diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 947a8a6..786e581 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-model - 1.2.0.6 + 1.2.0.7 com.github.oshi diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 947a8a6..786e581 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-model - 1.2.0.6 + 1.2.0.7 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index fadc9e4..4fe8f29 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.0.6 + 1.2.0.7 diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 947a8a6..786e581 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-model - 1.2.0.6 + 1.2.0.7 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index fadc9e4..4fe8f29 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.0.6 + 1.2.0.7 diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 3da8a13..3eb527f 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-job - 1.2.0.6 + 1.2.0.7 org.springframework.boot diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 947a8a6..786e581 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-model - 1.2.0.6 + 1.2.0.7 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index fadc9e4..4fe8f29 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.0.6 + 1.2.0.7 diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 3da8a13..3eb527f 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-job - 1.2.0.6 + 1.2.0.7 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-test.yml b/casic-metering-eqpt-api/src/main/resources/config/application-test.yml index c888087..040124a 100644 --- a/casic-metering-eqpt-api/src/main/resources/config/application-test.yml +++ b/casic-metering-eqpt-api/src/main/resources/config/application-test.yml @@ -4,7 +4,7 @@ spring: datasource: # driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3307/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://127.0.0.1:3307/casic_metering_xichang_prod?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true username: root password: root redis: diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 947a8a6..786e581 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-model - 1.2.0.6 + 1.2.0.7 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index fadc9e4..4fe8f29 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.0.6 + 1.2.0.7 diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 3da8a13..3eb527f 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-job - 1.2.0.6 + 1.2.0.7 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-test.yml b/casic-metering-eqpt-api/src/main/resources/config/application-test.yml index c888087..040124a 100644 --- a/casic-metering-eqpt-api/src/main/resources/config/application-test.yml +++ b/casic-metering-eqpt-api/src/main/resources/config/application-test.yml @@ -4,7 +4,7 @@ spring: datasource: # driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3307/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://127.0.0.1:3307/casic_metering_xichang_prod?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true username: root password: root redis: diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml index 88cce74..2ba3290 100644 --- a/casic-metering-eqpt-api/src/main/resources/config/application.yml +++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml @@ -3,7 +3,7 @@ ########################################################## spring: profiles: - active: dev + active: test servlet: multipart: max-file-size: 200MB @@ -68,8 +68,8 @@ job: admin: # xxl-job后台管理界面的地址 -# addresses: - addresses: http://111.198.10.15:21605/xxl-job-admin + addresses: +# addresses: http://111.198.10.15:21605/xxl-job-admin executor: # 此执行器的名称 appname: casic-metering-xc-eqpt-job diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 947a8a6..786e581 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-model - 1.2.0.6 + 1.2.0.7 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index fadc9e4..4fe8f29 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.0.6 + 1.2.0.7 diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 3da8a13..3eb527f 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-job - 1.2.0.6 + 1.2.0.7 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-test.yml b/casic-metering-eqpt-api/src/main/resources/config/application-test.yml index c888087..040124a 100644 --- a/casic-metering-eqpt-api/src/main/resources/config/application-test.yml +++ b/casic-metering-eqpt-api/src/main/resources/config/application-test.yml @@ -4,7 +4,7 @@ spring: datasource: # driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3307/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://127.0.0.1:3307/casic_metering_xichang_prod?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true username: root password: root redis: diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml index 88cce74..2ba3290 100644 --- a/casic-metering-eqpt-api/src/main/resources/config/application.yml +++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml @@ -3,7 +3,7 @@ ########################################################## spring: profiles: - active: dev + active: test servlet: multipart: max-file-size: 200MB @@ -68,8 +68,8 @@ job: admin: # xxl-job后台管理界面的地址 -# addresses: - addresses: http://111.198.10.15:21605/xxl-job-admin + addresses: +# addresses: http://111.198.10.15:21605/xxl-job-admin executor: # 此执行器的名称 appname: casic-metering-xc-eqpt-job diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index d500e06..cbee0fb 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-dao - 1.2.0.6 + 1.2.0.7 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.2.0.6 + 1.2.0.7 compile diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 947a8a6..786e581 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-model - 1.2.0.6 + 1.2.0.7 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index fadc9e4..4fe8f29 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.0.6 + 1.2.0.7 diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 3da8a13..3eb527f 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-job - 1.2.0.6 + 1.2.0.7 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-test.yml b/casic-metering-eqpt-api/src/main/resources/config/application-test.yml index c888087..040124a 100644 --- a/casic-metering-eqpt-api/src/main/resources/config/application-test.yml +++ b/casic-metering-eqpt-api/src/main/resources/config/application-test.yml @@ -4,7 +4,7 @@ spring: datasource: # driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3307/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://127.0.0.1:3307/casic_metering_xichang_prod?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true username: root password: root redis: diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml index 88cce74..2ba3290 100644 --- a/casic-metering-eqpt-api/src/main/resources/config/application.yml +++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml @@ -3,7 +3,7 @@ ########################################################## spring: profiles: - active: dev + active: test servlet: multipart: max-file-size: 200MB @@ -68,8 +68,8 @@ job: admin: # xxl-job后台管理界面的地址 -# addresses: - addresses: http://111.198.10.15:21605/xxl-job-admin + addresses: +# addresses: http://111.198.10.15:21605/xxl-job-admin executor: # 此执行器的名称 appname: casic-metering-xc-eqpt-job diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index d500e06..cbee0fb 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-dao - 1.2.0.6 + 1.2.0.7 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.2.0.6 + 1.2.0.7 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 0c81de6..1aced97 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 947a8a6..786e581 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-model - 1.2.0.6 + 1.2.0.7 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index fadc9e4..4fe8f29 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.0.6 + 1.2.0.7 diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 3da8a13..3eb527f 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-job - 1.2.0.6 + 1.2.0.7 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-test.yml b/casic-metering-eqpt-api/src/main/resources/config/application-test.yml index c888087..040124a 100644 --- a/casic-metering-eqpt-api/src/main/resources/config/application-test.yml +++ b/casic-metering-eqpt-api/src/main/resources/config/application-test.yml @@ -4,7 +4,7 @@ spring: datasource: # driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3307/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://127.0.0.1:3307/casic_metering_xichang_prod?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true username: root password: root redis: diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml index 88cce74..2ba3290 100644 --- a/casic-metering-eqpt-api/src/main/resources/config/application.yml +++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml @@ -3,7 +3,7 @@ ########################################################## spring: profiles: - active: dev + active: test servlet: multipart: max-file-size: 200MB @@ -68,8 +68,8 @@ job: admin: # xxl-job后台管理界面的地址 -# addresses: - addresses: http://111.198.10.15:21605/xxl-job-admin + addresses: +# addresses: http://111.198.10.15:21605/xxl-job-admin executor: # 此执行器的名称 appname: casic-metering-xc-eqpt-job diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index d500e06..cbee0fb 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-dao - 1.2.0.6 + 1.2.0.7 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.2.0.6 + 1.2.0.7 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 0c81de6..1aced97 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentImportDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentImportDTO.java index 809abb5..1e7b53b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentImportDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentImportDTO.java @@ -93,7 +93,7 @@ /** * 设备分类(字典code) */ - @DictCodeField(cacheName = MeterDictCode.EQUIPMENT_CATEGORY, needValid = true, message = "设备分类不合法") +// @DictCodeField(cacheName = MeterDictCode.EQUIPMENT_CATEGORY, needValid = true, message = "设备分类不合法") @ExcelProperty("设备分类") private String category; /** @@ -180,5 +180,8 @@ @ExcelIgnore private String checkDuplication; + @ExcelProperty + private String equipmentType; + } diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 947a8a6..786e581 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-model - 1.2.0.6 + 1.2.0.7 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index fadc9e4..4fe8f29 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.0.6 + 1.2.0.7 diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 3da8a13..3eb527f 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-job - 1.2.0.6 + 1.2.0.7 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-test.yml b/casic-metering-eqpt-api/src/main/resources/config/application-test.yml index c888087..040124a 100644 --- a/casic-metering-eqpt-api/src/main/resources/config/application-test.yml +++ b/casic-metering-eqpt-api/src/main/resources/config/application-test.yml @@ -4,7 +4,7 @@ spring: datasource: # driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3307/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://127.0.0.1:3307/casic_metering_xichang_prod?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true username: root password: root redis: diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml index 88cce74..2ba3290 100644 --- a/casic-metering-eqpt-api/src/main/resources/config/application.yml +++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml @@ -3,7 +3,7 @@ ########################################################## spring: profiles: - active: dev + active: test servlet: multipart: max-file-size: 200MB @@ -68,8 +68,8 @@ job: admin: # xxl-job后台管理界面的地址 -# addresses: - addresses: http://111.198.10.15:21605/xxl-job-admin + addresses: +# addresses: http://111.198.10.15:21605/xxl-job-admin executor: # 此执行器的名称 appname: casic-metering-xc-eqpt-job diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index d500e06..cbee0fb 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-dao - 1.2.0.6 + 1.2.0.7 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.2.0.6 + 1.2.0.7 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 0c81de6..1aced97 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentImportDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentImportDTO.java index 809abb5..1e7b53b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentImportDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentImportDTO.java @@ -93,7 +93,7 @@ /** * 设备分类(字典code) */ - @DictCodeField(cacheName = MeterDictCode.EQUIPMENT_CATEGORY, needValid = true, message = "设备分类不合法") +// @DictCodeField(cacheName = MeterDictCode.EQUIPMENT_CATEGORY, needValid = true, message = "设备分类不合法") @ExcelProperty("设备分类") private String category; /** @@ -180,5 +180,8 @@ @ExcelIgnore private String checkDuplication; + @ExcelProperty + private String equipmentType; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java index e9297d1..dcec8a9 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java @@ -115,6 +115,11 @@ */ @ApiModelProperty("意见内容") private String comment; + + public FlowCommentDto(String type, String comment) { + this.type = type; + this.comment = comment; + } } } diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 947a8a6..786e581 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-model - 1.2.0.6 + 1.2.0.7 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index fadc9e4..4fe8f29 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.0.6 + 1.2.0.7 diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 3da8a13..3eb527f 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-job - 1.2.0.6 + 1.2.0.7 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-test.yml b/casic-metering-eqpt-api/src/main/resources/config/application-test.yml index c888087..040124a 100644 --- a/casic-metering-eqpt-api/src/main/resources/config/application-test.yml +++ b/casic-metering-eqpt-api/src/main/resources/config/application-test.yml @@ -4,7 +4,7 @@ spring: datasource: # driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3307/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://127.0.0.1:3307/casic_metering_xichang_prod?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true username: root password: root redis: diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml index 88cce74..2ba3290 100644 --- a/casic-metering-eqpt-api/src/main/resources/config/application.yml +++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml @@ -3,7 +3,7 @@ ########################################################## spring: profiles: - active: dev + active: test servlet: multipart: max-file-size: 200MB @@ -68,8 +68,8 @@ job: admin: # xxl-job后台管理界面的地址 -# addresses: - addresses: http://111.198.10.15:21605/xxl-job-admin + addresses: +# addresses: http://111.198.10.15:21605/xxl-job-admin executor: # 此执行器的名称 appname: casic-metering-xc-eqpt-job diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index d500e06..cbee0fb 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-dao - 1.2.0.6 + 1.2.0.7 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.2.0.6 + 1.2.0.7 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 0c81de6..1aced97 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentImportDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentImportDTO.java index 809abb5..1e7b53b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentImportDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentImportDTO.java @@ -93,7 +93,7 @@ /** * 设备分类(字典code) */ - @DictCodeField(cacheName = MeterDictCode.EQUIPMENT_CATEGORY, needValid = true, message = "设备分类不合法") +// @DictCodeField(cacheName = MeterDictCode.EQUIPMENT_CATEGORY, needValid = true, message = "设备分类不合法") @ExcelProperty("设备分类") private String category; /** @@ -180,5 +180,8 @@ @ExcelIgnore private String checkDuplication; + @ExcelProperty + private String equipmentType; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java index e9297d1..dcec8a9 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java @@ -115,6 +115,11 @@ */ @ApiModelProperty("意见内容") private String comment; + + public FlowCommentDto(String type, String comment) { + this.type = type; + this.comment = comment; + } } } diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index da4807d..57508a3 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-model - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-common - 1.2.0.6 + 1.2.0.7 org.springframework.boot diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 947a8a6..786e581 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-model - 1.2.0.6 + 1.2.0.7 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index fadc9e4..4fe8f29 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.0.6 + 1.2.0.7 diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 3da8a13..3eb527f 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-job - 1.2.0.6 + 1.2.0.7 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-test.yml b/casic-metering-eqpt-api/src/main/resources/config/application-test.yml index c888087..040124a 100644 --- a/casic-metering-eqpt-api/src/main/resources/config/application-test.yml +++ b/casic-metering-eqpt-api/src/main/resources/config/application-test.yml @@ -4,7 +4,7 @@ spring: datasource: # driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3307/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://127.0.0.1:3307/casic_metering_xichang_prod?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true username: root password: root redis: diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml index 88cce74..2ba3290 100644 --- a/casic-metering-eqpt-api/src/main/resources/config/application.yml +++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml @@ -3,7 +3,7 @@ ########################################################## spring: profiles: - active: dev + active: test servlet: multipart: max-file-size: 200MB @@ -68,8 +68,8 @@ job: admin: # xxl-job后台管理界面的地址 -# addresses: - addresses: http://111.198.10.15:21605/xxl-job-admin + addresses: +# addresses: http://111.198.10.15:21605/xxl-job-admin executor: # 此执行器的名称 appname: casic-metering-xc-eqpt-job diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index d500e06..cbee0fb 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-dao - 1.2.0.6 + 1.2.0.7 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.2.0.6 + 1.2.0.7 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 0c81de6..1aced97 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentImportDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentImportDTO.java index 809abb5..1e7b53b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentImportDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentImportDTO.java @@ -93,7 +93,7 @@ /** * 设备分类(字典code) */ - @DictCodeField(cacheName = MeterDictCode.EQUIPMENT_CATEGORY, needValid = true, message = "设备分类不合法") +// @DictCodeField(cacheName = MeterDictCode.EQUIPMENT_CATEGORY, needValid = true, message = "设备分类不合法") @ExcelProperty("设备分类") private String category; /** @@ -180,5 +180,8 @@ @ExcelIgnore private String checkDuplication; + @ExcelProperty + private String equipmentType; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java index e9297d1..dcec8a9 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java @@ -115,6 +115,11 @@ */ @ApiModelProperty("意见内容") private String comment; + + public FlowCommentDto(String type, String comment) { + this.type = type; + this.comment = comment; + } } } diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index da4807d..57508a3 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-model - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-common - 1.2.0.6 + 1.2.0.7 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java index d78ac8c..4a5d3b1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java @@ -75,7 +75,7 @@ @Override public ReturnDTO processSubmit(String formId, Long id) { - return this.processSubmit(formId,id,null); + return this.processSubmit(formId, id, null); } @Transactional @@ -269,7 +269,6 @@ } /** - * * @param processId * @return */ @@ -421,7 +420,7 @@ FlowElement targetFlowElement = outgoingFlow.getSourceFlowElement(); if (targetFlowElement instanceof UserTask) { UserTask userTask = (UserTask) targetFlowElement; - if (Objects.nonNull(userTask) && Objects.nonNull(userTask.getLoopCharacteristics())){ + if (Objects.nonNull(userTask) && Objects.nonNull(userTask.getLoopCharacteristics())) { //或签 if ("${nrOfCompletedInstances/nrOfInstances > 0}".equals(userTask.getLoopCharacteristics().getCompletionCondition())) { flowTask.setCountersignOrSign(2);//或签 @@ -503,6 +502,10 @@ } + if (resultList.size() == 1 && resultList.get(0).size() == 1) { + resultList.get(0).get(0).setComment(new ApprovalLogResponse.FlowCommentDto("0", "自动通过")); + } + return resultList; } diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 947a8a6..786e581 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-model - 1.2.0.6 + 1.2.0.7 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index fadc9e4..4fe8f29 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.0.6 + 1.2.0.7 diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 3da8a13..3eb527f 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-job - 1.2.0.6 + 1.2.0.7 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-test.yml b/casic-metering-eqpt-api/src/main/resources/config/application-test.yml index c888087..040124a 100644 --- a/casic-metering-eqpt-api/src/main/resources/config/application-test.yml +++ b/casic-metering-eqpt-api/src/main/resources/config/application-test.yml @@ -4,7 +4,7 @@ spring: datasource: # driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3307/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://127.0.0.1:3307/casic_metering_xichang_prod?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true username: root password: root redis: diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml index 88cce74..2ba3290 100644 --- a/casic-metering-eqpt-api/src/main/resources/config/application.yml +++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml @@ -3,7 +3,7 @@ ########################################################## spring: profiles: - active: dev + active: test servlet: multipart: max-file-size: 200MB @@ -68,8 +68,8 @@ job: admin: # xxl-job后台管理界面的地址 -# addresses: - addresses: http://111.198.10.15:21605/xxl-job-admin + addresses: +# addresses: http://111.198.10.15:21605/xxl-job-admin executor: # 此执行器的名称 appname: casic-metering-xc-eqpt-job diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index d500e06..cbee0fb 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-dao - 1.2.0.6 + 1.2.0.7 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.2.0.6 + 1.2.0.7 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 0c81de6..1aced97 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentImportDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentImportDTO.java index 809abb5..1e7b53b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentImportDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentImportDTO.java @@ -93,7 +93,7 @@ /** * 设备分类(字典code) */ - @DictCodeField(cacheName = MeterDictCode.EQUIPMENT_CATEGORY, needValid = true, message = "设备分类不合法") +// @DictCodeField(cacheName = MeterDictCode.EQUIPMENT_CATEGORY, needValid = true, message = "设备分类不合法") @ExcelProperty("设备分类") private String category; /** @@ -180,5 +180,8 @@ @ExcelIgnore private String checkDuplication; + @ExcelProperty + private String equipmentType; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java index e9297d1..dcec8a9 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java @@ -115,6 +115,11 @@ */ @ApiModelProperty("意见内容") private String comment; + + public FlowCommentDto(String type, String comment) { + this.type = type; + this.comment = comment; + } } } diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index da4807d..57508a3 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-model - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-common - 1.2.0.6 + 1.2.0.7 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java index d78ac8c..4a5d3b1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java @@ -75,7 +75,7 @@ @Override public ReturnDTO processSubmit(String formId, Long id) { - return this.processSubmit(formId,id,null); + return this.processSubmit(formId, id, null); } @Transactional @@ -269,7 +269,6 @@ } /** - * * @param processId * @return */ @@ -421,7 +420,7 @@ FlowElement targetFlowElement = outgoingFlow.getSourceFlowElement(); if (targetFlowElement instanceof UserTask) { UserTask userTask = (UserTask) targetFlowElement; - if (Objects.nonNull(userTask) && Objects.nonNull(userTask.getLoopCharacteristics())){ + if (Objects.nonNull(userTask) && Objects.nonNull(userTask.getLoopCharacteristics())) { //或签 if ("${nrOfCompletedInstances/nrOfInstances > 0}".equals(userTask.getLoopCharacteristics().getCompletionCondition())) { flowTask.setCountersignOrSign(2);//或签 @@ -503,6 +502,10 @@ } + if (resultList.size() == 1 && resultList.get(0).size() == 1) { + resultList.get(0).get(0).setComment(new ApprovalLogResponse.FlowCommentDto("0", "自动通过")); + } + return resultList; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java index bd57777..5f41d98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java @@ -57,8 +57,10 @@ @Override public List planBizStatistics(String deptName) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List statisticsLists = this.noticeBoardMapper.statisticsInfoList(dataScope,EQUIPMENT_TYPE_NORMAL,null, deptName, +// DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + + List deptIds = getScopeOrCurrentDeptIds(); + List statisticsLists = this.noticeBoardMapper.statisticsInfoList(null,EQUIPMENT_TYPE_NORMAL,deptIds, deptName, SampleStatusEnum.getSampleStatusByCompletion(CheckCompletionEnum.CHECKED)); Map> deptMaps = statisticsLists.stream().collect(Collectors.groupingBy(EquipmentStatisticsList::getDeptId)); @@ -438,18 +440,18 @@ public EquipmentMultiAggr inUseMultiStatistic(List deptIds) { EquipmentMultiAggr res = new EquipmentMultiAggr(); EquipmentQueryForm queryForm = new EquipmentQueryForm(); - if(CollUtil.isEmpty(deptIds)){ - deptIds = getScopeOrCurrentDeptIds(); - queryForm.setDeptIds(deptIds); - }else { - List subDeptIds = new ArrayList<>(); - List allDeptList = permissionContext.getDeptService().list(null); - for (Long deptId : deptIds) { - subDeptIds.add(deptId); - subDeptIds.addAll(allDeptList.stream().filter(i->ObjectUtil.isNotEmpty(i.getPids())&&i.getPids().contains(String.valueOf(deptId))).map(Dept::getId).distinct().collect(Collectors.toList())); - } - queryForm.setDeptIds(subDeptIds); - } +// if(CollUtil.isEmpty(deptIds)){ +// deptIds = getScopeOrCurrentDeptIds(); +// queryForm.setDeptIds(deptIds); +// }else { +// List subDeptIds = new ArrayList<>(); +// List allDeptList = permissionContext.getDeptService().list(null); +// for (Long deptId : deptIds) { +// subDeptIds.add(deptId); +// subDeptIds.addAll(allDeptList.stream().filter(i->ObjectUtil.isNotEmpty(i.getPids())&&i.getPids().contains(String.valueOf(deptId))).map(Dept::getId).distinct().collect(Collectors.toList())); +// } +// queryForm.setDeptIds(subDeptIds); +// } queryForm.setUsageStatus(EquipmentStatusTypeEnum.UNSEAL); List list = equipmentInfoService.list(queryForm); @@ -475,7 +477,7 @@ CheckStatisticsDTO statisticsDTO = new CheckStatisticsDTO(); - statisticsDTO.setYearToCheck(list.stream().filter(i-> DateUtil.year(new Date()) == DateUtil.year(i.getCertificateValid())).count()); + statisticsDTO.setYearToCheck(list.stream().filter(i->ObjectUtil.isNotEmpty(i.getCertificateValid()) && DateUtil.year(new Date()) == DateUtil.year(i.getCertificateValid())).count()); statisticsDTO.setYearChecked(list.stream().mapToLong(i->Long.valueOf(i.getYearChecked())).sum()); return statisticsDTO; } diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 947a8a6..786e581 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-model - 1.2.0.6 + 1.2.0.7 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index fadc9e4..4fe8f29 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.0.6 + 1.2.0.7 diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 3da8a13..3eb527f 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-job - 1.2.0.6 + 1.2.0.7 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-test.yml b/casic-metering-eqpt-api/src/main/resources/config/application-test.yml index c888087..040124a 100644 --- a/casic-metering-eqpt-api/src/main/resources/config/application-test.yml +++ b/casic-metering-eqpt-api/src/main/resources/config/application-test.yml @@ -4,7 +4,7 @@ spring: datasource: # driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3307/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://127.0.0.1:3307/casic_metering_xichang_prod?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true username: root password: root redis: diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml index 88cce74..2ba3290 100644 --- a/casic-metering-eqpt-api/src/main/resources/config/application.yml +++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml @@ -3,7 +3,7 @@ ########################################################## spring: profiles: - active: dev + active: test servlet: multipart: max-file-size: 200MB @@ -68,8 +68,8 @@ job: admin: # xxl-job后台管理界面的地址 -# addresses: - addresses: http://111.198.10.15:21605/xxl-job-admin + addresses: +# addresses: http://111.198.10.15:21605/xxl-job-admin executor: # 此执行器的名称 appname: casic-metering-xc-eqpt-job diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index d500e06..cbee0fb 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-dao - 1.2.0.6 + 1.2.0.7 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.2.0.6 + 1.2.0.7 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 0c81de6..1aced97 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentImportDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentImportDTO.java index 809abb5..1e7b53b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentImportDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentImportDTO.java @@ -93,7 +93,7 @@ /** * 设备分类(字典code) */ - @DictCodeField(cacheName = MeterDictCode.EQUIPMENT_CATEGORY, needValid = true, message = "设备分类不合法") +// @DictCodeField(cacheName = MeterDictCode.EQUIPMENT_CATEGORY, needValid = true, message = "设备分类不合法") @ExcelProperty("设备分类") private String category; /** @@ -180,5 +180,8 @@ @ExcelIgnore private String checkDuplication; + @ExcelProperty + private String equipmentType; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java index e9297d1..dcec8a9 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java @@ -115,6 +115,11 @@ */ @ApiModelProperty("意见内容") private String comment; + + public FlowCommentDto(String type, String comment) { + this.type = type; + this.comment = comment; + } } } diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index da4807d..57508a3 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-model - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-common - 1.2.0.6 + 1.2.0.7 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java index d78ac8c..4a5d3b1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java @@ -75,7 +75,7 @@ @Override public ReturnDTO processSubmit(String formId, Long id) { - return this.processSubmit(formId,id,null); + return this.processSubmit(formId, id, null); } @Transactional @@ -269,7 +269,6 @@ } /** - * * @param processId * @return */ @@ -421,7 +420,7 @@ FlowElement targetFlowElement = outgoingFlow.getSourceFlowElement(); if (targetFlowElement instanceof UserTask) { UserTask userTask = (UserTask) targetFlowElement; - if (Objects.nonNull(userTask) && Objects.nonNull(userTask.getLoopCharacteristics())){ + if (Objects.nonNull(userTask) && Objects.nonNull(userTask.getLoopCharacteristics())) { //或签 if ("${nrOfCompletedInstances/nrOfInstances > 0}".equals(userTask.getLoopCharacteristics().getCompletionCondition())) { flowTask.setCountersignOrSign(2);//或签 @@ -503,6 +502,10 @@ } + if (resultList.size() == 1 && resultList.get(0).size() == 1) { + resultList.get(0).get(0).setComment(new ApprovalLogResponse.FlowCommentDto("0", "自动通过")); + } + return resultList; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java index bd57777..5f41d98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java @@ -57,8 +57,10 @@ @Override public List planBizStatistics(String deptName) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List statisticsLists = this.noticeBoardMapper.statisticsInfoList(dataScope,EQUIPMENT_TYPE_NORMAL,null, deptName, +// DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + + List deptIds = getScopeOrCurrentDeptIds(); + List statisticsLists = this.noticeBoardMapper.statisticsInfoList(null,EQUIPMENT_TYPE_NORMAL,deptIds, deptName, SampleStatusEnum.getSampleStatusByCompletion(CheckCompletionEnum.CHECKED)); Map> deptMaps = statisticsLists.stream().collect(Collectors.groupingBy(EquipmentStatisticsList::getDeptId)); @@ -438,18 +440,18 @@ public EquipmentMultiAggr inUseMultiStatistic(List deptIds) { EquipmentMultiAggr res = new EquipmentMultiAggr(); EquipmentQueryForm queryForm = new EquipmentQueryForm(); - if(CollUtil.isEmpty(deptIds)){ - deptIds = getScopeOrCurrentDeptIds(); - queryForm.setDeptIds(deptIds); - }else { - List subDeptIds = new ArrayList<>(); - List allDeptList = permissionContext.getDeptService().list(null); - for (Long deptId : deptIds) { - subDeptIds.add(deptId); - subDeptIds.addAll(allDeptList.stream().filter(i->ObjectUtil.isNotEmpty(i.getPids())&&i.getPids().contains(String.valueOf(deptId))).map(Dept::getId).distinct().collect(Collectors.toList())); - } - queryForm.setDeptIds(subDeptIds); - } +// if(CollUtil.isEmpty(deptIds)){ +// deptIds = getScopeOrCurrentDeptIds(); +// queryForm.setDeptIds(deptIds); +// }else { +// List subDeptIds = new ArrayList<>(); +// List allDeptList = permissionContext.getDeptService().list(null); +// for (Long deptId : deptIds) { +// subDeptIds.add(deptId); +// subDeptIds.addAll(allDeptList.stream().filter(i->ObjectUtil.isNotEmpty(i.getPids())&&i.getPids().contains(String.valueOf(deptId))).map(Dept::getId).distinct().collect(Collectors.toList())); +// } +// queryForm.setDeptIds(subDeptIds); +// } queryForm.setUsageStatus(EquipmentStatusTypeEnum.UNSEAL); List list = equipmentInfoService.list(queryForm); @@ -475,7 +477,7 @@ CheckStatisticsDTO statisticsDTO = new CheckStatisticsDTO(); - statisticsDTO.setYearToCheck(list.stream().filter(i-> DateUtil.year(new Date()) == DateUtil.year(i.getCertificateValid())).count()); + statisticsDTO.setYearToCheck(list.stream().filter(i->ObjectUtil.isNotEmpty(i.getCertificateValid()) && DateUtil.year(new Date()) == DateUtil.year(i.getCertificateValid())).count()); statisticsDTO.setYearChecked(list.stream().mapToLong(i->Long.valueOf(i.getYearChecked())).sum()); return statisticsDTO; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java index 5456965..4916f29 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java @@ -190,18 +190,25 @@ throw new BusinessException(500,"RFID标签已使用"); } String processId = approval.getProcessId(); + log.debug("==================== update status IN_APPROVED {} {}",processId,approval.getId()); + ReturnDTO res = updateApprovalStatus(submitRequest.getId(), ApprovalStatusEnum.IN_APPROVED); if (StrUtil.isEmpty(processId)) { + log.debug("==================== process submit {} {}",processId,approval.getId()); ReturnDTO submitRes = baseApprovalService.processSubmit(submitRequest.getFormId(), submitRequest.getId(),submitRequest.getReason()); if (!ResponseData.DEFAULT_SUCCESS_CODE.equals(submitRes.getCode())) { return submitRes; } ProcessInstance processInstance = (ProcessInstance) submitRes.getData(); - approval.setProcessId(processInstance.getProcessInstanceId()); - this.updateById(approval); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("id",approval.getId()); + updateWrapper.set("process_id",processInstance.getProcessInstanceId()); + this.update(updateWrapper); +// approval.setProcessId(processInstance.getProcessInstanceId()); +// this.updateById(approval); } else { baseApprovalService.resubmit(processId); } - return updateApprovalStatus(submitRequest.getId(), ApprovalStatusEnum.IN_APPROVED); + return res; } @Override @@ -280,6 +287,7 @@ public void finishApproval(Long approvalId) { EquipmentInfoApproval approvalInfo = this.getById(approvalId); approvalInfo.setApprovalStatus(ApprovalStatusEnum.PASSED); + log.debug("==================== update status PASSED {} {}",approvalInfo.getProcessId(),approvalInfo.getId()); this.updateById(approvalInfo); if (ObjectUtil.isEmpty(approvalInfo)) { return; diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 947a8a6..786e581 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-model - 1.2.0.6 + 1.2.0.7 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index fadc9e4..4fe8f29 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.0.6 + 1.2.0.7 diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 3da8a13..3eb527f 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-job - 1.2.0.6 + 1.2.0.7 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-test.yml b/casic-metering-eqpt-api/src/main/resources/config/application-test.yml index c888087..040124a 100644 --- a/casic-metering-eqpt-api/src/main/resources/config/application-test.yml +++ b/casic-metering-eqpt-api/src/main/resources/config/application-test.yml @@ -4,7 +4,7 @@ spring: datasource: # driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3307/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://127.0.0.1:3307/casic_metering_xichang_prod?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true username: root password: root redis: diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml index 88cce74..2ba3290 100644 --- a/casic-metering-eqpt-api/src/main/resources/config/application.yml +++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml @@ -3,7 +3,7 @@ ########################################################## spring: profiles: - active: dev + active: test servlet: multipart: max-file-size: 200MB @@ -68,8 +68,8 @@ job: admin: # xxl-job后台管理界面的地址 -# addresses: - addresses: http://111.198.10.15:21605/xxl-job-admin + addresses: +# addresses: http://111.198.10.15:21605/xxl-job-admin executor: # 此执行器的名称 appname: casic-metering-xc-eqpt-job diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index d500e06..cbee0fb 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-dao - 1.2.0.6 + 1.2.0.7 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.2.0.6 + 1.2.0.7 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 0c81de6..1aced97 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentImportDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentImportDTO.java index 809abb5..1e7b53b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentImportDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentImportDTO.java @@ -93,7 +93,7 @@ /** * 设备分类(字典code) */ - @DictCodeField(cacheName = MeterDictCode.EQUIPMENT_CATEGORY, needValid = true, message = "设备分类不合法") +// @DictCodeField(cacheName = MeterDictCode.EQUIPMENT_CATEGORY, needValid = true, message = "设备分类不合法") @ExcelProperty("设备分类") private String category; /** @@ -180,5 +180,8 @@ @ExcelIgnore private String checkDuplication; + @ExcelProperty + private String equipmentType; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java index e9297d1..dcec8a9 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java @@ -115,6 +115,11 @@ */ @ApiModelProperty("意见内容") private String comment; + + public FlowCommentDto(String type, String comment) { + this.type = type; + this.comment = comment; + } } } diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index da4807d..57508a3 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-model - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-common - 1.2.0.6 + 1.2.0.7 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java index d78ac8c..4a5d3b1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java @@ -75,7 +75,7 @@ @Override public ReturnDTO processSubmit(String formId, Long id) { - return this.processSubmit(formId,id,null); + return this.processSubmit(formId, id, null); } @Transactional @@ -269,7 +269,6 @@ } /** - * * @param processId * @return */ @@ -421,7 +420,7 @@ FlowElement targetFlowElement = outgoingFlow.getSourceFlowElement(); if (targetFlowElement instanceof UserTask) { UserTask userTask = (UserTask) targetFlowElement; - if (Objects.nonNull(userTask) && Objects.nonNull(userTask.getLoopCharacteristics())){ + if (Objects.nonNull(userTask) && Objects.nonNull(userTask.getLoopCharacteristics())) { //或签 if ("${nrOfCompletedInstances/nrOfInstances > 0}".equals(userTask.getLoopCharacteristics().getCompletionCondition())) { flowTask.setCountersignOrSign(2);//或签 @@ -503,6 +502,10 @@ } + if (resultList.size() == 1 && resultList.get(0).size() == 1) { + resultList.get(0).get(0).setComment(new ApprovalLogResponse.FlowCommentDto("0", "自动通过")); + } + return resultList; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java index bd57777..5f41d98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java @@ -57,8 +57,10 @@ @Override public List planBizStatistics(String deptName) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List statisticsLists = this.noticeBoardMapper.statisticsInfoList(dataScope,EQUIPMENT_TYPE_NORMAL,null, deptName, +// DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + + List deptIds = getScopeOrCurrentDeptIds(); + List statisticsLists = this.noticeBoardMapper.statisticsInfoList(null,EQUIPMENT_TYPE_NORMAL,deptIds, deptName, SampleStatusEnum.getSampleStatusByCompletion(CheckCompletionEnum.CHECKED)); Map> deptMaps = statisticsLists.stream().collect(Collectors.groupingBy(EquipmentStatisticsList::getDeptId)); @@ -438,18 +440,18 @@ public EquipmentMultiAggr inUseMultiStatistic(List deptIds) { EquipmentMultiAggr res = new EquipmentMultiAggr(); EquipmentQueryForm queryForm = new EquipmentQueryForm(); - if(CollUtil.isEmpty(deptIds)){ - deptIds = getScopeOrCurrentDeptIds(); - queryForm.setDeptIds(deptIds); - }else { - List subDeptIds = new ArrayList<>(); - List allDeptList = permissionContext.getDeptService().list(null); - for (Long deptId : deptIds) { - subDeptIds.add(deptId); - subDeptIds.addAll(allDeptList.stream().filter(i->ObjectUtil.isNotEmpty(i.getPids())&&i.getPids().contains(String.valueOf(deptId))).map(Dept::getId).distinct().collect(Collectors.toList())); - } - queryForm.setDeptIds(subDeptIds); - } +// if(CollUtil.isEmpty(deptIds)){ +// deptIds = getScopeOrCurrentDeptIds(); +// queryForm.setDeptIds(deptIds); +// }else { +// List subDeptIds = new ArrayList<>(); +// List allDeptList = permissionContext.getDeptService().list(null); +// for (Long deptId : deptIds) { +// subDeptIds.add(deptId); +// subDeptIds.addAll(allDeptList.stream().filter(i->ObjectUtil.isNotEmpty(i.getPids())&&i.getPids().contains(String.valueOf(deptId))).map(Dept::getId).distinct().collect(Collectors.toList())); +// } +// queryForm.setDeptIds(subDeptIds); +// } queryForm.setUsageStatus(EquipmentStatusTypeEnum.UNSEAL); List list = equipmentInfoService.list(queryForm); @@ -475,7 +477,7 @@ CheckStatisticsDTO statisticsDTO = new CheckStatisticsDTO(); - statisticsDTO.setYearToCheck(list.stream().filter(i-> DateUtil.year(new Date()) == DateUtil.year(i.getCertificateValid())).count()); + statisticsDTO.setYearToCheck(list.stream().filter(i->ObjectUtil.isNotEmpty(i.getCertificateValid()) && DateUtil.year(new Date()) == DateUtil.year(i.getCertificateValid())).count()); statisticsDTO.setYearChecked(list.stream().mapToLong(i->Long.valueOf(i.getYearChecked())).sum()); return statisticsDTO; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java index 5456965..4916f29 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java @@ -190,18 +190,25 @@ throw new BusinessException(500,"RFID标签已使用"); } String processId = approval.getProcessId(); + log.debug("==================== update status IN_APPROVED {} {}",processId,approval.getId()); + ReturnDTO res = updateApprovalStatus(submitRequest.getId(), ApprovalStatusEnum.IN_APPROVED); if (StrUtil.isEmpty(processId)) { + log.debug("==================== process submit {} {}",processId,approval.getId()); ReturnDTO submitRes = baseApprovalService.processSubmit(submitRequest.getFormId(), submitRequest.getId(),submitRequest.getReason()); if (!ResponseData.DEFAULT_SUCCESS_CODE.equals(submitRes.getCode())) { return submitRes; } ProcessInstance processInstance = (ProcessInstance) submitRes.getData(); - approval.setProcessId(processInstance.getProcessInstanceId()); - this.updateById(approval); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("id",approval.getId()); + updateWrapper.set("process_id",processInstance.getProcessInstanceId()); + this.update(updateWrapper); +// approval.setProcessId(processInstance.getProcessInstanceId()); +// this.updateById(approval); } else { baseApprovalService.resubmit(processId); } - return updateApprovalStatus(submitRequest.getId(), ApprovalStatusEnum.IN_APPROVED); + return res; } @Override @@ -280,6 +287,7 @@ public void finishApproval(Long approvalId) { EquipmentInfoApproval approvalInfo = this.getById(approvalId); approvalInfo.setApprovalStatus(ApprovalStatusEnum.PASSED); + log.debug("==================== update status PASSED {} {}",approvalInfo.getProcessId(),approvalInfo.getId()); this.updateById(approvalInfo); if (ObjectUtil.isEmpty(approvalInfo)) { return; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java index 5501550..d64203e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java @@ -380,6 +380,7 @@ importDTO.setModelId(itemModels.get(0).getId()); importDTO.setCategory(itemModels.get(0).getCategory()); importDTO.setCheckCycle(itemModels.get(0).getCheckCycle()); + importDTO.setEquipmentType(itemModels.get(0).getEquipmentType()); }else { if (StrUtil.isBlank(importDTO.getHelpInstruction())) { @@ -390,6 +391,7 @@ importDTO.setModelId(modelOpt.get().getId()); importDTO.setCategory(modelOpt.get().getCategory()); importDTO.setCheckCycle(modelOpt.get().getCheckCycle()); + importDTO.setEquipmentType(itemModels.get(0).getEquipmentType()); } else { throw new BusinessException(1500, String.format(validMsg, i + 1, "设备规格型号不存在")); } @@ -548,7 +550,7 @@ BeanUtil.copyProperties(importDTO, equipmentInfo); equipmentInfo.setId(IdWorker.getId()); equipmentInfo.setEquipmentNo(NumberGeneratorUtil.getContactNo(prefix, maxNo + i)); - equipmentInfo.setEquipmentType(equipmentType); +// equipmentInfo.setEquipmentType(equipmentType); equipmentInfo.setCreateUserId(user.getId()); equipmentInfo.setCreateUserName(user.getName()); equipmentInfo.setCreateTime(new Date()); @@ -765,7 +767,7 @@ EquipmentStatusTypeEnum.DELAY, EquipmentStatusTypeEnum.SEAL)); queryWrapper.eq("check_status",0); //未送检设备 - List list = this.baseMapper.selectRemindList(null, queryWrapper, + List list = this.baseMapper.selectRemindListPage(page,null, queryWrapper, SampleStatusEnum.getSampleStatusByCompletion(Arrays.asList(CheckCompletionEnum.UNCHECK,CheckCompletionEnum.IN_CHECK))); list.forEach(this::warpEquipmentRemindInfo); page.setRecords(list); diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 947a8a6..786e581 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-model - 1.2.0.6 + 1.2.0.7 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index fadc9e4..4fe8f29 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.0.6 + 1.2.0.7 diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 3da8a13..3eb527f 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-job - 1.2.0.6 + 1.2.0.7 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-test.yml b/casic-metering-eqpt-api/src/main/resources/config/application-test.yml index c888087..040124a 100644 --- a/casic-metering-eqpt-api/src/main/resources/config/application-test.yml +++ b/casic-metering-eqpt-api/src/main/resources/config/application-test.yml @@ -4,7 +4,7 @@ spring: datasource: # driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3307/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://127.0.0.1:3307/casic_metering_xichang_prod?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true username: root password: root redis: diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml index 88cce74..2ba3290 100644 --- a/casic-metering-eqpt-api/src/main/resources/config/application.yml +++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml @@ -3,7 +3,7 @@ ########################################################## spring: profiles: - active: dev + active: test servlet: multipart: max-file-size: 200MB @@ -68,8 +68,8 @@ job: admin: # xxl-job后台管理界面的地址 -# addresses: - addresses: http://111.198.10.15:21605/xxl-job-admin + addresses: +# addresses: http://111.198.10.15:21605/xxl-job-admin executor: # 此执行器的名称 appname: casic-metering-xc-eqpt-job diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index d500e06..cbee0fb 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-dao - 1.2.0.6 + 1.2.0.7 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.2.0.6 + 1.2.0.7 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 0c81de6..1aced97 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentImportDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentImportDTO.java index 809abb5..1e7b53b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentImportDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentImportDTO.java @@ -93,7 +93,7 @@ /** * 设备分类(字典code) */ - @DictCodeField(cacheName = MeterDictCode.EQUIPMENT_CATEGORY, needValid = true, message = "设备分类不合法") +// @DictCodeField(cacheName = MeterDictCode.EQUIPMENT_CATEGORY, needValid = true, message = "设备分类不合法") @ExcelProperty("设备分类") private String category; /** @@ -180,5 +180,8 @@ @ExcelIgnore private String checkDuplication; + @ExcelProperty + private String equipmentType; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java index e9297d1..dcec8a9 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java @@ -115,6 +115,11 @@ */ @ApiModelProperty("意见内容") private String comment; + + public FlowCommentDto(String type, String comment) { + this.type = type; + this.comment = comment; + } } } diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index da4807d..57508a3 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-model - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-common - 1.2.0.6 + 1.2.0.7 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java index d78ac8c..4a5d3b1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java @@ -75,7 +75,7 @@ @Override public ReturnDTO processSubmit(String formId, Long id) { - return this.processSubmit(formId,id,null); + return this.processSubmit(formId, id, null); } @Transactional @@ -269,7 +269,6 @@ } /** - * * @param processId * @return */ @@ -421,7 +420,7 @@ FlowElement targetFlowElement = outgoingFlow.getSourceFlowElement(); if (targetFlowElement instanceof UserTask) { UserTask userTask = (UserTask) targetFlowElement; - if (Objects.nonNull(userTask) && Objects.nonNull(userTask.getLoopCharacteristics())){ + if (Objects.nonNull(userTask) && Objects.nonNull(userTask.getLoopCharacteristics())) { //或签 if ("${nrOfCompletedInstances/nrOfInstances > 0}".equals(userTask.getLoopCharacteristics().getCompletionCondition())) { flowTask.setCountersignOrSign(2);//或签 @@ -503,6 +502,10 @@ } + if (resultList.size() == 1 && resultList.get(0).size() == 1) { + resultList.get(0).get(0).setComment(new ApprovalLogResponse.FlowCommentDto("0", "自动通过")); + } + return resultList; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java index bd57777..5f41d98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java @@ -57,8 +57,10 @@ @Override public List planBizStatistics(String deptName) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List statisticsLists = this.noticeBoardMapper.statisticsInfoList(dataScope,EQUIPMENT_TYPE_NORMAL,null, deptName, +// DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + + List deptIds = getScopeOrCurrentDeptIds(); + List statisticsLists = this.noticeBoardMapper.statisticsInfoList(null,EQUIPMENT_TYPE_NORMAL,deptIds, deptName, SampleStatusEnum.getSampleStatusByCompletion(CheckCompletionEnum.CHECKED)); Map> deptMaps = statisticsLists.stream().collect(Collectors.groupingBy(EquipmentStatisticsList::getDeptId)); @@ -438,18 +440,18 @@ public EquipmentMultiAggr inUseMultiStatistic(List deptIds) { EquipmentMultiAggr res = new EquipmentMultiAggr(); EquipmentQueryForm queryForm = new EquipmentQueryForm(); - if(CollUtil.isEmpty(deptIds)){ - deptIds = getScopeOrCurrentDeptIds(); - queryForm.setDeptIds(deptIds); - }else { - List subDeptIds = new ArrayList<>(); - List allDeptList = permissionContext.getDeptService().list(null); - for (Long deptId : deptIds) { - subDeptIds.add(deptId); - subDeptIds.addAll(allDeptList.stream().filter(i->ObjectUtil.isNotEmpty(i.getPids())&&i.getPids().contains(String.valueOf(deptId))).map(Dept::getId).distinct().collect(Collectors.toList())); - } - queryForm.setDeptIds(subDeptIds); - } +// if(CollUtil.isEmpty(deptIds)){ +// deptIds = getScopeOrCurrentDeptIds(); +// queryForm.setDeptIds(deptIds); +// }else { +// List subDeptIds = new ArrayList<>(); +// List allDeptList = permissionContext.getDeptService().list(null); +// for (Long deptId : deptIds) { +// subDeptIds.add(deptId); +// subDeptIds.addAll(allDeptList.stream().filter(i->ObjectUtil.isNotEmpty(i.getPids())&&i.getPids().contains(String.valueOf(deptId))).map(Dept::getId).distinct().collect(Collectors.toList())); +// } +// queryForm.setDeptIds(subDeptIds); +// } queryForm.setUsageStatus(EquipmentStatusTypeEnum.UNSEAL); List list = equipmentInfoService.list(queryForm); @@ -475,7 +477,7 @@ CheckStatisticsDTO statisticsDTO = new CheckStatisticsDTO(); - statisticsDTO.setYearToCheck(list.stream().filter(i-> DateUtil.year(new Date()) == DateUtil.year(i.getCertificateValid())).count()); + statisticsDTO.setYearToCheck(list.stream().filter(i->ObjectUtil.isNotEmpty(i.getCertificateValid()) && DateUtil.year(new Date()) == DateUtil.year(i.getCertificateValid())).count()); statisticsDTO.setYearChecked(list.stream().mapToLong(i->Long.valueOf(i.getYearChecked())).sum()); return statisticsDTO; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java index 5456965..4916f29 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java @@ -190,18 +190,25 @@ throw new BusinessException(500,"RFID标签已使用"); } String processId = approval.getProcessId(); + log.debug("==================== update status IN_APPROVED {} {}",processId,approval.getId()); + ReturnDTO res = updateApprovalStatus(submitRequest.getId(), ApprovalStatusEnum.IN_APPROVED); if (StrUtil.isEmpty(processId)) { + log.debug("==================== process submit {} {}",processId,approval.getId()); ReturnDTO submitRes = baseApprovalService.processSubmit(submitRequest.getFormId(), submitRequest.getId(),submitRequest.getReason()); if (!ResponseData.DEFAULT_SUCCESS_CODE.equals(submitRes.getCode())) { return submitRes; } ProcessInstance processInstance = (ProcessInstance) submitRes.getData(); - approval.setProcessId(processInstance.getProcessInstanceId()); - this.updateById(approval); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("id",approval.getId()); + updateWrapper.set("process_id",processInstance.getProcessInstanceId()); + this.update(updateWrapper); +// approval.setProcessId(processInstance.getProcessInstanceId()); +// this.updateById(approval); } else { baseApprovalService.resubmit(processId); } - return updateApprovalStatus(submitRequest.getId(), ApprovalStatusEnum.IN_APPROVED); + return res; } @Override @@ -280,6 +287,7 @@ public void finishApproval(Long approvalId) { EquipmentInfoApproval approvalInfo = this.getById(approvalId); approvalInfo.setApprovalStatus(ApprovalStatusEnum.PASSED); + log.debug("==================== update status PASSED {} {}",approvalInfo.getProcessId(),approvalInfo.getId()); this.updateById(approvalInfo); if (ObjectUtil.isEmpty(approvalInfo)) { return; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java index 5501550..d64203e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java @@ -380,6 +380,7 @@ importDTO.setModelId(itemModels.get(0).getId()); importDTO.setCategory(itemModels.get(0).getCategory()); importDTO.setCheckCycle(itemModels.get(0).getCheckCycle()); + importDTO.setEquipmentType(itemModels.get(0).getEquipmentType()); }else { if (StrUtil.isBlank(importDTO.getHelpInstruction())) { @@ -390,6 +391,7 @@ importDTO.setModelId(modelOpt.get().getId()); importDTO.setCategory(modelOpt.get().getCategory()); importDTO.setCheckCycle(modelOpt.get().getCheckCycle()); + importDTO.setEquipmentType(itemModels.get(0).getEquipmentType()); } else { throw new BusinessException(1500, String.format(validMsg, i + 1, "设备规格型号不存在")); } @@ -548,7 +550,7 @@ BeanUtil.copyProperties(importDTO, equipmentInfo); equipmentInfo.setId(IdWorker.getId()); equipmentInfo.setEquipmentNo(NumberGeneratorUtil.getContactNo(prefix, maxNo + i)); - equipmentInfo.setEquipmentType(equipmentType); +// equipmentInfo.setEquipmentType(equipmentType); equipmentInfo.setCreateUserId(user.getId()); equipmentInfo.setCreateUserName(user.getName()); equipmentInfo.setCreateTime(new Date()); @@ -765,7 +767,7 @@ EquipmentStatusTypeEnum.DELAY, EquipmentStatusTypeEnum.SEAL)); queryWrapper.eq("check_status",0); //未送检设备 - List list = this.baseMapper.selectRemindList(null, queryWrapper, + List list = this.baseMapper.selectRemindListPage(page,null, queryWrapper, SampleStatusEnum.getSampleStatusByCompletion(Arrays.asList(CheckCompletionEnum.UNCHECK,CheckCompletionEnum.IN_CHECK))); list.forEach(this::warpEquipmentRemindInfo); page.setRecords(list); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java index 6de99ec..54bb635 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java @@ -15,17 +15,20 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.status.EquipmentStatusApproval; import com.casic.missiles.mapper.status.EquipmentStatusApprovalMapper; +import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.equipment.IEquipmentAttachmentService; import com.casic.missiles.service.equipment.IEquipmentInfoService; import com.casic.missiles.service.impl.CommonApprovalServiceImpl; import com.casic.missiles.service.status.IEquipmentStatusApprovalService; import com.casic.missiles.service.status.IEquipmentStatusLogService; +import com.casic.missiles.service.system.ISystemDeptService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Optional; @@ -53,6 +56,7 @@ private final IBaseApprovalService baseApprovalService; private final AbstractPermissionContext permissionContext; private final IEquipmentStatusLogService statusLogService; + private final ISystemDeptService systemDeptService; @Override public Long saveOrUpdateApproval(EquipmentStatusApproval approvalForm) { @@ -199,9 +203,21 @@ public Page allPage(Page page, EquipmentStatusQueryForm queryForm) { QueryWrapper queryWrapper = commonQuery(queryForm); queryWrapper.eq("approval.approval_status",ApprovalStatusEnum.PASSED); - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - dataScope.setScopeName("info.dept_id"); - List list = this.baseMapper.listScopePage(dataScope, page, queryWrapper); +// DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); +// dataScope.setScopeName("info.dept_id"); + + // 如果当前用户所在组织机构 的级别是受检单位，查本单位下所有连的；否则查当前用户所在连的 + List userDeptList = systemDeptService.getUserDeptList(null); + List userDeptIds = new ArrayList<>(); + if(ObjectUtil.isNotEmpty(userDeptList)) { + userDeptIds.add(permissionContext.getAuthService().getLoginUser().getDeptId()); + userDeptIds = userDeptList.stream().map(Dept::getId).collect(Collectors.toList()); + } + if(CollUtil.isEmpty(userDeptIds) || userDeptIds.size() <= 0){ + return page; + } + queryWrapper.in("info.dept_id",userDeptIds); + List list = this.baseMapper.listScopePage(null, page, queryWrapper); list.forEach(this::warpApprovalInfo); page.setRecords(list); return page; diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 947a8a6..786e581 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-model - 1.2.0.6 + 1.2.0.7 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index fadc9e4..4fe8f29 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.0.6 + 1.2.0.7 diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 3da8a13..3eb527f 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-job - 1.2.0.6 + 1.2.0.7 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-test.yml b/casic-metering-eqpt-api/src/main/resources/config/application-test.yml index c888087..040124a 100644 --- a/casic-metering-eqpt-api/src/main/resources/config/application-test.yml +++ b/casic-metering-eqpt-api/src/main/resources/config/application-test.yml @@ -4,7 +4,7 @@ spring: datasource: # driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3307/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://127.0.0.1:3307/casic_metering_xichang_prod?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true username: root password: root redis: diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml index 88cce74..2ba3290 100644 --- a/casic-metering-eqpt-api/src/main/resources/config/application.yml +++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml @@ -3,7 +3,7 @@ ########################################################## spring: profiles: - active: dev + active: test servlet: multipart: max-file-size: 200MB @@ -68,8 +68,8 @@ job: admin: # xxl-job后台管理界面的地址 -# addresses: - addresses: http://111.198.10.15:21605/xxl-job-admin + addresses: +# addresses: http://111.198.10.15:21605/xxl-job-admin executor: # 此执行器的名称 appname: casic-metering-xc-eqpt-job diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index d500e06..cbee0fb 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-dao - 1.2.0.6 + 1.2.0.7 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.2.0.6 + 1.2.0.7 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 0c81de6..1aced97 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentImportDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentImportDTO.java index 809abb5..1e7b53b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentImportDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentImportDTO.java @@ -93,7 +93,7 @@ /** * 设备分类(字典code) */ - @DictCodeField(cacheName = MeterDictCode.EQUIPMENT_CATEGORY, needValid = true, message = "设备分类不合法") +// @DictCodeField(cacheName = MeterDictCode.EQUIPMENT_CATEGORY, needValid = true, message = "设备分类不合法") @ExcelProperty("设备分类") private String category; /** @@ -180,5 +180,8 @@ @ExcelIgnore private String checkDuplication; + @ExcelProperty + private String equipmentType; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java index e9297d1..dcec8a9 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java @@ -115,6 +115,11 @@ */ @ApiModelProperty("意见内容") private String comment; + + public FlowCommentDto(String type, String comment) { + this.type = type; + this.comment = comment; + } } } diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index da4807d..57508a3 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-model - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-common - 1.2.0.6 + 1.2.0.7 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java index d78ac8c..4a5d3b1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java @@ -75,7 +75,7 @@ @Override public ReturnDTO processSubmit(String formId, Long id) { - return this.processSubmit(formId,id,null); + return this.processSubmit(formId, id, null); } @Transactional @@ -269,7 +269,6 @@ } /** - * * @param processId * @return */ @@ -421,7 +420,7 @@ FlowElement targetFlowElement = outgoingFlow.getSourceFlowElement(); if (targetFlowElement instanceof UserTask) { UserTask userTask = (UserTask) targetFlowElement; - if (Objects.nonNull(userTask) && Objects.nonNull(userTask.getLoopCharacteristics())){ + if (Objects.nonNull(userTask) && Objects.nonNull(userTask.getLoopCharacteristics())) { //或签 if ("${nrOfCompletedInstances/nrOfInstances > 0}".equals(userTask.getLoopCharacteristics().getCompletionCondition())) { flowTask.setCountersignOrSign(2);//或签 @@ -503,6 +502,10 @@ } + if (resultList.size() == 1 && resultList.get(0).size() == 1) { + resultList.get(0).get(0).setComment(new ApprovalLogResponse.FlowCommentDto("0", "自动通过")); + } + return resultList; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java index bd57777..5f41d98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java @@ -57,8 +57,10 @@ @Override public List planBizStatistics(String deptName) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List statisticsLists = this.noticeBoardMapper.statisticsInfoList(dataScope,EQUIPMENT_TYPE_NORMAL,null, deptName, +// DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + + List deptIds = getScopeOrCurrentDeptIds(); + List statisticsLists = this.noticeBoardMapper.statisticsInfoList(null,EQUIPMENT_TYPE_NORMAL,deptIds, deptName, SampleStatusEnum.getSampleStatusByCompletion(CheckCompletionEnum.CHECKED)); Map> deptMaps = statisticsLists.stream().collect(Collectors.groupingBy(EquipmentStatisticsList::getDeptId)); @@ -438,18 +440,18 @@ public EquipmentMultiAggr inUseMultiStatistic(List deptIds) { EquipmentMultiAggr res = new EquipmentMultiAggr(); EquipmentQueryForm queryForm = new EquipmentQueryForm(); - if(CollUtil.isEmpty(deptIds)){ - deptIds = getScopeOrCurrentDeptIds(); - queryForm.setDeptIds(deptIds); - }else { - List subDeptIds = new ArrayList<>(); - List allDeptList = permissionContext.getDeptService().list(null); - for (Long deptId : deptIds) { - subDeptIds.add(deptId); - subDeptIds.addAll(allDeptList.stream().filter(i->ObjectUtil.isNotEmpty(i.getPids())&&i.getPids().contains(String.valueOf(deptId))).map(Dept::getId).distinct().collect(Collectors.toList())); - } - queryForm.setDeptIds(subDeptIds); - } +// if(CollUtil.isEmpty(deptIds)){ +// deptIds = getScopeOrCurrentDeptIds(); +// queryForm.setDeptIds(deptIds); +// }else { +// List subDeptIds = new ArrayList<>(); +// List allDeptList = permissionContext.getDeptService().list(null); +// for (Long deptId : deptIds) { +// subDeptIds.add(deptId); +// subDeptIds.addAll(allDeptList.stream().filter(i->ObjectUtil.isNotEmpty(i.getPids())&&i.getPids().contains(String.valueOf(deptId))).map(Dept::getId).distinct().collect(Collectors.toList())); +// } +// queryForm.setDeptIds(subDeptIds); +// } queryForm.setUsageStatus(EquipmentStatusTypeEnum.UNSEAL); List list = equipmentInfoService.list(queryForm); @@ -475,7 +477,7 @@ CheckStatisticsDTO statisticsDTO = new CheckStatisticsDTO(); - statisticsDTO.setYearToCheck(list.stream().filter(i-> DateUtil.year(new Date()) == DateUtil.year(i.getCertificateValid())).count()); + statisticsDTO.setYearToCheck(list.stream().filter(i->ObjectUtil.isNotEmpty(i.getCertificateValid()) && DateUtil.year(new Date()) == DateUtil.year(i.getCertificateValid())).count()); statisticsDTO.setYearChecked(list.stream().mapToLong(i->Long.valueOf(i.getYearChecked())).sum()); return statisticsDTO; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java index 5456965..4916f29 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java @@ -190,18 +190,25 @@ throw new BusinessException(500,"RFID标签已使用"); } String processId = approval.getProcessId(); + log.debug("==================== update status IN_APPROVED {} {}",processId,approval.getId()); + ReturnDTO res = updateApprovalStatus(submitRequest.getId(), ApprovalStatusEnum.IN_APPROVED); if (StrUtil.isEmpty(processId)) { + log.debug("==================== process submit {} {}",processId,approval.getId()); ReturnDTO submitRes = baseApprovalService.processSubmit(submitRequest.getFormId(), submitRequest.getId(),submitRequest.getReason()); if (!ResponseData.DEFAULT_SUCCESS_CODE.equals(submitRes.getCode())) { return submitRes; } ProcessInstance processInstance = (ProcessInstance) submitRes.getData(); - approval.setProcessId(processInstance.getProcessInstanceId()); - this.updateById(approval); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("id",approval.getId()); + updateWrapper.set("process_id",processInstance.getProcessInstanceId()); + this.update(updateWrapper); +// approval.setProcessId(processInstance.getProcessInstanceId()); +// this.updateById(approval); } else { baseApprovalService.resubmit(processId); } - return updateApprovalStatus(submitRequest.getId(), ApprovalStatusEnum.IN_APPROVED); + return res; } @Override @@ -280,6 +287,7 @@ public void finishApproval(Long approvalId) { EquipmentInfoApproval approvalInfo = this.getById(approvalId); approvalInfo.setApprovalStatus(ApprovalStatusEnum.PASSED); + log.debug("==================== update status PASSED {} {}",approvalInfo.getProcessId(),approvalInfo.getId()); this.updateById(approvalInfo); if (ObjectUtil.isEmpty(approvalInfo)) { return; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java index 5501550..d64203e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java @@ -380,6 +380,7 @@ importDTO.setModelId(itemModels.get(0).getId()); importDTO.setCategory(itemModels.get(0).getCategory()); importDTO.setCheckCycle(itemModels.get(0).getCheckCycle()); + importDTO.setEquipmentType(itemModels.get(0).getEquipmentType()); }else { if (StrUtil.isBlank(importDTO.getHelpInstruction())) { @@ -390,6 +391,7 @@ importDTO.setModelId(modelOpt.get().getId()); importDTO.setCategory(modelOpt.get().getCategory()); importDTO.setCheckCycle(modelOpt.get().getCheckCycle()); + importDTO.setEquipmentType(itemModels.get(0).getEquipmentType()); } else { throw new BusinessException(1500, String.format(validMsg, i + 1, "设备规格型号不存在")); } @@ -548,7 +550,7 @@ BeanUtil.copyProperties(importDTO, equipmentInfo); equipmentInfo.setId(IdWorker.getId()); equipmentInfo.setEquipmentNo(NumberGeneratorUtil.getContactNo(prefix, maxNo + i)); - equipmentInfo.setEquipmentType(equipmentType); +// equipmentInfo.setEquipmentType(equipmentType); equipmentInfo.setCreateUserId(user.getId()); equipmentInfo.setCreateUserName(user.getName()); equipmentInfo.setCreateTime(new Date()); @@ -765,7 +767,7 @@ EquipmentStatusTypeEnum.DELAY, EquipmentStatusTypeEnum.SEAL)); queryWrapper.eq("check_status",0); //未送检设备 - List list = this.baseMapper.selectRemindList(null, queryWrapper, + List list = this.baseMapper.selectRemindListPage(page,null, queryWrapper, SampleStatusEnum.getSampleStatusByCompletion(Arrays.asList(CheckCompletionEnum.UNCHECK,CheckCompletionEnum.IN_CHECK))); list.forEach(this::warpEquipmentRemindInfo); page.setRecords(list); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java index 6de99ec..54bb635 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java @@ -15,17 +15,20 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.status.EquipmentStatusApproval; import com.casic.missiles.mapper.status.EquipmentStatusApprovalMapper; +import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.equipment.IEquipmentAttachmentService; import com.casic.missiles.service.equipment.IEquipmentInfoService; import com.casic.missiles.service.impl.CommonApprovalServiceImpl; import com.casic.missiles.service.status.IEquipmentStatusApprovalService; import com.casic.missiles.service.status.IEquipmentStatusLogService; +import com.casic.missiles.service.system.ISystemDeptService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Optional; @@ -53,6 +56,7 @@ private final IBaseApprovalService baseApprovalService; private final AbstractPermissionContext permissionContext; private final IEquipmentStatusLogService statusLogService; + private final ISystemDeptService systemDeptService; @Override public Long saveOrUpdateApproval(EquipmentStatusApproval approvalForm) { @@ -199,9 +203,21 @@ public Page allPage(Page page, EquipmentStatusQueryForm queryForm) { QueryWrapper queryWrapper = commonQuery(queryForm); queryWrapper.eq("approval.approval_status",ApprovalStatusEnum.PASSED); - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - dataScope.setScopeName("info.dept_id"); - List list = this.baseMapper.listScopePage(dataScope, page, queryWrapper); +// DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); +// dataScope.setScopeName("info.dept_id"); + + // 如果当前用户所在组织机构 的级别是受检单位，查本单位下所有连的；否则查当前用户所在连的 + List userDeptList = systemDeptService.getUserDeptList(null); + List userDeptIds = new ArrayList<>(); + if(ObjectUtil.isNotEmpty(userDeptList)) { + userDeptIds.add(permissionContext.getAuthService().getLoginUser().getDeptId()); + userDeptIds = userDeptList.stream().map(Dept::getId).collect(Collectors.toList()); + } + if(CollUtil.isEmpty(userDeptIds) || userDeptIds.size() <= 0){ + return page; + } + queryWrapper.in("info.dept_id",userDeptIds); + List list = this.baseMapper.listScopePage(null, page, queryWrapper); list.forEach(this::warpApprovalInfo); page.setRecords(list); return page; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemSignServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemSignServiceImpl.java index 5c841ed..dac2ff7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemSignServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemSignServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.impl.system; import cn.hutool.core.lang.Assert; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -80,9 +81,13 @@ private void wrapper(SystemSign systemSign){ User user = userMapper.selectById(systemSign.getSignUserId()); - systemSign.setSignDeptId(user.getDeptId()); - Dept dept = deptMapper.selectById(user.getDeptId()); - systemSign.setSignDeptName(dept.getFullName()); + if(ObjectUtil.isNotEmpty(user)){ + systemSign.setSignDeptId(user.getDeptId()); + Dept dept = deptMapper.selectById(user.getDeptId()); + if(ObjectUtil.isNotEmpty(dept)){ + systemSign.setSignDeptName(dept.getFullName()); + } + } } @Override diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 947a8a6..786e581 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-model - 1.2.0.6 + 1.2.0.7 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index fadc9e4..4fe8f29 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.0.6 + 1.2.0.7 diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 3da8a13..3eb527f 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-job - 1.2.0.6 + 1.2.0.7 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-test.yml b/casic-metering-eqpt-api/src/main/resources/config/application-test.yml index c888087..040124a 100644 --- a/casic-metering-eqpt-api/src/main/resources/config/application-test.yml +++ b/casic-metering-eqpt-api/src/main/resources/config/application-test.yml @@ -4,7 +4,7 @@ spring: datasource: # driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3307/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://127.0.0.1:3307/casic_metering_xichang_prod?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true username: root password: root redis: diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml index 88cce74..2ba3290 100644 --- a/casic-metering-eqpt-api/src/main/resources/config/application.yml +++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml @@ -3,7 +3,7 @@ ########################################################## spring: profiles: - active: dev + active: test servlet: multipart: max-file-size: 200MB @@ -68,8 +68,8 @@ job: admin: # xxl-job后台管理界面的地址 -# addresses: - addresses: http://111.198.10.15:21605/xxl-job-admin + addresses: +# addresses: http://111.198.10.15:21605/xxl-job-admin executor: # 此执行器的名称 appname: casic-metering-xc-eqpt-job diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index d500e06..cbee0fb 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-dao - 1.2.0.6 + 1.2.0.7 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.2.0.6 + 1.2.0.7 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 0c81de6..1aced97 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentImportDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentImportDTO.java index 809abb5..1e7b53b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentImportDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentImportDTO.java @@ -93,7 +93,7 @@ /** * 设备分类(字典code) */ - @DictCodeField(cacheName = MeterDictCode.EQUIPMENT_CATEGORY, needValid = true, message = "设备分类不合法") +// @DictCodeField(cacheName = MeterDictCode.EQUIPMENT_CATEGORY, needValid = true, message = "设备分类不合法") @ExcelProperty("设备分类") private String category; /** @@ -180,5 +180,8 @@ @ExcelIgnore private String checkDuplication; + @ExcelProperty + private String equipmentType; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java index e9297d1..dcec8a9 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java @@ -115,6 +115,11 @@ */ @ApiModelProperty("意见内容") private String comment; + + public FlowCommentDto(String type, String comment) { + this.type = type; + this.comment = comment; + } } } diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index da4807d..57508a3 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.6 + 1.2.0.7 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-model - 1.2.0.6 + 1.2.0.7 com.casic casic-metering-common - 1.2.0.6 + 1.2.0.7 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java index d78ac8c..4a5d3b1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java @@ -75,7 +75,7 @@ @Override public ReturnDTO processSubmit(String formId, Long id) { - return this.processSubmit(formId,id,null); + return this.processSubmit(formId, id, null); } @Transactional @@ -269,7 +269,6 @@ } /** - * * @param processId * @return */ @@ -421,7 +420,7 @@ FlowElement targetFlowElement = outgoingFlow.getSourceFlowElement(); if (targetFlowElement instanceof UserTask) { UserTask userTask = (UserTask) targetFlowElement; - if (Objects.nonNull(userTask) && Objects.nonNull(userTask.getLoopCharacteristics())){ + if (Objects.nonNull(userTask) && Objects.nonNull(userTask.getLoopCharacteristics())) { //或签 if ("${nrOfCompletedInstances/nrOfInstances > 0}".equals(userTask.getLoopCharacteristics().getCompletionCondition())) { flowTask.setCountersignOrSign(2);//或签 @@ -503,6 +502,10 @@ } + if (resultList.size() == 1 && resultList.get(0).size() == 1) { + resultList.get(0).get(0).setComment(new ApprovalLogResponse.FlowCommentDto("0", "自动通过")); + } + return resultList; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java index bd57777..5f41d98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java @@ -57,8 +57,10 @@ @Override public List planBizStatistics(String deptName) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List statisticsLists = this.noticeBoardMapper.statisticsInfoList(dataScope,EQUIPMENT_TYPE_NORMAL,null, deptName, +// DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + + List deptIds = getScopeOrCurrentDeptIds(); + List statisticsLists = this.noticeBoardMapper.statisticsInfoList(null,EQUIPMENT_TYPE_NORMAL,deptIds, deptName, SampleStatusEnum.getSampleStatusByCompletion(CheckCompletionEnum.CHECKED)); Map> deptMaps = statisticsLists.stream().collect(Collectors.groupingBy(EquipmentStatisticsList::getDeptId)); @@ -438,18 +440,18 @@ public EquipmentMultiAggr inUseMultiStatistic(List deptIds) { EquipmentMultiAggr res = new EquipmentMultiAggr(); EquipmentQueryForm queryForm = new EquipmentQueryForm(); - if(CollUtil.isEmpty(deptIds)){ - deptIds = getScopeOrCurrentDeptIds(); - queryForm.setDeptIds(deptIds); - }else { - List subDeptIds = new ArrayList<>(); - List allDeptList = permissionContext.getDeptService().list(null); - for (Long deptId : deptIds) { - subDeptIds.add(deptId); - subDeptIds.addAll(allDeptList.stream().filter(i->ObjectUtil.isNotEmpty(i.getPids())&&i.getPids().contains(String.valueOf(deptId))).map(Dept::getId).distinct().collect(Collectors.toList())); - } - queryForm.setDeptIds(subDeptIds); - } +// if(CollUtil.isEmpty(deptIds)){ +// deptIds = getScopeOrCurrentDeptIds(); +// queryForm.setDeptIds(deptIds); +// }else { +// List subDeptIds = new ArrayList<>(); +// List allDeptList = permissionContext.getDeptService().list(null); +// for (Long deptId : deptIds) { +// subDeptIds.add(deptId); +// subDeptIds.addAll(allDeptList.stream().filter(i->ObjectUtil.isNotEmpty(i.getPids())&&i.getPids().contains(String.valueOf(deptId))).map(Dept::getId).distinct().collect(Collectors.toList())); +// } +// queryForm.setDeptIds(subDeptIds); +// } queryForm.setUsageStatus(EquipmentStatusTypeEnum.UNSEAL); List list = equipmentInfoService.list(queryForm); @@ -475,7 +477,7 @@ CheckStatisticsDTO statisticsDTO = new CheckStatisticsDTO(); - statisticsDTO.setYearToCheck(list.stream().filter(i-> DateUtil.year(new Date()) == DateUtil.year(i.getCertificateValid())).count()); + statisticsDTO.setYearToCheck(list.stream().filter(i->ObjectUtil.isNotEmpty(i.getCertificateValid()) && DateUtil.year(new Date()) == DateUtil.year(i.getCertificateValid())).count()); statisticsDTO.setYearChecked(list.stream().mapToLong(i->Long.valueOf(i.getYearChecked())).sum()); return statisticsDTO; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java index 5456965..4916f29 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java @@ -190,18 +190,25 @@ throw new BusinessException(500,"RFID标签已使用"); } String processId = approval.getProcessId(); + log.debug("==================== update status IN_APPROVED {} {}",processId,approval.getId()); + ReturnDTO res = updateApprovalStatus(submitRequest.getId(), ApprovalStatusEnum.IN_APPROVED); if (StrUtil.isEmpty(processId)) { + log.debug("==================== process submit {} {}",processId,approval.getId()); ReturnDTO submitRes = baseApprovalService.processSubmit(submitRequest.getFormId(), submitRequest.getId(),submitRequest.getReason()); if (!ResponseData.DEFAULT_SUCCESS_CODE.equals(submitRes.getCode())) { return submitRes; } ProcessInstance processInstance = (ProcessInstance) submitRes.getData(); - approval.setProcessId(processInstance.getProcessInstanceId()); - this.updateById(approval); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("id",approval.getId()); + updateWrapper.set("process_id",processInstance.getProcessInstanceId()); + this.update(updateWrapper); +// approval.setProcessId(processInstance.getProcessInstanceId()); +// this.updateById(approval); } else { baseApprovalService.resubmit(processId); } - return updateApprovalStatus(submitRequest.getId(), ApprovalStatusEnum.IN_APPROVED); + return res; } @Override @@ -280,6 +287,7 @@ public void finishApproval(Long approvalId) { EquipmentInfoApproval approvalInfo = this.getById(approvalId); approvalInfo.setApprovalStatus(ApprovalStatusEnum.PASSED); + log.debug("==================== update status PASSED {} {}",approvalInfo.getProcessId(),approvalInfo.getId()); this.updateById(approvalInfo); if (ObjectUtil.isEmpty(approvalInfo)) { return; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java index 5501550..d64203e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java @@ -380,6 +380,7 @@ importDTO.setModelId(itemModels.get(0).getId()); importDTO.setCategory(itemModels.get(0).getCategory()); importDTO.setCheckCycle(itemModels.get(0).getCheckCycle()); + importDTO.setEquipmentType(itemModels.get(0).getEquipmentType()); }else { if (StrUtil.isBlank(importDTO.getHelpInstruction())) { @@ -390,6 +391,7 @@ importDTO.setModelId(modelOpt.get().getId()); importDTO.setCategory(modelOpt.get().getCategory()); importDTO.setCheckCycle(modelOpt.get().getCheckCycle()); + importDTO.setEquipmentType(itemModels.get(0).getEquipmentType()); } else { throw new BusinessException(1500, String.format(validMsg, i + 1, "设备规格型号不存在")); } @@ -548,7 +550,7 @@ BeanUtil.copyProperties(importDTO, equipmentInfo); equipmentInfo.setId(IdWorker.getId()); equipmentInfo.setEquipmentNo(NumberGeneratorUtil.getContactNo(prefix, maxNo + i)); - equipmentInfo.setEquipmentType(equipmentType); +// equipmentInfo.setEquipmentType(equipmentType); equipmentInfo.setCreateUserId(user.getId()); equipmentInfo.setCreateUserName(user.getName()); equipmentInfo.setCreateTime(new Date()); @@ -765,7 +767,7 @@ EquipmentStatusTypeEnum.DELAY, EquipmentStatusTypeEnum.SEAL)); queryWrapper.eq("check_status",0); //未送检设备 - List list = this.baseMapper.selectRemindList(null, queryWrapper, + List list = this.baseMapper.selectRemindListPage(page,null, queryWrapper, SampleStatusEnum.getSampleStatusByCompletion(Arrays.asList(CheckCompletionEnum.UNCHECK,CheckCompletionEnum.IN_CHECK))); list.forEach(this::warpEquipmentRemindInfo); page.setRecords(list); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java index 6de99ec..54bb635 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java @@ -15,17 +15,20 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.status.EquipmentStatusApproval; import com.casic.missiles.mapper.status.EquipmentStatusApprovalMapper; +import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.equipment.IEquipmentAttachmentService; import com.casic.missiles.service.equipment.IEquipmentInfoService; import com.casic.missiles.service.impl.CommonApprovalServiceImpl; import com.casic.missiles.service.status.IEquipmentStatusApprovalService; import com.casic.missiles.service.status.IEquipmentStatusLogService; +import com.casic.missiles.service.system.ISystemDeptService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Optional; @@ -53,6 +56,7 @@ private final IBaseApprovalService baseApprovalService; private final AbstractPermissionContext permissionContext; private final IEquipmentStatusLogService statusLogService; + private final ISystemDeptService systemDeptService; @Override public Long saveOrUpdateApproval(EquipmentStatusApproval approvalForm) { @@ -199,9 +203,21 @@ public Page allPage(Page page, EquipmentStatusQueryForm queryForm) { QueryWrapper queryWrapper = commonQuery(queryForm); queryWrapper.eq("approval.approval_status",ApprovalStatusEnum.PASSED); - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - dataScope.setScopeName("info.dept_id"); - List list = this.baseMapper.listScopePage(dataScope, page, queryWrapper); +// DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); +// dataScope.setScopeName("info.dept_id"); + + // 如果当前用户所在组织机构 的级别是受检单位，查本单位下所有连的；否则查当前用户所在连的 + List userDeptList = systemDeptService.getUserDeptList(null); + List userDeptIds = new ArrayList<>(); + if(ObjectUtil.isNotEmpty(userDeptList)) { + userDeptIds.add(permissionContext.getAuthService().getLoginUser().getDeptId()); + userDeptIds = userDeptList.stream().map(Dept::getId).collect(Collectors.toList()); + } + if(CollUtil.isEmpty(userDeptIds) || userDeptIds.size() <= 0){ + return page; + } + queryWrapper.in("info.dept_id",userDeptIds); + List list = this.baseMapper.listScopePage(null, page, queryWrapper); list.forEach(this::warpApprovalInfo); page.setRecords(list); return page; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemSignServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemSignServiceImpl.java index 5c841ed..dac2ff7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemSignServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemSignServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.impl.system; import cn.hutool.core.lang.Assert; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -80,9 +81,13 @@ private void wrapper(SystemSign systemSign){ User user = userMapper.selectById(systemSign.getSignUserId()); - systemSign.setSignDeptId(user.getDeptId()); - Dept dept = deptMapper.selectById(user.getDeptId()); - systemSign.setSignDeptName(dept.getFullName()); + if(ObjectUtil.isNotEmpty(user)){ + systemSign.setSignDeptId(user.getDeptId()); + Dept dept = deptMapper.selectById(user.getDeptId()); + if(ObjectUtil.isNotEmpty(dept)){ + systemSign.setSignDeptName(dept.getFullName()); + } + } } @Override diff --git a/pom.xml b/pom.xml index 862573c..e6e45e1 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.casic casic-metering-eqpt-xichang - 1.2.0.6 + 1.2.0.7 casic-metering-eqpt-xichang pom