Merge branch 'master' of http://101.36.160.140:21044/depot-tianjin/depot-web-tianjin

.gitignore

@@ -1,15 +1,38 @@
-# ---> Java
-*.class
-target
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.jar
-*.war
-*.ear
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
-
-.DS_Store
+# ---> Java
+*.class
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+
+.DS_Store
+node_modules
+/dist
+build
+
+# local env files
+.env.local
+.env.*.local
+
+# Log files
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
+云南智能化粮库系统使用手册.pdf

Dockerfile

@@ -1,6 +1,6 @@
-FROM 192.168.123.25:31104/unis/java:8
-
-ADD ./target/depot-web.jar /root
-CMD ["sh", "-c", "cd /root; java -Djava.security.egd=file:/dev/./urandom -jar /root/depot-web.jar --depot-web.server.enable-self-preservation=false"]
-EXPOSE 9025
-
+FROM 192.168.123.25:31104/unis/java:8
+
+ADD ./target/depot-web.jar /root
+CMD ["sh", "-c", "cd /root; java -Djava.security.egd=file:/dev/./urandom -jar /root/depot-web.jar --depot-web.server.enable-self-preservation=false"]
+EXPOSE 9025
+

LICENSE

@@ -1,8 +1,8 @@
-MIT License
-Copyright (c) <year> <copyright holders>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+MIT License
+Copyright (c) <year> <copyright holders>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

depot-web.iml

@@ -1,204 +1,204 @@
-<?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="Spring" name="Spring">
-      <configuration />
-    </facet>
-    <facet type="web" name="Web">
-      <configuration>
-        <webroots />
-      </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.springframework.boot:spring-boot-starter-web:2.0.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.0.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.0.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.0.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.0.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.10.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.10.0" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.25" level="project" />
-    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.19" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.0.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.6" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.6" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.0.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:8.5.32" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:8.5.32" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.32" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.11.Final" level="project" />
-    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.4" level="project" />
-    <orderEntry type="library" name="Maven: org.openjfx:javafx.base:11.0.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.openjfx:javafx.base:linux:11.0.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.openjfx:javafx.base:mac:11.0.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.openjfx:javafx.base:win:11.0.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.0.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.0.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.0.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.0.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.0.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.0.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.2.3" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.2.3" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.2" level="project" />
-    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-config:2.0.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:2.0.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:2.0.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.0.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:2.0.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.56" level="project" />
-    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.56" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-config-client:2.0.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.6" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.6" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.0.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:2.7.9" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.0.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.5" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-eureka-client:2.0.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-core:2.0.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.0.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.13" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-eureka-client:2.0.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.eureka:eureka-client:1.9.2" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.codehaus.jettison:jettison:1.3.7" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: stax:stax-api:1.0.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-eventbus:0.3.0" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-infix:0.3.0" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: commons-jxpath:commons-jxpath:1.3" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: joda-time:joda-time:2.9.9" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.antlr:antlr-runtime:3.4" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.antlr:stringtemplate:3.2.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: antlr:antlr:2.7.7" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.google.code.gson:gson:2.8.5" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.commons:commons-math:2.2" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-core:0.7.6" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava:16.0" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.ws.rs:jsr311-api:1.1.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.servo:servo-core:0.12.21" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-core:1.19.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-client:1.19.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey.contribs:jersey-apache-client4:1.19.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.6" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.10" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.google.inject:guice:4.1.0" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: aopalliance:aopalliance:1.0" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.github.vlsi.compactmap:compactmap:1.2.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.github.andrewoma.dexx:dexx-collections:0.2" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.eureka:eureka-core:1.9.2" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.codehaus.woodstox:woodstox-core-asl:4.4.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.xml.stream:stax-api:1.0-2" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.codehaus.woodstox:stax2-api:3.1.4" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-archaius:2.0.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.0.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-archaius:2.0.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.8" level="project" />
-    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-ribbon:2.0.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon:2.2.5" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.ribbon:ribbon-transport:2.2.5" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-contexts:0.4.9" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-servo:0.4.9" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty:0.4.9" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: io.netty:netty-codec-http:4.1.27.Final" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: io.netty:netty-transport-native-epoll:4.1.27.Final" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: io.netty:netty-transport-native-unix-common:4.1.27.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-core:2.2.5" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-httpclient:2.2.5" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-loadbalancer:2.2.5" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-statistics:0.1.1" level="project" />
-    <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.3.8" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-eureka:2.2.5" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
-    <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.4.10" level="project" />
-    <orderEntry type="library" name="Maven: xmlpull:xmlpull:1.1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.4c" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-zuul:2.0.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-zuul:2.0.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.netflix-commons:netflix-commons-util:0.3.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-actuator:2.0.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator-autoconfigure:2.0.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator:2.0.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.micrometer:micrometer-core:1.0.6" level="project" />
-    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.10" level="project" />
-    <orderEntry type="library" name="Maven: org.latencyutils:LatencyUtils:2.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-hystrix:2.0.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.5.12" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-serialization:1.5.12" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.fasterxml.jackson.module:jackson-module-afterburner:2.9.6" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-metrics-event-stream:1.5.12" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-javanica:1.5.12" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.commons:commons-lang3:3.7" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
-    <orderEntry type="library" name="Maven: io.reactivex:rxjava-reactive-streams:1.2.1" level="project" />
-    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.2" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.zuul:zuul-core:1.3.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: commons-io:commons-io:2.4" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.2.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.0.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.0.8.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.0.4.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.0.4.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.0.4.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.9.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:2.15.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.7.11" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.7.11" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" 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" scope="TEST" name="Maven: org.springframework:spring-test:5.0.8.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.5.1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.0.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.0.9.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.0.9.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.0.9.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.0.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.0.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.0.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.0.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.1.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.27.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.27.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.27.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.27.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.27.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.27.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.session:spring-session-data-redis:2.0.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.session:spring-session-core:2.0.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.gbase8s:ifxjdbc:1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.gbase:druid:1.0.28" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.37" level="project" />
-  </component>
+<?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="Spring" name="Spring">
+      <configuration />
+    </facet>
+    <facet type="web" name="Web">
+      <configuration>
+        <webroots />
+      </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.springframework.boot:spring-boot-starter-web:2.0.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.0.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.0.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.0.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.0.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.10.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.10.0" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.25" level="project" />
+    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.19" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.0.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.6" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.6" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.6" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.0.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:8.5.32" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:8.5.32" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.32" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.11.Final" level="project" />
+    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.4" level="project" />
+    <orderEntry type="library" name="Maven: org.openjfx:javafx.base:11.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.openjfx:javafx.base:linux:11.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.openjfx:javafx.base:mac:11.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.openjfx:javafx.base:win:11.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.0.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.0.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.0.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.0.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.0.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.0.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-config:2.0.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:2.0.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:2.0.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.0.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:2.0.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.56" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.56" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-config-client:2.0.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.6" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.6" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.0.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:2.7.9" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.0.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.5" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-eureka-client:2.0.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-core:2.0.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.0.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.13" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-eureka-client:2.0.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.eureka:eureka-client:1.9.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.codehaus.jettison:jettison:1.3.7" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: stax:stax-api:1.0.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-eventbus:0.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-infix:0.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: commons-jxpath:commons-jxpath:1.3" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: joda-time:joda-time:2.9.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.antlr:antlr-runtime:3.4" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.antlr:stringtemplate:3.2.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: antlr:antlr:2.7.7" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.google.code.gson:gson:2.8.5" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.commons:commons-math:2.2" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-core:0.7.6" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:16.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.ws.rs:jsr311-api:1.1.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.servo:servo-core:0.12.21" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-core:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-client:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey.contribs:jersey-apache-client4:1.19.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.6" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.10" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.google.inject:guice:4.1.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.inject:javax.inject:1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.github.vlsi.compactmap:compactmap:1.2.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.github.andrewoma.dexx:dexx-collections:0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.eureka:eureka-core:1.9.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.codehaus.woodstox:woodstox-core-asl:4.4.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.xml.stream:stax-api:1.0-2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.codehaus.woodstox:stax2-api:3.1.4" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-archaius:2.0.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.0.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-archaius:2.0.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.8" level="project" />
+    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-ribbon:2.0.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon:2.2.5" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.ribbon:ribbon-transport:2.2.5" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-contexts:0.4.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-servo:0.4.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty:0.4.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.netty:netty-codec-http:4.1.27.Final" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.netty:netty-transport-native-epoll:4.1.27.Final" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.netty:netty-transport-native-unix-common:4.1.27.Final" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-core:2.2.5" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-httpclient:2.2.5" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-loadbalancer:2.2.5" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-statistics:0.1.1" level="project" />
+    <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.3.8" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-eureka:2.2.5" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
+    <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.4.10" level="project" />
+    <orderEntry type="library" name="Maven: xmlpull:xmlpull:1.1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.4c" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-zuul:2.0.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-zuul:2.0.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.netflix-commons:netflix-commons-util:0.3.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-actuator:2.0.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator-autoconfigure:2.0.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator:2.0.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.micrometer:micrometer-core:1.0.6" level="project" />
+    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.10" level="project" />
+    <orderEntry type="library" name="Maven: org.latencyutils:LatencyUtils:2.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-hystrix:2.0.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.5.12" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-serialization:1.5.12" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.fasterxml.jackson.module:jackson-module-afterburner:2.9.6" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-metrics-event-stream:1.5.12" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-javanica:1.5.12" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.commons:commons-lang3:3.7" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
+    <orderEntry type="library" name="Maven: io.reactivex:rxjava-reactive-streams:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.zuul:zuul-core:1.3.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: commons-io:commons-io:2.4" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.2.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.0.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.0.8.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.0.4.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.0.4.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.0.4.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.9.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:2.15.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.7.11" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.7.11" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" 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" scope="TEST" name="Maven: org.springframework:spring-test:5.0.8.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.5.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.0.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.0.9.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.0.9.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.0.9.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.0.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.0.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.0.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.0.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.1.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.27.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.27.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.27.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.27.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.27.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.27.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.session:spring-session-data-redis:2.0.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.session:spring-session-core:2.0.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.gbase8s:ifxjdbc:1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.gbase:druid:1.0.28" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.37" level="project" />
+  </component>
 </module>

pom.xml

@@ -1,157 +1,157 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<groupId>com.chinaitop</groupId>
-	<artifactId>depot-web</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
-	<packaging>jar</packaging>
-
-	<name>depot-web</name>
-	<description>Demo project for Spring Boot</description>
-
-	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.0.4.RELEASE</version>
-		<relativePath/> <!-- lookup parent from repository -->
-	</parent>
-
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<java.version>1.8</java.version>
-		<spring-cloud.version>Finchley.RELEASE</spring-cloud.version>
-	</properties>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
-		</dependency>
-		<!-- 引入spring boot自带的pagehelper插件 -->
-		<dependency>
-			<groupId>com.github.pagehelper</groupId>
-			<artifactId>pagehelper-spring-boot-starter</artifactId>
-			<version>1.2.3</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-config</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-config-server</artifactId>
-		</dependency>
-		<dependency>
-            <groupId>org.mybatis.spring.boot</groupId>
-            <artifactId>mybatis-spring-boot-starter</artifactId>
-            <version>1.3.2</version>
-        </dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
-		</dependency>
-		<dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-netflix-zuul</artifactId>
-        </dependency>
-		<!-- 网络抖动出现第一次调用失败,启用了重试功能 -->
-        <dependency>
-            <groupId>org.springframework.retry</groupId>
-            <artifactId>spring-retry</artifactId>
-        </dependency>
-		<!--<dependency>-->
-			<!--<groupId>org.springframework.boot</groupId>-->
-			<!--<artifactId>spring-boot-starter-tomcat</artifactId>-->
-			<!--<scope>provided</scope>-->
-		<!--</dependency>-->
-		<!--<dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>-->
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-		
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-redis</artifactId>
-		</dependency>
-		<dependency>  
-	        <groupId>org.springframework.session</groupId>  
-	        <artifactId>spring-session-data-redis</artifactId>  
-		</dependency>
-		
-		<!-- gbase依赖包 -->  
-		<dependency>
-	      	<groupId>com.gbase8s</groupId>
-	      	<artifactId>ifxjdbc</artifactId>
-	      	<version>1.0</version>
-	    </dependency>
-    	<dependency>
-      		<groupId>com.gbase</groupId>
-      		<artifactId>druid</artifactId>
-      		<version>1.0.28</version>
-    	</dependency>
-		<!-- 阿里巴巴json -->
-		<dependency>
-			<groupId>com.alibaba</groupId>
-			<artifactId>fastjson</artifactId>
-			<version>1.2.37</version>
-		</dependency>
-	</dependencies>
-
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-dependencies</artifactId>
-				<version>${spring-cloud.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
-
-	<build>
-		<finalName>${project.artifactId}</finalName>
-		<plugins>
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-				<version>2.5.5</version>
-			</plugin>
-		</plugins>
-		<!-- 如果不添加此节点mybatis的mapper.xml文件都会被漏掉。 -->
-		<resources>
-			<resource>
-				<directory>src/main/java</directory>
-				<includes>
-					<include>**/*.properties</include>
-					<include>**/*.xml</include>
-				</includes>
-				<filtering>false</filtering>
-			</resource>
-			<resource>
-				<directory>src/main/resources</directory>
-			</resource>
-		</resources>
-	</build>
-
-	<repositories>
-		<repository>
-			<id>spring-milestones</id>
-			<name>Spring Milestones</name>
-			<url>https://repo.spring.io/milestone</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-	</repositories>
-
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>com.chinaitop</groupId>
+	<artifactId>depot-web</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<packaging>jar</packaging>
+
+	<name>depot-web</name>
+	<description>Demo project for Spring Boot</description>
+
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>2.0.4.RELEASE</version>
+		<relativePath/> <!-- lookup parent from repository -->
+	</parent>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<java.version>1.8</java.version>
+		<spring-cloud.version>Finchley.RELEASE</spring-cloud.version>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+		<!-- 引入spring boot自带的pagehelper插件 -->
+		<dependency>
+			<groupId>com.github.pagehelper</groupId>
+			<artifactId>pagehelper-spring-boot-starter</artifactId>
+			<version>1.2.3</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-config</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-config-server</artifactId>
+		</dependency>
+		<dependency>
+            <groupId>org.mybatis.spring.boot</groupId>
+            <artifactId>mybatis-spring-boot-starter</artifactId>
+            <version>1.3.2</version>
+        </dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+		</dependency>
+		<dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-netflix-zuul</artifactId>
+        </dependency>
+		<!-- 网络抖动出现第一次调用失败,启用了重试功能 -->
+        <dependency>
+            <groupId>org.springframework.retry</groupId>
+            <artifactId>spring-retry</artifactId>
+        </dependency>
+		<!--<dependency>-->
+			<!--<groupId>org.springframework.boot</groupId>-->
+			<!--<artifactId>spring-boot-starter-tomcat</artifactId>-->
+			<!--<scope>provided</scope>-->
+		<!--</dependency>-->
+		<!--<dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>-->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+		
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-redis</artifactId>
+		</dependency>
+		<dependency>  
+	        <groupId>org.springframework.session</groupId>  
+	        <artifactId>spring-session-data-redis</artifactId>  
+		</dependency>
+		
+		<!-- gbase依赖包 -->  
+		<dependency>
+	      	<groupId>com.gbase8s</groupId>
+	      	<artifactId>ifxjdbc</artifactId>
+	      	<version>1.0</version>
+	    </dependency>
+    	<dependency>
+      		<groupId>com.gbase</groupId>
+      		<artifactId>druid</artifactId>
+      		<version>1.0.28</version>
+    	</dependency>
+		<!-- 阿里巴巴json -->
+		<dependency>
+			<groupId>com.alibaba</groupId>
+			<artifactId>fastjson</artifactId>
+			<version>1.2.37</version>
+		</dependency>
+	</dependencies>
+
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-dependencies</artifactId>
+				<version>${spring-cloud.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
+	<build>
+		<finalName>${project.artifactId}</finalName>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+				<version>2.5.5</version>
+			</plugin>
+		</plugins>
+		<!-- 如果不添加此节点mybatis的mapper.xml文件都会被漏掉。 -->
+		<resources>
+			<resource>
+				<directory>src/main/java</directory>
+				<includes>
+					<include>**/*.properties</include>
+					<include>**/*.xml</include>
+				</includes>
+				<filtering>false</filtering>
+			</resource>
+			<resource>
+				<directory>src/main/resources</directory>
+			</resource>
+		</resources>
+	</build>
+
+	<repositories>
+		<repository>
+			<id>spring-milestones</id>
+			<name>Spring Milestones</name>
+			<url>https://repo.spring.io/milestone</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+	</repositories>
+
+
+</project>

src/main/resources/static/app/basic/storehouse/controller/StorehouseCtrl.js

@@ -544,8 +544,75 @@ angular.module('app.basic')
         }
     }
 	
