产品，新闻，名片详情接口增加收藏状态

enterprise-manager/src/main/java/com/mortals/xhx/module/bussinesscard/model/vo/BussinesscardVo.java

@@ -18,6 +18,7 @@ public class BussinesscardVo extends BaseEntityLong {
 
     /** 序号，主键，自增长列表 */
     private List <Long> idList;
-
+    /**收藏状态**/
+    private Integer favoriteStatus;
 
 }
\ No newline at end of file

enterprise-manager/src/main/java/com/mortals/xhx/module/bussinesscard/service/impl/BussinesscardServiceImpl.java

@@ -5,6 +5,9 @@ import com.mortals.framework.util.DataUtil;
 import com.mortals.framework.util.StringUtils;
 import com.mortals.xhx.module.company.model.CompanyEntity;
 import com.mortals.xhx.module.company.service.CompanyService;
+import com.mortals.xhx.module.favorites.model.FavoritesBusinesscardEntity;
+import com.mortals.xhx.module.favorites.model.FavoritesBusinesscardQuery;
+import com.mortals.xhx.module.favorites.service.FavoritesBusinesscardService;
 import com.mortals.xhx.module.position.model.PositionEntity;
 import com.mortals.xhx.module.position.service.PositionService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,6 +34,8 @@ public class BussinesscardServiceImpl extends AbstractCRUDServiceImpl<Bussinessc
     private CompanyService companyService;
     @Autowired
     private PositionService positionService;
+    @Autowired
+    private FavoritesBusinesscardService favoritesBusinesscardService;
 
     @Override
     protected void saveBefore(BussinesscardEntity entity, Context context) throws AppException {
@@ -72,4 +77,21 @@ public class BussinesscardServiceImpl extends AbstractCRUDServiceImpl<Bussinessc
         }
     }
 
+    @Override
+    public BussinesscardEntity get(Long key, Context context) throws AppException {
+        BussinesscardEntity entity = this.dao.get(key);
+        if(entity!=null){
+            if(context!=null && context.getUser()!=null) {
+                FavoritesBusinesscardEntity favoritesBusinesscardEntity = favoritesBusinesscardService.selectOne(new FavoritesBusinesscardQuery().staffId(entity.getStaffId()).userId(context.getUser().getId()));
+                if(favoritesBusinesscardEntity!=null){
+                    entity.setFavoriteStatus(1);
+                }else {
+                    entity.setFavoriteStatus(0);
+                }
+            }else {
+                entity.setFavoriteStatus(0);
+            }
+        }
+        return entity;
+    }
 }
\ No newline at end of file

enterprise-manager/src/main/java/com/mortals/xhx/module/company/model/vo/CompanyVo.java

@@ -37,5 +37,4 @@ public class CompanyVo extends BaseEntityLong {
     //名片数量
     private Integer businessCardNums = 0;
 
-
 }
\ No newline at end of file

enterprise-manager/src/main/java/com/mortals/xhx/module/company/service/impl/CompanyServiceImpl.java

@@ -294,4 +294,22 @@ public class CompanyServiceImpl extends AbstractCRUDServiceImpl<CompanyDao, Comp
         homeStatInfo.setSendCardStaffList(staffList);
         return Rest.ok(homeStatInfo);
     }
+
+    @Override
+    public CompanyEntity get(Long key, Context context) throws AppException {
+        CompanyEntity entity = this.dao.get(key);
+        if(entity != null){
+            if(StringUtils.isNotEmpty(entity.getCompanyIntroduction())) {
+                String regex = "src=\"file";
+                String replacement;
+                if(domain.endsWith("/")){
+                    replacement = "src=\"" + domain + "file";
+                }else {
+                    replacement = "src=\"" + domain + "/file";
+                }
+                entity.setCompanyIntroduction(entity.getCompanyIntroduction().replaceAll(regex, replacement));
+            }
+        }
+        return entity;
+    }
 }
\ No newline at end of file

enterprise-manager/src/main/java/com/mortals/xhx/module/news/model/vo/NewsVo.java

