辅助事项增加字段

knowledge-base/src/main/java/com/mortals/xhx/module/site/model/vo/SiteMatterAssistVo.java

 package com.mortals.xhx.module.site.model.vo;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.site.model.SiteMatterAssistEntity;
+import lombok.Data;
+
 import java.util.ArrayList;
 import java.util.List;
 /**
@@ -9,6 +11,12 @@ import java.util.List;
 * @author zxfei
 * @date 2023-03-17
 */
+@Data
 public class SiteMatterAssistVo extends BaseEntityLong {
 
+    /** 材料数量 */
+    private Integer datumCount = 0;
+
+    /** 是否已添加收藏 */
+    private Integer isCollect = 0;
 }
\ No newline at end of file

knowledge-base/src/main/java/com/mortals/xhx/module/site/service/SiteMatterAssistService.java

@@ -10,5 +10,9 @@ import com.mortals.xhx.module.site.model.SiteMatterAssistEntity;
 * @date 2023-03-17
 */
 public interface SiteMatterAssistService extends ICRUDService<SiteMatterAssistEntity,Long>{
-
+    /**
+     * 增加浏览次数
+     * @param id
+     */
+    void addViewsCount(Long id);
 }
\ No newline at end of file

knowledge-base/src/main/java/com/mortals/xhx/module/site/service/impl/SiteMatterAssistServiceImpl.java

 package com.mortals.xhx.module.site.service.impl;
+import com.mortals.framework.model.PageInfo;
+import com.mortals.framework.util.DataUtil;
+import com.mortals.xhx.module.matter.model.MatterDatumEntity;
+import com.mortals.xhx.module.matter.model.MatterDatumQuery;
+import com.mortals.xhx.module.matter.service.MatterDatumService;
+import com.mortals.xhx.module.site.model.SiteMatterEntity;
+import com.mortals.xhx.module.user.model.UserCollectEntity;
+import com.mortals.xhx.module.user.model.UserCollectQuery;
+import com.mortals.xhx.module.user.service.UserCollectService;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.framework.exception.AppException;
@@ -6,6 +17,11 @@ import com.mortals.framework.model.Context;
 import com.mortals.xhx.module.site.dao.SiteMatterAssistDao;
 import com.mortals.xhx.module.site.model.SiteMatterAssistEntity;
 import com.mortals.xhx.module.site.service.SiteMatterAssistService;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
 * SiteMatterAssistService
 * 辅助接件事项 service实现
@@ -16,4 +32,77 @@ import com.mortals.xhx.module.site.service.SiteMatterAssistService;
 @Service("siteMatterAssistService")
 public class SiteMatterAssistServiceImpl extends AbstractCRUDServiceImpl<SiteMatterAssistDao, SiteMatterAssistEntity, Long> implements SiteMatterAssistService {
 
+    @Autowired
+    private MatterDatumService matterDatumService;
+    @Autowired
+    private UserCollectService userCollectService;
+
+    @Override
+    protected void findAfter(SiteMatterAssistEntity params, PageInfo pageInfo, Context context, List<SiteMatterAssistEntity> list) throws AppException {
+        list.stream().peek(item->{
+            List<MatterDatumEntity> matterDatumFileEntities = matterDatumService.find(new MatterDatumQuery().matterId(item.getMatterId()));
+            if(CollectionUtils.isNotEmpty(matterDatumFileEntities)) {
+                item.setDatumCount(matterDatumFileEntities.size());
+            }else {
+                item.setDatumCount(0);
+            }
+        }).count();
+        if(context!=null&&context.getUser()!=null){
+            List<UserCollectEntity> userCollectEntities = userCollectService.find(new UserCollectQuery().userId(context.getUser().getId()).collectType(1));
+            Map<Long,Long> matterMap = new HashMap<>();
+            if(CollectionUtils.isNotEmpty(userCollectEntities)){
+                for(UserCollectEntity userCollectEntity:userCollectEntities){
+                    Long matterId = DataUtil.converStr2Long(userCollectEntity.getBusinessId(),0);
+                    matterMap.put(matterId,matterId);
+                }
+            }else {
+                matterMap.put(0l,0l);
+            }
+            list.stream().peek(item->{
+                if(matterMap.containsKey(item.getMatterId())){
+                    item.setIsCollect(1);
+                }
+            }).count();
+        }
+        super.findAfter(params, context, list);
+    }
+
+    @Override
+    protected void findAfter(SiteMatterAssistEntity params, Context context, List<SiteMatterAssistEntity> list) throws AppException {
+        list.stream().peek(item->{
+            List<MatterDatumEntity> matterDatumFileEntities = matterDatumService.find(new MatterDatumQuery().matterId(item.getMatterId()));
+            if(CollectionUtils.isNotEmpty(matterDatumFileEntities)) {
+                item.setDatumCount(matterDatumFileEntities.size());
+            }else {
+                item.setDatumCount(0);
+            }
+        }).count();
+        if(context!=null&&context.getUser()!=null){
+            List<UserCollectEntity> userCollectEntities = userCollectService.find(new UserCollectQuery().userId(context.getUser().getId()).collectType(1));
+            Map<Long,Long> matterMap = new HashMap<>();
+            if(CollectionUtils.isNotEmpty(userCollectEntities)){
+                for(UserCollectEntity userCollectEntity:userCollectEntities){
+                    Long matterId = DataUtil.converStr2Long(userCollectEntity.getBusinessId(),0);
+                    matterMap.put(matterId,matterId);
+                }
+            }else {
+                matterMap.put(0l,0l);
+            }
+            list.stream().peek(item->{
+                if(matterMap.containsKey(item.getMatterId())){
+                    item.setIsCollect(1);
+                }
+            }).count();
+        }
+        super.findAfter(params, context, list);
+    }
+
+    @Override
+    public void addViewsCount(Long id) {
+        Map<String,Object> data = new HashMap<>();
+        data.put("viewsCountIncrement",1);
+        Map<String,Object> condition = new HashMap<>();
+        condition.put("id",id);
+        dao.update(data,condition);
+    }
 }
