1添加cid 与usrId 绑定功能

Dockerfile

@@ -0,0 +1,6 @@
+FROM openjdk:8-jdk-alpine
+LABEL authors="KCIM"
+RUN  ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+COPY ./target/kcim-cost-0.0.1-SNAPSHOT.jar ./data/app/kcim-cost-0.0.1-SNAPSHOT.jar
+EXPOSE 8083
+ENTRYPOINT ["java","-jar","./data/app/kcim-cost-0.0.1-SNAPSHOT.jar"]

pom.xml

@@ -20,6 +20,7 @@
         <spring-boot.version>2.3.12.RELEASE</spring-boot.version>
         <fastjson2.version>2.0.23</fastjson2.version>
         <nacos.version>2.2.8.RELEASE</nacos.version>
+        <spring-cloud-alibaba.version>2.2.8.RELEASE</spring-cloud-alibaba.version>
         <openfeign.version>2.2.9.RELEASE</openfeign.version>
         <saToken.version>1.31.0</saToken.version>
         <easypoi.version>4.3.0</easypoi.version>
@@ -335,6 +336,15 @@
             <artifactId>metastore</artifactId>
             <version>8.3.0.0-371</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+            <version>${spring-cloud-alibaba.version}</version>
+        </dependency>
     </dependencies>
 
     <build>

src/main/java/com/kcim/service/impl/ProjectCostServiceImpl.java

@@ -502,7 +502,7 @@ public class ProjectCostServiceImpl implements ProjectCostService {
             }
             List<ComputeProjectCostDetail> computeProjectCostDetailChilds=new ArrayList<>();
             //按项目分摊配置计算项目的所有项目成本列的分摊金额
-            itemShareParamCost.stream().forEach(shareParamCost->{
+            itemShareParamCost.forEach(shareParamCost->{
                 ComputeProjectCostDetail cmputeProjectCostDetail=createComputeProjectCostDetail(computeDate, currentUser,incomeShareParam,responsibilityItem,projectCost,
                         shareParamCost,shareParamCostVos,itemShareParams,computeShareParamDetailGroup,costDepartmentProfits);
                 computeProjectCostDetailChilds.add(cmputeProjectCostDetail);
@@ -530,12 +530,12 @@ public class ProjectCostServiceImpl implements ProjectCostService {
         repository.saveBatch(computeProjectCosts, 500);
         if (!CollectionUtils.isEmpty(computeProjectCostDetails)) {
             //保存项目分摊明细表对象数据
-            computeProjectCostDetails.stream().forEach(projectCostDetail->projectCostDetail.setProjectCostId(projectCostDetail.getComputeProjectCost().getId()));
+            computeProjectCostDetails.forEach(projectCostDetail->projectCostDetail.setProjectCostId(projectCostDetail.getComputeProjectCost().getId()));
             detailRepository.saveBatch(computeProjectCostDetails, 500);
         }
         if (!CollectionUtils.isEmpty(computeProjectGroupCostDetails)) {
             //保存项目分摊汇总表对象数据
-            computeProjectGroupCostDetails.stream().forEach(projectCostDetail->projectCostDetail.setProjectCostId(projectCostDetail.getComputeProjectCost().getId()));
+            computeProjectGroupCostDetails.forEach(projectCostDetail->projectCostDetail.setProjectCostId(projectCostDetail.getComputeProjectCost().getId()));
             groupDetailRepository.saveBatch(computeProjectGroupCostDetails, 500);
         }
 

src/main/resources/application-dev.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8082
+  port: 8083
   servlet:
     context-path: /costAccount
 spring:
@@ -17,27 +17,9 @@ spring:
       max-lifetime: 180000
       auto-commit: true
       connection-test-query: SELECT 1
-  application:
-    name: kcim-cost
-  cloud:
-    nacos: #注册nacos
-      discovery:
-        service: ${spring.application.name}
-        server-addr: 120.27.235.181:8848
-        #        namespace: 38b4fbe9-4a20-48c3-a8bf-ebf069fb26e8
-        #        group: KCIM
-        namespace: 060cc0fe-193f-4a94-bbca-6d48a4f95ac2
-        group: dev
-    sentinel:
-      enabled: true
-      transport:
-        port: 8719
-        dashboard: 120.27.235.181:8080
   jackson:
     date-format: yyyy-MM-dd hh:mm:ss
     time-zone: GMT+8
-
-  #    default-property-inclusion: non_null
   #redis
   redis:
     port: 6379
@@ -113,9 +95,6 @@ sa-token:
     password: xywl2021!
     # 连接超时时间
     timeout: 10s
-  #    host: 118.31.245.65
-  #    password: xywl2021#
-
   is-log: false
 minio:
   url: http://47.97.198.219:9000

src/main/resources/bootstrap.yml

@@ -0,0 +1,29 @@
+spring:
+  application:
+    name: kcim-cost
+  cloud:
+    nacos:
+      discovery:
+        namespace: 060cc0fe-193f-4a94-bbca-6d48a4f95ac2
+        server-addr: 120.27.235.181:8848
+        service: ${spring.application.name}
+        group: dev
+      config:
+        server-addr: 120.27.235.181:8848
+        namespace: 060cc0fe-193f-4a94-bbca-6d48a4f95ac2
+        file-extension: yaml
+        enabled: true
+        refresh-enabled: true
+#      discovery:
+#        server-addr: nacos-cs.iot-middleware:8848
+#        service: ${spring.application.name}
+#        #        namespace: 38b4fbe9-4a20-48c3-a8bf-ebf069fb26e8
+#        #        group: KCIM
+#        namespace: kcim-pre
+#        group: dev
+#      config:
+#        server-addr: nacos-cs.iot-middleware:8848
+#        namespace: kcim-pre
+#        file-extension: yaml
+#        enabled: true
+#        refresh-enabled: true