Skip to content

E
enterprise-platform
Commit d098f2cb authored by 王晓旭's avatar 王晓旭
Browse files
Options

Merge branch 'master' of http://gitlab.scsmile.cn/zxf/enterprise-platform

parents 476adedb 5b881f95
Hide whitespace changes
Inline Side-by-side
Showing with 393 additions and 35 deletions
enterprise-manager/src/main/java/com/mortals/xhx/busiz/applets/req/ProductReq.java 0 → 100644
View file @ d098f2cb
package com.mortals.xhx.busiz.applets.req;
import com.mortals.xhx.busiz.BaseReq;
import lombok.Data;
/**
* 产品请求
*
* @author: zxfei
* @date: 2023/10/7 16:53
*/
@Data
public class ProductReq extends BaseReq {
/**
* 分类id
*/
private Long categoryId;
}
enterprise-manager/src/main/java/com/mortals/xhx/busiz/applets/req/StaffReq.java 0 → 100644
View file @ d098f2cb
package com.mortals.xhx.busiz.applets.req;
import com.mortals.xhx.busiz.BaseReq;
import lombok.Data;
/**
* 产品请求
*
* @author: zxfei
* @date: 2023/10/7 16:53
*/
@Data
public class StaffReq extends BaseReq {
/**
* 员工id
*/
private Long id;
}
enterprise-manager/src/main/java/com/mortals/xhx/busiz/applets/web/CompanyApiController.java 0 → 100644
View file @ d098f2cb
package com.mortals.xhx.busiz.applets.web;
import com.mortals.framework.common.Rest;
import com.mortals.xhx.busiz.applets.req.NewsReq;
import com.mortals.xhx.module.company.model.CompanyLabelsQuery;
import com.mortals.xhx.module.company.model.CompanyQuery;
import com.mortals.xhx.module.company.service.CompanyLabelsService;
import com.mortals.xhx.module.company.service.CompanyService;
import com.mortals.xhx.module.labels.model.LabelsQuery;
import com.mortals.xhx.module.labels.service.LabelsService;
import com.mortals.xhx.module.news.model.NewsCategoryQuery;
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.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @author ZYW
* @date 2023-10-09 9:39
*/
@RestController
@Slf4j
@RequestMapping("/api/v1/company")
public class CompanyApiController extends AbstractBaseController<NewsReq>{
@Autowired
private CompanyService companyService;
@Autowired
private LabelsService labelsService;
/**
* 公司标注列表
*/
@PostMapping(value = "labelsList")
public Rest<Object> categoryList(){
String busiDesc = "公司标注";
Rest<Object> rest = Rest.ok();
try {
rest.setData(labelsService.find(new LabelsQuery()));
}catch (Exception e) {
log.error(busiDesc, e);
rest = Rest.fail(super.convertException(e));
}
return rest;
}
/**
* 公司列表
*/
@PostMapping(value = "companyList")
public Rest<Object> companyList(){
String busiDesc = "公司列表";
Rest<Object> rest = Rest.ok();
try {
rest.setData(companyService.find(new CompanyQuery()));
}catch (Exception e) {
log.error(busiDesc, e);
rest = Rest.fail(super.convertException(e));
}
return rest;
}
}
enterprise-manager/src/main/java/com/mortals/xhx/busiz/applets/web/ProductApiController.java 0 → 100644
View file @ d098f2cb
package com.mortals.xhx.busiz.applets.web;
import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.common.Rest;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import com.mortals.framework.model.OrderCol;
import com.mortals.framework.model.PageInfo;
import com.mortals.framework.model.Result;
import com.mortals.xhx.busiz.applets.req.NewsReq;
import com.mortals.xhx.busiz.applets.req.ProductReq;
import com.mortals.xhx.busiz.applets.rsp.NewsListInfo;
import com.mortals.xhx.common.utils.BeanUtil;
import com.mortals.xhx.module.category.model.CategoryQuery;
import com.mortals.xhx.module.category.service.CategoryService;
import com.mortals.xhx.module.company.model.CompanyQuery;
import com.mortals.xhx.module.company.service.CompanyService;
import com.mortals.xhx.module.labels.model.LabelsQuery;
import com.mortals.xhx.module.labels.service.LabelsService;
import com.mortals.xhx.module.news.model.NewsEntity;
import com.mortals.xhx.module.news.model.NewsQuery;
import com.mortals.xhx.module.product.model.ProductCategoryQuery;
import com.mortals.xhx.module.product.model.ProductEntity;
import com.mortals.xhx.module.product.model.ProductQuery;
import com.mortals.xhx.module.product.service.ProductCategoryService;
import com.mortals.xhx.module.product.service.ProductService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
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;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import static com.mortals.framework.ap.SysConstains.PAGEINFO_KEY;
import static com.mortals.xhx.common.key.ErrorCode.ERROR_TOKEN_EXPIRED;
import static com.mortals.xhx.common.key.ErrorCode.ERROR_TOKEN_EXPIRED_CONTENT;
/**
* @author ZYW
* @date 2023-10-09 9:39
*/
@RestController
@Slf4j
@RequestMapping("/api/v1/product")
public class ProductApiController extends AbstractBaseController<ProductReq>{
@Autowired
private ProductService productService;
@Autowired
private CategoryService categoryService;
/**
* 产品类型
*/
@PostMapping(value = "categoryList")
public Rest<Object> categoryList(){
String busiDesc = "产品类型";
Rest<Object> rest = Rest.ok();
try {
rest.setData(categoryService.find(new CategoryQuery()));
}catch (Exception e) {
log.error(busiDesc, e);
rest = Rest.fail(super.convertException(e));
}
return rest;
}
/**
* 产品列表
*/
@PostMapping(value = "productList")
public Rest<Object> productList(@RequestBody ProductReq productReq){
String busiDesc = "产品列表列表";
log.info("【{}】【请求体】--> {}", busiDesc, JSONObject.toJSONString(productReq));
Rest<Object> rest = Rest.ok();
Map<String, Object> model = new HashMap<>();
Context context = this.getContext();
if (ObjectUtils.isEmpty(context) || ObjectUtils.isEmpty(context.getUser())) {
throw new AppException(ERROR_TOKEN_EXPIRED, ERROR_TOKEN_EXPIRED_CONTENT);
}
try {
PageInfo pageInfo = buildPageInfo(productReq);
ProductQuery query = new ProductQuery();
if(!ObjectUtils.isEmpty(productReq.getCategoryId())){
query.setCategoryId(String.valueOf(productReq.getCategoryId()));
}
query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
Result<ProductEntity> result = productService.find(query, pageInfo, context);
List<ProductEntity> collect = result.getList().stream().map(item -> {
ProductEntity productEntity = new ProductEntity();
BeanUtils.copyProperties(item, productEntity, BeanUtil.getNullPropertyNames(item));
return productEntity;
}).collect(Collectors.toList());
model.put(KEY_RESULT_DATA, collect);
model.put(PAGEINFO_KEY, result.getPageInfo());
super.parsePageInfo(model, result.getPageInfo());
rest.setData(model);
recordSysLog(request, busiDesc + " 【成功】");
} catch (Exception e) {
log.error(busiDesc, e);
rest = Rest.fail(super.convertException(e));
}
return rest;
}
}
enterprise-manager/src/main/java/com/mortals/xhx/busiz/applets/web/StaffApiController.java 0 → 100644
View file @ d098f2cb
package com.mortals.xhx.busiz.applets.web;
import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.common.Rest;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import com.mortals.framework.model.OrderCol;
import com.mortals.framework.model.PageInfo;
import com.mortals.framework.model.Result;
import com.mortals.xhx.busiz.applets.req.ProductReq;
import com.mortals.xhx.busiz.applets.req.StaffReq;
import com.mortals.xhx.common.utils.BeanUtil;
import com.mortals.xhx.module.category.model.CategoryQuery;
import com.mortals.xhx.module.category.service.CategoryService;
import com.mortals.xhx.module.product.model.ProductEntity;
import com.mortals.xhx.module.product.model.ProductQuery;
import com.mortals.xhx.module.product.service.ProductService;
import com.mortals.xhx.module.staff.model.StaffEntity;
import com.mortals.xhx.module.staff.model.StaffQuery;
import com.mortals.xhx.module.staff.model.StaffRecordEntity;
import com.mortals.xhx.module.staff.service.StaffRecordService;
import com.mortals.xhx.module.staff.service.StaffService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
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;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import static com.mortals.framework.ap.SysConstains.PAGEINFO_KEY;
import static com.mortals.xhx.common.key.ErrorCode.ERROR_TOKEN_EXPIRED;
import static com.mortals.xhx.common.key.ErrorCode.ERROR_TOKEN_EXPIRED_CONTENT;
/**
* @author ZYW
* @date 2023-10-09 9:39
*/
@RestController
@Slf4j
@RequestMapping("/api/v1/staff")
public class StaffApiController extends AbstractBaseController<StaffReq>{
@Autowired
private StaffService staffService;
@Autowired
private StaffRecordService staffRecordService;
/**
* 员工详情
*/
@PostMapping(value = "staffInfo")
public Rest<Object> staffInfo(@RequestBody StaffReq staffReq){
String busiDesc = "员工详情";
log.info("【{}】【请求体】--> {}", busiDesc, JSONObject.toJSONString(staffReq));
Rest<Object> rest = Rest.ok();
Context context = this.getContext();
if (ObjectUtils.isEmpty(context) || ObjectUtils.isEmpty(context.getUser())) {
throw new AppException(ERROR_TOKEN_EXPIRED, ERROR_TOKEN_EXPIRED_CONTENT);
}
try {
if(!ObjectUtils.isEmpty(staffReq.getId())){
StaffEntity staffEntity = staffService.get(staffReq.getId());
if(staffEntity != null){
rest.setData(staffEntity);
}else {
rest = Rest.fail("未查到该员工");
}
}else {
rest = Rest.fail("缺少id");
}
recordSysLog(request, busiDesc + " 【成功】");
} catch (Exception e) {
log.error(busiDesc, e);
rest = Rest.fail(super.convertException(e));
}
return rest;
}
/**
* 名片被查看记录
*/
@PostMapping(value = "staffRecord")
public Rest<Object> staffRecord(@RequestBody StaffReq staffReq){
String busiDesc = "名片被查看记录";
log.info("【{}】【请求体】--> {}", busiDesc, JSONObject.toJSONString(staffReq));
Rest<Object> rest = Rest.ok();
Context context = this.getContext();
if (ObjectUtils.isEmpty(context) || ObjectUtils.isEmpty(context.getUser())) {
throw new AppException(ERROR_TOKEN_EXPIRED, ERROR_TOKEN_EXPIRED_CONTENT);
}
try {
if(!ObjectUtils.isEmpty(staffReq.getId())){
StaffRecordEntity staffRecordEntity = staffRecordService.get(staffReq.getId());
if(staffRecordEntity != null){
rest.setData(staffRecordEntity);
}else {
rest = Rest.fail("未查到记录");
}
}else {
rest = Rest.fail("缺少id");
}
recordSysLog(request, busiDesc + " 【成功】");
} catch (Exception e) {
log.error(busiDesc, e);
rest = Rest.fail(super.convertException(e));
}
return rest;
}
}
enterprise-manager/src/main/java/com/mortals/xhx/module/product/service/impl/ProductServiceImpl.java
View file @ d098f2cb
package com.mortals.xhx.module.product.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.mortals.framework.model.PageInfo;
import com.mortals.framework.model.Result;
import com.mortals.framework.service.impl.AbstractCRUDCacheServiceImpl;
......@@ -57,20 +58,33 @@ public class ProductServiceImpl extends AbstractCRUDCacheServiceImpl<ProductDao,
public Result<ProductEntity> find(ProductEntity entity, PageInfo pageInfo, Context context) throws AppException {
Result<ProductEntity> productEntityResult = new Result<>();
if (ObjectUtils.isEmpty(entity.getCategoryId()) && ObjectUtils.isEmpty(entity.getCompanyId())) {
return this.find(entity, pageInfo, context);
return super.find(entity, pageInfo, context);
} else {
Integer hot = entity.getHot();
//针对不同查询返回不同结果集
if (!ObjectUtils.isEmpty(entity.getCategoryId()) && ObjectUtils.isEmpty(entity.getCompanyId())) {
Result<ProductCategoryEntity> productCategoryResult = productCategoryService.find(new ProductCategoryQuery().categoryId(Long.parseLong(entity.getCategoryId())), pageInfo, context);
List<ProductEntity> productList = getProductEntitiesByCategory(entity, productCategoryResult);
if (!ObjectUtils.isEmpty(hot)) {
//过滤热门与非热门
productList = productList.stream().filter(f -> f.getHot() == hot).collect(Collectors.toList());
}
productEntityResult.setList(productList);
productEntityResult.setPageInfo(productCategoryResult.getPageInfo());
productEntityResult.setDict(productCategoryResult.getDict());
} else if (ObjectUtils.isEmpty(entity.getCategoryId()) && !ObjectUtils.isEmpty(entity.getCompanyId())) {
Result<CompanyProductEntity> companyProductEntityResult = companyProductService.find(new CompanyProductQuery().companyId(Long.parseLong(entity.getCompanyId())), pageInfo, context);
List<CompanyProductEntity> companyProducList = companyProductEntityResult.getList();
List<ProductEntity> productList = getProductEntitiesByCompanyId(entity, companyProducList);
if (!ObjectUtils.isEmpty(hot)) {
//过滤热门与非热门
productList = productList.stream().filter(f -> f.getHot() == hot).collect(Collectors.toList());
}
productEntityResult.setList(productList);
productEntityResult.setPageInfo(companyProductEntityResult.getPageInfo());
productEntityResult.setDict(companyProductEntityResult.getDict());
......@@ -85,6 +99,10 @@ public class ProductServiceImpl extends AbstractCRUDCacheServiceImpl<ProductDao,
//求2个list的交集
List<ProductEntity> collect = CollUtil.intersection(productCategoryList, productCompanyList).stream().collect(Collectors.toList());
if (!ObjectUtils.isEmpty(hot)) {
//过滤热门与非热门
collect = collect.stream().filter(f -> f.getHot() == hot).collect(Collectors.toList());
}
productEntityResult.setList(collect);
pageInfo.setTotalResult(collect.size());
productEntityResult.setPageInfo(pageInfo);
......@@ -112,7 +130,7 @@ public class ProductServiceImpl extends AbstractCRUDCacheServiceImpl<ProductDao,
List<ProductEntity> productList = productCategoryResult.getList().stream().map(item -> {
ProductEntity productEntity = this.getCache(item.getProductId().toString());
if (!ObjectUtils.isEmpty(productEntity)) {
String companyIds = companyProductService.find(new CompanyProductQuery().productId(productEntity.getId())).stream().map(i -> i.getProductId().toString()).collect(Collectors.joining(","));
String companyIds = companyProductService.find(new CompanyProductQuery().productId(productEntity.getId())).stream().map(i -> i.getCompanyId().toString()).collect(Collectors.joining(","));
productEntity.setCompanyId(companyIds);
productEntity.setCategoryId(entity.getCategoryId());
}
......@@ -124,29 +142,12 @@ public class ProductServiceImpl extends AbstractCRUDCacheServiceImpl<ProductDao,
@Override
protected void findAfter(ProductEntity params, PageInfo pageInfo, Context context, List<ProductEntity> list) throws AppException {
list.forEach(item -> {
String categoryIds = productCategoryService.find(new ProductCategoryQuery().productId(item.getId())).stream().map(i -> i.getCategoryId().toString()).collect(Collectors.joining(","));
String companyIds = companyProductService.find(new CompanyProductQuery().productId(item.getId())).stream().map(i -> i.getProductId().toString()).collect(Collectors.joining(","));
String categoryIds = productCategoryService.find(new ProductCategoryQuery().productId(item.getId())).stream().map(i -> i.getCategoryId().toString()).distinct().collect(Collectors.joining(","));
String companyIds = companyProductService.find(new CompanyProductQuery().productId(item.getId())).stream().map(i -> i.getCompanyId().toString()).distinct().collect(Collectors.joining(","));
item.setCompanyId(companyIds);
item.setCategoryId(categoryIds);
});
if (!ObjectUtils.isEmpty(params.getCategoryId())) {
//种类不为空 删除掉空的
Iterator<ProductEntity> iterator = list.iterator();
while (iterator.hasNext()) {
ProductEntity product = iterator.next();
String categoryIds = productCategoryService.find(new ProductCategoryQuery().productId(product.getId())).stream().map(i -> i.getCategoryId().toString()).collect(Collectors.joining(","));
}
}
if (!ObjectUtils.isEmpty(params.getCompanyId())) {
//公司查询不为空
}
}
@Override
......@@ -219,12 +220,19 @@ public class ProductServiceImpl extends AbstractCRUDCacheServiceImpl<ProductDao,
}
if (!ObjectUtils.isEmpty(entity.getCompanyId())) {
List<CompanyProductEntity> companyProductList = Arrays.asList(entity.getCompanyId().split(",")).stream().map(item -> {
Long[] companyProductRemoveIds = companyProductService.find(new CompanyProductQuery().productId(Long.parseLong(item))).stream().map(i -> i.getId()).toArray(Long[]::new);
if (!ObjectUtils.isEmpty(companyProductRemoveIds)) {
companyProductService.remove(companyProductRemoveIds, context);
}
CompanyEntity companyEntity = companyService.get(Long.parseLong(item), context);
List<Long> companyList = Arrays.asList(entity.getCompanyId().split(",")).stream().map(Long::parseLong).collect(Collectors.toList());
CompanyProductQuery companyProductQuery = new CompanyProductQuery();
companyProductQuery.setProductId(entity.getId());
// companyProductQuery.setCompanyIdList(companyList);
Long[] companyProductRemoveIds = companyProductService.find(companyProductQuery).stream().map(i -> i.getId()).toArray(Long[]::new);
if (!ObjectUtils.isEmpty(companyProductRemoveIds)) {
companyProductService.remove(companyProductRemoveIds, context);
}
List<CompanyProductEntity> companyProductList = companyList.stream().map(item -> {
CompanyEntity companyEntity = companyService.get(item, context);
CompanyProductEntity companyProductEntity = new CompanyProductEntity();
companyProductEntity.initAttrValue();
companyProductEntity.setProductId(entity.getId());
......@@ -241,13 +249,18 @@ public class ProductServiceImpl extends AbstractCRUDCacheServiceImpl<ProductDao,
}
if (!ObjectUtils.isEmpty(entity.getCategoryId())) {
List<ProductCategoryEntity> productCategoryList = Arrays.asList(entity.getCategoryId().split(",")).stream().map(item -> {
Long[] productCategoryRemoveIds = productCategoryService.find(new ProductCategoryQuery().productId(Long.parseLong(item))).stream().map(i -> i.getId()).toArray(Long[]::new);
if (!ObjectUtils.isEmpty(productCategoryRemoveIds)) {
productCategoryService.remove(productCategoryRemoveIds, context);
}
List<Long> categoryList = Arrays.asList(entity.getCategoryId().split(",")).stream().map(i->Long.parseLong(i)).collect(Collectors.toList());
ProductCategoryQuery productCategoryQuery = new ProductCategoryQuery();
productCategoryQuery.setProductId(entity.getId());
//productCategoryQuery.setCategoryIdList(categoryList);
Long[] productCategoryRemoveIds = productCategoryService.find(productCategoryQuery).stream().map(i -> i.getId()).toArray(Long[]::new);
if (!ObjectUtils.isEmpty(productCategoryRemoveIds)) {
productCategoryService.remove(productCategoryRemoveIds, context);
}
CategoryEntity categoryEntity = categoryService.get(Long.parseLong(item), context);
List<ProductCategoryEntity> productCategoryList = categoryList.stream().map(item -> {
CategoryEntity categoryEntity = categoryService.get(item, context);
ProductCategoryEntity productCategoryEntity = new ProductCategoryEntity();
productCategoryEntity.initAttrValue();
productCategoryEntity.setProductId(entity.getId());
......@@ -272,8 +285,6 @@ public class ProductServiceImpl extends AbstractCRUDCacheServiceImpl<ProductDao,
protected void removeAfter(Long[] ids, Context context, int result) throws AppException {
List<ProductQuestionEntity> productQuestionlist = productQuestionService.find(new ProductQuestionQuery().productIdList(Arrays.asList(ids)));
productQuestionService.removeList(productQuestionlist, context);
super.removeAfter(ids, context, result);
}
}
\ No newline at end of file
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