diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java index 6e32aac329..76db12ec30 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java @@ -271,9 +271,9 @@ public class FlowableRest implements FlowableFeign { return rb.setMsg("任务不存在"); } String assignee = task.getAssignee(); - /* if(StringUtils.isNotBlank(assignee)&& assignee.indexOf(userSid)<0){ + if(StringUtils.isNotBlank(assignee)&& assignee.indexOf(userSid)<0){ return rb.setMsg("当前用户不是环节的待办人,不能进行办理操作!"); - }*/ + } String nodeState = ""; String taskDefKey = ""; vo.setSid(businessSid); diff --git a/anrui-portal/anrui-portal-biz/pom.xml b/anrui-portal/anrui-portal-biz/pom.xml index 1a9bbf758c..ff00d9276c 100644 --- a/anrui-portal/anrui-portal-biz/pom.xml +++ b/anrui-portal/anrui-portal-biz/pom.xml @@ -15,6 +15,11 @@ 0.0.1 + + anrui-terminal-api + com.yxt.anrui + 0.0.1 + com.yxt yxt-common-base diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/PortalApplication.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/PortalApplication.java index 95b7f3cf5f..442ec5bc83 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/PortalApplication.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/PortalApplication.java @@ -14,7 +14,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients; "com.yxt.anrui.portal" }) @EnableDiscoveryClient -@EnableFeignClients(basePackages = {"com.yxt.anrui.crm","com.yxt.anrui.flowable","com.yxt.messagecenter"}) +@EnableFeignClients(basePackages = {"com.yxt.anrui.crm","com.yxt.anrui.flowable","com.yxt.messagecenter","com.yxt.anrui.terminal"}) public class PortalApplication { public static void main(String[] args) { diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexRest.java index 19c21ca02e..2004d7922b 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexRest.java @@ -11,8 +11,11 @@ import com.yxt.anrui.portal.biz.banner.BannerService; import com.yxt.anrui.portal.biz.flow.FlowableService; import com.yxt.anrui.portal.biz.formnotice.FormNoticeService; import com.yxt.anrui.portal.biz.sysuser.SysUserService; +import com.yxt.anrui.terminal.api.supplychain.baseInfo.AppScmBaseInfoFeign; +import com.yxt.anrui.terminal.api.supplychain.baseInfo.AppScmBaseInfoVo; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.utils.DateUtils; +import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.messagecenter.api.messagelist.MessageListFeign; @@ -53,6 +56,9 @@ public class AppIndexRest implements AppIndexFeign { private String LINKSID = "147694bb-c765-4426-8f67-d19a66585f31"; + @Autowired + private AppScmBaseInfoFeign appScmBaseInfoFeign; + @Override public ResultBean index(String userSid) { ResultBean rb = ResultBean.fireFail(); @@ -69,12 +75,6 @@ public class AppIndexRest implements AppIndexFeign { PagerQuery formNoticeQueryPage = new PagerQuery<>(); formNoticeQueryPage.setParams(formNoticeQuery); formNoticeQueryPage.getParams().setClosingDate(DateUtils.dateConvertStr(new Date())); -// SysUserVo sysUserVo = sysUserService.fetchBySidVo(query.getUserSid()); -// if (null != sysUserVo) { -// formNoticeQueryPage.getParams().setCreateOrgSid(sysUserVo.getOrganizationSid()); -// }else { -// formNoticeQueryPage.getParams().setCreateOrgSid("-1"); -// } //取前6条 formNoticeQueryPage.setSize(6); List formNoticeVoList = formNoticeService.pageList(formNoticeQueryPage).getRecords(); @@ -85,7 +85,33 @@ public class AppIndexRest implements AppIndexFeign { String path = fileUploadComponent.getUrlPrefix(); List subsetVersionVoList = appSubsetVersionService.selectVersionList(linkSid, path); subsetVersionVoList.stream().forEach(item -> { - item.setCornerNum("3"); + if ("98ff0724-5df4-4fc7-ab6d-3996e7706acd".equals(item.getAppSid())) { + //供应链 + ResultBean 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("3"); + } + }); map.put("apps", subsetVersionVoList); diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/baseInfo/AppScmBaseInfoFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/baseInfo/AppScmBaseInfoFeign.java index 286c23e13a..d104680f13 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/baseInfo/AppScmBaseInfoFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/baseInfo/AppScmBaseInfoFeign.java @@ -25,14 +25,13 @@ *********************************************************/ package com.yxt.anrui.terminal.api.supplychain.baseInfo; -import com.yxt.anrui.terminal.api.supplychain.carInspected.AppScmVehinspectItemFeignFallback; -import com.yxt.anrui.terminal.api.supplychain.carInspected.ItemDto; -import com.yxt.anrui.terminal.api.supplychain.carInspected.ItemInfoVo; 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.PathVariable; +import org.springframework.web.bind.annotation.ResponseBody; /** * Project: anrui-scm(供应链)
@@ -49,10 +48,10 @@ import org.springframework.web.bind.annotation.*; */ @Api(tags = "供应链待阅数量") @FeignClient( - contextId = "anrui-terminal-AppScmVehinspectItem", + contextId = "anrui-terminal-AppScmBaseInfo", name = "anrui-terminal", path = "supplychain/v1/baseInfo", - fallback = AppScmVehinspectItemFeignFallback.class) + fallback = AppScmBaseInfoFeignFallback.class) public interface AppScmBaseInfoFeign { diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java index 2f04e2bd5c..4706d1a84d 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java @@ -4,11 +4,13 @@ package com.yxt.anrui.terminal; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.cloud.openfeign.EnableFeignClients; /** * @author dimengzhe */ +@EnableDiscoveryClient @SpringBootApplication(scanBasePackages = { "com.yxt.anrui.terminal", "com.yxt.common.base.config"