From a312d032d6bfb62289f90562499412f32538ec05 Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期四, 29 八月 2024 18:28:56 +0800
Subject: [PATCH] 功能迭代
---
/dev/null | 167 -------------------------------------------------------
1 files changed, 0 insertions(+), 167 deletions(-)
diff --git a/product-server-device/.gitignore b/product-server-device/.gitignore
deleted file mode 100644
index 5dedbdc..0000000
--- a/product-server-device/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-lx_file/upload/
-lucene/
-attachment/upload/
-target/
-.classpath
-.project
-.settings/
\ No newline at end of file
diff --git a/product-server-device/pom.xml b/product-server-device/pom.xml
deleted file mode 100644
index 45b5ad7..0000000
--- a/product-server-device/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>com.lx</groupId>
- <artifactId>product-server</artifactId>
- <version>2.0.0-release</version>
- </parent>
- <version>2.1.0-release</version>
- <artifactId>product-server-device</artifactId>
- <name>product-server-device</name>
- <description>product-server-device</description>
- <dependencies>
- <dependency>
- <groupId>com.lx</groupId>
- <artifactId>product-server-common</artifactId>
- </dependency>
- <dependency>
- <groupId>com.lx</groupId>
- <artifactId>product-server-org-admin</artifactId>
- </dependency>
- <dependency>
- <groupId>com.lx</groupId>
- <artifactId>product-server-util</artifactId>
- </dependency>
- <dependency>
- <groupId>com.lx</groupId>
- <artifactId>product-server-lucene</artifactId>
- </dependency>
- <!--releases -->
- <dependency>
- <groupId>com.lx</groupId>
- <artifactId>product-server-core</artifactId>
- </dependency>
- <dependency>
- <groupId>com.lx</groupId>
- <artifactId>product-server-task</artifactId>
- </dependency>
- </dependencies>
-
-
-</project>
diff --git a/product-server-device/product-server-device.iml b/product-server-device/product-server-device.iml
deleted file mode 100644
index b7ff845..0000000
--- a/product-server-device/product-server-device.iml
+++ /dev/null
@@ -1,277 +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="Spring" name="Spring">
- <configuration />
- </facet>
- <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>
- </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="product-server-common" />
- <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.7" level="project" />
- <orderEntry type="library" name="Maven: com.alibaba:easyexcel:3.2.1" level="project" />
- <orderEntry type="library" name="Maven: com.alibaba:easyexcel-core:3.2.1" level="project" />
- <orderEntry type="library" name="Maven: com.alibaba:easyexcel-support:3.2.1" level="project" />
- <orderEntry type="library" name="Maven: org.apache.commons:commons-csv:1.8" level="project" />
- <orderEntry type="library" name="Maven: org.ehcache:ehcache:3.6.3" level="project" />
- <orderEntry type="module" module-name="product-server-util" />
- <orderEntry type="library" name="Maven: org.apache.commons:commons-jexl3:3.1" level="project" />
- <orderEntry type="module" module-name="product-server-lucene" />
- <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.2.7" level="project" />
- <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:1.3.2" level="project" />
- <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:1.3.2" level="project" />
- <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.6" level="project" />
- <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.2" level="project" />
- <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.2.7" level="project" />
- <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.6" level="project" />
- <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.2" level="project" />
- <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queryparser:8.3.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.lucene:lucene-core:8.3.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queries:8.3.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.lucene:lucene-sandbox:8.3.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.lucene:lucene-highlighter:8.3.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.lucene:lucene-memory:8.3.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.lucene:lucene-analyzers-smartcn:8.3.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.lucene:lucene-analyzers-common:8.3.0" level="project" />
- <orderEntry type="library" name="Maven: cn.bestwu:ik-analyzers:5.1.0" level="project" />
- <orderEntry type="library" name="Maven: com.chenlb.mmseg4j:mmseg4j-solr:2.4.0" level="project" />
- <orderEntry type="library" name="Maven: com.chenlb.mmseg4j:mmseg4j-core:1.10.0" level="project" />
- <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.6" level="project" />
- <orderEntry type="library" name="Maven: com.lx:product-server-core:2.0.1" level="project" />
- <orderEntry type="module" module-name="product-server-task" />
- <orderEntry type="module" module-name="product-server-admin" />
- <orderEntry type="module" module-name="product-server-email" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-mail:2.1.3.RELEASE" level="project" />
- <orderEntry type="module" module-name="product-server-auth" />
- <orderEntry type="module" module-name="product-server-text-message" />
- <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
- <orderEntry type="library" name="Maven: com.sendgrid:sendgrid-java:4.3.0" level="project" />
- <orderEntry type="library" name="Maven: com.sendgrid:java-http-client:4.1.0" level="project" />
- <orderEntry type="module" module-name="product-server-file" />
- <orderEntry type="library" name="Maven: com.deepoove:poi-tl:1.10.5" level="project" />
- <orderEntry type="library" name="Maven: com.deepoove:poi-ooxml-schemas-extra:4.1.5" level="project" />
- <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-transcoder:1.14" level="project" />
- <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-anim:1.14" level="project" />
- <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-css:1.14" level="project" />
- <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-ext:1.14" level="project" />
- <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-parser:1.14" level="project" />
- <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-svg-dom:1.14" level="project" />
- <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-awt-util:1.14" level="project" />
- <orderEntry type="library" name="Maven: org.apache.xmlgraphics:xmlgraphics-commons:2.6" level="project" />
- <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-bridge:1.14" level="project" />
- <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-script:1.14" level="project" />
- <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-dom:1.14" level="project" />
- <orderEntry type="library" name="Maven: xalan:xalan:2.7.2" level="project" />
- <orderEntry type="library" name="Maven: xalan:serializer:2.7.2" level="project" />
- <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-gvt:1.14" level="project" />
- <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-shared-resources:1.14" level="project" />
- <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-svggen:1.14" level="project" />
- <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-util:1.14" level="project" />
- <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-constants:1.14" level="project" />
- <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-i18n:1.14" level="project" />
- <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-xml:1.14" level="project" />
- <orderEntry type="library" name="Maven: xml-apis:xml-apis-ext:1.3.04" level="project" />
- <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-codec:1.14" level="project" />
- <orderEntry type="library" name="Maven: com.artofsolving:jodconverter:2.2.2" level="project" />
- <orderEntry type="library" name="Maven: org.openoffice:jurt:3.0.1" level="project" />
- <orderEntry type="library" name="Maven: org.openoffice:ridl:3.0.1" level="project" />
- <orderEntry type="library" name="Maven: org.openoffice:juh:3.0.1" level="project" />
- <orderEntry type="library" name="Maven: org.openoffice:unoil:3.0.1" level="project" />
- <orderEntry type="library" name="Maven: org.artofsolving.jodconverter:jodconverter-core:3.0-beta-4" level="project" />
- <orderEntry type="library" name="Maven: commons-net:commons-net:3.7.2" level="project" />
- <orderEntry type="library" name="Maven: org.apache.pdfbox:pdfbox:2.0.25" level="project" />
- <orderEntry type="library" name="Maven: org.apache.pdfbox:fontbox:2.0.25" level="project" />
- <orderEntry type="library" name="Maven: com.aspose:aspose-cells:23.6.1" level="project" />
- <orderEntry type="library" name="Maven: org.aspose:slides-line:15.9.0" level="project" />
- <orderEntry type="library" name="Maven: com.aspose:aspose-words:21.11.1" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.3.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.3.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.3.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.5.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.5.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-core:2.15.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.15.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.15.0" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.1.3.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.5.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.1.5.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.1.5.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.5.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.5.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.5.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.1.3.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.1.3.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.8" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.8" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.8" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.1.3.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.16" level="project" />
- <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.16" level="project" />
- <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.16" level="project" />
- <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.14.Final" level="project" />
- <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
- <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.4.0" level="project" />
- <orderEntry type="library" name="Maven: redis.clients:jedis:2.9.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.6.1" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.1.3.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.1.5.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.1.5.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.1.5.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.1.5.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.1.5.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.1.4.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.33.Final" level="project" />
- <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.33.Final" level="project" />
- <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.33.Final" level="project" />
- <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.33.Final" level="project" />
- <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.33.Final" level="project" />
- <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.33.Final" level="project" />
- <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.2.6.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.2" level="project" />
- <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-jdbc:9.0.16" level="project" />
- <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-juli:9.0.16" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.1.3.RELEASE" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.1.3.RELEASE" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.1.3.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: org.assertj:assertj-core:3.11.1" level="project" />
- <orderEntry type="library" name="Maven: org.mockito:mockito-core:2.23.4" level="project" />
- <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.9.10" level="project" />
- <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.10" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.6.2" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
- <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
- <orderEntry type="library" name="Maven: javax.servlet:jstl:1.2" level="project" />
- <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
- <orderEntry type="library" name="Maven: de.ruedigermoeller:fst:2.57" level="project" />
- <orderEntry type="library" name="Maven: org.javassist:javassist:3.21.0-GA" level="project" />
- <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.5.1" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.5.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-web:5.1.5.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.3.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
- <orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.3" level="project" />
- <orderEntry type="library" name="Maven: commons-io:commons-io:2.11.0" level="project" />
- <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
- <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.3" level="project" />
- <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
- <orderEntry type="library" name="Maven: com.google.zxing:javase:3.3.2" level="project" />
- <orderEntry type="library" name="Maven: com.beust:jcommander:1.72" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: com.github.jai-imageio:jai-imageio-core:1.3.1" level="project" />
- <orderEntry type="library" name="Maven: org.apache.ant:ant:1.9.7" level="project" />
- <orderEntry type="library" name="Maven: org.apache.ant:ant-launcher:1.9.7" level="project" />
- <orderEntry type="library" name="Maven: net.sf.jmimemagic:jmimemagic:0.1.5" level="project" />
- <orderEntry type="library" name="Maven: log4j:log4j:1.2.8" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.8" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.8" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.9.8" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.9.8" level="project" />
- <orderEntry type="library" name="Maven: org.codehaus.woodstox:stax2-api:3.1.4" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.woodstox:woodstox-core:5.0.3" level="project" />
- <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
- <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
- <orderEntry type="library" name="Maven: jaxen:jaxen:1.1.6" level="project" />
- <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
- <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.7" level="project" />
- <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.11" level="project" />
- <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.11.3" level="project" />
- <orderEntry type="library" name="Maven: org.apache.commons:commons-email:1.5" level="project" />
- <orderEntry type="library" name="Maven: com.sun.mail:javax.mail:1.6.2" level="project" />
- <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.3" level="project" />
- <orderEntry type="library" name="Maven: javax.activation:activation:1.1.1" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:2.1.3.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.1.5.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-websocket:5.1.5.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: eu.bitwalker:UserAgentUtils:1.21" level="project" />
- <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.2" level="project" />
- <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
- <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
- <orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" />
- <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" />
- <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.19" level="project" />
- <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
- <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" />
- <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.poi:poi-scratchpad:4.1.2" level="project" />
- <orderEntry type="library" name="Maven: com.belerweb:pinyin4j:2.5.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.slf4j:jul-to-slf4j:1.7.25" level="project" />
- <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.25" 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" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-test:5.1.5.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: com.adobe.xmp:xmpcore:5.1.2" level="project" />
- <orderEntry type="library" name="Maven: com.auth0:java-jwt:3.3.0" level="project" />
- <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.56" level="project" />
- <orderEntry type="library" name="Maven: net.sourceforge.nekohtml:nekohtml:1.9.22" level="project" />
- <orderEntry type="library" name="Maven: xerces:xercesImpl:2.11.0" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-thymeleaf:2.1.3.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf-spring5:3.0.11.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.thymeleaf.extras:thymeleaf-extras-java8time:3.0.3.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf:3.0.11.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: ognl:ognl:3.1.12" level="project" />
- <orderEntry type="library" name="Maven: org.attoparser:attoparser:2.0.5.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.unbescape:unbescape:1.1.6.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15:1.46" level="project" />
- <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.20" level="project" />
- <orderEntry type="library" name="Maven: com.google.protobuf:protobuf-java:3.6.1" level="project" />
- <orderEntry type="library" name="Maven: com.alibaba:druid:1.2.2" level="project" />
- <orderEntry type="library" name="Maven: io.logz.logback:logzio-logback-appender:1.0.24" level="project" />
- <orderEntry type="library" name="Maven: io.logz.sender:logzio-sender:1.1.1" level="project" />
- <orderEntry type="library" name="Maven: com.google.guava:guava:25.0-jre" level="project" />
- <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
- <orderEntry type="library" name="Maven: org.checkerframework:checker-compat-qual:2.0.0" level="project" />
- <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.1.3" level="project" />
- <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.1" level="project" />
- <orderEntry type="library" name="Maven: org.codehaus.mojo:animal-sniffer-annotations:1.14" level="project" />
- <orderEntry type="library" name="Maven: com.mashape.unirest:unirest-java:1.4.9" level="project" />
- <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.4" level="project" />
- <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.11" level="project" />
- <orderEntry type="library" name="Maven: org.json:json:20160212" level="project" />
- <orderEntry type="library" name="Maven: com.sun.jersey:jersey-client:1.19.4" level="project" />
- <orderEntry type="library" name="Maven: com.sun.jersey:jersey-core:1.19.4" level="project" />
- <orderEntry type="library" name="Maven: javax.ws.rs:jsr311-api:1.1.1" level="project" />
- <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.8.11" level="project" />
- <orderEntry type="library" name="Maven: com.bladejava:blade-patchca:1.1.0" level="project" />
- <orderEntry type="library" name="Maven: com.github.penggle:kaptcha:2.3.2" level="project" />
- <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235-1" level="project" />
- <orderEntry type="library" name="Maven: com.drewnoakes:metadata-extractor:2.11.0" level="project" />
- <orderEntry type="library" name="Maven: com.google.zxing:core:3.3.2" level="project" />
- <orderEntry type="library" name="Maven: net.coobird:thumbnailator:0.4.8" level="project" />
- <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.1" level="project" />
- <orderEntry type="library" name="Maven: org.fusesource:sigar:1.6.4" level="project" />
- <orderEntry type="library" name="Maven: com.github.albfernandez:juniversalchardet:2.3.1" level="project" />
- </component>
-</module>
\ No newline at end of file
diff --git a/product-server-device/src/main/java/META-INF/MANIFEST.MF b/product-server-device/src/main/java/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e..0000000
--- a/product-server-device/src/main/java/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path:
-
diff --git a/product-server-device/src/main/java/com/product/device/config/DeviceCode.java b/product-server-device/src/main/java/com/product/device/config/DeviceCode.java
deleted file mode 100644
index fd9f9a8..0000000
--- a/product-server-device/src/main/java/com/product/device/config/DeviceCode.java
+++ /dev/null
@@ -1,178 +0,0 @@
-package com.product.device.config;
-
-import java.text.DecimalFormat;
-import java.text.Format;
-
-import com.product.common.enums.IEnum;
-import com.product.common.enums.ModuleEnum;
-import com.product.core.config.Global;
-import com.product.util.BaseUtil;
-
-/**
- * Copyright 漏 2019.
- *
- * @Title:
- * @Project: LX
- * @Date: 2019-05-13 13:39
- * @Author: Luo
- * @Description: 涓氬姟鍔熻兘寮傚父鎶涘嚭
- */
-public enum DeviceCode implements IEnum {
-
- SYSTEM_OPERATION_SUCCESS("鎴愬姛", 200),
- SYSTEM_FORM_NODATA("璇锋眰鍙傛暟涓虹┖", 999),
- SYSTEM_FORM_COUNT("璇锋眰鍙傛暟鏈夎", 998),
- SYSTEM_TABLE_NODATA("璇锋眰琛ㄥ悕鏈夎", 997),
- SYSTEM_CPAGES_NOT_NULL("鍒嗛〉鍙傛暟涓嶈兘涓虹┖", 996),
- SYSTEM_LOGIN_USER_FAIL("鑾峰彇褰撳墠鐧诲綍浜哄け璐�", 995),
-
-
- COMMON_GET_WAREHOUSE_KEEPER_FAIL("鑾峰彇搴撶鍛樺け璐�", 1),
- COMMON_UNKNOWN_ERROR("鏈煡寮傚父", 2),
- COMMON_DATA_ERROR("鏁版嵁寮傚父", 3),
-
- ARCHIVES_SAVE_FAIL("璁惧妗ｆ淇濆瓨", 4),
- ARCHIVES_DELETE_FAIL("璁惧妗ｆ鍒犻櫎", 5),
-
- DEVICE_CREATE_INSPECTION_ERROR("鍒涘缓璁惧鐐规閿欒", 4),
- DEL_PRINT_CONFIG_DATA_FAIL("鍒犻櫎閰嶇疆鏁版嵁澶辫触", 6),
- DEVICE_ARCHIVES_OPERATE_FAIL("鐢垫妗ｆ鎿嶄綔澶辫触锛�", 7),
- SAVE_PATROL_CONFIG_ERROR("鐢垫璁惧宸℃椤圭洰鎿嶄綔澶辫触", 8),
- DEVICE_MAINTENANCE_REVIEW_FAIL("璁惧缁翠繚澶嶆牳澶辫触", 9),
- DEVICE_MAINTENANCE_YEAR_FAIL("鑾峰彇缁翠繚鍗曚綅骞村害缁翠繚缁熻澶辫触", 10),
- DEVICE_MAINTENANCE_YEAR_FINISH_FAIL("鑾峰彇缁翠繚鍗曚綅骞村害缁翠繚浠诲姟瀹屾垚鎯呭喌澶辫触", 11),
-
-
- //璁惧鐐规
- DEVICE_INSPECTION_ITEM_OPERATE_FAIL("鐐规椤圭洰鎿嶄綔閿欒锛�", 12),
- DEVICE_INSPECTION_ITEM_DELETE_FAIL("鐐规椤圭洰鍒犻櫎澶辫触", 13),
- DEVICE_INSPECTION_ITEM_HAS_REFERENCED("鐐规椤圭洰宸茶寮曠敤锛屼笉鑳藉垹闄�", 14),
- DEVICE_INSPECTION_CONFIG_OPERATE_FIAL("鐐规閰嶇疆鎿嶄綔閿欒锛�", 15),
- DEVICE_INSPECTION_CONFIG_SAVE_FIAL("鐐规閰嶇疆淇濆瓨閿欒", 16),
- DEVICE_INSPECTION_RECORD_OPERATE_FIAL("鐐规璁板綍鎿嶄綔閿欒锛�", 17),
- DEVICE_INSPECTION_RECORD_SAVEE_FIAL("鐐规璁板綍淇濆瓨澶辫触", 18),
-
- //璁惧淇濆吇
- DEVICE_MAINTENANCE_CONTENT_OPERATE_FAIL("淇濆吇椤圭洰鎿嶄綔閿欒锛�", 19),
- DEVICE_MAINTENANCE_CONTENT_DEL_FAIL("淇濆吇鍐呭鍒犻櫎澶辫触", 20),
- DEVICE_MAINTENANCE_CONTENT_HAS_REFERENCED("淇濆吇鍐呭宸茶寮曠敤锛屼笉鑳藉垹闄�", 21),
- DEVICE_MAINTENANCE_CONFIG_OPERATE_FAIL("淇濆吇閰嶇疆鎿嶄綔閿欒锛�", 22),
- DEVICE_MAINTENANCE_CONFIG_SAVE_FAIL("淇濆吇閰嶇疆淇濆瓨澶辫触", 23),
- DEVICE_MAINTENANCE_PLAN_OPERATE_FAIL("淇濆吇璁″垝鎿嶄綔閿欒锛�", 24),
- DEVICE_MAINTENANCE_PLAN_SAVE_FAIL("淇濆吇璁″垝淇濆瓨澶辫触", 25),
- DEVICE_MAINTENANCE_PLAN_HAS_BEGIN("淇濆吇璁″垝宸茬粡寮�濮�", 26),
- DEVICE_MAINTENANCE_PLAN_HAS_COMMON_PLAN("鍚屽勾搴﹀悓淇濆吇绫诲瀷璁″垝宸茬粡鍒涘缓", 27),
- DEVICE_MAINTENANCE_PLAN_HAS_NO_CONFIG("娌℃湁閰嶇疆瀵瑰簲绫诲瀷鐨勪繚鍏昏澶�", 28),
- DEVICE_MAINTENANCE_RECORD_OPERATE_FAIL("淇濆吇璁板綍鎿嶄綔閿欒锛�", 29),
- DEVICE_MAINTENANCE_TAK_COMPLETE_FAIL("淇濆吇浠诲姟瀹屾垚澶辫触", 30),
-
- //璁惧浠诲姟
- DEVICE_TASK_TYPE_NO_EXIST("浠诲姟绫诲瀷鏁版嵁涓嶅瓨鍦�", 31),
- DEVICE_TASK_DATA_NO_EXIST("璁惧浠诲姟鏁版嵁涓嶅瓨鍦�", 32),
- DEVICE_TASK_CREATE_FAIL_PARAM_ERROR("鍙傛暟寮傚父锛屽彂璧蜂换鍔″け璐ワ紝", 33),
- DEVICE_TASK_COMPLETE_FAIL_TASK_NO_EXIST("浠诲姟瀹屾垚澶辫触锛屼换鍔℃暟鎹笉瀛樺湪锛�", 34),
- DEVICE_TASK_COMPLETE_FAIL_TASK_OWNER_MISMATCH("褰撳墠鍔炵悊浜轰笌涓茶浠诲姟鑺傜偣鍔炵悊浜轰笉鍖归厤", 35),
- DEVICE_TASK_HAS_FINISH("浠诲姟宸茬粡缁撴潫锛屾棤闇�鍐嶆鍔炵悊", 36),
- DEVICE_TASK_WAREHOUSE_KEPPER_NO_EXIST("搴撶鍛樹笉瀛樺湪", 37),
-
- //澶囦欢妗ｆ
- SPARE_PART_ARCHIVE_OPERATE_FIAL("澶囦欢妗ｆ鎿嶄綔閿欒锛�", 38),
- SPARE_PART_ARCHIVE_DELETE_FIAL("澶囦欢妗ｆ鍒犻櫎澶辫触", 39),
- SPARE_PART_ARCHIVE_DELETE_FIAL_DATA_REFERENCED("澶囦欢妗ｆ鍒犻櫎澶辫触,鏁版嵁宸茶寮曠敤", 40),
- SPARE_PART_ARCHIVE_NEED_BAECODE_UNIT("闇�瑕佹寚瀹氫笖浠呰兘鎸囧畾涓�涓崟浣嶄负鏉＄爜鍗曚綅锛岃鑱旂郴绠＄悊鍛樺湪澶囦欢妗ｆ杩涜璁剧疆锛�", 41),
- SPARE_PART_ARCHIVE_GET_BASE_UNIT_FAIL("鍩烘湰鍗曚綅鑾峰彇澶辫触", 42),
-
- //澶囦欢閲囪喘鐢宠
- SPARE_PART_PURCHASE_APPLY_OPERATE_FIAL("澶囦欢閲囪喘鐢宠鎿嶄綔澶辫触锛�", 43),
- SPARE_PART_PURCHASE_APPLY_DELETE_FIAL("澶囦欢閲囪喘鐢宠鎿嶄綔澶辫触锛�", 44),
- SPARE_PART_PURCHASE_APPLY_DELETE_FIAL_DATA_REFERENCED("澶囦欢妗ｆ鍒犻櫎澶辫触,鏁版嵁宸茶寮曠敤", 45),
- SPARE_PART_PURCHASE_APPLY_CONFIRM("璇ラ噰璐敵璇峰崟宸茬粡琚簱绠＄‘璁わ紝鏃犳硶鏇存敼锛�", 46),
- SPARE_PART_PURCHASE_APPLY_SUB_LIST_FAIL("鏈敓鎴愯鍗曠殑閲囪喘鐢宠鍗曟槑缁嗚幏鍙栧け璐ワ細", 47),
-
- //澶囦欢閲囪喘璁㈠崟
- SPARE_PART_PURCHASE_ORDER_OPERATE_FIAL("澶囦欢閲囪喘鐢宠鎿嶄綔澶辫触锛�", 48),
- SPARE_PART_PURCHASE_ORDER_PARTIAL_WAREHOUSING("宸插瓨鍦ㄩ儴鍒嗗瓙琛ㄦ暟鎹叆搴擄紝鏃犳硶鍒犻櫎", 49),
- SPARE_PART_PURCHASE_ORDER_SELECT_ONE_SUPPLIER_ORDER("鍙兘閫夋嫨涓�瀹朵緵搴斿晢鐨勮鍗�", 50),
-
- //澶囦欢鍏ュ簱
- SPARE_PART_WAREHOUSE_IN_OPERATE_FIAL("澶囦欢鍏ュ簱鎿嶄綔澶辫触锛�", 51),
- SPARE_PART_WAREHOUSE_IN_SAVE_FIAL("澶囦欢鍏ュ簱淇濆瓨澶辫触", 52),
- SPARE_PART_WAREHOUSE_IN_SUB_OPERATE_FIAL("澶囦欢閲囪喘鐢宠瀛愯〃鎿嶄綔澶辫触锛�", 53),
-
- //澶囦欢棰嗙敤
- SPARE_PART_RECEIVE_OPERATE_FAIL("澶囦欢棰嗙敤鎿嶄綔澶辫触锛�", 54),
- SPARE_PART_RECEIVE_SUB_LIST_BY_REPAIR_FAIL("缁翠慨澶囦欢棰嗙敤鏄庣粏鑾峰彇澶辫触", 55),
- SPARE_PART_RECEIVE_SUB_LIST_BY_MAINTENANCE_FAIL("缁翠慨澶囦欢棰嗙敤鏄庣粏鑾峰彇澶辫触", 56),
- SPARE_PART_RECEIVE_SUB_DETAIL_OPERATE_FAIL("澶囦欢棰嗙敤鏄庣粏鎿嶄綔澶辫触锛�", 57),
- SPARE_PART_RECEIVE_SUB_SPLIT_OPERATE_FAIL("澶囦欢棰嗙敤鎷嗕欢鎿嶄綔澶辫触锛�", 58),
- SPARE_PART_RECEIVE_TASK_HAS_SEND("浠诲姟宸插彂璧锋垨宸茬粨鏉燂紝璇峰嬁閲嶅鍙戣捣浠诲姟", 59),
-
- //澶囦欢褰掕繕
- SPARE_PART_RETURN_OPERATE_FAIL("澶囦欢褰掕繕鎿嶄綔澶辫触锛�", 60),
- SPARE_PART_RETURN_DELETE_FIAL("澶囦欢褰掕繕鍒犻櫎澶辫触", 61),
- SPARE_PART_RETURN_DELETE_FIAL_DATA_REFERENCED("澶囦欢褰掕繕鍒犻櫎澶辫触,鏁版嵁宸茶寮曠敤", 62),
-
- //澶囦欢搴撳瓨
- SPARE_PART_STOCK_OPERATE_FAIL("澶囦欢搴撳瓨鎿嶄綔澶辫触锛�", 63),
- SPARE_PART_STOCK_ARCHIVE_PARAM_NO_UPLOAD("澶囦欢妗ｆ鍙傛暟鏈笂浼狅紝鏃犳硶杩涜璁＄畻", 64),
- SPARE_PART_SROCK_SPECIFY_BARCODE_SPLIT("璇锋寚瀹氫竴涓潯鐮佽繘琛屾媶浠�", 65),
- SPARE_PART_SROCK_SPLIT_METHOD_UNREASONABLE("鎷嗕欢鏂瑰紡涓嶅悎鐞嗭紝璇烽噸鏂伴�夋嫨", 66),
- SPARE_PART_STOCK_DISABLED_OR_NO_EXIST_UNIT("绂佺敤鎴栬�呮湭褰曞叆鍒扮郴缁熺殑鍗曚綅锛屾棤娉曡繘琛岃绠楋紝鍗曚綅uuid锛�%s", 67),
- SPARE_PART_STOCK_CANNOT_GET_ARCHIVE_UNIT("鏈幏鍙栧埌澶囦欢妗ｆid涓恒��%s銆戠殑鍗曚綅", 68),
-
- //澶囦欢鎶ュ簾
- SPARE_PART_SCRAPE_OPERATE_FAIL("澶囦欢鎶ュ簾鎿嶄綔澶辫触锛�", 69),
- SPARE_PART_SCRAPE_DELETE_FIAL("澶囦欢鎶ュ簾鍒犻櫎澶辫触", 70),
- SPARE_PART_SCRAPE_DELETE_FIAL_DATA_REFERENCED("澶囦欢鎶ュ簾鍒犻櫎澶辫触,鏁版嵁宸茶寮曠敤", 71),
-
- //搴撳瓨鐩樼偣
- SPARE_PART_INVENTORY_OPERATE_FAIL("澶囦欢搴撳瓨鎿嶄綔澶辫触锛�", 72),
- SPARE_PART_INVENTORY_PARSE_ERROR("閿欒鐨勫弬鏁帮紝瑙ｆ瀽澶辫触", 73),
-
-
- DEVICE_RECORD_SAVE_FAIL("{&device.name(璁惧)&}鍙拌处淇濆瓨澶辫触", 74),
-
- DEVICE_RECORD_FIND_FAIL("{&device.name(璁惧)&)鍙拌处璇︽儏鏌ヨ澶辫触", 75),
- DEVICE_RECORD_FIND_ALL_FAIL("{&device.name(璁惧)&}鍙拌处鏌ヨ澶辫触", 76),
- TASK_FIELDSET_NOT_FIND_ERROR("鏈壘鍒拌澶囦繚鍏讳俊鎭�", 77),
-
- INSPECTION_PLAN_CONFIG_LIST_FIND_FAIL("璁惧鐐规璁″垝閰嶇疆鏌ヨ澶辫触", 78),
-
- GET_INSPECTION_PLAN_DETAIL_LIST_FAIL("鑾峰彇鐐规璁″垝鏄庣粏澶辫触", 79),
- ;
-
- private String text;
- private int value;
-
- private DeviceCode(String text, int value) {
- this.text = text;
- this.value = value;
- }
-
- public String getText() {
- try {
- //浣跨敤姝ｅ垯鍖归厤text涓殑鐗规畩琛ㄨ揪寮忎互{&寮�澶达紝&}缁撳熬锛岃幏鍙栧埌鍏朵腑鐨勫唴瀹�
- String regex = "\\{&(.+?)&\\}";
- String result = this.text;
- if (this.text.matches(regex)) {
- result = this.text.replaceAll(regex, "$1");
- }
- String defaultValue = null;
- //鎴彇result涓互(寮�澶达紝)缁撳熬鐨勫唴瀹�
- if (result.contains("(") && result.contains(")")) {
- defaultValue = result.substring(0, result.indexOf("("));
- }
- //鍘绘帀result涓� (寮�澶达紝)缁撳熬鐨勫唴瀹� 鍖呭惈鎷彿
- result = result.replaceAll("\\(.*?\\)", "");
- //鑾峰彇绯荤粺閰嶇疆涓殑鍊�
- return BaseUtil.ifNull(Global.getSystemConfig(result, defaultValue),text);
- } catch (Exception e) {
- return text;
- }
- }
-
- public String getValue() {
- Format format = new DecimalFormat("000");
- return ModuleEnum.DEVICE.getValue() + format.format(this.value);
- }
-}
diff --git a/product-server-device/src/main/java/com/product/device/config/DeviceConst.java b/product-server-device/src/main/java/com/product/device/config/DeviceConst.java
deleted file mode 100644
index 9d01f1f..0000000
--- a/product-server-device/src/main/java/com/product/device/config/DeviceConst.java
+++ /dev/null
@@ -1,178 +0,0 @@
-package com.product.device.config;
-
-
-import com.product.core.config.CoreConst;
-
-/**
- * Copyright LX-BASE
- *
- * @Title: CmnConst
- * @Project: LX-BASE-SERVER
- * @Date: 2020-06-15 11锛�47
- * @Author: LiuChao
- * @Description:
- */
-public class DeviceConst extends CoreConst {
-
- //鐗规畩鍙橀噺
- public static final int DEVICE_DATA_SOCKET_PORT=8899;
- public static final String STANDARD_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss";
- public static final String STANDARD_YEAR_FORMAT = "yyyy";
- public static final String CPAGE="cpage";
- public static final String PAGESIZE="pagesize";
- public static final String DAYS="DAYS";
- public static final String WEEKS="WEEKS";
- public static final String MONTHS="MONTHS";
- public static final String TASK_STATUS_START = "0";
- public static final String TASK_STATUS_FINAL = "99";
-
- // 浠诲姟绫诲瀷
- public static final String TASK_TYPE_SPOT_CHECK = "0";
- public static final String TASK_TYPE_MAINTENANCE = "1";//淇濆吇浠诲姟
- public static final String TASK_TYPE_REPAIR = "2";
- public static final String TASK_TYPE_IDENTIFY = "3";
- public static final String TASK_TYPE_SPOT_CHECK_REVIEW = "4";
- public static final String TASK_TYPE_MAINTENANCE_REVIEW = "5";
- public static final String TASK_TYPE_REPAIR_REVIEW = "6";
- public static final String TASK_TYPE_DISPATCH = "7";
- public static final String TASK_TYPE_MOLD_RECEIVE = "8";
- public static final String TASK_TYPE_MOLD_RETURN = "9";
- public static final String TASK_TYPE_PURCHASE_APPLY = "10";
- public static final String TASK_TYPE_PURCHASE_INBOUND = "11";
- public static final String TASK_TYPE_COMPONENT_RECEIVE = "12";
- public static final String TASK_TYPE_COMPONENT_RETURN = "13";
- public static final String TASK_TYPE_COMPONENT_SCRAP = "14";
-
- // 浠诲姟鏍囬
- public static final String TASK_TITLE_FORMAT_SPOT_CHECK = "璁惧鐐规-%s";
- public static final String TASK_TITLE_FORMAT_MAINTENANCE = "璁惧淇濆吇-%s-%s";
- public static final String TASK_TITLE_FORMAT_REPAIR = "璁惧缁翠慨-%s-%s";
- public static final String TASK_TITLE_FORMAT_IDENTIFY = "璁惧閴村畾-%s";
- public static final String TASK_TITLE_FORMAT_SPOT_CHECK_REVIEW = "璁惧鐐规澶嶆牳-%s";
- public static final String TASK_TITLE_FORMAT_MAINTENANCE_REVIEW = "璁惧淇濆吇澶嶆牳-%s-%s";
- public static final String TASK_TITLE_FORMAT_REPAIR_REVIEW = "璁惧缁翠慨澶嶆牳-%s-%s";
- public static final String TASK_TITLE_FORMAT_DISPATCH = "娲惧崟浠诲姟-%s";
- public static final String TASK_TITLE_FORMAT_MOLD_RECEIVE = "妯″叿棰嗙敤-%s";
- public static final String TASK_TITLE_FORMAT_MOLD_RETURN = "妯″叿褰掕繕-%s";
- public static final String TASK_TITLE_FORMAT_PURCHASE_APPLY = "閲囪喘鐢宠-%s";
- public static final String TASK_TITLE_FORMAT_PURCHASE_INBOUND = "閲囪喘鍏ュ簱-%s";
- public static final String TASK_TITLE_FORMAT_COMPONENT_RECEIVE = "澶囦欢棰嗙敤-%s";
- public static final String TASK_TITLE_FORMAT_COMPONENT_RETURN = "澶囦欢褰掕繕-%s";
- public static final String TASK_TITLE_FORMAT_COMPONENT_SCRAP = "澶囦欢鎶ュ簾-%s";
-
-
- // 琛ㄥ悕
- public static final String TABLE_PRODUCT_DEVICE_TASK="product_device_task";
- public static final String TABLE_PRODUCT_DEVICE_ARCHIVE="product_device_archives";
- public static final String TABLE_PRODUCT_DEVICE_INSPECT_ITEM_CONFIG="product_device_inspection_item_config";
- public static final String TABLE_PRODUCT_INSPECT_SETTING="product_device_inspection_setting";
- public static final String TABLE_PRODUCT_INSPECT_SETTING_SUB="product_device_inspection_setting_sub";
- public static final String TABLE_PRODUCT_REPAIR_FAILURE="product_device_repair_failure_record";
- public static final String TABLE_PRODUCT_INSPECTION_SETTING="product_device_inspection_setting";
- public static final String TABLE_PRODUCT_MAINTENANCE_SETTING="product_device_maintenance_setting";
- public static final String TABLE_PRODUCT_PATROL_RECORD="product_device_patrol_record";
- public static final String TABLE_PRODUCT_PATROL_SETTING="product_device_patrol_setting";
- public static final String TABLE_PRODUCT_PATROL_RECORD_SUB="product_device_patrol_record_sub";
- public static final String PRODUCT_DEVICE_ARCHIVES = "product_device_archives";// 璁惧绠＄悊
- public static final String PRODUCT_DEVICE_INFO="product_device_info";
- public static final String PRODUCT_DEVICE_TASK="product_device_task";
- public static final String PRODUCT_DEVICE_TASK_TYPE="product_device_task_type";
- public static final String PRODUCT_DEVICE_UNIT="product_device_unit";
- public static final String PRODUCT_DEVICE_UNIT_SUB="product_device_unit_sub";
- public static final String PRODUCT_DEVICE_INSPECTION_RECORD="product_device_inspection_record";//璁惧鐐规璁板綍
- public static final String PRODUCT_DEVICE_INSPECTION_RECORD_SUB="product_device_inspection_record_sub";//鐐规璁板綍鏄庣粏
- public static final String PRODUCT_DEVICE_MAINTENANCE_ITEM_CONFIG = "product_device_maintenance_item_config";
- public static final String PRODUCT_DEVICE_MAINTENANCE_ITEM_DETAIL = "product_device_maintenance_item_detail";
- public static final String PRODUCT_DEVICE_MAINTENANCE_PLAN = "product_device_maintenance_plan";
- public static final String PRODUCT_DEVICE_MAINTENANCE_PLAN_SUB = "product_device_maintenance_plan_sub";
- public static final String PRODUCT_DEVICE_MAINTENANCE_PLAN_CHANGE = "product_device_maintenance_plan_change";
- public static final String PRODUCT_DEVICE_MAINTENANCE_PLAN_CHANGE_SUB = "product_device_maintenance_plan_change_sub";
- public static final String PRODUCT_DEVICE_MAINTENANCE_RECORD = "product_device_maintenance_record";
- public static final String PRODUCT_DEVICE_MAINTENANCE_RECORD_SUB = "product_device_maintenance_record_sub";
- public static final String PRODUCT_DEVICE_REPAIR_RECORD = "product_device_repair_record";
- public static final String PRODUCT_DEVICE_SPARE_PART_ARCHIVES = "product_device_spare_part_archives"; //璁惧澶囦欢妗ｆ
- public static final String PRODUCT_DEVICE_SPARE_PART_RECEIVE = "product_device_spare_part_receive"; //璁惧澶囦欢棰嗙敤鏄庣粏
- public static final String PRODUCT_DEVICE_SPARE_PART_SCRAP = "product_device_spare_part_scrap"; //璁惧澶囦欢鎶ュ簾鏄庣粏
- public static final String PRODUCT_DEVICE_SPARE_PART_ARCHIVES_PARAM = "product_device_spare_part_archives_param"; //澶囦欢妗ｆ-鍙傛暟
- public static final String PRODUCT_DEVICE_SPARE_PART_ARCHIVES_UNIT = "product_device_spare_part_archives_unit"; //澶囦欢妗ｆ-鍗曚綅
- public static final String PRODUCT_DEVICE_SPARE_PART_INVENTORY = "product_device_spare_part_inventory"; //鐩樼偣璁板綍
- public static final String PRODUCT_DEVICE_SPARE_PART_INVENTORY_DETAIL = "product_device_spare_part_inventory_detail"; //鐩樼偣璁板綍-鏄庣粏
- public static final String PRODUCT_DEVICE_SPARE_PART_INVENTORY_PROFIT = "product_device_spare_part_inventory_profit"; //鐩樼偣璁板綍-鍖垮悕鐩樼泩
- public static final String PRODUCT_DEVICE_SPARE_PART_INVENTORY_PROFIT_DETAIL = "product_device_spare_part_inventory_profit_detail"; //鐩樼偣璁板綍-鍖垮悕鐩樼泩-鏄庣粏
- public static final String PRODUCT_DEVICE_SPARE_PART_PURCHASE_APPLY = "product_device_spare_part_purchase_apply"; //閲囪喘鐢宠鍗�
- public static final String PRODUCT_DEVICE_SPARE_PART_PURCHASE_APPLY_SUB = "product_device_spare_part_purchase_apply_sub"; //閲囪喘鐢宠鍗�-瀛愯〃
- public static final String PRODUCT_DEVICE_SPARE_PART_PURCHASE_ORDER = "product_device_spare_part_purchase_order"; //閲囪喘璁㈠崟
- public static final String PRODUCT_DEVICE_SPARE_PART_PURCHASE_ORDER_SUB = "product_device_spare_part_purchase_order_sub"; //閲囪喘璁㈠崟-瀛愯〃
- public static final String PRODUCT_DEVICE_SPARE_PART_RECEIVE_SUB = "product_device_spare_part_receive_sub"; //棰嗙敤璁板綍-瀛愯〃
- public static final String PRODUCT_DEVICE_SPARE_PART_RECEIVE_SUB_DETAIL = "product_device_spare_part_receive_sub_detail"; //棰嗙敤璁板綍-瀛愯〃-棰嗙敤鏄庣粏
- public static final String PRODUCT_DEVICE_SPARE_PART_RECEIVE_SUB_SPLIT = "product_device_spare_part_receive_sub_split"; //棰嗙敤璁板綍-瀛愯〃-鎷嗕欢鍏ュ簱鏄庣粏
- public static final String PRODUCT_DEVICE_SPARE_PART_RETURN = "product_device_spare_part_return"; //閫�杩樿褰�
- public static final String PRODUCT_DEVICE_SPARE_PART_RETURN_SUB = "product_device_spare_part_return_sub"; //閫�杩樿褰�-瀛愯〃
- public static final String PRODUCT_DEVICE_SPARE_PART_SCRAP_SUB = "product_device_spare_part_scrap_sub"; //鎶ュ簾璁板綍-瀛愯〃
- public static final String PRODUCT_DEVICE_SPARE_PART_STOCK = "product_device_spare_part_stock"; //搴撳瓨
- public static final String PRODUCT_DEVICE_SPARE_PART_WAREHOUSE_IN = "product_device_spare_part_warehouse_in"; //鍏ュ簱鍗�
- public static final String PRODUCT_DEVICE_SPARE_PART_WAREHOUSE_IN_SUB = "product_device_spare_part_warehouse_in_sub"; //鍏ュ簱鍗�-瀛愯〃
- public static final String PRODUCT_DEVICE_SPARE_PART_WAREHOUSE_IN_SUB_DETAIL = "product_device_spare_part_warehouse_in_sub_detail"; //鍏ュ簱鍗�-瀛愯〃-鏄庣粏
- public static final String PRODUCT_DEVICE_INSPECTION_PLAN_SETTING = "product_device_inspection_plan_setting"; //鐐规璁″垝閰嶇疆琛�
- public static final String PRODUCT_DEVICE_INSPECTION_SETTING = "product_device_inspection_setting"; //鐐规閰嶇疆琛�
-
- //瀛楁
- public static final String DEVICE_QR_CODE= "device_qr_code";
- public static final String DEVICE_CODE="device_code";
- public static final String CREATED_BY="created_by";
- public static final String DICT_VALUE="dict_value";
- public static final String DICT_LABEL="dict_label";
- public static final String TYPE="type";
- public static final String NAME="name";
- public static final String YEAR="year";
- public static final String CYCLE="cycle";
- public static final String DEVICE_NUMBER="device_number";
- public static final String TASK_TITLE="task_title";
- public static final String TASK_TYPE="task_type";
- public static final String TASK_HANDLING_RULE="task_handling_rule";
- public static final String TASK_OWNER="task_owner";
- public static final String START_TIME="start_time";
- public static final String END_TIME="end_time";
- public static final String LINK_UUID="link_uuid";
- public static final String WRITE_BACK_UUID="write_back_uuid";
- public static final String MAINTENANCE_PERSONNEL="maintenance_personnel";
- public static final String DEVICE_UUID="device_uuid";
- public static final String DEVICE_NAME="device_name";
- public static final String DEVICE_MANAGER="manager";
- public static final String DEVICE_TYPE="device_type";
- public static final String ELEVATOR_VARIETY="elevator_variety";
- public static final String PLAN_MAINTENANCE_TIME="plan_maintenance_time";
- public static final String MAINTENANCE_USER="maintenance_user";
- public static final String MAINTENANCE_TIME="maintenance_time";
- public static final String TECHNICIAN="technician";
- public static final String PLAN_START_TIME="plan_start_time";
- public static final String PLAN_FINISH_TIME="plan_finish_time";
- public static final String TASK_STATUS="task_status";
- public static final String TABLE_NAME="table_name";
- public static final String ACTUAL_COMPLETION_TIME="actual_completion_time";
- public static final String ACTUAL_COMPLETION_USER="actual_completion_user";
- public static final String RESPONSIBLE_PERSON="responsible_person";
- public static final String IS_FINISH="is_finish";
- public static final String IS_REVOKE="is_revoke";
- public static final String IS_TIMEOUT="is_timeout";
- public static final String IS_ADD_RECORD="is_add_record";
- public static final String TRANSFER_REASON = "transfer_reason";
- public static final String APPLY_REPAIR_USER = "apply_repair_user";
- public static final String APPLY_REPAIR_TIME = "apply_repair_time";
- public static final String PLAN_SUB_UUID = "plan_sub_uuid";
- public static final String ITEM_UUID = "item_uuid";
- public static final String MAINTENANCE_STATUS = "maintenance_status";
- public static final String MAINTENANCE_TYPE = "maintenance_type";
- public static final String SEND_USER = "send_user";
- public static final String MAINTENANCE_CYCLE = "maintenance_cycle";
- public static final String INSPECTION_CYCLE="inspection_cycle";
- public static final String CYCLE_UNIT = "cycle_unit";
- public static final String MAINTENANCE_ITEM = "maintenance_item";
- public static final String INSPECTION_ITEM = "inspection_item";
- public static final String BACK_TYPE = "back_type";
- public static final String REMARK = "remark";
- public static final String CONFIRM_WAY = "confirm_way";
- public static final String AHEAD_NOTICE_DAY = "ahead_notice_day";
- public static final String INSPECT_FINAL_TIME="inspect_final_time";
- public static final String PARENT_KEY= "parent_key";
-}
diff --git a/product-server-device/src/main/java/com/product/device/config/QuickResponseCode.java b/product-server-device/src/main/java/com/product/device/config/QuickResponseCode.java
deleted file mode 100644
index d9a8158..0000000
--- a/product-server-device/src/main/java/com/product/device/config/QuickResponseCode.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.product.device.config;
-
-import cn.hutool.extra.qrcode.QrConfig;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import java.awt.*;
-
-@Configuration
-public class QuickResponseCode {
-
- @Bean
- public QrConfig qrConfig() {
- return QuickResponseCode.getQRConfig();
- }
-
- public static QrConfig getQRConfig() {
- int wh = 400;
- QrConfig qrConfig = new QrConfig();
- qrConfig.setBackColor(Color.white);
- qrConfig.setForeColor(Color.black);
- qrConfig.setWidth(wh);
- qrConfig.setHeight(wh);
- return qrConfig;
- }
-}
diff --git a/product-server-device/src/main/java/com/product/device/controller/CommonInspectionController.java b/product-server-device/src/main/java/com/product/device/controller/CommonInspectionController.java
deleted file mode 100644
index 1d88962..0000000
--- a/product-server-device/src/main/java/com/product/device/controller/CommonInspectionController.java
+++ /dev/null
@@ -1,168 +0,0 @@
-package com.product.device.controller;
-
-import com.product.device.config.DeviceCode;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletRequest;
-
-import com.product.core.config.CoreConst;
-import com.product.core.controller.support.AbstractBaseController;
-import com.product.core.entity.FieldSetEntity;
-import com.product.core.entity.RequestParameterEntity;
-import com.product.core.exception.BaseException;
-import com.product.core.spring.context.SpringMVCContextHolder;
-import com.product.device.service.CommonInspectionService;
-import com.product.module.sys.version.ApiVersion;
-
-import java.io.IOException;
-
-/**
- * 璁惧鐐规
- */
-@RestController
-@RequestMapping("/api/device/inspection")
-public class CommonInspectionController extends AbstractBaseController {
- @Autowired
- CommonInspectionService commonInspectionService;
-
- /**
- * 璁惧宸℃鏈堝害灞曠ず
- *
- * @throws IOException
- */
- @RequestMapping(value = "/getPatrolMonthlViewy/{version}", method = RequestMethod.POST)
- @ApiVersion(1)
- public String getPatrolMonthlViewy(HttpServletRequest request) {
-
- try {
- FieldSetEntity fse = null;
- Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
- if (bean != null) {
- RequestParameterEntity reqp = (RequestParameterEntity) bean;
- fse = reqp.getFormData();
- }
- if (bean == null || fse == null) {
- SpringMVCContextHolder.getSystemLogger().error(String.valueOf(DeviceCode.SYSTEM_FORM_NODATA));
- return this.error(DeviceCode.SYSTEM_FORM_NODATA);
- }
- String result = OK_List(commonInspectionService.getPatrolMonthlView(fse));
- return result;
- } catch (BaseException e) {
- e.printStackTrace();
- return error(e);
- } catch (Exception e) {
- e.printStackTrace();
- return e.getMessage();
- }
- }
-
- /**
- * 璁惧鐐规鎴栬�呭贰妫�閰嶇疆淇濆瓨
- *
- * @throws IOException
- */
- @RequestMapping(value = "/saveSetting/{version}", method = RequestMethod.POST)
- @ApiVersion(1)
- public String saveSetting(HttpServletRequest request) {
-
- try {
- FieldSetEntity fse = null;
- Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
- if (bean != null) {
- RequestParameterEntity reqp = (RequestParameterEntity) bean;
- fse = reqp.getFormData();
- }
- if (bean == null || fse == null) {
- SpringMVCContextHolder.getSystemLogger().error(String.valueOf(DeviceCode.SYSTEM_FORM_NODATA));
- return this.error(DeviceCode.SYSTEM_FORM_NODATA);
- }
-
- boolean succ = commonInspectionService.saveSetting(fse);
- if (succ) {
- return OK();
- }
- SpringMVCContextHolder.getSystemLogger().error(DeviceCode.SAVE_PATROL_CONFIG_ERROR.getValue(),
- DeviceCode.SAVE_PATROL_CONFIG_ERROR.getText());
- return this.error(DeviceCode.SAVE_PATROL_CONFIG_ERROR);
- } catch (BaseException e) {
- SpringMVCContextHolder.getSystemLogger().error(e);
- return this.error(e);
- } catch (Exception e) {
- SpringMVCContextHolder.getSystemLogger().error(e);
- return this.error(DeviceCode.SAVE_PATROL_CONFIG_ERROR);
- }
- }
-
- /**
- * 璁惧鐐规鎴栬�呭贰妫�澶嶆牳
- *
- * @throws IOException
- */
- @RequestMapping(value = "/batchReview/{version}", method = RequestMethod.POST)
- @ApiVersion(1)
- public String batchReview(HttpServletRequest request) {
-
- try {
- FieldSetEntity fse = null;
- Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
- if (bean != null) {
- RequestParameterEntity reqp = (RequestParameterEntity) bean;
- fse = reqp.getFormData();
- }
- if (bean == null || fse == null) {
- SpringMVCContextHolder.getSystemLogger().error(String.valueOf(DeviceCode.SYSTEM_FORM_NODATA));
- return this.error(DeviceCode.SYSTEM_FORM_NODATA);
- }
-
- boolean succ = commonInspectionService.batchReview(fse);
- if (succ) {
- return OK();
- }
- SpringMVCContextHolder.getSystemLogger().error(DeviceCode.SAVE_PATROL_CONFIG_ERROR.getValue(),
- DeviceCode.SAVE_PATROL_CONFIG_ERROR.getText());
- return error(DeviceCode.SAVE_PATROL_CONFIG_ERROR.getValue(), DeviceCode.SAVE_PATROL_CONFIG_ERROR.getText());
- } catch (BaseException e) {
- SpringMVCContextHolder.getSystemLogger().error(e);
- return this.error(e);
- } catch (Exception e) {
- SpringMVCContextHolder.getSystemLogger().error(e);
- return this.error(DeviceCode.SAVE_PATROL_CONFIG_ERROR.getValue(),
- DeviceCode.SAVE_PATROL_CONFIG_ERROR.getText());
- }
- }
-
- /**
- * 璁惧宸℃閰嶇疆璇︽儏
- *
- * @throws IOException
- */
- @RequestMapping(value = "/findPatrolSetting/{version}", method = RequestMethod.POST)
- @ApiVersion(1)
- public String findPatrolSetting(HttpServletRequest request) {
-
- try {
- FieldSetEntity fse = null;
- Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
- if (bean != null) {
- RequestParameterEntity reqp = (RequestParameterEntity) bean;
- fse = reqp.getFormData();
- }
- if (bean == null || fse == null) {
- SpringMVCContextHolder.getSystemLogger().error(String.valueOf(DeviceCode.SYSTEM_FORM_NODATA));
- return this.error(DeviceCode.SYSTEM_FORM_NODATA);
- }
-
- String result = OK_List(commonInspectionService.findPatrolSetting());
- return result;
- } catch (BaseException e) {
- e.printStackTrace();
- return error(e);
- } catch (Exception e) {
- e.printStackTrace();
- return e.getMessage();
- }
- }
-}
diff --git a/product-server-device/src/main/java/com/product/device/controller/DeviceMaintenanceController.java b/product-server-device/src/main/java/com/product/device/controller/DeviceMaintenanceController.java
deleted file mode 100644
index 9c9db87..0000000
--- a/product-server-device/src/main/java/com/product/device/controller/DeviceMaintenanceController.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package com.product.device.controller;
-
-import com.product.core.entity.FieldSetEntity;
-import com.product.core.exception.BaseException;
-import com.product.device.config.DeviceCode;
-import com.product.module.sys.version.ApiVersion;
-import com.product.util.BaseUtil;
-import com.product.util.support.AbstractBaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-
-import com.product.device.service.DeviceMainenanceService;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * 璁惧淇濆吇
- */
-@RestController
-@RequestMapping("/api/device/maintenance")
-public class DeviceMaintenanceController extends AbstractBaseController {
- @Autowired
- DeviceMainenanceService deviceMainenanceService;
-
-
- @PostMapping("/{version}")
- @ApiVersion(1)
- public String getMaintainByCurrentYear(HttpServletRequest request) {
- try {
- FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
- return OK_List(deviceMainenanceService.getMaintainByCurrentYear(fse));
- } catch (BaseException e) {
- return error(e);
- } catch (Exception e) {
- return error(DeviceCode.COMMON_DATA_ERROR, e);
- }
- }
-
- @PostMapping("/month/{version}")
- @ApiVersion(1)
- public String getMaintainMonth(HttpServletRequest request) {
- try {
- FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
- return OK_List(deviceMainenanceService.getMaintainMonth(fse));
- } catch (BaseException e) {
- return error(e);
- } catch (Exception e) {
- return error(DeviceCode.COMMON_DATA_ERROR, e);
- }
- }
-
- /**
- * 澶嶆牳缁翠繚璁板綍
- *
- * @param request
- * @return
- */
- @PostMapping("/review/{version}")
- @ApiVersion(1)
- public String reviewRecord(HttpServletRequest request) {
- try {
- FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
- if (!deviceMainenanceService.maintenanceReview(fse)) {
- //鏇存柊澶辫触
- return error(DeviceCode.DEVICE_MAINTENANCE_REVIEW_FAIL);
- }
- return OK();
- } catch (BaseException e) {
- return error(e);
- } catch (Exception e) {
- return error(DeviceCode.COMMON_DATA_ERROR, e);
- }
- }
-
- /**
- * 缁翠繚鍗曚綅骞村害缁翠繚缁熻
- * @param request
- * @return
- */
- @PostMapping("/year-maintenance/{version}")
- @ApiVersion(1)
- public String yearMaintenance(HttpServletRequest request) {
- try {
- FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
- return OK_List(deviceMainenanceService.yearMaintenance(fse));
- } catch (BaseException e) {
- return error(e);
- } catch (Exception e) {
- return error(DeviceCode.DEVICE_MAINTENANCE_YEAR_FAIL, e);
- }
- }
-
- /**
- * 缁翠繚鍗曚綅骞村害缁翠繚浠诲姟瀹屾垚鎯呭喌
- * @param request
- * @return
- */
- @PostMapping("/year-maintenance-finish/{version}")
- @ApiVersion(1)
- public String yearMaintenanceFinish(HttpServletRequest request) {
- try {
- FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
- return OK_List(deviceMainenanceService.yearMaintenanceFinish(fse));
- } catch (BaseException e) {
- return error(e);
- } catch (Exception e) {
- return error(DeviceCode.DEVICE_MAINTENANCE_YEAR_FINISH_FAIL, e);
- }
- }
-}
diff --git a/product-server-device/src/main/java/com/product/device/controller/QuickResponseController.java b/product-server-device/src/main/java/com/product/device/controller/QuickResponseController.java
deleted file mode 100644
index 8eb94f8..0000000
--- a/product-server-device/src/main/java/com/product/device/controller/QuickResponseController.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.product.device.controller;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletResponse;
-
-import com.product.device.service.QuickResponseService;
-
-import java.io.IOException;
-
-@RestController
-@RequestMapping("/api/common/util")
-public class QuickResponseController {
- @Autowired
- QuickResponseService qrService;
- @RequestMapping("/create-qr")
- public void generateV3(String content, HttpServletResponse servletResponse) throws IOException {
- qrService.generateStream(content,servletResponse);
- }
-}
diff --git a/product-server-device/src/main/java/com/product/device/data/gather/service/DeviceDataProcessThread.java b/product-server-device/src/main/java/com/product/device/data/gather/service/DeviceDataProcessThread.java
deleted file mode 100644
index 0413530..0000000
--- a/product-server-device/src/main/java/com/product/device/data/gather/service/DeviceDataProcessThread.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.product.device.data.gather.service;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.net.Socket;
-import java.nio.charset.Charset;
-
-import com.product.core.dao.BaseDao;
-import com.product.core.spring.context.SpringMVCContextHolder;
-
-import org.mozilla.universalchardet.UniversalDetector;
-
-
-public class DeviceDataProcessThread extends Thread {
- Charset utf8Charset = Charset.forName("UTF-8");
- Charset gbkCharset = Charset.forName("GBK");
- Charset gbCharset = Charset.forName("GB2312");
- Charset ISOCharset = Charset.forName("ISO-8859-1");
- Charset US = Charset.forName("US-ASCII");
-
- public BaseDao baseDao;
-
- Socket socket = null;
- //姣忓惎鍔ㄤ竴涓嚎绋嬶紝杩炴帴瀵瑰簲鐨凷ocket
-
- public DeviceDataProcessThread(Socket socket,BaseDao dao) {
- this.socket = socket;
- this.baseDao=dao;
- }
-
- //鍚姩绾跨▼锛屽嵆鍝嶅簲瀹㈡埛璇锋眰
- public void run() {
- BufferedReader reader=null;
-
- BufferedWriter writer=null;
- try {
- reader = new BufferedReader(new InputStreamReader(socket.getInputStream()));//璇诲彇瀹㈡埛绔秷鎭�
- writer=new BufferedWriter(new OutputStreamWriter(socket.getOutputStream()));//鍚戝鎴风鍐欐秷鎭�
- String line="";
- while((line=reader.readLine()) !=null ){
-// SpringMVCContextHolder.getSystemLogger().info("=============="+encode(line));
- SpringMVCContextHolder.getSystemLogger().info("=====瀛楃缂栫爜锛�"+getEncoding(line));
- SpringMVCContextHolder.getSystemLogger().info("=====鏀跺埌鏉ヨ嚜瀹㈡埛绔彂閫佺殑娑堟伅鏄細" + line);
-// SpringMVCContextHolder.getSystemLogger().info("=====鏀跺埌鏉ヨ嚜瀹㈡埛绔殑鍙戦�佺殑娑堟伅鏄�1111锛�" + new String(line.getBytes(utf8Charset)));
-// SpringMVCContextHolder.getSystemLogger().info("=====鏀跺埌鏉ヨ嚜瀹㈡埛绔殑鍙戦�佺殑娑堟伅鏄�1锛�" + new String(line.getBytes(US),gbkCharset));
-// SpringMVCContextHolder.getSystemLogger().info("=====鏀跺埌鏉ヨ嚜瀹㈡埛绔殑鍙戦�佺殑娑堟伅鏄�12锛�" + new String(line.getBytes(US),utf8Charset));
-// String lineGBK = new String(line.getBytes(ISOCharset), gbkCharset);
-// SpringMVCContextHolder.getSystemLogger().info("=====鏀跺埌鏉ヨ嚜瀹㈡埛绔殑鍙戦�佺殑娑堟伅鏄�2锛�" + lineGBK);
-// String lineUTF8 = new String(line.getBytes(ISOCharset), utf8Charset);
-// SpringMVCContextHolder.getSystemLogger().info("=====鏀跺埌鏉ヨ嚜瀹㈡埛绔殑鍙戦�佺殑娑堟伅鏄�3锛�" + lineUTF8);
-// String lineiso = new String(line.getBytes(utf8Charset), ISOCharset);
-// SpringMVCContextHolder.getSystemLogger().info("=====鏀跺埌鏉ヨ嚜瀹㈡埛绔殑鍙戦�佺殑娑堟伅鏄�4锛�" + lineiso);
-// String lineug = new String(line.getBytes(utf8Charset), gbkCharset);
-// SpringMVCContextHolder.getSystemLogger().info("=====鏀跺埌鏉ヨ嚜瀹㈡埛绔殑鍙戦�佺殑娑堟伅鏄�5锛�" + lineug);
-//
-// String linegi = new String(line.getBytes(gbkCharset), ISOCharset);
-// SpringMVCContextHolder.getSystemLogger().info("=====鏀跺埌鏉ヨ嚜瀹㈡埛绔殑鍙戦�佺殑娑堟伅鏄�6锛�" + linegi);
-// String linegu = new String(line.getBytes(gbkCharset), utf8Charset);
-// SpringMVCContextHolder.getSystemLogger().info("=====鏀跺埌鏉ヨ嚜瀹㈡埛绔殑鍙戦�佺殑娑堟伅鏄�7锛�" + linegu);
- }
-
- writer.write("鏈嶅姟鍣ㄥ凡鏀跺埌:"+line+"\n");
- writer.flush();
- } catch (IOException e) {
- e.printStackTrace();
- } finally{
- try {
- if(reader!=null) {
- reader.close();
- }
- if(writer!=null) {
- writer.close();
- }
-// if(socket!=null) {
-// socket.close();
-// }
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
-
- }
-
- public static String encode(String str) {
-// String testString = "杩欐槸涓�涓祴璇曞瓧绗︿覆";
- byte[] testData = str.getBytes();
-
- // 鍒濆鍖� CharsetDetector
- UniversalDetector detector = new UniversalDetector(null);
-
- // 灏嗘暟鎹～鍏呭埌 CharsetDetector
- detector.handleData(testData, 0, testData.length);
-
- // 瀹屾垚鏁版嵁濉厖
- detector.dataEnd();
-
- // 鑾峰彇妫�娴嬪嚭鏉ョ殑瀛楃闆�
- String encoding = detector.getDetectedCharset();
-
- if (encoding != null) {
- System.out.println("缂栫爜鏍煎紡涓猴細" + encoding);
- } else {
- System.out.println("鏈兘妫�娴嬪嚭缂栫爜鏍煎紡銆�");
- }
-
- // 閲婃斁璧勬簮
- detector.reset();
- return encoding;
- }
-
-
- public static String getEncoding(String str) {
- String encode = "GB2312";
- try {
- if (isEncoding(str, encode)) { // 鍒ゆ柇鏄笉鏄疓B2312
- return encode;
- }
- } catch (Exception exception) {
-
- }
- encode = "ISO-8859-1";
- try {
- if (isEncoding(str, encode)) { // 鍒ゆ柇鏄笉鏄疘SO-8859-1
- return encode;
- }
- } catch (Exception exception1) {
- }
- encode = "UTF-8";
- try {
- if (isEncoding(str, encode)) { // 鍒ゆ柇鏄笉鏄疷TF-8
- return encode;
- }
- } catch (Exception exception2) {
- }
- encode = "GBK";
- try {
- if (isEncoding(str, encode)) { // 鍒ゆ柇鏄笉鏄疓BK
- return encode;
- }
- } catch (Exception exception3) {
- }
- return "濡傛灉閮戒笉鏄紝璇存槑杈撳叆鐨勫唴瀹逛笉灞炰簬甯歌鐨勭紪鐮佹牸寮�"; // 濡傛灉閮戒笉鏄紝璇存槑杈撳叆鐨勫唴瀹逛笉灞炰簬甯歌鐨勭紪鐮佹牸寮忋��
- }
-
- public static boolean isEncoding(String str, String encode) {
- try {
- if (str.equals(new String(str.getBytes(), encode))) {
- return true;
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- return false;
- }
-
-}
\ No newline at end of file
diff --git a/product-server-device/src/main/java/com/product/device/data/gather/service/DeviceDataThread.java b/product-server-device/src/main/java/com/product/device/data/gather/service/DeviceDataThread.java
deleted file mode 100644
index 3d38087..0000000
--- a/product-server-device/src/main/java/com/product/device/data/gather/service/DeviceDataThread.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.product.device.data.gather.service;
-
-import java.io.IOException;
-import java.net.ServerSocket;
-import java.net.Socket;
-
-import com.product.core.dao.BaseDao;
-import com.product.core.spring.context.SpringBeanUtil;
-import com.product.core.spring.context.SpringMVCContextHolder;
-import com.product.device.config.DeviceConst;
-
-
-
-public class DeviceDataThread extends Thread {
-
-
- //鏈嶅姟鍣ㄧ姸鎬�
- public static boolean serverStatus=false;
-
- @Override
- public void run() {
- start();
- }
-
- public void start() {
- ServerSocket serverSocket = null;
- try {
- // 寤虹珛涓�涓湇鍔″櫒Socket(ServerSocket)鎸囧畾绔彛骞跺紑濮嬬洃鍚�
- serverSocket = new ServerSocket(DeviceConst.DEVICE_DATA_SOCKET_PORT);
- serverStatus=true;
- SpringMVCContextHolder.getSystemLogger().info("=====寤虹珛鏁版嵁鎺ユ敹鏈嶅姟,绔彛"+DeviceConst.DEVICE_DATA_SOCKET_PORT);
- // 鐩戝惉涓�鐩磋繘琛屼腑
- while (true) {
- // 浣跨敤accept()鏂规硶绛夊緟瀹㈡埛鍙戣捣閫氫俊
- Socket socket = serverSocket.accept();
- DeviceDataProcessThread thread = new DeviceDataProcessThread(socket,SpringBeanUtil.getBean(BaseDao.class));
- thread.start();
- }
- } catch (IOException e) {
- serverStatus=false;
- e.printStackTrace();
- }
- }
-}
diff --git a/product-server-device/src/main/java/com/product/device/data/gather/service/DeviceDataThreadMonitor.java b/product-server-device/src/main/java/com/product/device/data/gather/service/DeviceDataThreadMonitor.java
deleted file mode 100644
index 926d2e6..0000000
--- a/product-server-device/src/main/java/com/product/device/data/gather/service/DeviceDataThreadMonitor.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.product.device.data.gather.service;
-
-public class DeviceDataThreadMonitor extends Thread {
-
- @Override
- public void run() {
-
-
- }
-}
diff --git a/product-server-device/src/main/java/com/product/device/service/CommonInspectionService.java b/product-server-device/src/main/java/com/product/device/service/CommonInspectionService.java
deleted file mode 100644
index 135dd44..0000000
--- a/product-server-device/src/main/java/com/product/device/service/CommonInspectionService.java
+++ /dev/null
@@ -1,304 +0,0 @@
-package com.product.device.service;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-import com.product.admin.service.PublicService;
-import com.product.core.dao.BaseDao;
-import com.product.core.entity.DataTableEntity;
-import com.product.core.entity.FieldSetEntity;
-import com.product.core.exception.BaseException;
-import com.product.core.service.support.AbstractBaseService;
-import com.product.core.spring.context.SpringMVCContextHolder;
-import com.product.core.transfer.Transactional;
-import com.product.device.config.DeviceCode;
-import com.product.device.config.DeviceConst;
-import com.product.device.service.idel.IDeviceInspectionService;
-import com.product.module.sys.entity.SystemUser;
-import com.product.util.BaseUtil;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-
-/**
- * 璁惧鐐规
- *
- * @Author
- * @Date 2022/3/8 16:33
- * @Desc 鍔熻兘鐩稿叧 service
- */
-@Service
-public class CommonInspectionService extends AbstractBaseService implements IDeviceInspectionService {
-
- @Autowired
- public BaseDao baseDao;
- @Autowired
- DeviceManagerService deviceManagerService;
- @Autowired
- PublicService publicService;
- @Autowired
- DeviceTaskService deviceTaskService;
- /**
- * 鑾峰彇璁惧淇℃伅 鍖呮嫭瀛愯澶�
- *
- * @param device_sn
- * @return
- */
- public FieldSetEntity createInspection(String device_sn) {
- FieldSetEntity dev = deviceManagerService.findDevice( device_sn);
- baseDao.loadPromptData(dev);
- if (dev != null) {
- DataTableEntity dt = baseDao.listTable(DeviceConst.TABLE_PRODUCT_DEVICE_INSPECT_ITEM_CONFIG, " uuid in( select config_uuid from" + DeviceConst.TABLE_PRODUCT_INSPECT_SETTING_SUB + " where main_uuid=(select uuid from " + DeviceConst.TABLE_PRODUCT_INSPECT_SETTING + " where device_type=? )", new String[]{dev.getString("device_type")});
- if (!DataTableEntity.isEmpty(dt)) {
- Map<String, DataTableEntity> sub = new HashMap<>();
- sub.put("sub", dt);
- dev.setSubData(sub);
- dev.addSubDataTable(dt);
- }
- }
- return dev;
- }
-
- public DataTableEntity getPatrolMonthlView(FieldSetEntity fliter) throws BaseException{
- StringBuffer sb = new StringBuffer();
- ArrayList<String> parme = new ArrayList<>();
- sb.append(" SELECT a.name obName,GROUP_CONCAT( CONCAT(check_time,'&',result) ) check_time FROM(");
- sb.append(" SELECT c.name,b.result,DATE_FORMAT( a.check_time, '%d' ) check_time FROM ");
-
- sb.append(" "+fliter.getTableName()+" a LEFT JOIN "+fliter.getTableName()+"_sub b on a.uuid =b.record_uuid ");
-
- sb.append(" LEFT JOIN product_device_patrol_config c on b.patrol_uuid=c.uuid where 1=1");
-
-
- if (!StringUtils.isEmpty(fliter.getString("device_number"))) {
- sb.append(" and a.device_number=?");
- parme.add(fliter.getString("device_number"));
- }
- if (!StringUtils.isEmpty(fliter.getString("patrol_user"))) {
- sb.append(" and a.patrol_user=?");
- parme.add(fliter.getString("patrol_user"));
- }
- if (!StringUtils.isEmpty(fliter.getString("check_time"))) {
- sb.append(" and DATE_FORMAT( a.check_time, '%Y-%m' )=?");
- parme.add(fliter.getString("check_time").substring(0, 7));
- } else {
- throw new BaseException("0","骞存湀涓嶈兘涓虹┖");
- }
- sb.append(" GROUP BY c.name,b.result,DATE_FORMAT( a.check_time, '%d' ) ");
- sb.append(") a GROUP BY a.name ");
- String[] pArr = parme.toArray(new String[parme.size()]);
- DataTableEntity dt = baseDao.listTable(sb.toString(), pArr);
- for (int i = 0; i <dt.getRows() ; i++) {
- FieldSetEntity fs = dt.getFieldSetEntity(i);
- String check_time = fs.getString("check_time");
- if (!StringUtils.isEmpty(check_time)){
- String[] check_time_arr = check_time.split(",");
- for (int j = 0; j <check_time_arr.length ; j++) {
- String[] v = check_time_arr[j].split("&");
- fs.setValue("m"+v[0],v[1]);
- }
-
- }
- }
- return dt;
- }
-
- public FieldSetEntity getInspectionSetting(String device_type) {
- FieldSetEntity fs = baseDao.getFieldSetByFilter(DeviceConst.TABLE_PRODUCT_INSPECTION_SETTING, " device_type=? ", new String[]{device_type}, false);
- return fs;
- }
-
- public DataTableEntity getTreeArchives() {
- DataTableEntity dt = baseDao.listTable(DeviceConst.TABLE_PRODUCT_DEVICE_ARCHIVE, new String[]{});
- return dt;
- }
-
- /**
- * 淇濇寔璁惧閰嶇疆锛堢偣妫�銆佸贰妫�銆佷繚鍏伙級
- * @param fs
- * @return
- */
- @Transactional
- public boolean saveSetting(FieldSetEntity fs) {
- DataTableEntity subTable = fs.getSubDataTable("subTable");
- boolean re = true;
- for (int i = 0; i < subTable.getRows(); i++) {
- FieldSetEntity sub = subTable.getFieldSetEntity(i);
- sub.setTableName(fs.getTableName());
- if (!StringUtils.isEmpty(sub.getString("~type~"))) {
- publicService.delete(sub);
- continue;
- }
- sub.setValue("device_number", fs.getString("device_number"));
- sub.setValue("cycle", fs.getString("cycle"));
- baseDao.executeUpdate("update product_device_maintenance_setting set device_number=? ",new String[] {fs.getString("device_number")});
-
- if ("product_device_maintenance_setting".equals(fs.getTableName())){
- sub.setValue("type", fs.getString("type"));
- sub.setValue("ahead_notice_day", fs.getString("ahead_notice_day"));
- }
- if ("product_device_inspection_setting".equals(fs.getTableName())){
- sub.setValue("start_time", fs.getDate("start_time"));
- sub.setValue("warn_time", fs.getDate("warn_time"));
- }
- String uuid = publicService.saveFieldSetEntity(sub);
- if (StringUtils.isEmpty(uuid)) {
- re = false;
- }
- }
- return re;
- }
-
- @Transactional
- public boolean batchReview(FieldSetEntity fs) {
- String uuid = fs.getString("uuid");
- if (StringUtils.isEmpty(uuid)) {
- return false;
- }
- String[] split = uuid.split(",");
- boolean re = true;
- for (int i = 0; i < split.length; i++) {
- FieldSetEntity recordFs = new FieldSetEntity();
- recordFs.setTableName(fs.getTableName());
- recordFs.setValue("uuid", split[i]);
- recordFs.setValue("check_user", SpringMVCContextHolder.getCurrentUser().getUser_id());
- recordFs.setValue("check_time", new Date());
- String uuids = publicService.saveFieldSetEntity(recordFs);
- if (StringUtils.isEmpty(uuids)) {
- re = false;
- }
-
- }
- return re;
- }
-
- public FieldSetEntity findPatrolSetting() {
- DataTableEntity dataTableEntity = baseDao.listTable(DeviceConst.TABLE_PRODUCT_PATROL_SETTING, "");
- FieldSetEntity fs = new FieldSetEntity();
- fs.setTableName(DeviceConst.TABLE_PRODUCT_PATROL_SETTING);
-
- DataTableEntity dt = new DataTableEntity();
-
- for (int i = 0; i < dataTableEntity.getRows(); i++) {
- FieldSetEntity sub = dataTableEntity.getFieldSetEntity(i);
- FieldSetEntity fsSub = new FieldSetEntity();
- fsSub.setTableName(DeviceConst.TABLE_PRODUCT_PATROL_SETTING);
- fsSub.setValue("patrol_config_uuid", sub.getString("patrol_config_uuid"));
- fsSub.setValue("remark", sub.getString("remark"));
- fsSub.setValue("uuid", sub.getString("uuid"));
- dt.addFieldSetEntity(fsSub);
- fs.setValue("device_number", sub.getString("device_number"));
- fs.setValue("cycle", sub.getString("cycle"));
-
- }
- Map<String, DataTableEntity> sub = new HashMap<>();
- sub.put("subTable", dt);
- fs.setSubData(sub);
- return fs;
- }
- public FieldSetEntity findInspectionSetting() {
- DataTableEntity dataTableEntity = baseDao.listTable(DeviceConst.TABLE_PRODUCT_INSPECTION_SETTING, "");
- FieldSetEntity fs = new FieldSetEntity();
- fs.setTableName(DeviceConst.TABLE_PRODUCT_INSPECTION_SETTING);
-
- DataTableEntity dt = new DataTableEntity();
-
- for (int i = 0; i < dataTableEntity.getRows(); i++) {
- FieldSetEntity sub = dataTableEntity.getFieldSetEntity(i);
- FieldSetEntity fsSub = new FieldSetEntity();
- fsSub.setTableName(DeviceConst.TABLE_PRODUCT_INSPECTION_SETTING);
- fsSub.setValue("inspection_uuid", sub.getString("inspection_uuid"));
- fsSub.setValue("remark", sub.getString("remark"));
- fsSub.setValue("uuid", sub.getString("uuid"));
- fsSub.setValue("back_type", sub.getString("back_type"));
-
- dt.addFieldSetEntity(fsSub);
- fs.setValue("device_number", sub.getString("device_number"));
- fs.setValue("cycle", sub.getString("cycle"));
- fs.setValue("start_time", sub.getString("start_time"));
- fs.setValue("warn_time", sub.getString("warn_time"));
-
- }
- Map<String, DataTableEntity> sub = new HashMap<>();
- sub.put("subTable", dt);
- fs.setSubData(sub);
- return fs;
- }
- /**
- * 璁惧鐨勭偣妫�閰嶇疆
- * @param asset_code
- * @return
- */
- public FieldSetEntity findDeviceSetting(String device_uuid) {
- FieldSetEntity device=deviceManagerService.findDevice(device_uuid);
- String sql="select c.* from product_device_inspection_setting a join product_device_inspection_setting_sub b on a.uuid=b.main_uuid left join product_device_inspection_item_config c on b.config_uuid=c.uuid and c.is_used=1 where status=1 and a.device_uuid=? ";
- DataTableEntity dataTableEntity = baseDao.listTable(sql,new String[] {device_uuid});
- device.addSubDataTable(dataTableEntity);
- return device;
- }
- /**
- * 璁惧鐨勭偣妫�璁板綍
- * @param asset_code
- * @return
- */
- public FieldSetEntity findInspectionRecord(String uuid) {
- FieldSetEntity record=baseDao.getFieldSetEntity("product_device_inspection_record",
- new String[]{"device_uuid","inspect_user","inspect_final_time","check_user","check_time","is_finish"},uuid, false);
-
- if(!FieldSetEntity.isEmpty(record)) {
-
- FieldSetEntity device=deviceManagerService.findDevice(record.getString("device_uuid"));
- record.setValue("device_uuid", device.getString("device_name"));
- record.setValue("device_uuid_save_value", device.getString("uuid"));
-
- String sql="select s.*,c.* from product_device_inspection_setting a left join product_device_inspection_item_config c on a.inspection_item=c.uuid and c.is_used=1 left join product_device_inspection_record_sub s on s.inspect_item=c.uuid and record_uuid=? where a.device_uuid=? ";
- DataTableEntity dt = baseDao.listTable(sql,new String[] {uuid,record.getString("device_uuid_save_value")});
- record.addSubDataTable(dt); //鐐规椤�
-// record.removeSubData("product_device_inspection_record_sub");
- }
- return record;
- }
- /**
- * 淇濆瓨鐐规淇℃伅
- * @param fs
- * @return
- */
- @Transactional
- public String saveInspection(FieldSetEntity fs) throws BaseException{
- if(!FieldSetEntity.isEmpty(fs) ) {
- FieldSetEntity rfs=new FieldSetEntity(DeviceConst.PRODUCT_DEVICE_INSPECTION_RECORD);
- SystemUser user = SpringMVCContextHolder.getCurrentUser();
- rfs.setValue("org_level_uuid", user.getOrg_level_uuid());
-// rfs.setValue("device_uuid", fs.getValue("device_number"));
- rfs.setValue("device_uuid", fs.getValue("uuid"));
- rfs.setValue("is_finish", 0);
- rfs.setValue("use_dept", user.getOrg_level_uuid());
- rfs.setValue("inspect_user", user.getUser_id());
- rfs.setValue("inspect_final_time",new Date());
-// rfs.setValue("task_uuid", fieldValue);
- DataTableEntity dt=fs.getSubDataTable(DeviceConst.PRODUCT_DEVICE_INSPECTION_RECORD_SUB);
- if(!DataTableEntity.isEmpty(dt)) {
- rfs.addSubDataTable(dt);
- if(baseDao.saveFieldSetEntity(rfs)) {//鍒涘缓浠诲姟
- deviceTaskService.automaticCreateTask(
- String.format(DeviceConst.TASK_TITLE_FORMAT_SPOT_CHECK, fs.getString(DeviceConst.DEVICE_NAME))
- ,DeviceConst.TASK_TYPE_SPOT_CHECK
- ,rfs.getUUID()
- ,fs.getString(DeviceConst.DEVICE_MANAGER)
- );
-
- }
- }
- return rfs.getUUID();
- }
-
- return null;
- }
-
-
-
-}
\ No newline at end of file
diff --git a/product-server-device/src/main/java/com/product/device/service/DeviceMainenanceService.java b/product-server-device/src/main/java/com/product/device/service/DeviceMainenanceService.java
deleted file mode 100644
index c7b3ba9..0000000
--- a/product-server-device/src/main/java/com/product/device/service/DeviceMainenanceService.java
+++ /dev/null
@@ -1,265 +0,0 @@
-package com.product.device.service;
-
-import cn.hutool.core.collection.CollectionUtil;
-import com.beust.jcommander.internal.Lists;
-import com.product.core.config.CoreConst;
-import com.product.core.dao.BaseDao;
-import com.product.core.entity.DataTableEntity;
-import com.product.core.entity.FieldSetEntity;
-import com.product.core.exception.BaseException;
-import com.product.core.service.support.AbstractBaseService;
-import com.product.core.spring.context.SpringMVCContextHolder;
-import com.product.core.transfer.Transactional;
-import com.product.device.config.DeviceCode;
-import com.product.device.config.DeviceConst;
-import com.product.device.service.idel.IDeviceMainenanceService;
-import com.product.module.sys.entity.SystemUser;
-import com.product.task.device.service.DeviceManagerTaskService;
-import com.product.util.BaseUtil;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-
-/**
- * 璁惧缁翠慨
- *
- * @Author
- * @Date 2022/3/8 16:33
- * @Desc 鍔熻兘鐩稿叧 service
- */
-@Service
-public class DeviceMainenanceService extends AbstractBaseService implements IDeviceMainenanceService {
-
- @Autowired
- public BaseDao baseDao;
- @Autowired
- DeviceManagerService deviceManagerService;
- @Autowired
- DeviceManagerTaskService deviceManagerTaskService;
-
- /**
- * 鑾峰彇璁惧淇℃伅 鍖呮嫭瀛愯澶�
- *
- * @return
- */
- @Transactional
- public String saveDeviceFailure(FieldSetEntity fs) {
- SystemUser currentUser = SpringMVCContextHolder.getCurrentUser();
- if (fs != null) {
- fs.setValue("org_level_uuid", currentUser.getOrg_level_uuid());
- }
- fs.setTableName(DeviceConst.TABLE_PRODUCT_REPAIR_FAILURE);
- boolean b = baseDao.saveFieldSetEntity(fs);
- if (b) {
- //淇敼璁惧鐨勭姸鎬佷负鍋滄満缁翠慨
- deviceManagerService.deviceStatusChange(fs.getString("asset_code"), "2");
-// //涓婃姤浠诲姟鐢熸垚
-// deviceManagerTaskService.createTask();
- //璁惧杩愯璁板綍
- deviceManagerService.appendDeivceManageLog(fs.getString("asset_code"), fs.getString("created_by"), "", "璁惧鏁呴殰涓婃姤", "product_device_repair_failure_record", fs.getString("uuid"));
- }
-
- return fs.getString(CoreConst.UUID);
- }
-
- /**
- * 鍒涘缓缁翠慨浠诲姟锛岀涓�娆″彲鑳介�変腑鐨勬槸璋冨害浜猴紝涔熷彲鑳芥槸缁翠慨浜哄憳
- *
- * @param fs
- */
- public void createMaintainTask(FieldSetEntity fs) {
-
- deviceManagerTaskService.createTask();
- }
-
-
- /**
- * 鑾峰彇鏈勾宸插畬鎴愮殑淇濆吇璁板綍
- */
- public DataTableEntity getMaintainByCurrentYear(FieldSetEntity fse) {
- StringBuilder sql = new StringBuilder();
- sql.append("\nSELECT b.*,a.plan_maintenance_time,a.maintenance_user,a.maintenance_time,a.check_user,a.check_time FROM `product_device_maintenance_record` a ");
- sql.append("\nINNER JOIN `product_device_info` b ON a. device_uuid=b.uuid ");
- sql.append("\nwhere length(a.check_user)>0 ");
- String elevatorVariety = fse.getString("elevator_variety");
- String maintenanceUnit = fse.getString("maintenance_unit");
- List<Object> params = StringUtils.isAnyEmpty(elevatorVariety, maintenanceUnit) ? new ArrayList<>() : null;
- if (!StringUtils.isEmpty(elevatorVariety)) {
- String[] split = elevatorVariety.split(",");
- sql.append("\nAND ").append(BaseUtil.buildQuestionMarkFilter("b.elevator_variety", split.length, true));
- params.addAll(CollectionUtil.toList(split));
- }
- if (!StringUtils.isEmpty(maintenanceUnit)) {
- sql.append("\nAND b.maintenance_unit=? ");
- params.add(elevatorVariety);
- }
- Integer cpage = fse.getInteger(DeviceConst.CPAGE);
- Integer pageSize = fse.getInteger(DeviceConst.PAGESIZE);
- //鏌ヨ宸插鏍歌繃鐨勮褰�
- sql.append(" order by a.maintenance_time desc ");
- DataTableEntity result = baseDao.listTable(sql.toString(), params.toArray(), pageSize, cpage);
- result.getMeta().addAliasTable("product_device_info", "b");
- result.getMeta().addAliasTable("product_device_maintenance_record", "a");
- baseDao.loadPromptData(result);
- return result;
- }
-
-
- public DataTableEntity getMaintainMonth(FieldSetEntity fse) {
- Integer cpage = fse.getInteger(DeviceConst.CPAGE);
- Integer pageSize = fse.getInteger(DeviceConst.PAGESIZE);
- StringBuilder sql = new StringBuilder();
- sql.append("\nSELECT b.*,a.maintenance_user, a.plan_finish_time FROM `product_device_maintenance_plan_sub`a ");
- sql.append("\nINNER JOIN `product_device_info`b ON a.device_uuid = b.uuid ");
- //sql鏌ヨplan_finish_time鏃堕棿鏄惁灞炰簬褰撴湀
- sql.append("\nWHERE MONTH(a.plan_finish_time) = MONTH(NOW()) AND a.is_finish=1");
- String elevatorVariety = fse.getString("elevator_variety");
- String maintenanceUnit = fse.getString("maintenance_unit");
- List<Object> params = StringUtils.isAnyEmpty(elevatorVariety, maintenanceUnit) ? new ArrayList<>() : null;
- if (!StringUtils.isEmpty(elevatorVariety)) {
- String[] split = elevatorVariety.split(",");
- sql.append("\nAND ").append(BaseUtil.buildQuestionMarkFilter("b.elevator_variety", split.length, true));
- params.addAll(CollectionUtil.toList(split));
- }
- if (!StringUtils.isEmpty(maintenanceUnit)) {
- sql.append("\nAND b.maintenance_unit=? ");
- params.add(elevatorVariety);
- }
- DataTableEntity result = baseDao.listTable(sql.toString(), params.toArray(), pageSize, cpage);
- result.getMeta().addAliasTable("product_device_info", "b");
- result.getMeta().addAliasTable("product_device_maintenance_plan_sub", "a");
- return result;
- }
-
- /**
- * 缁翠繚璁板綍澶嶆牳
- */
- public boolean maintenanceReview(FieldSetEntity fse) {
- String uuids = fse.getString("uuids");
- if (StringUtils.isBlank(uuids)) {
- throw new BaseException(DeviceCode.SYSTEM_FORM_COUNT);
- }
-
- String[] split = (SpringMVCContextHolder.getCurrentUserId() + "," + uuids).split(",");
- return baseDao.executeUpdate("update `product_device_maintenance_record` set check_time=now(),check_user=? where is_finish=1 and " + BaseUtil.buildQuestionMarkFilter("uuid", split.length - 1, true), split);
- }
-
- /**
- * 缁翠繚鍗曚綅骞村害缁翠繚缁熻
- *
- * @param fse
- * @return
- */
- public DataTableEntity yearMaintenance(FieldSetEntity fse) {
- // 鐢垫鍝佺
- String elevatorVariety = null;
- // 缁翠繚鍗曚綅
- String maintenanceUnit = null;
- if (fse != null) {
- elevatorVariety = fse.getString("elevator_variety");
- maintenanceUnit = fse.getString("maintenance_unit");
- }
- StringBuilder sql = new StringBuilder(128);
- sql.append("\nSELECT u.`name`,count(r.uuid) record_count");
- sql.append("\nFROM product_device_maintenance_unit u");
- sql.append("\nLEFT JOIN product_device_info a on a.maintenance_unit=u.uuid");
- sql.append("\nLEFT JOIN product_device_maintenance_record r on r.device_uuid=a.uuid");
- StringBuilder filterSql = new StringBuilder(32);
- List<String> param = Lists.newArrayList();
- if (!StringUtils.isEmpty(elevatorVariety)) {
- String[] arr = elevatorVariety.split(",");
- filterSql.append(BaseUtil.buildQuestionMarkFilter("elevator_variety", arr.length, true));
- param.addAll(Arrays.asList(arr));
- }
- if (!StringUtils.isEmpty(maintenanceUnit)) {
- if (filterSql.length() > 0) {
- filterSql.append(" AND ");
- }
- String[] arr = maintenanceUnit.split(",");
- filterSql.append(BaseUtil.buildQuestionMarkFilter("maintenance_unit", arr.length, true));
- param.addAll(Arrays.asList(arr));
- }
- if (filterSql.length() > 0) {
- sql.append("\nWHERE ").append(filterSql);
- }
- sql.append("\nGROUP BY u.uuid");
- return baseDao.listTable(sql.toString(), param.toArray());
- }
-
- /**
- * 缁翠繚鍗曚綅骞村害缁翠繚浠诲姟瀹屾垚鎯呭喌
- *
- * @param fse
- * @return
- */
- public DataTableEntity yearMaintenanceFinish(FieldSetEntity fse) {
- // 鐢垫鍝佺
- String elevatorVariety = null;
- // 缁翠繚鍗曚綅
- String maintenanceUnit = null;
- if (fse != null) {
- elevatorVariety = fse.getString("elevator_variety");
- maintenanceUnit = fse.getString("maintenance_unit");
- }
- StringBuilder sql = new StringBuilder(128);
- sql.append("\nSELECT T.*,CASE WHEN record_count = 0 THEN 0 ELSE ROUND(finish_count / record_count, 4) END finish_rate");
- sql.append("\nFROM (");
- sql.append("\n SELECT u.name,a.device_number,a.device_unit,a.device_code,d.manufacture_company,count(r.uuid) record_count, count(r.is_finish) + 1 finish_count");
- sql.append("\n FROM product_device_maintenance_unit u");
- sql.append("\n JOIN product_device_info a on a.maintenance_unit=u.uuid");
- sql.append("\n JOIN product_device_archives d on a.archives_uuid=d.uuid");
- sql.append("\n JOIN product_device_maintenance_record r on r.device_uuid=a.uuid");
- StringBuilder filterSql = new StringBuilder(32);
- List<String> param = Lists.newArrayList();
- if (!StringUtils.isEmpty(elevatorVariety)) {
- String[] arr = elevatorVariety.split(",");
- filterSql.append(BaseUtil.buildQuestionMarkFilter("elevator_variety", arr.length, true));
- param.addAll(Arrays.asList(arr));
- }
- if (!StringUtils.isEmpty(maintenanceUnit)) {
- if (filterSql.length() > 0) {
- filterSql.append(" AND ");
- }
- String[] arr = maintenanceUnit.split(",");
- filterSql.append(BaseUtil.buildQuestionMarkFilter("maintenance_unit", arr.length, true));
- param.addAll(Arrays.asList(arr));
- }
- if (filterSql.length() > 0) {
- sql.append("\n WHERE ").append(filterSql);
- }
- sql.append("\n GROUP BY 1,2,3,4,5");
- sql.append("\n) T");
- return baseDao.listTable(sql.toString(), param.toArray());
- }
-
- /**
- * 璁惧鐨勪繚鍏婚厤缃�
- *
- * @param asset_code 璁惧缂栧彿
- * @param manceType 淇濆吇绫诲瀷
- * @return
- */
- public FieldSetEntity findDeviceMaintenanceSetting(String uuid, String manceType) {
-
- FieldSetEntity device = deviceManagerService.findDevice(uuid);
-
- FieldSetEntity record = new FieldSetEntity("product_device_maintenance_record");
- record.setValue("device_uuid", device.getString("device_name"));
- record.setValue("device_number", device.getString("device_number"));
- record.setValue("device_uuid_save_value", device.getString("uuid"));
- String sql = "select c.item_uuid,c.content ,c.criterion from product_device_maintenance_setting a left join product_device_maintenance_item_config b on\r\n"
- + "a.maintenance_item=b.uuid join \r\n"
- + "product_device_maintenance_item_detail c on b.uuid= c.item_uuid\r\n"
- + "where device_uuid=? and maintenance_type=? and c.is_used=1 \r\n"
- + "order by item_uuid";
- DataTableEntity dataTableEntity = baseDao.listTable(sql, new String[]{uuid, manceType});
- record.addSubDataTable(dataTableEntity);
-
- return record;
- }
-}
diff --git a/product-server-device/src/main/java/com/product/device/service/DeviceManagerService.java b/product-server-device/src/main/java/com/product/device/service/DeviceManagerService.java
deleted file mode 100644
index 8b54120..0000000
--- a/product-server-device/src/main/java/com/product/device/service/DeviceManagerService.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package com.product.device.service;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.product.core.config.Global;
-import com.product.core.dao.BaseDao;
-import com.product.core.entity.DataTableEntity;
-import com.product.core.entity.FieldSetEntity;
-import com.product.core.service.support.AbstractBaseService;
-import com.product.device.config.DeviceConst;
-import com.product.module.sys.service.UserService;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.thymeleaf.util.StringUtils;
-
-
-/**
- * 璁惧绠＄悊
- * @Author
- * @Date 2022/3/8 16:33
- * @Desc 鍔熻兘鐩稿叧 service
- */
-@Service
-public class DeviceManagerService extends AbstractBaseService {
-
- @Autowired
- public BaseDao baseDao;
- @Autowired
- UserService userService;
- /**
- * 鑾峰彇璁惧淇℃伅 鍖呮嫭瀛愯澶�
- * @param uuid
- * @return
- */
- public FieldSetEntity findDeviceAndSub(String uuid,String device_number) {
- FieldSetEntity dev=findDevice(uuid);
- if(dev !=null && "device".equals(Global.getSystemConfig("system_platform_type", "")) ) {
- DataTableEntity dt=baseDao.listTable(DeviceConst.PRODUCT_DEVICE_INFO,"uuid=?", new String[] {uuid},new String[]{});
- if(!DataTableEntity.isEmpty(dt)) {
- baseDao.loadPromptData(dt);
- Map <String,DataTableEntity> sub=new HashMap<>();
- sub.put("sub", dt);
- dev.setSubData(sub);
- //dev.addSubDataTable(dt);
- }
- }
-
- return dev;
- }
- /**
- * 鑾峰彇璁惧淇℃伅 鍖呮嫭瀛愯澶�
- * @param uuid
- * @param asset_code
- * @return
- */
- public FieldSetEntity findDevice(String uuid) {
- StringBuilder st=new StringBuilder();
- List<String> pa=new ArrayList<String>();
- if(!StringUtils.isEmpty(uuid)) {
- st.append("uuid=?");
- pa.add(uuid);
- }else {
- return null;
- }
- FieldSetEntity dev=baseDao.getFieldSetEntityByFilter(DeviceConst.PRODUCT_DEVICE_INFO, new String[]{}, st.toString(), pa.toArray(), false, null);
- baseDao.loadPromptData(dev);
- return dev;
- }
- /**
- * 璁惧鐨勭姸鎬佸彉鏇�
- * 濡傛灉鏈夊瓙璁惧锛岄渶瑕佹妸瀛愯澶囩姸鎬佷竴璧峰彉鏇�
- * @return
- */
- public boolean deviceStatusChange(String device_number,String status) {
- return baseDao.executeUpdate("update product_device_info set device_status=? where device_number=?",new String[] {status,device_number});
- }
- /**
- * 娣诲姞璁惧杩愯璁板綍
- * @param asset_code
- * @param user
- * @param type
- * @param log
- * @return
- */
- public boolean appendDeivceManageLog(String asset_code,String user,String type,String log,String table,String uuid ) {
-
- return true;
- }
- /**
- * 璁惧鐨勭浉鍏充汉鍛樹俊鎭�
- * @param asset_code
- * @return
- */
- public DataTableEntity findDevicePersion(String asset_code) {
- StringBuilder sql = new StringBuilder();
- sql.append("\nselect a.user_id userid,b.post,a.user_name,a.user_phone_number tel,thumbnail_img from (");
- sql.append("\nselect yardman userid,'璋冨害浜�' post from product_device_archives where asset_code='").append(asset_code).append("' union");
- sql.append("\nselect repair_fitter,'閽冲伐缁翠慨浜哄憳' from product_device_archives where asset_code='").append(asset_code).append("' union");
- sql.append("\nselect repair_electrician,'鐢靛伐缁翠慨浜哄憳' from product_device_archives where asset_code='").append(asset_code).append("' union");
- sql.append("\nselect mechanician ,'鏈烘鎶�鏈憳' from product_device_archives where asset_code='").append(asset_code).append("' union");
- sql.append("\nselect electrician ,'鐢垫皵鎶�鏈憳' from product_device_archives where asset_code='").append(asset_code).append("' union");
- sql.append("\nselect technician ,'鎶�鏈礋璐ｄ汉' from product_device_archives where asset_code='").append(asset_code).append("' union");
- sql.append("\nselect safety_manager ,'瀹夊叏绠＄悊鍛�' from product_device_archives where asset_code='").append(asset_code).append("'");
- sql.append("\n) b left join product_sys_users a on b.userid=a.user_id");
-
- DataTableEntity dte = baseDao.listTable(sql.toString(), new Object[]{});
-// dte.getMeta().addAliasTable("product_sys_users", "a");
-// dte.getMeta().addAliasTable("product_device_archives", "b");
-// dte.getMeta().addAliasField("product_sys_users.user_id", "userid");
-// dte.getMeta().addAliasField("product_sys_users.user_id", "post");
-// baseDao.loadPromptData(dte);
-
- // 澶村儚
- FieldSetEntity tempFse;
- for (int i = 0;i < dte.getRows();i++) {
- tempFse = dte.getFieldSetEntity(i);
- tempFse.setValue(com.product.core.websocket.config.CmnConst.THUMBNAIL_IMG, userService.getUserAvatar(tempFse.getString("userid")));
- }
-
- return dte;
-
- }
-
-}
diff --git a/product-server-device/src/main/java/com/product/device/service/QuickResponseService.java b/product-server-device/src/main/java/com/product/device/service/QuickResponseService.java
deleted file mode 100644
index e787276..0000000
--- a/product-server-device/src/main/java/com/product/device/service/QuickResponseService.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.product.device.service;
-
-import cn.hutool.extra.qrcode.QrCodeUtil;
-import cn.hutool.extra.qrcode.QrConfig;
-import com.product.device.utils.QuickResponseCode;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-
-import com.product.common.lang.StringUtils;
-
-import java.io.File;
-import java.io.IOException;
-
-@Service
-public class QuickResponseService {
- @Resource
- QrConfig qrconig;
- public void generateFile(String content, File file){
- //鐢熸垚鍒版湰鍦版枃浠�
- QrCodeUtil.generate(content, qrconig, file);
- }
- //杈撳嚭鍒版祦
- public void generateStream(String content, HttpServletResponse response) throws IOException {
- QrCodeUtil.generate(content,qrconig,"png",response.getOutputStream());
- }
- public static void generateQRFile(String content,File file) {
- //鐢熸垚鍒版湰鍦版枃浠�
- QrCodeUtil.generate(content, QuickResponseCode.getQRConfig(), file);
- }
- /**
- * 鐢熸垚璁惧缂栫爜鐨勪簩缁寸爜
- * @param device_sn
- * @param file
- */
- public static void generateDeviceQRFile(String device_sn,String uuid,File file) {
- StringBuilder str=new StringBuilder();
- str.append("{");
- if(!StringUtils.isEmpty(device_sn)) {
- str.append( "\"asset_code\":\"").append(device_sn ).append("\"");
- }
- if(!StringUtils.isEmpty(uuid)) {
- str.append( ",\"uuid\":\"").append(uuid ).append("\"");
- }
- str.append("}");
-
- //鐢熸垚鍒版湰鍦版枃浠�
- QrCodeUtil.generate(str.toString(), QuickResponseCode.getQRConfig(), file);
- }
-
- public static void main(String args[]) {
- QuickResponseService k=new QuickResponseService();
- File f=new File("d:/device.png");
- k.qrconig=QuickResponseCode.getQRConfig();
- k.generateFile("dfsgefsdf", f);
- for(int i=0;i<5;i++) {
- File f1=new File("d:/device"+i+".png");
- generateDeviceQRFile("device_"+i,"uuids_"+i,f1);
- }
- }
-}
diff --git a/product-server-device/src/main/java/com/product/device/service/ide/IDeviceMainenanceService.java b/product-server-device/src/main/java/com/product/device/service/ide/IDeviceMainenanceService.java
deleted file mode 100644
index b00ebb3..0000000
--- a/product-server-device/src/main/java/com/product/device/service/ide/IDeviceMainenanceService.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.product.device.service.ide;
-
-import com.product.core.entity.FieldSetEntity;
-import com.product.core.exception.BaseException;
-
-/**
- *
-* Copyright LX-BASE
-* @Title: LX-BASE-SERVICE-IDEL
-* @Project: IPasswordSecurityService
-* @Date: 2020-10-10 16:19
-* @Author:
-* @Description: 璁惧缁翠慨
- */
-public interface IDeviceMainenanceService {
-
- /**
- * 璁惧鏁呴殰鐢虫姤
- * @param fse
- * @return
- * @throws BaseException
- */
- String saveDeviceFailure(FieldSetEntity fse)throws BaseException;
-
-
-
-}
diff --git a/product-server-device/src/main/resources/META-INF/MANIFEST.MF b/product-server-device/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e..0000000
--- a/product-server-device/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path:
-
diff --git a/product-server-device/src/test/java/com/product/device/test/DeviceDataGatherTest.java b/product-server-device/src/test/java/com/product/device/test/DeviceDataGatherTest.java
deleted file mode 100644
index 5110d55..0000000
--- a/product-server-device/src/test/java/com/product/device/test/DeviceDataGatherTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.product.device.test;
-
-import java.awt.BorderLayout;
-import java.awt.Cursor;
-import java.awt.Image;
-import java.awt.Toolkit;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.swing.JFrame;
-import javax.swing.JPanel;
-import javax.swing.WindowConstants;
-
-
-public class DeviceDataGatherTest extends JFrame {
-
- JPanel current = null;
- // 寰楀埌鏄剧ず鍣ㄥ睆骞曠殑瀹介珮
- public int width = Toolkit.getDefaultToolkit().getScreenSize().width;
- public int height = Toolkit.getDefaultToolkit().getScreenSize().height - 40;
- // 瀹氫箟绐椾綋鐨勫楂�
- public int windowsWedth = 1500;
- public int windowsHeight = 700;
- private Map<String, JPanel> panel = new HashMap<String, JPanel>();
- DeviceGatherPanel mp = new DeviceGatherPanel(this);
- public JPanel getPanel(String name) {
- return panel.get(name);
- }
- public void setPanel(String name, JPanel panel) {
- this.panel.put(name, panel);
- }
-
- JPanel mpanel = new JPanel(new BorderLayout());
-
- public JPanel getMpanel() {
- return mpanel;
- }
-
- public void setMpanel(JPanel mpanel) {
- this.mpanel = mpanel;
- }
- public DeviceDataGatherTest() {
- this.setTitle("璁惧绠＄悊鏁版嵁閲囬泦娴嬭瘯");
- this.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
- // 璁剧疆绐椾綋浣嶇疆鍜屽ぇ灏�
- this.setBounds((width - windowsWedth) / 2, (height - windowsHeight) / 2, windowsWedth, windowsHeight);
-
- try {
- this.setContentPane(mp);
- this.setResizable(false);
- this.setVisible(true);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- public static void main(String args[]) {
- DeviceDataGatherTest master = new DeviceDataGatherTest();
- }
-}
diff --git a/product-server-device/src/test/java/com/product/device/test/DeviceGatherPanel.java b/product-server-device/src/test/java/com/product/device/test/DeviceGatherPanel.java
deleted file mode 100644
index 4d29540..0000000
--- a/product-server-device/src/test/java/com/product/device/test/DeviceGatherPanel.java
+++ /dev/null
@@ -1,167 +0,0 @@
-package com.product.device.test;
-
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.Label;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.io.DataOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.Socket;
-import java.nio.charset.Charset;
-
-import javax.swing.JButton;
-import javax.swing.JComboBox;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JSeparator;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-import javax.swing.SwingConstants;
-
-
-
-public class DeviceGatherPanel extends JPanel {
- Charset utf8Charset = Charset.forName("UTF-8");
- Charset gbkCharset = Charset.forName("GBK");
- Charset gbCharset = Charset.forName("GB2312");
- Charset ISOCharset = Charset.forName("ISO-8859-1");
- Charset US = Charset.forName("US-ASCII");
-
-
- private JLabel logger=new JLabel(" ",Label.LEFT);
-
- private JLabel ip_label=new JLabel("IP鍦板潃锛�");
- private JTextField ip=new JTextField();
-
- private JLabel port_label=new JLabel("绔彛锛�");
- private JTextField port=new JTextField();
-
- private JLabel info_label=new JLabel("娑堟伅鍐呭锛�");
- private JTextField info=new JTextField();
-
- public JTextArea log = new JTextArea();
- public JButton start=new JButton(" 鍙戦�佹秷鎭� ");
-
- JScrollPane jsp;
- int height=35;
- int whidth=300;
-// int lw=250;
- Font ft =new Font("寰蒋闆呴粦", Font.BOLD, 14);
- DeviceDataGatherTest f=null;
- public DeviceGatherPanel(DeviceDataGatherTest f) {
- this.f=f;
-
- GridBagConstraints c = new GridBagConstraints();
- GridBagLayout bg = new GridBagLayout();
- this.setLayout(bg);
- c.anchor = GridBagConstraints.WEST;
- c.insets = new Insets(2, 5, 2, 5);
- c.gridx = 0;
- c.gridy = 0;
- c.gridwidth = 2;
- c.gridheight = 1;
- c.fill=GridBagConstraints.WEST;
- logger.setText("澶勭悊鏃ュ織......");
- logger.setFont(ft);
- logger.setHorizontalAlignment(SwingConstants.LEFT);
- logger.setPreferredSize(new Dimension(700, 50));
- logger.setHorizontalAlignment(SwingConstants.LEFT);
- this.add(logger,c);
- c.gridy = 1;
- c.gridx = 0;
- c.gridwidth = 1;
- log.setRows(30);
- log.setColumns(60);
- jsp = new JScrollPane(log,JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
- JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
-
- this.add(jsp,c);
-
- JPanel config=new JPanel();
-// config.setPreferredSize(new Dimension(lw, 400));
- GridBagLayout rbg = new GridBagLayout();
- config.setLayout(rbg);
- GridBagConstraints rc = new GridBagConstraints();
- rc.anchor = GridBagConstraints.CENTER;
- rc.insets = new Insets(2, 10, 2, 10);
- rc.gridx = 0;
- rc.gridy = 0;
- rc.gridwidth = 1;
- rc.gridheight = 1;
- config.add(ip_label,rc);
- rc.gridx = 1;
- ip.setPreferredSize(new Dimension(whidth, height));
- config.add(ip,rc);
-//
- rc.gridx = 0;
- rc.gridy = 1;
-
- config.add(port_label, rc);
- rc.gridx = 1;
- port.setPreferredSize(new Dimension(whidth, height));
- config.add(port, rc);
-//
- rc.gridx = 0;
- rc.gridy = 2;
- rc.gridwidth = 2;
- JSeparator sep = new JSeparator(SwingConstants.CENTER);
- sep.setPreferredSize(new Dimension(whidth+160, 20));
- config.add(sep,rc);
- rc.gridx = 0;
- rc.gridy = 3;
- rc.gridwidth = 1;
- config.add(info_label, rc);
- rc.gridx = 1;
- info.setPreferredSize(new Dimension(whidth, height));
- config.add(info, rc);
- rc.gridx = 1;
- rc.gridy = 4;
- start.setPreferredSize(new Dimension(whidth, height));
- config.add(start, rc);
- start.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- try{
- if(!"".equals(info.getText())) {
- Socket s=new Socket(ip.getText(),Integer.parseInt(port.getText()));
- OutputStream dout=s.getOutputStream();
- dout.write(info.getText().getBytes(gbkCharset));
-// DataOutputStream dout=new DataOutputStream(s.getOutputStream());
-// dout.writeUTF(info.getText());
-// dout.writeBytes(info.getText());
- dout.flush();
- dout.close();
- InputStream inputStream = s.getInputStream();
- //IO璇诲彇
- byte[] buf = new byte[2048];
- int readlen = 0;
- while((readlen = inputStream.read(buf))!= -1){
- System.out.println(new String(buf,0,readlen));
- }
- s.close();
-
- }
- }catch(Exception ee){
- ee.printStackTrace();
- System.out.println(ee);
- }
- }
- });
-
- c.gridy = 1;
- c.gridx = 1;
- this.add(config,c);
- ip.setText("211.149.162.168");
- port.setText("8899");
- }
-
-
-
-}
-
-
--
Gitblit v1.9.2