@@ -27,6 +27,8 @@ public class NewsVo extends BaseEntityLong {
     private Integer upStatus;
     /**分享状态**/
     private Integer shareStatus;
+    /**收藏状态**/
+    private Integer favoriteStatus;
     /**
      * 头像地址
      */

enterprise-manager/src/main/java/com/mortals/xhx/module/news/service/impl/NewsServiceImpl.java

@@ -4,6 +4,9 @@ import com.mortals.framework.util.StringUtils;
 import com.mortals.xhx.base.system.user.model.UserEntity;
 import com.mortals.xhx.base.system.user.model.UserQuery;
 import com.mortals.xhx.base.system.user.service.UserService;
+import com.mortals.xhx.module.favorites.model.FavoritesNewsEntity;
+import com.mortals.xhx.module.favorites.model.FavoritesNewsQuery;
+import com.mortals.xhx.module.favorites.service.FavoritesNewsService;
 import com.mortals.xhx.module.news.model.*;
 import com.mortals.xhx.module.news.service.NewsRecordService;
 import com.mortals.xhx.module.news.service.NewsShareService;
@@ -44,6 +47,8 @@ public class NewsServiceImpl extends AbstractCRUDServiceImpl<NewsDao, NewsEntity
     private NewsUpService newsUpService;
     @Autowired
     private UserService userService;
+    @Autowired
+    private FavoritesNewsService favoritesNewsService;
 
     @Value("${domain.name:https://oa.xinhx.co}")
     private String domain;
@@ -132,6 +137,12 @@ public class NewsServiceImpl extends AbstractCRUDServiceImpl<NewsDao, NewsEntity
                     }else {
                         entity.setUpStatus(0);
                     }
+                    FavoritesNewsEntity favoritesNewsEntity = favoritesNewsService.selectOne(new FavoritesNewsQuery().newsId(key).userId(userEntity.getId()));
+                    if(favoritesNewsEntity!=null){
+                        entity.setFavoriteStatus(1);
+                    }else {
+                        entity.setFavoriteStatus(0);
+                    }
                 }else {
                     entity.setShareStatus(0);
                     entity.setUpStatus(0);

enterprise-manager/src/main/java/com/mortals/xhx/module/product/model/vo/ProductVo.java

@@ -23,6 +23,7 @@ public class ProductVo extends BaseEntityLong {
     private String companyId;
     //所属企业
     private String categoryId;
-
+    /**收藏状态**/
+    private Integer favoriteStatus;
 
 }
\ No newline at end of file

enterprise-manager/src/main/java/com/mortals/xhx/module/product/service/impl/ProductServiceImpl.java

@@ -12,6 +12,9 @@ import com.mortals.xhx.module.company.model.CompanyProductEntity;
 import com.mortals.xhx.module.company.model.CompanyProductQuery;
 import com.mortals.xhx.module.company.service.CompanyProductService;
 import com.mortals.xhx.module.company.service.CompanyService;
+import com.mortals.xhx.module.favorites.model.FavoritesProductEntity;
+import com.mortals.xhx.module.favorites.model.FavoritesProductQuery;
+import com.mortals.xhx.module.favorites.service.FavoritesProductService;
 import com.mortals.xhx.module.product.model.*;
 import com.mortals.xhx.module.product.service.ProductCategoryService;
 import org.apache.commons.collections4.CollectionUtils;
@@ -52,6 +55,8 @@ public class ProductServiceImpl extends AbstractCRUDCacheServiceImpl<ProductDao,
     private CategoryService categoryService;
     @Autowired
     private CompanyService companyService;
+    @Autowired
+    private FavoritesProductService favoritesProductService;
 
     @Value("${domain.name:https://oa.xinhx.co}")
     private String domain;
@@ -301,4 +306,32 @@ public class ProductServiceImpl extends AbstractCRUDCacheServiceImpl<ProductDao,
         productQuestionService.removeList(productQuestionlist, context);
         super.removeAfter(ids, context, result);
     }
+
+    @Override
+    public ProductEntity get(Long key, Context context) throws AppException {
+        ProductEntity entity = this.dao.get(key);
+        if(entity!=null) {
+            String regex = "src=\"file";
+            String replacement;
+            if (domain.endsWith("/")) {
+                replacement = "src=\"" + domain + "file";
+            } else {
+                replacement = "src=\"" + domain + "/file";
+            }
+            if(StringUtils.isNotEmpty(entity.getProductDetail())) {
+                entity.setProductDetail(entity.getProductDetail().replaceAll(regex, replacement));
+            }
+            if(context!=null && context.getUser()!=null) {
+                FavoritesProductEntity favoritesProductEntity = favoritesProductService.selectOne(new FavoritesProductQuery().productId(key).userId(context.getUser().getId()));
+                if(favoritesProductEntity!=null){
+                    entity.setFavoriteStatus(1);
+                }else {
+                    entity.setFavoriteStatus(0);
+                }
+            }else {
+                entity.setFavoriteStatus(0);
+            }
+        }
+        return entity;
+    }
 }
\ No newline at end of file