Skip to content

Y
yd-product
Commit a2688a55 by zhangxingmin
Options

Merge remote-tracking branch 'origin/dev' into prod

parents 506416fb ad2aeaef
Showing with 108 additions and 3 deletions
yd-product-api/Dockerfile
...@@ -7,6 +7,6 @@ RUN mkdir -p /home/app ...@@ -7,6 +7,6 @@ RUN mkdir -p /home/app
# 拷贝项目jar - 使用可执行的 fat JAR # 拷贝项目jar - 使用可执行的 fat JAR
COPY target/yd-product-api-1.0-SNAPSHOT-exec.jar /home/app/yd-product-api.jar COPY target/yd-product-api-1.0-SNAPSHOT-exec.jar /home/app/yd-product-api.jar
# 执行命令启动jar，并设置JVM内存参数 # 执行命令启动jar，并设置JVM内存参数
ENTRYPOINT ["java", "-Xmx256m", "-Xms128m", "-jar", "/home/app/yd-product-api.jar"] ENTRYPOINT ["java","-Duser.timezone=Asia/Shanghai", "-Xmx256m", "-Xms128m", "-jar", "/home/app/yd-product-api.jar"]
# 暴露端口 # 暴露端口
EXPOSE 9466 EXPOSE 9466
yd-product-api/src/main/java/com/yd/product/api/controller/ApiProductLaunchController.java
...@@ -87,5 +87,15 @@ public class ApiProductLaunchController implements ApiProductLaunchFeignClient { ...@@ -87,5 +87,15 @@ public class ApiProductLaunchController implements ApiProductLaunchFeignClient {
return apiProductLaunchService.editStatus(request); return apiProductLaunchService.editStatus(request);
} }
/**
* 批量更新-产品全简体标题/短标题
* @param request
* @return
*/
@Override
public Result batchUpdateScTitle(ApiProductLaunchBatchUpdateScTitleRequest request) {
return apiProductLaunchService.batchUpdateScTitle(request);
}
} }
yd-product-api/src/main/java/com/yd/product/api/service/ApiProductLaunchService.java
...@@ -21,5 +21,7 @@ public interface ApiProductLaunchService { ...@@ -21,5 +21,7 @@ public interface ApiProductLaunchService {
Result editStatus(ApiProductLaunchEditStatusRequest request); Result editStatus(ApiProductLaunchEditStatusRequest request);
Result batchUpdateScTitle(ApiProductLaunchBatchUpdateScTitleRequest request);
Result<ProductLaunch> checkProductLaunchIsExist(String productLaunchBizId); Result<ProductLaunch> checkProductLaunchIsExist(String productLaunchBizId);
} }
yd-product-api/src/main/java/com/yd/product/api/service/impl/ApiAnnouncementCommissionRatioServiceImpl.java
package com.yd.product.api.service.impl; package com.yd.product.api.service.impl;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yd.common.enums.CommonEnum; import com.yd.common.enums.CommonEnum;
...@@ -64,6 +65,7 @@ public class ApiAnnouncementCommissionRatioServiceImpl implements ApiAnnouncemen ...@@ -64,6 +65,7 @@ public class ApiAnnouncementCommissionRatioServiceImpl implements ApiAnnouncemen
@Override @Override
public List<ApiAnnouncementCommissionRatioListResponse> conditionList(ApiAnnouncementCommissionRatioListRequest request) { public List<ApiAnnouncementCommissionRatioListResponse> conditionList(ApiAnnouncementCommissionRatioListRequest request) {
log.info("获取conditionList的值===========,{}", JSON.toJSONString(request));
return iAnnouncementCommissionRatioService.conditionList(request); return iAnnouncementCommissionRatioService.conditionList(request);
} }
......
yd-product-api/src/main/java/com/yd/product/api/service/impl/ApiProductLaunchServiceImpl.java
...@@ -95,7 +95,7 @@ public class ApiProductLaunchServiceImpl implements ApiProductLaunchService { ...@@ -95,7 +95,7 @@ public class ApiProductLaunchServiceImpl implements ApiProductLaunchService {
public Result<IPage<ApiProductLaunchPageResponse>> page(ApiProductLaunchPageRequest request) { public Result<IPage<ApiProductLaunchPageResponse>> page(ApiProductLaunchPageRequest request) {
Page<ApiProductLaunchPageResponse> page = new Page<ApiProductLaunchPageResponse>(request.getPageNo(), request.getPageSize()); Page<ApiProductLaunchPageResponse> page = new Page<ApiProductLaunchPageResponse>(request.getPageNo(), request.getPageSize());
//简体转繁体 //简体转繁体
request.setFTitle(ChineseTextConverter.simplifiedToTraditional(request.getTitle())); // request.setFTitle(ChineseTextConverter.simplifiedToTraditional(request.getTitle()));
//繁体转简体 //繁体转简体
request.setJTitle(ChineseTextConverter.traditionalToSimplified(request.getTitle())); request.setJTitle(ChineseTextConverter.traditionalToSimplified(request.getTitle()));
IPage<ApiProductLaunchPageResponse> iPage = iProductLaunchService.page(page, request); IPage<ApiProductLaunchPageResponse> iPage = iProductLaunchService.page(page, request);
...@@ -136,13 +136,17 @@ public class ApiProductLaunchServiceImpl implements ApiProductLaunchService { ...@@ -136,13 +136,17 @@ public class ApiProductLaunchServiceImpl implements ApiProductLaunchService {
//添加产品上架信息 //添加产品上架信息
ProductLaunch productLaunch = new ProductLaunch(); ProductLaunch productLaunch = new ProductLaunch();
//标题
productLaunch.setTitle(request.getProductName()); productLaunch.setTitle(request.getProductName());
//标题转全简->全简体标题
productLaunch.setTitleSc(ChineseTextConverter.traditionalToSimplified(productLaunch.getTitle()));
productLaunch.setMainUrls(String.join(";",request.getMainUrlsList())); productLaunch.setMainUrls(String.join(";",request.getMainUrlsList()));
productLaunch.setProductBizId(productBizId); productLaunch.setProductBizId(productBizId);
//产品上架信息表唯一业务ID //产品上架信息表唯一业务ID
productLaunch.setProductLaunchBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_PRODUCT_LAUNCH.getCode())); productLaunch.setProductLaunchBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_PRODUCT_LAUNCH.getCode()));
//待审核 //待审核
productLaunch.setStatus(ProductCommonEnum.PRODUCT_LAUNCH_STATUS_DSH.getItemValue()); productLaunch.setStatus(ProductCommonEnum.PRODUCT_LAUNCH_STATUS_DSH.getItemValue());
iProductLaunchService.saveOrUpdate(productLaunch); iProductLaunchService.saveOrUpdate(productLaunch);
//添加产品上架对象分类关系信息 //添加产品上架对象分类关系信息
ApiRelObjectCategoryListAddRequest addRequest = new ApiRelObjectCategoryListAddRequest(); ApiRelObjectCategoryListAddRequest addRequest = new ApiRelObjectCategoryListAddRequest();
...@@ -302,6 +306,10 @@ public class ApiProductLaunchServiceImpl implements ApiProductLaunchService { ...@@ -302,6 +306,10 @@ public class ApiProductLaunchServiceImpl implements ApiProductLaunchService {
productLaunch.setDetailUrls(!CollectionUtils.isEmpty(apiProductLaunchDto.getDetailUrlsList()) ? String.join(";",apiProductLaunchDto.getDetailUrlsList()) : ""); productLaunch.setDetailUrls(!CollectionUtils.isEmpty(apiProductLaunchDto.getDetailUrlsList()) ? String.join(";",apiProductLaunchDto.getDetailUrlsList()) : "");
productLaunch.setProjectBizIdList(!CollectionUtils.isEmpty(apiProductLaunchDto.getProjectBizIdList()) ? String.join(";",apiProductLaunchDto.getProjectBizIdList()) : ""); productLaunch.setProjectBizIdList(!CollectionUtils.isEmpty(apiProductLaunchDto.getProjectBizIdList()) ? String.join(";",apiProductLaunchDto.getProjectBizIdList()) : "");
productLaunch.setStatus(ProductCommonEnum.PRODUCT_LAUNCH_STATUS_DSH.getItemValue()); productLaunch.setStatus(ProductCommonEnum.PRODUCT_LAUNCH_STATUS_DSH.getItemValue());
productLaunch.setTitle(apiProductLaunchDto.getTitle());
productLaunch.setTitleSc(ChineseTextConverter.traditionalToSimplified(apiProductLaunchDto.getTitle()));
productLaunch.setShortTitle(apiProductLaunchDto.getShortTitle());
productLaunch.setShortTitleSc(ChineseTextConverter.traditionalToSimplified(apiProductLaunchDto.getShortTitle()));
iProductLaunchService.saveOrUpdate(productLaunch); iProductLaunchService.saveOrUpdate(productLaunch);
//设置产品上架信息参数列表 //设置产品上架信息参数列表
...@@ -323,6 +331,10 @@ public class ApiProductLaunchServiceImpl implements ApiProductLaunchService { ...@@ -323,6 +331,10 @@ public class ApiProductLaunchServiceImpl implements ApiProductLaunchService {
productLaunch.setMainUrls(!CollectionUtils.isEmpty(apiProductLaunchDto.getMainUrlsList()) ? String.join(";",apiProductLaunchDto.getMainUrlsList()) : ""); productLaunch.setMainUrls(!CollectionUtils.isEmpty(apiProductLaunchDto.getMainUrlsList()) ? String.join(";",apiProductLaunchDto.getMainUrlsList()) : "");
productLaunch.setDetailUrls(!CollectionUtils.isEmpty(apiProductLaunchDto.getDetailUrlsList()) ? String.join(";",apiProductLaunchDto.getDetailUrlsList()) : ""); productLaunch.setDetailUrls(!CollectionUtils.isEmpty(apiProductLaunchDto.getDetailUrlsList()) ? String.join(";",apiProductLaunchDto.getDetailUrlsList()) : "");
productLaunch.setProjectBizIdList(!CollectionUtils.isEmpty(apiProductLaunchDto.getProjectBizIdList()) ? String.join(";",apiProductLaunchDto.getProjectBizIdList()) : ""); productLaunch.setProjectBizIdList(!CollectionUtils.isEmpty(apiProductLaunchDto.getProjectBizIdList()) ? String.join(";",apiProductLaunchDto.getProjectBizIdList()) : "");
productLaunch.setTitle(apiProductLaunchDto.getTitle());
productLaunch.setTitleSc(ChineseTextConverter.traditionalToSimplified(apiProductLaunchDto.getTitle()));
productLaunch.setShortTitle(apiProductLaunchDto.getShortTitle());
productLaunch.setShortTitleSc(ChineseTextConverter.traditionalToSimplified(apiProductLaunchDto.getShortTitle()));
iProductLaunchService.saveOrUpdate(productLaunch); iProductLaunchService.saveOrUpdate(productLaunch);
//设置产品上架信息参数列表 //设置产品上架信息参数列表
...@@ -475,6 +487,28 @@ public class ApiProductLaunchServiceImpl implements ApiProductLaunchService { ...@@ -475,6 +487,28 @@ public class ApiProductLaunchServiceImpl implements ApiProductLaunchService {
} }
/** /**
* 批量更新-产品全简体标题/短标题
* @param request
* @return
*/
@Override
public Result batchUpdateScTitle(ApiProductLaunchBatchUpdateScTitleRequest request) {
List<ProductLaunch> productLaunchList = iProductLaunchService.queryAll();
if (CollectionUtils.isEmpty(productLaunchList)) {
return Result.success();
}
productLaunchList = productLaunchList.stream().map(dto -> {
//标题——>繁体转简体
dto.setTitleSc(ChineseTextConverter.traditionalToSimplified(dto.getTitle()));
//短标题——>繁体转简体
dto.setShortTitleSc(ChineseTextConverter.traditionalToSimplified(dto.getShortTitle()));
return dto;
}).collect(Collectors.toList());
iProductLaunchService.saveOrUpdateBatch(productLaunchList);
return Result.success();
}
/**
* 校验产品上架信息是否存在 * 校验产品上架信息是否存在
* @param productLaunchBizId * @param productLaunchBizId
* @return * @return
......
yd-product-feign/src/main/java/com/yd/product/feign/client/productlaunch/ApiProductLaunchFeignClient.java
...@@ -63,4 +63,12 @@ public interface ApiProductLaunchFeignClient { ...@@ -63,4 +63,12 @@ public interface ApiProductLaunchFeignClient {
*/ */
@PutMapping("/edit/status") @PutMapping("/edit/status")
Result editStatus(@Validated @RequestBody ApiProductLaunchEditStatusRequest request); Result editStatus(@Validated @RequestBody ApiProductLaunchEditStatusRequest request);
/**
* 批量更新-产品全简体标题/短标题
* @param request
* @return
*/
@PostMapping("/batch/update/sc/title")
Result batchUpdateScTitle(@Validated @RequestBody ApiProductLaunchBatchUpdateScTitleRequest request);
} }
yd-product-feign/src/main/java/com/yd/product/feign/fallback/productlaunch/ApiProductLaunchFeignFallbackFactory.java
...@@ -47,6 +47,11 @@ public class ApiProductLaunchFeignFallbackFactory implements FallbackFactory<Api ...@@ -47,6 +47,11 @@ public class ApiProductLaunchFeignFallbackFactory implements FallbackFactory<Api
public Result editStatus(ApiProductLaunchEditStatusRequest request) { public Result editStatus(ApiProductLaunchEditStatusRequest request) {
return null; return null;
} }
@Override
public Result batchUpdateScTitle(ApiProductLaunchBatchUpdateScTitleRequest request) {
return null;
}
}; };
} }
} }
yd-product-feign/src/main/java/com/yd/product/feign/request/productlaunch/ApiProductLaunchBatchUpdateScTitleRequest.java 0 → 100644
package com.yd.product.feign.request.productlaunch;
import lombok.Data;
import java.util.List;
@Data
public class ApiProductLaunchBatchUpdateScTitleRequest {
/**
* 产品上架信息表唯一业务ID
*/
private List<String> productLaunchBizIdList;
}
yd-product-service/pom.xml
...@@ -13,6 +13,13 @@ ...@@ -13,6 +13,13 @@
<dependencies> <dependencies>
<!-- knife4j -->
<dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-openapi3-spring-boot-starter</artifactId>
<version>4.3.0</version>
</dependency>
<dependency> <dependency>
<groupId>com.baomidou</groupId> <groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId> <artifactId>mybatis-plus-boot-starter</artifactId>
......
yd-product-service/src/main/java/com/yd/product/service/model/ProductLaunch.java
...@@ -50,12 +50,24 @@ public class ProductLaunch implements Serializable { ...@@ -50,12 +50,24 @@ public class ProductLaunch implements Serializable {
private String title; private String title;
/** /**
* 全简体标题
*/
@TableField("title_sc")
private String titleSc;
/**
* 短标题 * 短标题
*/ */
@TableField("short_title") @TableField("short_title")
private String shortTitle; private String shortTitle;
/** /**
* 全简短标题
*/
@TableField("short_title_sc")
private String shortTitleSc;
/**
* 主图url（多个url用分号分隔） * 主图url（多个url用分号分隔）
*/ */
@TableField("main_urls") @TableField("main_urls")
......
yd-product-service/src/main/java/com/yd/product/service/service/IProductLaunchService.java
...@@ -7,6 +7,8 @@ import com.yd.product.feign.response.productlaunch.ApiProductLaunchPageResponse; ...@@ -7,6 +7,8 @@ import com.yd.product.feign.response.productlaunch.ApiProductLaunchPageResponse;
import com.yd.product.service.model.ProductLaunch; import com.yd.product.service.model.ProductLaunch;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
/** /**
* <p> * <p>
* 产品上架信息表（新表） 服务类 * 产品上架信息表（新表） 服务类
...@@ -21,4 +23,6 @@ public interface IProductLaunchService extends IService<ProductLaunch> { ...@@ -21,4 +23,6 @@ public interface IProductLaunchService extends IService<ProductLaunch> {
ApiProductLaunchPageRequest request); ApiProductLaunchPageRequest request);
ProductLaunch queryOne(String productLaunchBizId); ProductLaunch queryOne(String productLaunchBizId);
List<ProductLaunch> queryAll();
} }
yd-product-service/src/main/java/com/yd/product/service/service/impl/ProductLaunchServiceImpl.java
...@@ -11,6 +11,8 @@ import com.yd.product.service.service.IProductLaunchService; ...@@ -11,6 +11,8 @@ import com.yd.product.service.service.IProductLaunchService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List;
/** /**
* <p> * <p>
* 产品上架信息表（新表） 服务实现类 * 产品上架信息表（新表） 服务实现类
...@@ -32,4 +34,9 @@ public class ProductLaunchServiceImpl extends ServiceImpl<ProductLaunchMapper, P ...@@ -32,4 +34,9 @@ public class ProductLaunchServiceImpl extends ServiceImpl<ProductLaunchMapper, P
public ProductLaunch queryOne(String productLaunchBizId) { public ProductLaunch queryOne(String productLaunchBizId) {
return this.getOne(new LambdaQueryWrapper<ProductLaunch>().eq(ProductLaunch::getProductLaunchBizId,productLaunchBizId)); return this.getOne(new LambdaQueryWrapper<ProductLaunch>().eq(ProductLaunch::getProductLaunchBizId,productLaunchBizId));
} }
@Override
public List<ProductLaunch> queryAll() {
return this.baseMapper.selectList(null);
}
} }
yd-product-service/src/main/resources/mappers/ProductLaunchMapper.xml
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</if> </if>
</if> </if>
<if test="request.title != null and request.title != ''"> <if test="request.title != null and request.title != ''">
and (pl.title like concat('%', #{request.fTitle}, '%') or pl.title like concat('%', #{request.jTitle}, '%')) and (pl.title_sc like concat('%', #{request.jTitle}, '%'))
</if> </if>
<if test="request.titleList != null and request.titleList.size > 0"> <if test="request.titleList != null and request.titleList.size > 0">
and pl.title in and pl.title in
......
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