diff --git a/mes-dependencies/.flattened-pom.xml b/mes-dependencies/.flattened-pom.xml deleted file mode 100644 index c3f90d91..00000000 --- a/mes-dependencies/.flattened-pom.xml +++ /dev/null @@ -1,590 +0,0 @@ - - - 4.0.0 - com.chanko.yunxi - mes-dependencies - 2.0.0-jdk8-snapshot - pom - ${project.artifactId} - 基础 bom 文件，管理整个项目的依赖版本 - https://github.com/YunaiV/ruoyi-vue-pro - - 1.4.7 - 7.2.11.RELEASE - 2.3 - 2.7.18 - 2.7.0 - 2.2.5 - 3.5.0 - 5.1.0 - 1.18.30 - 2.12.2 - 1.16.2 - 1.2.83 - 3.10.0 - 5.8.22 - 1.7.1 - 2.14.2 - 6.8.0 - 3.18.0 - 4.11.0 - 3.5.4 - 1.2.20 - 2.11.0 - 3.3.2 - 1.6.15 - 8.5.6 - 4.11.0 - 1.0.7 - 3.1.880 - 8.1.3.62 - 2.2.3 - 2.7.0 - 0.1.55 - 4.5.7.B - 4.6.4 - 1.0.10 - 3.6.1 - 2.5 - 2.2.9 - 4.3.0 - 2.7.11 - 1.5.5.Final - 1.6.6 - 2.2.1 - 1.0.8 - 1.0.5 - 32.1.3-jre - 8.12.0 - 0.33.0 - 3.5.4 - 1.5.0 - 2.0.0-jdk8-snapshot - - - - - org.springframework.boot - spring-boot-dependencies - ${spring.boot.version} - pom - import - - - com.chanko.yunxi - mes-spring-boot-starter-banner - 2.0.0-jdk8-snapshot - - - com.chanko.yunxi - mes-spring-boot-starter-biz-operatelog - 2.0.0-jdk8-snapshot - - - com.chanko.yunxi - mes-spring-boot-starter-biz-dict - 2.0.0-jdk8-snapshot - - - com.chanko.yunxi - mes-spring-boot-starter-biz-sms - 2.0.0-jdk8-snapshot - - - com.chanko.yunxi - mes-spring-boot-starter-biz-pay - 2.0.0-jdk8-snapshot - - - com.chanko.yunxi - mes-spring-boot-starter-biz-tenant - 2.0.0-jdk8-snapshot - - - com.chanko.yunxi - mes-spring-boot-starter-biz-data-permission - 2.0.0-jdk8-snapshot - - - com.chanko.yunxi - mes-spring-boot-starter-biz-social - 2.0.0-jdk8-snapshot - - - com.chanko.yunxi - mes-spring-boot-starter-biz-error-code - 2.0.0-jdk8-snapshot - - - com.chanko.yunxi - mes-spring-boot-starter-biz-ip - 2.0.0-jdk8-snapshot - - - com.chanko.yunxi - mes-spring-boot-starter-captcha - 2.0.0-jdk8-snapshot - - - com.chanko.yunxi - mes-spring-boot-starter-desensitize - 2.0.0-jdk8-snapshot - - - org.springframework.boot - spring-boot-configuration-processor - ${spring.boot.version} - - - com.chanko.yunxi - mes-spring-boot-starter-web - 2.0.0-jdk8-snapshot - - - com.chanko.yunxi - mes-spring-boot-starter-security - 2.0.0-jdk8-snapshot - - - com.chanko.yunxi - mes-spring-boot-starter-websocket - 2.0.0-jdk8-snapshot - - - com.github.xiaoymin - knife4j-openapi3-spring-boot-starter - ${knife4j.version} - - - org.springdoc - springdoc-openapi-ui - ${springdoc.version} - - - com.chanko.yunxi - mes-spring-boot-starter-mybatis - 2.0.0-jdk8-snapshot - - - com.alibaba - druid-spring-boot-starter - ${druid.version} - - - com.baomidou - mybatis-plus-boot-starter - ${mybatis-plus.version} - - - com.baomidou - mybatis-plus-generator - ${mybatis-plus-generator.version} - - - com.baomidou - dynamic-datasource-spring-boot-starter - ${dynamic-datasource.version} - - - com.github.yulichang - mybatis-plus-join-boot-starter - ${mybatis-plus-join.version} - - - com.chanko.yunxi - mes-spring-boot-starter-redis - 2.0.0-jdk8-snapshot - - - org.redisson - redisson-spring-boot-starter - ${redisson.version} - - - org.springframework.boot - spring-boot-starter-actuator - - - - - com.dameng - DmJdbcDriver18 - ${dm8.jdbc.version} - - - com.chanko.yunxi - mes-spring-boot-starter-job - 2.0.0-jdk8-snapshot - - - com.chanko.yunxi - mes-spring-boot-starter-mq - 2.0.0-jdk8-snapshot - - - org.apache.rocketmq - rocketmq-spring-boot-starter - ${rocketmq-spring.version} - - - com.chanko.yunxi - mes-spring-boot-starter-protection - 2.0.0-jdk8-snapshot - - - com.baomidou - lock4j-redisson-spring-boot-starter - ${lock4j.version} - - - org.redisson - redisson-spring-boot-starter - - - - - io.github.resilience4j - resilience4j-ratelimiter - ${resilience4j.version} - - - io.github.resilience4j - resilience4j-spring-boot2 - ${resilience4j.version} - - - com.chanko.yunxi - mes-spring-boot-starter-monitor - 2.0.0-jdk8-snapshot - - - org.apache.skywalking - apm-toolkit-trace - ${skywalking.version} - - - org.apache.skywalking - apm-toolkit-logback-1.x - ${skywalking.version} - - - org.apache.skywalking - apm-toolkit-opentracing - ${skywalking.version} - - - io.opentracing - opentracing-api - ${opentracing.version} - - - io.opentracing - opentracing-util - ${opentracing.version} - - - io.opentracing - opentracing-noop - ${opentracing.version} - - - de.codecentric - spring-boot-admin-starter-server - ${spring-boot-admin.version} - - - de.codecentric - spring-boot-admin-server-cloud - - - - - de.codecentric - spring-boot-admin-starter-client - ${spring-boot-admin.version} - - - org.mockito - mockito-inline - ${mockito-inline.version} - - - org.springframework.boot - spring-boot-starter-test - ${spring.boot.version} - - - org.ow2.asm - asm - - - org.mockito - mockito-core - - - - - com.github.fppt - jedis-mock - ${jedis-mock.version} - - - uk.co.jemos.podam - podam - ${podam.version} - - - com.chanko.yunxi - mes-spring-boot-starter-flowable - 2.0.0-jdk8-snapshot - - - org.flowable - flowable-spring-boot-starter-process - ${flowable.version} - - - org.flowable - flowable-spring-boot-starter-actuator - ${flowable.version} - - - com.chanko.yunxi - mes-common - 2.0.0-jdk8-snapshot - - - com.chanko.yunxi - mes-spring-boot-starter-excel - 2.0.0-jdk8-snapshot - - - org.projectlombok - lombok - ${lombok.version} - - - org.mapstruct - mapstruct - ${mapstruct.version} - - - org.mapstruct - mapstruct-jdk8 - ${mapstruct.version} - - - org.mapstruct - mapstruct-processor - ${mapstruct.version} - - - cn.hutool - hutool-all - ${hutool.version} - - - com.alibaba - easyexcel - ${easyexcel.verion} - - - commons-io - commons-io - ${commons-io.version} - - - org.apache.tika - tika-core - ${tika-core.version} - - - org.apache.velocity - velocity-engine-core - ${velocity.version} - - - com.alibaba - fastjson - ${fastjson.version} - - - cn.smallbun.screw - screw-core - ${screw.version} - - - org.freemarker - freemarker - - - com.alibaba - fastjson - - - - - com.google.guava - guava - ${guava.version} - - - com.google.inject - guice - ${guice.version} - - - com.alibaba - transmittable-thread-local - ${transmittable-thread-local.version} - - - commons-net - commons-net - ${commons-net.version} - - - com.jcraft - jsch - ${jsch.version} - - - com.xingyuv - spring-boot-starter-captcha-plus - ${captcha-plus.version} - - - org.lionsoul - ip2region - ${ip2region.version} - - - org.jsoup - jsoup - ${jsoup.version} - - - com.squareup.okio - okio - ${okio.version} - - - com.squareup.okhttp3 - okhttp - ${okhttp3.version} - - - com.chanko.yunxi - mes-spring-boot-starter-file - 2.0.0-jdk8-snapshot - - - io.minio - minio - ${minio.version} - - - com.aliyun - aliyun-java-sdk-core - ${aliyun-java-sdk-core.version} - - - io.opentracing - opentracing-api - - - io.opentracing - opentracing-util - - - - - com.aliyun - aliyun-java-sdk-dysmsapi - ${aliyun-java-sdk-dysmsapi.version} - - - com.tencentcloudapi - tencentcloud-sdk-java-sms - ${tencentcloud-sdk-java.version} - - - com.xingyuv - spring-boot-starter-justauth - ${justauth.version} - - - cn.hutool - hutool-core - - - - - com.github.binarywang - weixin-java-pay - ${weixin-java.version} - - - com.github.binarywang - wx-java-mp-spring-boot-starter - ${weixin-java.version} - - - com.github.binarywang - wx-java-miniapp-spring-boot-starter - ${weixin-java.version} - - - org.jeecgframework.jimureport - jimureport-spring-boot-starter - ${jimureport.version} - - - com.alibaba - druid - - - - - xerces - xercesImpl - ${xercesImpl.version} - - - com.bstek.ureport - ureport2-console - ${ureport2.version} - - - - - - - org.codehaus.mojo - flatten-maven-plugin - ${flatten-maven-plugin.version} - - - flatten - process-resources - - flatten - - - - flatten.clean - clean - - clean - - - - - resolveCiFriendliesOnly - true - - - - - diff --git a/mes-framework/.flattened-pom.xml b/mes-framework/.flattened-pom.xml deleted file mode 100644 index cc08197c..00000000 --- a/mes-framework/.flattened-pom.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - 4.0.0 - - com.chanko.yunxi - mes - 2.0.0-jdk8-snapshot - - com.chanko.yunxi - mes-framework - 2.0.0-jdk8-snapshot - pom - 该包是技术组件，每个子包，代表一个组件。每个组件包括两部分： - 1. core 包：是该组件的核心封装 - 2. config 包：是该组件基于 Spring 的配置 - - 技术组件，也分成两类： - 1. 框架组件：和我们熟悉的 MyBatis、Redis 等等的拓展 - 2. 业务组件：和业务相关的组件的封装，例如说数据字典、操作日志等等。 - 如果是业务组件，Maven 名字会包含 biz - https://github.com/YunaiV/ruoyi-vue-pro - - mes-common - mes-spring-boot-starter-banner - mes-spring-boot-starter-mybatis - mes-spring-boot-starter-redis - mes-spring-boot-starter-web - mes-spring-boot-starter-security - mes-spring-boot-starter-file - mes-spring-boot-starter-monitor - mes-spring-boot-starter-protection - mes-spring-boot-starter-job - mes-spring-boot-starter-mq - mes-spring-boot-starter-excel - mes-spring-boot-starter-biz-operatelog - mes-spring-boot-starter-biz-dict - mes-spring-boot-starter-biz-sms - mes-spring-boot-starter-biz-tenant - mes-spring-boot-starter-biz-data-permission - mes-spring-boot-starter-biz-error-code - mes-spring-boot-starter-biz-ip - mes-spring-boot-starter-captcha - mes-spring-boot-starter-websocket - mes-spring-boot-starter-desensitize - - diff --git a/mes-framework/mes-common/.flattened-pom.xml b/mes-framework/mes-common/.flattened-pom.xml deleted file mode 100644 index b7763a17..00000000 --- a/mes-framework/mes-common/.flattened-pom.xml +++ /dev/null @@ -1,121 +0,0 @@ - - - 4.0.0 - - com.chanko.yunxi - mes-framework - 2.0.0-jdk8-snapshot - - com.chanko.yunxi - mes-common - 2.0.0-jdk8-snapshot - ${project.artifactId} - 定义基础 pojo 类、枚举、工具类等等 - https://github.com/YunaiV/ruoyi-vue-pro - - - org.springframework - spring-core - provided - - - org.springframework - spring-expression - provided - - - org.springframework - spring-aop - provided - - - org.aspectj - aspectjweaver - provided - - - org.springframework.boot - spring-boot-configuration-processor - true - - - org.springframework - spring-web - provided - - - jakarta.servlet - jakarta.servlet-api - provided - - - org.springdoc - springdoc-openapi-ui - provided - - - org.apache.skywalking - apm-toolkit-trace - - - org.projectlombok - lombok - - - org.mapstruct - mapstruct - - - org.mapstruct - mapstruct-jdk8 - - - org.mapstruct - mapstruct-processor - - - com.google.guava - guava - provided - - - com.fasterxml.jackson.core - jackson-databind - provided - - - com.fasterxml.jackson.core - jackson-core - provided - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - provided - - - org.slf4j - slf4j-api - provided - - - jakarta.validation - jakarta.validation-api - provided - - - cn.hutool - hutool-all - - - com.alibaba - transmittable-thread-local - - - org.springframework.boot - spring-boot-starter-test - test - - - diff --git a/mes-module-heli/.flattened-pom.xml b/mes-module-heli/.flattened-pom.xml deleted file mode 100644 index 50959521..00000000 --- a/mes-module-heli/.flattened-pom.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - 4.0.0 - - com.chanko.yunxi - mes - 2.0.0-jdk8-snapshot - - com.chanko.yunxi - mes-module-heli - 2.0.0-jdk8-snapshot - pom - ${project.artifactId} - 合立业务模块 - - mes-module-heli-api - mes-module-heli-biz - - diff --git a/mes-module-heli/mes-module-heli-api/.flattened-pom.xml b/mes-module-heli/mes-module-heli-api/.flattened-pom.xml deleted file mode 100644 index 6d8c9905..00000000 --- a/mes-module-heli/mes-module-heli-api/.flattened-pom.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - 4.0.0 - - com.chanko.yunxi - mes-module-heli - 2.0.0-jdk8-snapshot - - com.chanko.yunxi - mes-module-heli-api - 2.0.0-jdk8-snapshot - ${project.artifactId} - 合立业务模块 API，暴露给其它模块调用 - - - com.chanko.yunxi - mes-common - - - org.springframework.boot - spring-boot-starter-validation - true - - - org.springdoc - springdoc-openapi-ui - provided - - - diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processbom/ProcessBomServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processbom/ProcessBomServiceImpl.java index a66b3be5..dcc563e3 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processbom/ProcessBomServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processbom/ProcessBomServiceImpl.java @@ -765,24 +765,156 @@ public class ProcessBomServiceImpl implements ProcessBomService { } } // 如提交版本+1 - if(operateTypeEnum == OperateTypeEnum.SUBMIT){ - updateObj.setVersion(updateObj.getVersion()+1); + if(operateTypeEnum == OperateTypeEnum.SUBMIT) { + updateObj.setVersion(updateObj.getVersion() + 1); // bomEditStatus = BomEditStatusEnum.HAS_EDIT.getStatus(); updateObj.setBomEditStatus(bomEditStatus); //确定为提交时查出审批人并插入到表中 SerarchUser serarchUser = new SerarchUser(); - if(updateObj.getShenheUser() ==null){ + if (updateObj.getShenheUser() == null) { updateObj.setShenheUser(0L); } //第一次提交时获取审核人， - List shenheDOS = shenheMapper.serchShenHeRuser("2",updateObj.getShenheUser(),0); - if(shenheDOS.size()>0){ + List shenheDOS = shenheMapper.serchShenHeRuser("2", updateObj.getShenheUser(), 0); + if (shenheDOS.size() > 0) { updateObj.setBomStatus(6); //审核后设置状态为默认 ShenheDO shenheDO = shenheDOS.get(0); - updateObj.setShenheUser(shenheDO.getShenheUser()); - }else{ + if (ObjectUtil.isNotEmpty(shenheDO.getShenheUser())) { + updateObj.setShenheUser(shenheDO.getShenheUser()); + } else { + updateObj.setBomStatus(7); + updateObj.setShenheTime(LocalDateTime.now()); + updateObj.setShenheUser(null); + //bom审核通过,推送任务通知单 + List processBomDetailDOS = getProcessBomDetailListByBomId(updateObj.getId()); + boolean hasBomType4 = processBomDetailDOS.stream() + .anyMatch(bomDetail -> bomDetail.getBomType() == 4); + if (hasBomType4) { + PlanDO getplanid = processBomMapper.getplanid(updateObj.getPlanId()); + List attentiontodook = attentiontodoMapper.selectByIdlist(13);// 改 + String nickname = userApi.getUser(SecurityFrameworkUtils.getLoginUser().getId()).getNickname(); + List attentiontodook1 = attentiontodoService.getAttentiontodolistdaiban(13); + if (attentiontodook1.size() < 1) { + { + AttentiontodoDO attentiontodoDO = new AttentiontodoDO(); + attentiontodoDO.setEvent("BOM变更审核通过后"); + attentiontodoDO.setAttr5("1"); + attentiontodoDO.setAttr4(nickname); + attentiontodoDO.setLevel("1"); + attentiontodook.add(attentiontodoDO); + + } + } + + + for (AttentiontodoDO attentiontodoRespVO : attentiontodook) { + { + + bdgzsomthingDO BdgzsomthingDO = new bdgzsomthingDO(); + BdgzsomthingDO.setThingname(attentiontodoRespVO.getEvent());//事件名称 + BdgzsomthingDO.setThings(updateObj.getProjectSubCode() + "审核已通过,请推送任务通知单");//事件名称 + BdgzsomthingDO.setAttr2(getplanid.getPlanNo());//跳转携带参数 + BdgzsomthingDO.setAttr3(getplanid.getPlanNo());//独特标识 + + if (attentiontodoRespVO.getAttr5().equals("1")) {//提醒状态 + BdgzsomthingDO.setDborgz("待办"); + } else if (attentiontodoRespVO.getAttr5().equals("2")) { + BdgzsomthingDO.setDborgz("关注"); + } + + if (ObjectUtil.isEmpty(attentiontodoRespVO.getAttr4())) { + PlanDO planDO = planMapper.selectOne(new LambdaQueryWrapper().eq(PlanDO::getPlanNo, getplanid.getPlanNo())); + if (ObjectUtil.isNotEmpty(planDO)) { + AdminUserDO user = adminUserService.getUser(Long.valueOf(planDO.getCreator())); + if (ObjectUtil.isNotEmpty(user)) { + BdgzsomthingDO.setClick(user.getNickname()); + } + } + } else { + BdgzsomthingDO.setClick(attentiontodoRespVO.getAttr4()); + } + if (attentiontodoRespVO.getLevel().equals("1")) { + BdgzsomthingDO.setLevel("紧急"); + } else if (attentiontodoRespVO.getLevel().equals("2")) { + BdgzsomthingDO.setLevel("一般"); + } else if (attentiontodoRespVO.getLevel().equals("3")) { + BdgzsomthingDO.setLevel("非紧急"); + } + BdgzsomthingDO.setYesorno("0");//是否点击 + BdgzsomthingDO.setAttr4("0");//是否已处理 + bdgzsomthingMapper.insert(BdgzsomthingDO); + } + } + } + } + } else { + updateObj.setBomStatus(7); + updateObj.setShenheTime(LocalDateTime.now()); + + updateObj.setShenheUser(null); + //bom审核通过,推送任务通知单 + List processBomDetailDOS = getProcessBomDetailListByBomId(updateObj.getId()); + boolean hasBomType4 = processBomDetailDOS.stream() + .anyMatch(bomDetail -> bomDetail.getBomType() == 4); + if (hasBomType4) { + PlanDO getplanid = processBomMapper.getplanid(updateObj.getPlanId()); + List attentiontodook = attentiontodoMapper.selectByIdlist(13);// 改 + String nickname = userApi.getUser(SecurityFrameworkUtils.getLoginUser().getId()).getNickname(); + List attentiontodook1 = attentiontodoService.getAttentiontodolistdaiban(13); + if (attentiontodook1.size() < 1) { + { + AttentiontodoDO attentiontodoDO = new AttentiontodoDO(); + attentiontodoDO.setEvent("BOM变更审核通过后"); + attentiontodoDO.setAttr5("1"); + attentiontodoDO.setAttr4(nickname); + attentiontodoDO.setLevel("1"); + attentiontodook.add(attentiontodoDO); + + } + } + + + for (AttentiontodoDO attentiontodoRespVO : attentiontodook) { + { + + bdgzsomthingDO BdgzsomthingDO = new bdgzsomthingDO(); + BdgzsomthingDO.setThingname(attentiontodoRespVO.getEvent());//事件名称 + BdgzsomthingDO.setThings(updateObj.getProjectSubCode() + "审核已通过,请推送任务通知单");//事件名称 + BdgzsomthingDO.setAttr2(getplanid.getPlanNo());//跳转携带参数 + BdgzsomthingDO.setAttr3(getplanid.getPlanNo());//独特标识 + + if (attentiontodoRespVO.getAttr5().equals("1")) {//提醒状态 + BdgzsomthingDO.setDborgz("待办"); + } else if (attentiontodoRespVO.getAttr5().equals("2")) { + BdgzsomthingDO.setDborgz("关注"); + } + + if (ObjectUtil.isEmpty(attentiontodoRespVO.getAttr4())) { + PlanDO planDO = planMapper.selectOne(new LambdaQueryWrapper().eq(PlanDO::getPlanNo, getplanid.getPlanNo())); + if (ObjectUtil.isNotEmpty(planDO)) { + AdminUserDO user = adminUserService.getUser(Long.valueOf(planDO.getCreator())); + if (ObjectUtil.isNotEmpty(user)) { + BdgzsomthingDO.setClick(user.getNickname()); + } + } + } else { + BdgzsomthingDO.setClick(attentiontodoRespVO.getAttr4()); + } + if (attentiontodoRespVO.getLevel().equals("1")) { + BdgzsomthingDO.setLevel("紧急"); + } else if (attentiontodoRespVO.getLevel().equals("2")) { + BdgzsomthingDO.setLevel("一般"); + } else if (attentiontodoRespVO.getLevel().equals("3")) { + BdgzsomthingDO.setLevel("非紧急"); + } + BdgzsomthingDO.setYesorno("0");//是否点击 + BdgzsomthingDO.setAttr4("0");//是否已处理 + bdgzsomthingMapper.insert(BdgzsomthingDO); + } + } + } } } if(operateTypeEnum == OperateTypeEnum.AUDIT){ @@ -878,7 +1010,7 @@ public class ProcessBomServiceImpl implements ProcessBomService { } - }else{ + }else if (!(operateTypeEnum == OperateTypeEnum.SUBMIT)){ updateObj.setBomStatus(ProcessBomStatusEnum.valueOf(updateReqVO.getActive()).getCode()); } if (updateReqVO.getProjectSubCode() != null){