xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-11-22 18:36:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

adding productsearchTag select

Browse Source
This commit is contained in:
Carl
2022-01-19 19:31:28 +08:00
parent 3293b25734
commit 8ca5dddd59
6 changed files with 123 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/interceptor/SmartAuthenticationInterceptor.java
View File

@@ -72,8 +72,8 @@ public class SmartAuthenticationInterceptor extends HandlerInterceptorAdapter {
}
Boolean noNeedLogin = request.getServletPath().contains("royalcanin");
Boolean noNeedLoginToo = request.getContextPath().contains("royalcanin");
System.out.println("request.getContextPath() : " + request.getRequestURI());
System.out.println("request.getRequestURI() : " + request.getRequestURI());
// System.out.println("request.getContextPath() : " + request.getRequestURI());
// System.out.println("request.getRequestURI() : " + request.getRequestURI());
if (noNeedLogin||noNeedLoginToo) {
return true;
}

34
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/GoodController.java
View File

@@ -17,6 +17,9 @@ import net.lab1024.smartadmin.module.system.royalcanin.good.model.ProductMasterQ
import net.lab1024.smartadmin.module.system.royalcanin.good.model.ProductQueryEntity;
import net.lab1024.smartadmin.module.system.royalcanin.good.service.CartService;
import net.lab1024.smartadmin.module.system.royalcanin.good.service.GoodService;
import net.lab1024.smartadmin.module.system.royalcanin.productSearchTag.model.ProductSearchTagEntity;
import net.lab1024.smartadmin.module.system.royalcanin.productSearchTag.service.ProductSearchTagService;
import net.lab1024.smartadmin.util.MapRemoveNullUtil;
import net.lab1024.smartadmin.util.SmartJWTUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
@@ -25,7 +28,9 @@ import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@Api(tags = {SwaggerTagConst.Admin.MANAGER_MALL_API})
@OperateLog
@@ -40,6 +45,9 @@ public class GoodController {
@Autowired
private CartService cartService;
@Autowired
private ProductSearchTagService productSearchTagService;
@Autowired
private GoodService goodService;
@@ -58,6 +66,32 @@ public class GoodController {
@ApiOperation(value = "查询标品信息", notes = "查询标品信息")
@PostMapping("royalcanin/product/query")
public String transferBrand(ProductQueryEntity productQueryEntity) throws Exception {
Map<String, String> paramMap = MapRemoveNullUtil.setConditionMap(productQueryEntity);
List<String> brandNameList = new ArrayList<>();
List<String> tagNameList = new ArrayList<>();
for (String key : paramMap.keySet()) {
if(key == "categoryName" ){
for(String categoryname : paramMap.get(key).split(",")){
if(categoryname.equals("体型犬粮")||categoryname.equals("功能犬粮")||categoryname.equals("品种犬粮")||categoryname.equals("犬湿粮")||categoryname.equals("功能猫粮")||categoryname.equals("品种猫粮")||categoryname.equals("营养猫粮")||categoryname.equals("猫湿粮")||categoryname.equals("优卡产品")) {
brandNameList.add(categoryname);
tagNameList.add(categoryname);
}else {
brandNameList.add(categoryname);
}
}
}else if (key == "tagUsedAge"||key == "tagFunction"||key == "tagBreed"){
for(String tagName : paramMap.get(key).split(",")){
tagNameList.add(tagName);
}
}
}
List<ProductSearchTagEntity> productSearchTagList = productSearchTagService.findAllByCondition(brandNameList,productQueryEntity.getPetType(),tagNameList,productQueryEntity.getTagStatus());
List<String> tagCodeList = new ArrayList<>();
for (ProductSearchTagEntity productSearchTagEntity:productSearchTagList){
tagCodeList.add(productSearchTagEntity.getTagCode());
}
String tagCode = String.join(",",tagCodeList);
productQueryEntity.setTagCode(tagCode);
long startTime = System.currentTimeMillis();
String result = goodService.brandQuery(productQueryEntity);
long acceptTime = System.currentTimeMillis() ;

17
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/model/ProductQueryEntity.java
View File

@@ -10,18 +10,35 @@ import lombok.NoArgsConstructor;
public class ProductQueryEntity {
private String channelId;
private String secret;
private String page;
private String rows;
private String productCode;
private String name;
private String brandCode;
private String brandName;
private String petType;
private String categoryName;
private String tagUsedAge;
private String tagFunction;
private String tagBreed;
private String tagStatus;
private String tagCode;
private String isSales;
}

5
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java
View File

@@ -40,6 +40,11 @@ public class GoodService {
public String brandQuery(ProductQueryEntity productQueryEntity) throws Exception {
Map<String, String> paramMap = MapRemoveNullUtil.setConditionMap(productQueryEntity);
paramMap.remove("petType");
paramMap.remove("categoryName");
paramMap.remove("tagUsedAge");
paramMap.remove("tagFunction");
paramMap.remove("tagBreed");
MapRemoveNullUtil.removeNullEntry(paramMap);
paramMap.put("secret","H5@2021");
paramMap.put("channelId","15");