\ No newline at end of file

knowledge-base/src/main/java/com/mortals/xhx/module/site/web/SiteMatterAssistController.java

 package com.mortals.xhx.module.site.web;
+import com.mortals.framework.exception.AppException;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.module.site.model.SiteMatterEntity;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -46,5 +48,17 @@ public class SiteMatterAssistController extends BaseCRUDJsonBodyMappingControlle
         super.init(model, context);
     }
 
+    @Override
+    protected void doListBefore(SiteMatterAssistEntity query, Map<String, Object> model, Context context) throws AppException {
+        Map<String,String> orderMap = new HashMap<>();
+        orderMap.put("viewsCount","DESC");
+        query.setOrderCols(orderMap);
+        super.doListBefore(query,model,context);
+    }
 
+    @Override
+    protected int viewAfter(Long id, Map<String, Object> model, SiteMatterAssistEntity entity, Context context) throws AppException {
+        this.service.addViewsCount(id);
+        return 1;
+    }
 }
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/single/model/vo/SingleMatterVo.java

 package com.mortals.xhx.module.single.model.vo;
+
 import com.mortals.framework.model.BaseEntityLong;
-import com.mortals.xhx.module.single.model.SingleMatterEntity;
-import java.util.ArrayList;
-import java.util.List;
+import lombok.Data;
 /**
 * 单事项视图对象
 *
 * @author zxfei
 * @date 2023-03-21
 */
+@Data
 public class SingleMatterVo extends BaseEntityLong {
+    /** 材料数量 */
+    private Integer datumCount = 0;
 
 }
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/single/service/impl/SingleMatterServiceImpl.java

 package com.mortals.xhx.module.single.service.impl;
+import com.mortals.framework.model.PageInfo;
+import com.mortals.xhx.module.matter.model.MatterDatumEntity;
+import com.mortals.xhx.module.matter.model.MatterDatumQuery;
+import com.mortals.xhx.module.matter.service.MatterDatumService;
+import com.mortals.xhx.module.site.model.SiteMatterEntity;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.framework.exception.AppException;
@@ -8,6 +15,7 @@ import com.mortals.xhx.module.single.model.SingleMatterEntity;
 import com.mortals.xhx.module.single.service.SingleMatterService;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -20,6 +28,35 @@ import java.util.Map;
 @Service("singleMatterService")
 public class SingleMatterServiceImpl extends AbstractCRUDServiceImpl<SingleMatterDao, SingleMatterEntity, Long> implements SingleMatterService {
 
+    @Autowired
+    private MatterDatumService matterDatumService;
+
+    @Override
+    protected void findAfter(SingleMatterEntity params, PageInfo pageInfo, Context context, List<SingleMatterEntity> list) throws AppException {
+        list.stream().peek(item->{
+            List<MatterDatumEntity> matterDatumFileEntities = matterDatumService.find(new MatterDatumQuery().matterId(item.getMatterId()));
+            if(CollectionUtils.isNotEmpty(matterDatumFileEntities)) {
+                item.setDatumCount(matterDatumFileEntities.size());
+            }else {
+                item.setDatumCount(0);
+            }
+        }).count();
+        super.findAfter(params, context, list);
+    }
+
+    @Override
+    protected void findAfter(SingleMatterEntity params, Context context, List<SingleMatterEntity> list) throws AppException {
+        list.stream().peek(item->{
+            List<MatterDatumEntity> matterDatumFileEntities = matterDatumService.find(new MatterDatumQuery().matterId(item.getMatterId()));
+            if(CollectionUtils.isNotEmpty(matterDatumFileEntities)) {
+                item.setDatumCount(matterDatumFileEntities.size());
+            }else {
+                item.setDatumCount(0);
+            }
+        }).count();
+        super.findAfter(params, context, list);
+    }
+
     @Override
     public void addViewsCount(Long id) {
         Map<String,Object> data = new HashMap<>();