代码合并

RMS/RMS.iml

@@ -0,0 +1,227 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="web" name="Web">
+      <configuration>
+        <webroots />
+      </configuration>
+    </facet>
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: org.springdoc:springdoc-openapi-ui:1.6.6" level="project" />
+    <orderEntry type="library" name="Maven: org.springdoc:springdoc-openapi-webmvc-core:1.6.6" level="project" />
+    <orderEntry type="library" name="Maven: org.springdoc:springdoc-openapi-common:1.6.6" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-core:2.1.12" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.12.6" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-annotations:2.1.12" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-models:2.1.12" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
+    <orderEntry type="library" name="Maven: org.webjars:swagger-ui:4.5.0" level="project" />
+    <orderEntry type="library" name="Maven: org.webjars:webjars-locator-core:0.46" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.12.6" level="project" />
+    <orderEntry type="library" name="Maven: io.github.classgraph:classgraph:4.8.138" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.5.9" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.5.9" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.5.9" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.5.9" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.10" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.10" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.17.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.17.1" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.33" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
+    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.28" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.15" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.15" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.7" level="project" />
+    <orderEntry type="library" name="Maven: com.deepoove:poi-tl:1.10.3" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.33" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.deepoove:poi-ooxml-schemas-extra:4.1.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-transcoder:1.14" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-anim:1.14" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-css:1.14" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-ext:1.14" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-parser:1.14" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-svg-dom:1.14" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-awt-util:1.14" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:xmlgraphics-commons:2.6" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.0.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-bridge:1.14" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-script:1.14" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-dom:1.14" level="project" />
+    <orderEntry type="library" name="Maven: xalan:xalan:2.7.2" level="project" />
+    <orderEntry type="library" name="Maven: xalan:serializer:2.7.2" level="project" />
+    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-gvt:1.14" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-shared-resources:1.14" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-svggen:1.14" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-util:1.14" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-constants:1.14" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-i18n:1.14" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-xml:1.14" level="project" />
+    <orderEntry type="library" name="Maven: xml-apis:xml-apis-ext:1.3.04" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-codec:1.14" level="project" />
+    <orderEntry type="library" name="Maven: cn.dev33:sa-token-spring-boot-starter:1.29.0" level="project" />
+    <orderEntry type="library" name="Maven: cn.dev33:sa-token-servlet:1.29.0" level="project" />
+    <orderEntry type="library" name="Maven: cn.dev33:sa-token-dao-redis-jackson:1.29.0" level="project" />
+    <orderEntry type="library" name="Maven: cn.dev33:sa-token-core:1.29.0" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.10" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.10" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.5.9" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:2.0.12" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2-extension:2.0.12" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2:2.0.12" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.21" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.6" level="project" />
+    <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.12.6" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.12.6" level="project" />
+    <orderEntry type="library" name="Maven: com.ejlchina:okhttps:3.1.1" level="project" />
+    <orderEntry type="library" name="Maven: com.ejlchina:data-core:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.17.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-thymeleaf:2.5.9" level="project" />
+    <orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf-spring5:3.0.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf:3.0.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.attoparser:attoparser:2.0.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.unbescape:unbescape:1.1.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.thymeleaf.extras:thymeleaf-extras-java8time:3.0.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.6.5" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.7" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.3.4" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.3.4" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.3.4" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.3.4" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.3.4" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.5.9" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:4.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.15" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.5.9" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.5.8" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.5.8" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.5.8" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.15" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.3.15" level="project" />
+    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:6.1.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.73.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.73.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.73.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.73.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.73.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-tcnative-classes:2.0.46.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.73.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.4.14" level="project" />
+    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.5.9" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.5.9" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.12.6" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.12.6" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.12.6" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.5.9" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.56" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.56" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.56" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.15" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.15" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.15" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.15" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:2.5.9" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.3.15" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:5.3.15" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.9.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:8.0.28" level="project" />
+    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.22" level="project" />
+    <orderEntry type="library" name="Maven: junit:junit:4.13.2" level="project" />
+    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-mail:2.5.9" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.3.15" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.mail:jakarta.mail:1.6.7" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.activation:jakarta.activation:1.2.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.5.9" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.5.9" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.5.9" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.5.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.4.7" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:2.4.7" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:9.1" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.19.0" level="project" />
+    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter:5.7.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.7.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.7.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-params:5.7.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.7.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.7.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:3.9.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.10.22" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.22" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:3.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-junit-jupiter:3.9.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.15" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.15" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.3.15" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.8.4" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.9.1" level="project" />
+    <orderEntry type="library" name="Maven: io.github.draco1023:poi-tl-ext:0.4.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:ooxml-schemas:1.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.0.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: net.sourceforge.cssparser:cssparser:0.9.29" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.w3c.css:sac:1.3" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.jsoup:jsoup:1.15.3" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: net.sf.saxon:Saxon-HE:11.4" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.xmlresolver:xmlresolver:4.4.3" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.httpcomponents.client5:httpclient5:5.0.4" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.httpcomponents.core5:httpcore5-h2:5.1.3" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.httpcomponents.core5:httpcore5:5.1.3" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.xmlresolver:xmlresolver:data:4.4.3" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: de.rototor.snuggletex:snuggletex-core:1.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.twelvemonkeys.imageio:imageio-batik:3.8.3" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.twelvemonkeys.imageio:imageio-core:3.8.3" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.twelvemonkeys.common:common-lang:3.8.3" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.twelvemonkeys.common:common-io:3.8.3" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.twelvemonkeys.common:common-image:3.8.3" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.xmlgraphics:batik-rasterizer-ext:1.15" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.xmlgraphics:batik-svgrasterizer:1.15" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.xmlgraphics:batik-extension:1.15" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-amqp:2.5.9" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.amqp:spring-rabbit:2.3.14" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.amqp:spring-amqp:2.3.14" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
+    <orderEntry type="library" name="Maven: com.rabbitmq:amqp-client:5.12.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.7" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.4.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.2" level="project" />
+  </component>
+</module>

