1.删除无用代码

2.修改成员和部门接口

eladmin-activity/eladmin-activity.iml

@@ -1,218 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="web" name="Web">
-      <configuration>
-        <webroots />
-      </configuration>
-    </facet>
-    <facet type="jpa" name="JPA">
-      <configuration>
-        <setting name="validation-enabled" value="true" />
-        <setting name="provider-name" value="Hibernate" />
-        <datasource-mapping />
-        <naming-strategy-map />
-      </configuration>
-    </facet>
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="eladmin-common" />
-    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.3.4" level="project" />
-    <orderEntry type="library" name="Maven: org.activiti:activiti-spring-boot-starter-basic:6.0.0" level="project" />
-    <orderEntry type="library" name="Maven: org.activiti:activiti-engine:6.0.0" level="project" />
-    <orderEntry type="library" name="Maven: org.activiti:activiti-bpmn-converter:6.0.0" level="project" />
-    <orderEntry type="library" name="Maven: org.activiti:activiti-process-validation:6.0.0" level="project" />
-    <orderEntry type="library" name="Maven: org.activiti:activiti-image-generator:6.0.0" level="project" />
-    <orderEntry type="library" name="Maven: org.activiti:activiti-dmn-api:6.0.0" level="project" />
-    <orderEntry type="library" name="Maven: org.activiti:activiti-dmn-model:6.0.0" level="project" />
-    <orderEntry type="library" name="Maven: org.activiti:activiti-form-model:6.0.0" level="project" />
-    <orderEntry type="library" name="Maven: org.activiti:activiti-form-api:6.0.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-email:1.4" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.mail:javax.mail:1.6.2" level="project" />
-    <orderEntry type="library" name="Maven: javax.activation:activation:1.1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.2" level="project" />
-    <orderEntry type="library" name="Maven: de.odysseus.juel:juel-api:2.2.7" level="project" />
-    <orderEntry type="library" name="Maven: de.odysseus.juel:juel-impl:2.2.7" level="project" />
-    <orderEntry type="library" name="Maven: de.odysseus.juel:juel-spi:2.2.7" level="project" />
-    <orderEntry type="library" name="Maven: org.activiti:activiti-spring:6.0.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-orm:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: commons-dbcp:commons-dbcp:1.4" level="project" />
-    <orderEntry type="library" name="Maven: commons-pool:commons-pool:1.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.activiti:activiti-modeler:5.23.0" level="project" />
-    <orderEntry type="library" name="Maven: org.activiti:activiti-common-rest:5.23.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-config:5.1.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:5.1.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.1.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-web:5.1.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.7" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.7" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-parser:1.10" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-css:1.10" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:xmlgraphics-commons:2.2" level="project" />
-    <orderEntry type="library" name="Maven: commons-io:commons-io:1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-svg-dom:1.10" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-ext:1.10" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-svggen:1.10" level="project" />
-    <orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
-    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
-    <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.3.0" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.3.0" level="project" />
-    <orderEntry type="library" name="Maven: javax.xml.ws:jaxws-api:2.3.1" level="project" />
-    <orderEntry type="library" name="Maven: javax.xml.soap:javax.xml.soap-api:1.4.0" level="project" />
-    <orderEntry type="library" name="Maven: javax.jws:javax.jws-api:1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.corba:glassfish-corba-omgapi:4.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.mozilla:rhino:1.7.10" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-transcoder:1.8" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-anim:1.8" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-awt-util:1.8" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-bridge:1.8" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-script:1.8" level="project" />
-    <orderEntry type="library" name="Maven: xalan:xalan:2.7.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-dom:1.8" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-gvt:1.8" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-util:1.8" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-xml:1.8" level="project" />
-    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
-    <orderEntry type="library" name="Maven: xml-apis:xml-apis-ext:1.3.04" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-codec:1.8" level="project" />
-    <orderEntry type="library" name="Maven: org.activiti:activiti-json-converter:6.0.0" level="project" />
-    <orderEntry type="library" name="Maven: org.activiti:activiti-bpmn-model:6.0.0" level="project" />
-    <orderEntry type="library" name="Maven: joda-time:joda-time:2.10.1" level="project" />
-    <orderEntry type="library" name="Maven: math.geom2d:javaGeom:0.11.1" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.25" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-jpa:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.2" level="project" />
-    <orderEntry type="library" name="Maven: javax.transaction:javax.transaction-api:1.3" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate:hibernate-core:5.3.7.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final" level="project" />
-    <orderEntry type="library" name="Maven: javax.persistence:javax.persistence-api:2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.javassist:javassist:3.23.1-GA" level="project" />
-    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.9.3" level="project" />
-    <orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.5.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.dom4j:dom4j:2.1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:5.0.4.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-jpa:2.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aspects:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.0.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.11.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.11.1" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.25" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.7" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.7" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.7" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.12" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.12" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.12" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.13.Final" level="project" />
-    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.1.0.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: org.ow2.asm:asm:5.0.4" level="project" />
-    <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.11.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:2.23.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" />
-    <orderEntry type="library" 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.1.2.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.6.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-security:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-cache:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.2.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.2" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.29.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.29.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.29.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.29.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.29.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.29.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.5.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
-    <orderEntry type="library" name="Maven: org.bgee.log4jdbc-log4j2:log4jdbc-log4j2-jdbc4.1:1.16" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava:20.0" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.21" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.21" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:8.0.13" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.24" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.24" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.lionsoul:ip2region:1.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi:3.17" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.17" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.17" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.6.0" level="project" />
-    <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
-    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.04" level="project" />
-    <orderEntry type="library" name="Maven: xerces:xercesImpl:2.12.0" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.70" level="project" />
-    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.3.1.Final" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.mapstruct:mapstruct-processor:1.3.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" name="Maven: com.github.whvcse:easy-captcha:1.6.2" level="project" />
-    <orderEntry type="library" name="Maven: eu.bitwalker:UserAgentUtils:1.21" level="project" />
-  </component>
-</module>

eladmin-common/eladmin-common.iml

@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="web" name="Web">
-      <configuration>
-        <webroots />
-        <sourceRoots>
-          <root url="file://$MODULE_DIR$/src/main/java" />
-        </sourceRoots>
-      </configuration>
-    </facet>
-    <facet type="jpa" name="JPA">
-      <configuration>
-        <setting name="validation-enabled" value="true" />
-        <setting name="provider-name" value="Hibernate" />
-        <datasource-mapping />
-        <naming-strategy-map />
-      </configuration>
-    </facet>
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.3.4" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-jpa:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: javax.transaction:javax.transaction-api:1.3" level="project" />
-    <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
-    <orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate:hibernate-core:5.3.7.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final" level="project" />
-    <orderEntry type="library" name="Maven: javax.persistence:javax.persistence-api:2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.javassist:javassist:3.23.1-GA" level="project" />
-    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.9.3" level="project" />
-    <orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.5.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.dom4j:dom4j:2.1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:5.0.4.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-jpa:2.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-orm:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aspects:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.0.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.11.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.11.1" 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.23" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.7" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.7" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.7" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.7" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.7" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.12" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.12" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.12" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.13.Final" level="project" />
-    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.1.0.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: org.ow2.asm:asm:5.0.4" 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.11.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:2.23.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.3" 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" name="Maven: org.springframework:spring-core:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.6.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-security:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-config:5.1.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:5.1.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-web:5.1.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-cache:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.2.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.2" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.29.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.29.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.29.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.29.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.29.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.29.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.5.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
-    <orderEntry type="library" name="Maven: org.bgee.log4jdbc-log4j2:log4jdbc-log4j2-jdbc4.1:1.16" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava:20.0" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.21" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.21" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:8.0.13" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.24" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.24" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.lionsoul:ip2region:1.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi:3.17" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.17" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.17" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.6.0" level="project" />
-    <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
-    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.04" level="project" />
-    <orderEntry type="library" name="Maven: xerces:xercesImpl:2.12.0" level="project" />
-    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.70" level="project" />
-    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.3.1.Final" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.mapstruct:mapstruct-processor:1.3.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" name="Maven: com.github.whvcse:easy-captcha:1.6.2" level="project" />
-    <orderEntry type="library" name="Maven: eu.bitwalker:UserAgentUtils:1.21" level="project" />
-  </component>
-</module>

eladmin-generator/eladmin-generator.iml

@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="web" name="Web">
-      <configuration>
-        <webroots />
-      </configuration>
-    </facet>
-    <facet type="jpa" name="JPA">
-      <configuration>
-        <setting name="validation-enabled" value="true" />
-        <setting name="provider-name" value="Hibernate" />
-        <datasource-mapping />
-        <naming-strategy-map />
-      </configuration>
-    </facet>
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="eladmin-common" />
-    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.3.4" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-freemarker:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.0.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.11.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.11.1" 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.23" level="project" />
-    <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.28" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.9" level="project" />
-    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-jpa:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: javax.transaction:javax.transaction-api:1.3" level="project" />
-    <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
-    <orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate:hibernate-core:5.3.7.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final" level="project" />
-    <orderEntry type="library" name="Maven: javax.persistence:javax.persistence-api:2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.javassist:javassist:3.23.1-GA" level="project" />
-    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.9.3" level="project" />
-    <orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.5.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.dom4j:dom4j:2.1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:5.0.4.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-jpa:2.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-orm:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aspects:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.7" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.7" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.7" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.7" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.7" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.12" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.12" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.12" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.13.Final" level="project" />
-    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.1.0.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: org.ow2.asm:asm:5.0.4" 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.11.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:2.23.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.3" 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" name="Maven: org.springframework:spring-core:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.6.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-security:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-config:5.1.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:5.1.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-web:5.1.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-cache:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.2.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.2" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.29.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.29.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.29.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.29.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.29.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.29.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.5.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
-    <orderEntry type="library" name="Maven: org.bgee.log4jdbc-log4j2:log4jdbc-log4j2-jdbc4.1:1.16" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava:20.0" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.21" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.21" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:8.0.13" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.24" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.24" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.lionsoul:ip2region:1.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi:3.17" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.17" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.17" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.6.0" level="project" />
-    <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
-    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.04" level="project" />
-    <orderEntry type="library" name="Maven: xerces:xercesImpl:2.12.0" level="project" />
-    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.70" level="project" />
-    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.3.1.Final" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.mapstruct:mapstruct-processor:1.3.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" name="Maven: com.github.whvcse:easy-captcha:1.6.2" level="project" />
-    <orderEntry type="library" name="Maven: eu.bitwalker:UserAgentUtils:1.21" level="project" />
-  </component>
-</module>

eladmin-logging/eladmin-logging.iml

@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="web" name="Web">
-      <configuration>
-        <webroots />
-      </configuration>
-    </facet>
-    <facet type="jpa" name="JPA">
-      <configuration>
-        <setting name="validation-enabled" value="true" />
-        <setting name="provider-name" value="Hibernate" />
-        <datasource-mapping />
-        <naming-strategy-map />
-      </configuration>
-    </facet>
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="eladmin-common" />
-    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.3.4" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-jpa:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: javax.transaction:javax.transaction-api:1.3" level="project" />
-    <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
-    <orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate:hibernate-core:5.3.7.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final" level="project" />
-    <orderEntry type="library" name="Maven: javax.persistence:javax.persistence-api:2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.javassist:javassist:3.23.1-GA" level="project" />
-    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.9.3" level="project" />
-    <orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.5.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.dom4j:dom4j:2.1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:5.0.4.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-jpa:2.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-orm:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aspects:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.0.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.11.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.11.1" 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.23" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.7" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.7" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.7" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.7" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.7" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.12" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.12" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.12" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.13.Final" level="project" />
-    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.1.0.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: org.ow2.asm:asm:5.0.4" 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.11.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:2.23.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.3" 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" name="Maven: org.springframework:spring-core:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.6.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-security:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-config:5.1.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:5.1.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-web:5.1.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-cache:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.2.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.2" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.29.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.29.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.29.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.29.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.29.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.29.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.5.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
-    <orderEntry type="library" name="Maven: org.bgee.log4jdbc-log4j2:log4jdbc-log4j2-jdbc4.1:1.16" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava:20.0" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.21" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.21" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:8.0.13" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.24" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.24" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.lionsoul:ip2region:1.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi:3.17" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.17" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.17" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.6.0" level="project" />
-    <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
-    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.04" level="project" />
-    <orderEntry type="library" name="Maven: xerces:xercesImpl:2.12.0" level="project" />
-    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.70" level="project" />
-    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.3.1.Final" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.mapstruct:mapstruct-processor:1.3.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" name="Maven: com.github.whvcse:easy-captcha:1.6.2" level="project" />
-    <orderEntry type="library" name="Maven: eu.bitwalker:UserAgentUtils:1.21" level="project" />
-  </component>
-</module>

eladmin-system/eladmin-system.iml

@@ -1,252 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="web" name="Web">
-      <configuration>
-        <webroots />
-        <sourceRoots>
-          <root url="file://$MODULE_DIR$/src/main/java" />
-          <root url="file://$MODULE_DIR$/src/main/resources" />
-        </sourceRoots>
-      </configuration>
-    </facet>
-    <facet type="jpa" name="JPA">
-      <configuration>
-        <setting name="validation-enabled" value="true" />
-        <setting name="provider-name" value="Hibernate" />
-        <datasource-mapping />
-        <naming-strategy-map />
-      </configuration>
-    </facet>
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="eladmin-generator" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-freemarker:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.28" level="project" />
-    <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.9" level="project" />
-    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
-    <orderEntry type="module" module-name="eladmin-tools" />
-    <orderEntry type="module" module-name="eladmin-logging" />
-    <orderEntry type="library" name="Maven: javax.mail:mail:1.4.7" level="project" />
-    <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
-    <orderEntry type="library" name="Maven: com.qiniu:qiniu-java-sdk:7.2.29" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.squareup.okhttp3:okhttp:3.14.4" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.squareup.okio:okio:1.17.2" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.google.code.gson:gson:2.8.5" level="project" />
-    <orderEntry type="library" name="Maven: com.alipay.sdk:alipay-sdk-java:4.9.153.ALL" level="project" />
-    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.62" level="project" />
-    <orderEntry type="module" module-name="eladmin-activity" />
-    <orderEntry type="module" module-name="eladmin-common" />
-    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.3.4" level="project" />
-    <orderEntry type="library" name="Maven: org.activiti:activiti-spring-boot-starter-basic:6.0.0" level="project" />
-    <orderEntry type="library" name="Maven: org.activiti:activiti-engine:6.0.0" level="project" />
-    <orderEntry type="library" name="Maven: org.activiti:activiti-bpmn-converter:6.0.0" level="project" />
-    <orderEntry type="library" name="Maven: org.activiti:activiti-process-validation:6.0.0" level="project" />
-    <orderEntry type="library" name="Maven: org.activiti:activiti-image-generator:6.0.0" level="project" />
-    <orderEntry type="library" name="Maven: org.activiti:activiti-dmn-api:6.0.0" level="project" />
-    <orderEntry type="library" name="Maven: org.activiti:activiti-dmn-model:6.0.0" level="project" />
-    <orderEntry type="library" name="Maven: org.activiti:activiti-form-model:6.0.0" level="project" />
-    <orderEntry type="library" name="Maven: org.activiti:activiti-form-api:6.0.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-email:1.4" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.mail:javax.mail:1.6.2" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.2" level="project" />
-    <orderEntry type="library" name="Maven: de.odysseus.juel:juel-api:2.2.7" level="project" />
-    <orderEntry type="library" name="Maven: de.odysseus.juel:juel-impl:2.2.7" level="project" />
-    <orderEntry type="library" name="Maven: de.odysseus.juel:juel-spi:2.2.7" level="project" />
-    <orderEntry type="library" name="Maven: org.activiti:activiti-spring:6.0.0" level="project" />
-    <orderEntry type="library" name="Maven: commons-dbcp:commons-dbcp:1.4" level="project" />
-    <orderEntry type="library" name="Maven: commons-pool:commons-pool:1.6" level="project" />
-    <orderEntry type="library" name="Maven: org.activiti:activiti-modeler:5.23.0" level="project" />
-    <orderEntry type="library" name="Maven: org.activiti:activiti-common-rest:5.23.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.1.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.7" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-parser:1.10" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-css:1.10" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:xmlgraphics-commons:2.2" level="project" />
-    <orderEntry type="library" name="Maven: commons-io:commons-io:1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-svg-dom:1.10" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-ext:1.10" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-svggen:1.10" level="project" />
-    <orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
-    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.3.0" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.3.0" level="project" />
-    <orderEntry type="library" name="Maven: javax.xml.ws:jaxws-api:2.3.1" level="project" />
-    <orderEntry type="library" name="Maven: javax.xml.soap:javax.xml.soap-api:1.4.0" level="project" />
-    <orderEntry type="library" name="Maven: javax.jws:javax.jws-api:1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.corba:glassfish-corba-omgapi:4.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.mozilla:rhino:1.7.10" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-transcoder:1.8" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-anim:1.8" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-awt-util:1.8" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-bridge:1.8" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-script:1.8" level="project" />
-    <orderEntry type="library" name="Maven: xalan:xalan:2.7.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-dom:1.8" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-gvt:1.8" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-util:1.8" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-xml:1.8" level="project" />
-    <orderEntry type="library" name="Maven: xml-apis:xml-apis-ext:1.3.04" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-codec:1.8" level="project" />
-    <orderEntry type="library" name="Maven: org.activiti:activiti-json-converter:6.0.0" level="project" />
-    <orderEntry type="library" name="Maven: org.activiti:activiti-bpmn-model:6.0.0" level="project" />
-    <orderEntry type="library" name="Maven: joda-time:joda-time:2.10.1" level="project" />
-    <orderEntry type="library" name="Maven: math.geom2d:javaGeom:0.11.1" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.25" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt-api:0.11.1" level="project" />
-    <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt-impl:0.11.1" level="project" />
-    <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt-jackson:0.11.1" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.7" level="project" />
-    <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.3.0" level="project" />
-    <orderEntry type="library" name="Maven: com.mchange:mchange-commons-java:0.2.11" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
-    <orderEntry type="library" name="Maven: ch.ethz.ganymed:ganymed-ssh2:build210" level="project" />
-    <orderEntry type="library" name="Maven: com.jcraft:jsch:0.1.55" level="project" />
-    <orderEntry type="library" name="Maven: com.github.oshi:oshi-core:5.3.6" level="project" />
-    <orderEntry type="library" name="Maven: net.java.dev.jna:jna:5.6.0" level="project" />
-    <orderEntry type="library" name="Maven: net.java.dev.jna:jna-platform:5.6.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-jpa:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: javax.transaction:javax.transaction-api:1.3" level="project" />
-    <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate:hibernate-core:5.3.7.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final" level="project" />
-    <orderEntry type="library" name="Maven: javax.persistence:javax.persistence-api:2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.javassist:javassist:3.23.1-GA" level="project" />
-    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.9.3" level="project" />
-    <orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.5.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.dom4j:dom4j:2.1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:5.0.4.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-jpa:2.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-orm:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aspects:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.0.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.11.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.11.1" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.25" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.7" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.7" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.7" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.12" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.12" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.12" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.13.Final" level="project" />
-    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.1.0.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: org.ow2.asm:asm:5.0.4" level="project" />
-    <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.11.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:2.23.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" />
-    <orderEntry type="library" 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" name="Maven: org.springframework:spring-core:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.6.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-security:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-config:5.1.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:5.1.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-web:5.1.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-cache:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.2.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.2" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.29.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.29.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.29.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.29.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.29.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.29.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.5.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
-    <orderEntry type="library" name="Maven: org.bgee.log4jdbc-log4j2:log4jdbc-log4j2-jdbc4.1:1.16" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava:20.0" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.21" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.21" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:8.0.13" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.24" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.24" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.lionsoul:ip2region:1.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi:3.17" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.17" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.17" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.6.0" level="project" />
-    <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
-    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.04" level="project" />
-    <orderEntry type="library" name="Maven: xerces:xercesImpl:2.12.0" level="project" />
-    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.70" level="project" />
-    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.3.1.Final" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.mapstruct:mapstruct-processor:1.3.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" name="Maven: com.github.whvcse:easy-captcha:1.6.2" level="project" />
-    <orderEntry type="library" name="Maven: eu.bitwalker:UserAgentUtils:1.21" level="project" />
-  </component>
-</module>

eladmin-system/src/main/java/me/zhengjie/modules/dm/camera/domain/DmCamera.java

