添加app首页待办待阅数量、以及子应用的数量接口

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/index/AppIndexAppNumVo.java

@@ -0,0 +1,18 @@
+package com.yxt.anrui.portal.api.index;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/8/17 14:36
+ * @Description
+ */
+@Data
+public class AppIndexAppNumVo implements Vo {
+    private static final long serialVersionUID = 8714208618340144189L;
+
+    private String appSid;
+
+    private String cornerNum;
+}

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/index/AppIndexFeign.java

@@ -4,9 +4,11 @@ import com.yxt.common.core.result.ResultBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
 
-import javax.validation.Valid;
+import java.util.List;
 
 @Api(tags = "app首页")
 @FeignClient(
@@ -21,4 +23,14 @@ public interface AppIndexFeign {
     @GetMapping("/index")
     public ResultBean<AppIndexVo> index(@RequestParam("userSid") String userSid);
 
+    @ApiOperation(value = "App首页待办待阅的数量")
+    @ResponseBody
+    @GetMapping("/homeWorkBadge")
+    ResultBean<AppIndexWorkNumVo> selectHomeWorkNum(@RequestParam("userSid") String userSid);
+
+    @ApiOperation(value = "App首页子应用的待办数量")
+    @ResponseBody
+    @GetMapping("/homeAppBadge")
+    ResultBean<List<AppIndexAppNumVo>> selectAppNum(@RequestParam("userSid")String userSid);
+
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/index/AppIndexFeignFallBack.java

@@ -3,7 +3,7 @@ package com.yxt.anrui.portal.api.index;
 import com.yxt.common.core.result.ResultBean;
 import org.springframework.stereotype.Component;
 
-import javax.validation.Valid;
+import java.util.List;
 
 /**
  * @Description
@@ -17,4 +17,14 @@ public class AppIndexFeignFallBack implements AppIndexFeign {
     public ResultBean<AppIndexVo> index(String userSid) {
         return new ResultBean<AppIndexVo>().success().setMsg("网站维护，请稍后再试");
     }
+
+    @Override
+    public ResultBean<AppIndexWorkNumVo> selectHomeWorkNum(String userSid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<AppIndexAppNumVo>> selectAppNum(String userSid) {
+        return null;
+    }
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/index/AppIndexWorkNumVo.java

@@ -0,0 +1,21 @@
+package com.yxt.anrui.portal.api.index;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/8/17 14:06
+ * @Description
+ */
+@Data
+public class AppIndexWorkNumVo implements Vo {
+    private static final long serialVersionUID = 6450324108325744150L;
+
+    @ApiModelProperty(value = "待阅数量")
+    private int notReadNum;
+
+    @ApiModelProperty(value = "待办数量")
+    private int notWorkNum;
+}

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/appsubsetversion/AppSubsetVersionMapper.java

@@ -3,6 +3,7 @@ package com.yxt.anrui.portal.biz.appsubsetversion;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yxt.anrui.portal.api.appsubsetversion.AppSubsetVersion;
 import com.yxt.anrui.portal.api.appsubsetversion.AppSubsetVersionVo;
+import com.yxt.anrui.portal.api.index.AppIndexAppNumVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -36,4 +37,6 @@ public interface AppSubsetVersionMapper extends BaseMapper<AppSubsetVersion> {
 	AppSubsetVersionVo getLastByAppSid(@Param("appSid") String appSid);
 
 	AppSubsetVersionVo selectByAppSidOne(String s);
+
+	List<AppIndexAppNumVo> selectAppNum(String linkSid);
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/appsubsetversion/AppSubsetVersionMapper.xml

@@ -39,4 +39,12 @@
         ORDER BY createTime DESC
         LIMIT 1
     </select>
+
+    <select id="selectAppNum" resultType="com.yxt.anrui.portal.api.index.AppIndexAppNumVo">
+        select appSid
+        from app_subset_version
+        where linkSid = #{linkSid}
+          AND id IN (SELECT MAX(id) FROM app_subset_version GROUP BY appSid)
+        ORDER BY sortNo ASC
+    </select>
 </mapper>

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/appsubsetversion/AppSubsetVersionService.java

@@ -2,6 +2,7 @@ package com.yxt.anrui.portal.biz.appsubsetversion;
 
 import com.yxt.anrui.portal.api.appsubsetversion.AppSubsetVersion;
 import com.yxt.anrui.portal.api.appsubsetversion.AppSubsetVersionVo;
+import com.yxt.anrui.portal.api.index.AppIndexAppNumVo;
 import com.yxt.common.base.service.MybatisBaseService;
 import org.springframework.stereotype.Service;
 
@@ -42,4 +43,8 @@ public class AppSubsetVersionService extends MybatisBaseService<AppSubsetVersion
 	public AppSubsetVersionVo selectByAppSidOne(String s) {
 		return baseMapper.selectByAppSidOne(s);
 	}
+
+	public List<AppIndexAppNumVo> selectAppNum(String linkSid) {
+		return baseMapper.selectAppNum(linkSid);
+	}
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexRest.java

@@ -4,8 +4,10 @@ import com.yxt.anrui.portal.api.appsubsetversion.AppSubsetVersionVo;
 import com.yxt.anrui.portal.api.banner.BannerVo;
 import com.yxt.anrui.portal.api.formnotice.FormNoticeQuery;
 import com.yxt.anrui.portal.api.formnotice.FormNoticeVo;
+import com.yxt.anrui.portal.api.index.AppIndexAppNumVo;
 import com.yxt.anrui.portal.api.index.AppIndexFeign;
 import com.yxt.anrui.portal.api.index.AppIndexVo;
+import com.yxt.anrui.portal.api.index.AppIndexWorkNumVo;
 import com.yxt.anrui.portal.biz.appsubsetversion.AppSubsetVersionService;
 import com.yxt.anrui.portal.biz.banner.BannerService;
 import com.yxt.anrui.portal.biz.flow.FlowableService;
@@ -66,9 +68,11 @@ public class AppIndexRest implements AppIndexFeign {
         Map<String, Object> map = new HashMap<String, Object>();
         appVo.setUserSid(userSid);
         // 待办数量
-        appVo.setNotWorkNum(flowableService.getTodoNum(userSid).getData());
+//        appVo.setNotWorkNum(flowableService.getTodoNum(userSid).getData());
+        appVo.setNotWorkNum(0);
         // 待阅数量
-        appVo.setNotReadNum(messageListFeign.selectUnReadCount("", userSid).getData());
+//        appVo.setNotReadNum(messageListFeign.selectUnReadCount("", userSid).getData());
+        appVo.setNotReadNum(0);
 
         // 通知公告列表
         FormNoticeQuery formNoticeQuery = new FormNoticeQuery();
@@ -85,7 +89,7 @@ public class AppIndexRest implements AppIndexFeign {
         String path = fileUploadComponent.getUrlPrefix();
         List<AppSubsetVersionVo> subsetVersionVoList = appSubsetVersionService.selectVersionList(linkSid, path);
         subsetVersionVoList.stream().forEach(item -> {
-            if ("98ff0724-5df4-4fc7-ab6d-3996e7706acd".equals(item.getAppSid())) {
+            /*if ("98ff0724-5df4-4fc7-ab6d-3996e7706acd".equals(item.getAppSid())) {
                 //供应链
                 ResultBean<AppScmBaseInfoVo> indexCountVo = appScmBaseInfoFeign.getToDoNum(userSid);
                 int count = 0;
@@ -107,10 +111,12 @@ public class AppIndexRest implements AppIndexFeign {
                         count = count + Integer.valueOf(appScmBaseInfoVo.getInventoryCarNum()).intValue();
                     }
                 }
-                item.setCornerNum(String.valueOf(count));
+//                item.setCornerNum(String.valueOf(count));
+                item.setCornerNum("");
             } else {
-                item.setCornerNum("3");
-            }
+                item.setCornerNum("");
+            }*/
+            item.setCornerNum("");
 
         });
         map.put("apps", subsetVersionVoList);
@@ -128,4 +134,52 @@ public class AppIndexRest implements AppIndexFeign {
         appVo.setMapExtra(map);
         return rb.setData(appVo).success();
     }
+
+    @Override
+    public ResultBean<AppIndexWorkNumVo> selectHomeWorkNum(String userSid) {
+        ResultBean<AppIndexWorkNumVo> rb = ResultBean.fireFail();
+        AppIndexWorkNumVo vo = new AppIndexWorkNumVo();
+        // 待办数量
+        vo.setNotWorkNum(flowableService.getTodoNum(userSid).getData());
+        // 待阅数量
+        vo.setNotReadNum(messageListFeign.selectUnReadCount("", userSid).getData());
+        return rb.success().setData(vo);
+    }
+
+    @Override
+    public ResultBean<List<AppIndexAppNumVo>> selectAppNum(String userSid) {
+        ResultBean<List<AppIndexAppNumVo>> rb = ResultBean.fireFail();
+        String linkSid = LINKSID;
+        List<AppIndexAppNumVo> appIndexAppNumVos = appSubsetVersionService.selectAppNum(linkSid);
+        appIndexAppNumVos.stream().forEach(item -> {
+            if ("98ff0724-5df4-4fc7-ab6d-3996e7706acd".equals(item.getAppSid())) {
+                //供应链
+                ResultBean<AppScmBaseInfoVo> indexCountVo = appScmBaseInfoFeign.getToDoNum(userSid);
+                int count = 0;
+                if (indexCountVo.getSuccess()) {
+                    AppScmBaseInfoVo appScmBaseInfoVo = indexCountVo.getData();
+                    if (StringUtils.isNotBlank(appScmBaseInfoVo.getInspectedCarNum())) {
+                        count = count + Integer.valueOf(appScmBaseInfoVo.getInspectedCarNum()).intValue();
+                    }
+                    if (StringUtils.isNotBlank(appScmBaseInfoVo.getInspectinoCarNum())) {
+                        count = count + Integer.valueOf(appScmBaseInfoVo.getInspectinoCarNum()).intValue();
+                    }
+                    if (StringUtils.isNotBlank(appScmBaseInfoVo.getMoveCarNum())) {
+                        count = count + Integer.valueOf(appScmBaseInfoVo.getMoveCarNum()).intValue();
+                    }
+                    if (StringUtils.isNotBlank(appScmBaseInfoVo.getStorageCarNum())) {
+                        count = count + Integer.valueOf(appScmBaseInfoVo.getStorageCarNum()).intValue();
+                    }
+                    if (StringUtils.isNotBlank(appScmBaseInfoVo.getInventoryCarNum())) {
+                        count = count + Integer.valueOf(appScmBaseInfoVo.getInventoryCarNum()).intValue();
+                    }
+                }
+                item.setCornerNum(String.valueOf(count));
+            } else {
+                item.setCornerNum("");
+            }
+
+        });
+        return rb.success().setData(appIndexAppNumVos);
+    }
 }