RMS/src/main/java/cn/cslg/report/common/model/dto/invalidReReport/ArgumentsDTO.java

@@ -63,6 +63,8 @@ public class ArgumentsDTO  {
      */
     private String scratchType ;
 
+    private   Integer scratchId;
+
     /**
      * 划词颜色
      */

RMS/src/main/java/cn/cslg/report/common/model/dto/invalidReReport/InvalidReasonDTO.java

@@ -71,6 +71,7 @@ public class InvalidReasonDTO {
          */
         private String argumentStr;
 
+        private Integer isCommon;
         private List<GroupDetail> groupDetails;
     }
 

RMS/src/main/java/cn/cslg/report/common/model/dto/invalidReReport/ProofGroupDTO.java

@@ -26,7 +26,6 @@ public class ProofGroupDTO {
      * 陈述意见
      */
     private String argumentStr;
-
     private List<GroupDetail> groupDetails;
 
 

RMS/src/main/java/cn/cslg/report/common/model/vo/invalidReReport/ArgumentsDetailsVO.java

@@ -49,7 +49,7 @@ public class ArgumentsDetailsVO {
     /**
      * 权要id
      */
-    private Integer rightId;
+    private Integer rightSort;
 
     /**
      * 特征id

RMS/src/main/java/cn/cslg/report/controller/InvalidReReport/ArgumentsController.java

@@ -7,11 +7,13 @@ import cn.cslg.report.common.model.dto.invalidReReport.ArgumentsDetailsDTO;
 import cn.cslg.report.common.model.dto.invalidReReport.ArgumentsListDTO;
 import cn.cslg.report.common.utils.Response;
 import cn.cslg.report.entity.invalidReReport.AssoFeatureProof;
+import cn.cslg.report.entity.invalidReReport.ProofStr;
 import cn.cslg.report.service.business.AssoRecordsFeatureService;
 import cn.cslg.report.service.business.InvalidReReport.ArgumentsService;
 import cn.cslg.report.service.business.InvalidReReport.AssoFeatureProofService;
 import cn.cslg.report.service.business.InvalidReReport.ProofStrService;
 import cn.cslg.report.service.business.asso.AssoReportPersonService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
@@ -42,10 +44,11 @@ public class ArgumentsController {
         return argumentsService.addArguments(argumentsDTO);
     }
 
-    @Operation(summary = "删除陈述意见")
-    @PostMapping("/deleteArguments")
-    public String deleteArguments(@RequestBody List<Integer> argumentsIds) {
-        argumentsService.deleteArguments(argumentsIds);
+    @Operation(summary = "删除无效理由")
+    @PostMapping("/deleteProofStr")
+    public String deleteArguments(@RequestBody List<Integer> invalidStrIds ) {
+        //根据无效理由id查询
+        argumentsService.deleteProofStr(invalidStrIds);
         return Response.success("删除成功");
     }
 

RMS/src/main/java/cn/cslg/report/controller/InvalidReReport/InvalidReasonController.java

@@ -4,6 +4,7 @@ import cn.cslg.report.common.core.base.Constants;
 import cn.cslg.report.common.model.dto.invalidReReport.CheckReFeaturesDTO;
 import cn.cslg.report.common.model.dto.invalidReReport.InvalidReasonDTO;
 import cn.cslg.report.common.model.dto.invalidReReport.InvalidReasonFieldValueDTO;
+import cn.cslg.report.common.model.dto.invalidReReport.UpdateArgumentStrDTO;
 import cn.cslg.report.common.model.vo.invalidReReport.QueryInvalidReasonVO;
 import cn.cslg.report.common.utils.Response;
 import cn.cslg.report.service.business.ExportArgumentsScenariosService;
@@ -96,7 +97,12 @@ public class InvalidReasonController {
         }
         return Response.success("添加成功");
     }
-
+    @Operation(summary = "更新无效理由和证据")
+    @PostMapping("/updateArgumentStr")
+    public String updateArgumentStr(@RequestBody UpdateArgumentStrDTO updateArgumentStrDTO) throws IOException {
+        invalidReasonService.updateArgumentStr(updateArgumentStrDTO);
+        return Response.success();
+    }
     @Operation(summary = "导出无效理由")
     @GetMapping("/exportInvalid")
     public String exportInvalid(Integer reportId) throws IOException {

RMS/src/main/java/cn/cslg/report/service/business/ExportArgumentsScenariosService.java

@@ -50,10 +50,10 @@ public class ExportArgumentsScenariosService {
     private final CacheUtils cacheUtils;
     private final LoginUtils loginUtils;
     private final ReportService reportService;
-    public String ExportToWord(Integer reportId) throws IOException {
 
+    public String ExportToWord(Integer reportId) throws IOException {
         //根据报告id查询报告
-        Report report =reportService.getById(reportId);
+        Report report = reportService.getById(reportId);
         String templeName = IdUtil.simpleUUID() + ".docx";
         String directoryName = fileUtils.createDirectory();
         //富文本栏位计数器
@@ -88,9 +88,9 @@ public class ExportArgumentsScenariosService {
         //根据报告id查询无效理由
         List<QueryInvalidReasonVO> queryInvalidReasonVOS = invalidReasonService.queryInvalidReason(reportId);
         //根据无效类型排序，方便合并单元格
-        queryInvalidReasonVOS.sort(Comparator.comparing(QueryInvalidReasonVO::getInvalidName));
+        queryInvalidReasonVOS.sort(Comparator.comparing(QueryInvalidReasonVO::getInvalidName).thenComparing(QueryInvalidReasonVO::getContent));
         //设置标题
-        WordUtil.setParagraph(doc, report.getName()+"无效理由", "宋体", 16, 10, true, ParagraphAlignment.CENTER);
+        WordUtil.setParagraph(doc, report.getName() + "无效理由", "宋体", 16, 10, true, ParagraphAlignment.CENTER);
         //设置副标题
         WordUtil.setParagraph(doc, "生成时间：" + new Date().toString(), "宋体", 10, 10, true, ParagraphAlignment.RIGHT);
         int colTotalCount = fields.size() + 5;
@@ -98,7 +98,7 @@ public class ExportArgumentsScenariosService {
         int dataCount = queryInvalidReasonVOS.size();
         //创建表格
         XWPFTable xTable = doc.createTable(1, colTotalCount);
-        CTTblPr tblPr =xTable.getCTTbl().addNewTblPr();
+        CTTblPr tblPr = xTable.getCTTbl().addNewTblPr();
         tblPr.addNewJc().setVal(STJc.CENTER);
         //设置边框
         WordUtil.setTableBolder(xTable, 10, "000000");
@@ -107,7 +107,7 @@ public class ExportArgumentsScenariosService {
             WordUtil.setCellText(xTable.getRow(0).getCell(j), nameList.get(j), 1200, "宋体", 10, true);
         }
         //记录对比文件文件内容map
-        Map<Integer,String> fileMap = new TreeMap<>();
+        Map<Integer, String> fileMap = new TreeMap<>();
         //记录合并数据map
         Map<Integer, Integer> map = new HashMap<>();
         // 创建表格内容
@@ -156,19 +156,31 @@ public class ExportArgumentsScenariosService {
                         for (int t = 0; t < proofGroupIns.size(); t++) {
                             List<QueryInvalidReasonVO.proofIn> proofIns = proofGroupIns.get(t).getProofs();
                             for (int i = 0; i < proofIns.size(); i++) {
-                                QueryInvalidReasonVO.proofIn proofIn =proofIns.get(i);
+                                QueryInvalidReasonVO.proofIn proofIn = proofIns.get(i);
                                 //生成对比文件组合名称
                                 if (t == 0 && i == 0) {
-                                    stringBuilder.append("D" +proofIn.getSort());
+                                    if (proofIn.getId() == 0) {
+                                        stringBuilder.append("公知常识");
+                                    } else {
+                                        stringBuilder.append("D" + proofIn.getSort());
+                                    }
 
                                 } else if (t != 0 && i == 0) {
-                                    stringBuilder.append(" D" + proofIn.getSort());
+                                    if (proofIn.getId() == 0) {
+                                        stringBuilder.append(" 公知常识");
+                                    } else {
+                                        stringBuilder.append(" D" + proofIn.getSort());
+                                    }
                                 } else {
-                                    stringBuilder.append("+D" + proofIn.getSort());
+                                    if (proofIn.getId() == 0) {
+                                        stringBuilder.append("+公知常识");
+                                    } else {
+                                        stringBuilder.append("+D" + proofIn.getSort());
+                                    }
                                 }
                                 //记录对比文件名称字典
-                                if(fileMap.get(proofIn.getSort())==null){
-                                    fileMap.put(proofIn.getSort(),proofIn.getFileName());
+                                if (fileMap.get(proofIn.getSort()) == null&&proofIn.getId()!=0) {
+                                    fileMap.put(proofIn.getSort(), proofIn.getFileName());
                                 }
                             }
 
@@ -189,24 +201,23 @@ public class ExportArgumentsScenariosService {
                 }
             }
         }
-
         //添加文件说明行
         XWPFTableRow row = xTable.insertNewTableRow(dataCount + 1);
         XWPFTableCell cell = row.createCell();
         XWPFRun run;
         run = WordUtil.setTableCellStyle(cell, "1200", ParagraphAlignment.CENTER, "微软雅黑", 9, false);
-         List<String> fileNames =new ArrayList<>();
-        for(Integer key:fileMap.keySet()){
-           fileNames.add("D"+key+"是"+ fileMap.get(key));
-         }
-    String  fileText =   StringUtils.join(fileNames, ",");
+        List<String> fileNames = new ArrayList<>();
+        for (Integer key : fileMap.keySet()) {
+            fileNames.add("D" + key + "是" + fileMap.get(key));
+        }
+        String fileText = StringUtils.join(fileNames, ",");
         run.setText(fileText);
-        for(Integer p=0;p<colTotalCount-1;p++){
+        for (Integer p = 0; p < colTotalCount - 1; p++) {
             XWPFTableCell cellTem = row.createCell();
             XWPFRun runTem;
             runTem = WordUtil.setTableCellStyle(cellTem, "1200", ParagraphAlignment.CENTER, "微软雅黑", 9, false);
         }
-        WordUtil.mergeCellsHorizontal(xTable,dataCount + 1,0,colTotalCount-1);
+        WordUtil.mergeCellsHorizontal(xTable, dataCount + 1, 0, colTotalCount - 1);
         //记录合并起始位置
         Integer t = 1;
         for (int i : map.keySet()) {

RMS/src/main/java/cn/cslg/report/service/business/InvalidReReport/ArgumentsService.java

@@ -49,7 +49,7 @@ public class ArgumentsService extends ServiceImpl<ArgumentsMapper, Arguments> {
     private final ReportService reportService;
     private final CompareFilesService compareFilesService;
     private final ProofStrService proofStrService;
-
+    private final AssoProofGroupStrService assoProofGroupStrService;
     /**
      * 添加陈述意见
      *
@@ -111,6 +111,7 @@ public class ArgumentsService extends ServiceImpl<ArgumentsMapper, Arguments> {
             if (argumentsDTO.getContent() != null) {
                 Scratch scratch = new Scratch();
                 BeanUtils.copyProperties(argumentsDTO, scratch);
+                scratch.setId(argumentsDTO.getScratchId());
                 //根据证据类型获得证据的专利号
                 CompareFiles compareFiles = compareFilesService.getById(arguments.getProofId());
                 String patenNo = compareFiles.getPatentNo();
@@ -119,7 +120,7 @@ public class ArgumentsService extends ServiceImpl<ArgumentsMapper, Arguments> {
                 scratch.setArgumentId(arguments.getId());
                 scratch.setReportId(argumentsDTO.getReportId());
                 scratch.setScratchColor(argumentsDTO.getColor());
-                scratch.insert();
+                scratch.insertOrUpdate();
             }
         }
         return Response.success("添加成功");
@@ -208,6 +209,7 @@ public class ArgumentsService extends ServiceImpl<ArgumentsMapper, Arguments> {
             Arguments argument = arguments.stream().filter(tem -> tem.getId().equals(item.getArgumentId())).findFirst().orElse(null);
             BeanUtils.copyProperties(argument, argumentsDetailsVO);
             BeanUtils.copyProperties(item, argumentsDetailsVO);
+            argumentsDetailsVO.setRightSort(argument.getRightSort());
             ProofStr proofStr = proofStrs.stream().filter(tem -> tem.getFeatureId().equals(argument.getFeatureId())).findFirst().orElse(null);
             if (proofStr != null) {
                 argumentsDetailsVO.setProofStr(proofStr.getProofStr());
@@ -443,11 +445,25 @@ public class ArgumentsService extends ServiceImpl<ArgumentsMapper, Arguments> {
 
         return true;
     }
+    public boolean deleteProofStr(List<Integer> ids ) {
+        LambdaQueryWrapper<ProofStr> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(ProofStr::getId,ids);
+        List<ProofStr> proofStrs =proofStrService.list(wrapper);
+        //根据无效理由id查询陈述意见
+        LambdaQueryWrapper<Arguments> argumentsLambdaQueryWrapper =new LambdaQueryWrapper<>();
+        argumentsLambdaQueryWrapper.in(Arguments::getProofStrId,ids);
+        List<Arguments> arguments =this.list(argumentsLambdaQueryWrapper);
+        List<Integer> argumentIds =arguments.stream().map(Arguments::getId).collect(Collectors.toList());
+        if(argumentIds.size()!=0){
+            this.deleteArguments(argumentIds);
+        }
+        //删除
+        LambdaQueryWrapper<AssoProofGroupStr> wrapper1 =new LambdaQueryWrapper<>();
+        wrapper1.in(AssoProofGroupStr::getProofStrId,ids);
+        assoProofGroupStrService.remove(wrapper1);
+        proofStrService.removeByIds(ids);
+        return true;
+    }
 
 
-    public static void main(String[] args) {
-        String a = Response.error();
-        Response av = JSONObject.parseObject(a, Response.class);
-        System.out.println(av.getCode());
-    }
 }

RMS/src/main/java/cn/cslg/report/service/business/InvalidReReport/InvalidReasonService.java

@@ -270,6 +270,7 @@ public class InvalidReasonService extends ServiceImpl<InvalidReasonMapper, Inval
         if (invalidName.equals(1)) {//若类型为1，则为说明书公开不充分,涉及内容为说明书，手动输入无效证据
             BeanUtils.copyProperties(invalidReasonDTO, invalidReason);
             //说明书公开不充分入表
+            invalidReason.setContent(-1);
             invalidReason.updateById();
         } else if (invalidName.equals(0)) {//若类型为0，则为“权利要求不清楚”，需要选择涉及内容（content）并输入相关证据（proofStr）
             if (invalidReasonDTO.getProofStr() != null && invalidReasonDTO.getProofStr() != "") {
@@ -347,7 +348,7 @@ public class InvalidReasonService extends ServiceImpl<InvalidReasonMapper, Inval
                 List<Integer> noDeleteIds = new ArrayList<>();
                 for (InvalidReasonDTO.ProofGroupIn proofGroupIn : invalidReasonDTO.getProofGroups()) {
                     if (proofGroupIn.getId() != null) {
-                        noDeleteIds .add(proofGroupIn.getId());
+                        noDeleteIds.add(proofGroupIn.getId());
                     } else {
                         ProofGroupDTO proofGroupDTO = new ProofGroupDTO();
                         proofGroupDTO.setInvalidReasonId(invalidReason.getId());//无效理由id
@@ -358,9 +359,11 @@ public class InvalidReasonService extends ServiceImpl<InvalidReasonMapper, Inval
                     }
                 }
                 //删除无效理由的证据组合
-                if(noDeleteIds.size()!=0) {
                     LambdaQueryWrapper<ProofGroup> lambdaQueryWrapper =new LambdaQueryWrapper<>();
-                    lambdaQueryWrapper.notIn(ProofGroup::getId,noDeleteIds).eq(ProofGroup::getInvalidReasonId,invalidReason.getId());
+                    lambdaQueryWrapper.eq(ProofGroup::getInvalidReasonId,invalidReason.getId());
+                if(noDeleteIds.size()!=0) {
+                    lambdaQueryWrapper.notIn(ProofGroup::getId,noDeleteIds);
+                }
                     List<ProofGroup> proofGroups =proofGroupService.list(lambdaQueryWrapper);
                     List<Integer> deleteIds =proofGroups.stream().map(ProofGroup::getId).collect(Collectors.toList());
                     if(deleteIds.size()!=0) {
@@ -369,7 +372,7 @@ public class InvalidReasonService extends ServiceImpl<InvalidReasonMapper, Inval
                         assoProofGroupStrService.remove(queryWrapper);
                         proofGroupService.removeByIds(deleteIds);
                     }
-                }
+
                 proofGroupService.addProofGroup(proofGroupDTOS);
             } else {
                 return Response.error("证据组合不能为空");
@@ -500,6 +503,14 @@ public class InvalidReasonService extends ServiceImpl<InvalidReasonMapper, Inval
                 proof.setFileName(item.getFileName());
                 proofIns.add(proof);
             });
+            //公知常识添加·
+            if(proofIds.contains(0)){
+                QueryInvalidReasonVO.proofIn proof = new QueryInvalidReasonVO.proofIn();
+                proof.setId(0);
+                proof.setSort(proofIds.size()+1);
+                proof.setFileName("公知常识");
+                proofIns.add(proof);
+            }
             proofGroupIn.setProofIds(proofIds);
             proofIns.sort(Comparator.comparing(QueryInvalidReasonVO.proofIn::getSort));
             proofGroupIn.setProofs(proofIns);

RMS/src/main/java/cn/cslg/report/service/business/InvalidReReport/ProofGroupService.java

@@ -72,13 +72,15 @@ public class ProofGroupService extends ServiceImpl<ProofGroupMapper, ProofGroup>
                     assoProofGroup.setCreateId(personnelVO.getId());
                     assoProofGroups.add(assoProofGroup);
                     List<Integer> proofStrIds = proofGroupDTO.getGroupDetails().get(i).getProofStrIds();
-                    proofStrIds.forEach(item -> {
-                        AssoProofGroupStr assoProofGroupStr = new AssoProofGroupStr();
-                        assoProofGroupStr.setProofGroupId(proofGroup.getId());
-                        assoProofGroupStr.setProofStrId(item);
-                        assoProofGroupStr.setCompareFileId(compareFileId);
-                        assoProofGroupStrs.add(assoProofGroupStr);
-                    });
+                    if(proofStrIds!=null) {
+                        proofStrIds.forEach(item -> {
+                            AssoProofGroupStr assoProofGroupStr = new AssoProofGroupStr();
+                            assoProofGroupStr.setProofGroupId(proofGroup.getId());
+                            assoProofGroupStr.setProofStrId(item);
+                            assoProofGroupStr.setCompareFileId(compareFileId);
+                            assoProofGroupStrs.add(assoProofGroupStr);
+                        });
+                    }
                 }
                 assoProofGroupService.saveBatch(assoProofGroups);
                 assoProofGroupStrService.saveBatch(assoProofGroupStrs);

RMS/src/main/resources/application.yml

@@ -26,7 +26,7 @@ spring:
       max-file-size: 1000MB
       max-request-size: 1000MB
   profiles:
-    active: dev
+    active: prodNetIn
   jackson:
     default-property-inclusion: non_null
     serialization:

RMS/src/main/resources/mapper/InvalidReasonFieldValueMapper.xml

@@ -15,7 +15,7 @@
             resultType="cn.cslg.report.common.model.dto.invalidReReport.InvalidReasonFieldValueDTO"
             parameterType="java.lang.Integer">
         select a.INVALID_REASON_ID as invalidReasonId ,a.INVALID_REASON_FIELD_ID as fieldId ,a.FIELD_VALUE as
-        fieldValue,b.FIELD_KEY as fieldKey  from RMS_TEST.INVALID_REASON_FIELD_VALUE a left join RMS_TEST.INVALID_REASON_FIELD b on
+        fieldValue,b.FIELD_KEY as fieldKey  from INVALID_REASON_FIELD_VALUE a left join INVALID_REASON_FIELD b on
         a.INVALID_REASON_FIELD_ID=b.ID
         <where>
             a.INVALID_REASON_ID in

RMS/target/classes/application.yml

@@ -26,7 +26,7 @@ spring:
       max-file-size: 1000MB
       max-request-size: 1000MB
   profiles:
-    active: dev
+    active: prodNetIn
   jackson:
     default-property-inclusion: non_null
     serialization: