Helius
2021-12-17 d3a9bc81a311c3c84db705eadebd150d06468f6b
add dataDic
1 files renamed
4 files modified
3 files added
117 ■■■■■ changed files
src/main/java/cc/mrbird/febs/common/configure/WebMvcConfigure.java 1 ●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/pay/controller/PayController.java 15 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/video/controller/ApiDataDictionaryController.java 44 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/video/conversion/DataDicConversion.java 21 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/video/mapper/DataDictionaryCustomMapper.java 2 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/video/vo/DataDicVo.java 26 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/video/vo/VideoInfoVo.java 3 ●●●●● patch | view | raw | blame | history
src/main/resources/mapper/modules/DataDictionaryCustomMapper.xml 5 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/common/configure/WebMvcConfigure.java
@@ -14,6 +14,7 @@
        InterceptorRegistration registration = registry.addInterceptor(new LoginInterceptor());
        registration.addPathPatterns("/api/**");
        registration.excludePathPatterns("/api/login/**");
        registration.excludePathPatterns("/api/common/**");
        registration.excludePathPatterns("/api/video/**");
        registration.excludePathPatterns("/api/member/vipCostInfo");
        registration.excludePathPatterns("/api/member/appVersion");
src/main/java/cc/mrbird/febs/pay/controller/PayController.java
File was renamed from src/main/java/cc/mrbird/febs/pay/controller/PayCallBackController.java
@@ -1,12 +1,18 @@
package cc.mrbird.febs.pay.controller;
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.pay.properties.AliPayProperties;
import cc.mrbird.febs.pay.service.IPayService;
import cc.mrbird.febs.video.dto.VipBuyDto;
import com.alipay.api.AlipayApiException;
import com.alipay.api.internal.util.AlipaySignature;
import com.ijpay.alipay.AliPayApi;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -21,7 +27,8 @@
@Slf4j
@RestController
@RequestMapping(value = "/api/pay")
public class PayCallBackController {
@Api(value = "PayController", tags = "支付")
public class PayController {
    @Autowired
    private IPayService payService;
@@ -55,4 +62,10 @@
            return "failure";
        }
    }
    @ApiOperation(value = "支付宝支付")
    @PostMapping(value = "/pay")
    public FebsResponse pay(@RequestBody VipBuyDto vipBuyDto) {
        return new FebsResponse().success().data(payService.aliPay(vipBuyDto));
    }
}
src/main/java/cc/mrbird/febs/video/controller/ApiDataDictionaryController.java
New file
@@ -0,0 +1,44 @@
package cc.mrbird.febs.video.controller;
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.video.conversion.DataDicConversion;
import cc.mrbird.febs.video.entity.DataDictionaryCustom;
import cc.mrbird.febs.video.mapper.DataDictionaryCustomMapper;
import cc.mrbird.febs.video.vo.DataDicVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
 * @author wzy
 * @date 2021-12-17
 **/
@Slf4j
@RestController
@RequestMapping(value = "/api/common/")
@RequiredArgsConstructor
@Api(value = "ApiDataDictionaryController", tags = "字典类")
public class ApiDataDictionaryController {
    private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
    @ApiOperation(value = "根据type获取字典值", notes = "根据type获取字典值")
    @ApiResponses({
            @ApiResponse(code = 200, message = "success", response = DataDicVo.class)
    })
    @GetMapping(value = "/findDataByDicType")
    public FebsResponse findDataByDicType(@RequestParam("type") String type) {
        List<DataDictionaryCustom> dataDic = dataDictionaryCustomMapper.selectByType(type);
        return new FebsResponse().success().data(DataDicConversion.INSTANCE.entitiesToVos(dataDic));
    }
}
src/main/java/cc/mrbird/febs/video/conversion/DataDicConversion.java
New file
@@ -0,0 +1,21 @@
package cc.mrbird.febs.video.conversion;
import cc.mrbird.febs.video.entity.DataDictionaryCustom;
import cc.mrbird.febs.video.vo.DataDicVo;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
import java.util.List;
/**
 * @author wzy
 * @date 2021-12-17
 **/
@Mapper
public abstract class DataDicConversion {
    public static final DataDicConversion INSTANCE = Mappers.getMapper(DataDicConversion.class);
    public abstract DataDicVo entityToVo(DataDictionaryCustom dataDictionaryCustom);
    public abstract List<DataDicVo> entitiesToVos(List<DataDictionaryCustom> list);
}
src/main/java/cc/mrbird/febs/video/mapper/DataDictionaryCustomMapper.java
@@ -12,4 +12,6 @@
    List<ApiVipCostVo> selectApiVipCostByType(@Param("type") String type);
    DataDictionaryCustom selectDataByTypeAndCode(@Param("type") String type, @Param("code") String code);
    List<DataDictionaryCustom> selectByType(@Param("type") String type);
}
src/main/java/cc/mrbird/febs/video/vo/DataDicVo.java
New file
@@ -0,0 +1,26 @@
package cc.mrbird.febs.video.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @author wzy
 * @date 2021-12-17
 **/
@Data
@ApiModel(value = "DataDicVo", description = "字典值返回参数类")
public class DataDicVo {
    @ApiModelProperty(value = "字典类型")
    private String type;
    @ApiModelProperty(value = "字典编码")
    private String code;
    @ApiModelProperty(value ="值")
    private String value;
    @ApiModelProperty(value = "描述")
    private String description;
}
src/main/java/cc/mrbird/febs/video/vo/VideoInfoVo.java
@@ -35,6 +35,9 @@
    @ApiModelProperty(value = "是否免费 1/免费 2/会员")
    private Integer isFree;
    @ApiModelProperty(value = "是否点赞 1/是 2/否")
    private Integer isLike;
    @ApiModelProperty(value = "当前播放itemid")
    private Long itemId;
src/main/resources/mapper/modules/DataDictionaryCustomMapper.xml
@@ -15,4 +15,9 @@
        select * from data_dictionary_custom
        where type=#{type} and code=#{code}
    </select>
    <select id="selectByType" resultType="cc.mrbird.febs.video.entity.DataDictionaryCustom">
        select * from data_dictionary_custom
        where type=#{type}
    </select>
</mapper>