@@ -1,71 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.camera.domain;
-
-import lombok.Data;
-import cn.hutool.core.bean.BeanUtil;
-import io.swagger.annotations.ApiModelProperty;
-import cn.hutool.core.bean.copier.CopyOptions;
-import javax.persistence.*;
-import javax.validation.constraints.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
-import me.zhengjie.base.BaseEntity;
-import org.hibernate.annotations.*;
-import java.sql.Timestamp;
-import java.io.Serializable;
-
-/**
-* @website https://el-admin.vip
-* @description /
-* @author xwx
-* @date 2021-04-20
-**/
-@Entity
-@Data
-@Table(name="dm_camera")
-public class DmCamera extends BaseEntity implements Serializable {
-
-    @Id
-    @Column(name = "id")
-    @ApiModelProperty(value = "主键")
-    private Long id;
-
-    @Column(name = "code")
-    @ApiModelProperty(value = "摄像头编号")
-    private String code;
-
-    @Column(name = "name")
-    @ApiModelProperty(value = "摄像头名称")
-    private String name;
-
-    @Column(name = "camera_param")
-    @ApiModelProperty(value = "摄像头参数(摄像头基本参数)")
-    private String cameraParam;
-
-    @Column(name = "address")
-    @ApiModelProperty(value = "摄像头位置(摄像头安装位置)")
-    private String address;
-
-    @Column(name = "restaurant")
-    @ApiModelProperty(value = "所属餐厅(摄像头所属餐厅)")
-    private String restaurant;
-
-    public void copy(DmCamera source){
-        BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
-    }
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/camera/repository/DmCameraRepository.java

@@ -1,33 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.camera.repository;
-
-import me.zhengjie.modules.dm.camera.domain.DmCamera;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
-
-/**
-* @website https://el-admin.vip
-* @author xwx
-* @date 2021-04-20
-**/
-public interface DmCameraRepository extends JpaRepository<DmCamera, Long>, JpaSpecificationExecutor<DmCamera> {
-
-    @Query(value = "select count(*) from dm_camera where code =:code and if((!ISNULL(:id) and :id!=''),id!= :id,1=1)",nativeQuery = true)
-    int checkCode(@Param("code") String code, @Param("id") Long id);
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/camera/rest/DmCameraController.java

@@ -1,96 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.camera.rest;
-
-import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.dm.camera.domain.DmCamera;
-import me.zhengjie.modules.dm.camera.service.DmCameraService;
-import me.zhengjie.modules.dm.camera.service.dto.DmCameraQueryCriteria;
-import org.springframework.data.domain.Pageable;
-import lombok.RequiredArgsConstructor;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import io.swagger.annotations.*;
-import java.io.IOException;
-import java.util.Map;
-import javax.servlet.http.HttpServletResponse;
-
-/**
-* @website https://el-admin.vip
-* @author xwx
-* @date 2021-04-20
-**/
-@RestController
-@RequiredArgsConstructor
-@Api(tags = "camera管理")
-@RequestMapping("/api/dmCamera")
-public class DmCameraController {
-
-    private final DmCameraService dmCameraService;
-
-    @Log("导出数据")
-    @ApiOperation("导出数据")
-    @GetMapping(value = "/download")
-    @PreAuthorize("@el.check('dmCamera:list')")
-    public void download(HttpServletResponse response, DmCameraQueryCriteria criteria) throws IOException {
-        dmCameraService.download(dmCameraService.queryAll(criteria), response);
-    }
-
-    @GetMapping
-    @Log("查询camera")
-    @ApiOperation("查询camera")
-    @PreAuthorize("@el.check('dmCamera:list')")
-    public ResponseEntity<Object> query(DmCameraQueryCriteria criteria, Pageable pageable){
-        return new ResponseEntity<>(dmCameraService.queryAll(criteria,pageable),HttpStatus.OK);
-    }
-
-    @PostMapping
-    @Log("新增camera")
-    @ApiOperation("新增camera")
-    @PreAuthorize("@el.check('dmCamera:add')")
-    public ResponseEntity<Object> create(@Validated @RequestBody DmCamera resources){
-        return new ResponseEntity<>(dmCameraService.create(resources),HttpStatus.CREATED);
-    }
-
-    @PutMapping
-    @Log("修改camera")
-    @ApiOperation("修改camera")
-    @PreAuthorize("@el.check('dmCamera:edit')")
-    public ResponseEntity<Object> update(@Validated @RequestBody DmCamera resources){
-        dmCameraService.update(resources);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @Log("删除camera")
-    @ApiOperation("删除camera")
-    @PreAuthorize("@el.check('dmCamera:del')")
-    @DeleteMapping
-    public ResponseEntity<Object> delete(@RequestBody Long[] ids) {
-        dmCameraService.deleteAll(ids);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-
-    @PutMapping(value = "/checkCode")
-    @Log("判断dmCamera是否存在相同Code")
-    @ApiOperation("判断dmCamera是否存在相同Code")
-    public ResponseEntity<Object> checkCode(@RequestBody Map<String,String> params) {
-        int count  = dmCameraService.checkCode(params.get("code"),params.get("id")==null?null:Long.parseLong(params.get("id")));
-        return new ResponseEntity<>(count>0?true:false,HttpStatus.OK);
-    }
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/camera/service/DmCameraService.java

@@ -1,85 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.camera.service;
-
-import me.zhengjie.modules.dm.camera.domain.DmCamera;
-import me.zhengjie.modules.dm.camera.service.dto.DmCameraDto;
-import me.zhengjie.modules.dm.camera.service.dto.DmCameraQueryCriteria;
-import org.springframework.data.domain.Pageable;
-import java.util.Map;
-import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
-/**
-* @website https://el-admin.vip
-* @description 服务接口
-* @author xwx
-* @date 2021-04-20
-**/
-public interface DmCameraService {
-
-    /**
-    * 查询数据分页
-    * @param criteria 条件
-    * @param pageable 分页参数
-    * @return Map<String,Object>
-    */
-    Map<String,Object> queryAll(DmCameraQueryCriteria criteria, Pageable pageable);
-
-    /**
-    * 查询所有数据不分页
-    * @param criteria 条件参数
-    * @return List<DmCameraDto>
-    */
-    List<DmCameraDto> queryAll(DmCameraQueryCriteria criteria);
-
-    /**
-     * 根据ID查询
-     * @param id ID
-     * @return DmCameraDto
-     */
-    DmCameraDto findById(Long id);
-
-    /**
-    * 创建
-    * @param resources /
-    * @return DmCameraDto
-    */
-    DmCameraDto create(DmCamera resources);
-
-    /**
-    * 编辑
-    * @param resources /
-    */
-    void update(DmCamera resources);
-
-    /**
-    * 多选删除
-    * @param ids /
-    */
-    void deleteAll(Long[] ids);
-
-    /**
-    * 导出数据
-    * @param all 待导出的数据
-    * @param response /
-    * @throws IOException /
-    */
-    void download(List<DmCameraDto> all, HttpServletResponse response) throws IOException;
-
-    int checkCode(String code,Long id);
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/camera/service/dto/DmCameraDto.java

@@ -1,64 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.camera.service.dto;
-
-import lombok.Data;
-import java.sql.Timestamp;
-import java.io.Serializable;
-import com.alibaba.fastjson.annotation.JSONField;
-import com.alibaba.fastjson.serializer.ToStringSerializer;
-
-/**
-* @website https://el-admin.vip
-* @description /
-* @author xwx
-* @date 2021-04-20
-**/
-@Data
-public class DmCameraDto implements Serializable {
-
-    /** 主键 */
-    /** 防止精度丢失 */
-    @JSONField(serializeUsing = ToStringSerializer.class)
-    private Long id;
-
-    /** 摄像头编号 */
-    private String code;
-
-    /** 摄像头名称 */
-    private String name;
-
-    /** 摄像头参数(摄像头基本参数) */
-    private String cameraParam;
-
-    /** 摄像头位置(摄像头安装位置) */
-    private String address;
-
-    /** 所属餐厅(摄像头所属餐厅) */
-    private String restaurant;
-
-    /** 创建者 */
-    private String createBy;
-
-    /** 更新者 */
-    private String updateBy;
-
-    /** 创建日期 */
-    private Timestamp createTime;
-
-    /** 更新时间 */
-    private Timestamp updateTime;
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/camera/service/dto/DmCameraQueryCriteria.java

@@ -1,45 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.camera.service.dto;
-
-import lombok.Data;
-import java.util.List;
-import me.zhengjie.annotation.Query;
-
-/**
-* @website https://el-admin.vip
-* @author xwx
-* @date 2021-04-20
-**/
-@Data
-public class DmCameraQueryCriteria{
-
-    /** 模糊 */
-    @Query(type = Query.Type.INNER_LIKE)
-    private String code;
-
-    /** 模糊 */
-    @Query(type = Query.Type.INNER_LIKE)
-    private String name;
-
-    /** 模糊 */
-    @Query(type = Query.Type.INNER_LIKE)
-    private String address;
-
-    /** 模糊 */
-    @Query(type = Query.Type.INNER_LIKE)
-    private String restaurant;
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/camera/service/impl/DmCameraServiceImpl.java

@@ -1,119 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.camera.service.impl;
-
-import me.zhengjie.modules.dm.camera.domain.DmCamera;
-import me.zhengjie.utils.ValidationUtil;
-import me.zhengjie.utils.FileUtil;
-import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.dm.camera.repository.DmCameraRepository;
-import me.zhengjie.modules.dm.camera.service.DmCameraService;
-import me.zhengjie.modules.dm.camera.service.dto.DmCameraDto;
-import me.zhengjie.modules.dm.camera.service.dto.DmCameraQueryCriteria;
-import me.zhengjie.modules.dm.camera.service.mapstruct.DmCameraMapper;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import cn.hutool.core.lang.Snowflake;
-import cn.hutool.core.util.IdUtil;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import me.zhengjie.utils.PageUtil;
-import me.zhengjie.utils.QueryHelp;
-import java.util.List;
-import java.util.Map;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-
-/**
-* @website https://el-admin.vip
-* @description 服务实现
-* @author xwx
-* @date 2021-04-20
-**/
-@Service
-@RequiredArgsConstructor
-public class DmCameraServiceImpl implements DmCameraService {
-
-    private final DmCameraRepository dmCameraRepository;
-    private final DmCameraMapper dmCameraMapper;
-
-    @Override
-    public Map<String,Object> queryAll(DmCameraQueryCriteria criteria, Pageable pageable){
-        Page<DmCamera> page = dmCameraRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable);
-        return PageUtil.toPage(page.map(dmCameraMapper::toDto));
-    }
-
-    @Override
-    public List<DmCameraDto> queryAll(DmCameraQueryCriteria criteria){
-        return dmCameraMapper.toDto(dmCameraRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder)));
-    }
-
-    @Override
-    @Transactional
-    public DmCameraDto findById(Long id) {
-        DmCamera dmCamera = dmCameraRepository.findById(id).orElseGet(DmCamera::new);
-        ValidationUtil.isNull(dmCamera.getId(),"DmCamera","id",id);
-        return dmCameraMapper.toDto(dmCamera);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public DmCameraDto create(DmCamera resources) {
-        Snowflake snowflake = IdUtil.createSnowflake(1, 1);
-        resources.setId(snowflake.nextId()); 
-        return dmCameraMapper.toDto(dmCameraRepository.save(resources));
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void update(DmCamera resources) {
-        DmCamera dmCamera = dmCameraRepository.findById(resources.getId()).orElseGet(DmCamera::new);
-        ValidationUtil.isNull( dmCamera.getId(),"DmCamera","id",resources.getId());
-        dmCamera.copy(resources);
-        dmCameraRepository.save(dmCamera);
-    }
-
-    @Override
-    public void deleteAll(Long[] ids) {
-        for (Long id : ids) {
-            dmCameraRepository.deleteById(id);
-        }
-    }
-
-    @Override
-    public void download(List<DmCameraDto> all, HttpServletResponse response) throws IOException {
-        List<Map<String, Object>> list = new ArrayList<>();
-        for (DmCameraDto dmCamera : all) {
-            Map<String,Object> map = new LinkedHashMap<>();
-            map.put("摄像头编号", dmCamera.getCode());
-            map.put("摄像头名称", dmCamera.getName());
-            map.put("摄像头参数(摄像头基本参数)", dmCamera.getCameraParam());
-            map.put("摄像头位置(摄像头安装位置)", dmCamera.getAddress());
-            map.put("所属餐厅(摄像头所属餐厅)", dmCamera.getRestaurant());
-            map.put("创建者", dmCamera.getCreateBy());
-            map.put("更新者", dmCamera.getUpdateBy());
-            map.put("创建日期", dmCamera.getCreateTime());
-            map.put("更新时间", dmCamera.getUpdateTime());
-            list.add(map);
-        }
-        FileUtil.downloadExcel(list, response);
-    }
-
-    @Override
-    public int checkCode(String code,Long id){ return dmCameraRepository.checkCode(code,id); };
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/camera/service/mapstruct/DmCameraMapper.java

@@ -1,32 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.camera.service.mapstruct;
-
-import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.dm.camera.domain.DmCamera;
-import me.zhengjie.modules.dm.camera.service.dto.DmCameraDto;
-import org.mapstruct.Mapper;
-import org.mapstruct.ReportingPolicy;
-
-/**
-* @website https://el-admin.vip
-* @author xwx
-* @date 2021-04-20
-**/
-@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE)
-public interface DmCameraMapper extends BaseMapper<DmCameraDto, DmCamera> {
-
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/daypc/domain/DmDayPc.java

@@ -1,99 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.daypc.domain;
-
-import lombok.Data;
-import cn.hutool.core.bean.BeanUtil;
-import io.swagger.annotations.ApiModelProperty;
-import cn.hutool.core.bean.copier.CopyOptions;
-import javax.persistence.*;
-import javax.validation.constraints.*;
-import java.sql.Timestamp;
-import java.math.BigDecimal;
-import java.io.Serializable;
-
-/**
-* @website https://el-admin.vip
-* @description /
-* @author sunmz
-* @date 2021-09-22
-**/
-@Entity
-@Data
-@Table(name="dm_day_pc")
-public class DmDayPc implements Serializable {
-
-    @Id
-    @Column(name = "id")
-    @ApiModelProperty(value = "id")
-    private Long id;
-
-    @Column(name = "pid")
-    @ApiModelProperty(value = "菜品id")
-    private Integer pid;
-
-    @Column(name = "cpid")
-    @ApiModelProperty(value = "餐盘id")
-    private Integer cpid;
-
-    @Column(name = "name")
-    @ApiModelProperty(value = "菜品名称")
-    private String name;
-
-    @Column(name = "price")
-    @ApiModelProperty(value = "价格")
-    private BigDecimal price;
-
-    @Column(name = "times")
-    @ApiModelProperty(value = "餐别")
-    private String times;
-
-    @Column(name = "cate")
-    @ApiModelProperty(value = "菜品分类id")
-    private Integer cate;
-
-    @Column(name = "cate_name")
-    @ApiModelProperty(value = "菜品分类名称")
-    private String cateName;
-
-    @Column(name = "window")
-    @ApiModelProperty(value = "档口id")
-    private Integer window;
-
-    @Column(name = "window_name")
-    @ApiModelProperty(value = "档口名称")
-    private String windowName;
-
-    @Column(name = "pstate")
-    @ApiModelProperty(value = "菜品状态")
-    private Integer pstate;
-
-    @Column(name = "seq")
-    @ApiModelProperty(value = "流水号")
-    private String seq;
-
-    @Column(name = "pcdate")
-    @ApiModelProperty(value = "日期")
-    private Timestamp pcdate;
-
-    @Column(name = "shopname")
-    @ApiModelProperty(value = "餐厅名称")
-    private String shopname;
-
-    public void copy(DmDayPc source){
-        BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
-    }
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/daypc/repository/DmDayPcRepository.java

@@ -1,28 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.daypc.repository;
-
-import me.zhengjie.modules.dm.daypc.domain.DmDayPc;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-
-/**
-* @website https://el-admin.vip
-* @author sunmz
-* @date 2021-09-22
-**/
-public interface DmDayPcRepository extends JpaRepository<DmDayPc, Long>, JpaSpecificationExecutor<DmDayPc> {
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/daypc/rest/DmDayPcController.java

@@ -1,87 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.daypc.rest;
-
-import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.dm.daypc.domain.DmDayPc;
-import me.zhengjie.modules.dm.daypc.service.DmDayPcService;
-import me.zhengjie.modules.dm.daypc.service.dto.DmDayPcQueryCriteria;
-import org.springframework.data.domain.Pageable;
-import lombok.RequiredArgsConstructor;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import io.swagger.annotations.*;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
-/**
-* @website https://el-admin.vip
-* @author sunmz
-* @date 2021-09-22
-**/
-@RestController
-@RequiredArgsConstructor
-@Api(tags = "daypc管理")
-@RequestMapping("/api/dmDayPc")
-public class DmDayPcController {
-
-    private final DmDayPcService dmDayPcService;
-
-    @Log("导出数据")
-    @ApiOperation("导出数据")
-    @GetMapping(value = "/download")
-    @PreAuthorize("@el.check('dmDayPc:list')")
-    public void download(HttpServletResponse response, DmDayPcQueryCriteria criteria) throws IOException {
-        dmDayPcService.download(dmDayPcService.queryAll(criteria), response);
-    }
-
-    @GetMapping
-    @Log("查询daypc")
-    @ApiOperation("查询daypc")
-    @PreAuthorize("@el.check('dmDayPc:list')")
-    public ResponseEntity<Object> query(DmDayPcQueryCriteria criteria, Pageable pageable){
-        return new ResponseEntity<>(dmDayPcService.queryAll(criteria,pageable),HttpStatus.OK);
-    }
-
-    @PostMapping
-    @Log("新增daypc")
-    @ApiOperation("新增daypc")
-    @PreAuthorize("@el.check('dmDayPc:add')")
-    public ResponseEntity<Object> create(@Validated @RequestBody DmDayPc resources){
-        return new ResponseEntity<>(dmDayPcService.create(resources),HttpStatus.CREATED);
-    }
-
-    @PutMapping
-    @Log("修改daypc")
-    @ApiOperation("修改daypc")
-    @PreAuthorize("@el.check('dmDayPc:edit')")
-    public ResponseEntity<Object> update(@Validated @RequestBody DmDayPc resources){
-        dmDayPcService.update(resources);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @Log("删除daypc")
-    @ApiOperation("删除daypc")
-    @PreAuthorize("@el.check('dmDayPc:del')")
-    @DeleteMapping
-    public ResponseEntity<Object> delete(@RequestBody Long[] ids) {
-        dmDayPcService.deleteAll(ids);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/daypc/service/DmDayPcService.java

@@ -1,83 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.daypc.service;
-
-import me.zhengjie.modules.dm.daypc.domain.DmDayPc;
-import me.zhengjie.modules.dm.daypc.service.dto.DmDayPcDto;
-import me.zhengjie.modules.dm.daypc.service.dto.DmDayPcQueryCriteria;
-import org.springframework.data.domain.Pageable;
-import java.util.Map;
-import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
-/**
-* @website https://el-admin.vip
-* @description 服务接口
-* @author sunmz
-* @date 2021-09-22
-**/
-public interface DmDayPcService {
-
-    /**
-    * 查询数据分页
-    * @param criteria 条件
-    * @param pageable 分页参数
-    * @return Map<String,Object>
-    */
-    Map<String,Object> queryAll(DmDayPcQueryCriteria criteria, Pageable pageable);
-
-    /**
-    * 查询所有数据不分页
-    * @param criteria 条件参数
-    * @return List<DmDayPcDto>
-    */
-    List<DmDayPcDto> queryAll(DmDayPcQueryCriteria criteria);
-
-    /**
-     * 根据ID查询
-     * @param id ID
-     * @return DmDayPcDto
-     */
-    DmDayPcDto findById(Long id);
-
-    /**
-    * 创建
-    * @param resources /
-    * @return DmDayPcDto
-    */
-    DmDayPcDto create(DmDayPc resources);
-
-    /**
-    * 编辑
-    * @param resources /
-    */
-    void update(DmDayPc resources);
-
-    /**
-    * 多选删除
-    * @param ids /
-    */
-    void deleteAll(Long[] ids);
-
-    /**
-    * 导出数据
-    * @param all 待导出的数据
-    * @param response /
-    * @throws IOException /
-    */
-    void download(List<DmDayPcDto> all, HttpServletResponse response) throws IOException;
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/daypc/service/dto/DmDayPcDto.java

@@ -1,76 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.daypc.service.dto;
-
-import lombok.Data;
-import java.sql.Timestamp;
-import java.math.BigDecimal;
-import java.io.Serializable;
-import com.alibaba.fastjson.annotation.JSONField;
-import com.alibaba.fastjson.serializer.ToStringSerializer;
-
-/**
-* @website https://el-admin.vip
-* @description /
-* @author sunmz
-* @date 2021-09-22
-**/
-@Data
-public class DmDayPcDto implements Serializable {
-
-    /** 防止精度丢失 */
-    @JSONField(serializeUsing = ToStringSerializer.class)
-    private Long id;
-
-    /** 菜品id */
-    private Integer pid;
-
-    /** 餐盘id */
-    private Integer cpid;
-
-    /** 菜品名称 */
-    private String name;
-
-    /** 价格 */
-    private BigDecimal price;
-
-    /** 餐别 */
-    private String times;
-
-    /** 菜品分类id */
-    private Integer cate;
-
-    /** 菜品分类名称 */
-    private String cateName;
-
-    /** 档口id */
-    private Integer window;
-
-    /** 档口名称 */
-    private String windowName;
-
-    /** 菜品状态 */
-    private Integer pstate;
-
-    /** 流水号 */
-    private String seq;
-
-    /** 日期 */
-    private Timestamp pcdate;
-
-    /** 餐厅名称 */
-    private String shopname;
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/daypc/service/dto/DmDayPcQueryCriteria.java

@@ -1,50 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.daypc.service.dto;
-
-import lombok.Data;
-import java.sql.Timestamp;
-import java.util.List;
-import me.zhengjie.annotation.Query;
-
-/**
-* @website https://el-admin.vip
-* @author sunmz
-* @date 2021-09-22
-**/
-@Data
-public class DmDayPcQueryCriteria{
-
-    /** 模糊 */
-    @Query(type = Query.Type.INNER_LIKE)
-    private Integer cpid;
-
-    /** 模糊 */
-    @Query(type = Query.Type.INNER_LIKE)
-    private String name;
-
-    /** 精确 */
-    @Query
-    private String times;
-
-    /** 精确 */
-    @Query
-    private String cateName;
-
-    /** 精确 */
-    @Query
-    private Timestamp pcdate;
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/daypc/service/impl/DmDayPcServiceImpl.java

@@ -1,120 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.daypc.service.impl;
-
-import me.zhengjie.modules.dm.daypc.domain.DmDayPc;
-import me.zhengjie.utils.ValidationUtil;
-import me.zhengjie.utils.FileUtil;
-import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.dm.daypc.repository.DmDayPcRepository;
-import me.zhengjie.modules.dm.daypc.service.DmDayPcService;
-import me.zhengjie.modules.dm.daypc.service.dto.DmDayPcDto;
-import me.zhengjie.modules.dm.daypc.service.dto.DmDayPcQueryCriteria;
-import me.zhengjie.modules.dm.daypc.service.mapstruct.DmDayPcMapper;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import cn.hutool.core.lang.Snowflake;
-import cn.hutool.core.util.IdUtil;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import me.zhengjie.utils.PageUtil;
-import me.zhengjie.utils.QueryHelp;
-import java.util.List;
-import java.util.Map;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-
-/**
-* @website https://el-admin.vip
-* @description 服务实现
-* @author sunmz
-* @date 2021-09-22
-**/
-@Service
-@RequiredArgsConstructor
-public class DmDayPcServiceImpl implements DmDayPcService {
-
-    private final DmDayPcRepository dmDayPcRepository;
-    private final DmDayPcMapper dmDayPcMapper;
-
-    @Override
-    public Map<String,Object> queryAll(DmDayPcQueryCriteria criteria, Pageable pageable){
-        Page<DmDayPc> page = dmDayPcRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable);
-        return PageUtil.toPage(page.map(dmDayPcMapper::toDto));
-    }
-
-    @Override
-    public List<DmDayPcDto> queryAll(DmDayPcQueryCriteria criteria){
-        return dmDayPcMapper.toDto(dmDayPcRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder)));
-    }
-
-    @Override
-    @Transactional
-    public DmDayPcDto findById(Long id) {
-        DmDayPc dmDayPc = dmDayPcRepository.findById(id).orElseGet(DmDayPc::new);
-        ValidationUtil.isNull(dmDayPc.getId(),"DmDayPc","id",id);
-        return dmDayPcMapper.toDto(dmDayPc);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public DmDayPcDto create(DmDayPc resources) {
-        Snowflake snowflake = IdUtil.createSnowflake(1, 1);
-        resources.setId(snowflake.nextId()); 
-        return dmDayPcMapper.toDto(dmDayPcRepository.save(resources));
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void update(DmDayPc resources) {
-        DmDayPc dmDayPc = dmDayPcRepository.findById(resources.getId()).orElseGet(DmDayPc::new);
-        ValidationUtil.isNull( dmDayPc.getId(),"DmDayPc","id",resources.getId());
-        dmDayPc.copy(resources);
-        dmDayPcRepository.save(dmDayPc);
-    }
-
-    @Override
-    public void deleteAll(Long[] ids) {
-        for (Long id : ids) {
-            dmDayPcRepository.deleteById(id);
-        }
-    }
-
-    @Override
-    public void download(List<DmDayPcDto> all, HttpServletResponse response) throws IOException {
-        List<Map<String, Object>> list = new ArrayList<>();
-        for (DmDayPcDto dmDayPc : all) {
-            Map<String,Object> map = new LinkedHashMap<>();
-            map.put("菜品id", dmDayPc.getPid());
-            map.put("餐盘id", dmDayPc.getCpid());
-            map.put("菜品名称", dmDayPc.getName());
-            map.put("价格", dmDayPc.getPrice());
-            map.put("餐别", dmDayPc.getTimes());
-            map.put("菜品分类id", dmDayPc.getCate());
-            map.put("菜品分类名称", dmDayPc.getCateName());
-            map.put("档口id", dmDayPc.getWindow());
-            map.put("档口名称", dmDayPc.getWindowName());
-            map.put("菜品状态", dmDayPc.getPstate());
-            map.put("流水号", dmDayPc.getSeq());
-            map.put("日期", dmDayPc.getPcdate());
-            map.put("餐厅名称", dmDayPc.getShopname());
-            list.add(map);
-        }
-        FileUtil.downloadExcel(list, response);
-    }
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/daypc/service/mapstruct/DmDayPcMapper.java

@@ -1,32 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.daypc.service.mapstruct;
-
-import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.dm.daypc.domain.DmDayPc;
-import me.zhengjie.modules.dm.daypc.service.dto.DmDayPcDto;
-import org.mapstruct.Mapper;
-import org.mapstruct.ReportingPolicy;
-
-/**
-* @website https://el-admin.vip
-* @author sunmz
-* @date 2021-09-22
-**/
-@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE)
-public interface DmDayPcMapper extends BaseMapper<DmDayPcDto, DmDayPc> {
-
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/device/domain/DmDevice.java

@@ -1,70 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.device.domain;
-
-import lombok.Data;
-import cn.hutool.core.bean.BeanUtil;
-import io.swagger.annotations.ApiModelProperty;
-import cn.hutool.core.bean.copier.CopyOptions;
-import javax.persistence.*;
-import javax.validation.constraints.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
-import me.zhengjie.base.BaseEntity;
-import org.hibernate.annotations.*;
-import java.sql.Timestamp;
-import java.io.Serializable;
-
-/**
-* @website https://el-admin.vip
-* @description /
-* @author xwx
-* @date 2021-04-20
-**/
-@Entity
-@Data
-@Table(name="dm_device")
-public class DmDevice extends BaseEntity  implements Serializable {
-
-    @Id
-    @Column(name = "id")
-    @ApiModelProperty(value = "主键")
-    private Long id;
-
-    @Column(name = "code",nullable = false)
-    @NotBlank
-    @ApiModelProperty(value = "设备编号")
-    private String code;
-
-    @Column(name = "name",nullable = false)
-    @NotBlank
-    @ApiModelProperty(value = "设备名称")
-    private String name;
-
-    @Column(name = "build_address",nullable = false)
-    @NotBlank
-    @ApiModelProperty(value = "设备安装位置")
-    private String buildAddress;
-
-    @Column(name = "build_date")
-    @ApiModelProperty(value = "安装时间")
-    private Timestamp buildDate;
-
-    public void copy(DmDevice source){
-        BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
-    }
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/device/repository/DmDeviceRepository.java

@@ -1,32 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.device.repository;
-
-import me.zhengjie.modules.dm.device.domain.DmDevice;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
-
-/**
-* @website https://el-admin.vip
-* @author xwx
-* @date 2021-04-20
-**/
-public interface DmDeviceRepository extends JpaRepository<DmDevice, Long>, JpaSpecificationExecutor<DmDevice> {
-   @Query(value = "select count(*) from dm_device where code =:code and if((!ISNULL(:id) and :id!=''),id!= :id,1=1)",nativeQuery = true)
-    int checkCode(@Param("code") String code, @Param("id") Long id);
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/device/rest/DmDeviceController.java

@@ -1,98 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.device.rest;
-
-import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.dm.device.domain.DmDevice;
-import me.zhengjie.modules.dm.device.service.DmDeviceService;
-import me.zhengjie.modules.dm.device.service.dto.DmDeviceQueryCriteria;
-import org.springframework.data.domain.Pageable;
-import lombok.RequiredArgsConstructor;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import io.swagger.annotations.*;
-import java.io.IOException;
-import java.util.Map;
-import javax.servlet.http.HttpServletResponse;
-
-/**
-* @website https://el-admin.vip
-* @author xwx
-* @date 2021-04-20
-**/
-@RestController
-@RequiredArgsConstructor
-@Api(tags = "dmDevice管理")
-@RequestMapping("/api/dmDevice")
-public class DmDeviceController {
-
-    private final DmDeviceService dmDeviceService;
-
-    @Log("导出数据")
-    @ApiOperation("导出数据")
-    @GetMapping(value = "/download")
-    @PreAuthorize("@el.check('dmDevice:list')")
-    public void download(HttpServletResponse response, DmDeviceQueryCriteria criteria) throws IOException {
-        dmDeviceService.download(dmDeviceService.queryAll(criteria), response);
-    }
-
-    @GetMapping
-    @Log("查询dmDevice")
-    @ApiOperation("查询dmDevice")
-    @PreAuthorize("@el.check('dmDevice:list')")
-    public ResponseEntity<Object> query(DmDeviceQueryCriteria criteria, Pageable pageable){
-        return new ResponseEntity<>(dmDeviceService.queryAll(criteria,pageable),HttpStatus.OK);
-    }
-
-    @PostMapping
-    @Log("新增dmDevice")
-    @ApiOperation("新增dmDevice")
-    @PreAuthorize("@el.check('dmDevice:add')")
-    public ResponseEntity<Object> create(@Validated @RequestBody DmDevice resources){
-        return new ResponseEntity<>(dmDeviceService.create(resources),HttpStatus.CREATED);
-    }
-
-    @PutMapping
-    @Log("修改dmDevice")
-    @ApiOperation("修改dmDevice")
-    @PreAuthorize("@el.check('dmDevice:edit')")
-    public ResponseEntity<Object> update(@Validated @RequestBody DmDevice resources){
-        dmDeviceService.update(resources);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @Log("删除dmDevice")
-    @ApiOperation("删除dmDevice")
-    @PreAuthorize("@el.check('dmDevice:del')")
-    @DeleteMapping
-    public ResponseEntity<Object> delete(@RequestBody Long[] ids) {
-        dmDeviceService.deleteAll(ids);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-
-    @PutMapping(value = "/checkCode")
-    @Log("判断dmDevice是否存在相同Code")
-    @ApiOperation("判断dmDevice是否存在相同Code")
-    public ResponseEntity<Object> checkCode(@RequestBody Map<String,String> params) {
-        int count  = dmDeviceService.checkCode(params.get("code"),params.get("id")==null?null:Long.parseLong(params.get("id")));
-        return new ResponseEntity<>(count>0?true:false,HttpStatus.OK);
-    }
-
-
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/device/service/DmDeviceService.java

@@ -1,85 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.device.service;
-
-import me.zhengjie.modules.dm.device.domain.DmDevice;
-import me.zhengjie.modules.dm.device.service.dto.DmDeviceDto;
-import me.zhengjie.modules.dm.device.service.dto.DmDeviceQueryCriteria;
-import org.springframework.data.domain.Pageable;
-import java.util.Map;
-import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
-/**
-* @website https://el-admin.vip
-* @description 服务接口
-* @author xwx
-* @date 2021-04-20
-**/
-public interface DmDeviceService {
-
-    /**
-    * 查询数据分页
-    * @param criteria 条件
-    * @param pageable 分页参数
-    * @return Map<String,Object>
-    */
-    Map<String,Object> queryAll(DmDeviceQueryCriteria criteria, Pageable pageable);
-
-    /**
-    * 查询所有数据不分页
-    * @param criteria 条件参数
-    * @return List<DmDeviceDto>
-    */
-    List<DmDeviceDto> queryAll(DmDeviceQueryCriteria criteria);
-
-    /**
-     * 根据ID查询
-     * @param id ID
-     * @return DmDeviceDto
-     */
-    DmDeviceDto findById(Long id);
-
-    /**
-    * 创建
-    * @param resources /
-    * @return DmDeviceDto
-    */
-    DmDeviceDto create(DmDevice resources);
-
-    /**
-    * 编辑
-    * @param resources /
-    */
-    void update(DmDevice resources);
-
-    /**
-    * 多选删除
-    * @param ids /
-    */
-    void deleteAll(Long[] ids);
-
-    /**
-    * 导出数据
-    * @param all 待导出的数据
-    * @param response /
-    * @throws IOException /
-    */
-    void download(List<DmDeviceDto> all, HttpServletResponse response) throws IOException;
-
-    int checkCode(String code,Long id);
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/device/service/dto/DmDeviceDto.java

@@ -1,61 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.device.service.dto;
-
-import lombok.Data;
-import java.sql.Timestamp;
-import java.io.Serializable;
-import com.alibaba.fastjson.annotation.JSONField;
-import com.alibaba.fastjson.serializer.ToStringSerializer;
-
-/**
-* @website https://el-admin.vip
-* @description /
-* @author xwx
-* @date 2021-04-20
-**/
-@Data
-public class DmDeviceDto implements Serializable {
-
-    /** 主键 */
-    /** 防止精度丢失 */
-    @JSONField(serializeUsing = ToStringSerializer.class)
-    private Long id;
-
-    /** 设备编号 */
-    private String code;
-
-    /** 设备名称 */
-    private String name;
-
-    /** 设备安装位置 */
-    private String buildAddress;
-
-    /** 安装时间 */
-    private Timestamp buildDate;
-
-    /** 创建者 */
-    private String createBy;
-
-    /** 更新者 */
-    private String updateBy;
-
-    /** 创建日期 */
-    private Timestamp createTime;
-
-    /** 更新时间 */
-    private Timestamp updateTime;
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/device/service/dto/DmDeviceQueryCriteria.java

@@ -1,45 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.device.service.dto;
-
-import lombok.Data;
-import java.sql.Timestamp;
-import java.util.List;
-import me.zhengjie.annotation.Query;
-
-/**
-* @website https://el-admin.vip
-* @author xwx
-* @date 2021-04-20
-**/
-@Data
-public class DmDeviceQueryCriteria{
-
-    /** 模糊 */
-    @Query(type = Query.Type.INNER_LIKE)
-    private String code;
-
-    /** 模糊 */
-    @Query(type = Query.Type.INNER_LIKE)
-    private String name;
-
-    /** 模糊 */
-    @Query(type = Query.Type.INNER_LIKE)
-    private String buildAddress;
-    /** BETWEEN */
-    @Query(type = Query.Type.BETWEEN)
-    private List<Timestamp> buildDate;
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/device/service/impl/DmDeviceServiceImpl.java

@@ -1,118 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.device.service.impl;
-
-import me.zhengjie.modules.dm.device.domain.DmDevice;
-import me.zhengjie.utils.ValidationUtil;
-import me.zhengjie.utils.FileUtil;
-import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.dm.device.repository.DmDeviceRepository;
-import me.zhengjie.modules.dm.device.service.DmDeviceService;
-import me.zhengjie.modules.dm.device.service.dto.DmDeviceDto;
-import me.zhengjie.modules.dm.device.service.dto.DmDeviceQueryCriteria;
-import me.zhengjie.modules.dm.device.service.mapstruct.DmDeviceMapper;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import cn.hutool.core.lang.Snowflake;
-import cn.hutool.core.util.IdUtil;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import me.zhengjie.utils.PageUtil;
-import me.zhengjie.utils.QueryHelp;
-import java.util.List;
-import java.util.Map;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-
-/**
-* @website https://el-admin.vip
-* @description 服务实现
-* @author xwx
-* @date 2021-04-20
-**/
-@Service
-@RequiredArgsConstructor
-public class DmDeviceServiceImpl implements DmDeviceService {
-
-    private final DmDeviceRepository dmDeviceRepository;
-    private final DmDeviceMapper dmDeviceMapper;
-
-    @Override
-    public Map<String,Object> queryAll(DmDeviceQueryCriteria criteria, Pageable pageable){
-        Page<DmDevice> page = dmDeviceRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable);
-        return PageUtil.toPage(page.map(dmDeviceMapper::toDto));
-    }
-
-    @Override
-    public List<DmDeviceDto> queryAll(DmDeviceQueryCriteria criteria){
-        return dmDeviceMapper.toDto(dmDeviceRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder)));
-    }
-
-    @Override
-    @Transactional
-    public DmDeviceDto findById(Long id) {
-        DmDevice dmDevice = dmDeviceRepository.findById(id).orElseGet(DmDevice::new);
-        ValidationUtil.isNull(dmDevice.getId(),"DmDevice","id",id);
-        return dmDeviceMapper.toDto(dmDevice);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public DmDeviceDto create(DmDevice resources) {
-        Snowflake snowflake = IdUtil.createSnowflake(1, 1);
-        resources.setId(snowflake.nextId()); 
-        return dmDeviceMapper.toDto(dmDeviceRepository.save(resources));
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void update(DmDevice resources) {
-        DmDevice dmDevice = dmDeviceRepository.findById(resources.getId()).orElseGet(DmDevice::new);
-        ValidationUtil.isNull( dmDevice.getId(),"DmDevice","id",resources.getId());
-        dmDevice.copy(resources);
-        dmDeviceRepository.save(dmDevice);
-    }
-
-    @Override
-    public void deleteAll(Long[] ids) {
-        for (Long id : ids) {
-            dmDeviceRepository.deleteById(id);
-        }
-    }
-
-    @Override
-    public void download(List<DmDeviceDto> all, HttpServletResponse response) throws IOException {
-        List<Map<String, Object>> list = new ArrayList<>();
-        for (DmDeviceDto dmDevice : all) {
-            Map<String,Object> map = new LinkedHashMap<>();
-            map.put("设备编号", dmDevice.getCode());
-            map.put("设备名称", dmDevice.getName());
-            map.put("设备安装位置", dmDevice.getBuildAddress());
-            map.put("安装时间", dmDevice.getBuildDate());
-            map.put("创建者", dmDevice.getCreateBy());
-            map.put("更新者", dmDevice.getUpdateBy());
-            map.put("创建日期", dmDevice.getCreateTime());
-            map.put("更新时间", dmDevice.getUpdateTime());
-            list.add(map);
-        }
-        FileUtil.downloadExcel(list, response);
-    }
-
-    @Override
-    public int checkCode(String code,Long id){ return dmDeviceRepository.checkCode(code,id); };
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/device/service/mapstruct/DmDeviceMapper.java

@@ -1,32 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.device.service.mapstruct;
-
-import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.dm.device.domain.DmDevice;
-import me.zhengjie.modules.dm.device.service.dto.DmDeviceDto;
-import org.mapstruct.Mapper;
-import org.mapstruct.ReportingPolicy;
-
-/**
-* @website https://el-admin.vip
-* @author xwx
-* @date 2021-04-20
-**/
-@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE)
-public interface DmDeviceMapper extends BaseMapper<DmDeviceDto, DmDevice> {
-
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/food/domain/DmFood.java

@@ -1,108 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.food.domain;
-
-import lombok.Data;
-import cn.hutool.core.bean.BeanUtil;
-import io.swagger.annotations.ApiModelProperty;
-import cn.hutool.core.bean.copier.CopyOptions;
-import me.zhengjie.utils.SecurityUtils;
-import org.springframework.security.core.userdetails.UserDetails;
-
-import javax.persistence.*;
-import javax.validation.constraints.*;
-import java.sql.Timestamp;
-import java.math.BigDecimal;
-import java.io.Serializable;
-import java.util.Date;
-
-/**
-* @website https://el-admin.vip
-* @description /
-* @author sunmz
-* @date 2021-09-15
-**/
-@Entity
-@Data
-@Table(name="dm_food")
-public class DmFood implements Serializable {
-
-    @Id
-    @Column(name = "id")
-    @ApiModelProperty(value = "id")
-    private Long id;
-
-    @Column(name = "code",nullable = false)
-    @NotBlank
-    @ApiModelProperty(value = "编号")
-    private String code;
-
-    @Column(name = "name",nullable = false)
-    @NotBlank
-    @ApiModelProperty(value = "名称")
-    private String name;
-
-    @Column(name = "price",nullable = false)
-    @NotNull
-    @ApiModelProperty(value = "单价")
-    private BigDecimal price;
-
-    @Column(name = "picture")
-    @ApiModelProperty(value = "图片")
-    private String picture;
-
-    @Column(name = "create_by")
-    @ApiModelProperty(value = "创建者")
-    private String createBy;
-
-    @Column(name = "update_by")
-    @ApiModelProperty(value = "更新者")
-    private String updateBy;
-
-    @Column(name = "create_time")
-    @ApiModelProperty(value = "创建日期")
-    private Timestamp createTime;
-
-    @Column(name = "update_time")
-    @ApiModelProperty(value = "更新时间")
-    private Timestamp updateTime;
-
-    @Column(name = "remark")
-    @ApiModelProperty(value = "描述")
-    private String remark;
-
-    @Column(name = "type")
-    @ApiModelProperty(value = "类型")
-    private String type;
-
-    public void copy(DmFood source){
-        BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
-    }
-
-    @PrePersist
-    public void prePersist() {
-        UserDetails user = SecurityUtils.getCurrentUser();
-        this.createBy = user.getUsername();
-        this.createTime = new Timestamp(new Date().getTime());
-    }
-
-    @PreUpdate
-    public void preUPdate() {
-        UserDetails user = SecurityUtils.getCurrentUser();
-        this.updateBy = user.getUsername();
-        this.updateTime = new Timestamp(new Date().getTime());
-    }
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/food/repository/DmFoodRepository.java

@@ -1,28 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.food.repository;
-
-import me.zhengjie.modules.dm.food.domain.DmFood;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-
-/**
-* @website https://el-admin.vip
-* @author sunmz
-* @date 2021-09-15
-**/
-public interface DmFoodRepository extends JpaRepository<DmFood, Long>, JpaSpecificationExecutor<DmFood> {
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/food/rest/DmFoodController.java

@@ -1,89 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.food.rest;
-
-import me.zhengjie.annotation.Log;
-import me.zhengjie.config.FileProperties;
-import me.zhengjie.modules.dm.food.domain.DmFood;
-import me.zhengjie.modules.dm.food.service.DmFoodService;
-import me.zhengjie.modules.dm.food.service.dto.DmFoodQueryCriteria;
-import org.springframework.data.domain.Pageable;
-import lombok.RequiredArgsConstructor;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import io.swagger.annotations.*;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
-/**
-* @website https://el-admin.vip
-* @author sunmz
-* @date 2021-09-15
-**/
-@RestController
-@RequiredArgsConstructor
-@Api(tags = "food管理")
-@RequestMapping("/api/dmFood")
-public class DmFoodController {
-
-    private final DmFoodService dmFoodService;
-    private final FileProperties properties;
-
-    @Log("导出数据")
-    @ApiOperation("导出数据")
-    @GetMapping(value = "/download")
-    @PreAuthorize("@el.check('dmFood:list')")
-    public void download(HttpServletResponse response, DmFoodQueryCriteria criteria) throws IOException {
-        dmFoodService.download(dmFoodService.queryAll(criteria), response);
-    }
-
-    @GetMapping
-    @Log("查询food")
-    @ApiOperation("查询food")
-    @PreAuthorize("@el.check('dmFood:list')")
-    public ResponseEntity<Object> query(DmFoodQueryCriteria criteria, Pageable pageable){
-        return new ResponseEntity<>(dmFoodService.queryAll(criteria,pageable),HttpStatus.OK);
-    }
-
-    @PostMapping
-    @Log("新增food")
-    @ApiOperation("新增food")
-    @PreAuthorize("@el.check('dmFood:add')")
-    public ResponseEntity<Object> create(@Validated @RequestBody DmFood resources){
-        return new ResponseEntity<>(dmFoodService.create(resources),HttpStatus.CREATED);
-    }
-
-    @PutMapping
-    @Log("修改food")
-    @ApiOperation("修改food")
-    @PreAuthorize("@el.check('dmFood:edit')")
-    public ResponseEntity<Object> update(@Validated @RequestBody DmFood resources){
-        dmFoodService.update(resources);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @Log("删除food")
-    @ApiOperation("删除food")
-    @PreAuthorize("@el.check('dmFood:del')")
-    @DeleteMapping
-    public ResponseEntity<Object> delete(@RequestBody Long[] ids) {
-        dmFoodService.deleteAll(ids);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/food/service/DmFoodService.java

@@ -1,83 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.food.service;
-
-import me.zhengjie.modules.dm.food.domain.DmFood;
-import me.zhengjie.modules.dm.food.service.dto.DmFoodDto;
-import me.zhengjie.modules.dm.food.service.dto.DmFoodQueryCriteria;
-import org.springframework.data.domain.Pageable;
-import java.util.Map;
-import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
-/**
-* @website https://el-admin.vip
-* @description 服务接口
-* @author sunmz
-* @date 2021-09-15
-**/
-public interface DmFoodService {
-
-    /**
-    * 查询数据分页
-    * @param criteria 条件
-    * @param pageable 分页参数
-    * @return Map<String,Object>
-    */
-    Map<String,Object> queryAll(DmFoodQueryCriteria criteria, Pageable pageable);
-
-    /**
-    * 查询所有数据不分页
-    * @param criteria 条件参数
-    * @return List<DmFoodDto>
-    */
-    List<DmFoodDto> queryAll(DmFoodQueryCriteria criteria);
-
-    /**
-     * 根据ID查询
-     * @param id ID
-     * @return DmFoodDto
-     */
-    DmFoodDto findById(Long id);
-
-    /**
-    * 创建
-    * @param resources /
-    * @return DmFoodDto
-    */
-    DmFoodDto create(DmFood resources);
-
-    /**
-    * 编辑
-    * @param resources /
-    */
-    void update(DmFood resources);
-
-    /**
-    * 多选删除
-    * @param ids /
-    */
-    void deleteAll(Long[] ids);
-
-    /**
-    * 导出数据
-    * @param all 待导出的数据
-    * @param response /
-    * @throws IOException /
-    */
-    void download(List<DmFoodDto> all, HttpServletResponse response) throws IOException;
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/food/service/dto/DmFoodDto.java

@@ -1,67 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.food.service.dto;
-
-import lombok.Data;
-import java.sql.Timestamp;
-import java.math.BigDecimal;
-import java.io.Serializable;
-import com.alibaba.fastjson.annotation.JSONField;
-import com.alibaba.fastjson.serializer.ToStringSerializer;
-
-/**
-* @website https://el-admin.vip
-* @description /
-* @author sunmz
-* @date 2021-09-15
-**/
-@Data
-public class DmFoodDto implements Serializable {
-
-    /** 防止精度丢失 */
-    @JSONField(serializeUsing = ToStringSerializer.class)
-    private Long id;
-
-    /** 编号 */
-    private String code;
-
-    /** 名称 */
-    private String name;
-
-    /** 类型 */
-    private String type;
-
-    /** 单价 */
-    private BigDecimal price;
-
-    /** 图片 */
-    private String picture;
-
-    /** 创建者 */
-    private String createBy;
-
-    /** 更新者 */
-    private String updateBy;
-
-    /** 创建日期 */
-    private Timestamp createTime;
-
-    /** 更新时间 */
-    private Timestamp updateTime;
-
-    /** 描述 */
-    private String remark;
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/food/service/dto/DmFoodQueryCriteria.java

@@ -1,41 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.food.service.dto;
-
-import lombok.Data;
-import java.util.List;
-import me.zhengjie.annotation.Query;
-
-/**
-* @website https://el-admin.vip
-* @author sunmz
-* @date 2021-09-15
-**/
-@Data
-public class DmFoodQueryCriteria{
-
-    /** 模糊 */
-    @Query(type = Query.Type.INNER_LIKE)
-    private String code;
-
-    /** 模糊 */
-    @Query(type = Query.Type.INNER_LIKE)
-    private String name;
-
-    /** 精确 */
-    @Query
-    private String type;
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/food/service/impl/DmFoodServiceImpl.java

@@ -1,116 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.food.service.impl;
-
-import me.zhengjie.modules.dm.food.domain.DmFood;
-import me.zhengjie.utils.ValidationUtil;
-import me.zhengjie.utils.FileUtil;
-import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.dm.food.repository.DmFoodRepository;
-import me.zhengjie.modules.dm.food.service.DmFoodService;
-import me.zhengjie.modules.dm.food.service.dto.DmFoodDto;
-import me.zhengjie.modules.dm.food.service.dto.DmFoodQueryCriteria;
-import me.zhengjie.modules.dm.food.service.mapstruct.DmFoodMapper;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import cn.hutool.core.lang.Snowflake;
-import cn.hutool.core.util.IdUtil;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import me.zhengjie.utils.PageUtil;
-import me.zhengjie.utils.QueryHelp;
-import java.util.List;
-import java.util.Map;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-
-/**
-* @website https://el-admin.vip
-* @description 服务实现
-* @author sunmz
-* @date 2021-09-15
-**/
-@Service
-@RequiredArgsConstructor
-public class DmFoodServiceImpl implements DmFoodService {
-
-    private final DmFoodRepository dmFoodRepository;
-    private final DmFoodMapper dmFoodMapper;
-
-    @Override
-    public Map<String,Object> queryAll(DmFoodQueryCriteria criteria, Pageable pageable){
-        Page<DmFood> page = dmFoodRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable);
-        return PageUtil.toPage(page.map(dmFoodMapper::toDto));
-    }
-
-    @Override
-    public List<DmFoodDto> queryAll(DmFoodQueryCriteria criteria){
-        return dmFoodMapper.toDto(dmFoodRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder)));
-    }
-
-    @Override
-    @Transactional
-    public DmFoodDto findById(Long id) {
-        DmFood dmFood = dmFoodRepository.findById(id).orElseGet(DmFood::new);
-        ValidationUtil.isNull(dmFood.getId(),"DmFood","id",id);
-        return dmFoodMapper.toDto(dmFood);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public DmFoodDto create(DmFood resources) {
-        Snowflake snowflake = IdUtil.createSnowflake(1, 1);
-        resources.setId(snowflake.nextId()); 
-        return dmFoodMapper.toDto(dmFoodRepository.save(resources));
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void update(DmFood resources) {
-        DmFood dmFood = dmFoodRepository.findById(resources.getId()).orElseGet(DmFood::new);
-        ValidationUtil.isNull( dmFood.getId(),"DmFood","id",resources.getId());
-        dmFood.copy(resources);
-        dmFoodRepository.save(dmFood);
-    }
-
-    @Override
-    public void deleteAll(Long[] ids) {
-        for (Long id : ids) {
-            dmFoodRepository.deleteById(id);
-        }
-    }
-
-    @Override
-    public void download(List<DmFoodDto> all, HttpServletResponse response) throws IOException {
-        List<Map<String, Object>> list = new ArrayList<>();
-        for (DmFoodDto dmFood : all) {
-            Map<String,Object> map = new LinkedHashMap<>();
-            map.put("编号", dmFood.getCode());
-            map.put("名称", dmFood.getName());
-            map.put("单价", dmFood.getPrice());
-            map.put("图片", dmFood.getPicture());
-            map.put("创建者", dmFood.getCreateBy());
-            map.put("更新者", dmFood.getUpdateBy());
-            map.put("创建日期", dmFood.getCreateTime());
-            map.put("更新时间", dmFood.getUpdateTime());
-            map.put("描述", dmFood.getRemark());
-            list.add(map);
-        }
-        FileUtil.downloadExcel(list, response);
-    }
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/food/service/mapstruct/DmFoodMapper.java

@@ -1,32 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.food.service.mapstruct;
-
-import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.dm.food.domain.DmFood;
-import me.zhengjie.modules.dm.food.service.dto.DmFoodDto;
-import org.mapstruct.Mapper;
-import org.mapstruct.ReportingPolicy;
-
-/**
-* @website https://el-admin.vip
-* @author sunmz
-* @date 2021-09-15
-**/
-@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE)
-public interface DmFoodMapper extends BaseMapper<DmFoodDto, DmFood> {
-
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/foodPj/domain/DmFoodPj.java

@@ -1,94 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.foodPj.domain;
-
-import lombok.Data;
-import cn.hutool.core.bean.BeanUtil;
-import io.swagger.annotations.ApiModelProperty;
-import cn.hutool.core.bean.copier.CopyOptions;
-import javax.persistence.*;
-import javax.validation.constraints.*;
-import java.sql.Timestamp;
-import java.io.Serializable;
-
-/**
-* @website https://el-admin.vip
-* @description /
-* @author sunmz
-* @date 2021-09-15
-**/
-@Entity
-@Data
-@Table(name="dm_food_pj")
-public class DmFoodPj implements Serializable {
-
-    @Id
-    @Column(name = "id")
-    @ApiModelProperty(value = "id")
-    private Long id;
-
-    @Column(name = "food_name")
-    @ApiModelProperty(value = "菜品名称")
-    private String foodName;
-
-    @Column(name = "food_code")
-    @ApiModelProperty(value = "菜品编号")
-    private String foodCode;
-
-    @Column(name = "food_type")
-    @ApiModelProperty(value = "菜品分类")
-    private String foodType;
-
-    @Column(name = "user_code")
-    @ApiModelProperty(value = "用户工号")
-    private String userCode;
-
-    @Column(name = "user_name")
-    @ApiModelProperty(value = "用户姓名")
-    private String userName;
-
-    @Column(name = "order_time")
-    @ApiModelProperty(value = "下单时间")
-    private Timestamp orderTime;
-
-    @Column(name = "order_bh")
-    @ApiModelProperty(value = "订单编号")
-    private String orderBh;
-
-    @Column(name = "pj_time")
-    @ApiModelProperty(value = "评价时间")
-    private Timestamp pjTime;
-
-    @Column(name = "pj_star")
-    @ApiModelProperty(value = "评价星级")
-    private String pjStar;
-
-    @Column(name = "pj_tag")
-    @ApiModelProperty(value = "评价标签")
-    private String pjTag;
-
-    @Column(name = "pj_desc")
-    @ApiModelProperty(value = "评价详情")
-    private String pjDesc;
-
-    @Column(name = "pj_pic")
-    @ApiModelProperty(value = "上传图片")
-    private String pjPic;
-
-    public void copy(DmFoodPj source){
-        BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
-    }
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/foodPj/repository/DmFoodPjRepository.java

@@ -1,28 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.foodPj.repository;
-
-import me.zhengjie.modules.dm.foodPj.domain.DmFoodPj;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-
-/**
-* @website https://el-admin.vip
-* @author sunmz
-* @date 2021-09-15
-**/
-public interface DmFoodPjRepository extends JpaRepository<DmFoodPj, Long>, JpaSpecificationExecutor<DmFoodPj> {
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/foodPj/rest/DmFoodPjController.java

@@ -1,87 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.foodPj.rest;
-
-import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.dm.foodPj.domain.DmFoodPj;
-import me.zhengjie.modules.dm.foodPj.service.DmFoodPjService;
-import me.zhengjie.modules.dm.foodPj.service.dto.DmFoodPjQueryCriteria;
-import org.springframework.data.domain.Pageable;
-import lombok.RequiredArgsConstructor;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import io.swagger.annotations.*;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
-/**
-* @website https://el-admin.vip
-* @author sunmz
-* @date 2021-09-15
-**/
-@RestController
-@RequiredArgsConstructor
-@Api(tags = "foodPj管理")
-@RequestMapping("/api/dmFoodPj")
-public class DmFoodPjController {
-
-    private final DmFoodPjService dmFoodPjService;
-
-    @Log("导出数据")
-    @ApiOperation("导出数据")
-    @GetMapping(value = "/download")
-    @PreAuthorize("@el.check('dmFoodPj:list')")
-    public void download(HttpServletResponse response, DmFoodPjQueryCriteria criteria) throws IOException {
-        dmFoodPjService.download(dmFoodPjService.queryAll(criteria), response);
-    }
-
-    @GetMapping
-    @Log("查询foodPj")
-    @ApiOperation("查询foodPj")
-    @PreAuthorize("@el.check('dmFoodPj:list')")
-    public ResponseEntity<Object> query(DmFoodPjQueryCriteria criteria, Pageable pageable){
-        return new ResponseEntity<>(dmFoodPjService.queryAll(criteria,pageable),HttpStatus.OK);
-    }
-
-    @PostMapping
-    @Log("新增foodPj")
-    @ApiOperation("新增foodPj")
-    @PreAuthorize("@el.check('dmFoodPj:add')")
-    public ResponseEntity<Object> create(@Validated @RequestBody DmFoodPj resources){
-        return new ResponseEntity<>(dmFoodPjService.create(resources),HttpStatus.CREATED);
-    }
-
-    @PutMapping
-    @Log("修改foodPj")
-    @ApiOperation("修改foodPj")
-    @PreAuthorize("@el.check('dmFoodPj:edit')")
-    public ResponseEntity<Object> update(@Validated @RequestBody DmFoodPj resources){
-        dmFoodPjService.update(resources);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @Log("删除foodPj")
-    @ApiOperation("删除foodPj")
-    @PreAuthorize("@el.check('dmFoodPj:del')")
-    @DeleteMapping
-    public ResponseEntity<Object> delete(@RequestBody Long[] ids) {
-        dmFoodPjService.deleteAll(ids);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/foodPj/service/DmFoodPjService.java

@@ -1,83 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.foodPj.service;
-
-import me.zhengjie.modules.dm.foodPj.domain.DmFoodPj;
-import me.zhengjie.modules.dm.foodPj.service.dto.DmFoodPjDto;
-import me.zhengjie.modules.dm.foodPj.service.dto.DmFoodPjQueryCriteria;
-import org.springframework.data.domain.Pageable;
-import java.util.Map;
-import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
-/**
-* @website https://el-admin.vip
-* @description 服务接口
-* @author sunmz
-* @date 2021-09-15
-**/
-public interface DmFoodPjService {
-
-    /**
-    * 查询数据分页
-    * @param criteria 条件
-    * @param pageable 分页参数
-    * @return Map<String,Object>
-    */
-    Map<String,Object> queryAll(DmFoodPjQueryCriteria criteria, Pageable pageable);
-
-    /**
-    * 查询所有数据不分页
-    * @param criteria 条件参数
-    * @return List<DmFoodPjDto>
-    */
-    List<DmFoodPjDto> queryAll(DmFoodPjQueryCriteria criteria);
-
-    /**
-     * 根据ID查询
-     * @param id ID
-     * @return DmFoodPjDto
-     */
-    DmFoodPjDto findById(Long id);
-
-    /**
-    * 创建
-    * @param resources /
-    * @return DmFoodPjDto
-    */
-    DmFoodPjDto create(DmFoodPj resources);
-
-    /**
-    * 编辑
-    * @param resources /
-    */
-    void update(DmFoodPj resources);
-
-    /**
-    * 多选删除
-    * @param ids /
-    */
-    void deleteAll(Long[] ids);
-
-    /**
-    * 导出数据
-    * @param all 待导出的数据
-    * @param response /
-    * @throws IOException /
-    */
-    void download(List<DmFoodPjDto> all, HttpServletResponse response) throws IOException;
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/foodPj/service/dto/DmFoodPjDto.java

@@ -1,72 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.foodPj.service.dto;
-
-import lombok.Data;
-import java.sql.Timestamp;
-import java.io.Serializable;
-import com.alibaba.fastjson.annotation.JSONField;
-import com.alibaba.fastjson.serializer.ToStringSerializer;
-
-/**
-* @website https://el-admin.vip
-* @description /
-* @author sunmz
-* @date 2021-09-15
-**/
-@Data
-public class DmFoodPjDto implements Serializable {
-
-    /** 防止精度丢失 */
-    @JSONField(serializeUsing = ToStringSerializer.class)
-    private Long id;
-
-    /** 菜品名称 */
-    private String foodName;
-
-    /** 菜品编号 */
-    private String foodCode;
-
-    /** 菜品分类 */
-    private String foodType;
-
-    /** 用户工号 */
-    private String userCode;
-
-    /** 用户姓名 */
-    private String userName;
-
-    /** 下单时间 */
-    private Timestamp orderTime;
-
-    /** 订单编号 */
-    private String orderBh;
-
-    /** 评价时间 */
-    private Timestamp pjTime;
-
-    /** 评价星级 */
-    private String pjStar;
-
-    /** 评价标签 */
-    private String pjTag;
-
-    /** 评价详情 */
-    private String pjDesc;
-
-    /** 上传图片 */
-    private String pjPic;
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/foodPj/service/dto/DmFoodPjQueryCriteria.java

@@ -1,41 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.foodPj.service.dto;
-
-import lombok.Data;
-import java.sql.Timestamp;
-import java.util.List;
-import me.zhengjie.annotation.Query;
-
-/**
-* @website https://el-admin.vip
-* @author sunmz
-* @date 2021-09-15
-**/
-@Data
-public class DmFoodPjQueryCriteria{
-
-    /** 模糊 */
-    @Query(type = Query.Type.INNER_LIKE)
-    private String foodName;
-
-    /** 精确 */
-    @Query
-    private String pjStar;
-    /** BETWEEN */
-    @Query(type = Query.Type.BETWEEN)
-    private List<Timestamp> pjTime;
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/foodPj/service/impl/DmFoodPjServiceImpl.java

@@ -1,119 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.foodPj.service.impl;
-
-import me.zhengjie.modules.dm.foodPj.domain.DmFoodPj;
-import me.zhengjie.utils.ValidationUtil;
-import me.zhengjie.utils.FileUtil;
-import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.dm.foodPj.repository.DmFoodPjRepository;
-import me.zhengjie.modules.dm.foodPj.service.DmFoodPjService;
-import me.zhengjie.modules.dm.foodPj.service.dto.DmFoodPjDto;
-import me.zhengjie.modules.dm.foodPj.service.dto.DmFoodPjQueryCriteria;
-import me.zhengjie.modules.dm.foodPj.service.mapstruct.DmFoodPjMapper;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import cn.hutool.core.lang.Snowflake;
-import cn.hutool.core.util.IdUtil;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import me.zhengjie.utils.PageUtil;
-import me.zhengjie.utils.QueryHelp;
-import java.util.List;
-import java.util.Map;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-
-/**
-* @website https://el-admin.vip
-* @description 服务实现
-* @author sunmz
-* @date 2021-09-15
-**/
-@Service
-@RequiredArgsConstructor
-public class DmFoodPjServiceImpl implements DmFoodPjService {
-
-    private final DmFoodPjRepository dmFoodPjRepository;
-    private final DmFoodPjMapper dmFoodPjMapper;
-
-    @Override
-    public Map<String,Object> queryAll(DmFoodPjQueryCriteria criteria, Pageable pageable){
-        Page<DmFoodPj> page = dmFoodPjRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable);
-        return PageUtil.toPage(page.map(dmFoodPjMapper::toDto));
-    }
-
-    @Override
-    public List<DmFoodPjDto> queryAll(DmFoodPjQueryCriteria criteria){
-        return dmFoodPjMapper.toDto(dmFoodPjRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder)));
-    }
-
-    @Override
-    @Transactional
-    public DmFoodPjDto findById(Long id) {
-        DmFoodPj dmFoodPj = dmFoodPjRepository.findById(id).orElseGet(DmFoodPj::new);
-        ValidationUtil.isNull(dmFoodPj.getId(),"DmFoodPj","id",id);
-        return dmFoodPjMapper.toDto(dmFoodPj);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public DmFoodPjDto create(DmFoodPj resources) {
-        Snowflake snowflake = IdUtil.createSnowflake(1, 1);
-        resources.setId(snowflake.nextId()); 
-        return dmFoodPjMapper.toDto(dmFoodPjRepository.save(resources));
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void update(DmFoodPj resources) {
-        DmFoodPj dmFoodPj = dmFoodPjRepository.findById(resources.getId()).orElseGet(DmFoodPj::new);
-        ValidationUtil.isNull( dmFoodPj.getId(),"DmFoodPj","id",resources.getId());
-        dmFoodPj.copy(resources);
-        dmFoodPjRepository.save(dmFoodPj);
-    }
-
-    @Override
-    public void deleteAll(Long[] ids) {
-        for (Long id : ids) {
-            dmFoodPjRepository.deleteById(id);
-        }
-    }
-
-    @Override
-    public void download(List<DmFoodPjDto> all, HttpServletResponse response) throws IOException {
-        List<Map<String, Object>> list = new ArrayList<>();
-        for (DmFoodPjDto dmFoodPj : all) {
-            Map<String,Object> map = new LinkedHashMap<>();
-            map.put("菜品名称", dmFoodPj.getFoodName());
-            map.put("菜品编号", dmFoodPj.getFoodCode());
-            map.put("菜品分类", dmFoodPj.getFoodType());
-            map.put("用户工号", dmFoodPj.getUserCode());
-            map.put("用户姓名", dmFoodPj.getUserName());
-            map.put("下单时间", dmFoodPj.getOrderTime());
-            map.put("订单编号", dmFoodPj.getOrderBh());
-            map.put("评价时间", dmFoodPj.getPjTime());
-            map.put("评价星级", dmFoodPj.getPjStar());
-            map.put("评价标签", dmFoodPj.getPjTag());
-            map.put("评价详情", dmFoodPj.getPjDesc());
-            map.put("上传图片", dmFoodPj.getPjPic());
-            list.add(map);
-        }
-        FileUtil.downloadExcel(list, response);
-    }
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/foodPj/service/mapstruct/DmFoodPjMapper.java

@@ -1,32 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.foodPj.service.mapstruct;
-
-import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.dm.foodPj.domain.DmFoodPj;
-import me.zhengjie.modules.dm.foodPj.service.dto.DmFoodPjDto;
-import org.mapstruct.Mapper;
-import org.mapstruct.ReportingPolicy;
-
-/**
-* @website https://el-admin.vip
-* @author sunmz
-* @date 2021-09-15
-**/
-@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE)
-public interface DmFoodPjMapper extends BaseMapper<DmFoodPjDto, DmFoodPj> {
-
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/information/domain/DmInformation.java

@@ -1,95 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.information.domain;
-
-import lombok.Data;
-import cn.hutool.core.bean.BeanUtil;
-import io.swagger.annotations.ApiModelProperty;
-import cn.hutool.core.bean.copier.CopyOptions;
-import me.zhengjie.base.BaseEntity;
-import me.zhengjie.modules.dm.user.domain.DmUser;
-
-import javax.persistence.*;
-import javax.validation.constraints.*;
-import java.sql.Timestamp;
-import java.io.Serializable;
-import java.util.List;
-
-/**
-* @website https://el-admin.vip
-* @description /
-* @author xwx
-* @date 2021-04-22
-**/
-@Entity
-@Data
-@Table(name="dm_information")
-public class DmInformation extends BaseEntity implements Serializable {
-
-    @Id
-    @Column(name = "id")
-    @ApiModelProperty(value = "主键")
-    private Long id;
-
-    @Column(name = "content")
-    @ApiModelProperty(value = "发布内容(需发布的信息内容)")
-    private String content;
-
-    @Column(name = "status")
-    @ApiModelProperty(value = "(00-待审核  01-审批通过(已发布） 02-审核未通过)")
-    private String status;
-
-    @Column(name = "approval_remark")
-    @ApiModelProperty(value = "审批备注")
-    private String approvalRemark;
-
-    @ApiModelProperty(value = "审批人")
-    @OneToOne
-    @JoinColumn(name = "approval_user")
-    private DmUser approvalUser;
-
-    @Column(name = "is_has_approval")
-    @ApiModelProperty(value = "是否添加审批人")
-    private Boolean isHasApproval ;
-
-    @Column(name = "task_id")
-    @ApiModelProperty(value = "任务ID act_ru_task")
-    private String taskId;
-
-    @Column(name = "proc_inst_id")
-    @ApiModelProperty(value = "任务实例id act_ru_execution")
-    private String procInstId;
-
-    @OneToOne
-    @JoinColumn(name = "request_user")
-    @ApiModelProperty(value = "发起人")
-    private DmUser requestUser;
-
-    @Column(name = "release_time")
-    @ApiModelProperty(value = "发布时间")
-    private Timestamp releaseTime;
-
-    @Column(name = "approval_time")
-    @ApiModelProperty(value = "审批时间")
-    private Timestamp approvalTime;
-
-    @Transient
-    private List<DmUser> approvalUserList;
-
-    public void copy(DmInformation source){
-        BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
-    }
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/information/repository/DmInformationRepository.java

@@ -1,57 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.information.repository;
-
-import me.zhengjie.modules.dm.information.domain.DmInformation;
-import me.zhengjie.modules.dm.information.service.dto.DmInformationDto;
-import me.zhengjie.modules.dm.information.service.dto.DmInformationQueryCriteria;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
-
-import java.util.List;
-import java.util.Map;
-
-/**
-* @website https://el-admin.vip
-* @author xwx
-* @date 2021-04-22
-**/
-public interface DmInformationRepository extends JpaRepository<DmInformation, Long>, JpaSpecificationExecutor<DmInformation> {
-
-    @Modifying
-    @Query(value = "update dm_information set task_id =:#{#resources.taskId} ,proc_inst_id =:#{#resources.procInstId} where id =:#{#resources.id} ",nativeQuery = true )
-    void updateTask(@Param(value = "resources") DmInformation resources);
-
-    @Query(value = "select GROUP_CONCAT(DISTINCT(approval_user)) as userIds from dm_information_approval where is_new = '1' and info_id = ?1 ",nativeQuery = true )
-    Map<String,Object> selectInfoApproveUserNames(Long id);
-
-    @Modifying
-    @Query(value = "update dm_information set status = '00' ,approval_user = null,approval_remark=null where id = ?1 ",nativeQuery = true )
-    void reset(Long id);
-
-    @Query(value = "select status from dm_information where id = ?1",nativeQuery = true)
-    String findSubmitBeforeStatus(Long id);
-
-    @Query(value = "select a.*  from  dm_information a left join dm_information_approval b on a.id= b.info_id where b.is_new = 1 and  b.approval_user = ?1 and a.status = '00' group by a.id",
-            countQuery = "select count(*) from (select a.* from dm_information a left join dm_information_approval b on a.id= b.info_id where b.is_new = 1 and  b.approval_user = ?1 and a.status = '00' group by a.id)",
-            nativeQuery = true)
-    Page<DmInformation> findAllDSP(String approval_user, Pageable pageable);
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/information/rest/DmInformationController.java

@@ -1,123 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.information.rest;
-
-import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.dm.information.domain.DmInformation;
-import me.zhengjie.modules.dm.information.service.DmInformationService;
-import me.zhengjie.modules.dm.information.service.dto.DmInformationQueryCriteria;
-import org.springframework.data.domain.Pageable;
-import lombok.RequiredArgsConstructor;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import io.swagger.annotations.*;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
-/**
-* @website https://el-admin.vip
-* @author xwx
-* @date 2021-04-22
-**/
-@RestController
-@RequiredArgsConstructor
-@Api(tags = "dmInformation管理")
-@RequestMapping("/api/dmInformation")
-public class DmInformationController {
-
-    private final DmInformationService dmInformationService;
-
-    @Log("导出数据")
-    @ApiOperation("导出数据")
-    @GetMapping(value = "/download")
-    @PreAuthorize("@el.check('dmInformation:list')")
-    public void download(HttpServletResponse response, DmInformationQueryCriteria criteria) throws IOException {
-        dmInformationService.download(dmInformationService.queryAll(criteria), response);
-    }
-
-    @GetMapping
-    @Log("查询dmInformation")
-    @ApiOperation("查询dmInformation")
-    @PreAuthorize("@el.check('dmInformation:list')")
-    public ResponseEntity<Object> query(DmInformationQueryCriteria criteria, Pageable pageable){
-        return new ResponseEntity<>(dmInformationService.queryAll(criteria,pageable),HttpStatus.OK);
-    }
-
-    @GetMapping(value = "approvalList")
-    @Log("查询dmInformation")
-    @ApiOperation("查询dmInformation")
-    @PreAuthorize("@el.check('dmInformation:list')")
-    public ResponseEntity<Object> approvalList(DmInformationQueryCriteria criteria, Pageable pageable){
-        return new ResponseEntity<>(dmInformationService.findAllDSP(pageable),HttpStatus.OK);
-    }
-
-    @PostMapping
-    @Log("新增dmInformation")
-    @ApiOperation("新增dmInformation")
-    @PreAuthorize("@el.check('dmInformation:add')")
-    public ResponseEntity<Object> create(@Validated @RequestBody DmInformation resources){
-        return new ResponseEntity<>(dmInformationService.create(resources),HttpStatus.CREATED);
-    }
-
-    @PostMapping(value = "/addApprovalUser")
-    @Log("新增审批人")
-    @ApiOperation("新增审批人")
-    @PreAuthorize("@el.check('dmInformation:edit')")
-    public ResponseEntity<Object> addApprovalUser(@Validated @RequestBody DmInformation resources){
-        dmInformationService.addApprovalUser(resources);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @Log("删除dmInformation")
-    @ApiOperation("删除dmInformation")
-    @PreAuthorize("@el.check('dmInformation:del')")
-    @DeleteMapping
-    public ResponseEntity<Object> delete(@RequestBody Long[] ids) {
-        dmInformationService.deleteAll(ids);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-
-    @PutMapping
-    @Log("修改dmInformation")
-    @ApiOperation("修改dmInformation")
-    @PreAuthorize("@el.check('dmInformation:edit')")
-    public ResponseEntity<Object> update(@Validated @RequestBody DmInformation resources){
-        dmInformationService.update(resources);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @PostMapping(value = "/approval")
-    @Log("审批")
-    @ApiOperation("审批")
-    public ResponseEntity<Object> Approval(@RequestBody DmInformation resources){
-        dmInformationService.approval(resources);
-        return new ResponseEntity<>("审批完成",HttpStatus.OK);
-
-
-    }
-
-    @Log("撤回dmInformation")
-    @ApiOperation("撤回dmInformation")
-    @PreAuthorize("@el.check('dmInformation:edit')")
-    @PostMapping(value = "ch")
-    public ResponseEntity<Object> ch(@RequestBody Long ids) {
-        dmInformationService.ch(ids);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/information/service/DmInformationService.java

@@ -1,113 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.information.service;
-
-import me.zhengjie.modules.dm.information.domain.DmInformation;
-import me.zhengjie.modules.dm.information.service.dto.DmInformationDto;
-import me.zhengjie.modules.dm.information.service.dto.DmInformationQueryCriteria;
-import org.springframework.data.domain.Pageable;
-import java.util.Map;
-import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
-/**
-* @website https://el-admin.vip
-* @description 服务接口
-* @author xwx
-* @date 2021-04-22
-**/
-public interface DmInformationService {
-
-    /**
-    * 查询数据分页
-    * @param criteria 条件
-    * @param pageable 分页参数
-    * @return Map<String,Object>
-    */
-    Map<String,Object> queryAll(DmInformationQueryCriteria criteria, Pageable pageable);
-
-    /**
-    * 查询所有数据不分页
-    * @param criteria 条件参数
-    * @return List<DmInformationDto>
-    */
-    List<DmInformationDto> queryAll(DmInformationQueryCriteria criteria);
-
-    /**
-     * 根据ID查询
-     * @param id ID
-     * @return DmInformationDto
-     */
-    DmInformationDto findById(Long id);
-
-    /**
-    * 创建
-    * @param resources /
-    * @return DmInformationDto
-    */
-    DmInformationDto create(DmInformation resources);
-
-    /**
-    * 编辑
-    * @param resources /
-    */
-    void update(DmInformation resources,String ... statusList);
-
-    /**
-    * 多选删除
-    * @param ids /
-    */
-    void deleteAll(Long[] ids);
-
-    /**
-    * 导出数据
-    * @param all 待导出的数据
-    * @param response /
-    * @throws IOException /
-    */
-    void download(List<DmInformationDto> all, HttpServletResponse response) throws IOException;
-
-     DmInformation toEntity(DmInformationDto dto);
-
-    void updateTask(DmInformation resources);
-
-    /**
-     * todo 添加审批人
-     * @param resources
-     */
-    void addApprovalUser(DmInformation resources);
-
-    /**
-     * todo 审批
-     * @param resources
-     */
-    void approval(DmInformation resources);
-
-    /**
-     * todo 撤回
-     * @param id
-     */
-    void ch(Long id);
-
-    /**
-     * 查询数据分页
-     * @param pageable 分页参数
-     * @return Map<String,Object>
-     */
-    Map<String,Object> findAllDSP(Pageable pageable);
-
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/information/service/dto/DmInformationDto.java

@@ -1,81 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.information.service.dto;
-
-import lombok.Data;
-import java.sql.Timestamp;
-import java.io.Serializable;
-import com.alibaba.fastjson.annotation.JSONField;
-import com.alibaba.fastjson.serializer.ToStringSerializer;
-import me.zhengjie.modules.dm.user.domain.DmUser;
-import me.zhengjie.modules.dm.user.service.dto.DmUserDto;
-
-/**
-* @website https://el-admin.vip
-* @description /
-* @author xwx
-* @date 2021-04-22
-**/
-@Data
-public class DmInformationDto implements Serializable {
-
-    /** 主键 */
-    /** 防止精度丢失 */
-    @JSONField(serializeUsing = ToStringSerializer.class)
-    private Long id;
-
-    /** 发布内容(需发布的信息内容) */
-    private String content;
-
-    /** (00-待审核  01-审批通过(已发布） 02-审核未通过) */
-    private String status;
-
-    /** 审批备注 */
-    private String approvalRemark;
-
-    /** 审批人 */
-    private DmUserDto approvalUser;
-
-    /** 是否添加审批人 */
-    private Boolean isHasApproval ;
-
-    /** 任务ID act_ru_task */
-    private String taskId;
-
-    /** 任务实例id act_ru_execution */
-    private String procInstId;
-
-    /** 发起人 */
-    private DmUserDto requestUser;
-
-    /** 创建者 */
-    private String createBy;
-
-    /** 更新者 */
-    private String updateBy;
-
-    /** 创建日期 */
-    private Timestamp createTime;
-
-    /** 更新时间 */
-    private Timestamp updateTime;
-
-    /** 发布时间 */
-    private Timestamp releaseTime;
-
-    /** 审批时间 */
-    private Timestamp approvalTime;
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/information/service/dto/DmInformationQueryCriteria.java

@@ -1,41 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.information.service.dto;
-
-import lombok.Data;
-import java.sql.Timestamp;
-import java.util.List;
-import me.zhengjie.annotation.Query;
-
-/**
-* @website https://el-admin.vip
-* @author xwx
-* @date 2021-04-22
-**/
-@Data
-public class DmInformationQueryCriteria{
-
-    /** 模糊 */
-    @Query(type = Query.Type.INNER_LIKE)
-    private String content;
-
-    /** 精确 */
-    @Query
-    private String status;
-    /** BETWEEN */
-    @Query(type = Query.Type.BETWEEN)
-    private List<Timestamp> releaseTime;
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/information/service/impl/DmInformationServiceImpl.java

@@ -1,287 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.information.service.impl;
-
-import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.modules.dm.activiti.event.ActivitiEvent;
-import me.zhengjie.modules.dm.activiti.status.OperationStatus;
-import me.zhengjie.modules.dm.information.domain.DmInformation;
-import me.zhengjie.modules.dm.informationApproval.domain.DmInformationApproval;
-import me.zhengjie.modules.dm.informationApproval.service.DmInformationApprovalService;
-import me.zhengjie.modules.dm.user.domain.DmUser;
-import me.zhengjie.modules.dm.user.service.mapstruct.DmUserMapper;
-import me.zhengjie.modules.dm.user.util.DmUserUtils;
-import me.zhengjie.modules.system.service.UserService;
-import me.zhengjie.modules.system.service.dto.UserDto;
-import me.zhengjie.utils.*;
-import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.dm.information.repository.DmInformationRepository;
-import me.zhengjie.modules.dm.information.service.DmInformationService;
-import me.zhengjie.modules.dm.information.service.dto.DmInformationDto;
-import me.zhengjie.modules.dm.information.service.dto.DmInformationQueryCriteria;
-import me.zhengjie.modules.dm.information.service.mapstruct.DmInformationMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import cn.hutool.core.lang.Snowflake;
-import cn.hutool.core.util.IdUtil;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-
-import java.awt.*;
-import java.sql.Timestamp;
-import java.util.*;
-import java.io.IOException;
-import java.util.List;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-
-/**
-* @website https://el-admin.vip
-* @description 服务实现
-* @author xwx
-* @date 2021-04-22
-**/
-@Service
-@RequiredArgsConstructor
-public class DmInformationServiceImpl implements DmInformationService {
-
-    private final DmInformationRepository dmInformationRepository;
-    private final DmInformationMapper dmInformationMapper;
-    @Autowired
-    private DmInformationApprovalService approvalService;
-    @Resource
-    private ApplicationContext applicationContext;
-
-    /** 用户信息 */
-    @Autowired
-    private UserService userService;
-    @Autowired
-    private final DmUserMapper dmUserMapper;
-
-    @Override
-    public Map<String,Object> queryAll(DmInformationQueryCriteria criteria, Pageable pageable){
-        Page<DmInformation> page = dmInformationRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable);
-        return PageUtil.toPage(page.map(dmInformationMapper::toDto));
-    }
-
-    @Override
-    public List<DmInformationDto> queryAll(DmInformationQueryCriteria criteria){
-        return dmInformationMapper.toDto(dmInformationRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder)));
-    }
-
-    @Override
-    @Transactional
-    public DmInformationDto findById(Long id) {
-        DmInformation dmInformation = dmInformationRepository.findById(id).orElseGet(DmInformation::new);
-        ValidationUtil.isNull(dmInformation.getId(),"DmInformation","id",id);
-        return dmInformationMapper.toDto(dmInformation);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public DmInformationDto create(DmInformation resources) {
-        Snowflake snowflake = IdUtil.createSnowflake(1, 1);
-        resources.setId(snowflake.nextId());
-        resources.setRequestUser(dmUserMapper.toEntity(DmUserUtils.getCurrDmUser()));
-        resources.setStatus("00");
-        resources.setIsHasApproval(false);
-        DmInformationDto dto = dmInformationMapper.toDto(dmInformationRepository.save(resources));
-        dto.setRequestUser(DmUserUtils.getCurrDmUser());
-        ActivitiEvent event = new ActivitiEvent(this,resources,OperationStatus.SUBMIT);
-        applicationContext.publishEvent(event);
-        return dto;
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void update(DmInformation resources,String ... statusList) {
-        DmInformation dmInformation = dmInformationRepository.findById(resources.getId()).orElseGet(DmInformation::new);
-        ValidationUtil.isNull( dmInformation.getId(),"DmInformation","id",resources.getId());
-        dmInformation.copy(resources);
-         String status = statusList.length>0?statusList[0]:dmInformation.getStatus();
-         //判断是否驳回后修改
-         Boolean isApprovalUpdate = "02".equals(status);
-        //触发审批流程
-        if(isApprovalUpdate){
-            //初始化所有信息
-            reset(dmInformation.getId());
-            ActivitiEvent event = new ActivitiEvent(this,resources,OperationStatus.SUBMIT_APPROVAL_USER);
-            applicationContext.publishEvent(event);
-        }
-        if("02".equals(status) || "03".equals(status)){
-            dmInformation.setStatus("00");//将状态改为待审批
-            dmInformationRepository.save(dmInformation);
-        }
-
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void addApprovalUser(DmInformation resources){
-        DmInformation dmInformation = dmInformationRepository.findById(resources.getId()).orElseGet(DmInformation::new);
-        ValidationUtil.isNull( dmInformation.getId(),"DmInformation","id",resources.getId());
-
-        dmInformation.setIsHasApproval(true);
-        List<DmUser> appUsers = resources.getApprovalUserList();
-
-        if(appUsers !=null && appUsers.size()>0){
-            for(DmUser dmUser : appUsers){
-                DmInformationApproval approval = new DmInformationApproval();
-                approval.setInformation(resources);
-                approval.setApprovalUser(dmUser);
-                approval.setStatus("00");
-                approval.setIsNew(true);
-                approvalService.create(approval);
-            }
-        }
-        dmInformationRepository.save(dmInformation);
-
-        //触发审批流程
-        ActivitiEvent event = new ActivitiEvent(this,dmInformation,OperationStatus.SUBMIT_APPROVAL_USER);
-        applicationContext.publishEvent(event);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void approval(DmInformation resources) {
-        DmInformation information = dmInformationRepository.findById(resources.getId()).orElseGet(DmInformation::new);
-        ValidationUtil.isNull( information.getId(),"DmInformation","id",resources.getId());
-        information.copy(resources);
-
-        //判断用户是否具备审批权限
-        //1、判断是否具有审批用户
-        UserDto user= userService.findById(SecurityUtils.getCurrentUserId());
-        Boolean isApproval =true;
-        List<DmInformationApproval> approvalList = approvalService.findInfoByReqAndUser(information.getId(),user.getDmUser().getId()+"");
-        DmInformationApproval approval = approvalList==null || approvalList.size()<=0 || approvalList.get(0).getId() == null?null:approvalList.get(0);
-        isApproval=!(approval==null);
-        if(!isApproval){
-            throw new BadRequestException("无审批权限");
-        }
-        String status = information.getStatus();
-        if(!"01".equals(status) && !"02".equals(status)){
-            throw new BadRequestException("审批状态错误");
-        }
-
-        DmInformation information1 = approval.getInformation();
-        System.out.println("information1.getStatus() ==> "+information1.getStatus());
-        if(information1 == null || information1.getId() == null ||  !"00".equals(approval.getStatus())){
-            throw new BadRequestException("当前状态不可审批");
-        }
-        DmUser dmUser = dmUserMapper.toEntity(user.getDmUser());
-        String inistatus = approval.getStatus();
-
-        //修改信息
-        information.setApprovalUser(dmUser);
-        information.setApprovalTime(new Timestamp(System.currentTimeMillis()));
-        this.update(information,inistatus);
-        //保存审批信息
-        approval.setApprovalUser(dmUser);
-        approval.setStatus(information.getStatus());
-        approval.setApprovalRemark(information.getApprovalRemark());
-        approvalService.update(approval);
-
-        //触发审批流程
-        information.setTaskId(approval.getTaskId());
-        ActivitiEvent event = new ActivitiEvent(this,information,OperationStatus.APPROVE);
-        applicationContext.publishEvent(event);
-    }
-
-
-    @Override
-    public void deleteAll(Long[] ids) {
-        for (Long id : ids) {
-            dmInformationRepository.deleteById(id);
-        }
-    }
-
-    @Override
-    public void download(List<DmInformationDto> all, HttpServletResponse response) throws IOException {
-        List<Map<String, Object>> list = new ArrayList<>();
-        for (DmInformationDto dmInformation : all) {
-            Map<String,Object> map = new LinkedHashMap<>();
-            map.put("发布内容(需发布的信息内容)", dmInformation.getContent());
-            map.put("(00-待审核  01-审批通过(已发布） 02-审核未通过)", dmInformation.getStatus());
-            map.put("审批人", dmInformation.getApprovalUser());
-            map.put("任务ID act_ru_task", dmInformation.getTaskId());
-            map.put("任务实例id act_ru_execution", dmInformation.getProcInstId());
-            map.put("发起人", dmInformation.getRequestUser());
-            map.put("创建者", dmInformation.getCreateBy());
-            map.put("更新者", dmInformation.getUpdateBy());
-            map.put("创建日期", dmInformation.getCreateTime());
-            map.put("更新时间", dmInformation.getUpdateTime());
-            map.put("发布时间", dmInformation.getReleaseTime());
-            map.put("审批时间", dmInformation.getApprovalTime());
-            list.add(map);
-        }
-        FileUtil.downloadExcel(list, response);
-    }
-
-    @Override
-    public void ch(Long id){
-        DmInformation information = dmInformationRepository.findById(id).orElseGet(DmInformation::new);
-        ValidationUtil.isNull( information.getId(),"DmInformation","id",id);
-        if("00".equals(information.getStatus())){
-            information.setStatus("03");
-            this.update(information,"00");
-        }else {
-            throw new BadRequestException("当前状态不可撤回");
-        }
-    }
-
-    @Override
-    public Map<String, Object> findAllDSP(Pageable pageable) {
-        Page<DmInformation> page = dmInformationRepository.findAllDSP(DmUserUtils.getCurrDmUser().getId()+"",pageable);
-        return PageUtil.toPage(page.map(dmInformationMapper::toDto));
-    }
-
-    @Override
-    public DmInformation toEntity(DmInformationDto dto) {
-        if ( dto == null ) {
-            return null;
-        }
-
-        DmInformation dmInformation = new DmInformation();
-
-        dmInformation.setCreateBy( dto.getCreateBy() );
-        dmInformation.setCreateTime( dto.getCreateTime() );
-        dmInformation.setUpdateTime( dto.getUpdateTime() );
-        dmInformation.setId( dto.getId() );
-        dmInformation.setContent( dto.getContent() );
-        dmInformation.setStatus( dto.getStatus() );
-        dmInformation.setTaskId( dto.getTaskId() );
-        dmInformation.setProcInstId( dto.getProcInstId() );
-        dmInformation.setReleaseTime( dto.getReleaseTime() );
-        dmInformation.setApprovalTime( dto.getApprovalTime() );
-
-        return dmInformation;
-    }
-
-    @Override
-    public void updateTask(DmInformation resources) {
-        dmInformationRepository.updateTask(resources);
-    }
-
-
-    public void reset (Long id){
-        //修改审批状态为待审批
-        approvalService.reset(id);
-        //修改申请为待审批状态
-        dmInformationRepository.reset(id);
-    }
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/information/service/mapstruct/DmInformationMapper.java

@@ -1,32 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.information.service.mapstruct;
-
-import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.dm.information.domain.DmInformation;
-import me.zhengjie.modules.dm.information.service.dto.DmInformationDto;
-import org.mapstruct.Mapper;
-import org.mapstruct.ReportingPolicy;
-
-/**
-* @website https://el-admin.vip
-* @author xwx
-* @date 2021-04-22
-**/
-@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE)
-public interface DmInformationMapper extends BaseMapper<DmInformationDto, DmInformation> {
-
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/informationApproval/domain/DmInformationApproval.java

@@ -1,83 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.informationApproval.domain;
-
-import lombok.Data;
-import cn.hutool.core.bean.BeanUtil;
-import io.swagger.annotations.ApiModelProperty;
-import cn.hutool.core.bean.copier.CopyOptions;
-import javax.persistence.*;
-import javax.validation.constraints.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
-import me.zhengjie.base.BaseEntity;
-import me.zhengjie.modules.dm.information.domain.DmInformation;
-import me.zhengjie.modules.dm.user.domain.DmUser;
-import org.hibernate.annotations.*;
-import java.sql.Timestamp;
-import java.io.Serializable;
-
-/**
-* @website https://el-admin.vip
-* @description /
-* @author xwx
-* @date 2021-04-23
-**/
-@Entity
-@Data
-@Table(name="dm_information_approval")
-public class DmInformationApproval  extends BaseEntity implements Serializable {
-
-    @Id
-    @Column(name = "id")
-    @ApiModelProperty(value = "主键")
-    private Long id;
-
-    @ApiModelProperty(value = "信息")
-    @OneToOne
-    @JoinColumn(name = "info_id")
-    private DmInformation information;
-
-    @ApiModelProperty(value = "审批人")
-    @OneToOne
-    @JoinColumn(name = "approval_user")
-    private DmUser approvalUser;
-
-    @Column(name = "status")
-    @ApiModelProperty(value = "(00-待审核  01-审批通过(已发布） 02-审核未通过)")
-    private String status;
-
-    @Column(name = "approval_remark")
-    @ApiModelProperty(value = "审批备注")
-    private String approvalRemark;
-
-    @Column(name = "is_new")
-    @ApiModelProperty(value = "是否为最新审批")
-    private Boolean isNew;
-
-    @Column(name = "task_id")
-    @ApiModelProperty(value = "任务ID act_ru_task")
-    private String taskId;
-
-    @Column(name = "proc_inst_id")
-    @ApiModelProperty(value = "任务实例id act_ru_execution")
-    private String procInstId;
-
-    public void copy(DmInformationApproval source){
-        BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
-    }
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/informationApproval/repository/DmInformationApprovalRepository.java

@@ -1,60 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.informationApproval.repository;
-
-import me.zhengjie.modules.dm.informationApproval.domain.DmInformationApproval;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-
-import java.util.List;
-
-/**
-* @website https://el-admin.vip
-* @author xwx
-* @date 2021-04-23
-**/
-public interface DmInformationApprovalRepository extends JpaRepository<DmInformationApproval, Long>, JpaSpecificationExecutor<DmInformationApproval> {
-
-    /**
-     * todo 修改审批人
-     */
-    @Modifying
-    @Query(value = "update dm_information_approval set approval_user = ?1 where request_id = ?2",nativeQuery = true)
-    void editApprovalUser(String approvalUser,Long requestId);
-
-    /**
-     * todo 重置
-     * @param infoId
-     */
-    @Modifying
-    @Query(value = "update dm_information_approval set status = '00',approval_remark = ''  where is_new = '1' and  info_id = ?1",nativeQuery = true)
-    void reset(Long infoId);
-
-    /**
-     * todo 刷新任务信息
-     */
-    @Modifying
-    @Query(value = "update dm_information_approval set task_id = ?3 , proc_inst_id=?4  where is_new = '1' and  info_id = ?1 and approval_user = ?2 ",nativeQuery = true)
-    void resetTask(Long infoId,String approvalUser,String taskId,String procInstId);
-
-    @Query(value="select * from dm_information_approval where info_id = ?1 and  approval_user = ?2 and is_new = '1' ",nativeQuery = true)
-    List<DmInformationApproval> findInfoByReqAndUser(Long infoId, String approvalUser);
-
-
-
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/informationApproval/rest/DmInformationApprovalController.java

@@ -1,87 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.informationApproval.rest;
-
-import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.dm.informationApproval.domain.DmInformationApproval;
-import me.zhengjie.modules.dm.informationApproval.service.DmInformationApprovalService;
-import me.zhengjie.modules.dm.informationApproval.service.dto.DmInformationApprovalQueryCriteria;
-import org.springframework.data.domain.Pageable;
-import lombok.RequiredArgsConstructor;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import io.swagger.annotations.*;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
-/**
-* @website https://el-admin.vip
-* @author xwx
-* @date 2021-04-23
-**/
-@RestController
-@RequiredArgsConstructor
-@Api(tags = "dmInformationApproval管理")
-@RequestMapping("/api/dmInformationApproval")
-public class DmInformationApprovalController {
-
-    private final DmInformationApprovalService dmInformationApprovalService;
-
-    @Log("导出数据")
-    @ApiOperation("导出数据")
-    @GetMapping(value = "/download")
-    @PreAuthorize("@el.check('dmInformationApproval:list')")
-    public void download(HttpServletResponse response, DmInformationApprovalQueryCriteria criteria) throws IOException {
-        dmInformationApprovalService.download(dmInformationApprovalService.queryAll(criteria), response);
-    }
-
-    @GetMapping
-    @Log("查询dmInformationApproval")
-    @ApiOperation("查询dmInformationApproval")
-    @PreAuthorize("@el.check('dmInformationApproval:list')")
-    public ResponseEntity<Object> query(DmInformationApprovalQueryCriteria criteria, Pageable pageable){
-        return new ResponseEntity<>(dmInformationApprovalService.queryAll(criteria,pageable),HttpStatus.OK);
-    }
-
-    @PostMapping
-    @Log("新增dmInformationApproval")
-    @ApiOperation("新增dmInformationApproval")
-    @PreAuthorize("@el.check('dmInformationApproval:add')")
-    public ResponseEntity<Object> create(@Validated @RequestBody DmInformationApproval resources){
-        return new ResponseEntity<>(dmInformationApprovalService.create(resources),HttpStatus.CREATED);
-    }
-
-    @PutMapping
-    @Log("修改dmInformationApproval")
-    @ApiOperation("修改dmInformationApproval")
-    @PreAuthorize("@el.check('dmInformationApproval:edit')")
-    public ResponseEntity<Object> update(@Validated @RequestBody DmInformationApproval resources){
-        dmInformationApprovalService.update(resources);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @Log("删除dmInformationApproval")
-    @ApiOperation("删除dmInformationApproval")
-    @PreAuthorize("@el.check('dmInformationApproval:del')")
-    @DeleteMapping
-    public ResponseEntity<Object> delete(@RequestBody Long[] ids) {
-        dmInformationApprovalService.deleteAll(ids);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/informationApproval/service/DmInformationApprovalService.java

@@ -1,100 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.informationApproval.service;
-
-import me.zhengjie.modules.dm.informationApproval.domain.DmInformationApproval;
-import me.zhengjie.modules.dm.informationApproval.service.dto.DmInformationApprovalDto;
-import me.zhengjie.modules.dm.informationApproval.service.dto.DmInformationApprovalQueryCriteria;
-import org.springframework.data.domain.Pageable;
-import java.util.Map;
-import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
-/**
-* @website https://el-admin.vip
-* @description 服务接口
-* @author xwx
-* @date 2021-04-23
-**/
-public interface DmInformationApprovalService {
-
-    /**
-    * 查询数据分页
-    * @param criteria 条件
-    * @param pageable 分页参数
-    * @return Map<String,Object>
-    */
-    Map<String,Object> queryAll(DmInformationApprovalQueryCriteria criteria, Pageable pageable);
-
-    /**
-    * 查询所有数据不分页
-    * @param criteria 条件参数
-    * @return List<DmInformationApprovalDto>
-    */
-    List<DmInformationApprovalDto> queryAll(DmInformationApprovalQueryCriteria criteria);
-
-    /**
-     * 根据ID查询
-     * @param id ID
-     * @return DmInformationApprovalDto
-     */
-    DmInformationApprovalDto findById(Long id);
-
-    /**
-    * 创建
-    * @param resources /
-    * @return DmInformationApprovalDto
-    */
-    DmInformationApprovalDto create(DmInformationApproval resources);
-
-    /**
-    * 编辑
-    * @param resources /
-    */
-    void update(DmInformationApproval resources);
-
-    /**
-    * 多选删除
-    * @param ids /
-    */
-    void deleteAll(Long[] ids);
-
-    /**
-    * 导出数据
-    * @param all 待导出的数据
-    * @param response /
-    * @throws IOException /
-    */
-    void download(List<DmInformationApprovalDto> all, HttpServletResponse response) throws IOException;
-
-    /**
-     * todo 刷新任务信息
-     * @param infoId
-     */
-    void reset (Long infoId);
-
-    /**
-     * todo 刷新任务信息
-     * @param infoId
-     * @param approvalUser
-     * @param taskId
-     * @param procInstId
-     */
-    void resetTask (Long infoId,String approvalUser,String taskId,String procInstId);
-
-    List<DmInformationApproval> findInfoByReqAndUser(Long infoId,String approvalUser);
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/informationApproval/service/dto/DmInformationApprovalDto.java

@@ -1,72 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.informationApproval.service.dto;
-
-import lombok.Data;
-import java.sql.Timestamp;
-import java.io.Serializable;
-import com.alibaba.fastjson.annotation.JSONField;
-import com.alibaba.fastjson.serializer.ToStringSerializer;
-import me.zhengjie.modules.dm.information.domain.DmInformation;
-import me.zhengjie.modules.dm.user.domain.DmUser;
-
-/**
-* @website https://el-admin.vip
-* @description /
-* @author xwx
-* @date 2021-04-23
-**/
-@Data
-public class DmInformationApprovalDto implements Serializable {
-
-    /** 主键 */
-    /** 防止精度丢失 */
-    @JSONField(serializeUsing = ToStringSerializer.class)
-    private Long id;
-
-    /** 信息主键 */
-   private DmInformation information;
-
-    /** 审批人 */
-    private DmUser approvalUser;
-
-    /** (00-待审核  01-审批通过(已发布） 02-审核未通过) */
-    private String status;
-
-    /** 审批备注 */
-    private String approvalRemark;
-
-    /** 是否为最新审批 */
-    private Boolean isNew;
-
-    /** 任务ID act_ru_task */
-    private String taskId;
-
-    /** 任务实例id act_ru_execution */
-    private String procInstId;
-
-    /** 创建者 */
-    private String createBy;
-
-    /** 更新者 */
-    private String updateBy;
-
-    /** 创建日期 */
-    private Timestamp createTime;
-
-    /** 更新时间 */
-    private Timestamp updateTime;
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/informationApproval/service/dto/DmInformationApprovalQueryCriteria.java

@@ -1,49 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.informationApproval.service.dto;
-
-import lombok.Data;
-import java.util.List;
-import me.zhengjie.annotation.Query;
-
-/**
-* @website https://el-admin.vip
-* @author xwx
-* @date 2021-04-23
-**/
-@Data
-public class DmInformationApprovalQueryCriteria{
-
-    /** 精确 */
-    @Query
-    private Long infoId;
-
-    /** 精确 */
-    @Query
-    private String approvalUser;
-
-    /** 精确 */
-    @Query
-    private String status;
-
-    /** 模糊 */
-    @Query(type = Query.Type.INNER_LIKE)
-    private String approvalRemark;
-
-    /** 精确 */
-    @Query
-    private String isNew;
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/informationApproval/service/impl/DmInformationApprovalServiceImpl.java

@@ -1,135 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.informationApproval.service.impl;
-
-import me.zhengjie.modules.dm.informationApproval.domain.DmInformationApproval;
-import me.zhengjie.utils.ValidationUtil;
-import me.zhengjie.utils.FileUtil;
-import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.dm.informationApproval.repository.DmInformationApprovalRepository;
-import me.zhengjie.modules.dm.informationApproval.service.DmInformationApprovalService;
-import me.zhengjie.modules.dm.informationApproval.service.dto.DmInformationApprovalDto;
-import me.zhengjie.modules.dm.informationApproval.service.dto.DmInformationApprovalQueryCriteria;
-import me.zhengjie.modules.dm.informationApproval.service.mapstruct.DmInformationApprovalMapper;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import cn.hutool.core.lang.Snowflake;
-import cn.hutool.core.util.IdUtil;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import me.zhengjie.utils.PageUtil;
-import me.zhengjie.utils.QueryHelp;
-import java.util.List;
-import java.util.Map;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-
-/**
-* @website https://el-admin.vip
-* @description 服务实现
-* @author xwx
-* @date 2021-04-23
-**/
-@Service
-@RequiredArgsConstructor
-public class DmInformationApprovalServiceImpl implements DmInformationApprovalService {
-
-    private final DmInformationApprovalRepository dmInformationApprovalRepository;
-    private final DmInformationApprovalMapper dmInformationApprovalMapper;
-
-    @Override
-    public Map<String,Object> queryAll(DmInformationApprovalQueryCriteria criteria, Pageable pageable){
-        Page<DmInformationApproval> page = dmInformationApprovalRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable);
-        return PageUtil.toPage(page.map(dmInformationApprovalMapper::toDto));
-    }
-
-    @Override
-    public List<DmInformationApprovalDto> queryAll(DmInformationApprovalQueryCriteria criteria){
-        return dmInformationApprovalMapper.toDto(dmInformationApprovalRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder)));
-    }
-
-    @Override
-    @Transactional
-    public DmInformationApprovalDto findById(Long id) {
-        DmInformationApproval dmInformationApproval = dmInformationApprovalRepository.findById(id).orElseGet(DmInformationApproval::new);
-        ValidationUtil.isNull(dmInformationApproval.getId(),"DmInformationApproval","id",id);
-        return dmInformationApprovalMapper.toDto(dmInformationApproval);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public DmInformationApprovalDto create(DmInformationApproval resources) {
-        Snowflake snowflake = IdUtil.createSnowflake(1, 1);
-        resources.setId(snowflake.nextId()); 
-        return dmInformationApprovalMapper.toDto(dmInformationApprovalRepository.save(resources));
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void update(DmInformationApproval resources) {
-        DmInformationApproval dmInformationApproval = dmInformationApprovalRepository.findById(resources.getId()).orElseGet(DmInformationApproval::new);
-        ValidationUtil.isNull( dmInformationApproval.getId(),"DmInformationApproval","id",resources.getId());
-        dmInformationApproval.copy(resources);
-        dmInformationApprovalRepository.save(dmInformationApproval);
-    }
-
-    @Override
-    public void deleteAll(Long[] ids) {
-        for (Long id : ids) {
-            dmInformationApprovalRepository.deleteById(id);
-        }
-    }
-
-    @Override
-    public void download(List<DmInformationApprovalDto> all, HttpServletResponse response) throws IOException {
-        List<Map<String, Object>> list = new ArrayList<>();
-        for (DmInformationApprovalDto dmInformationApproval : all) {
-            Map<String,Object> map = new LinkedHashMap<>();
-            map.put("信息主键", dmInformationApproval.getInformation().getId());
-            map.put("审批人", dmInformationApproval.getApprovalUser());
-            map.put("(00-待审核  01-审批通过(已发布） 02-审核未通过)", dmInformationApproval.getStatus());
-            map.put("审批备注", dmInformationApproval.getApprovalRemark());
-            map.put("是否为最新审批", dmInformationApproval.getIsNew());
-            map.put("任务ID act_ru_task", dmInformationApproval.getTaskId());
-            map.put("任务实例id act_ru_execution", dmInformationApproval.getProcInstId());
-            map.put("创建者", dmInformationApproval.getCreateBy());
-            map.put("更新者", dmInformationApproval.getUpdateBy());
-            map.put("创建日期", dmInformationApproval.getCreateTime());
-            map.put("更新时间", dmInformationApproval.getUpdateTime());
-            list.add(map);
-        }
-        FileUtil.downloadExcel(list, response);
-    }
-
-    @Override
-    public void reset(Long infoId) {
-        dmInformationApprovalRepository.reset(infoId);
-    }
-
-    @Override
-    public void resetTask(Long infoId, String approvalUser, String taskId, String procInstId) {
-        dmInformationApprovalRepository.resetTask(infoId,approvalUser,taskId,procInstId);
-    }
-
-    @Override
-    public List<DmInformationApproval> findInfoByReqAndUser(Long infoId, String approvalUser) {
-        return dmInformationApprovalRepository.findInfoByReqAndUser(infoId,approvalUser);
-    }
-
-
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/informationApproval/service/mapstruct/DmInformationApprovalMapper.java

@@ -1,32 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.informationApproval.service.mapstruct;
-
-import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.dm.informationApproval.domain.DmInformationApproval;
-import me.zhengjie.modules.dm.informationApproval.service.dto.DmInformationApprovalDto;
-import org.mapstruct.Mapper;
-import org.mapstruct.ReportingPolicy;
-
-/**
-* @website https://el-admin.vip
-* @author xwx
-* @date 2021-04-23
-**/
-@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE)
-public interface DmInformationApprovalMapper extends BaseMapper<DmInformationApprovalDto, DmInformationApproval> {
-
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/order/domain/DmOrderItem.java

@@ -1,69 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.order.domain;
-
-import lombok.Data;
-import cn.hutool.core.bean.BeanUtil;
-import io.swagger.annotations.ApiModelProperty;
-import cn.hutool.core.bean.copier.CopyOptions;
-import javax.persistence.*;
-import javax.validation.constraints.*;
-import java.io.Serializable;
-
-/**
-* @website https://el-admin.vip
-* @description /
-* @author sunmz
-* @date 2021-09-15
-**/
-@Entity
-@Data
-@Table(name="dm_order_item")
-public class DmOrderItem implements Serializable {
-
-    @Id
-    @Column(name = "id")
-    @ApiModelProperty(value = "id")
-    private Long id;
-
-    @Column(name = "bh")
-    @ApiModelProperty(value = "编号")
-    private String bh;
-
-    @Column(name = "code")
-    @ApiModelProperty(value = "商品编号")
-    private String code;
-
-    @Column(name = "name")
-    @ApiModelProperty(value = "商品名称")
-    private String name;
-
-    @Column(name = "price")
-    @ApiModelProperty(value = "单价")
-    private String price;
-
-    @Column(name = "num")
-    @ApiModelProperty(value = "数量")
-    private Integer num;
-
-    @Column(name = "money")
-    @ApiModelProperty(value = "金额小计")
-    private String money;
-
-    public void copy(DmOrderItem source){
-        BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
-    }
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/order/domain/DmOrderRecord.java

@@ -1,78 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.order.domain;
-
-import lombok.Data;
-import cn.hutool.core.bean.BeanUtil;
-import io.swagger.annotations.ApiModelProperty;
-import cn.hutool.core.bean.copier.CopyOptions;
-import javax.persistence.*;
-import javax.validation.constraints.*;
-import java.sql.Timestamp;
-import java.io.Serializable;
-
-/**
-* @website https://el-admin.vip
-* @description /
-* @author sunmz
-* @date 2021-09-15
-**/
-@Entity
-@Data
-@Table(name="dm_order_record")
-public class DmOrderRecord implements Serializable {
-
-    @Id
-    @Column(name = "id")
-    @ApiModelProperty(value = "id")
-    private Long id;
-
-    @Column(name = "bh")
-    @ApiModelProperty(value = "订单编号")
-    private String bh;
-
-    @Column(name = "money")
-    @ApiModelProperty(value = "实付金额")
-    private String money;
-
-    @Column(name = "user_name")
-    @ApiModelProperty(value = "用户姓名")
-    private String userName;
-
-    @Column(name = "user_type")
-    @ApiModelProperty(value = "人员种类")
-    private String userType;
-
-    @Column(name = "phone")
-    @ApiModelProperty(value = "用户手机号")
-    private String phone;
-
-    @Column(name = "order_time")
-    @ApiModelProperty(value = "下单时间")
-    private Timestamp orderTime;
-
-    @Column(name = "total_money")
-    @ApiModelProperty(value = "合计金额")
-    private String totalMoney;
-
-    @Column(name = "zk_money")
-    @ApiModelProperty(value = "折扣")
-    private String zkMoney;
-
-    public void copy(DmOrderRecord source){
-        BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
-    }
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/order/repository/DmOrderItemRepository.java

@@ -1,28 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.order.repository;
-
-import me.zhengjie.modules.dm.order.domain.DmOrderItem;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-
-/**
-* @website https://el-admin.vip
-* @author sunmz
-* @date 2021-09-15
-**/
-public interface DmOrderItemRepository extends JpaRepository<DmOrderItem, Long>, JpaSpecificationExecutor<DmOrderItem> {
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/order/repository/DmOrderRecordRepository.java

@@ -1,28 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.order.repository;
-
-import me.zhengjie.modules.dm.order.domain.DmOrderRecord;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-
-/**
-* @website https://el-admin.vip
-* @author sunmz
-* @date 2021-09-15
-**/
-public interface DmOrderRecordRepository extends JpaRepository<DmOrderRecord, Long>, JpaSpecificationExecutor<DmOrderRecord> {
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/order/rest/DmOrderItemController.java

@@ -1,87 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.order.rest;
-
-import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.dm.order.domain.DmOrderItem;
-import me.zhengjie.modules.dm.order.service.DmOrderItemService;
-import me.zhengjie.modules.dm.order.service.dto.DmOrderItemQueryCriteria;
-import org.springframework.data.domain.Pageable;
-import lombok.RequiredArgsConstructor;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import io.swagger.annotations.*;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
-/**
-* @website https://el-admin.vip
-* @author sunmz
-* @date 2021-09-15
-**/
-@RestController
-@RequiredArgsConstructor
-@Api(tags = "orderItem管理")
-@RequestMapping("/api/dmOrderItem")
-public class DmOrderItemController {
-
-    private final DmOrderItemService dmOrderItemService;
-
-    @Log("导出数据")
-    @ApiOperation("导出数据")
-    @GetMapping(value = "/download")
-    @PreAuthorize("@el.check('dmOrderItem:list')")
-    public void download(HttpServletResponse response, DmOrderItemQueryCriteria criteria) throws IOException {
-        dmOrderItemService.download(dmOrderItemService.queryAll(criteria), response);
-    }
-
-    @GetMapping
-    @Log("查询orderItem")
-    @ApiOperation("查询orderItem")
-    @PreAuthorize("@el.check('dmOrderItem:list')")
-    public ResponseEntity<Object> query(DmOrderItemQueryCriteria criteria, Pageable pageable){
-        return new ResponseEntity<>(dmOrderItemService.queryAll(criteria,pageable),HttpStatus.OK);
-    }
-
-    @PostMapping
-    @Log("新增orderItem")
-    @ApiOperation("新增orderItem")
-    @PreAuthorize("@el.check('dmOrderItem:add')")
-    public ResponseEntity<Object> create(@Validated @RequestBody DmOrderItem resources){
-        return new ResponseEntity<>(dmOrderItemService.create(resources),HttpStatus.CREATED);
-    }
-
-    @PutMapping
-    @Log("修改orderItem")
-    @ApiOperation("修改orderItem")
-    @PreAuthorize("@el.check('dmOrderItem:edit')")
-    public ResponseEntity<Object> update(@Validated @RequestBody DmOrderItem resources){
-        dmOrderItemService.update(resources);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @Log("删除orderItem")
-    @ApiOperation("删除orderItem")
-    @PreAuthorize("@el.check('dmOrderItem:del')")
-    @DeleteMapping
-    public ResponseEntity<Object> delete(@RequestBody Long[] ids) {
-        dmOrderItemService.deleteAll(ids);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/order/rest/DmOrderRecordController.java

@@ -1,87 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.order.rest;
-
-import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.dm.order.domain.DmOrderRecord;
-import me.zhengjie.modules.dm.order.service.DmOrderRecordService;
-import me.zhengjie.modules.dm.order.service.dto.DmOrderRecordQueryCriteria;
-import org.springframework.data.domain.Pageable;
-import lombok.RequiredArgsConstructor;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import io.swagger.annotations.*;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
-/**
-* @website https://el-admin.vip
-* @author sunmz
-* @date 2021-09-15
-**/
-@RestController
-@RequiredArgsConstructor
-@Api(tags = "order管理")
-@RequestMapping("/api/dmOrderRecord")
-public class DmOrderRecordController {
-
-    private final DmOrderRecordService dmOrderRecordService;
-
-    @Log("导出数据")
-    @ApiOperation("导出数据")
-    @GetMapping(value = "/download")
-    @PreAuthorize("@el.check('dmOrderRecord:list')")
-    public void download(HttpServletResponse response, DmOrderRecordQueryCriteria criteria) throws IOException {
-        dmOrderRecordService.download(dmOrderRecordService.queryAll(criteria), response);
-    }
-
-    @GetMapping
-    @Log("查询order")
-    @ApiOperation("查询order")
-    @PreAuthorize("@el.check('dmOrderRecord:list')")
-    public ResponseEntity<Object> query(DmOrderRecordQueryCriteria criteria, Pageable pageable){
-        return new ResponseEntity<>(dmOrderRecordService.queryAll(criteria,pageable),HttpStatus.OK);
-    }
-
-    @PostMapping
-    @Log("新增order")
-    @ApiOperation("新增order")
-    @PreAuthorize("@el.check('dmOrderRecord:add')")
-    public ResponseEntity<Object> create(@Validated @RequestBody DmOrderRecord resources){
-        return new ResponseEntity<>(dmOrderRecordService.create(resources),HttpStatus.CREATED);
-    }
-
-    @PutMapping
-    @Log("修改order")
-    @ApiOperation("修改order")
-    @PreAuthorize("@el.check('dmOrderRecord:edit')")
-    public ResponseEntity<Object> update(@Validated @RequestBody DmOrderRecord resources){
-        dmOrderRecordService.update(resources);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @Log("删除order")
-    @ApiOperation("删除order")
-    @PreAuthorize("@el.check('dmOrderRecord:del')")
-    @DeleteMapping
-    public ResponseEntity<Object> delete(@RequestBody Long[] ids) {
-        dmOrderRecordService.deleteAll(ids);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/order/service/DmOrderItemService.java

@@ -1,83 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.order.service;
-
-import me.zhengjie.modules.dm.order.domain.DmOrderItem;
-import me.zhengjie.modules.dm.order.service.dto.DmOrderItemDto;
-import me.zhengjie.modules.dm.order.service.dto.DmOrderItemQueryCriteria;
-import org.springframework.data.domain.Pageable;
-import java.util.Map;
-import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
-/**
-* @website https://el-admin.vip
-* @description 服务接口
-* @author sunmz
-* @date 2021-09-15
-**/
-public interface DmOrderItemService {
-
-    /**
-    * 查询数据分页
-    * @param criteria 条件
-    * @param pageable 分页参数
-    * @return Map<String,Object>
-    */
-    Map<String,Object> queryAll(DmOrderItemQueryCriteria criteria, Pageable pageable);
-
-    /**
-    * 查询所有数据不分页
-    * @param criteria 条件参数
-    * @return List<DmOrderItemDto>
-    */
-    List<DmOrderItemDto> queryAll(DmOrderItemQueryCriteria criteria);
-
-    /**
-     * 根据ID查询
-     * @param id ID
-     * @return DmOrderItemDto
-     */
-    DmOrderItemDto findById(Long id);
-
-    /**
-    * 创建
-    * @param resources /
-    * @return DmOrderItemDto
-    */
-    DmOrderItemDto create(DmOrderItem resources);
-
-    /**
-    * 编辑
-    * @param resources /
-    */
-    void update(DmOrderItem resources);
-
-    /**
-    * 多选删除
-    * @param ids /
-    */
-    void deleteAll(Long[] ids);
-
-    /**
-    * 导出数据
-    * @param all 待导出的数据
-    * @param response /
-    * @throws IOException /
-    */
-    void download(List<DmOrderItemDto> all, HttpServletResponse response) throws IOException;
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/order/service/DmOrderRecordService.java

@@ -1,83 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.order.service;
-
-import me.zhengjie.modules.dm.order.domain.DmOrderRecord;
-import me.zhengjie.modules.dm.order.service.dto.DmOrderRecordDto;
-import me.zhengjie.modules.dm.order.service.dto.DmOrderRecordQueryCriteria;
-import org.springframework.data.domain.Pageable;
-import java.util.Map;
-import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
-/**
-* @website https://el-admin.vip
-* @description 服务接口
-* @author sunmz
-* @date 2021-09-15
-**/
-public interface DmOrderRecordService {
-
-    /**
-    * 查询数据分页
-    * @param criteria 条件
-    * @param pageable 分页参数
-    * @return Map<String,Object>
-    */
-    Map<String,Object> queryAll(DmOrderRecordQueryCriteria criteria, Pageable pageable);
-
-    /**
-    * 查询所有数据不分页
-    * @param criteria 条件参数
-    * @return List<DmOrderRecordDto>
-    */
-    List<DmOrderRecordDto> queryAll(DmOrderRecordQueryCriteria criteria);
-
-    /**
-     * 根据ID查询
-     * @param id ID
-     * @return DmOrderRecordDto
-     */
-    DmOrderRecordDto findById(Long id);
-
-    /**
-    * 创建
-    * @param resources /
-    * @return DmOrderRecordDto
-    */
-    DmOrderRecordDto create(DmOrderRecord resources);
-
-    /**
-    * 编辑
-    * @param resources /
-    */
-    void update(DmOrderRecord resources);
-
-    /**
-    * 多选删除
-    * @param ids /
-    */
-    void deleteAll(Long[] ids);
-
-    /**
-    * 导出数据
-    * @param all 待导出的数据
-    * @param response /
-    * @throws IOException /
-    */
-    void download(List<DmOrderRecordDto> all, HttpServletResponse response) throws IOException;
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/order/service/dto/DmOrderItemDto.java

@@ -1,53 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.order.service.dto;
-
-import lombok.Data;
-import java.io.Serializable;
-import com.alibaba.fastjson.annotation.JSONField;
-import com.alibaba.fastjson.serializer.ToStringSerializer;
-
-/**
-* @website https://el-admin.vip
-* @description /
-* @author sunmz
-* @date 2021-09-15
-**/
-@Data
-public class DmOrderItemDto implements Serializable {
-
-    /** 防止精度丢失 */
-    @JSONField(serializeUsing = ToStringSerializer.class)
-    private Long id;
-
-    /** 编号 */
-    private String bh;
-
-    /** 商品编号 */
-    private String code;
-
-    /** 商品名称 */
-    private String name;
-
-    /** 单价 */
-    private String price;
-
-    /** 数量 */
-    private Integer num;
-
-    /** 金额小计 */
-    private String money;
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/order/service/dto/DmOrderItemQueryCriteria.java

@@ -1,29 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.order.service.dto;
-
-import lombok.Data;
-import java.util.List;
-import me.zhengjie.annotation.Query;
-
-/**
-* @website https://el-admin.vip
-* @author sunmz
-* @date 2021-09-15
-**/
-@Data
-public class DmOrderItemQueryCriteria{
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/order/service/dto/DmOrderRecordDto.java

@@ -1,60 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.order.service.dto;
-
-import lombok.Data;
-import java.sql.Timestamp;
-import java.io.Serializable;
-import com.alibaba.fastjson.annotation.JSONField;
-import com.alibaba.fastjson.serializer.ToStringSerializer;
-
-/**
-* @website https://el-admin.vip
-* @description /
-* @author sunmz
-* @date 2021-09-15
-**/
-@Data
-public class DmOrderRecordDto implements Serializable {
-
-    /** 防止精度丢失 */
-    @JSONField(serializeUsing = ToStringSerializer.class)
-    private Long id;
-
-    /** 订单编号 */
-    private String bh;
-
-    /** 实付金额 */
-    private String money;
-
-    /** 用户姓名 */
-    private String userName;
-
-    /** 人员种类 */
-    private String userType;
-
-    /** 用户手机号 */
-    private String phone;
-
-    /** 下单时间 */
-    private Timestamp orderTime;
-
-    /** 合计金额 */
-    private String totalMoney;
-
-    /** 折扣 */
-    private String zkMoney;
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/order/service/dto/DmOrderRecordQueryCriteria.java

@@ -1,41 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.order.service.dto;
-
-import lombok.Data;
-import java.sql.Timestamp;
-import java.util.List;
-import me.zhengjie.annotation.Query;
-
-/**
-* @website https://el-admin.vip
-* @author sunmz
-* @date 2021-09-15
-**/
-@Data
-public class DmOrderRecordQueryCriteria{
-
-    /** 模糊 */
-    @Query(type = Query.Type.INNER_LIKE)
-    private String bh;
-
-    /** 模糊 */
-    @Query(type = Query.Type.INNER_LIKE)
-    private String userName;
-    /** BETWEEN */
-    @Query(type = Query.Type.BETWEEN)
-    private List<Timestamp> orderTime;
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/order/service/impl/DmOrderItemServiceImpl.java

@@ -1,113 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.order.service.impl;
-
-import me.zhengjie.modules.dm.order.domain.DmOrderItem;
-import me.zhengjie.utils.ValidationUtil;
-import me.zhengjie.utils.FileUtil;
-import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.dm.order.repository.DmOrderItemRepository;
-import me.zhengjie.modules.dm.order.service.DmOrderItemService;
-import me.zhengjie.modules.dm.order.service.dto.DmOrderItemDto;
-import me.zhengjie.modules.dm.order.service.dto.DmOrderItemQueryCriteria;
-import me.zhengjie.modules.dm.order.service.mapstruct.DmOrderItemMapper;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import cn.hutool.core.lang.Snowflake;
-import cn.hutool.core.util.IdUtil;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import me.zhengjie.utils.PageUtil;
-import me.zhengjie.utils.QueryHelp;
-import java.util.List;
-import java.util.Map;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-
-/**
-* @website https://el-admin.vip
-* @description 服务实现
-* @author sunmz
-* @date 2021-09-15
-**/
-@Service
-@RequiredArgsConstructor
-public class DmOrderItemServiceImpl implements DmOrderItemService {
-
-    private final DmOrderItemRepository dmOrderItemRepository;
-    private final DmOrderItemMapper dmOrderItemMapper;
-
-    @Override
-    public Map<String,Object> queryAll(DmOrderItemQueryCriteria criteria, Pageable pageable){
-        Page<DmOrderItem> page = dmOrderItemRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable);
-        return PageUtil.toPage(page.map(dmOrderItemMapper::toDto));
-    }
-
-    @Override
-    public List<DmOrderItemDto> queryAll(DmOrderItemQueryCriteria criteria){
-        return dmOrderItemMapper.toDto(dmOrderItemRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder)));
-    }
-
-    @Override
-    @Transactional
-    public DmOrderItemDto findById(Long id) {
-        DmOrderItem dmOrderItem = dmOrderItemRepository.findById(id).orElseGet(DmOrderItem::new);
-        ValidationUtil.isNull(dmOrderItem.getId(),"DmOrderItem","id",id);
-        return dmOrderItemMapper.toDto(dmOrderItem);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public DmOrderItemDto create(DmOrderItem resources) {
-        Snowflake snowflake = IdUtil.createSnowflake(1, 1);
-        resources.setId(snowflake.nextId()); 
-        return dmOrderItemMapper.toDto(dmOrderItemRepository.save(resources));
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void update(DmOrderItem resources) {
-        DmOrderItem dmOrderItem = dmOrderItemRepository.findById(resources.getId()).orElseGet(DmOrderItem::new);
-        ValidationUtil.isNull( dmOrderItem.getId(),"DmOrderItem","id",resources.getId());
-        dmOrderItem.copy(resources);
-        dmOrderItemRepository.save(dmOrderItem);
-    }
-
-    @Override
-    public void deleteAll(Long[] ids) {
-        for (Long id : ids) {
-            dmOrderItemRepository.deleteById(id);
-        }
-    }
-
-    @Override
-    public void download(List<DmOrderItemDto> all, HttpServletResponse response) throws IOException {
-        List<Map<String, Object>> list = new ArrayList<>();
-        for (DmOrderItemDto dmOrderItem : all) {
-            Map<String,Object> map = new LinkedHashMap<>();
-            map.put("编号", dmOrderItem.getBh());
-            map.put("商品编号", dmOrderItem.getCode());
-            map.put("商品名称", dmOrderItem.getName());
-            map.put("单价", dmOrderItem.getPrice());
-            map.put("数量", dmOrderItem.getNum());
-            map.put("金额小计", dmOrderItem.getMoney());
-            list.add(map);
-        }
-        FileUtil.downloadExcel(list, response);
-    }
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/order/service/impl/DmOrderRecordServiceImpl.java

@@ -1,115 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.order.service.impl;
-
-import me.zhengjie.modules.dm.order.domain.DmOrderRecord;
-import me.zhengjie.utils.ValidationUtil;
-import me.zhengjie.utils.FileUtil;
-import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.dm.order.repository.DmOrderRecordRepository;
-import me.zhengjie.modules.dm.order.service.DmOrderRecordService;
-import me.zhengjie.modules.dm.order.service.dto.DmOrderRecordDto;
-import me.zhengjie.modules.dm.order.service.dto.DmOrderRecordQueryCriteria;
-import me.zhengjie.modules.dm.order.service.mapstruct.DmOrderRecordMapper;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import cn.hutool.core.lang.Snowflake;
-import cn.hutool.core.util.IdUtil;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import me.zhengjie.utils.PageUtil;
-import me.zhengjie.utils.QueryHelp;
-import java.util.List;
-import java.util.Map;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-
-/**
-* @website https://el-admin.vip
-* @description 服务实现
-* @author sunmz
-* @date 2021-09-15
-**/
-@Service
-@RequiredArgsConstructor
-public class DmOrderRecordServiceImpl implements DmOrderRecordService {
-
-    private final DmOrderRecordRepository dmOrderRecordRepository;
-    private final DmOrderRecordMapper dmOrderRecordMapper;
-
-    @Override
-    public Map<String,Object> queryAll(DmOrderRecordQueryCriteria criteria, Pageable pageable){
-        Page<DmOrderRecord> page = dmOrderRecordRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable);
-        return PageUtil.toPage(page.map(dmOrderRecordMapper::toDto));
-    }
-
-    @Override
-    public List<DmOrderRecordDto> queryAll(DmOrderRecordQueryCriteria criteria){
-        return dmOrderRecordMapper.toDto(dmOrderRecordRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder)));
-    }
-
-    @Override
-    @Transactional
-    public DmOrderRecordDto findById(Long id) {
-        DmOrderRecord dmOrderRecord = dmOrderRecordRepository.findById(id).orElseGet(DmOrderRecord::new);
-        ValidationUtil.isNull(dmOrderRecord.getId(),"DmOrderRecord","id",id);
-        return dmOrderRecordMapper.toDto(dmOrderRecord);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public DmOrderRecordDto create(DmOrderRecord resources) {
-        Snowflake snowflake = IdUtil.createSnowflake(1, 1);
-        resources.setId(snowflake.nextId()); 
-        return dmOrderRecordMapper.toDto(dmOrderRecordRepository.save(resources));
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void update(DmOrderRecord resources) {
-        DmOrderRecord dmOrderRecord = dmOrderRecordRepository.findById(resources.getId()).orElseGet(DmOrderRecord::new);
-        ValidationUtil.isNull( dmOrderRecord.getId(),"DmOrderRecord","id",resources.getId());
-        dmOrderRecord.copy(resources);
-        dmOrderRecordRepository.save(dmOrderRecord);
-    }
-
-    @Override
-    public void deleteAll(Long[] ids) {
-        for (Long id : ids) {
-            dmOrderRecordRepository.deleteById(id);
-        }
-    }
-
-    @Override
-    public void download(List<DmOrderRecordDto> all, HttpServletResponse response) throws IOException {
-        List<Map<String, Object>> list = new ArrayList<>();
-        for (DmOrderRecordDto dmOrderRecord : all) {
-            Map<String,Object> map = new LinkedHashMap<>();
-            map.put("订单编号", dmOrderRecord.getBh());
-            map.put("实付金额", dmOrderRecord.getMoney());
-            map.put("用户姓名", dmOrderRecord.getUserName());
-            map.put("人员种类", dmOrderRecord.getUserType());
-            map.put("用户手机号", dmOrderRecord.getPhone());
-            map.put("下单时间", dmOrderRecord.getOrderTime());
-            map.put("合计金额", dmOrderRecord.getTotalMoney());
-            map.put("折扣", dmOrderRecord.getZkMoney());
-            list.add(map);
-        }
-        FileUtil.downloadExcel(list, response);
-    }
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/order/service/mapstruct/DmOrderItemMapper.java

@@ -1,32 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.order.service.mapstruct;
-
-import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.dm.order.domain.DmOrderItem;
-import me.zhengjie.modules.dm.order.service.dto.DmOrderItemDto;
-import org.mapstruct.Mapper;
-import org.mapstruct.ReportingPolicy;
-
-/**
-* @website https://el-admin.vip
-* @author sunmz
-* @date 2021-09-15
-**/
-@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE)
-public interface DmOrderItemMapper extends BaseMapper<DmOrderItemDto, DmOrderItem> {
-
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/order/service/mapstruct/DmOrderRecordMapper.java

@@ -1,32 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.order.service.mapstruct;
-
-import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.dm.order.domain.DmOrderRecord;
-import me.zhengjie.modules.dm.order.service.dto.DmOrderRecordDto;
-import org.mapstruct.Mapper;
-import org.mapstruct.ReportingPolicy;
-
-/**
-* @website https://el-admin.vip
-* @author sunmz
-* @date 2021-09-15
-**/
-@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE)
-public interface DmOrderRecordMapper extends BaseMapper<DmOrderRecordDto, DmOrderRecord> {
-
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/rfidTableware/domain/DmRfidTableware.java

@@ -1,99 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.rfidTableware.domain;
-
-import lombok.Data;
-import cn.hutool.core.bean.BeanUtil;
-import io.swagger.annotations.ApiModelProperty;
-import cn.hutool.core.bean.copier.CopyOptions;
-import me.zhengjie.utils.SecurityUtils;
-import org.springframework.security.core.userdetails.UserDetails;
-
-import javax.persistence.*;
-import javax.validation.constraints.*;
-import java.sql.Timestamp;
-import java.io.Serializable;
-import java.util.Date;
-
-/**
-* @website https://el-admin.vip
-* @description /
-* @author sunmz
-* @date 2021-09-15
-**/
-@Entity
-@Data
-@Table(name="dm_rfid_tableware")
-public class DmRfidTableware implements Serializable {
-
-    @Id
-    @Column(name = "id")
-    @ApiModelProperty(value = "id")
-    private Long id;
-
-    @Column(name = "code",nullable = false)
-    @NotBlank
-    @ApiModelProperty(value = "芯片编号(餐具内RFID编号)")
-    private String code;
-
-    @Column(name = "name",nullable = false)
-    @NotBlank
-    @ApiModelProperty(value = "餐具名称(餐具名称)")
-    private String name;
-
-    @Column(name = "restaurant",nullable = false)
-    @NotBlank
-    @ApiModelProperty(value = "所属餐厅(餐具所属餐厅)")
-    private String restaurant;
-
-    @Column(name = "create_by")
-    @ApiModelProperty(value = "创建者")
-    private String createBy;
-
-    @Column(name = "update_by")
-    @ApiModelProperty(value = "更新者")
-    private String updateBy;
-
-    @Column(name = "create_time")
-    @ApiModelProperty(value = "创建日期")
-    private Timestamp createTime;
-
-    @Column(name = "update_time")
-    @ApiModelProperty(value = "更新时间")
-    private Timestamp updateTime;
-
-    @Column(name = "user_time")
-    @ApiModelProperty(value = "使用日期")
-    private Timestamp userTime;
-
-    public void copy(DmRfidTableware source){
-        BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
-    }
-
-    @PrePersist
-    public void prePersist() {
-        UserDetails user = SecurityUtils.getCurrentUser();
-        this.createBy = user.getUsername();
-        this.createTime = new Timestamp(new Date().getTime());
-    }
-
-    @PreUpdate
-    public void preUPdate() {
-        UserDetails user = SecurityUtils.getCurrentUser();
-        this.updateBy = user.getUsername();
-        this.updateTime = new Timestamp(new Date().getTime());
-    }
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/rfidTableware/repository/DmRfidTablewareRepository.java

@@ -1,28 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.rfidTableware.repository;
-
-import me.zhengjie.modules.dm.rfidTableware.domain.DmRfidTableware;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-
-/**
-* @website https://el-admin.vip
-* @author sunmz
-* @date 2021-09-15
-**/
-public interface DmRfidTablewareRepository extends JpaRepository<DmRfidTableware, Long>, JpaSpecificationExecutor<DmRfidTableware> {
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/rfidTableware/rest/DmRfidTablewareController.java

@@ -1,87 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.rfidTableware.rest;
-
-import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.dm.rfidTableware.domain.DmRfidTableware;
-import me.zhengjie.modules.dm.rfidTableware.service.DmRfidTablewareService;
-import me.zhengjie.modules.dm.rfidTableware.service.dto.DmRfidTablewareQueryCriteria;
-import org.springframework.data.domain.Pageable;
-import lombok.RequiredArgsConstructor;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import io.swagger.annotations.*;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
-/**
-* @website https://el-admin.vip
-* @author sunmz
-* @date 2021-09-15
-**/
-@RestController
-@RequiredArgsConstructor
-@Api(tags = "rfidTableware管理")
-@RequestMapping("/api/dmRfidTableware")
-public class DmRfidTablewareController {
-
-    private final DmRfidTablewareService dmRfidTablewareService;
-
-    @Log("导出数据")
-    @ApiOperation("导出数据")
-    @GetMapping(value = "/download")
-    @PreAuthorize("@el.check('dmRfidTableware:list')")
-    public void download(HttpServletResponse response, DmRfidTablewareQueryCriteria criteria) throws IOException {
-        dmRfidTablewareService.download(dmRfidTablewareService.queryAll(criteria), response);
-    }
-
-    @GetMapping
-    @Log("查询rfidTableware")
-    @ApiOperation("查询rfidTableware")
-    @PreAuthorize("@el.check('dmRfidTableware:list')")
-    public ResponseEntity<Object> query(DmRfidTablewareQueryCriteria criteria, Pageable pageable){
-        return new ResponseEntity<>(dmRfidTablewareService.queryAll(criteria,pageable),HttpStatus.OK);
-    }
-
-    @PostMapping
-    @Log("新增rfidTableware")
-    @ApiOperation("新增rfidTableware")
-    @PreAuthorize("@el.check('dmRfidTableware:add')")
-    public ResponseEntity<Object> create(@Validated @RequestBody DmRfidTableware resources){
-        return new ResponseEntity<>(dmRfidTablewareService.create(resources),HttpStatus.CREATED);
-    }
-
-    @PutMapping
-    @Log("修改rfidTableware")
-    @ApiOperation("修改rfidTableware")
-    @PreAuthorize("@el.check('dmRfidTableware:edit')")
-    public ResponseEntity<Object> update(@Validated @RequestBody DmRfidTableware resources){
-        dmRfidTablewareService.update(resources);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @Log("删除rfidTableware")
-    @ApiOperation("删除rfidTableware")
-    @PreAuthorize("@el.check('dmRfidTableware:del')")
-    @DeleteMapping
-    public ResponseEntity<Object> delete(@RequestBody Long[] ids) {
-        dmRfidTablewareService.deleteAll(ids);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/rfidTableware/service/DmRfidTablewareService.java

@@ -1,83 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.rfidTableware.service;
-
-import me.zhengjie.modules.dm.rfidTableware.domain.DmRfidTableware;
-import me.zhengjie.modules.dm.rfidTableware.service.dto.DmRfidTablewareDto;
-import me.zhengjie.modules.dm.rfidTableware.service.dto.DmRfidTablewareQueryCriteria;
-import org.springframework.data.domain.Pageable;
-import java.util.Map;
-import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
-/**
-* @website https://el-admin.vip
-* @description 服务接口
-* @author sunmz
-* @date 2021-09-15
-**/
-public interface DmRfidTablewareService {
-
-    /**
-    * 查询数据分页
-    * @param criteria 条件
-    * @param pageable 分页参数
-    * @return Map<String,Object>
-    */
-    Map<String,Object> queryAll(DmRfidTablewareQueryCriteria criteria, Pageable pageable);
-
-    /**
-    * 查询所有数据不分页
-    * @param criteria 条件参数
-    * @return List<DmRfidTablewareDto>
-    */
-    List<DmRfidTablewareDto> queryAll(DmRfidTablewareQueryCriteria criteria);
-
-    /**
-     * 根据ID查询
-     * @param id ID
-     * @return DmRfidTablewareDto
-     */
-    DmRfidTablewareDto findById(Long id);
-
-    /**
-    * 创建
-    * @param resources /
-    * @return DmRfidTablewareDto
-    */
-    DmRfidTablewareDto create(DmRfidTableware resources);
-
-    /**
-    * 编辑
-    * @param resources /
-    */
-    void update(DmRfidTableware resources);
-
-    /**
-    * 多选删除
-    * @param ids /
-    */
-    void deleteAll(Long[] ids);
-
-    /**
-    * 导出数据
-    * @param all 待导出的数据
-    * @param response /
-    * @throws IOException /
-    */
-    void download(List<DmRfidTablewareDto> all, HttpServletResponse response) throws IOException;
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/rfidTableware/service/dto/DmRfidTablewareDto.java

@@ -1,60 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.rfidTableware.service.dto;
-
-import lombok.Data;
-import java.sql.Timestamp;
-import java.io.Serializable;
-import com.alibaba.fastjson.annotation.JSONField;
-import com.alibaba.fastjson.serializer.ToStringSerializer;
-
-/**
-* @website https://el-admin.vip
-* @description /
-* @author sunmz
-* @date 2021-09-15
-**/
-@Data
-public class DmRfidTablewareDto implements Serializable {
-
-    /** 防止精度丢失 */
-    @JSONField(serializeUsing = ToStringSerializer.class)
-    private Long id;
-
-    /** 芯片编号(餐具内RFID编号) */
-    private String code;
-
-    /** 餐具名称(餐具名称) */
-    private String name;
-
-    /** 所属餐厅(餐具所属餐厅) */
-    private String restaurant;
-
-    /** 创建者 */
-    private String createBy;
-
-    /** 更新者 */
-    private String updateBy;
-
-    /** 创建日期 */
-    private Timestamp createTime;
-
-    /** 更新时间 */
-    private Timestamp updateTime;
-
-    /** 使用日期 */
-    private Timestamp userTime;
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/rfidTableware/service/dto/DmRfidTablewareQueryCriteria.java

@@ -1,41 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.rfidTableware.service.dto;
-
-import lombok.Data;
-import java.util.List;
-import me.zhengjie.annotation.Query;
-
-/**
-* @website https://el-admin.vip
-* @author sunmz
-* @date 2021-09-15
-**/
-@Data
-public class DmRfidTablewareQueryCriteria{
-
-    /** 模糊 */
-    @Query(type = Query.Type.INNER_LIKE)
-    private String code;
-
-    /** 模糊 */
-    @Query(type = Query.Type.INNER_LIKE)
-    private String name;
-
-    /** 模糊 */
-    @Query(type = Query.Type.INNER_LIKE)
-    private String restaurant;
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/rfidTableware/service/impl/DmRfidTablewareServiceImpl.java

@@ -1,115 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.rfidTableware.service.impl;
-
-import me.zhengjie.modules.dm.rfidTableware.domain.DmRfidTableware;
-import me.zhengjie.utils.ValidationUtil;
-import me.zhengjie.utils.FileUtil;
-import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.dm.rfidTableware.repository.DmRfidTablewareRepository;
-import me.zhengjie.modules.dm.rfidTableware.service.DmRfidTablewareService;
-import me.zhengjie.modules.dm.rfidTableware.service.dto.DmRfidTablewareDto;
-import me.zhengjie.modules.dm.rfidTableware.service.dto.DmRfidTablewareQueryCriteria;
-import me.zhengjie.modules.dm.rfidTableware.service.mapstruct.DmRfidTablewareMapper;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import cn.hutool.core.lang.Snowflake;
-import cn.hutool.core.util.IdUtil;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import me.zhengjie.utils.PageUtil;
-import me.zhengjie.utils.QueryHelp;
-import java.util.List;
-import java.util.Map;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-
-/**
-* @website https://el-admin.vip
-* @description 服务实现
-* @author sunmz
-* @date 2021-09-15
-**/
-@Service
-@RequiredArgsConstructor
-public class DmRfidTablewareServiceImpl implements DmRfidTablewareService {
-
-    private final DmRfidTablewareRepository dmRfidTablewareRepository;
-    private final DmRfidTablewareMapper dmRfidTablewareMapper;
-
-    @Override
-    public Map<String,Object> queryAll(DmRfidTablewareQueryCriteria criteria, Pageable pageable){
-        Page<DmRfidTableware> page = dmRfidTablewareRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable);
-        return PageUtil.toPage(page.map(dmRfidTablewareMapper::toDto));
-    }
-
-    @Override
-    public List<DmRfidTablewareDto> queryAll(DmRfidTablewareQueryCriteria criteria){
-        return dmRfidTablewareMapper.toDto(dmRfidTablewareRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder)));
-    }
-
-    @Override
-    @Transactional
-    public DmRfidTablewareDto findById(Long id) {
-        DmRfidTableware dmRfidTableware = dmRfidTablewareRepository.findById(id).orElseGet(DmRfidTableware::new);
-        ValidationUtil.isNull(dmRfidTableware.getId(),"DmRfidTableware","id",id);
-        return dmRfidTablewareMapper.toDto(dmRfidTableware);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public DmRfidTablewareDto create(DmRfidTableware resources) {
-        Snowflake snowflake = IdUtil.createSnowflake(1, 1);
-        resources.setId(snowflake.nextId()); 
-        return dmRfidTablewareMapper.toDto(dmRfidTablewareRepository.save(resources));
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void update(DmRfidTableware resources) {
-        DmRfidTableware dmRfidTableware = dmRfidTablewareRepository.findById(resources.getId()).orElseGet(DmRfidTableware::new);
-        ValidationUtil.isNull( dmRfidTableware.getId(),"DmRfidTableware","id",resources.getId());
-        dmRfidTableware.copy(resources);
-        dmRfidTablewareRepository.save(dmRfidTableware);
-    }
-
-    @Override
-    public void deleteAll(Long[] ids) {
-        for (Long id : ids) {
-            dmRfidTablewareRepository.deleteById(id);
-        }
-    }
-
-    @Override
-    public void download(List<DmRfidTablewareDto> all, HttpServletResponse response) throws IOException {
-        List<Map<String, Object>> list = new ArrayList<>();
-        for (DmRfidTablewareDto dmRfidTableware : all) {
-            Map<String,Object> map = new LinkedHashMap<>();
-            map.put("芯片编号(餐具内RFID编号)", dmRfidTableware.getCode());
-            map.put("餐具名称(餐具名称)", dmRfidTableware.getName());
-            map.put("所属餐厅(餐具所属餐厅)", dmRfidTableware.getRestaurant());
-            map.put("创建者", dmRfidTableware.getCreateBy());
-            map.put("更新者", dmRfidTableware.getUpdateBy());
-            map.put("创建日期", dmRfidTableware.getCreateTime());
-            map.put("更新时间", dmRfidTableware.getUpdateTime());
-            map.put("使用日期", dmRfidTableware.getUserTime());
-            list.add(map);
-        }
-        FileUtil.downloadExcel(list, response);
-    }
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/rfidTableware/service/mapstruct/DmRfidTablewareMapper.java

@@ -1,32 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.rfidTableware.service.mapstruct;
-
-import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.dm.rfidTableware.domain.DmRfidTableware;
-import me.zhengjie.modules.dm.rfidTableware.service.dto.DmRfidTablewareDto;
-import org.mapstruct.Mapper;
-import org.mapstruct.ReportingPolicy;
-
-/**
-* @website https://el-admin.vip
-* @author sunmz
-* @date 2021-09-15
-**/
-@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE)
-public interface DmRfidTablewareMapper extends BaseMapper<DmRfidTablewareDto, DmRfidTableware> {
-
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/serveEvaluate/domain/DmServeEvaluate.java

@@ -1,68 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.serveEvaluate.domain;
-
-import lombok.Data;
-import cn.hutool.core.bean.BeanUtil;
-import io.swagger.annotations.ApiModelProperty;
-import cn.hutool.core.bean.copier.CopyOptions;
-import me.zhengjie.base.BaseEntity;
-
-import javax.persistence.*;
-import javax.validation.constraints.*;
-import java.sql.Timestamp;
-import java.io.Serializable;
-
-/**
-* @website https://el-admin.vip
-* @description /
-* @author xwx
-* @date 2021-04-20
-**/
-@Entity
-@Data
-@Table(name="dm_serve_evaluate")
-public class DmServeEvaluate  extends BaseEntity implements Serializable {
-
-    @Id
-    @Column(name = "id")
-    @ApiModelProperty(value = "主键")
-    private Long id;
-
-    @Column(name = "food_name")
-    @ApiModelProperty(value = "菜品名称")
-    private String foodName;
-
-    @Column(name = "concat")
-    @ApiModelProperty(value = "评价详情(对菜品的评价内容)")
-    private String concat;
-
-    @Column(name = "request_user")
-    @ApiModelProperty(value = "用户名称(评价的用户名称)")
-    private String requestUser;
-
-    @Column(name = "order_time")
-    @ApiModelProperty(value = "点餐时间(用户点餐时间）")
-    private Timestamp orderTime;
-
-    @Column(name = "evaluate_time")
-    @ApiModelProperty(value = "评价时间(用户评价时间)")
-    private Timestamp evaluateTime;
-
-    public void copy(DmServeEvaluate source){
-        BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
-    }
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/serveEvaluate/repository/DmServeEvaluateRepository.java

@@ -1,28 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.serveEvaluate.repository;
-
-import me.zhengjie.modules.dm.serveEvaluate.domain.DmServeEvaluate;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-
-/**
-* @website https://el-admin.vip
-* @author xwx
-* @date 2021-04-20
-**/
-public interface DmServeEvaluateRepository extends JpaRepository<DmServeEvaluate, Long>, JpaSpecificationExecutor<DmServeEvaluate> {
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/serveEvaluate/rest/DmServeEvaluateController.java

@@ -1,87 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.serveEvaluate.rest;
-
-import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.dm.serveEvaluate.domain.DmServeEvaluate;
-import me.zhengjie.modules.dm.serveEvaluate.service.DmServeEvaluateService;
-import me.zhengjie.modules.dm.serveEvaluate.service.dto.DmServeEvaluateQueryCriteria;
-import org.springframework.data.domain.Pageable;
-import lombok.RequiredArgsConstructor;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import io.swagger.annotations.*;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
-/**
-* @website https://el-admin.vip
-* @author xwx
-* @date 2021-04-20
-**/
-@RestController
-@RequiredArgsConstructor
-@Api(tags = "dmServeEvaluate管理")
-@RequestMapping("/api/dmServeEvaluate")
-public class DmServeEvaluateController {
-
-    private final DmServeEvaluateService dmServeEvaluateService;
-
-    @Log("导出数据")
-    @ApiOperation("导出数据")
-    @GetMapping(value = "/download")
-    @PreAuthorize("@el.check('dmServeEvaluate:list')")
-    public void download(HttpServletResponse response, DmServeEvaluateQueryCriteria criteria) throws IOException {
-        dmServeEvaluateService.download(dmServeEvaluateService.queryAll(criteria), response);
-    }
-
-    @GetMapping
-    @Log("查询dmServeEvaluate")
-    @ApiOperation("查询dmServeEvaluate")
-    @PreAuthorize("@el.check('dmServeEvaluate:list')")
-    public ResponseEntity<Object> query(DmServeEvaluateQueryCriteria criteria, Pageable pageable){
-        return new ResponseEntity<>(dmServeEvaluateService.queryAll(criteria,pageable),HttpStatus.OK);
-    }
-
-    @PostMapping
-    @Log("新增dmServeEvaluate")
-    @ApiOperation("新增dmServeEvaluate")
-    @PreAuthorize("@el.check('dmServeEvaluate:add')")
-    public ResponseEntity<Object> create(@Validated @RequestBody DmServeEvaluate resources){
-        return new ResponseEntity<>(dmServeEvaluateService.create(resources),HttpStatus.CREATED);
-    }
-
-    @PutMapping
-    @Log("修改dmServeEvaluate")
-    @ApiOperation("修改dmServeEvaluate")
-    @PreAuthorize("@el.check('dmServeEvaluate:edit')")
-    public ResponseEntity<Object> update(@Validated @RequestBody DmServeEvaluate resources){
-        dmServeEvaluateService.update(resources);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @Log("删除dmServeEvaluate")
-    @ApiOperation("删除dmServeEvaluate")
-    @PreAuthorize("@el.check('dmServeEvaluate:del')")
-    @DeleteMapping
-    public ResponseEntity<Object> delete(@RequestBody Long[] ids) {
-        dmServeEvaluateService.deleteAll(ids);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/serveEvaluate/service/DmServeEvaluateService.java

@@ -1,83 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.serveEvaluate.service;
-
-import me.zhengjie.modules.dm.serveEvaluate.domain.DmServeEvaluate;
-import me.zhengjie.modules.dm.serveEvaluate.service.dto.DmServeEvaluateDto;
-import me.zhengjie.modules.dm.serveEvaluate.service.dto.DmServeEvaluateQueryCriteria;
-import org.springframework.data.domain.Pageable;
-import java.util.Map;
-import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
-/**
-* @website https://el-admin.vip
-* @description 服务接口
-* @author xwx
-* @date 2021-04-20
-**/
-public interface DmServeEvaluateService {
-
-    /**
-    * 查询数据分页
-    * @param criteria 条件
-    * @param pageable 分页参数
-    * @return Map<String,Object>
-    */
-    Map<String,Object> queryAll(DmServeEvaluateQueryCriteria criteria, Pageable pageable);
-
-    /**
-    * 查询所有数据不分页
-    * @param criteria 条件参数
-    * @return List<DmServeEvaluateDto>
-    */
-    List<DmServeEvaluateDto> queryAll(DmServeEvaluateQueryCriteria criteria);
-
-    /**
-     * 根据ID查询
-     * @param id ID
-     * @return DmServeEvaluateDto
-     */
-    DmServeEvaluateDto findById(Long id);
-
-    /**
-    * 创建
-    * @param resources /
-    * @return DmServeEvaluateDto
-    */
-    DmServeEvaluateDto create(DmServeEvaluate resources);
-
-    /**
-    * 编辑
-    * @param resources /
-    */
-    void update(DmServeEvaluate resources);
-
-    /**
-    * 多选删除
-    * @param ids /
-    */
-    void deleteAll(Long[] ids);
-
-    /**
-    * 导出数据
-    * @param all 待导出的数据
-    * @param response /
-    * @throws IOException /
-    */
-    void download(List<DmServeEvaluateDto> all, HttpServletResponse response) throws IOException;
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/serveEvaluate/service/dto/DmServeEvaluateDto.java

@@ -1,64 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.serveEvaluate.service.dto;
-
-import lombok.Data;
-import java.sql.Timestamp;
-import java.io.Serializable;
-import com.alibaba.fastjson.annotation.JSONField;
-import com.alibaba.fastjson.serializer.ToStringSerializer;
-
-/**
-* @website https://el-admin.vip
-* @description /
-* @author xwx
-* @date 2021-04-20
-**/
-@Data
-public class DmServeEvaluateDto implements Serializable {
-
-    /** 主键 */
-    /** 防止精度丢失 */
-    @JSONField(serializeUsing = ToStringSerializer.class)
-    private Long id;
-
-    /** 菜品名称 */
-    private String foodName;
-
-    /** 评价详情(对菜品的评价内容) */
-    private String concat;
-
-    /** 用户名称(评价的用户名称) */
-    private String requestUser;
-
-    /** 点餐时间(用户点餐时间） */
-    private Timestamp orderTime;
-
-    /** 评价时间(用户评价时间) */
-    private Timestamp evaluateTime;
-
-    /** 创建者 */
-    private String createBy;
-
-    /** 更新者 */
-    private String updateBy;
-
-    /** 创建日期 */
-    private Timestamp createTime;
-
-    /** 更新时间 */
-    private Timestamp updateTime;
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/serveEvaluate/service/dto/DmServeEvaluateQueryCriteria.java

@@ -1,33 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.serveEvaluate.service.dto;
-
-import lombok.Data;
-import java.util.List;
-import me.zhengjie.annotation.Query;
-
-/**
-* @website https://el-admin.vip
-* @author xwx
-* @date 2021-04-20
-**/
-@Data
-public class DmServeEvaluateQueryCriteria{
-
-    /** 模糊 */
-    @Query(type = Query.Type.INNER_LIKE)
-    private String foodName;
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/serveEvaluate/service/impl/DmServeEvaluateServiceImpl.java

@@ -1,116 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.serveEvaluate.service.impl;
-
-import me.zhengjie.modules.dm.serveEvaluate.domain.DmServeEvaluate;
-import me.zhengjie.utils.ValidationUtil;
-import me.zhengjie.utils.FileUtil;
-import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.dm.serveEvaluate.repository.DmServeEvaluateRepository;
-import me.zhengjie.modules.dm.serveEvaluate.service.DmServeEvaluateService;
-import me.zhengjie.modules.dm.serveEvaluate.service.dto.DmServeEvaluateDto;
-import me.zhengjie.modules.dm.serveEvaluate.service.dto.DmServeEvaluateQueryCriteria;
-import me.zhengjie.modules.dm.serveEvaluate.service.mapstruct.DmServeEvaluateMapper;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import cn.hutool.core.lang.Snowflake;
-import cn.hutool.core.util.IdUtil;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import me.zhengjie.utils.PageUtil;
-import me.zhengjie.utils.QueryHelp;
-import java.util.List;
-import java.util.Map;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-
-/**
-* @website https://el-admin.vip
-* @description 服务实现
-* @author xwx
-* @date 2021-04-20
-**/
-@Service
-@RequiredArgsConstructor
-public class DmServeEvaluateServiceImpl implements DmServeEvaluateService {
-
-    private final DmServeEvaluateRepository dmServeEvaluateRepository;
-    private final DmServeEvaluateMapper dmServeEvaluateMapper;
-
-    @Override
-    public Map<String,Object> queryAll(DmServeEvaluateQueryCriteria criteria, Pageable pageable){
-        Page<DmServeEvaluate> page = dmServeEvaluateRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable);
-        return PageUtil.toPage(page.map(dmServeEvaluateMapper::toDto));
-    }
-
-    @Override
-    public List<DmServeEvaluateDto> queryAll(DmServeEvaluateQueryCriteria criteria){
-        return dmServeEvaluateMapper.toDto(dmServeEvaluateRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder)));
-    }
-
-    @Override
-    @Transactional
-    public DmServeEvaluateDto findById(Long id) {
-        DmServeEvaluate dmServeEvaluate = dmServeEvaluateRepository.findById(id).orElseGet(DmServeEvaluate::new);
-        ValidationUtil.isNull(dmServeEvaluate.getId(),"DmServeEvaluate","id",id);
-        return dmServeEvaluateMapper.toDto(dmServeEvaluate);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public DmServeEvaluateDto create(DmServeEvaluate resources) {
-        Snowflake snowflake = IdUtil.createSnowflake(1, 1);
-        resources.setId(snowflake.nextId()); 
-        return dmServeEvaluateMapper.toDto(dmServeEvaluateRepository.save(resources));
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void update(DmServeEvaluate resources) {
-        DmServeEvaluate dmServeEvaluate = dmServeEvaluateRepository.findById(resources.getId()).orElseGet(DmServeEvaluate::new);
-        ValidationUtil.isNull( dmServeEvaluate.getId(),"DmServeEvaluate","id",resources.getId());
-        dmServeEvaluate.copy(resources);
-        dmServeEvaluateRepository.save(dmServeEvaluate);
-    }
-
-    @Override
-    public void deleteAll(Long[] ids) {
-        for (Long id : ids) {
-            dmServeEvaluateRepository.deleteById(id);
-        }
-    }
-
-    @Override
-    public void download(List<DmServeEvaluateDto> all, HttpServletResponse response) throws IOException {
-        List<Map<String, Object>> list = new ArrayList<>();
-        for (DmServeEvaluateDto dmServeEvaluate : all) {
-            Map<String,Object> map = new LinkedHashMap<>();
-            map.put("菜品名称", dmServeEvaluate.getFoodName());
-            map.put("评价详情(对菜品的评价内容)", dmServeEvaluate.getConcat());
-            map.put("用户名称(评价的用户名称)", dmServeEvaluate.getRequestUser());
-            map.put("点餐时间(用户点餐时间）", dmServeEvaluate.getOrderTime());
-            map.put("评价时间(用户评价时间)", dmServeEvaluate.getEvaluateTime());
-            map.put("创建者", dmServeEvaluate.getCreateBy());
-            map.put("更新者", dmServeEvaluate.getUpdateBy());
-            map.put("创建日期", dmServeEvaluate.getCreateTime());
-            map.put("更新时间", dmServeEvaluate.getUpdateTime());
-            list.add(map);
-        }
-        FileUtil.downloadExcel(list, response);
-    }
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/serveEvaluate/service/mapstruct/DmServeEvaluateMapper.java

@@ -1,32 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.serveEvaluate.service.mapstruct;
-
-import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.dm.serveEvaluate.domain.DmServeEvaluate;
-import me.zhengjie.modules.dm.serveEvaluate.service.dto.DmServeEvaluateDto;
-import org.mapstruct.Mapper;
-import org.mapstruct.ReportingPolicy;
-
-/**
-* @website https://el-admin.vip
-* @author xwx
-* @date 2021-04-20
-**/
-@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE)
-public interface DmServeEvaluateMapper extends BaseMapper<DmServeEvaluateDto, DmServeEvaluate> {
-
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/service/domain/DmServicePj.java

@@ -1,104 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.service.domain;
-
-import lombok.Data;
-import cn.hutool.core.bean.BeanUtil;
-import io.swagger.annotations.ApiModelProperty;
-import cn.hutool.core.bean.copier.CopyOptions;
-import me.zhengjie.utils.SecurityUtils;
-import org.springframework.security.core.userdetails.UserDetails;
-
-import javax.persistence.*;
-import javax.validation.constraints.*;
-import java.sql.Timestamp;
-import java.io.Serializable;
-import java.util.Date;
-
-/**
-* @website https://el-admin.vip
-* @description /
-* @author sunmz
-* @date 2021-09-15
-**/
-@Entity
-@Data
-@Table(name="dm_service_pj")
-public class DmServicePj implements Serializable {
-
-    @Id
-    @Column(name = "id")
-    @ApiModelProperty(value = "id")
-    @GeneratedValue(strategy = GenerationType.IDENTITY)//设置自增
-    private Integer id;
-
-    @Column(name = "user_name")
-    @ApiModelProperty(value = "评价用户")
-    private String userName;
-
-    @Column(name = "user_code")
-    @ApiModelProperty(value = "用户工号")
-    private String userCode;
-
-    @Column(name = "total_point")
-    @ApiModelProperty(value = "综合评分")
-    private String totalPoint;
-
-    @Column(name = "pj_time")
-    @ApiModelProperty(value = "评价时间")
-    private Timestamp pjTime;
-
-    @Column(name = "wd_point")
-    @ApiModelProperty(value = "味道")
-    private Integer wdPoint;
-
-    @Column(name = "pz_point")
-    @ApiModelProperty(value = "品种")
-    private Integer pzPoint;
-
-    @Column(name = "fl_point")
-    @ApiModelProperty(value = "分量")
-    private Integer flPoint;
-
-    @Column(name = "fwtd_point")
-    @ApiModelProperty(value = "服务态度")
-    private Integer fwtdPoint;
-
-    @Column(name = "hjws_point")
-    @ApiModelProperty(value = "环境卫生")
-    private Integer hjwsPoint;
-
-    @Column(name = "zhfw_point")
-    @ApiModelProperty(value = "综合服务")
-    private Integer zhfwPoint;
-
-    @Column(name = "cxgj_point")
-    @ApiModelProperty(value = "持续改进")
-    private Integer cxgjPoint;
-
-    @Column(name = "remark")
-    @ApiModelProperty(value = "意见建议")
-    private String remark;
-
-    public void copy(DmServicePj source){
-        BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
-    }
-
-    @PrePersist
-    public void prePersist() {
-        this.pjTime = new Timestamp(new Date().getTime());
-    }
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/service/repository/DmServicePjRepository.java

@@ -1,28 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.service.repository;
-
-import me.zhengjie.modules.dm.service.domain.DmServicePj;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-
-/**
-* @website https://el-admin.vip
-* @author sunmz
-* @date 2021-09-15
-**/
-public interface DmServicePjRepository extends JpaRepository<DmServicePj, Integer>, JpaSpecificationExecutor<DmServicePj> {
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/service/rest/DmServicePjController.java

@@ -1,87 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.service.rest;
-
-import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.dm.service.domain.DmServicePj;
-import me.zhengjie.modules.dm.service.service.DmServicePjService;
-import me.zhengjie.modules.dm.service.service.dto.DmServicePjQueryCriteria;
-import org.springframework.data.domain.Pageable;
-import lombok.RequiredArgsConstructor;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import io.swagger.annotations.*;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
-/**
-* @website https://el-admin.vip
-* @author sunmz
-* @date 2021-09-15
-**/
-@RestController
-@RequiredArgsConstructor
-@Api(tags = "servicePj管理")
-@RequestMapping("/api/dmServicePj")
-public class DmServicePjController {
-
-    private final DmServicePjService dmServicePjService;
-
-    @Log("导出数据")
-    @ApiOperation("导出数据")
-    @GetMapping(value = "/download")
-    @PreAuthorize("@el.check('dmServicePj:list')")
-    public void download(HttpServletResponse response, DmServicePjQueryCriteria criteria) throws IOException {
-        dmServicePjService.download(dmServicePjService.queryAll(criteria), response);
-    }
-
-    @GetMapping
-    @Log("查询servicePj")
-    @ApiOperation("查询servicePj")
-    @PreAuthorize("@el.check('dmServicePj:list')")
-    public ResponseEntity<Object> query(DmServicePjQueryCriteria criteria, Pageable pageable){
-        return new ResponseEntity<>(dmServicePjService.queryAll(criteria,pageable),HttpStatus.OK);
-    }
-
-    @PostMapping
-    @Log("新增servicePj")
-    @ApiOperation("新增servicePj")
-    @PreAuthorize("@el.check('dmServicePj:add')")
-    public ResponseEntity<Object> create(@Validated @RequestBody DmServicePj resources){
-        return new ResponseEntity<>(dmServicePjService.create(resources),HttpStatus.CREATED);
-    }
-
-    @PutMapping
-    @Log("修改servicePj")
-    @ApiOperation("修改servicePj")
-    @PreAuthorize("@el.check('dmServicePj:edit')")
-    public ResponseEntity<Object> update(@Validated @RequestBody DmServicePj resources){
-        dmServicePjService.update(resources);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @Log("删除servicePj")
-    @ApiOperation("删除servicePj")
-    @PreAuthorize("@el.check('dmServicePj:del')")
-    @DeleteMapping
-    public ResponseEntity<Object> delete(@RequestBody Integer[] ids) {
-        dmServicePjService.deleteAll(ids);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/service/service/DmServicePjService.java

@@ -1,83 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.service.service;
-
-import me.zhengjie.modules.dm.service.domain.DmServicePj;
-import me.zhengjie.modules.dm.service.service.dto.DmServicePjDto;
-import me.zhengjie.modules.dm.service.service.dto.DmServicePjQueryCriteria;
-import org.springframework.data.domain.Pageable;
-import java.util.Map;
-import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
-/**
-* @website https://el-admin.vip
-* @description 服务接口
-* @author sunmz
-* @date 2021-09-15
-**/
-public interface DmServicePjService {
-
-    /**
-    * 查询数据分页
-    * @param criteria 条件
-    * @param pageable 分页参数
-    * @return Map<String,Object>
-    */
-    Map<String,Object> queryAll(DmServicePjQueryCriteria criteria, Pageable pageable);
-
-    /**
-    * 查询所有数据不分页
-    * @param criteria 条件参数
-    * @return List<DmServicePjDto>
-    */
-    List<DmServicePjDto> queryAll(DmServicePjQueryCriteria criteria);
-
-    /**
-     * 根据ID查询
-     * @param id ID
-     * @return DmServicePjDto
-     */
-    DmServicePjDto findById(Integer id);
-
-    /**
-    * 创建
-    * @param resources /
-    * @return DmServicePjDto
-    */
-    DmServicePjDto create(DmServicePj resources);
-
-    /**
-    * 编辑
-    * @param resources /
-    */
-    void update(DmServicePj resources);
-
-    /**
-    * 多选删除
-    * @param ids /
-    */
-    void deleteAll(Integer[] ids);
-
-    /**
-    * 导出数据
-    * @param all 待导出的数据
-    * @param response /
-    * @throws IOException /
-    */
-    void download(List<DmServicePjDto> all, HttpServletResponse response) throws IOException;
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/service/service/dto/DmServicePjDto.java

@@ -1,68 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.service.service.dto;
-
-import lombok.Data;
-import java.sql.Timestamp;
-import java.io.Serializable;
-
-/**
-* @website https://el-admin.vip
-* @description /
-* @author sunmz
-* @date 2021-09-15
-**/
-@Data
-public class DmServicePjDto implements Serializable {
-
-    private Integer id;
-
-    /** 评价用户 */
-    private String userName;
-
-    /** 用户工号 */
-    private String userCode;
-
-    /** 综合评分 */
-    private String totalPoint;
-
-    /** 评价时间 */
-    private Timestamp pjTime;
-
-    /** 味道 */
-    private Integer wdPoint;
-
-    /** 品种 */
-    private Integer pzPoint;
-
-    /** 分量 */
-    private Integer flPoint;
-
-    /** 服务态度 */
-    private Integer fwtdPoint;
-
-    /** 环境卫生 */
-    private Integer hjwsPoint;
-
-    /** 综合服务 */
-    private Integer zhfwPoint;
-
-    /** 持续改进 */
-    private Integer cxgjPoint;
-
-    /** 意见建议 */
-    private String remark;
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/service/service/dto/DmServicePjQueryCriteria.java

@@ -1,37 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.service.service.dto;
-
-import lombok.Data;
-import java.sql.Timestamp;
-import java.util.List;
-import me.zhengjie.annotation.Query;
-
-/**
-* @website https://el-admin.vip
-* @author sunmz
-* @date 2021-09-15
-**/
-@Data
-public class DmServicePjQueryCriteria{
-
-    /** 模糊 */
-    @Query(type = Query.Type.INNER_LIKE)
-    private String userName;
-    /** BETWEEN */
-    @Query(type = Query.Type.BETWEEN)
-    private List<Timestamp> pjTime;
-}

eladmin-system/src/main/java/me/zhengjie/modules/dm/service/service/impl/DmServicePjServiceImpl.java

@@ -1,115 +0,0 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-package me.zhengjie.modules.dm.service.service.impl;
-
-import me.zhengjie.modules.dm.service.domain.DmServicePj;
-import me.zhengjie.utils.ValidationUtil;
-import me.zhengjie.utils.FileUtil;
-import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.dm.service.repository.DmServicePjRepository;
-import me.zhengjie.modules.dm.service.service.DmServicePjService;
-import me.zhengjie.modules.dm.service.service.dto.DmServicePjDto;
-import me.zhengjie.modules.dm.service.service.dto.DmServicePjQueryCriteria;
-import me.zhengjie.modules.dm.service.service.mapstruct.DmServicePjMapper;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import me.zhengjie.utils.PageUtil;
-import me.zhengjie.utils.QueryHelp;
-import java.util.List;
-import java.util.Map;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-
-/**
-* @website https://el-admin.vip
-* @description 服务实现
-* @author sunmz
-* @date 2021-09-15
-**/
-@Service
-@RequiredArgsConstructor
-public class DmServicePjServiceImpl implements DmServicePjService {
-
-    private final DmServicePjRepository dmServicePjRepository;
-    private final DmServicePjMapper dmServicePjMapper;
-
-    @Override
-    public Map<String,Object> queryAll(DmServicePjQueryCriteria criteria, Pageable pageable){
-        Page<DmServicePj> page = dmServicePjRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable);
-        return PageUtil.toPage(page.map(dmServicePjMapper::toDto));
-    }
-
-    @Override
-    public List<DmServicePjDto> queryAll(DmServicePjQueryCriteria criteria){
-        return dmServicePjMapper.toDto(dmServicePjRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder)));
-    }
-
-    @Override
-    @Transactional
-    public DmServicePjDto findById(Integer id) {
-        DmServicePj dmServicePj = dmServicePjRepository.findById(id).orElseGet(DmServicePj::new);
-        ValidationUtil.isNull(dmServicePj.getId(),"DmServicePj","id",id);
-        return dmServicePjMapper.toDto(dmServicePj);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public DmServicePjDto create(DmServicePj resources) {
-        return dmServicePjMapper.toDto(dmServicePjRepository.save(resources));
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void update(DmServicePj resources) {
-        DmServicePj dmServicePj = dmServicePjRepository.findById(resources.getId()).orElseGet(DmServicePj::new);
-        ValidationUtil.isNull( dmServicePj.getId(),"DmServicePj","id",resources.getId());
-        dmServicePj.copy(resources);
-        dmServicePjRepository.save(dmServicePj);
-    }
-
-    @Override
-    public void deleteAll(Integer[] ids) {
-        for (Integer id : ids) {
-            dmServicePjRepository.deleteById(id);
-        }
-    }
-
-    @Override
-    public void download(List<DmServicePjDto> all, HttpServletResponse response) throws IOException {
-        List<Map<String, Object>> list = new ArrayList<>();
-        for (DmServicePjDto dmServicePj : all) {
-            Map<String,Object> map = new LinkedHashMap<>();
-            map.put("评价用户", dmServicePj.getUserName());
-            map.put("用户工号", dmServicePj.getUserCode());
-            map.put("综合评分", dmServicePj.getTotalPoint());
-            map.put("评价时间", dmServicePj.getPjTime());
-            map.put("味道", dmServicePj.getWdPoint());
-            map.put("品种", dmServicePj.getPzPoint());
-            map.put("分量", dmServicePj.getFlPoint());
-            map.put("服务态度", dmServicePj.getFwtdPoint());
-            map.put("环境卫生", dmServicePj.getHjwsPoint());
-            map.put("综合服务", dmServicePj.getZhfwPoint());
-            map.put("持续改进", dmServicePj.getCxgjPoint());
-            map.put("意见建议", dmServicePj.getRemark());
-            list.add(map);
-        }
-        FileUtil.downloadExcel(list, response);
-    }
-}