-	$scope.falseEnum = [{id:0,value:"否"},{id:1,value:"能"},{id:9,value:"其他或不确定"}];
-
+	$scope.falseEnum = [{id:1,value:"能"},{id:0,value:"否"},{id:9,value:"其他或不确定"}];
+	$scope.falseEnum2 = [{id:1,value:"是"},{id:0,value:"否"}];
+	// 储粮功效
+	$scope.clgxList = [
+		{ id: 0, value: "A类仓房" },
+		{ id: 1, value: "B类仓房" },
+		{ id: 2, value: "C类仓房" },
+		{ id: 3, value: "D类仓房" },
+	];
+	// 隔热性能
+	$scope.grxnList = [
+		{ id: 1, value: "Ⅰ级" },
+		{ id: 2, value: "Ⅱ级" },
+		{ id: 3, value: "Ⅲ级" },
+		{ id: 4, value: "Ⅳ级" },
+	];
+	// 结构材料
+	$scope.jgclList = [
+		{ id: 1, value: "Ⅰ级"},
+		{ id: 2, value: "Ⅱ级"},
+		{ id: 3, value: "Ⅲ级"},
+	];
+	// 气密性
+	$scope.qmxList = [
+		{ id: 1, value: "Ⅰ级" },
+		{ id: 2, value: "Ⅱ级" },
+		{ id: 3, value: "Ⅲ级" },
+		{ id: 4, value: "Ⅳ级" },
+	];
+	// 粮情技术
+	$scope.lqjsList = [
+		{ id: 1, value: "Ⅰ级" },
+		{ id: 2, value: "Ⅱ级" },
+		{ id: 3, value: "Ⅲ级" },
+		{ id: 4, value: "无粮情检测技术" },
+	];
+	// 通风系统形式
+	$scope.tfxtxsList = [
+		{ id: 0, value: "竖向通风"},
+		{ id: 1, value: "横向通风"},
+		{ id: 2, value: "径向通风"},
+		{ id: 3, value: "全网板通风"},
+		{ id: 4, value: "其它"},
+	];
+	// 通风技术
+	$scope.tfjsList = [
+		{ id: 1, value: "Ⅰ级"},
+		{ id: 2, value: "Ⅱ级"},
+		{ id: 3, value: "Ⅲ级"},
+	];
+	// 杀虫技术
+	$scope.scjsList = [
+		{ id: 1, value: "Ⅰ级"},
+		{ id: 2, value: "Ⅱ级"},
+	];
+	// 控温技术
+	$scope.kwjsList = [
+		{ id: 1, value: "Ⅰ级"},
+		{ id: 2, value: "Ⅱ级"},
+		{ id: 3, value: "Ⅲ级"},
+	];
+	// 挡粮门型式
+	$scope.dlmxsList = [
+		{ id: 1, value: "“一字型”挡粮板" },
+		{ id: 2, value: "“三角形”挡粮门" },
+		{ id: 3, value: "“弧形”挡粮门" },
+		{ id: 4, value: "围包" },
+		{ id: 5, value: "其它型式" },
+	];
 	//添加货位弹出窗口
 	$scope.editRow = function(warehouse, btnType) {
 		//先校验仓房必录数据，后添加货位

src/main/resources/static/app/basic/storehouse/views/Storehouse-edit.html

@@ -71,11 +71,13 @@
 										</tr>
 										<tr>
 											<th>
-												<label class="label" style="margin-top: 9px;text-align: center;">保管员</label>
+												<label class="label" style="margin-top: 9px;text-align: center;">保管员
+													<span style="color: red;margin-left: 5px;text-align: center;">*</span>
+												</label>
 											</th>
 											<th>
 												<label class="input">
-													<input type="text" ng-model="basicStorehouse.dutystoreman" ng-disabled="basicStorehouse.libraryType == 0 || isNotEdit" />
+													<input type="text" ng-model="basicStorehouse.dutystoreman" required ng-disabled="basicStorehouse.libraryType == 0 || isNotEdit" />
 												</label>
 											</th>
 											<th>
@@ -242,11 +244,11 @@
 												</label>
 											</th>
 											<th>
-												<label class="label" style="margin-top: 9px;text-align: center;">库门位置</label>
+												<label class="label" style="margin-top: 9px;text-align: center;">库门位置<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
 											</th>
 											<th>
 												<label class="input">
-													<input type="text" ng-model="basicStorehouse.houseDootPosition" ng-readonly="isNotEdit"
+													<input type="text" ng-model="basicStorehouse.houseDootPosition" ng-readonly="isNotEdit" required
 												name="houseDoorNum">
 												</label>
 											</th>
@@ -290,11 +292,11 @@
 												</label>
 											</th>
 											<th>
-												<label class="label" style="margin-top: 9px;text-align: center;">库门高度(m)</label>
+												<label class="label" style="margin-top: 9px;text-align: center;">库门高度(m)<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
 											</th>
 											<th>
 												<label class="input">
-													<input type="number" ng-model="basicStorehouse.houseDoorHeigth" ng-readonly="isNotEdit"
+													<input type="number" ng-model="basicStorehouse.houseDoorHeigth" ng-readonly="isNotEdit" required
 														name="houseDoorHeight" oninput="if(value.length>4) value=value.slice(0,4)"
 														onblur="this.value= this.value.match(/\d+(\.\d{0,2})?/) ? this.value.match(/\d+(\.\d{0,2})?/)[0] : ''" />
 												</label>
@@ -339,11 +341,11 @@
 												</label>
 											</th>
 											<th>
-												<label class="label" style="margin-top: 9px;text-align: center;">库门宽度(m)</label>
+												<label class="label" style="margin-top: 9px;text-align: center;">库门宽度(m)<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
 											</th>
 											<th>
 												<label class="input">
-													<input type="number" ng-model="basicStorehouse.houseDoorWidth" ng-readonly="isNotEdit"
+													<input type="number" ng-model="basicStorehouse.houseDoorWidth" ng-readonly="isNotEdit" required
 														name="houseDoorWidth" oninput="if(value.length>5) value=value.slice(0,5)" 
 														onblur="this.value= this.value.match(/\d+(\.\d{0,2})?/) ? this.value.match(/\d+(\.\d{0,2})?/)[0] : ''" />
 												</label>
@@ -489,34 +491,34 @@
 												</label>
 											</th>
 											<th>
-												<label class="label" style="margin-top: 9px;text-align: center;">有无防火防爆防盗设施</label>
+												<label class="label" style="margin-top: 9px;text-align: center;">有无防火防爆防盗设施<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
 											</th>
 											<th>
 												<label class="select">
 													<select ng-model="basicStorehouse.ywfhfbfdss" ng-disabled="isNotEdit"
-														ng-options="enum.id as enum.value for enum in falseEnum"
+														ng-options="enum.id as enum.value for enum in falseEnum" required
 														class="form-control">
 													</select>
 												</label>
 											</th>
 											<th>
-												<label class="label" style="margin-top: 9px;text-align: center;">能否散装储存</label>
+												<label class="label" style="margin-top: 9px;text-align: center;">能否散装储存<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
 											</th>
 											<th>
 												<label class="select">
-													<select ng-model="basicStorehouse.nfszcc" ng-disabled="isNotEdit"
+													<select ng-model="basicStorehouse.nfszcc" ng-disabled="isNotEdit" required
 														ng-options="enum.id as enum.value for enum in falseEnum"
 														class="form-control">
 													</select>
 												</label>
 											</th>
 											<th>
-												<label class="label" style="margin-top: 9px;text-align: center;">有无防鼠防雀防虫装置及设施</label>
+												<label class="label" style="margin-top: 9px;text-align: center;">有无防鼠防雀防虫装置及设施<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
 											</th>
 											<th>
 												<label class="select">
 													<select ng-model="basicStorehouse.ywfsfqfczz" ng-disabled="isNotEdit"
-														ng-options="enum.id as enum.value for enum in falseEnum"
+														ng-options="enum.id as enum.value for enum in falseEnum" required
 														class="form-control">
 													</select>
 												</label>
@@ -546,34 +548,34 @@
 												</label>
 											</th>
 											<th>
-												<label class="label" style="margin-top: 9px;text-align: center;">有无机械通风设施</label>
+												<label class="label" style="margin-top: 9px;text-align: center;">有无机械通风设施<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
 											</th>
 											<th>
 												<label class="select">
 													<select ng-model="basicStorehouse.ywjxtfss" ng-disabled="isNotEdit"
-														ng-options="enum.id as enum.value for enum in falseEnum"
+														ng-options="enum.id as enum.value for enum in falseEnum" required
 														class="form-control">
 													</select>
 												</label>
 											</th>
 											<th>
-												<label class="label" style="margin-top: 9px;text-align: center;">能否环流熏蒸杀虫</label>
+												<label class="label" style="margin-top: 9px;text-align: center;">能否环流熏蒸杀虫<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
 											</th>
 											<th>
 												<label class="select">
 													<select ng-model="basicStorehouse.nfhlxzsc" ng-disabled="isNotEdit"
-														ng-options="enum.id as enum.value for enum in falseEnum"
+														ng-options="enum.id as enum.value for enum in falseEnum" required
 														class="form-control">
 													</select>
 												</label>
 											</th>
 											<th>
-												<label class="label" style="margin-top: 9px;text-align: center;">能否富氮低氧气调储粮</label>
+												<label class="label" style="margin-top: 9px;text-align: center;">能否富氮低氧气调储粮<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
 											</th>
 											<th>
 												<label class="select">
 													<select ng-model="basicStorehouse.nffddyqtcl" ng-disabled="isNotEdit"
-														ng-options="enum.id as enum.value for enum in falseEnum"
+														ng-options="enum.id as enum.value for enum in falseEnum" required
 														class="form-control">
 													</select>
 												</label>
@@ -591,12 +593,194 @@
 													</select>
 												</label>
 											</th>
-											<th></th>
-											<th></th>
-											<th></th>
-											<th></th>
-											<th></th>
-											<th></th>
+											<th>
+												<label class="label" style="margin-top: 9px;text-align: center;">储粮功效<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
+											</th>
+											<th>
+												<label class="select">
+													<select ng-model="basicStorehouse.clgx" ng-disabled="isNotEdit"
+														ng-options="enum.id as enum.value for enum in clgxList" required
+														class="form-control">
+														<option value="">--请选择--</option>
+													</select>
+												</label>
+											</th>
+											<th>
+												<label class="label" style="margin-top: 9px;text-align: center;">能否隔热保温<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
+											</th>
+											<th>
+												<label class="select">
+													<select ng-model="basicStorehouse.nfgrbw" ng-disabled="isNotEdit"
+														ng-options="enum.id as enum.value for enum in falseEnum" required
+														class="form-control">
+													</select>
+												</label>
+											</th>
+											<th>
+												<label class="label" style="margin-top: 9px;text-align: center;">隔热性能<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
+											</th>
+											<th>
+												<label class="select">
+													<select ng-model="basicStorehouse.grxn" ng-disabled="isNotEdit"
+														ng-options="enum.id as enum.value for enum in grxnList" required
+														class="form-control">
+														<option value="">--请选择--</option>
+													</select>
+												</label>
+											</th>
+										</tr>
+										<!-- 新增 -->
+										<tr>
+											<th colspan="2">
+												<label class="label" style="margin-top: 9px;text-align: center;">结构材料<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
+											</th>
+											<th>
+												<label class="select">
+													<select ng-model="basicStorehouse.jgcl" ng-disabled="isNotEdit"
+														ng-options="enum.id as enum.value for enum in jgclList" required
+														class="form-control">
+														<option value="">--请选择--</option>
+													</select>
+												</label>
+											</th>
+											<th>
+												<label class="label" style="margin-top: 9px;text-align: center;">气密性<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
+											</th>
+											<th>
+												<label class="select">
+													<select ng-model="basicStorehouse.jgcl" ng-disabled="isNotEdit"
+														ng-options="enum.id as enum.value for enum in qmxList" required
+														class="form-control">
+														<option value="">--请选择--</option>
+													</select>
+												</label>
+											</th>
+											<th>
+												<label class="label" style="margin-top: 9px;text-align: center;">粮情技术<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
+											</th>
+											<th>
+												<label class="select">
+													<select ng-model="basicStorehouse.lqjs" ng-disabled="isNotEdit"
+														ng-options="enum.id as enum.value for enum in lqjsList" required
+														class="form-control">
+														<option value="">--请选择--</option>
+													</select>
+												</label>
+											</th>
+											<th>
+												<label class="label" style="margin-top: 9px;text-align: center;">通风系统型式</label>
+											</th>
+											<th>
+												<label class="select">
+													<select ng-model="basicStorehouse.tfxtxs" ng-disabled="isNotEdit"
+														ng-options="enum.id as enum.value for enum in lqjsList" required
+														class="form-control">
+														<option value="">--请选择--</option>
+													</select>
+												</label>
+											</th>
+										</tr>
+										<tr>
+											<th colspan="2">
+												<label class="label" style="margin-top: 9px;text-align: center;">通风技术<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
+											</th>
+											<th>
+												<label class="select">
+													<select ng-model="basicStorehouse.tfxtxs" ng-disabled="isNotEdit"
+														ng-options="enum.id as enum.value for enum in tfjsList" required
+														class="form-control">
+														<option value="">--请选择--</option>
+													</select>
+												</label>
+											</th>
+											<th>
+												<label class="label" style="margin-top: 9px;text-align: center;">杀虫技术<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
+											</th>
+											<th>
+												<label class="select">
+													<select ng-model="basicStorehouse.scjs" ng-disabled="isNotEdit"
+														ng-options="enum.id as enum.value for enum in scjsList" required
+														class="form-control">
+														<option value="">--请选择--</option>
+													</select>
+												</label>
+											</th>
+											<th>
+												<label class="label" style="margin-top: 9px;text-align: center;">控温技术<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
+											</th>
+											<th>
+												<label class="select">
+													<select ng-model="basicStorehouse.kwjs" ng-disabled="isNotEdit"
+														ng-options="enum.id as enum.value for enum in kwjsList" required
+														class="form-control">
+														<option value="">--请选择--</option>
+													</select>
+												</label>
+											</th>
+											<th>
+												<label class="label" style="margin-top: 9px;text-align: center;">是否已进行信息化改造<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
+											</th>
+											<th>
+												<label class="select">
+													<select ng-model="basicStorehouse.sfyjxxxhgz" ng-disabled="isNotEdit"
+														ng-options="enum.id as enum.value for enum in falseEnum2" required
+														class="form-control">
+														<option value="">--请选择--</option>
+													</select>
+												</label>
+											</th>
+										</tr>
+										<tr>
+											<th colspan="2">
+												<label class="label" style="margin-top: 9px;text-align: center;">挡粮门型式</label>
+											</th>
+											<th>
+												<label class="select">
+													<select ng-model="basicStorehouse.dlmxs" ng-disabled="isNotEdit"
+														ng-options="enum.id as enum.value for enum in dlmxsList" required
+														class="form-control">
+														<option value="">--请选择--</option>
+													</select>
+												</label>
+											</th>
+											<th>
+												<label class="label" style="margin-top: 9px;text-align: center;">建设单位</label>
+											</th>
+											<th>
+												<label class="input">
+													<input type="text" ng-model="basicStorehouse.jsdw"
+													name="jsdw" maxlength="20" ng-readonly="isNotEdit">
+												</label>
+											</th>
+											<th>
+												<label class="label" style="margin-top: 9px;text-align: center;">设计使用年限</label>
+											</th>
+											<th>
+												<label class="input">
+													<input type="text" ng-model="basicStorehouse.sjsynx"
+													name="sjsynx" maxlength="20" ng-readonly="isNotEdit">
+												</label>
+											</th>
+											<th>
+												<label class="label" style="margin-top: 9px;text-align: center;">设计单位 </label>
+											</th>
+											<th>
+												<label class="input">
+													<input type="text" ng-model="basicStorehouse.sjdw"
+													name="sjdw" maxlength="20" ng-readonly="isNotEdit">
+												</label>
+											</th>
+										</tr>
+										<tr>
+											<th colspan="2">
+												<label class="label" style="margin-top: 9px;text-align: center;">监理单位 </label>
+											</th>
+											<th>
+												<label class="input">
+													<input type="text" ng-model="basicStorehouse.jldw"
+													name="jldw" maxlength="20" ng-readonly="isNotEdit">
+												</label>
+											</th>
 										</tr>
 									</table>
 								</fieldset>

src/main/resources/static/app/intelligent/grainDetection/controller/insectPestDetectionCtrl.js

@@ -276,13 +276,13 @@ angular.module('app.intelligent').controller("insectPestDetectionCtrl", function
     };
 })
 // 虫害手工录入
-.controller("insectPestEditCtrl", function($scope, $filter, $http, $stateParams, $state, $rootScope, $uibModal, insectPestDetectionService,
-                                           warehouseService) {
-
+.controller("insectPestEditCtrl", function($scope, $filter, $http, $stateParams, $state, $rootScope, $uibModal, insectPestDetectionService, warehouseService) {
     $scope.insectPests = {};
+    $scope.pestList = [ {hczl: '', ckmdzjh: ''}];
     $scope.saveFlag = false;
     $scope.insectPests.vUpdatePeople = $rootScope.userInfo.realName;
     $scope.insectPests.orgId = $rootScope.depotInfo.orgId;
+    // console.log($scope.insectPests, $rootScope.depotInfo.orgId);
 
     var validator = $("#insectPests-form").validate();
 
@@ -291,6 +291,11 @@ angular.module('app.intelligent').controller("insectPestDetectionCtrl", function
         var checkNumber = /^\+?[1-9]\d*$/;
         return this.optional(element)||(checkNumber.test(value));
     },"请输入大于0的整数！");
+    // 验证密度（头/公斤）
+    $.validator.addMethod("validFrequency1",function(value,element, params) {
+        var checkNumber = /^\+?([1-9]+\,*)*\d$/;
+        return this.optional(element)||(checkNumber.test(value));
+    },"请输入正确的数据！");
 
     // 货位列表
     $scope.loadWare = function(houseId) {
@@ -307,8 +312,14 @@ angular.module('app.intelligent').controller("insectPestDetectionCtrl", function
         $rootScope.back();
     };
 
+    $scope.addPest = function() {
+        $scope.pestList.push({hczl: '', ckmdzjh: ''});
+        // console.log($scope.pestList);
+    };
+
     // 保存.
     $scope.saveData = function () {
+        console.log($scope.pestList);
         if (!$scope.saveFlag) {
             if (validator.form()) {
                 // 设置saveFlag为true,防止重复提交.
@@ -323,7 +334,21 @@ angular.module('app.intelligent').controller("insectPestDetectionCtrl", function
                         $scope.insectPests.standTime = $filter('date')(item.value, "yyyy-MM-dd HH:mm:ss");
                     }
                 });
-
+                let hczlStr = '';
+                let ckmdzjhStr = '';
+                $scope.pestList.forEach(item => {
+                    if(item.hczl) {
+                        hczlStr = hczlStr + item.hczl + '#'
+                    }
+                    if(item.ckmdzjh) {
+                        ckmdzjhStr = ckmdzjhStr + item.ckmdzjh + '|'
+                    }
+                });
+                hczlStr = hczlStr.slice(0, hczlStr.length - 1);
+                ckmdzjhStr = ckmdzjhStr.slice(0, ckmdzjhStr.length - 1);
+                console.log(hczlStr, ckmdzjhStr);
+                $scope.insectPests.hczl = hczlStr;
+                $scope.insectPests.ckmdzjh = ckmdzjhStr;
                 //保存熏蒸数据
                 insectPestDetectionService.saveInsectPestDate($scope.insectPests).then(function(data){
                     if(data.message == "success"){

src/main/resources/static/app/intelligent/grainDetection/views/insectPestDetection-edit.html

@@ -83,42 +83,18 @@
 												</label>
 											</th>
 											<th >
-												<label label class="label" style="margin-top: 9px;text-align: center;">害虫种类<span style="color: red;">*</span></label>
-											</th>
-											<th>
-												<section>
-													<label class="select">
-														<select ng-model="insectPests.hczl" name="hczl"
-																ng-options="enum.enumid as enum.enumname for enum in dicDataList[5267]" required>
-															<option value="">--请选择--</option>
-														</select><i></i>
-													</label>
-												</section>
-											</th>
-										</tr>
-										<tr>
-											<th>
-												<label label class="label" style="margin-top: 9px;text-align: center;">密度(头/公斤)<span style="color: red;">*</span></label>
-											</th>
-											<th>
-												<section>
-													<label class="input">
-														<input class="form-control" type="text" ng-model="insectPests.iValue"
-															   name="iValue" validFrequency="true" required>
-													</label>
-												</section>
-											</th>
-											<th>
-												<label label class="label" style="margin-top: 9px;text-align: center;">虫粮等级</label>
+												<label label class="label" style="margin-top: 9px;text-align: center;">虫粮等级<span style="color: red;">*</span></label>
 											</th>
 											<th>
 												<section>
 													<label class="input">
 														<input class="form-control" type="text" ng-model="insectPests.cldjpd"
-															   name="cldjpd" validFrequency="true">
+															   name="cldjpd" validFrequency="true" required>
 													</label>
 												</section>
 											</th>
+										</tr>
+										<tr>
 											<th>
 												<label label class="label" style="margin-top: 9px;text-align: center;">害虫抗药性分析</label>
 											</th>
@@ -130,8 +106,6 @@
 													</label>
 												</section>
 											</th>
-										</tr>
-										<tr>
 											<th>
 												<label class="label" style="margin-top: 9px;text-align: center;">检测时间<span style="color: red;">*</span></label>
 											</th>
@@ -149,11 +123,50 @@
 													<input type="text" ng-model="insectPests.vUpdatePeople" ng-disabled="true">
 												</label>
 											</th>
-											<th></th>
-											<th></th>
 										</tr>
 									</table>
 								</fieldset>
+
+								<header>
+									虫害情况
+								</header>
+								<div class="row"
+									 ng-repeat="item in pestList"
+									 ng-style="{ 'padding': $index === 0 ? '25px 14px 5px' : '0px 14px 5px'}"
+								>
+									<div class="col-md-3">
+										<label class="label" style="margin-top: 9px;">虫害种类<span style="color: red;">*</span></label>
+										<section>
+											<label class="select">
+												<select ng-model="item.hczl" name="hczl{{$index}}"
+														ng-options="enum.enumid as enum.enumname for enum in dicDataList[5267]" required>
+													<option value="">--请选择--</option>
+												</select><i></i>
+											</label>
+										</section>
+									</div>
+									<div class="col-md-1"></div>
+									<div class="col-md-3">
+										<label class="label" style="margin-top: 9px;">密度（头/公斤）<span style="color: red;">*</span></label>
+										<section>
+											<label class="input">
+												<input class="form-control" type="text" ng-model="item.ckmdzjh"
+														 name="`ckmdzjh{{$index}}`" validFrequency1="true" required>
+												<!-- <input class="form-control" type="text" ng-model="pestList.iValue"
+														 name="iValue" validFrequency="true" required> -->
+											</label>
+										</section>
+									</div>
+								</div>
+								<div class="row" style="padding-left: 14px;">
+									<div class="col-md-1">
+										<button style="padding: 5px 10px;" type="button" class="btn btn-default" ng-click="addPest()">
+											<i class="glyphicon glyphicon-plus"></i> 
+											<span>新增</span>
+										</button>
+
+									</div>
+								</div>
 								<footer class="text-align-center">
 									<button type="button" class="btn btn-primary" ng-click="saveData()">保存</button>
 									<button type="button" class="btn btn-default" ng-click="retList()">取消</button>

src/main/resources/static/app/layout/partials/navigation.tpl.html

@@ -899,6 +899,12 @@
                                     <li has-func="180" data-ui-sref-active="active">
                                         <a data-ui-sref="app.storage.safeproduce.notifyList">安全生产通告</a>
                                     </li>
+                                    <li has-func="181" data-ui-sref-active="active">
+                                        <a data-ui-sref="app.storage.safeproduce.safeRiskLevelCtrl">安全风险分级管控</a>
+                                    </li>
+                                    <li has-func="182.5" data-ui-sref-active="active">
+                                        <a data-ui-sref="app.storage.safeproduce.safeDangerHandle">安全隐患跟踪处理</a>
+                                    </li>
                                     <!--<li has-func="181" data-ui-sref-active="active">
                                         <a data-ui-sref="app.storage.safeproduce.recordList">粮库危险作业备案</a>
                                     </li>-->
@@ -1390,6 +1396,9 @@
                     <li has-func="69" data-ui-sref-active="active">
                         <a data-ui-sref="app.storage.payment.list"> 费用管理</a>
                     </li>
+                    <li has-func="69.5">
+                        <a data-ui-sref="app.storage.foodHandle">粮情处置</a>
+                    </li>
                     <!--<li has-func="125" data-ui-sref-active="active">
                         <a href="http://192.168.60.120:8088/jckz/init-huangFu.html?_U=ystest&_T=e10adc3949ba59abbe56e057f20f883e" target="_blank"> 智能仓房</a>
                     </li>-->

src/main/resources/static/app/storage/controller/safeProduceDangerHandle.js

@@ -0,0 +1,201 @@
+"use strict";
+
+angular
+  .module("app.storage")
+  .controller(
+    "safeProduceDangerHandle",
+    function ($scope, $state, $rootScope, safeDangerHandleService) {
+      $scope.pageInfo = { pageNum: 1, pageSize: 10 };
+      $scope.orgName = $rootScope.depotInfo.orgName;
+      $scope.loadData = function () {
+        safeDangerHandleService
+          .getPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize)
+          .then(
+            function (data) {
+              console.log(data);
+              if (data) {
+                $scope.pageInfo.list = data.data.list;
+                $scope.pageInfo.hasNextPage = data.data.hasNextPage;
+                $scope.pageInfo.nextPage = data.data.nextPage;
+                $scope.pageInfo.navigatepageNums = data.data.navigatepageNums;
+                $scope.pageInfo.isLastPage = data.data.isLastPage;
+                $scope.pageInfo.pages = Math.ceil(
+                  data.data.total / $scope.pageInfo.pageSize
+                );
+              }
+              if ($scope.pageInfo.pageNum <= 0) {
+                $scope.pageInfo.pageNum = 1;
+              }
+              if ($scope.pageInfo.pageSize <= 0) {
+                $scope.pageInfo.pageSize = 10;
+              }
+            },
+            function (data) {
+              console.log(222, data);
+            }
+          );
+      };
+
+      $scope.loadData();
+
+      // 打印 导出PDF
+      $scope.print = function () {
+        $("#print").printArea();
+      };
+
+      // 翻页
+      $scope.goPage = function (pageNum) {
+        $scope.pageInfo.pageNum = pageNum;
+        $scope.loadData();
+      };
+      // 添加页面
+      $scope.showAddDanger = function () {
+        $state.go("app.storage.safeproduce.safeProduceDangerHandleSave", {
+          id: 0,
+          isNotEdit: false,
+        });
+      };
+      // 修改编辑页面
+      $scope.showEditDanger = function (id) {
+        $state.go("app.storage.safeproduce.safeProduceDangerHandleSave", {
+          id: id,
+          isNotEdit: false,
+        });
+      };
+
+      // 查看页面
+      $scope.showViewDanger = function (id) {
+        $state.go("app.storage.safeproduce.safeProduceDangerHandleSave", {
+          id: id,
+          isNotEdit: true,
+        });
+      };
+      // 根据id删除信息
+      $scope.removeDanger = function (id) {
+        if (!confirm("确定要删除吗？")) {
+          return;
+        }
+        safeDangerHandleService.removeById(id).then(function (data) {
+          if (data.message == "success") {
+            alert("删除成功");
+            $scope.loadData();
+          } else {
+            alert("删除失败");
+          }
+        });
+      };
+    }
+  )
+  .controller(
+    "safeProduceDangerHandleSave",
+    function (
+      $scope,
+      $state,
+      $rootScope,
+      safeDangerHandleService,
+      StorehouseService,
+      $stateParams
+    ) {
+      $scope.orgName = $rootScope.depotInfo.orgName;
+      $scope.insertDanger = {
+        orgName: $rootScope.depotInfo.orgName,
+      };
+      console.log($rootScope.depotInfo.orgName);
+      $scope.storehouseList = [];
+      // $scope.storehouseId = "";
+      //下面的判断用于查看页面只读状态
+      if ($stateParams.isNotEdit != null) {
+        if ($stateParams.isNotEdit == "false") {
+          // 修改
+          $scope.isNotEdit = false;
+        } else if ($stateParams.isNotEdit == "true") {
+          // 查看
+          $scope.isNotEdit = true;
+        }
+      } else {
+        $scope.isNotEdit = false;
+      }
+      $scope.loadStore = function () {
+        //仓房信息下拉
+        StorehouseService.getStorehouseList($rootScope.orgInfo.orgId).then(
+          function (data) {
+            console.log(data.houseList);
+            if (data.houseList.length > 0) {
+              $scope.storehouseList = data.houseList; //下拉列表数据
+            }
+          },
+          function (data) {
+            console.log(data);
+          }
+        );
+      };
+
+      
+
+      $scope.edit = function () {
+        console.log("$scope.isNotEdit", $scope.isNotEdit);
+        // 编辑
+        if ($stateParams.id !== 0) {
+          safeDangerHandleService
+            .queryById($stateParams.id)
+            .then(function (data) {
+              console.log(148, data);
+              $scope.insertDanger = data.data;
+            });
+        }
+      };
+      // $scope.loadStore();
+      $scope.edit();
+      // 提交表单
+      var validator = $("#safeDangerHandle-form").validate();
+      $scope.saveData = function () {
+        console.log($stateParams.id);
+        $scope.insertDanger.solveTime = $(
+          "input[name='solveTime']"
+        ).val(); // 时间控件获取值
+        if (validator.form()) {
+          
+          $scope.insertDanger.orgId = $rootScope.orgInfo.orgId;
+          if (+$stateParams.id !== 0) {
+            safeDangerHandleService
+              .updateRask(angular.toJson($scope.insertDanger))
+              .then(
+                function (data) {
+                  if (data.message == "success") {
+                    alert("修改成功！");
+                    //$scope.back();
+                    $scope.backLayer();
+                  } else {
+                    alert("修改失败！");
+                  }
+                },
+                function (data) {
+                  console.log(data);
+                }
+              );
+          } else {
+            safeDangerHandleService
+              .save(angular.toJson($scope.insertDanger))
+              .then(
+                function (data) {
+                  if (data.message == "success") {
+                    alert("保存成功！");
+                    //$scope.back();
+                    $scope.backLayer();
+                  } else {
+                    alert("保存失败！");
+                  }
+                },
+                function (data) {
+                  console.log(data);
+                }
+              );
+          }
+        }
+      };
+      // 返回
+      $scope.backLayer = function () {
+        $state.go("app.storage.safeproduce.safeDangerHandle");
+      };
+    }
+  );

src/main/resources/static/app/storage/controller/safeProduceRiskCtrl.js

@@ -0,0 +1,205 @@
+"use strict";
+
+angular
+  .module("app.storage")
+  .controller(
+    "safeProduceRiskCtrl",
+    function ($scope, $state, $rootScope, safeProduceRiskService) {
+      $scope.pageInfo = { pageNum: 1, pageSize: 10 };
+      // $scope.startDate = "";
+      // $scope.endDate = "";
+      $scope.search = {
+        searchStartDate: "",
+        searchEndDate: "",
+      };
+
+      $scope.loadData = function () {
+        $scope.search.searchStartDate = $(
+          "input[name='searchStartDate']"
+        ).val(); // 时间控件获取值
+        $scope.search.searchEndDate = $("input[name='searchEndDate']").val(); // 时间控件获取值
+        safeProduceRiskService
+          .getPageInfo(
+            $scope.pageInfo.pageNum,
+            $scope.pageInfo.pageSize,
+            $scope.search.searchStartDate,
+            $scope.search.searchEndDate
+          )
+          .then(
+            function (data) {
+              if (data) {
+                $scope.pageInfo = data.data;
+                // $scope.pageInfo.pages = Math.ceil(data.data.total / $scope.pageInfo.pageSize);
+              }
+              if ($scope.pageInfo.pageNum <= 0) {
+                $scope.pageInfo.pageNum = 1;
+              }
+              if ($scope.pageInfo.pageSize <= 0) {
+                $scope.pageInfo.pageSize = 10;
+              }
+            },
+            function (data) {
+              console.log(222, data);
+            }
+          );
+      };
+
+      $scope.loadData();
+
+      // 打印 导出PDF
+    $scope.print = function() {
+      $("#print").printArea();
+  };
+
+      // 翻页
+      $scope.goPage = function (pageNum) {
+        $scope.pageInfo.pageNum = pageNum;
+        $scope.loadData();
+      };
+      // 添加页面
+      $scope.showAddRisk = function () {
+        $state.go("app.storage.safeproduce.safeRiskAdd", {
+          id: 0,
+          isNotEdit: false,
+        });
+      };
+      // 修改编辑页面
+      $scope.showEditRisk = function (id) {
+        $state.go("app.storage.safeproduce.safeRiskAdd", {
+          id: id,
+          isNotEdit: false,
+        });
+      };
+
+      // 查看页面
+      $scope.showViewRisk = function (id) {
+        $state.go("app.storage.safeproduce.safeRiskAdd", {
+          id: id,
+          isNotEdit: true,
+        });
+      };
+      // 根据id删除信息
+      $scope.removeRisk = function (id) {
+        if (!confirm("确定要删除吗？")) {
+          return;
+        }
+        safeProduceRiskService.removeById(id).then(function (data) {
+          if (data.message == "success") {
+            alert("删除成功");
+            $scope.loadData();
+          } else {
+            alert("删除失败");
+          }
+        });
+      };
+    }
+  )
+  .controller(
+    "safeProduceRiskCtrlSave",
+    function (
+      $scope,
+      $state,
+      $rootScope,
+      safeProduceRiskService,
+      $stateParams
+    ) {
+      // $scope.orgName = $rootScope.depotInfo.orgName;
+      $scope.insertRisk = {
+        libraryPointName: $rootScope.depotInfo.orgName,
+        riskTypeId: 1,
+      };
+      //下面的判断用于查看页面只读状态
+      if ($stateParams.isNotEdit != null) {
+        if ($stateParams.isNotEdit == "false") {
+          // 修改
+          $scope.isNotEdit = false;
+        } else if ($stateParams.isNotEdit == "true") {
+          // 查看
+          $scope.isNotEdit = true;
+        }
+      } else {
+        $scope.isNotEdit = false;
+      }
+
+      // 风险分级
+      $scope.fxfjList = [
+        { id: "A级-重大风险", value: "A级-重大风险" },
+        { id: "B级-较大风险", value: "B级-较大风险" },
+        { id: "C级-一般风险", value: "C级-一般风险" },
+        { id: "D级-低风险", value: "D级-低风险" },
+      ];
+      // 风险类型
+      $scope.fxlxList = [
+        { id: "基础设施", value: "基础设施" },
+        { id: "网络安全", value: "网络安全" },
+        { id: "消防安全", value: "消防安全" },
+        { id: "用电安全", value: "用电安全" },
+        { id: "作业安全", value: "作业安全" },
+        { id: "用药安全", value: "用药安全" },
+        { id: "管理风险", value: "管理风险" },
+        { id: "其他风险", value: "其他风险" },
+      ];
+
+      $scope.edit = function () {
+        console.log("$scope.isNotEdit", $scope.isNotEdit);
+        // 编辑
+        if ($stateParams.id !== 0) {
+          safeProduceRiskService
+            .queryById($stateParams.id)
+            .then(function (data) {
+              console.log(148, data);
+              $scope.insertRisk = data.data;
+            });
+        }
+      };
+      $scope.edit();
+      // 提交表单
+      var validator = $("#safeProduceNotify-form").validate();
+      $scope.saveData = function () {
+        console.log($stateParams.id);
+        if (validator.form()) {
+          $scope.insertRisk.orgId = $rootScope.orgInfo.orgId;
+          $scope.fxlxList.forEach((item, i) => {
+            if(item.value === $scope.insertRisk.riskTypeName) {
+              $scope.insertRisk.riskTypeId = i;
+            }
+          });
+          if (+$stateParams.id !== 0) {
+            safeProduceRiskService.updateRask(angular.toJson($scope.insertRisk)).then(
+              function (data) {
+                if (data.message == "success") {
+                  alert("修改成功！");
+                  //$scope.back();
+                  $scope.backLayer();
+                } else {
+                  alert("修改失败！");
+                }
+              },
+              function (data) {
+                console.log(data);
+              }
+            );
+          } else {
+            safeProduceRiskService.save(angular.toJson($scope.insertRisk)).then(
+              function (data) {
+                if (data.message == "success") {
+                  alert("保存成功！");
+                  //$scope.back();
+                  $scope.backLayer();
+                } else {
+                  alert("保存失败！");
+                }
+              },
+              function (data) {
+                console.log(data);
+              }
+            );
+          }
+        }
+      };
+      // 返回
+      $scope.backLayer = function () {
+        $state.go("app.storage.safeproduce.safeRiskLevelCtrl");
+      };
+    }
+  );

src/main/resources/static/app/storage/drug/drugInfo/views/drugInfo-edit.html

@@ -85,6 +85,16 @@
                                                        ng-readonly="isNotEdit" placeholder="例:500ml" required>
                                             </label>
                                         </section>
+                                        <section class="col col-6">
+                                            <label class="label">储存地点<span style="color: red;">*</span></label>
+                                            <label class="select">
+                                                <select ng-model="drugInfo.ccdd" name="ccdd" required >
+                                                        <option value="">请选择</option>
+                                                        <option value="1">药品库</option>
+                                                        <option value="2">其他</option>
+                                                </select><i></i>
+                                            </label>
+                                        </section>
                                     </div>
                                     <section>
                                         <label class="label">储存条件</label>
@@ -102,7 +112,15 @@
                                         </label>
                                     </section>
                                     <section>
-                                        <label class="label">使用后处理方式</label>
+                                        <label class="label">包装物处理方式</label>
+                                        <label class="textarea">
+                                            <textarea rows="5" ng-model="drugInfo.bzwclfs" name="aqsysms" ng-disabled="isNotEdit"
+                                                oninput="if(value.length>1000) value=value.slice(0,1000)">
+                                            </textarea>
+                                        </label>
+                                    </section>
+                                    <section>
+                                        <label class="label">残渣处理方式</label>
                                         <label class="textarea">
                                             <textarea rows="5" ng-model="drugInfo.syhclfs" name="syhclfs" ng-disabled="isNotEdit"
                                                 oninput="if(value.length>1000) value=value.slice(0,1000)">

src/main/resources/static/app/storage/grainCard/controller/foodHandleCtr.js

@@ -0,0 +1,233 @@
+"use strict";
+angular
+  .module("app.storage")
+  .controller(
+    "foodHandleCtr",
+    function (
+      $scope,
+      $state,
+      $rootScope,
+      $uibModal,
+      $http,
+      $filter,
+      warehouseService,
+      $stateParams,
+      foodHandleService,
+      archiveService
+    ) {
+      $scope.pageInfo = { pageNum: 1, pageSize: 10 };
+      $scope.search = {};
+      $scope.isArchive = false;
+      $scope.isArchiveHouse = 0;
+      // 分页列表
+      $scope.loadData = function () {
+            
+            foodHandleService.getPageInfo($scope.pageInfo, $scope.search).then(
+              function (data) {
+                $scope.pageInfo = data.data;
+              },
+              function (data) {
+                console.log(data);
+              }
+            );
+      };
+      $scope.loadData();
+      // 货位列表
+      $scope.loadWare = function (houseId) {
+      console.log("🚀 ~ file: foodHandleCtr.js ~ line 47 ~ houseId", houseId)
+        warehouseService
+          .getStorehouse($rootScope.orgInfo.orgId, houseId, "0")
+          .then(
+            function (data) {
+              $scope.warelist = data.wareList; //下拉列表数据
+              $scope.warehouseObj = data.wares; //查询数据列表货位信息转换
+            },
+            function (data) {
+              console.log(data);
+            }
+          );
+      };
+      $scope.loadWare(null);
+
+      // 添加页面
+      $scope.showAddFood = function () {
+        $state.go("app.storage.foodHandle.add", {
+          id: 0,
+          isNotEdit: false,
+        });
+      };
+      // 修改编辑页面
+      $scope.showEditFood = function (id) {
+        $state.go("app.storage.foodHandle.add", {
+          id: id,
+          isNotEdit: false,
+        });
+      };
+      // 查看
+      $scope.showViewFood = function (id) {
+        $state.go("app.storage.foodHandle.add", {
+          id: id,
+          isNotEdit: true,
+        });
+      };
+
+      // 根据id删除信息
+      $scope.removeFood = function (id) {
+        if (!confirm("确定要删除吗？")) {
+          return;
+        }
+        foodHandleService.removeById(id).then(function (data) {
+          if (data.message == "success") {
+            alert("删除成功");
+            $scope.loadData();
+          } else {
+            alert("删除失败");
+          }
+        });
+      };
+
+      //修改按钮
+      $scope.editProductGrainList = function (id, spareOne, lypzName) {
+        $state.go("app.storage.productGrain.add", {
+          id: id,
+          spareOne: spareOne,
+          lypzName: lypzName,
+        });
+      };
+
+      // 翻页
+      $scope.goPage = function (pageNum) {
+        if ($scope.pageInfo.pageNum != pageNum && pageNum > 0) {
+          $scope.pageInfo.pageNum = pageNum;
+          $scope.loadData();
+        }
+      };
+    }
+  )
+  .controller(
+    "foodHandleSave",
+    function (
+      $scope,
+      $state,
+      $rootScope,
+      $uibModal,
+      $http,
+      $filter,
+      warehouseService,
+      $stateParams,
+      foodHandleService,
+      archiveService,
+      cerealsCardService,
+      StorehouseService,
+      keeperService,
+      enumService,
+      TankService
+    ) {
+      $scope.insertFoodHandle = {};
+      $scope.search = {
+        spareOne: "",
+        spareTwo: "",
+      };
+      //下面的判断用于查看页面只读状态
+      if ($stateParams.isNotEdit != null) {
+        if ($stateParams.isNotEdit == "false") {
+          // 修改
+          $scope.isNotEdit = false;
+        } else if ($stateParams.isNotEdit == "true") {
+          // 查看
+          $scope.isNotEdit = true;
+        }
+      } else {
+        $scope.isNotEdit = false;
+      }
+      $scope.loadWare = function (houseId) {
+        warehouseService
+          .getStorehouse($rootScope.orgInfo.orgId, houseId, "0")
+          .then(
+            function (data) {
+              $scope.warelist = data.wareList; //下拉列表数据
+              $scope.warehouseObj = data.wares; //查询数据列表货位信息转换
+              console.log($scope.warelist, $scope.warehouseObj);
+            },
+            function (data) {
+              console.log(data);
+            }
+          );
+      };
+      $scope.loadWare(null);
+      $scope.edit = function () {
+        // 编辑
+          if ($stateParams.id !== 0) {
+            foodHandleService
+              .findDataById($stateParams.id)
+              .then(function (data) {
+                $scope.insertFoodHandle = data.data;
+                if($scope.insertFoodHandle.isSolve == 1) {
+                  $scope.insertFoodHandle.isSolve = "1"
+                }
+                if($scope.insertFoodHandle.isSolve == 0) {
+                  $scope.insertFoodHandle.isSolve = "0"
+                }
+                
+                $scope.search.spareOne = data.data.storeHouseId;
+                $scope.search.spareTwo = data.data.wareHouseId;
+              });
+          }
+      };
+      $scope.edit();
+
+      $scope.insertFoodHandle = {
+        orgName: $rootScope.depotInfo.orgName,
+      };
+
+      var validator = $("#safeProduceFood-form").validate();
+      $scope.saveData = function () {
+        if (validator.form()) {
+          $scope.insertFoodHandle.checkDate = $("input[name='checkDate']").val(); // 时间控件获取值
+          $scope.insertFoodHandle.orgId = $rootScope.orgInfo.orgId;
+          $scope.insertFoodHandle.storeHouseId = $scope.search.spareOne;
+          $scope.insertFoodHandle.storehouseName = $rootScope.storehouseObj[$scope.search.spareOne].storehouseName;
+          $scope.insertFoodHandle.warehouseName = $scope.warehouseObj[$scope.search.spareTwo].warehouseName;
+          $scope.insertFoodHandle.wareHouseId = $scope.search.spareTwo;
+          if (+$stateParams.id !== 0) {
+            foodHandleService
+              .updateFood(angular.toJson($scope.insertFoodHandle))
+              .then(
+                function (data) {
+                  if (data.message == "success") {
+                    alert("修改成功！");
+                    //$scope.back();
+                    $scope.backLayer();
+                  } else {
+                    alert("修改失败！");
+                  }
+                },
+                function (data) {
+                  console.log(data);
+                }
+              );
+          } else {
+            foodHandleService
+              .saveData(angular.toJson($scope.insertFoodHandle))
+              .then(
+                function (data) {
+                  if (data.message == "success") {
+                    alert("保存成功！");
+                    //$scope.back();
+                    $scope.backLayer();
+                  } else {
+                    alert("保存失败！");
+                  }
+                },
+                function (data) {
+                  console.log(data);
+                }
+              );
+          }
+        }
+      };
+      $scope.backLayer = function () {
+        $state.go("app.storage.foodHandle");
+      };
+    }
+  );

src/main/resources/static/app/storage/grainCard/service/foodHandleService.js

@@ -0,0 +1,114 @@
+"use strict";
+angular.module('app.storage').service("foodHandleService", function ($http, $q, APP_CONFIG, $rootScope) {
+    // 分页列表
+    this.getPageInfo = function (pageInfo, search) {
+        console.log(search.spareTwo);
+        var d = $q.defer();
+        $http({
+            method: 'GET',
+            url: APP_CONFIG.depotStorageUrl + '/grainDisposal/getList',
+            params: {
+                pageNum: pageInfo.pageNum,
+                pageSize: pageInfo.pageSize,
+                storeHouseName: search.spareOne ? $rootScope.storehouseObj[search.spareOne].storehouseName : "",
+                wareHouseName: search.spareTwo ? $rootScope.wares[search.spareTwo].warehouseName : "",
+                // createTime: search.createTime,
+                orgId: $rootScope.orgInfo.orgId
+            }
+        }).then(function successCallback(response) {
+            // 请求成功执行代码
+            d.resolve(response.data);
+        }, function errorCallback(response) {
+            // 请求失败执行代码
+            d.reject("error");
+        });
+        return d.promise;
+    };
+    // 成品粮粮情卡保存
+    this.saveData = function (data) {
+        var d = $q.defer();
+        $http({
+          method: "POST",
+          url: APP_CONFIG.depotStorageUrl + "/grainDisposal/saveData",
+          data: {
+            riskJson: data,
+          },
+        }).then(
+          function successCallback(response) {
+            console.log("success", response);
+            // 请求成功执行代码
+            d.resolve(response.data);
+          },
+          function errorCallback(response) {
+            console.log("error", response);
+            // 请求失败执行代码
+            d.reject("error");
+          }
+        );
+        return d.promise;
+    };
+
+    // 根据id查询数据
+    this.findDataById = function (id) {
+        var d = $q.defer();
+        $http({
+            method: 'GET',
+            url: APP_CONFIG.depotStorageUrl + '/grainDisposal/queryById',
+            params: {
+                id: id
+            }
+        }).then(function successCallback(response) {
+            // 请求成功执行代码
+            d.resolve(response.data);
+        }, function errorCallback(response) {
+            // 请求失败执行代码
+            d.reject("error");
+        });
+        return d.promise;
+    };
+
+    // 删除
+    this.removeById = function (id) {
+        var d = $q.defer();
+        $http({
+          method: "POST",
+          url: APP_CONFIG.depotStorageUrl + "/grainDisposal/deleteRisk",
+          data: {
+            id: id,
+          },
+        }).then(
+          function successCallback(response) {
+            // 请求成功执行代码
+            d.resolve(response.data);
+          },
+          function errorCallback(response) {
+            // 请求失败执行代码
+            d.reject("error");
+          }
+        );
+        return d.promise;
+      };
+
+      // 编辑
+      this.updateFood = function(data) {
+        var d = $q.defer();
+        $http({
+          method: "POST",
+          url: APP_CONFIG.depotStorageUrl + "/grainDisposal/updateData",
+          data: {
+            riskJson: data,
+          },
+        }).then(
+          function successCallback(response) {
+            // 请求成功执行代码
+            d.resolve(response.data);
+          },
+          function errorCallback(response) {
+            // 请求失败执行代码
+            d.reject("error");
+          }
+        );
+        return d.promise;
+      }
+
+});

src/main/resources/static/app/storage/grainCard/views/foodHandle-edit.html

@@ -0,0 +1,255 @@
+<div id="content">
+  <section id="widget-grid" widget-grid>
+    <div class="row">
+      <article class="col-sm-12 col-md-12 col-lg-12">
+        <div
+          jarvis-widget
+          id="form-grid-widget"
+          data-widget-colorbutton="false"
+          data-widget-editbutton="false"
+          data-widget-custombutton="false"
+        >
+          <div>
+            <div class="widget-body no-padding">
+              <form
+                id="safeProduceFood-form"
+                class="smart-form"
+                data-validator-option="validateOptions"
+                novalidate="novalidate"
+              >
+                <button
+                  type="submit"
+                  class="bv-hidden-submit"
+                  style="display: none; width: 0px; height: 0px"
+                ></button>
+                <header>
+                  <a
+                    href-void
+                    class="btn btn-default btn-xs"
+                    ng-click="backLayer()"
+                  >
+                    <i class="fa fa-angle-left"></i>&nbsp;返回&nbsp;
+                  </a>
+                  &nbsp;<strong>粮情检查表</strong>
+                </header>
+                <fieldset>
+                  <div class="row">
+                    <section class="col col-3">
+                      <label class="label"> 仓房名称<span style="color: red">*</span>:</label>
+                      <label class="select">
+                        <select
+                          ng-model="search.spareOne"
+                          class="form-control input-sm"
+                          name="spareOne"
+                          ng-disabled="isNotEdit"
+                          ng-options="store.storehouseId as store.storehouseName for store in storehouseObj"
+                          ng-change="loadWare(search.storehouseCode)"
+                          required
+                        >
+                          <option value="">请选择</option></select
+                        >&emsp;
+                      </label>
+                    </section>
+                    <section class="col col-3">
+                      <label class="label"
+                        >货位名称:<span style="color: red">*</span></label
+                      >
+                      <label class="select">
+                        <select
+                        ng-disabled="isNotEdit"
+                          ng-model="search.spareTwo"
+                          required
+                          class="form-control input-sm"
+                          ng-options="ware.warehouseId as ware.warehouseName for ware in warelist"
+                        >
+                          <option value="">请选择</option></select
+                        >&emsp;
+                      </label>
+                    </section>
+                    <section class="col col-3">
+                      <label class="label"
+                        >粮油品种<span style="color: red">*</span></label
+                      >
+                      <label class="input">
+                        <input
+                          type="text"
+                          ng-disabled="isNotEdit"
+                          required
+                          ng-model="insertFoodHandle.grainOilVarieties"
+                          name="grainOilVarieties"
+                        />
+                      </label>
+                    </section>
+                    <section class="col col-3">
+                      <label class="label"
+                        >检查日期<span style="color: red">*</span></label
+                      >
+                      <label class="input form-group">
+                        <input
+                          ng-disabled="isNotEdit"
+                          class="form-control"
+                          type="text"
+                          required
+                          ng-model="insertFoodHandle.checkDate"
+                          id="checkDate"
+                          name="checkDate"
+                          onClick="WdatePicker({lang:'zh-cn'})"
+                        />
+                      </label>
+                    </section>
+                  </div>
+                  <div class="row">
+                    <section class="col col-3">
+                      <label class="label"
+                        >单位名称<span style="color: red">*</span></label
+                      >
+                      <label class="input">
+                        <input
+                          type="text"
+                          ng-model="insertFoodHandle.companyName"
+                          name="companyName"
+                          required
+                          ng-disabled="isNotEdit"
+                        />
+                      </label>
+                    </section>
+                    <section class="col col-3">
+                      <label class="label"
+                        >粮情员<span style="color: red">*</span></label
+                      >
+                      <label class="input">
+                        <input
+                          type="text"
+                          ng-disabled="isNotEdit"
+                          required
+                          ng-model="insertFoodHandle.grainPerson"
+                          name="grainPerson"
+                        />
+                      </label>
+                    </section>
+                    <section class="col col-3">
+                      <label class="label"
+                        >保管组长<span style="color: red">*</span></label
+                      >
+                      <label class="input">
+                        <input
+                          type="text"
+                          ng-disabled="isNotEdit"
+                          required
+                          ng-model="insertFoodHandle.custodianLeader"
+                          name="custodianLeader"
+                        />
+                      </label>
+                    </section>
+                    <section class="col col-3">
+                      <label class="label"
+                        >保管员<span style="color: red">*</span></label
+                      >
+                      <label class="input">
+                        <input
+                          type="text"
+                          ng-disabled="isNotEdit"
+                          required
+                          ng-model="insertFoodHandle.custodian"
+                          name="custodian"
+                        />
+                      </label>
+                    </section>
+                  </div>
+                  <div class="row">
+                    <section class="col col-3">
+                        <label class="label"
+                          >解决情况<span style="color: red">*</span></label
+                        >
+                        <label class="select">
+                            <select
+                              ng-model="insertFoodHandle.isSolve"
+                              class="form-control input-sm"
+                              name="isSolve"
+                              required
+                            >
+                              <option value="">请选择</option>
+                              <option value="1">是</option>
+                              <option value="0">否</option>
+                            </select
+                            >&emsp;
+                          </label>
+                      </section>
+                  </div>
+                  <header style="margin-left: 0; margin-bottom: 20px">
+                    &nbsp;发现粮情
+                  </header>
+                  <div class="row">
+                    <section class="col col-12" style="width: 100%">
+                      <label class="label"
+                        >现象及原因<span style="color: red">*</span></label
+                      >
+                      <label class="textarea textarea-resizable">
+                        <textarea
+                          rows="5"
+                          class="custom-scroll"
+                          ng-disabled="isNotEdit"
+                          ng-model="insertFoodHandle.phenomenonCause"
+                          ng-disabled="isNotEdit"
+                          name="phenomenonCause"
+                          required
+                        ></textarea>
+                      </label>
+                    </section>
+                  </div>
+                  <div class="row">
+                    <section class="col col-12" style="width: 100%">
+                      <label class="label">保管员采取的措施</label>
+                      <label class="textarea textarea-resizable">
+                        <textarea
+                          rows="5"
+                          class="custom-scroll"
+                          ng-disabled="isNotEdit"
+                          ng-model="insertFoodHandle.custodianMeasure"
+                          ng-disabled="isNotEdit"
+                          name="custodianMeasure"
+                        ></textarea>
+                      </label>
+                    </section>
+                  </div>
+                  <div class="row">
+                    <section class="col col-12" style="width: 100%">
+                      <label class="label">粮情员处理意见</label>
+                      <label class="textarea textarea-resizable">
+                        <textarea
+                          rows="5"
+                          class="custom-scroll"
+                          ng-disabled="isNotEdit"
+                          ng-model="insertFoodHandle.grainPersonComments"
+                          ng-disabled="isNotEdit"
+                          name="grainPersonComments"
+                        ></textarea>
+                      </label>
+                    </section>
+                  </div>
+                </fieldset>
+                <footer class="modal-footer text-align-center">
+                  <button
+                    ng-click="back()"
+                    class="btn btn-default btn-lg"
+                    data-dismiss="modal"
+                  >
+                    取消
+                  </button>
+                  <button
+                    ng-click="saveData()"
+                    type="button"
+                    class="btn btn-primary btn-lg"
+                    ng-hide="isNotEdit"
+                  >
+                    提交
+                  </button>
+                </footer>
+              </form>
+            </div>
+          </div>
+        </div>
+      </article>
+    </div>
+  </section>
+</div>

src/main/resources/static/app/storage/grainCard/views/foodHandle-list.html

@@ -0,0 +1,114 @@
+<!-- MAIN CONTENT -->
+<div id="content">
+    <!-- widget grid -->
+    <section widget-grid id="widget-grid">
+        <div class="row">
+            <article class="col-sm-12">
+
+                <div jarvis-widget id="standard-datatable-widget"
+                     data-widget-color="darken" data-widget-editbutton="false">
+                    <header>
+						<span class="widget-icon"> <i class="fa fa-table"></i>
+						</span>
+                        <h2>粮情处置</h2>
+                    </header>
+                    <div>
+                        <div class="widget-body no-padding">
+                            <div id="DataTables_Table_1_wrapper"
+                                 class="dataTables_wrapper form-inline no-footer">
+                                <div class="dt-toolbar">
+                                    <div class="col-xs-12 col-sm-9">
+                                        <div class="form-group">
+                                            <a ng-hide="isArchive" class="btn btn-primary btn-sm" ng-click="showAddFood()">
+                                                <span class="fa fa-plus"></span>&nbsp;新&nbsp;增
+                                            </a>
+                                            <label style="margin-left: 10px;"> 仓房名称:
+                                                <select ng-model="search.spareOne" class="form-control input-sm"
+                                                        ng-options="store.storehouseId as store.storehouseName for store in storehouseObj"
+                                                        ng-change="loadWare(search.storehouseCode)">
+                                                    <option value="">请选择</option>
+                                                </select>&emsp;
+                                            </label>
+                                            <label> 货位名称:
+                                                <select ng-model="search.spareTwo" class="form-control input-sm"
+                                                        ng-options="ware.warehouseId as ware.warehouseName for ware in warelist">
+                                                    <option value="">请选择</option>
+                                                </select>&emsp;
+                                            </label>
+                                            <a class="btn btn-default btn-sm" ng-click="loadData()">
+                                                <i class="fa fa-search"></i>&nbsp;查&nbsp;询
+                                            </a>
+                                        </div>
+                                    </div>
+                                    <!-- <div class="col-sm-3 col-xs-6 hidden-xs">
+                                        <div class="dataTables_length">
+                                            <label>每页显示 <select ng-model="pageInfo.pageSize" ng-change="loadData(pageInfo.pageNum=1)"
+                                                ng-options="num as num for num in [10,25,50,100]"
+                                                class="form-control input-sm"></select> 条
+                                            </label>
+                                        </div>
+                                    </div> -->
+                                </div>
+
+                                <table class="table table-striped table-bordered table-hover"
+                                       width="100%">
+                                    <thead>
+                                    <tr>
+                                        <th class="text-center">序号</th>
+                                        <th data-class="expand" class="text-center">仓房名称</th>
+                                        <th data-class="expand" class="text-center">货位名称</th>
+                                        <th data-hide="expand" class="text-center">粮油品种</th>
+                                        <th data-hide="expand" class="text-center">发现粮情日期</th>
+                                        <th data-hide="expand" class="text-center">解决情况</th>
+                                        <th data-hide="expand" class="text-center">创建日期</th>
+                                        <th data-hide="expand" class="text-center">操作</th>
+                                    </tr>
+                                    </thead>
+
+                                    <tbody>
+                                     <tr ng-repeat="cereals in pageInfo.list">
+                                        <td class="text-center">{{$index+1}}</td>
+                                        <td class="text-center">{{cereals.storeHouseName}}</td>
+                                        <td class="text-center">{{cereals.wareHouseName}}</td>
+                                        <td class="text-center">{{cereals.grainOilVarieties}}</td>
+                                        <td class="text-center">{{cereals.findGrainDate}}</td>
+                                        <td class="text-center">{{cereals.isSolve ? "是" : "否"}}</td>
+                                        <td class="text-center">{{cereals.createTime}}</td>
+                                        <td class="text-center">
+                                            <a href-void ng-click="showViewFood(cereals.id,cereals.spareFour)">查看</a>
+                                            <a ng-hide="isArchive" href-void ng-click="showEditFood(cereals.id,cereals.spareOne,cereals.lypzName)">修改</a>
+                                            <a ng-hide="isArchive" href-void ng-click="removeFood(cereals.id)">删除</a>
+                                        </td>
+                                    </tr>
+
+
+                                    <!--<tr>
+                                        <td class="text-center">1</td>
+                                        <td class="text-center">1</td>
+                                        <td class="text-center">1</td>
+                                        <td class="text-center">1</td>
+                                        <td class="text-center">1</td>
+                                        <td class="text-center">1</td>
+                                        <td class="text-center">
+                                            <a href-void ng-click="checkProductGrainList(cereals.id)">查看</a>
+                                            <a href-void ng-click="editProductGrainList(cereals.id,cereals.spareOne,cereals.lypzName)">修改</a>
+                                        </td>
+                                    </tr>-->
+                                   
+                                    </tbody>
+
+                                </table>
+                                <div smart-include="app/layout/partials/page.tpl.html"></div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </article>
+        </div>
+
+    </section>
+
+</div>
+
+
+

src/main/resources/static/app/storage/module.js

@@ -558,8 +558,34 @@ angular.module('app.storage', ['ui.router', 'datatables', 'datatables.bootstrap'
                 }
             })
 
-//成品粮粮情卡
+//粮情处置
+.state('app.storage.foodHandle', {
+    url: '/foodHandle',
+    data: {
+        title: '粮情处置'
+    },
+    views: {
+        "content@app": {
+            controller: 'foodHandleCtr',
+            templateUrl: 'app/storage/grainCard/views/foodHandle-list.html'
+        }
+    }
+})
+//粮情处置新增/编辑
+.state('app.storage.foodHandle.add', {
+    url: '/foodHandle/add/:id/:isNotEdit',
+    data: {
+        title: '新增'
+    },
+    views: {
+        "content@app": {
+            controller: 'foodHandleSave',
+            templateUrl: 'app/storage/grainCard/views/foodHandle-edit.html'
+        }
+    }
+})
 
+//成品粮粮情卡
 .state('app.storage.productGrain', {
     url: '/productGrain/:id/:spareOne/:lypzName',
     data: {
@@ -627,6 +653,57 @@ angular.module('app.storage', ['ui.router', 'datatables', 'datatables.bootstrap'
                 }
             })
 
+            // 安全风险等级管控
+            .state('app.storage.safeproduce.safeRiskLevelCtrl', {
+                url: '/safeproduce/riskLevelCtrl',
+                data: {
+                    title: '安全风险分级管控'
+                },
+                views: {
+                    "content@app": {
+                        controller: 'safeProduceRiskCtrl',
+                        templateUrl: 'app/storage/views/safeproduce/safeRiskLevelCtrl-list.html'
+                    }
+                }
+            })
+            .state('app.storage.safeproduce.safeRiskAdd', {
+                url: '/safeproduce/riskLevelCtrl/:id/:isNotEdit',
+                data: {
+                    title: '安全风险分级管控编辑'
+                },
+                views: {
+                    "content@app": {
+                        controller: 'safeProduceRiskCtrlSave',
+                        templateUrl: 'app/storage/views/safeproduce/safeRiskLevelCtrl-edit.html'
+                    }
+                }
+            })
+            // 安全隐患跟踪处理
+            .state('app.storage.safeproduce.safeDangerHandle', {
+                url: '/safeproduce/dangerHandle',
+                data: {
+                    title: '安全隐患跟踪处理'
+                },
+                views: {
+                    "content@app": {
+                        controller: 'safeProduceDangerHandle',
+                        templateUrl: 'app/storage/views/safeproduce/safeDangerHandle-list.html'
+                    }
+                }
+            })
+            .state('app.storage.safeproduce.safeProduceDangerHandleSave', {
+                url: '/safeproduce/dangerHandle/:id/:isNotEdit',
+                data: {
+                    title: '安全隐患跟踪处理编辑'
+                },
+                views: {
+                    "content@app": {
+                        controller: 'safeProduceDangerHandleSave',
+                        templateUrl: 'app/storage/views/safeproduce/safeDangerHandle-edit.html'
+                    }
+                }
+            })
+
             /*--------------安全生产通知---------------*/
             .state('app.storage.safeproduce.notifyList', {
                 url: '/safeproduce/list',

src/main/resources/static/app/storage/service/safeDangerHandleService.js

@@ -0,0 +1,118 @@
+"use strict";
+
+angular
+  .module("app.storage")
+  .service(
+    "safeDangerHandleService",
+    function ($http, $q, APP_CONFIG, $rootScope) {
+      // 安全隐患跟踪处理
+      this.getPageInfo = function (pageNum, pageSize) {
+        var d = $q.defer();
+        $http({
+          method: "GET",
+          url: APP_CONFIG.depotStorageUrl + "/riskFollow/getList",
+          params: {
+            pageNum: pageNum,
+            pageSize: pageSize,
+            orgId: $rootScope.orgInfo.orgId,
+          },
+        }).then(
+          function successCallback(response) {
+            // 请求成功执行代码
+            d.resolve(response.data);
+          },
+          function errorCallback(response) {
+            // 请求失败执行代码
+            d.reject("error");
+          }
+        );
+        return d.promise;
+      };
+      // 保存
+      this.save = function (data) {
+        var d = $q.defer();
+        $http({
+          method: "POST",
+          url: APP_CONFIG.depotStorageUrl + "/riskFollow/saveData",
+          data: {
+            riskJson: data,
+          },
+        }).then(
+          function successCallback(response) {
+            console.log("success", response);
+            // 请求成功执行代码
+            d.resolve(response.data);
+          },
+          function errorCallback(response) {
+            console.log("error", response);
+            // 请求失败执行代码
+            d.reject("error");
+          }
+        );
+        return d.promise;
+      };
+      // 删除
+      this.removeById = function (id) {
+        var d = $q.defer();
+        $http({
+          method: "POST",
+          url: APP_CONFIG.depotStorageUrl + "/riskFollow/deleteRisk",
+          data: {
+            id: id,
+          },
+        }).then(
+          function successCallback(response) {
+            // 请求成功执行代码
+            d.resolve(response.data);
+          },
+          function errorCallback(response) {
+            // 请求失败执行代码
+            d.reject("error");
+          }
+        );
+        return d.promise;
+      };
+      // 根据Id查询
+      this.queryById = function(id) {
+        var d = $q.defer();
+        $http({
+          method: "GET",
+          url: APP_CONFIG.depotStorageUrl + "/riskFollow/queryById",
+          params: {
+            id,
+          },
+        }).then(
+          function successCallback(response) {
+            // 请求成功执行代码
+            d.resolve(response.data);
+          },
+          function errorCallback(response) {
+            // 请求失败执行代码
+            d.reject("error");
+          }
+        );
+        return d.promise;
+      };
+      // 编辑
+      this.updateRask = function(data) {
+        var d = $q.defer();
+        $http({
+          method: "POST",
+          url: APP_CONFIG.depotStorageUrl + "/riskFollow/updateData",
+          data: {
+            riskJson: data,
+          },
+        }).then(
+          function successCallback(response) {
+            // 请求成功执行代码
+            d.resolve(response.data);
+          },
+          function errorCallback(response) {
+            // 请求失败执行代码
+            d.reject("error");
+          }
+        );
+        return d.promise;
+      }
+    }
+  );

src/main/resources/static/app/storage/service/safeProduceRiskService.js

@@ -0,0 +1,120 @@
+"use strict";
+
+angular
+  .module("app.storage")
+  .service(
+    "safeProduceRiskService",
+    function ($http, $q, APP_CONFIG, $rootScope) {
+      // 安全风险分级管控分页列表
+      this.getPageInfo = function (pageNum, pageSize, startDate, endDate) {
+        var d = $q.defer();
+        $http({
+          method: "GET",
+          url: APP_CONFIG.depotStorageUrl + "/riskManagement/getList",
+          params: {
+            pageNum: pageNum,
+            pageSize: pageSize,
+            // startDate,
+            // endDate,
+            orgId: $rootScope.orgInfo.orgId,
+          },
+        }).then(
+          function successCallback(response) {
+            // 请求成功执行代码
+            d.resolve(response.data);
+          },
+          function errorCallback(response) {
+            // 请求失败执行代码
+            d.reject("error");
+          }
+        );
+        return d.promise;
+      };
+      // 保存
+      this.save = function (data) {
+        var d = $q.defer();
+        $http({
+          method: "POST",
+          url: APP_CONFIG.depotStorageUrl + "/riskManagement/saveData",
+          data: {
+            riskJson: data,
+          },
+        }).then(
+          function successCallback(response) {
+            console.log("success", response);
+            // 请求成功执行代码
+            d.resolve(response.data);
+          },
+          function errorCallback(response) {
+            console.log("error", response);
+            // 请求失败执行代码
+            d.reject("error");
+          }
+        );
+        return d.promise;
+      };
+      // 删除
+      this.removeById = function (id) {
+        var d = $q.defer();
+        $http({
+          method: "POST",
+          url: APP_CONFIG.depotStorageUrl + "/riskManagement/deleteRisk",
+          data: {
+            id: id,
+          },
+        }).then(
+          function successCallback(response) {
+            // 请求成功执行代码
+            d.resolve(response.data);
+          },
+          function errorCallback(response) {
+            // 请求失败执行代码
+            d.reject("error");
+          }
+        );
+        return d.promise;
+      };
+      // 根据Id查询
+      this.queryById = function(id) {
+        var d = $q.defer();
+        $http({
+          method: "GET",
+          url: APP_CONFIG.depotStorageUrl + "/riskManagement/queryById",
+          params: {
+            id,
+          },
+        }).then(
+          function successCallback(response) {
+            // 请求成功执行代码
+            d.resolve(response.data);
+          },
+          function errorCallback(response) {
+            // 请求失败执行代码
+            d.reject("error");
+          }
+        );
+        return d.promise;
+      };
+      // 编辑
+      this.updateRask = function(data) {
+        var d = $q.defer();
+        $http({
+          method: "POST",
+          url: APP_CONFIG.depotStorageUrl + "/riskManagement/updateData",
+          data: {
+            riskJson: data,
+          },
+        }).then(
+          function successCallback(response) {
+            // 请求成功执行代码
+            d.resolve(response.data);
+          },
+          function errorCallback(response) {
+            // 请求失败执行代码
+            d.reject("error");
+          }
+        );
+        return d.promise;
+      }
+    }
+  );

src/main/resources/static/app/storage/views/safeproduce/safeDangerHandle-edit.html

@@ -0,0 +1,232 @@
+<div id="content">
+  <section id="widget-grid" widget-grid>
+    <div class="row">
+      <article class="col-sm-12 col-md-12 col-lg-12">
+        <div
+          jarvis-widget
+          id="form-grid-widget"
+          data-widget-colorbutton="false"
+          data-widget-editbutton="false"
+          data-widget-custombutton="false"
+        >
+          <div>
+            <div class="widget-body no-padding">
+              <form
+                id="safeDangerHandle-form"
+                class="smart-form"
+                data-validator-option="validateOptions"
+                novalidate="novalidate"
+              >
+                <button
+                  type="submit"
+                  class="bv-hidden-submit"
+                  style="display: none; width: 0px; height: 0px"
+                ></button>
+                <header>
+                  <a
+                    href-void
+                    class="btn btn-default btn-xs"
+                    ng-click="backLayer()"
+                  >
+                    <i class="fa fa-angle-left"></i>&nbsp;返回&nbsp;
+                  </a>
+                  &nbsp;<strong>安全隐患跟踪处理</strong>
+                </header>
+                <fieldset>
+                  <div class="row">
+                    <section class="col col-3">
+                      <label class="label"
+                        >单位名称<span style="color: red">*</span></label
+                      >
+                      <label class="input">
+                        <input
+                          type="text"
+                          ng-model="orgName"
+                          name="orgName"
+                          ng-disabled="isNotEdit"
+                          required
+                          readonly="true"
+                        />
+                      </label>
+                    </section>
+                    <section class="form-group col col-3">
+                      <label class="label"
+                        >整改时限<span style="color: red">*</span></label
+                      >
+                      <label class="select">
+                        <input
+                        style="padding: 5px 10px;box-sizing: border-box;"
+                          ng-disabled="isNotEdit"
+                          class="form-control"
+                          type="text"
+                          ng-model="insertDanger.solveTime"
+                          id="solveTime"
+                          name="solveTime"
+                          onClick="WdatePicker({lang:'zh-cn'})"
+                        />
+                      </label>
+                    </section>
+                    <section class="col col-3">
+                      <label class="label"
+                        >责任单位<span style="color: red">*</span></label
+                      >
+                      <label class="input">
+                        <input
+                          type="text"
+                          ng-model="insertDanger.responsibleDept"
+                          name="responsibleDept"
+                          required
+                          ng-disabled="isNotEdit"
+                        />
+                      </label>
+                    </section>
+                    <section class="col col-3">
+                      <label class="label"
+                        >责任人<span style="color: red">*</span></label
+                      >
+                      <label class="input">
+                        <input
+                          type="text"
+                          ng-model="insertDanger.responsiblePerson"
+                          name="responsiblePerson"
+                          required
+                          ng-disabled="isNotEdit"
+                        />
+                      </label>
+                    </section>
+                  </div>
+                  <!-- <div class="row">
+                    <section class="col col-3">
+                      <label class="label"
+                        >仓房名称<span style="color: red">*</span></label
+                      >
+                      <label class="input">
+                        <select
+                          ng-model="storehouseId"
+                          class="form-control input-sm"
+                          ng-options="store.storehouseId as store.storehouseName for store in storeHouseList"
+                        >
+                          <option value="">请选择</option></select
+                        >&emsp;
+                      </label>
+                    </section>
+                    <section class="col col-3">
+                      <label class="label"
+                        >货位名称<span style="color: red">*</span></label
+                      >
+                      <label class="input">
+                        <select
+                          ng-model="storehouseId"
+                          class="form-control input-sm"
+                          ng-options="store.storehouseId as store.storehouseName for store in storeHouseList"
+                        >
+                          <option value="">请选择</option></select
+                        >&emsp;
+                      </label>
+                    </section>
+                  </div> -->
+                  <div class="row">
+                    <section class="col col-12" style="width: 100%">
+                      <label class="label"
+                        >隐患信息<span style="color: red">*</span></label
+                      >
+                      <label class="input">
+                        <input
+                          type="text"
+                          ng-model="insertDanger.riskInfo"
+                          ng-disabled="isNotEdit"
+                          name="riskInfo"
+                          required
+                        />
+                      </label>
+                    </section>
+                  </div>
+                  <div class="row">
+                    <section class="col col-12" style="width: 100%">
+                      <label class="label"
+                        >隐患排查信息<span style="color: red">*</span></label
+                      >
+                      <label class="input">
+                        <input
+                          type="text"
+                          ng-model="insertDanger.riskCheck"
+                          ng-disabled="isNotEdit"
+                          name="riskCheck"
+                          required
+                        />
+                      </label>
+                    </section>
+                  </div>
+                  <div class="row">
+                    <section class="col col-12" style="width: 100%">
+                      <label class="label"
+                        >隐患整改验收信息<span style="color: red"
+                          >*</span
+                        ></label
+                      >
+                      <label class="input">
+                        <input
+                          type="text"
+                          ng-model="insertDanger.riskSolve"
+                          ng-disabled="isNotEdit"
+                          required
+                          name="riskSolve"
+                        />
+                      </label>
+                    </section>
+                  </div>
+                  <div class="row">
+                    <section class="col col-12" style="width: 100%">
+                      <label class="label"
+                        >事故基本信息<span style="color: red">*</span></label
+                      >
+                      <label class="input">
+                        <input
+                          type="text"
+                          ng-model="insertDanger.baseRiskInfo"
+                          ng-disabled="isNotEdit"
+                          name="baseRiskInfo"
+                          required
+                        />
+                      </label>
+                    </section>
+                  </div>
+                  <div class="row">
+                    <section class="col col-12" style="width: 100%">
+                      <label class="label">整改验收信息</label>
+                      <label class="input">
+                        <input
+                          type="text"
+                          ng-model="insertDanger.solveCheckInfo"
+                          ng-disabled="isNotEdit"
+                          name="solveCheckInfo"
+                        />
+                      </label>
+                    </section>
+                  </div>
+                </fieldset>
+                <footer class="modal-footer text-align-center">
+                  <button
+                    ng-click="back()"
+                    class="btn btn-default btn-lg"
+                    data-dismiss="modal"
+                  >
+                    取消
+                  </button>
+                  <button
+                    ng-click="saveData()"
+                    type="button"
+                    class="btn btn-primary btn-lg"
+                    ng-hide="isNotEdit"
+                  >
+                    提交
+                  </button>
+                </footer>
+              </form>
+            </div>
+          </div>
+        </div>
+      </article>
+    </div>
+  </section>
+</div>

src/main/resources/static/app/storage/views/safeproduce/safeDangerHandle-list.html

@@ -0,0 +1,69 @@
+<!-- MAIN CONTENT -->
+<div id="content">
+  <!-- widget grid -->
+  <section widget-grid id="widget-grid">
+      <div class="row">
+          <article class="col-sm-12">
+
+              <div jarvis-widget id="standard-datatable-widget" data-widget-color="darken" data-widget-editbutton="false">
+                  <header>
+                      <span class="widget-icon"> <i class="fa fa-table"></i> </span>
+                      <h2>安全隐患跟踪处理</h2>
+                  </header>
+                  <div>
+                      <div class="widget-body no-padding">
+                          <div id="DataTables_Table_1_wrapper" class="dataTables_wrapper form-inline no-footer">
+                              <div class="dt-toolbar" style="display: flex;justify-content: space-between;">
+                                  <div class="col-xs-3 col-sm-1">
+                                      <a has-permission="578" href-void class="btn btn-primary btn-sm" ng-click="showAddDanger()"><i class="fa fa-plus"></i>&nbsp;新&nbsp;增</a>
+                                  </div>
+                                  <div class="col-sm-5 col-xs-6 hidden-xs">
+                                      <div class="dataTables_length" id="DataTables_Table_8_length">
+                                          <label>每页显示 <select ng-model="pageInfo.pageSize" ng-change="loadData(pageInfo.pageNum=1)"
+                                                              ng-options="num as num for num in [10,25,50,100]"
+                                                              class="form-control input-sm"></select> 条
+                                          </label>
+                                      </div>
+                                  </div>
+                              </div>
+
+                              <table class="table table-striped table-bordered table-hover" width="100%">
+                                  <thead>
+                                  <tr>
+                                      <th data-hide="expand">序号</th>
+                                      <th data-class="expand">库区名称</th>
+                                      <!-- <th data-class="expand">货位名称</th> -->
+                                      <th data-hide="expand">隐患信息</th>
+                                      <th data-hide="expand">隐患排查信息</th>
+                                      <th data-hide="expand">隐患整改信息</th>
+                                      <th data-hide="expand"> 操作</th>
+                                  </tr>
+                                  </thead>
+
+                                  <tbody>
+                                  <tr ng-repeat="listItem in pageInfo.list">
+                                      <td>{{ $index + 1 }}</td>
+                                      <td>{{ orgName }}</td>
+                                      <!-- <td>{{ listItem.warehouseName }}</td> -->
+                                      <td>{{ listItem.riskInfo }}</td>
+                                      <td>{{ listItem.riskCheck }}</td>
+                                      <td>{{ listItem.riskSolve }}</td>
+                                      <td>
+                                          <a has-permission="579" href-void ng-click="showViewDanger(listItem.id)"><i class="fa fa-info-circle"></i>查看</a>
+                                          <a has-permission="580" href-void ng-click="showEditDanger(listItem.id)"><i class="fa fa-edit"></i>修改</a>
+                                          <a has-permission="581" href-void ng-click="removeDanger(listItem.id)"><i class="fa fa-trash-o"></i>删除</a>
+                                      </td>
+                                  </tr>
+                                  </tbody>
+
+                              </table>
+
+                              <div smart-include="app/layout/partials/page.tpl.html"></div>
+                          </div>
+                      </div>
+                  </div>
+              </div>
+          </article>
+      </div>
+  </section>
+</div>

src/main/resources/static/app/storage/views/safeproduce/safeRiskLevelCtrl-edit.html

@@ -0,0 +1,116 @@
+<div id="content">
+  <section id="widget-grid" widget-grid>
+      <div class="row">
+          <article class="col-sm-12 col-md-12 col-lg-12">
+              <div jarvis-widget id="form-grid-widget" data-widget-colorbutton="false" data-widget-editbutton="false"
+                   data-widget-custombutton="false">
+                  <div>
+                      <div class="widget-body no-padding">
+                          <form id="safeProduceNotify-form" class="smart-form" data-validator-option="validateOptions" novalidate="novalidate">
+                              <button type="submit" class="bv-hidden-submit" style="display: none; width: 0px; height: 0px;"></button>
+                              <header>
+                                  <a href-void class="btn btn-default btn-xs" ng-click="backLayer()">
+                                      <i class="fa fa-angle-left"></i>&nbsp;返回&nbsp;
+                                  </a>
+                                  &nbsp;<strong>安全风险分级管控</strong>
+                              </header>
+                              <fieldset>
+                                  <div class="row">
+                                      <section class="col col-3">
+                                          <label class="label">库点名称<span style="color: red;">*</span></label>
+                                          <label class="input">
+                                              <input type="text" ng-model="insertRisk.libraryPointName" name="fileName"  ng-disabled="isNotEdit" required>
+                                          </label>
+                                      </section>
+                                      <section class="col col-3">
+                                          <label class="label">识别人<span style="color: red;">*</span></label>
+                                          <label class="input">
+                                              <input type="text" ng-model="insertRisk.identifyPerson" name="operationTime" required>
+                                          </label>
+                                      </section>
+                                      <section class="col col-3">
+                                          <label class="label">环节部位<span style="color: red;">*</span></label>
+                                          <label class="input">
+                                              <input type="text" ng-model="insertRisk.linkPart" name="linkPart">
+                                          </label>
+                                      </section>
+                                      <section class="col col-3">
+                                          <label class="label">风险分级<span style="color: red;">*</span></label>
+                                          <label class="select">
+                                            <select 
+                                                ng-model="insertRisk.riskClassification"
+                                                name="riskClassification" class="form-control input-sm"
+                                                ng-options="item.id as item.value for item in fxfjList"
+                                                    ng-change="loadWare(houseId)" required>
+                                                <option value="">请选择</option>
+                                            </select> <i></i>
+                                        </label>
+                                      </section>
+                                  </div>
+                                  <div class="row">
+                                      <section class="col col-3">
+                                          <label class="label">风险类型<span style="color: red;">*</span></label>
+                                          <label class="select">
+                                            <select 
+                                                ng-model="insertRisk.riskTypeName"
+                                                name="riskTypeName" class="form-control input-sm"
+                                                ng-options="item.id as item.value for item in fxlxList"
+                                                    ng-change="loadWare(houseId)" required>
+                                                <option value="">请选择</option>
+                                            </select> <i></i>
+                                        </label>
+                                      </section>
+                                  </div>
+                                  <div class="row">
+                                        <section class="col col-12" style="width: 100%;">
+                                            <label class="label">风险识别</label>
+                                            <label class="textarea textarea-resizable">
+                                                <textarea rows="5" class="custom-scroll"  ng-model="insertRisk.riskIdentification"  ng-disabled="isNotEdit" name="riskIdentification"></textarea>
+                                            </label>
+                                        </section>
+                                    </div>
+                                  <div class="row">
+                                        <section class="col col-12" style="width: 100%;">
+                                            <label class="label">可能导致事故类型</label>
+                                            <label class="textarea textarea-resizable">
+                                                <textarea rows="5" class="custom-scroll"  ng-model="insertRisk.accidentType"  ng-disabled="isNotEdit" name="accidentType"></textarea>
+                                            </label>
+                                        </section>
+                                    </div>
+                                  <div class="row">
+                                        <section class="col col-12" style="width: 100%;">
+                                            <label class="label">风险管控措施<span style="color: red;">*</span></label>
+                                            <label class="textarea textarea-resizable">
+                                                <textarea rows="5" class="custom-scroll"  ng-model="insertRisk.riskMeasures" 
+                                                required
+                                                ng-disabled="isNotEdit" name="riskMeasures"></textarea>
+                                            </label>
+                                        </section>
+                                    </div>
+                                    <div class="row">
+                                        <section class="col col-3">
+                                            <label class="label">责任部门</label>
+                                            <label class="input">
+                                                <input type="text" ng-model="insertRisk.responsibleDept" name="responsibleDept" placeholder="责任部门"  ng-disabled="isNotEdit" required>
+                                            </label>
+                                        </section>
+                                        <section class="col col-3">
+                                            <label class="label">责任人</label>
+                                            <label class="input">
+                                                <input type="text" ng-model="insertRisk.responsiblePerson" name="responsiblePerson" placeholder="责任人" ng-disabled="isNotEdit" required>
+                                            </label>
+                                        </section>
+                                    </div>
+                              </fieldset>
+                              <footer class="modal-footer text-align-center">
+                                  <button ng-click="back()" class="btn btn-default btn-lg" data-dismiss="modal">取消</button>
+                                  <button ng-click="saveData()" type="button" class="btn btn-primary btn-lg" ng-hide="isNotEdit">提交</button>
+                              </footer>
+                          </form>
+                      </div>
+                  </div>
+              </div>
+          </article>
+      </div>
+  </section>
+</div>

src/main/resources/static/app/storage/views/safeproduce/safeRiskLevelCtrl-list.html

@@ -0,0 +1,144 @@
+<!-- MAIN CONTENT -->
+<div id="content">
+  <!-- widget grid -->
+  <section widget-grid id="widget-grid">
+    <div class="row">
+      <article class="col-sm-12">
+        <div
+          jarvis-widget
+          id="standard-datatable-widget"
+          data-widget-color="darken"
+          data-widget-editbutton="false"
+        >
+          <header>
+            <span class="widget-icon"> <i class="fa fa-table"></i> </span>
+            <h2>安全风险分级管控</h2>
+          </header>
+          <div>
+            <div class="widget-body no-padding">
+              <div
+                id="DataTables_Table_1_wrapper"
+                class="dataTables_wrapper form-inline no-footer"
+              >
+                <div class="dt-toolbar">
+                  <div class="col-xs-3 col-sm-1">
+                    <a
+                      has-permission="578"
+                      href-void
+                      class="btn btn-primary btn-sm"
+                      ng-click="showAddRisk()"
+                      ><i class="fa fa-plus"></i>&nbsp;新&nbsp;增</a
+                    >
+                  </div>
+                  <div class="col-xs-12 col-sm-6">
+                    <div class="form-group">
+                      <label>
+                        日期:&emsp;<input
+                          style="width: 100px"
+                          class="form-control"
+                          type="text"
+                          ng-model="search.searchStartDate"
+                          id="searchStartDate"
+                          name="searchStartDate"
+                          onClick="WdatePicker({lang:'zh-cn',maxDate:'#F{$dp.$D(\'searchEndDate\')}'})"
+                        />
+                        --&nbsp;<input
+                          style="width: 100px"
+                          ng-disabled="isArchive"
+                          class="form-control"
+                          type="text"
+                          ng-model="search.searchEndDate"
+                          id="searchEndDate"
+                          name="searchEndDate"
+                          onClick="WdatePicker({lang:'zh-cn',minDate:'#F{$dp.$D(\'searchStartDate\')}'})"
+                        />
+                        &emsp;
+                      </label>
+                      <a class="btn btn-default btn-sm" ng-click="loadData()">
+                        <i class="fa fa-search"></i>&nbsp;查&nbsp;询</a
+                      >
+                      <a class="btn btn-primary btn-sm" id="print" ng-click="print()">
+                        <i class="fa fa-print"></i>&nbsp;打&nbsp;印</a
+                      >
+                    </div>
+                  </div>
+                  <div class="col-sm-5 col-xs-6 hidden-xs">
+                    <div
+                      class="dataTables_length"
+                      id="DataTables_Table_8_length"
+                    >
+                      <label
+                        >每页显示
+                        <select
+                          ng-model="pageInfo.pageSize"
+                          ng-change="loadData(pageInfo.pageNum=1)"
+                          ng-options="num as num for num in [10,25,50,100]"
+                          class="form-control input-sm"
+                        ></select>
+                        条
+                      </label>
+                    </div>
+                  </div>
+                </div>
+
+                <table
+                  class="table table-striped table-bordered table-hover"
+                  width="100%"
+                >
+                  <thead>
+                    <tr>
+                      <th data-hide="expand">序号</th>
+                      <th data-class="expand">环节/部位</th>
+                      <th data-class="expand">风险辨识</th>
+                      <th data-hide="expand">风险等级</th>
+                      <th data-hide="expand">可能导致事故类型</th>
+                      <th data-hide="expand">风险管控措施</th>
+                      <th data-hide="expand">责任部门</th>
+                      <th data-hide="expand">责任人</th>
+                      <th data-hide="expand">操作</th>
+                    </tr>
+                  </thead>
+
+                  <tbody>
+                    <tr ng-repeat="listItem in pageInfo.list">
+                      <td>{{ $index + 1}}</td>
+                      <td>{{ listItem.linkPart }}</td>
+                      <td>{{ listItem.riskIdentification }}</td>
+                      <td>{{listItem.riskClassification}}</td>
+                      <td>{{ listItem.accidentType }}</td>
+                      <td>{{ listItem.riskMeasures }}</td>
+                      <td>{{ listItem.responsibleDept }}</td>
+                      <td>{{ listItem.responsiblePerson }}</td>
+                      <td>
+                        <a
+                          has-permission="579"
+                          href-void
+                          ng-click="showViewRisk(listItem.id)"
+                          ><i class="fa fa-info-circle"></i>查看</a
+                        >
+                        <a
+                          has-permission="580"
+                          href-void
+                          ng-click="showEditRisk(listItem.id)"
+                          ><i class="fa fa-edit"></i>修改</a
+                        >
+                        <a
+                          has-permission="581"
+                          href-void
+                          ng-click="removeRisk(listItem.id)" 
+                          ><i class="fa fa-trash-o"></i>删除</a
+                        >
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+
+                <div smart-include="app/layout/partials/page.tpl.html"></div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </article>
+    </div>
+  </section>
+</div>

src/main/resources/static/bower_components/echarts/build/.jshintrc

@@ -1,77 +0,0 @@
-{
-    "bitwise": false,
-    "camelcase": true,
-    "curly": true,
-    "eqeqeq": false,
-    "forin": false,
-    "immed": true,
-    "latedef": false,
-    "newcap": true,
-    "noarg": false,
-    "noempty": true,
-    "nonew": true,
-    "plusplus": false,
-    "quotmark": "single",
-    "regexp": false,
-    "undef": true,
-    "unused": "vars",
-    "strict": false,
-    "trailing": false,
-    "maxparams": 20,
-    "maxdepth": 6,
-    "maxlen": 200,
-
-    "asi": false,
-    "boss": false,
-    "debug": false,
-    "eqnull": true,
-    "esversion": 6,
-    "evil": true,
-    "expr": true,
-    "funcscope": false,
-    "globalstrict": false,
-    "iterator": false,
-    "lastsemic": false,
-    "laxbreak": true,
-    "laxcomma": false,
-    "loopfunc": false,
-    "multistr": false,
-    "onecase": false,
-    "proto": false,
-    "regexdash": false,
-    "scripturl": false,
-    "smarttabs": false,
-    "shadow": true,
-    "sub": true,
-    "supernew": false,
-    "validthis": true,
-
-    "browser": true,
-    "couch": false,
-    "devel": true,
-    "dojo": false,
-    "jquery": true,
-    "mootools": false,
-    "node": false,
-    "nonstandard": false,
-    "prototypejs": false,
-    "rhino": false,
-    "wsh": false,
-
-    "nomen": false,
-    "onevar": false,
-    "passfail": false,
-    "white": false,
-
-    "varstmt": true,
-
-    "predef": [
-        "__DEV__",
-        "global",
-        "require",
-        "exports",
-        "Buffer",
-        "module",
-        "__dirname"
-    ]
-}

src/main/resources/static/bower_components/echarts/build/amd2common.js

@@ -1,160 +0,0 @@
-var glob = require('glob');
-var fsExtra = require('fs-extra');
-var esprima = require('esprima');
-
-function run(cb) {
-    glob('**/*.js', {
-        cwd: __dirname + '/../src/'
-    }, function (err, files) {
-        files.forEach(function (filePath) {
-            var code = parse(fsExtra.readFileSync(
-                __dirname + '/../src/' + filePath, 'utf-8'));
-            code = code.replace(/require\(([\'"])zrender\//g, 'require($1zrender/lib/');
-            fsExtra.outputFileSync(
-                __dirname + '/../lib/' + filePath,
-                code, 'utf-8');
-        });
-
-        cb && cb();
-    });
-}
-
-if (require.main === module) {
-    run();
-}
-else {
-    module.exports = run;
-}
-
-var MAGIC_DEPS = {
-    'exports' : true,
-    'module' : true,
-    'require' : true
-};
-
-var SIMPLIFIED_CJS = ['require', 'exports', 'module'];
-
-// Convert AMD-style JavaScript string into node.js compatible module
-function parse (raw){
-    var output = '';
-    var ast = esprima.parse(raw, {
-        range: true,
-        raw: true
-    });
-
-    var defines = ast.body.filter(isDefine);
-
-    if ( defines.length > 1 ){
-        throw new Error('Each file can have only a single define call. Found "'+ defines.length +'"');
-    } else if (!defines.length){
-        return raw;
-    }
-
-    var def = defines[0];
-    var args = def.expression['arguments'];
-    var factory = getFactory( args );
-    var useStrict = getUseStrict( factory );
-
-    // do replacements in-place to avoid modifying the code more than needed
-    if (useStrict) {
-        output += useStrict.expression.raw +';\n';
-    }
-    output += raw.substring( 0, def.range[0] ); // anything before define
-    output += getRequires(args, factory); // add requires
-    output += getBody(raw, factory.body, useStrict); // module body
-
-    output += raw.substring( def.range[1], raw.length ); // anything after define
-
-    return output;
-}
-
-
-function getRequires(args, factory){
-    var requires = [];
-    var deps = getDependenciesNames( args );
-    var params = factory.params.map(function(param, i){
-        return {
-            name : param.name,
-            // simplified cjs doesn't have deps
-            dep : (deps.length)? deps[i] : SIMPLIFIED_CJS[i]
-        };
-    });
-
-    params.forEach(function(param){
-        if ( MAGIC_DEPS[param.dep] && !MAGIC_DEPS[param.name] ) {
-            // if user remaped magic dependency we declare a var
-            requires.push( 'var '+ param.name +' = '+ param.dep +';' );
-        } else if ( param.dep && !MAGIC_DEPS[param.dep] ) {
-            // only do require for params that have a matching dependency also
-            // skip "magic" dependencies
-            requires.push( 'var '+ param.name +' = require(\''+ param.dep +'\');' );
-        }
-    });
-
-    return requires.join('\n');
-}
-
-
-function getDependenciesNames(args){
-    var deps = [];
-    var arr = args.filter(function(arg){
-        return arg.type === 'ArrayExpression';
-    })[0];
-
-    if (arr) {
-        deps = arr.elements.map(function(el){
-            return el.value;
-        });
-    }
-
-    return deps;
-}
-
-
-function isDefine(node){
-    return node.type === 'ExpressionStatement' &&
-           node.expression.type === 'CallExpression' &&
-           node.expression.callee.type === 'Identifier' &&
-           node.expression.callee.name === 'define';
-}
-
-
-function getFactory(args){
-    return args.filter(function(arg){
-        return arg.type === 'FunctionExpression';
-    })[0];
-}
-
-
-function getBody(raw, factoryBody, useStrict){
-    var returnStatement = factoryBody.body.filter(function(node){
-        return node.type === 'ReturnStatement';
-    })[0];
-
-    var body = '';
-    var bodyStart = useStrict ? useStrict.expression.range[1] + 1 : factoryBody.range[0] + 1;
-
-    if (returnStatement) {
-        body += raw.substring( bodyStart, returnStatement.range[0] );
-        // "return ".length === 7 so we add "6" to returnStatement start
-        body += 'module.exports ='+ raw.substring( returnStatement.range[0] + 6, factoryBody.range[1] - 1 );
-    } else {
-        // if using exports or module.exports or just a private module we
-        // simply return the factoryBody content
-        body = raw.substring( bodyStart, factoryBody.range[1] - 1 );
-    }
-
-    return body;
-}
-
-
-function getUseStrict(factory){
-    return factory.body.body.filter(isUseStrict)[0];
-}
-
-
-function isUseStrict(node){
-    return node.type === 'ExpressionStatement' &&
-            node.expression.type === 'Literal' &&
-            node.expression.value === 'use strict';
-}

src/main/resources/static/bower_components/echarts/build/build.js

@@ -1,236 +0,0 @@
-#!/usr/bin/env node
-
-const fsExtra = require('fs-extra');
-const fs = require('fs');
-const {resolve} = require('path');
-const config = require('./config.js');
-const commander = require('commander');
-const {build, watch, color} = require('zrender/build/helper');
-const ecLangPlugin = require('./rollup-plugin-ec-lang');
-const prePublish = require('./pre-publish');
-const recheckDEV = require('zrender/build/babel-plugin-transform-remove-dev').recheckDEV;
-
-function run() {
-
-    /**
-     * Tips for `commander`:
-     * (1) If arg xxx not specified, `commander.xxx` is undefined.
-     *     Otherwise:
-     *      If '-x, --xxx', `commander.xxx` can only be true/false, even if '--xxx yyy' input.
-     *      If '-x, --xxx <some>', the 'some' string is required, or otherwise error will be thrown.
-     *      If '-x, --xxx [some]', the 'some' string is optional, that is, `commander.xxx` can be boolean or string.
-     * (2) `node ./build/build.js --help` will print helper info and exit.
-     */
-
-    let descIndent = '                                 ';
-    let egIndent = '    ';
-
-    commander
-        .usage('[options]')
-        .description([
-            'Build echarts and generate result files in directory `echarts/dist`.',
-            '',
-            '  For example:',
-            '',
-            egIndent + 'node build/build.js --release'
-                + '\n' + descIndent + '# Build all to `dist` folder.',
-            egIndent + 'node build/build.js --prepublish'
-                + '\n' + descIndent + '# Only prepublish.',
-            egIndent + 'node build/build.js --removedev'
-                + '\n' + descIndent + '# Remove __DEV__ code. If --min, __DEV__ always be removed.',
-            egIndent + 'node build/build.js --type ""'
-                + '\n' + descIndent + '# Only generate `dist/echarts.js`.',
-            egIndent + 'node build/build.js --type common --min'
-                + '\n' + descIndent + '# Only generate `dist/echarts.common.min.js`.',
-            egIndent + 'node build/build.js --type simple --min --lang en'
-                + '\n' + descIndent + '# Only generate `dist/echarts-en.simple.min.js`.',
-            egIndent + 'node build/build.js --lang "my/lang.js" -i "my/index.js" -o "my/bundle.js"'
-                + '\n' + descIndent + '# Take `<cwd>/my/index.js` as input and generate `<cwd>/my/bundle.js`,'
-                + '\n' + descIndent + 'where `<cwd>/my/lang.js` is used as language file.',
-        ].join('\n'))
-        .option(
-            '-w, --watch', [
-            'Watch modifications of files and auto-compile to dist file. For example,',
-            descIndent + '`echarts/dist/echarts.js`.'
-        ].join('\n'))
-        .option(
-            '--lang <language file path or shortcut>', [
-            'Use the specified file instead of `echarts/src/lang.js`. For example:',
-            descIndent + '`--lang en` will use `echarts/src/langEN.js`.',
-            descIndent + '`--lang my/langDE.js` will use `<cwd>/my/langDE.js`. -o must be specified in this case.',
-            descIndent + '`--lang /my/indexSW.js` will use `/my/indexSW.js`. -o must be specified in this case.'
-        ].join('\n'))
-        .option(
-            '--release',
-            'Build all for release'
-        )
-        .option(
-            '--prepublish',
-            'Build all for release'
-        )
-        .option(
-            '--removedev',
-            'Remove __DEV__ code. If --min, __DEV__ always be removed.'
-        )
-        .option(
-            '--min',
-            'Whether to compress the output file, and remove error-log-print code.'
-        )
-        .option(
-            '--type <type name>', [
-            'Can be "simple" or "common" or "" (default). For example,',
-            descIndent + '`--type ""` or `--type "common"`.'
-        ].join('\n'))
-        .option(
-            '--sourcemap',
-            'Whether output sourcemap.'
-        )
-        .option(
-            '--format <format>',
-            'The format of output bundle. Can be "umd", "amd", "iife", "cjs", "es".'
-        )
-        .option(
-            '-i, --input <input file path>',
-            'If input file path is specified, output file path must be specified too.'
-        )
-        .option(
-            '-o, --output <output file path>',
-            'If output file path is specified, input file path must be specified too.'
-        )
-        .parse(process.argv);
-
-    let isWatch = !!commander.watch;
-    let isRelease = !!commander.release;
-    let isPrePublish = !!commander.prepublish;
-
-    let opt = {
-        lang: commander.lang,
-        min: commander.min,
-        type: commander.type || '',
-        input: commander.input,
-        output: commander.output,
-        format: commander.format,
-        sourcemap: commander.sourcemap,
-        removeDev: commander.removedev,
-        addBundleVersion: isWatch
-    };
-
-    validateIO(opt.input, opt.output);
-    validateLang(opt.lang, opt.output);
-
-    normalizeParams(opt);
-
-    // Clear `echarts/dist`
-    if (isRelease) {
-        fsExtra.removeSync(getPath('./dist'));
-    }
-
-    if (isWatch) {
-        watch(config.createECharts(opt));
-    }
-    else if (isPrePublish) {
-        prePublish();
-    }
-    else if (isRelease) {
-        let configs = [];
-        let configForCheck;
-
-        [
-            {min: false},
-            {min: true},
-            {min: false, lang: 'en'},
-            {min: true, lang: 'en'}
-        ].forEach(function (opt) {
-
-            ['', 'simple', 'common'].forEach(function (type) {
-                let singleOpt = Object.assign({type}, opt);
-                normalizeParams(singleOpt);
-                let singleConfig = config.createECharts(singleOpt);
-                configs.push(singleConfig);
-
-                if (singleOpt.min && singleOpt.type === '') {
-                    configForCheck = singleConfig;
-                }
-            });
-        });
-
-        configs.push(
-            config.createBMap(false),
-            config.createBMap(true),
-            config.createDataTool(false),
-            config.createDataTool(true)
-        );
-
-        build(configs)
-            .then(function () {
-                checkCode(configForCheck);
-                prePublish();
-            }).catch(handleBuildError);
-    }
-    else {
-        let cfg = config.createECharts(opt);
-        build([cfg])
-            .then(function () {
-                if (opt.removeDev) {
-                    checkCode(cfg);
-                }
-            })
-            .catch(handleBuildError);
-    }
-}
-
-function normalizeParams(opt) {
-    if (opt.sourcemap == null) {
-        opt.sourcemap = !(opt.min || opt.type);
-    }
-    if (opt.removeDev == null) {
-        opt.removeDev = !!opt.min;
-    }
-}
-
-function handleBuildError(err) {
-    console.log(err);
-}
-
-function checkCode(singleConfig) {
-    // Make sure __DEV__ is eliminated.
-    let code = fs.readFileSync(singleConfig.output.file, {encoding: 'utf-8'});
-    if (!code) {
-        throw new Error(`${singleConfig.output.file} is empty`);
-    }
-    recheckDEV(code);
-    console.log(color('fgGreen', 'dim')('Check code: correct.'));
-}
-
-function validateIO(input, output) {
-    if ((input != null && output == null)
-        || (input == null && output != null)
-    ) {
-        throw new Error('`input` and `output` must be both set.');
-    }
-}
-
-function validateLang(lang, output) {
-    if (!lang) {
-        return;
-    }
-
-    let langInfo = ecLangPlugin.getLangFileInfo(lang);
-
-    if (langInfo.isOuter && !output) {
-        throw new Error('`-o` or `--output` must be specified if using a file path in `--lang`.');
-    }
-    if (!langInfo.absolutePath || !fs.statSync(langInfo.absolutePath).isFile()) {
-        throw new Error(`File ${langInfo.absolutePath} does not exist yet. Contribution is welcome!`);
-    }
-}
-
-/**
- * @param {string} relativePath Based on echarts directory.
- * @return {string} Absolute path.
- */
-function getPath(relativePath) {
-    return resolve(__dirname, '../', relativePath);
-}
-
-run();

src/main/resources/static/bower_components/echarts/build/config.js

@@ -1,154 +0,0 @@
-const nodeResolvePlugin = require('rollup-plugin-node-resolve');
-const uglifyPlugin = require('rollup-plugin-uglify');
-const ecRemoveDevPlugin = require('./rollup-plugin-ec-remove-dev');
-const ecLangPlugin = require('./rollup-plugin-ec-lang');
-const {resolve} = require('path');
-
-function getPathBasedOnECharts(path) {
-    return resolve(__dirname, '../', path);
-}
-
-function getPlugins({min, lang, sourcemap, removeDev, addBundleVersion}) {
-    let plugins = [];
-
-    removeDev && plugins.push(
-        ecRemoveDevPlugin({sourcemap})
-    );
-
-    lang && plugins.push(
-        ecLangPlugin({lang})
-    );
-
-    plugins.push(
-        nodeResolvePlugin()
-    );
-
-    addBundleVersion && plugins.push({
-        outro: function () {
-            return 'exports.bundleVersion = "' + (+new Date()) + '";';
-        }
-    });
-
-    min && plugins.push(uglifyPlugin({
-        compress: {
-            // Eliminate __DEV__ code.
-            // Currently, in uglify:
-            // `var vx; if(vx) {...}` can not be removed.
-            // `if (__DEV__) {...}` can be removed if `__DEV__` is defined as `false` in `global_defs`.
-            // 'global_defs': {
-            //     __DEV__: false
-            // },
-            'dead_code': true
-        }
-    }));
-
-    return plugins;
-}
-
-/**
- * @param {Object} [opt]
- * @param {string} [opt.type=''] '' or 'simple' or 'common'
- * @param {boolean} [opt.min=false]
- * @param {string} [opt.lang=undefined] null/undefined/'' or 'en' or 'fi' or a file path.
- * @param {string} [opt.input=undefined] If set, `opt.output` is required too, and `opt.type` is ignored.
- * @param {string} [opt.output=undefined] If set, `opt.input` is required too, and `opt.type` is ignored.
- * @param {boolean} [opt.sourcemap] If set, `opt.input` is required too, and `opt.type` is ignored.
- * @param {boolean} [opt.removeDev]
- * @param {string} [opt.format='umd'] If set, `opt.input` is required too, and `opt.type` is ignored.
- * @param {boolean} [opt.addBundleVersion=false] Only for debug in watch, prompt that the two build is different.
- */
-exports.createECharts = function (opt = {}) {
-    let srcType = opt.type ? '.' + opt.type : '.all';
-    let postfixType = opt.type ? '.' + opt.type : '';
-    let postfixMin = opt.min ? '.min' : '';
-    let postfixLang = opt.lang ? '-' + opt.lang.toLowerCase() : '';
-    let input = opt.input;
-    let output = opt.output;
-    let sourcemap = opt.sourcemap;
-    let format = opt.format || 'umd';
-
-    if (input != null || output != null) {
-        // Based on process.cwd();
-        input = resolve(input);
-        output = resolve(output);
-    }
-    else {
-        input = getPathBasedOnECharts(`./echarts${srcType}.js`);
-        output = getPathBasedOnECharts(`dist/echarts${postfixLang}${postfixType}${postfixMin}.js`);
-    }
-
-    return {
-        plugins: getPlugins(opt),
-        input: input,
-        legacy: true, // Support IE8-
-        output: {
-            name: 'echarts',
-            format: format,
-            sourcemap: sourcemap,
-            legacy: true, // Must be declared both in inputOptions and outputOptions.
-            file: output
-        },
-        watch: {
-            include: [
-                getPathBasedOnECharts('./src/**'),
-                getPathBasedOnECharts('./echarts*.js'),
-                getPathBasedOnECharts('../zrender/src/**')
-            ]
-        }
-    };
-};
-
-/**
- * @param {boolean} [min=false]
- */
-exports.createBMap = function (min) {
-    let postfix = min ? '.min' : '';
-
-    return {
-        plugins: getPlugins({min}),
-        input: getPathBasedOnECharts(`./extension-src/bmap/bmap.js`),
-        legacy: true, // Support IE8-
-        external: ['echarts'],
-        output: {
-            name: 'bmap',
-            format: 'umd',
-            sourcemap: !min,
-            legacy: true, // Must be declared both in inputOptions and outputOptions.
-            globals: {
-                // For UMD `global.echarts`
-                echarts: 'echarts'
-            },
-            file: getPathBasedOnECharts(`dist/extension/bmap${postfix}.js`)
-        },
-        watch: {
-            include: [getPathBasedOnECharts('./extension-src/bmap/**')]
-        }
-    };
-};
-
-/**
- * @param {boolean} [min=false]
- */
-exports.createDataTool = function (min) {
-    let postfix = min ? '.min' : '';
-    return {
-        plugins: getPlugins({min}),
-        input: getPathBasedOnECharts(`./extension-src/dataTool/index.js`),
-        legacy: true, // Support IE8-
-        external: ['echarts'],
-        output: {
-            name: 'dataTool',
-            format: 'umd',
-            sourcemap: !min,
-            legacy: true, // Must be declared both in inputOptions and outputOptions.
-            globals: {
-                // For UMD `global.echarts`
-                echarts: 'echarts'
-            },
-            file: getPathBasedOnECharts(`dist/extension/dataTool${postfix}.js`)
-        },
-        watch: {
-            include: [getPathBasedOnECharts('./extension-src/dataTool/**')]
-        }
-    };
-};

src/main/resources/static/bower_components/echarts/build/mangleString.js

@@ -1,165 +0,0 @@
-var esprima = require('esprima');
-var escodegen = require('escodegen');
-var estraverse = require('estraverse');
-
-var SYNTAX = estraverse.Syntax;
-
-var STR_MIN_LENGTH = 5;
-var STR_MIN_DIST = 1000;
-var STR_MIN_COUNT = 2;
-
-function createDeclaration(declarations) {
-    return {
-        type: SYNTAX.VariableDeclaration,
-        declarations: declarations,
-        kind: 'var'
-    };
-}
-
-function createDeclarator(id, init) {
-    return {
-        type: SYNTAX.VariableDeclarator,
-        id: {
-            type: SYNTAX.Identifier,
-            name: id
-        },
-        init: {
-            type: SYNTAX.Literal,
-            value: init
-        }
-    };
-}
-
-function base54Digits() {
-    return 'etnrisouaflchpdvmgybwESxTNCkLAOM_DPHBjFIqRUzWXV$JKQGYZ0516372984';
-}
-
-var base54 = (function(){
-    var DIGITS = base54Digits();
-    return function(num) {
-        var ret = '';
-        var base = 54;
-        do {
-            ret += DIGITS.charAt(num % base);
-            num = Math.floor(num / base);
-            base = 64;
-        } while (num > 0);
-        return ret;
-    };
-})();
-
-function mangleString(source) {
-
-    var ast = esprima.parse(source, {
-        loc: true
-    });
-
-    var stringVariables = {};
-
-    var stringRelaceCount = 0;
-
-    estraverse.traverse(ast, {
-        enter: function (node, parent) {
-            if (node.type === SYNTAX.Literal
-                && typeof node.value === 'string'
-            ) {
-                // Ignore if string is the key of property
-                if (parent.type === SYNTAX.Property) {
-                    return;
-                }
-                var value = node.value;
-                if (value.length > STR_MIN_LENGTH) {
-                    if (!stringVariables[value]) {
-                        stringVariables[value] = {
-                            count: 0,
-                            lastLoc: node.loc.start.line,
-                            name: '__echartsString__' + base54(stringRelaceCount++)
-                        };
-                    }
-                    var diff = node.loc.start.line - stringVariables[value].lastLoc;
-                    // GZIP ?
-                    if (diff >= STR_MIN_DIST) {
-                        stringVariables[value].lastLoc = node.loc.start.line;
-                        stringVariables[value].count++;
-                    }
-                }
-            }
-
-            if (node.type === SYNTAX.MemberExpression && !node.computed) {
-                if (node.property.type === SYNTAX.Identifier) {
-                    var value = node.property.name;
-                    if (value.length > STR_MIN_LENGTH) {
-                        if (!stringVariables[value]) {
-                            stringVariables[value] = {
-                                count: 0,
-                                lastLoc: node.loc.start.line,
-                                name: '__echartsString__' + base54(stringRelaceCount++)
-                            };
-                        }
-                        var diff = node.loc.start.line - stringVariables[value].lastLoc;
-                        if (diff >= STR_MIN_DIST) {
-                            stringVariables[value].lastLoc = node.loc.start.line;
-                            stringVariables[value].count++;
-                        }
-                    }
-                }
-            }
-        }
-    });
-
-    estraverse.replace(ast, {
-        enter: function (node, parent) {
-            if ((node.type === SYNTAX.Literal
-                && typeof node.value === 'string')
-            ) {
-                // Ignore if string is the key of property
-                if (parent.type === SYNTAX.Property) {
-                    return;
-                }
-                var str = node.value;
-                if (stringVariables[str] && stringVariables[str].count > STR_MIN_COUNT) {
-                    return {
-                        type: SYNTAX.Identifier,
-                        name: stringVariables[str].name
-                    };
-                }
-            }
-            if (node.type === SYNTAX.MemberExpression && !node.computed) {
-                if (node.property.type === SYNTAX.Identifier) {
-                    var str = node.property.name;
-                    if (stringVariables[str] && stringVariables[str].count > STR_MIN_COUNT) {
-                        return {
-                            type: SYNTAX.MemberExpression,
-                            object: node.object,
-                            property: {
-                                type: SYNTAX.Identifier,
-                                name: stringVariables[str].name
-                            },
-                            computed: true
-                        };
-                    }
-                }
-            }
-        }
-    });
-
-    // Add variables in the top
-    for (var str in stringVariables) {
-        // Used more than once
-        if (stringVariables[str].count > STR_MIN_COUNT) {
-            ast.body.unshift(createDeclaration([
-                createDeclarator(stringVariables[str].name, str)
-            ]));
-        }
-    }
-
-    return escodegen.generate(
-        ast,
-        {
-            format: {escapeless: true},
-            comment: true
-        }
-    );
-}
-
-exports = module.exports = mangleString;

src/main/resources/static/bower_components/echarts/build/optimize.js

@@ -1,40 +0,0 @@
-var UglifyJS = require('uglify-js');
-var fs = require('fs');
-var etpl = require('etpl');
-var argv = require('optimist').argv;
-
-etpl.config({
-    commandOpen: '/**',
-    commandClose: '*/'
-});
-
-var mode = argv.m || 'all';
-var configPath = mode === 'all' ? 'config/echarts.js' : 'config/echarts.' + mode + '.js';
-var outPath = mode === 'all' ? '../dist/echarts.js' : '../dist/echarts.' + mode + '.js';
-
-var config = eval('(' + fs.readFileSync(configPath, 'utf-8') + ')');
-var mainCode = fs.readFileSync(outPath, 'utf-8');
-var startCode = fs.readFileSync('wrap/start.js', 'utf-8');
-var nutCode = fs.readFileSync('wrap/nut.js', 'utf-8');
-var endCode = fs.readFileSync('wrap/end.js', 'utf-8');
-
-endCode = etpl.compile(endCode)({
-    parts: config.include
-});
-
-// FIXME
-var sourceCode = [startCode, nutCode, require('./mangleString')(mainCode), endCode].join('\n');
-
-var ast = UglifyJS.parse(sourceCode);
-/* jshint camelcase: false */
-// compressor needs figure_out_scope too
-ast.figure_out_scope();
-ast = ast.transform(UglifyJS.Compressor( {} ));
-
-// need to figure out scope again so mangler works optimally
-ast.figure_out_scope();
-ast.compute_char_frequency();
-ast.mangle_names();
-
-fs.writeFileSync(outPath, [startCode, nutCode, mainCode, endCode].join('\n'), 'utf-8');
-fs.writeFileSync(outPath.replace('.js', '.min.js'), ast.print_to_string(), 'utf-8');

src/main/resources/static/bower_components/echarts/build/pre-publish.js

@@ -1,72 +0,0 @@
-/**
- * Compatible with prevoius folder structure: `echarts/lib` exists in `node_modules`
- * (1) Build all files to CommonJS to `echarts/lib`.
- * (2) Remove __DEV__.
- * (3) Mount `echarts/src/export.js` to `echarts/lib/echarts.js`.
- */
-
-const path = require('path');
-const fsExtra = require('fs-extra');
-const {color, travelSrcDir, prePulishSrc} = require('zrender/build/helper');
-
-const ecDir = path.resolve(__dirname, '..');
-const srcDir = path.resolve(__dirname, '../src');
-const extensionSrcDir = path.resolve(__dirname, '../extension-src');
-const extensionDir = path.resolve(__dirname, '../extension');
-const libDir = path.resolve(__dirname, '../lib');
-
-
-module.exports = function () {
-
-    fsExtra.removeSync(libDir);
-    fsExtra.ensureDirSync(libDir);
-
-    travelSrcDir(srcDir, ({fileName, relativePath, absolutePath}) => {
-        prePulishSrc({
-            inputPath: absolutePath,
-            outputPath: path.resolve(libDir, relativePath, fileName),
-            transform
-        });
-    });
-
-    travelSrcDir(extensionSrcDir, ({fileName, relativePath, absolutePath}) => {
-        prePulishSrc({
-            inputPath: absolutePath,
-            outputPath: path.resolve(extensionDir, relativePath, fileName),
-            transform
-        });
-    });
-
-    prePulishSrc({
-        inputPath: path.resolve(ecDir, 'echarts.all.js'),
-        outputPath: path.resolve(ecDir, 'index.js')
-    });
-    prePulishSrc({
-        inputPath: path.resolve(ecDir, 'echarts.common.js'),
-        outputPath: path.resolve(ecDir, 'index.common.js')
-    });
-    prePulishSrc({
-        inputPath: path.resolve(ecDir, 'echarts.simple.js'),
-        outputPath: path.resolve(ecDir, 'index.simple.js')
-    });
-
-    function transform({code, inputPath, outputPath}) {
-        if (inputPath === path.resolve(ecDir, 'src/echarts.js')) {
-            // Using `echarts/echarts.blank.js` to overwrite `echarts/lib/echarts.js`
-            // for including exports API.
-            code += `
-var ___ec_export = require("./export");
-(function () {
-    for (var key in ___ec_export) {
-        if (___ec_export.hasOwnProperty(key)) {
-            exports[key] = ___ec_export[key];
-        }
-    }
-})();`;
-        }
-
-        return code;
-    }
-
-    console.log(color('fgGreen', 'bright')('All done.'));
-};

src/main/resources/static/bower_components/echarts/build/rollup-plugin-ec-dev.js

@@ -1,38 +0,0 @@
-/**
- * Define variable `__DEV__`.
- *
- * Usage:
- *
- * import ecDevPlugin from 'echats/build/rollup-plugin-ec-dev';
- * let rollupConfig = {
- *     plugins: [
- *         ecDevPlugin(),
- *         ...
- *     ]
- * };
- *
- * We use global variable `__DEV__` for convenience, but it bring trouble
- * while building: it is not able to make sure the decaration of `__DEV__`
- * occures in front of the whole code if we use ES module import. So we
- * use the plugin to handle that.
- *
- * See `echarts/src/config.js`.
- */
-
-module.exports = function (opt) {
-
-    return {
-        intro: function () {
-            return [
-                'if (typeof __DEV__ === "undefined") {',
-                '    if (typeof window !== "undefined") {',
-                '        window.__DEV__ = true;',
-                '    }',
-                '    else if (typeof global !== "undefined") {',
-                '        global.__DEV__ = true;',
-                '    }',
-                '}'
-            ].join('\n');
-        }
-    };
-};

src/main/resources/static/bower_components/echarts/build/rollup-plugin-ec-lang.js

@@ -1,60 +0,0 @@
-/**
- * Find language definations.
- *
- * Usage:
- *
- * import ecLangPlugin from 'echarts/build/rollup-plugin-ec-lang';
- * let rollupConfig = {
- *     plugins: [
- *         ecLangPlugin({lang: 'en'}),
- *         ...
- *     ]
- * };
- */
-
-const {resolve} = require('path');
-const {readFileSync} = require('fs');
-
-/**
- * @param {Object} [opt]
- * @param {string} [opt.lang=null] null/undefined/'' or 'en' or 'fi' or a file path.
- */
-function getPlugin(opt) {
-    let lang = opt && opt.lang || '';
-
-    return {
-        load: function (absolutePath) {
-            if (/\/src\/lang\.js$/.test(absolutePath)) {
-                let langPath = getLangFileInfo(lang).absolutePath;
-                if (langPath) {
-                    absolutePath = langPath;
-                }
-            }
-            return readFileSync(absolutePath, 'utf-8');
-        }
-    };
-}
-
-/**
- * @param {string} lang null/undefined/'' or 'en' or 'fi' or a file path.
- * @return {Object} {isOuter, absolutePath}
- */
-let getLangFileInfo = getPlugin.getLangFileInfo = function (lang) {
-    let absolutePath;
-    let isOuter = false;
-
-    if (lang) {
-        if (/^[a-zA-Z]{2}$/.test(lang)) {
-            absolutePath = resolve(__dirname, '../', 'src/lang' + lang.toUpperCase() + '.js')
-        }
-        else {
-            isOuter = true;
-            // `lang` is an absolute path or a relative path based on process.cwd().
-            absolutePath = resolve(lang);
-        }
-    }
-
-    return {isOuter, absolutePath};
-};
-
-module.exports = getPlugin;

src/main/resources/static/bower_components/echarts/build/rollup-plugin-ec-remove-dev.js

@@ -1,35 +0,0 @@
-/**
- * Remove the code of `if (__DEV__) { ... }`.
- *
- * Usage:
- *
- * import ecRemoveDevPlugin from 'echats/build/rollup-plugin-ec-remove-dev';
- * let rollupConfig = {
- *     plugins: [
- *         ecRemoveDevPlugin(),
- *         ...
- *     ]
- * };
- */
-
-const babel = require('@babel/core');
-const removeDEVPlugin = require('zrender/build/babel-plugin-transform-remove-dev');
-
-/**
- * @param {Object} [opt]
- * @param {Object} [opt.sourcemap]
- */
-module.exports = function ({sourcemap} = {}) {
-
-    return {
-        transform: function (sourceCode) {
-
-            let {code, map} = babel.transform(sourceCode, {
-                plugins: [removeDEVPlugin],
-                sourceMaps: sourcemap
-            });
-
-            return {code, map};
-        }
-    };
-};

src/main/resources/static/bower_components/echarts/src/util/throttle.js

@@ -1,71 +0,0 @@
-{
-    "bitwise": false,
-    "camelcase": true,
-    "curly": true,
-    "eqeqeq": false,
-    "forin": false,
-    "immed": true,
-    "latedef": false,
-    "newcap": true,
-    "noarg": false,
-    "noempty": true,
-    "nonew": true,
-    "plusplus": false,
-    "quotmark": "single",
-    "regexp": false,
-    "undef": true,
-    "unused": "vars",
-    "strict": false,
-    "trailing": false,
-    "maxparams": 20,
-    "maxdepth": 6,
-    "maxlen": 200,
-
-    "asi": false,
-    "boss": false,
-    "debug": false,
-    "eqnull": true,
-    "esversion": 6,
-    "module": true,
-    "evil": true,
-    "expr": true,
-    "funcscope": false,
-    "globalstrict": false,
-    "iterator": false,
-    "lastsemic": false,
-    "laxbreak": true,
-    "laxcomma": false,
-    "loopfunc": false,
-    "multistr": false,
-    "onecase": false,
-    "proto": false,
-    "regexdash": false,
-    "scripturl": false,
-    "smarttabs": false,
-    "shadow": true,
-    "sub": true,
-    "supernew": false,
-    "validthis": true,
-
-    "browser": true,
-    "couch": false,
-    "devel": true,
-    "dojo": false,
-    "jquery": true,
-    "mootools": false,
-    "node": false,
-    "nonstandard": false,
-    "prototypejs": false,
-    "rhino": false,
-    "wsh": false,
-
-    "nomen": false,
-    "onevar": false,
-    "passfail": false,
-    "white": false,
-
-    "predef": [
-        "__dirname",
-        "require"
-    ]
-}

src/main/resources/static/bower_components/echarts/test/build/esm2cjs/expect/.jshintrc

@@ -1,71 +0,0 @@
-{
-    "bitwise": false,
-    "camelcase": true,
-    "curly": true,
-    "eqeqeq": false,
-    "forin": false,
-    "immed": true,
-    "latedef": false,
-    "newcap": true,
-    "noarg": false,
-    "noempty": true,
-    "nonew": true,
-    "plusplus": false,
-    "quotmark": false,
-    "regexp": false,
-    "undef": true,
-    "unused": "vars",
-    "strict": false,
-    "trailing": false,
-    "maxparams": 20,
-    "maxdepth": 6,
-    "maxlen": 200,
-
-    "asi": false,
-    "boss": false,
-    "debug": false,
-    "eqnull": true,
-    "esversion": 3,
-    "evil": true,
-    "expr": true,
-    "funcscope": false,
-    "globalstrict": false,
-    "iterator": false,
-    "lastsemic": false,
-    "laxbreak": true,
-    "laxcomma": false,
-    "loopfunc": false,
-    "multistr": false,
-    "onecase": false,
-    "proto": false,
-    "regexdash": false,
-    "scripturl": false,
-    "smarttabs": false,
-    "shadow": true,
-    "sub": true,
-    "supernew": false,
-    "validthis": true,
-
-    "browser": true,
-    "couch": false,
-    "devel": true,
-    "dojo": false,
-    "jquery": true,
-    "mootools": false,
-    "node": false,
-    "nonstandard": false,
-    "prototypejs": false,
-    "rhino": false,
-    "wsh": false,
-
-    "nomen": false,
-    "onevar": false,
-    "passfail": false,
-    "white": false,
-
-    "predef": [
-        "require",
-        "exports",
-        "module"
-    ]
-}

src/main/resources/static/bower_components/echarts/test/build/esm2cjs/expect/basic.expect.js

@@ -1,74 +0,0 @@
-var util = require("./a/b/util");
-
-var zrUtil = require("zrender/core/util");
-
-var someInZrUtil1Alias = zrUtil.someInZrUtil1;
-var zz = zrUtil.zz;
-exports.zrUtil = zrUtil;
-
-var _color = require("zrender/core/color");
-
-var color2Alias = _color.color2;
-var color = _color.color;
-var color3 = _color.color3;
-var color4 = _color.color4;
-exports.color2Alias = _color.color2;
-exports.color = _color.color;
-
-var Some = require("some");
-
-exports.Some = Some;
-
-var Some2 = require("some2");
-
-var _util3 = require("zrender/lib/core/util");
-
-exports.someInZrUtil2 = _util3.someInZrUtil2;
-
-var _echarts = require("./echarts");
-
-(function () {
-  for (var key in _echarts) {
-    if (_echarts == null || !_echarts.hasOwnProperty(key) || key === 'default' || key === '__esModule') return;
-    exports[key] = _echarts[key];
-  }
-})();
-
-var _yy = require("./xx/yy");
-
-exports.defaultAsBB = _yy;
-exports.exportSingle = _yy.exportSingle;
-
-require("ssssss");
-
-var propInZrUtil = zrUtil.some;
-someInZrUtil1Alias();
-zz();
-var color4Renamed = color4;
-
-function exportSingleFn() {}
-
-var b = util.b;
-var c = Some;
-c(b);
-color2Alias();
-color3();
-var ss = new Some2();
-ss();
-var pureLocalVar = 'pure'; // jshint ignore:line
-
-function b() {
-  a++;
-  innerSingleVarRenamed = innerSingleVar;
-}
-
-var exportSingleVar = 'aa';
-var innerSingleVar = 'cc';
-var innerSingleVarRenamed;
-exports.propInZrUtil = propInZrUtil;
-exports.color4Renamed = color4Renamed;
-exports.exportSingleFn = exportSingleFn;
-exports.exportSingleVar = exportSingleVar;
-exports.innerSingleVarAlias = innerSingleVar;
-exports.innerSingleVarAlias2 = innerSingleVar;
-exports.innerSingleVarRenamed = innerSingleVarRenamed;

src/main/resources/static/bower_components/echarts/test/build/esm2cjs/expect/export-default0.expect.js

@@ -1,7 +0,0 @@
-var zrUtil = require("zrender/core/util");
-
-function _default() {
-  zrUtil();
-}
-
-module.exports = _default;

src/main/resources/static/bower_components/echarts/test/build/esm2cjs/expect/export-default1.expect.js

@@ -1,8 +0,0 @@
-var zrUtil = require("zrender/core/util");
-
-function bb() {
-  zrUtil();
-}
-
-var _default = bb;
-module.exports = _default;

src/main/resources/static/bower_components/echarts/test/build/esm2cjs/expect/export-default2.expect.js

@@ -1,7 +0,0 @@
-var xx = require("zrender/core/util");
-
-// export * from './echarts';
-// export {default as defaultAsBB} from './xx/yy';
-// export {exportSingle} from './xx/yy';
-var _default = xx;
-module.exports = _default;

src/main/resources/static/bower_components/echarts/test/build/esm2cjs/expect/export-default3.expect.js

@@ -1,7 +0,0 @@
-var zrUtil = require("zrender/core/util");
-
-var Chart = zrUtil.extend({
-  zrUtil: zrUtil
-});
-var _default = Chart;
-module.exports = _default;

src/main/resources/static/bower_components/echarts/test/build/esm2cjs/expect/forbiden-export.expect.js

@@ -1,8 +0,0 @@
-import * as util from './a/b/util';
-export var exportSingleVar = 'aa';
-var b = util;
-export { b };
-
-function SomeDefault() {}
-
-export default SomeDefault;

src/main/resources/static/bower_components/echarts/test/build/esm2cjs/src/basic.src.js

@@ -1,74 +0,0 @@
-
-import * as util from './a/b/util';
-import * as zrUtil from 'zrender/core/util';
-import {someInZrUtil1 as someInZrUtil1Alias, zz} from 'zrender/core/util';
-import {color2 as color2Alias, color, color3, color4} from 'zrender/core/color';
-import Some from 'some';
-import Some2 from 'some2';
-
-export {someInZrUtil2} from 'zrender/src/core/util';
-
-export * from './echarts';
-export {default as defaultAsBB} from './xx/yy';
-export {exportSingle} from './xx/yy';
-
-export {zrUtil};
-
-var propInZrUtil = zrUtil.some;
-
-export {propInZrUtil};
-export {color};
-
-export {Some};
-export {color2Alias};
-
-import 'ssssss';
-
-someInZrUtil1Alias();
-zz();
-
-var color4Renamed = color4;
-
-export {color4Renamed};
-
-
-export function exportSingleFn() {
-}
-
-var b = util.b;
-var c = Some;
-c(b);
-
-if (__DEV__) {
-    console.log('asdfasdf', Some);
-    assert(b, 'asdfasd');
-}
-
-color2Alias();
-color3();
-var ss = new Some2();
-ss();
-var pureLocalVar = 'pure'; // jshint ignore:line
-
-
-function b() {
-    a++;
-
-    innerSingleVarRenamed = innerSingleVar;
-
-    if (__DEV__ ) {
-        console.log('zvcx');
-        alert('v44');
-    }
-}
-
-
-export var exportSingleVar = 'aa';
-
-var innerSingleVar = 'cc';
-var innerSingleVarRenamed
-export {innerSingleVar as innerSingleVarAlias, innerSingleVarRenamed};
-export {innerSingleVar as innerSingleVarAlias2};
-
-
-

src/main/resources/static/bower_components/echarts/test/build/esm2cjs/src/export-default0.src.js

@@ -1,6 +0,0 @@
-
-import * as zrUtil from 'zrender/core/util';
-
-export default function () {
-    zrUtil();
-}

src/main/resources/static/bower_components/echarts/test/build/esm2cjs/src/export-default1.src.js

@@ -1,8 +0,0 @@
-
-import * as zrUtil from 'zrender/core/util';
-
-function bb() {
-    zrUtil();
-}
-
-export default bb;

src/main/resources/static/bower_components/echarts/test/build/esm2cjs/src/export-default2.src.js

@@ -1,8 +0,0 @@
-
-import xx from 'zrender/core/util';
-
-// export * from './echarts';
-// export {default as defaultAsBB} from './xx/yy';
-// export {exportSingle} from './xx/yy';
-
-export default xx;

src/main/resources/static/bower_components/echarts/test/build/esm2cjs/src/export-default3.src.js

@@ -1,8 +0,0 @@
-
-import * as zrUtil from 'zrender/core/util';
-
-var Chart = zrUtil.extend({
-    zrUtil: zrUtil
-});
-
-export default Chart;

src/main/resources/static/bower_components/echarts/test/build/esm2cjs/src/forbiden-export.src.js

@@ -1,16 +0,0 @@
-
-
-import * as util from './a/b/util';
-
-export var exportSingleVar = 'aa';
-
-var b = util;
-
-export {b};
-
-function SomeDefault() {
-
-}
-
-export default SomeDefault;
-

src/main/resources/static/bower_components/echarts/test/build/removeDEV/expect/code.expect.js

@@ -1,11 +0,0 @@
-var a = 112;
-a++;
-a++;
-a++;
-a--;
-
-function b() {
-  a++;
-}
-
-a += 12;

src/main/resources/static/bower_components/echarts/test/build/removeDEV/src/code.src.js

@@ -1,33 +0,0 @@
-
-var a = 112;
-
-if (__DEV__ ) {
-    alert('vzxczxcvzx');
-    console.log('zxcvzxvvx');
-}
-
-a++;
-a++;
-
-
-a++;
-
-
-if (__DEV__ ) {
-    alert('v2332x');
-    console.log('v23232x');
-}
-
-a--;
-
-function b() {
-
-    a++;
-
-    if (__DEV__ ) {
-        console.log('211');
-        alert('12');
-    }
-}
-
-a+=12;

src/main/resources/static/bower_components/echarts/test/build/test-transform.js

@@ -1,88 +0,0 @@
-
-const path = require('path');
-const babel = require('@babel/core');
-const fs = require('fs');
-// See require('@babel/plugin-transform-modules-commonjs')
-const esm2cjsPlugin = path.resolve(__dirname, '../../build/babel-plugin-transform-modules-commonjs-ec');
-const removeDEVPlugin = path.resolve(__dirname, '../../build/babel-plugin-transform-remove-dev');
-
-function run() {
-    removeDEV();
-    esm2cjs();
-}
-
-function removeDEV() {
-
-    const suite = makeSuite('removeDEV');
-
-    suite.eachSrcFile(({fileName, filePath}) => {
-        let result = babel.transformFileSync(filePath, {
-            plugins: [removeDEVPlugin]
-        });
-
-        suite.writeToExpectFile(fileName, result.code);
-
-        console.log(`removing dev ${fileName} ...`);
-    });
-    console.log('All done.');
-}
-
-
-function esm2cjs() {
-
-    const suite = makeSuite('esm2cjs');
-
-    suite.eachSrcFile(({fileName, filePath}) => {
-        console.log(`transforming to cjs ${fileName} ...`);
-
-        if (/^forbiden/.test(fileName)) {
-            try {
-                transformSingle();
-                throw new Error('Should fail.');
-            }
-            catch (e) {
-                console.log(`${fileName} failed as expected.`);
-            }
-        }
-        else {
-            transformSingle();
-        }
-
-        function transformSingle() {
-            let result = babel.transformFileSync(filePath, {
-                plugins: [removeDEVPlugin, esm2cjsPlugin]
-            });
-
-            suite.writeToExpectFile(fileName, result.code);
-        }
-    });
-
-    console.log('All done.');
-
-}
-
-const makeSuite = suiteName => {
-
-    const srcDir = path.resolve(__dirname, `./${suiteName}/src`);
-    const expectDir = path.resolve(__dirname, `./${suiteName}/expect`);
-
-    return {
-        srcDir,
-        expectDir,
-        eachSrcFile(cb) {
-            fs.readdirSync(srcDir).forEach(fileName => {
-                if (!/^[^.].*[.]src[.]js$/.test(fileName)) {
-                    return;
-                }
-                const filePath = path.resolve(srcDir, fileName);
-                cb({fileName, filePath, suiteName, srcDir, expectDir});
-            });
-        },
-        writeToExpectFile(srcFileName, content) {
-            let outputPath = path.resolve(expectDir, srcFileName.replace('.src.', '.expect.'));
-            fs.writeFileSync(outputPath, content, {encoding:'utf-8'});
-        }
-    };
-};
-
-run();

src/main/resources/static/bower_components/echarts/test/ut/MIT.LICENSE

@@ -1,34 +0,0 @@
-/*jshint node:true */
-module.exports = function( Release ) {
-
-function today() {
-	return new Date().toISOString().replace(/T.+/, "");
-}
-
-// also add version property to this
-Release._jsonFiles.push( "validation.jquery.json" );
-
-Release.define({
-	issueTracker: "github",
-	changelogShell: function() {
-		return Release.newVersion + " / " + today() + "\n==================\n\n";
-	},
-
-	generateArtifacts: function( done ) {
-		Release.exec( "grunt release", "Grunt command failed" );
-		done([
-			"dist/additional-methods.js",
-			"dist/additional-methods.min.js",
-			"dist/jquery.validate.js",
-			"dist/jquery.validate.min.js"
-		]);
-	},
-
-	// disable CDN publishing
-	cdnPublish: false,
-
-	// disable authors check
-	_checkAuthorsTxt: function() {}
-});
-
-};

src/main/resources/static/bower_components/summernote/build/grunt-build.js

@@ -1,78 +0,0 @@
-module.exports = function (grunt) {
-  'use strict';
-
-  var requirejs = require('requirejs');
-  var path = require('path');
-
-  var rDefineStart = /define\([^{]*?{/;
-  var rDefineEndWithReturn = /\s*return\s+[^\}]+(\}\);[^\w\}]*)$/;
-  var rDefineEnd = /\}\);[^}\w]*$/;
-
-  grunt.registerMultiTask('build', 'concatenate source: summernote.js', function () {
-
-    /**
-     * Strip all definitions generated by requirejs
-     *
-     * @param {String} name
-     * @param {String} path
-     * @param {String} contents The contents to be written (including their AMD wrappers)
-     */
-    var convert = function (name, path, contents) {
-      contents = contents.replace(rDefineStart, '');
-
-      if (rDefineEndWithReturn.test(contents)) {
-        contents = contents.replace(rDefineEndWithReturn, '');
-      } else {
-        contents = contents.replace(rDefineEnd, '');
-      }
-      return contents;
-    };
-
-    var outputPath = this.data.outFile;
-    /**
-     * Handle final output from the optimizer
-     */
-    var out = function (compiled) {
-      // 01. Embed version
-      var version = grunt.config('pkg.version');
-      compiled = compiled.replace(/@VERSION/g, version);
-
-      // 02.  Embed Date
-      var date = (new Date()).toISOString().replace(/:\d+\.\d+Z$/, 'Z');
-      compiled = compiled.replace(/@DATE/g, date);
-
-      grunt.file.write(outputPath, compiled);
-    };
-
-    var config = {
-      name: 'summernote/summernote',
-      baseUrl: this.data.baseUrl,
-      out: out,
-      optimize: 'none',
-      wrap: {
-        startFile: path.join(this.data.baseUrl, this.data.startFile),
-        endFile: path.join(this.data.baseUrl, this.data.endFile)
-      },
-      findNestedDependencies: true,
-      skipSemiColonInsertion: true,
-      onBuildWrite: convert,
-      excludeShallow: ['jquery', 'CodeMirror', 'app'],
-      paths: {
-        jquery: 'empty:',
-        CodeMirror: 'empty:'
-      },
-      packages: [{
-        name: 'summernote',
-        location: './',
-        main: 'summernote'
-      }]
-    };
-
-    var done = this.async();
-    requirejs.optimize(config, function () {
-      done();
-    }, function (err) {
-      done(err);
-    });
-  });
-};