| 对比新文件 |
| | |
|---|
| | | <?xml version="1.0" encoding="UTF-8"?> |
|---|
| | | <!DOCTYPE generatorConfiguration PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN" "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd"> |
|---|
| | | <generatorConfiguration> |
|---|
| | | <!-- 数据库驱动包位置 --> |
|---|
| | | <classPathEntry location="D:\workspace\firework\generator\mysql-connector-java-5.1.26-bin.jar" /> |
|---|
| | | <!--<classPathEntry location="C:\oracle\product\10.2.0\db_1\jdbc\lib\ojdbc14.jar" />--> |
|---|
| | | <context id="DB2Tables" targetRuntime="MyBatis3"> |
|---|
| | | <property name="javaFileEncoding" value="UTF-8"/> |
|---|
| | | <commentGenerator> |
|---|
| | | <property name="suppressAllComments" value="false" /> |
|---|
| | | </commentGenerator> |
|---|
| | | <!-- 数据库链接URL、用户名、密码 --> |
|---|
| | | <jdbcConnection driverClass="com.mysql.jdbc.Driver" connectionURL="jdbc:mysql://twt.sinanoaq.com:13306/hotwork" userId="root" password="Sinanoaq#415"> |
|---|
| | | <!--<jdbcConnection driverClass="oracle.jdbc.driver.OracleDriver" connectionURL="jdbc:oracle:thin:@localhost:1521:orcl" userId="msa" password="msa">--> |
|---|
| | | </jdbcConnection> |
|---|
| | | <javaTypeResolver> |
|---|
| | | <property name="forceBigDecimals" value="false" /> |
|---|
| | | </javaTypeResolver> |
|---|
| | | <!-- 生成模型的包名和位置 --> |
|---|
| | | <javaModelGenerator targetPackage="com.gk.hotwork.Domain" targetProject="D:\workspace\zhongtai\src\main\java\"> |
|---|
| | | <property name="enableSubPackages" value="true" /> |
|---|
| | | <property name="trimStrings" value="true" /> |
|---|
| | | </javaModelGenerator> |
|---|
| | | <!-- 生成的xml映射文件包名和位置 --> |
|---|
| | | <sqlMapGenerator targetPackage="com.gk.hotwork.Mapper.mybatis" targetProject="D:\workspace\zhongtai\src\main\java\"> |
|---|
| | | <property name="enableSubPackages" value="true" /> |
|---|
| | | </sqlMapGenerator> |
|---|
| | | <!-- 生成DAO的包名和位置 --> |
|---|
| | | <javaClientGenerator type="XMLMAPPER" targetPackage="com.gk.hotwork.Mapper" targetProject="D:\zhongtai\firework\src\main\java\"> |
|---|
| | | <property name="enableSubPackages" value="true" /> |
|---|
| | | </javaClientGenerator> |
|---|
| | | <!-- 要生成那些表(更改tableName和domainObjectName就可以) --> |
|---|
| | | <!-- <table tableName="enterpsrise" domainObjectName="Enterprise" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false" />--> |
|---|
| | | <!-- <table tableName="securitysupervisory" domainObjectName="SecuritySupervisory" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false" />--> |
|---|
| | | <!-- <table tableName="enterpriseresource" domainObjectName="EnterpriseResource" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false" />--> |
|---|
| | | <!-- <table tableName="enterpriseperson" domainObjectName="EnterprisePerson" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false" />--> |
|---|
| | | <!-- <table tableName="enterpriseannual" domainObjectName="EnterpriseAnnual" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false" />--> |
|---|
| | | <!-- <table tableName="enterprisedocument" domainObjectName="EnterpriseDocument" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false" />--> |
|---|
| | | <!-- <table tableName="transportperson" domainObjectName="TransportPerson" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false" />--> |
|---|
| | | <!-- <table tableName="enterprisestaff" domainObjectName="EnterpriseStaff" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false" />--> |
|---|
| | | <!-- <table tableName="transportcertificate" domainObjectName="TransportCertificate" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false" />--> |
|---|
| | | <!-- <table tableName="transportcertificateperson" domainObjectName="TransportCertificatePerson" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false" />--> |
|---|
| | | <table tableName="sms_log" domainObjectName="SmsLog" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false" /> |
|---|
| | | </context> |
|---|
| | | </generatorConfiguration> |
|---|
| 对比新文件 |
| | |
|---|
| | | java -jar mybatis-generator-core-1.3.2.jar -configfile yufei.xml -overwrite |
|---|
| | | //删除文件 |
|---|
| | | git rm --cached -r |
|---|
| 对比新文件 |
| | |
|---|
| | | <?xml version="1.0" encoding="UTF-8"?> |
|---|
| | | <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> |
|---|
| | | <component name="FacetManager"> |
|---|
| | | <facet type="web" name="Web"> |
|---|
| | | <configuration> |
|---|
| | | <webroots> |
|---|
| | | <root url="file://$MODULE_DIR$/src/main/webapp" relative="/" /> |
|---|
| | | </webroots> |
|---|
| | | </configuration> |
|---|
| | | </facet> |
|---|
| | | <facet type="Spring" name="Spring"> |
|---|
| | | <configuration /> |
|---|
| | | </facet> |
|---|
| | | </component> |
|---|
| | | <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8"> |
|---|
| | | <output url="file://$MODULE_DIR$/target/classes" /> |
|---|
| | | <output-test url="file://$MODULE_DIR$/target/test-classes" /> |
|---|
| | | <content url="file://$MODULE_DIR$"> |
|---|
| | | <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> |
|---|
| | | <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> |
|---|
| | | <excludeFolder url="file://$MODULE_DIR$/target" /> |
|---|
| | | </content> |
|---|
| | | <orderEntry type="inheritedJdk" /> |
|---|
| | | <orderEntry type="sourceFolder" forTests="false" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-jdbc:2.3.3.RELEASE" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.3.3.RELEASE" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.5" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.2.8.RELEASE" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.springframework.data:spring-data-jdbc:2.0.3.RELEASE" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.springframework.data:spring-data-relational:2.0.3.RELEASE" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.3.3.RELEASE" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.8.RELEASE" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.3.3.RELEASE" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.3.3.RELEASE" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.3.3.RELEASE" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.13.3" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.26" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.3.3.RELEASE" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.2" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.2" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.springframework:spring-web:5.2.8.RELEASE" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.8.RELEASE" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.3.3.RELEASE" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.37" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.37" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: com.google.zxing:core:3.3.0" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.3" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.1.3" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.5" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.5" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-log4j:1.3.8.RELEASE" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.30" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.30" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.3.2" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.3.2" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.3.3.RELEASE" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.22" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.22" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" /> |
|---|
| | | <orderEntry type="library" scope="RUNTIME" name="Maven: org.springframework.boot:spring-boot-devtools:2.3.3.RELEASE" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.3.3.RELEASE" level="project" /> |
|---|
| | | <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:8.0.21" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-configuration-processor:2.3.3.RELEASE" level="project" /> |
|---|
| | | <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.3.3.RELEASE" level="project" /> |
|---|
| | | <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.3.3.RELEASE" level="project" /> |
|---|
| | | <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.3.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: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" /> |
|---|
| | | <orderEntry type="library" scope="TEST" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" /> |
|---|
| | | <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.16.1" level="project" /> |
|---|
| | | <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest:2.2" level="project" /> |
|---|
| | | <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter:5.6.2" level="project" /> |
|---|
| | | <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.6.2" level="project" /> |
|---|
| | | <orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.0" level="project" /> |
|---|
| | | <orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" /> |
|---|
| | | <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.6.2" level="project" /> |
|---|
| | | <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-params:5.6.2" level="project" /> |
|---|
| | | <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.6.2" level="project" /> |
|---|
| | | <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.6.2" level="project" /> |
|---|
| | | <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:3.3.3" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.14" level="project" /> |
|---|
| | | <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.14" level="project" /> |
|---|
| | | <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" /> |
|---|
| | | <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-junit-jupiter:3.3.3" level="project" /> |
|---|
| | | <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" /> |
|---|
| | | <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.springframework:spring-core:5.2.8.RELEASE" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.2.8.RELEASE" level="project" /> |
|---|
| | | <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.2.8.RELEASE" level="project" /> |
|---|
| | | <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.7.0" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: commons-io:commons-io:2.7" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.14" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.11" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.apache.poi:poi:5.2.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.logging.log4j:log4j-api:2.13.3" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:5.2.2" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-lite:5.2.2" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:5.0.3" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.21" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.07" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.apache.poi:poi-scratchpad:5.2.2" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.8.RELEASE" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.java-websocket:Java-WebSocket:1.5.1" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:2.1.0.RELEASE" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.2.8.RELEASE" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.springframework:spring-websocket:5.2.8.RELEASE" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: com.documents4j:documents4j-local:1.1.5" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: com.documents4j:documents4j-api:1.1.5" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: com.documents4j:documents4j-transformer:1.1.5" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: com.documents4j:documents4j-util-conversion:1.1.5" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: javax.activation:activation:1.1.1" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: com.google.guava:guava:28.1-jre" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.8.1" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.2" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.codehaus.mojo:animal-sniffer-annotations:1.18" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.zeroturnaround:zt-exec:1.11" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: com.documents4j:documents4j-transformer-msoffice-word:1.1.5" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: com.documents4j:documents4j-transformer-msoffice-base:1.1.5" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: com.documents4j:documents4j-transformer-api:1.1.5" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: com.documents4j:documents4j-util-all:1.1.5" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: com.documents4j:documents4j-util-transformer-process:1.1.5" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.8.0" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.14" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.14" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.2" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.8.0" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.8.0" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.8.0" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.8.0" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.8.0" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.reflections:reflections:0.9.11" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.javassist:javassist:3.21.0-GA" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.8.0" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-security:2.3.3.RELEASE" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.8.RELEASE" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.springframework.security:spring-security-config:5.3.4.RELEASE" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.springframework.security:spring-security-web:5.3.4.RELEASE" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.3.3.RELEASE" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.3.3.RELEASE" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.3.3.RELEASE" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.2.8.RELEASE" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.8.RELEASE" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: redis.clients:jedis:3.3.0" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.8.1" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.springframework.security.oauth:spring-security-oauth2:2.3.3.RELEASE" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.8.RELEASE" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.13" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.13" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:5.3.4.RELEASE" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.8.RELEASE" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.0.6" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.41" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.0" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.2" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.2" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.springframework.security:spring-security-jwt:1.0.9.RELEASE" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.56" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.56" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: com.liferay:org.apache.commons.fileupload:1.2.2.LIFERAY-PATCHED-1" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.jetbrains:annotations:20.1.0" level="project" /> |
|---|
| | | <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.18.12" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: com.google.zxing:javase:3.3.0" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: com.beust:jcommander:1.48" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: com.github.jai-imageio:jai-imageio-core:1.3.1" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.3.3.RELEASE" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.1.5.Final" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.1" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.1" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.1" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:3.2" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.13" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: e-iceblue:spire.office.free:3.1.1" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.apache.rocketmq:rocketmq-client:4.9.3" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.apache.rocketmq:rocketmq-common:4.9.3" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.apache.rocketmq:rocketmq-remoting:4.9.3" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: io.netty:netty-all:4.1.51.Final" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: commons-validator:commons-validator:1.7" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.4" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: commons-digester:commons-digester:2.1" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.redisson:redisson-spring-boot-starter:3.16.8" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-actuator:2.3.3.RELEASE" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator-autoconfigure:2.3.3.RELEASE" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator:2.3.3.RELEASE" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: io.micrometer:micrometer-core:1.5.4" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.12" level="project" /> |
|---|
| | | <orderEntry type="library" scope="RUNTIME" name="Maven: org.latencyutils:LatencyUtils:2.0.3" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.redisson:redisson:3.16.8" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.51.Final" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.51.Final" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.51.Final" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.51.Final" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.51.Final" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: io.netty:netty-resolver-dns:4.1.51.Final" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: io.netty:netty-codec-dns:4.1.51.Final" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.51.Final" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: javax.cache:cache-api:1.1.1" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.3.9.RELEASE" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: io.reactivex.rxjava3:rxjava:3.0.12" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.jboss.marshalling:jboss-marshalling:2.0.11.Final" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.jboss.marshalling:jboss-marshalling-river:2.0.11.Final" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.11.2" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.jodd:jodd-bean:5.1.6" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.jodd:jodd-core:5.1.6" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.redisson:redisson-spring-data-25:3.16.8" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.apache.rocketmq:rocketmq-spring-boot:2.2.2" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.apache.rocketmq:rocketmq-acl:4.9.3" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.apache.rocketmq:rocketmq-logging:4.9.3" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: org.apache.rocketmq:rocketmq-srvutil:4.9.3" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: commons-cli:commons-cli:1.2" level="project" /> |
|---|
| | | <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.2" level="project" /> |
|---|
| | | </component> |
|---|
| | | </module> |
|---|
| 对比新文件 |
| | |
|---|
| | | <?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 https://maven.apache.org/xsd/maven-4.0.0.xsd"> |
|---|
| | | <modelVersion>4.0.0</modelVersion> |
|---|
| | | <parent> |
|---|
| | | <groupId>org.springframework.boot</groupId> |
|---|
| | | <artifactId>spring-boot-starter-parent</artifactId> |
|---|
| | | <version>2.3.3.RELEASE</version> |
|---|
| | | <relativePath/> <!-- lookup parent from repository --> |
|---|
| | | </parent> |
|---|
| | | <groupId>com.gk.zhongtai</groupId> |
|---|
| | | <artifactId>hazardInvestgation</artifactId> |
|---|
| | | <version>2.0.5</version> |
|---|
| | | <packaging>jar</packaging> |
|---|
| | | |
|---|
| | | <properties> |
|---|
| | | <project.build.sourceencoding>UTF-8</project.build.sourceencoding> |
|---|
| | | <project.reporting.outputencoding>UTF-8</project.reporting.outputencoding> |
|---|
| | | <java.version>1.8</java.version> |
|---|
| | | </properties> |
|---|
| | | |
|---|
| | | <dependencies> |
|---|
| | | <dependency> |
|---|
| | | <groupId>org.springframework.boot</groupId> |
|---|
| | | <artifactId>spring-boot-starter-data-jdbc</artifactId> |
|---|
| | | </dependency> |
|---|
| | | <dependency> |
|---|
| | | <groupId>org.springframework.boot</groupId> |
|---|
| | | <artifactId>spring-boot-starter-web</artifactId> |
|---|
| | | <exclusions> |
|---|
| | | <!-- <exclusion>--> |
|---|
| | | <!-- <groupId>org.springframework.boot</groupId>--> |
|---|
| | | <!-- <artifactId>spring-boot-starter-logging</artifactId>--> |
|---|
| | | <!-- </exclusion>--> |
|---|
| | | <exclusion> |
|---|
| | | <groupId>org.springframework.boot</groupId> |
|---|
| | | <artifactId>spring-boot-starter-tomcat</artifactId> |
|---|
| | | </exclusion> |
|---|
| | | <exclusion> |
|---|
| | | <artifactId>logback-classic</artifactId> |
|---|
| | | <groupId>ch.qos.logback</groupId> |
|---|
| | | </exclusion> |
|---|
| | | </exclusions> |
|---|
| | | </dependency> |
|---|
| | | <dependency> |
|---|
| | | <groupId>org.springframework.boot</groupId> |
|---|
| | | <artifactId>spring-boot-starter-tomcat</artifactId> |
|---|
| | | <!-- <scope>provided</scope>--> |
|---|
| | | </dependency> |
|---|
| | | <dependency> |
|---|
| | | <groupId>com.google.zxing</groupId> |
|---|
| | | <artifactId>core</artifactId> |
|---|
| | | <version>3.4.1</version> |
|---|
| | | </dependency> |
|---|
| | | <dependency> |
|---|
| | | <groupId>org.mybatis.spring.boot</groupId> |
|---|
| | | <artifactId>mybatis-spring-boot-starter</artifactId> |
|---|
| | | <version>2.1.3</version> |
|---|
| | | </dependency> |
|---|
| | | <!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-log4j --> |
|---|
| | | <dependency> |
|---|
| | | <groupId>org.springframework.boot</groupId> |
|---|
| | | <artifactId>spring-boot-starter-log4j</artifactId> |
|---|
| | | <version>1.3.8.RELEASE</version> |
|---|
| | | </dependency> |
|---|
| | | |
|---|
| | | <!-- https://mvnrepository.com/artifact/com.baomidou/mybatis-plus-boot-starter --> |
|---|
| | | <dependency> |
|---|
| | | <groupId>com.baomidou</groupId> |
|---|
| | | <artifactId>mybatis-plus-boot-starter</artifactId> |
|---|
| | | <version>3.3.2</version> |
|---|
| | | </dependency> |
|---|
| | | <!-- https://mvnrepository.com/artifact/com.alibaba/druid-spring-boot-starter --> |
|---|
| | | <dependency> |
|---|
| | | <groupId>com.alibaba</groupId> |
|---|
| | | <artifactId>druid-spring-boot-starter</artifactId> |
|---|
| | | <version>1.1.22</version> |
|---|
| | | </dependency> |
|---|
| | | <dependency> |
|---|
| | | <groupId>org.springframework.boot</groupId> |
|---|
| | | <artifactId>spring-boot-devtools</artifactId> |
|---|
| | | <scope>runtime</scope> |
|---|
| | | <optional>true</optional> |
|---|
| | | </dependency> |
|---|
| | | <dependency> |
|---|
| | | <groupId>mysql</groupId> |
|---|
| | | <artifactId>mysql-connector-java</artifactId> |
|---|
| | | <scope>runtime</scope> |
|---|
| | | </dependency> |
|---|
| | | <dependency> |
|---|
| | | <groupId>org.springframework.boot</groupId> |
|---|
| | | <artifactId>spring-boot-configuration-processor</artifactId> |
|---|
| | | <optional>true</optional> |
|---|
| | | </dependency> |
|---|
| | | <dependency> |
|---|
| | | <groupId>org.springframework.boot</groupId> |
|---|
| | | <artifactId>spring-boot-starter-test</artifactId> |
|---|
| | | <scope>test</scope> |
|---|
| | | <exclusions> |
|---|
| | | <exclusion> |
|---|
| | | <groupId>org.junit.vintage</groupId> |
|---|
| | | <artifactId>junit-vintage-engine</artifactId> |
|---|
| | | </exclusion> |
|---|
| | | </exclusions> |
|---|
| | | </dependency> |
|---|
| | | |
|---|
| | | <dependency> |
|---|
| | | <groupId>commons-io</groupId> |
|---|
| | | <artifactId>commons-io</artifactId> |
|---|
| | | <version>2.7</version> |
|---|
| | | </dependency> |
|---|
| | | |
|---|
| | | <!-- https://mvnrepository.com/artifact/commons-codec/commons-codec --> |
|---|
| | | <dependency> |
|---|
| | | <groupId>commons-codec</groupId> |
|---|
| | | <artifactId>commons-codec</artifactId> |
|---|
| | | <version>1.14</version> |
|---|
| | | </dependency> |
|---|
| | | <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 --> |
|---|
| | | <dependency> |
|---|
| | | <groupId>org.apache.commons</groupId> |
|---|
| | | <artifactId>commons-lang3</artifactId> |
|---|
| | | <version>3.11</version> |
|---|
| | | </dependency> |
|---|
| | | |
|---|
| | | |
|---|
| | | <!-- https://mvnrepository.com/artifact/org.apache.poi/poi --> |
|---|
| | | <dependency> |
|---|
| | | <groupId>org.apache.poi</groupId> |
|---|
| | | <artifactId>poi</artifactId> |
|---|
| | | <version>5.2.2</version> |
|---|
| | | </dependency> |
|---|
| | | <dependency> |
|---|
| | | <groupId>org.apache.poi</groupId> |
|---|
| | | <artifactId>poi-ooxml</artifactId> |
|---|
| | | <version>5.2.2</version> |
|---|
| | | </dependency> |
|---|
| | | |
|---|
| | | <dependency> |
|---|
| | | <groupId>org.apache.poi</groupId> |
|---|
| | | <artifactId>poi-scratchpad</artifactId> |
|---|
| | | <version>5.2.2</version> |
|---|
| | | </dependency> |
|---|
| | | <dependency> |
|---|
| | | <groupId>org.apache.poi</groupId> |
|---|
| | | <artifactId>poi-ooxml-schemas</artifactId> |
|---|
| | | <version>4.1.2</version> |
|---|
| | | </dependency> |
|---|
| | | <!-- https://mvnrepository.com/artifact/org.springframework/spring-beans --> |
|---|
| | | <dependency> |
|---|
| | | <groupId>org.springframework</groupId> |
|---|
| | | <artifactId>spring-beans</artifactId> |
|---|
| | | <version>5.2.8.RELEASE</version> |
|---|
| | | </dependency> |
|---|
| | | <!-- https://mvnrepository.com/artifact/org.java-websocket/Java-WebSocket --> |
|---|
| | | <dependency> |
|---|
| | | <groupId>org.java-websocket</groupId> |
|---|
| | | <artifactId>Java-WebSocket</artifactId> |
|---|
| | | <version>1.5.1</version> |
|---|
| | | </dependency> |
|---|
| | | <dependency> |
|---|
| | | <groupId>org.springframework.boot</groupId> |
|---|
| | | <artifactId>spring-boot-starter-websocket</artifactId> |
|---|
| | | <version>2.1.0.RELEASE</version> |
|---|
| | | </dependency> |
|---|
| | | |
|---|
| | | <dependency> |
|---|
| | | <groupId>com.documents4j</groupId> |
|---|
| | | <artifactId>documents4j-local</artifactId> |
|---|
| | | <version>1.1.5</version> |
|---|
| | | </dependency> |
|---|
| | | |
|---|
| | | <dependency> |
|---|
| | | <groupId>com.documents4j</groupId> |
|---|
| | | <artifactId>documents4j-transformer-msoffice-word</artifactId> |
|---|
| | | <version>1.1.5</version> |
|---|
| | | </dependency> |
|---|
| | | |
|---|
| | | <!-- 整合swagger2--> |
|---|
| | | <!-- https://mvnrepository.com/artifact/io.springfox/springfox-swagger2 --> |
|---|
| | | <dependency> |
|---|
| | | <groupId>io.springfox</groupId> |
|---|
| | | <artifactId>springfox-swagger2</artifactId> |
|---|
| | | <version>2.8.0</version> |
|---|
| | | </dependency> |
|---|
| | | <!-- https://mvnrepository.com/artifact/io.springfox/springfox-swagger-ui --> |
|---|
| | | <dependency> |
|---|
| | | <groupId>io.springfox</groupId> |
|---|
| | | <artifactId>springfox-swagger-ui</artifactId> |
|---|
| | | <version>2.8.0</version> |
|---|
| | | </dependency> |
|---|
| | | |
|---|
| | | <!-- 整合redis auth2--> |
|---|
| | | <!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-security --> |
|---|
| | | <dependency> |
|---|
| | | <groupId>org.springframework.boot</groupId> |
|---|
| | | <artifactId>spring-boot-starter-security</artifactId> |
|---|
| | | <version>2.3.3.RELEASE</version> |
|---|
| | | </dependency> |
|---|
| | | <!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-data-redis --> |
|---|
| | | <dependency> |
|---|
| | | <groupId>org.springframework.boot</groupId> |
|---|
| | | <artifactId>spring-boot-starter-data-redis</artifactId> |
|---|
| | | <version>2.3.3.RELEASE</version> |
|---|
| | | <exclusions> |
|---|
| | | <exclusion> |
|---|
| | | <groupId>io.lettuce</groupId> |
|---|
| | | <artifactId>lettuce-core</artifactId> |
|---|
| | | </exclusion> |
|---|
| | | </exclusions> |
|---|
| | | </dependency> |
|---|
| | | <!-- https://mvnrepository.com/artifact/redis.clients/jedis --> |
|---|
| | | <dependency> |
|---|
| | | <groupId>redis.clients</groupId> |
|---|
| | | <artifactId>jedis</artifactId> |
|---|
| | | <version>3.3.0</version> |
|---|
| | | </dependency> |
|---|
| | | <!-- https://mvnrepository.com/artifact/org.springframework.security.oauth/spring-security-oauth2 --> |
|---|
| | | <dependency> |
|---|
| | | <groupId>org.springframework.security.oauth</groupId> |
|---|
| | | <artifactId>spring-security-oauth2</artifactId> |
|---|
| | | <version>2.3.3.RELEASE</version> |
|---|
| | | </dependency> |
|---|
| | | <!-- https://mvnrepository.com/artifact/org.springframework.security/spring-security-core --> |
|---|
| | | <dependency> |
|---|
| | | <groupId>org.springframework.security</groupId> |
|---|
| | | <artifactId>spring-security-core</artifactId> |
|---|
| | | <version>5.3.4.RELEASE</version> |
|---|
| | | </dependency> |
|---|
| | | <dependency> |
|---|
| | | <groupId>cn.hutool</groupId> |
|---|
| | | <artifactId>hutool-all</artifactId> |
|---|
| | | <version>5.0.6</version> |
|---|
| | | </dependency> |
|---|
| | | <!--json tools--> |
|---|
| | | <dependency> |
|---|
| | | <groupId>com.alibaba</groupId> |
|---|
| | | <artifactId>fastjson</artifactId> |
|---|
| | | <version>1.2.41</version> |
|---|
| | | </dependency> |
|---|
| | | <!--jwt--> |
|---|
| | | <dependency> |
|---|
| | | <groupId>io.jsonwebtoken</groupId> |
|---|
| | | <artifactId>jjwt</artifactId> |
|---|
| | | <version>0.9.0</version> |
|---|
| | | </dependency> |
|---|
| | | <dependency> |
|---|
| | | <groupId>org.springframework.security</groupId> |
|---|
| | | <artifactId>spring-security-jwt</artifactId> |
|---|
| | | <version>1.0.9.RELEASE</version> |
|---|
| | | </dependency> |
|---|
| | | <!-- https://mvnrepository.com/artifact/com.liferay/org.apache.commons.fileupload --> |
|---|
| | | <dependency> |
|---|
| | | <groupId>com.liferay</groupId> |
|---|
| | | <artifactId>org.apache.commons.fileupload</artifactId> |
|---|
| | | <version>1.2.2.LIFERAY-PATCHED-1</version> |
|---|
| | | </dependency> |
|---|
| | | <!-- https://mvnrepository.com/artifact/org.jetbrains/annotations --> |
|---|
| | | <dependency> |
|---|
| | | <groupId>org.jetbrains</groupId> |
|---|
| | | <artifactId>annotations</artifactId> |
|---|
| | | <version>20.1.0</version> |
|---|
| | | </dependency> |
|---|
| | | <!-- https://mvnrepository.com/artifact/org.projectlombok/lombok --> |
|---|
| | | <dependency> |
|---|
| | | <groupId>org.projectlombok</groupId> |
|---|
| | | <artifactId>lombok</artifactId> |
|---|
| | | <version>1.18.12</version> |
|---|
| | | <scope>provided</scope> |
|---|
| | | </dependency> |
|---|
| | | |
|---|
| | | <!--Java二维码相关依赖--> |
|---|
| | | <dependency> |
|---|
| | | <groupId>com.google.zxing</groupId> |
|---|
| | | <artifactId>core</artifactId> |
|---|
| | | <version>3.3.0</version> |
|---|
| | | </dependency> |
|---|
| | | <dependency> |
|---|
| | | <groupId>com.google.zxing</groupId> |
|---|
| | | <artifactId>javase</artifactId> |
|---|
| | | <version>3.3.0</version> |
|---|
| | | </dependency> |
|---|
| | | |
|---|
| | | <dependency> |
|---|
| | | <groupId>org.apache.httpcomponents</groupId> |
|---|
| | | <artifactId>httpclient</artifactId> |
|---|
| | | <version>4.5</version> |
|---|
| | | </dependency> |
|---|
| | | |
|---|
| | | <dependency> |
|---|
| | | <groupId>org.springframework.boot</groupId> |
|---|
| | | <artifactId>spring-boot-starter-validation</artifactId> |
|---|
| | | </dependency> |
|---|
| | | <dependency> |
|---|
| | | <groupId>com.baomidou</groupId> |
|---|
| | | <artifactId>mybatis-plus-extension</artifactId> |
|---|
| | | <version>3.4.1</version> |
|---|
| | | </dependency> |
|---|
| | | <dependency> |
|---|
| | | <groupId>org.aspectj</groupId > |
|---|
| | | <artifactId>aspectjweaver</artifactId > |
|---|
| | | <version>1.8.13</version > |
|---|
| | | </dependency> |
|---|
| | | <dependency> |
|---|
| | | <groupId>e-iceblue</groupId> |
|---|
| | | <artifactId>spire.office.free</artifactId> |
|---|
| | | <version>3.1.1</version> |
|---|
| | | </dependency> |
|---|
| | | <dependency> |
|---|
| | | <groupId>com.documents4j</groupId> |
|---|
| | | <artifactId>documents4j-local</artifactId> |
|---|
| | | <version>1.1.5</version> |
|---|
| | | </dependency> |
|---|
| | | |
|---|
| | | <dependency> |
|---|
| | | <groupId>com.documents4j</groupId> |
|---|
| | | <artifactId>documents4j-transformer-msoffice-word</artifactId> |
|---|
| | | <version>1.1.5</version> |
|---|
| | | </dependency> |
|---|
| | | <dependency> |
|---|
| | | <groupId>org.apache.rocketmq</groupId> |
|---|
| | | <artifactId>rocketmq-client</artifactId> |
|---|
| | | <version>4.9.3</version> |
|---|
| | | <exclusions> |
|---|
| | | <exclusion> |
|---|
| | | <artifactId>logback-classic</artifactId> |
|---|
| | | <groupId>ch.qos.logback</groupId> |
|---|
| | | </exclusion> |
|---|
| | | </exclusions> |
|---|
| | | </dependency> |
|---|
| | | <!-- https://mvnrepository.com/artifact/org.redisson/redisson-spring-boot-starter --> |
|---|
| | | <dependency> |
|---|
| | | <groupId>org.redisson</groupId> |
|---|
| | | <artifactId>redisson-spring-boot-starter</artifactId> |
|---|
| | | <version>3.16.8</version> |
|---|
| | | </dependency> |
|---|
| | | |
|---|
| | | <dependency> |
|---|
| | | <groupId>org.apache.rocketmq</groupId> |
|---|
| | | <artifactId>rocketmq-spring-boot</artifactId> |
|---|
| | | <version>2.2.2</version> |
|---|
| | | </dependency> |
|---|
| | | |
|---|
| | | </dependencies> |
|---|
| | | <repositories> |
|---|
| | | <repository> |
|---|
| | | <id>com.e-iceblue</id> |
|---|
| | | <url>http://repo.e-iceblue.cn/repository/maven-public/</url> |
|---|
| | | </repository> |
|---|
| | | </repositories> |
|---|
| | | <build> |
|---|
| | | <resources> |
|---|
| | | <resource> |
|---|
| | | <directory>src/main/java</directory> |
|---|
| | | <includes> |
|---|
| | | <include>**/*.xml</include> |
|---|
| | | </includes> |
|---|
| | | </resource> |
|---|
| | | <!--设置自己目录下的配置文件--> |
|---|
| | | <resource> |
|---|
| | | <!--下方resources的文件夹名字要和自己项目的文件夹名确认一致才行 很多人就是忽略了名字不一致 --> |
|---|
| | | <directory>src/main/resources</directory> |
|---|
| | | <includes> |
|---|
| | | <include>**/*</include> |
|---|
| | | </includes> |
|---|
| | | </resource> |
|---|
| | | </resources> |
|---|
| | | <plugins> |
|---|
| | | <plugin> |
|---|
| | | <groupId>org.springframework.boot</groupId> |
|---|
| | | <artifactId>spring-boot-maven-plugin</artifactId> |
|---|
| | | <configuration> |
|---|
| | | <mainClass>com.gk.hotwork.HotworkApplication</mainClass> |
|---|
| | | <fork>true</fork> |
|---|
| | | </configuration> |
|---|
| | | <executions> |
|---|
| | | <execution> |
|---|
| | | <goals> |
|---|
| | | <goal>repackage</goal> |
|---|
| | | </goals> |
|---|
| | | </execution> |
|---|
| | | </executions> |
|---|
| | | </plugin> |
|---|
| | | </plugins> |
|---|
| | | </build> |
|---|
| | | |
|---|
| | | </project> |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Api; |
|---|
| | | |
|---|
| | | |
|---|
| | | import com.alibaba.fastjson.JSONArray; |
|---|
| | | import com.alibaba.fastjson.JSONObject; |
|---|
| | | import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|---|
| | | import com.gk.hotwork.Controller.Base.BaseController; |
|---|
| | | import com.gk.hotwork.Domain.DepartmentInfo; |
|---|
| | | import com.gk.hotwork.Domain.ExamScoreInfo; |
|---|
| | | import com.gk.hotwork.Domain.Exception.BusinessException; |
|---|
| | | import com.gk.hotwork.Domain.RoleInfo; |
|---|
| | | import com.gk.hotwork.Domain.UserInfo; |
|---|
| | | import com.gk.hotwork.Domain.Utils.BeanUtils; |
|---|
| | | import com.gk.hotwork.Domain.Utils.Msg; |
|---|
| | | import com.gk.hotwork.Domain.Utils.StringUtils; |
|---|
| | | import com.gk.hotwork.Domain.dto.DepartmentDTO; |
|---|
| | | import com.gk.hotwork.Domain.dto.UserDTO; |
|---|
| | | import com.gk.hotwork.Service.DepartmentService; |
|---|
| | | import com.gk.hotwork.Service.ExamScoreService; |
|---|
| | | import com.gk.hotwork.Service.RoleService; |
|---|
| | | import com.gk.hotwork.Service.UserService; |
|---|
| | | import com.sun.org.apache.bcel.internal.generic.I2F; |
|---|
| | | import io.swagger.annotations.Api; |
|---|
| | | import io.swagger.annotations.ApiImplicitParam; |
|---|
| | | import io.swagger.annotations.ApiImplicitParams; |
|---|
| | | import io.swagger.annotations.ApiOperation; |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.beans.factory.annotation.Value; |
|---|
| | | import org.springframework.web.bind.annotation.*; |
|---|
| | | |
|---|
| | | import java.util.*; |
|---|
| | | |
|---|
| | | @Api(tags = "Api接口数据接口") |
|---|
| | | @RestController |
|---|
| | | @RequestMapping("/api") |
|---|
| | | public class ApiController extends BaseController { |
|---|
| | | @Value("${filePath}") |
|---|
| | | private String filePath; //配置文件配置的物理保存地址 |
|---|
| | | @Value("${fileurl}") |
|---|
| | | private String fileurl; |
|---|
| | | @Autowired |
|---|
| | | ExamScoreService examscoreService; |
|---|
| | | @Autowired |
|---|
| | | UserService userService; |
|---|
| | | @Autowired |
|---|
| | | DepartmentService departmentService; |
|---|
| | | @Autowired |
|---|
| | | private RoleService roleService; |
|---|
| | | |
|---|
| | | @PostMapping("/addExam") |
|---|
| | | @ApiOperation(value = "添加合格成绩", notes = "添加合格成绩", response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "realname",value = "真实姓名"), |
|---|
| | | @ApiImplicitParam(name = "mobile",value = "手机号"), |
|---|
| | | @ApiImplicitParam(name = "idcard",value = "身份证"), |
|---|
| | | @ApiImplicitParam(name = "examtype",value = "考试类型"), |
|---|
| | | @ApiImplicitParam(name = "score",value = "分数"), |
|---|
| | | @ApiImplicitParam(name = "starttime",value = "有效期开始时间"), |
|---|
| | | @ApiImplicitParam(name = "endtime",value = "有效期结束时间"), |
|---|
| | | }) |
|---|
| | | public Msg addExam(@RequestBody JSONArray jsonArray){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | for (int i = 0; i < jsonArray.size(); i++) { |
|---|
| | | JSONObject jsonObject = jsonArray.getJSONObject(i); |
|---|
| | | ExamScoreInfo examScoreInfo = new ExamScoreInfo(); |
|---|
| | | examScoreInfo.setRealname(jsonObject.getString("realname")); |
|---|
| | | examScoreInfo.setMobile(jsonObject.getString("mobile")); |
|---|
| | | examScoreInfo.setIdcard(jsonObject.getString("idcard")); |
|---|
| | | examScoreInfo.setExamtype(jsonObject.getString("examtype")); |
|---|
| | | examScoreInfo.setScore(jsonObject.getInteger("score")); |
|---|
| | | examScoreInfo.setStarttime(jsonObject.getDate("starttime")); |
|---|
| | | examScoreInfo.setEndtime(jsonObject.getDate("endtime")); |
|---|
| | | examScoreInfo.setCreatetime(new Date()); |
|---|
| | | ExamScoreInfo examScoreExist = examscoreService.selectByMobile(jsonObject.getString("examtype"),jsonObject.getString("mobile")); |
|---|
| | | if (examScoreExist != null){ |
|---|
| | | examScoreInfo.setId(examScoreExist.getId()); |
|---|
| | | examscoreService.updateById(examScoreInfo); |
|---|
| | | }else { |
|---|
| | | examscoreService.save(examScoreInfo); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * @Description: 众泰考试api |
|---|
| | | * @date 2022/4/26 16:34 |
|---|
| | | */ |
|---|
| | | |
|---|
| | | @PostMapping("/exam/foreground/login") |
|---|
| | | public Msg examLogin(@RequestBody JSONObject loginFormData) { |
|---|
| | | //手机号 |
|---|
| | | String username = loginFormData.getString("telIdNo"); |
|---|
| | | String password = loginFormData.getString("password"); |
|---|
| | | UserInfo userInfo = userService.examForegroundLogin(username, password); |
|---|
| | | UserDTO userDTO = new UserDTO(); |
|---|
| | | BeanUtils.copyProperties(userInfo,userDTO); |
|---|
| | | if (userDTO.getId() != null) { |
|---|
| | | List<RoleInfo> roleInfos = roleService.selectRoleByUser(userDTO.getId()); |
|---|
| | | if (roleInfos.size() == 1) |
|---|
| | | userDTO.setRoleId(roleInfos.get(0).getId()); |
|---|
| | | userDTO.setRoleName(roleInfos.get(0).getName()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | return success(userDTO); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/exam/background/login") |
|---|
| | | public Msg examBackgroundLogin(@RequestBody JSONObject loginFormData) { |
|---|
| | | |
|---|
| | | String username = loginFormData.getString("username"); |
|---|
| | | String password = loginFormData.getString("password"); |
|---|
| | | UserInfo userInfo = userService.examBackgroundLogin(username, password); |
|---|
| | | return success(userInfo); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/departmentPage") |
|---|
| | | public Msg departmentPage(@RequestBody JSONObject jsonObject) { |
|---|
| | | String name = jsonObject.getString("name"); |
|---|
| | | Integer first = jsonObject.getInteger("first"); |
|---|
| | | Integer pageSize = jsonObject.getInteger("pageSize"); |
|---|
| | | Map<String, Object> result = new HashMap<>(); |
|---|
| | | Integer count = departmentService.selectCountForExam(name); |
|---|
| | | List<DepartmentInfo> data = departmentService.selectPageForExam(name, first, pageSize); |
|---|
| | | result.put("count", count); |
|---|
| | | result.put("data", data); |
|---|
| | | return success(result); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/departmentList") |
|---|
| | | public Msg departmentList() { |
|---|
| | | List<DepartmentInfo> list = departmentService.list(new LambdaQueryWrapper<DepartmentInfo>().eq(DepartmentInfo::getIsdel,0)); |
|---|
| | | List<DepartmentDTO> res = new ArrayList<>(); |
|---|
| | | DepartmentDTO departmentDTO; |
|---|
| | | for (DepartmentInfo dep : list) { |
|---|
| | | departmentDTO = new DepartmentDTO(); |
|---|
| | | departmentDTO.setId(dep.getId()); |
|---|
| | | departmentDTO.setName(dep.getDepartment()); |
|---|
| | | res.add(departmentDTO); |
|---|
| | | } |
|---|
| | | |
|---|
| | | return success(res); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/personPage") |
|---|
| | | public Msg personPage(@RequestBody JSONObject jsonObject) { |
|---|
| | | String name = jsonObject.getString("name"); |
|---|
| | | String idno = jsonObject.getString("idno"); |
|---|
| | | String tel = jsonObject.getString("tel"); |
|---|
| | | String department = jsonObject.getString("department"); |
|---|
| | | String company = jsonObject.getString("company"); |
|---|
| | | Integer first = jsonObject.getInteger("first"); |
|---|
| | | Integer pageSize = jsonObject.getInteger("pageSize"); |
|---|
| | | Map<String, Object> result = new HashMap<>(); |
|---|
| | | Integer count = userService.selectCountForExam(name,idno,tel,department,company); |
|---|
| | | List<UserInfo> data = userService.selectPageForExam(name,idno,tel,department,company, first, pageSize); |
|---|
| | | result.put("count", count); |
|---|
| | | result.put("data", data); |
|---|
| | | return success(result); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | @PostMapping("/rolePage") |
|---|
| | | public Msg rolePage(@RequestBody JSONObject jsonObject) { |
|---|
| | | String name = jsonObject.getString("name"); |
|---|
| | | Integer first = jsonObject.getInteger("first"); |
|---|
| | | Integer pageSize = jsonObject.getInteger("pageSize"); |
|---|
| | | Map<String, Object> result = new HashMap<>(); |
|---|
| | | Integer count = roleService.selectCountForRole(name); |
|---|
| | | List<RoleInfo> data = roleService.selectPageForRole(name, first, pageSize); |
|---|
| | | result.put("count", count); |
|---|
| | | result.put("data", data); |
|---|
| | | return success(result); |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Config.Cors; |
|---|
| | | |
|---|
| | | import org.springframework.context.annotation.Configuration; |
|---|
| | | import org.springframework.web.servlet.config.annotation.CorsRegistry; |
|---|
| | | import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; |
|---|
| | | |
|---|
| | | @Configuration |
|---|
| | | public class CorsConfig extends WebMvcConfigurerAdapter { |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public void addCorsMappings(CorsRegistry registry) { |
|---|
| | | registry.addMapping("/**").allowedOrigins("*") |
|---|
| | | .allowedMethods("GET", "HEAD", "POST","PUT", "DELETE", "OPTIONS") |
|---|
| | | .allowCredentials(true).maxAge(3600); |
|---|
| | | } |
|---|
| | | |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Config.Cors; |
|---|
| | | |
|---|
| | | import org.springframework.stereotype.Component; |
|---|
| | | |
|---|
| | | import javax.servlet.*; |
|---|
| | | import javax.servlet.annotation.WebFilter; |
|---|
| | | import javax.servlet.http.HttpServletRequest; |
|---|
| | | import javax.servlet.http.HttpServletResponse; |
|---|
| | | import java.io.IOException; |
|---|
| | | |
|---|
| | | @Component |
|---|
| | | @WebFilter(urlPatterns = "/*", filterName = "CorsFilter") |
|---|
| | | public class CorsFilter implements Filter { |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) throws IOException, ServletException { |
|---|
| | | HttpServletResponse response = (HttpServletResponse) res; |
|---|
| | | HttpServletRequest reqs = (HttpServletRequest) req; |
|---|
| | | String curOrigin = reqs.getHeader("Origin"); |
|---|
| | | response.setHeader("Access-Control-Allow-Origin", curOrigin == null ? "*" : curOrigin); |
|---|
| | | // response.setHeader("Access-Control-Allow-Origin", "*"); |
|---|
| | | response.setHeader("Access-Control-Allow-Credentials", "true"); |
|---|
| | | response.setHeader("Access-Control-Allow-Methods", "POST, GET, PATCH, DELETE, PUT, OPTIONS"); |
|---|
| | | response.setHeader("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept, X-Auth-Token, Authorization"); |
|---|
| | | // response.setHeader("Access-Control-Allow-Headers", "*"); |
|---|
| | | response.setHeader("Access-Control-Max-Age","3600"); |
|---|
| | | chain.doFilter(req, res); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public void init(FilterConfig filterConfig) { |
|---|
| | | System.out.println("cors"); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public void destroy() {} |
|---|
| | | |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Config.Cors; |
|---|
| | | |
|---|
| | | import org.springframework.beans.factory.annotation.Value; |
|---|
| | | import org.springframework.context.annotation.Configuration; |
|---|
| | | import org.springframework.web.servlet.config.annotation.CorsRegistry; |
|---|
| | | import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; |
|---|
| | | import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; |
|---|
| | | |
|---|
| | | @Configuration |
|---|
| | | public class MyMvcConfigurer implements WebMvcConfigurer { |
|---|
| | | @Value("${filePath}") |
|---|
| | | private String filePath; //配置文件配置的物理保存地址 |
|---|
| | | @Value("${sqlPath}") |
|---|
| | | private String sqlPath; |
|---|
| | | @Value("${enterprisePath}") |
|---|
| | | private String enterprisePath; //配置文件配置的物理保存地址 |
|---|
| | | @Value("${contractPath}") |
|---|
| | | private String contractPath; //配置文件配置的物理保存地址 |
|---|
| | | @Value("${transportCertificatePath}") |
|---|
| | | private String transportCertificatePath; |
|---|
| | | @Value("${hiddenDangerPath}") |
|---|
| | | private String hiddenDangerPath; |
|---|
| | | @Value("${patrolPath}") |
|---|
| | | private String patrolPath; |
|---|
| | | @Value("${appPath}") |
|---|
| | | private String appPath; |
|---|
| | | @Value("${workCertPath}") |
|---|
| | | private String workCertPath; |
|---|
| | | @Value("${taskPath}") |
|---|
| | | private String taskPath; |
|---|
| | | @Value("${emergencyPlanPath}") |
|---|
| | | private String emergencyPlanPath; |
|---|
| | | |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public void addCorsMappings(CorsRegistry registry) { |
|---|
| | | registry.addMapping("/**") |
|---|
| | | .allowedOrigins("*") |
|---|
| | | .allowCredentials(true) |
|---|
| | | .allowedMethods("GET", "POST", "DELETE", "PUT","PATCH") |
|---|
| | | .maxAge(3600); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /**服务器静态资源配置**/ |
|---|
| | | @Override |
|---|
| | | public void addResourceHandlers(ResourceHandlerRegistry registry) { |
|---|
| | | registry.addResourceHandler("/upload/**") |
|---|
| | | .addResourceLocations("file:"+ filePath) //媒体资源 |
|---|
| | | .addResourceLocations("classpath:/META-INF/resources/"); //swagger2页面 |
|---|
| | | registry.addResourceHandler("/dbback/**") |
|---|
| | | .addResourceLocations("file:"+sqlPath); |
|---|
| | | registry.addResourceHandler("/upload/enterprise/**") |
|---|
| | | .addResourceLocations("file:"+enterprisePath); |
|---|
| | | registry.addResourceHandler("/upload/contract/**") |
|---|
| | | .addResourceLocations("file:"+contractPath); |
|---|
| | | registry.addResourceHandler("/upload/transportCertificate/**") |
|---|
| | | .addResourceLocations("file:" + transportCertificatePath); |
|---|
| | | registry.addResourceHandler("/upload/hiddenDanger/**") |
|---|
| | | .addResourceLocations("file:" + hiddenDangerPath); |
|---|
| | | registry.addResourceHandler("/upload/patrol/**") |
|---|
| | | .addResourceLocations("file:" + patrolPath); |
|---|
| | | registry.addResourceHandler("/upload/app/**") |
|---|
| | | .addResourceLocations("file:" + appPath); |
|---|
| | | registry.addResourceHandler("/upload/workCert/**") |
|---|
| | | .addResourceLocations("file:" + workCertPath); |
|---|
| | | registry.addResourceHandler("/upload/task/**") |
|---|
| | | .addResourceLocations("file:" + taskPath); |
|---|
| | | registry.addResourceHandler("/upload/emergencyPlan/**") |
|---|
| | | .addResourceLocations("file:" + emergencyPlanPath); |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Config.DataSource; |
|---|
| | | |
|---|
| | | import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder; |
|---|
| | | import org.springframework.boot.context.properties.ConfigurationProperties; |
|---|
| | | import org.springframework.context.annotation.Bean; |
|---|
| | | import org.springframework.context.annotation.Configuration; |
|---|
| | | |
|---|
| | | import javax.sql.DataSource; |
|---|
| | | |
|---|
| | | @Configuration |
|---|
| | | public class DataSourceConfig { |
|---|
| | | |
|---|
| | | @Bean |
|---|
| | | @ConfigurationProperties("spring.datasource.one") |
|---|
| | | DataSource dsOne(){ |
|---|
| | | return DruidDataSourceBuilder.create().build(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Config.DataSource; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; |
|---|
| | | import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; |
|---|
| | | import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean; |
|---|
| | | import org.apache.ibatis.plugin.Interceptor; |
|---|
| | | import org.apache.ibatis.session.SqlSessionFactory; |
|---|
| | | import org.mybatis.spring.SqlSessionTemplate; |
|---|
| | | import org.mybatis.spring.annotation.MapperScan; |
|---|
| | | import org.mybatis.spring.annotation.MapperScans; |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.beans.factory.annotation.Qualifier; |
|---|
| | | import org.springframework.context.annotation.Bean; |
|---|
| | | import org.springframework.context.annotation.Configuration; |
|---|
| | | import org.springframework.core.io.Resource; |
|---|
| | | import org.springframework.core.io.support.PathMatchingResourcePatternResolver; |
|---|
| | | import org.springframework.core.io.support.ResourcePatternResolver; |
|---|
| | | import org.springframework.stereotype.Repository; |
|---|
| | | |
|---|
| | | import javax.sql.DataSource; |
|---|
| | | import java.io.IOException; |
|---|
| | | import java.util.ArrayList; |
|---|
| | | import java.util.Arrays; |
|---|
| | | import java.util.List; |
|---|
| | | |
|---|
| | | @Configuration |
|---|
| | | @MapperScans({ |
|---|
| | | @MapperScan(value = "com.gk.hotwork.Mapper",sqlSessionFactoryRef = "sqlSessionFactoryBean1" ,annotationClass = Repository.class), |
|---|
| | | @MapperScan(value = "com.gk.hotwork.doublePrevention.repository",sqlSessionFactoryRef = "sqlSessionFactoryBean1" ,annotationClass = Repository.class), |
|---|
| | | @MapperScan(value = "com.gk.hotwork.specialWork.repository",sqlSessionFactoryRef = "sqlSessionFactoryBean1" ,annotationClass = Repository.class), |
|---|
| | | } |
|---|
| | | ) |
|---|
| | | public class MyBatisConfigOne { |
|---|
| | | @Autowired |
|---|
| | | @Qualifier("dsOne") |
|---|
| | | DataSource dsOne; |
|---|
| | | |
|---|
| | | @Autowired |
|---|
| | | private PaginationInterceptor paginationInterceptor; |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | @Bean |
|---|
| | | SqlSessionFactory sqlSessionFactoryBean1() throws Exception { |
|---|
| | | MybatisSqlSessionFactoryBean factoryBean = new MybatisSqlSessionFactoryBean(); |
|---|
| | | factoryBean.setDataSource(dsOne); |
|---|
| | | factoryBean.setMapperLocations(resolveMapperLocations()); |
|---|
| | | |
|---|
| | | //关键代码 设置 MyBatis-Plus 分页插件 |
|---|
| | | Interceptor[] plugins = {paginationInterceptor}; |
|---|
| | | paginationInterceptor.setLimit(100000); |
|---|
| | | factoryBean.setPlugins(plugins); |
|---|
| | | |
|---|
| | | return factoryBean.getObject(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Resource[] resolveMapperLocations() { |
|---|
| | | ResourcePatternResolver resourceResolver = new PathMatchingResourcePatternResolver(); |
|---|
| | | List<String> mapperLocations = new ArrayList<>(); |
|---|
| | | mapperLocations.add("classpath*:com/gk/hotwork/Mapper/**/*.xml"); |
|---|
| | | List<Resource> resources = new ArrayList(); |
|---|
| | | if (mapperLocations != null) { |
|---|
| | | for (String mapperLocation : mapperLocations) { |
|---|
| | | try { |
|---|
| | | Resource[] mappers = resourceResolver.getResources(mapperLocation); |
|---|
| | | resources.addAll(Arrays.asList(mappers)); |
|---|
| | | } catch (IOException e) { |
|---|
| | | // ignore |
|---|
| | | } |
|---|
| | | } |
|---|
| | | } |
|---|
| | | return resources.toArray(new Resource[resources.size()]); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @Bean |
|---|
| | | SqlSessionTemplate sqlSessionTemplate1() throws Exception{ |
|---|
| | | return new SqlSessionTemplate(sqlSessionFactoryBean1()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Config.DataSource; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.core.conditions.AbstractWrapper; |
|---|
| | | import org.aspectj.lang.JoinPoint; |
|---|
| | | import org.aspectj.lang.annotation.Aspect; |
|---|
| | | import org.aspectj.lang.annotation.Before; |
|---|
| | | import org.aspectj.lang.annotation.Pointcut; |
|---|
| | | import org.springframework.stereotype.Component; |
|---|
| | | |
|---|
| | | @Aspect |
|---|
| | | @Component |
|---|
| | | public class MybatisAspectj { |
|---|
| | | // 配置织入点 |
|---|
| | | @Pointcut("execution(public * com.baomidou.mybatisplus.core.mapper.BaseMapper.selectOne(..))") |
|---|
| | | public void selectOneAspect() { |
|---|
| | | } |
|---|
| | | |
|---|
| | | @Before("selectOneAspect()") |
|---|
| | | public void beforeSelect(JoinPoint point) { |
|---|
| | | Object arg = point.getArgs()[0]; |
|---|
| | | if (arg instanceof AbstractWrapper) { |
|---|
| | | arg = (AbstractWrapper) arg; |
|---|
| | | ((AbstractWrapper) arg).last("limit 1"); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Config.Log; |
|---|
| | | |
|---|
| | | |
|---|
| | | import cn.hutool.core.util.StrUtil; |
|---|
| | | import com.alibaba.fastjson.JSONObject; |
|---|
| | | import com.gk.hotwork.Config.Oauth2.IRedisService; |
|---|
| | | import com.gk.hotwork.Config.Oauth2.RedisKeyEnum; |
|---|
| | | import com.gk.hotwork.Domain.Enum.SourceType; |
|---|
| | | import com.gk.hotwork.Domain.HiddenDanger; |
|---|
| | | import com.gk.hotwork.Domain.HiddenDangerLog; |
|---|
| | | import com.gk.hotwork.Domain.Log.HiddenDangerLogAnno; |
|---|
| | | import com.gk.hotwork.Domain.UserInfo; |
|---|
| | | import com.gk.hotwork.Domain.Utils.CommonUtil; |
|---|
| | | import com.gk.hotwork.Domain.Utils.Msg; |
|---|
| | | import com.gk.hotwork.Domain.Utils.SpringBeanUtil; |
|---|
| | | import com.gk.hotwork.Service.HiddenDangerLogService; |
|---|
| | | import com.gk.hotwork.Service.UserService; |
|---|
| | | import com.google.common.net.HttpHeaders; |
|---|
| | | import io.jsonwebtoken.Claims; |
|---|
| | | import org.apache.log4j.Logger; |
|---|
| | | import org.aspectj.lang.JoinPoint; |
|---|
| | | import org.aspectj.lang.Signature; |
|---|
| | | import org.aspectj.lang.annotation.AfterReturning; |
|---|
| | | import org.aspectj.lang.annotation.Aspect; |
|---|
| | | import org.aspectj.lang.annotation.Before; |
|---|
| | | import org.aspectj.lang.annotation.Pointcut; |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.stereotype.Component; |
|---|
| | | import org.springframework.web.context.request.RequestContextHolder; |
|---|
| | | import org.springframework.web.context.request.ServletRequestAttributes; |
|---|
| | | |
|---|
| | | import javax.servlet.http.HttpServletRequest; |
|---|
| | | import javax.xml.crypto.Data; |
|---|
| | | import java.lang.reflect.Method; |
|---|
| | | import java.util.Date; |
|---|
| | | |
|---|
| | | @Aspect |
|---|
| | | @Component |
|---|
| | | public class HiddenDangerLogAspect { |
|---|
| | | |
|---|
| | | private static final Logger logger = Logger.getLogger(HiddenDangerLogAspect.class); |
|---|
| | | |
|---|
| | | @Autowired |
|---|
| | | private HiddenDangerLogService hiddenDangerLogService; |
|---|
| | | @Autowired |
|---|
| | | private IRedisService redisService; |
|---|
| | | @Autowired |
|---|
| | | private UserService userService; |
|---|
| | | |
|---|
| | | @Pointcut("@annotation(com.gk.hotwork.Domain.Log.HiddenDangerLogAnno)") |
|---|
| | | public void controllerAspect() { |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | @AfterReturning(returning="result",pointcut = "controllerAspect()") |
|---|
| | | public void AfterExec(JoinPoint joinPoint,Object result) |
|---|
| | | { |
|---|
| | | handleLog(joinPoint,result); |
|---|
| | | //调用日志处理类去处理我们的日志 |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | private void handleLog(JoinPoint joinPoint,Object result) { |
|---|
| | | try { |
|---|
| | | ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); |
|---|
| | | assert requestAttributes != null; |
|---|
| | | HttpServletRequest request = requestAttributes.getRequest(); |
|---|
| | | String token = request.getHeader(HttpHeaders.AUTHORIZATION); |
|---|
| | | //解析token |
|---|
| | | Claims claims = CommonUtil.parseJWT(token); |
|---|
| | | String tokenKey = StrUtil.format(RedisKeyEnum.AUTH_TOKEN.getKey(), claims.getId()); |
|---|
| | | Object o = redisService.get(tokenKey); |
|---|
| | | JSONObject user = JSONObject.parseObject(o.toString()); |
|---|
| | | Msg msg = (Msg) result; |
|---|
| | | Object hiddenDanger = msg.getResult(); |
|---|
| | | HiddenDangerLog logInfo = getLogInfo(joinPoint); |
|---|
| | | if (logInfo != null) { |
|---|
| | | Long id = user.getLong("id"); |
|---|
| | | UserInfo userInfo = userService.getById(id); |
|---|
| | | logInfo.setOperatorid(id); |
|---|
| | | logInfo.setOperator(userInfo.getRealname()); |
|---|
| | | logInfo.setDetail(logInfo.getOperator() + logInfo.getDetail()); |
|---|
| | | logInfo.setOperationtime(new Date()); |
|---|
| | | logInfo.setValidflag(true); |
|---|
| | | logInfo.setExtra(hiddenDanger instanceof HiddenDanger?((HiddenDanger) hiddenDanger).getRectifier():""); |
|---|
| | | hiddenDangerLogService.save(logInfo); |
|---|
| | | } |
|---|
| | | |
|---|
| | | } catch (Exception e1) { |
|---|
| | | e1.printStackTrace(); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | private HiddenDangerLog getLogInfo(JoinPoint joinPoint) throws Exception{ |
|---|
| | | //类名 |
|---|
| | | String targetName = joinPoint.getTarget().getClass().getName(); |
|---|
| | | // |
|---|
| | | String methodName = joinPoint.getSignature().getName(); |
|---|
| | | HiddenDangerLog hiddenDangerLog = null; |
|---|
| | | Object[] args = joinPoint.getArgs(); |
|---|
| | | Class<?> targetClass = Class.forName(targetName); |
|---|
| | | Method[] methods = targetClass.getMethods(); |
|---|
| | | for (Method method : methods) { |
|---|
| | | if (method.getName().equals(methodName)) { |
|---|
| | | Class<?>[] clazzs = method.getParameterTypes(); |
|---|
| | | if (clazzs.length == args.length) { |
|---|
| | | hiddenDangerLog = new HiddenDangerLog(); |
|---|
| | | String detail = method.getAnnotation(HiddenDangerLogAnno.class).detail(); |
|---|
| | | String operation = method.getAnnotation(HiddenDangerLogAnno.class).operation(); |
|---|
| | | SourceType source = method.getAnnotation(HiddenDangerLogAnno.class).source(); |
|---|
| | | hiddenDangerLog.setDetail(detail); |
|---|
| | | hiddenDangerLog.setOperation(operation); |
|---|
| | | hiddenDangerLog.setSource(source); |
|---|
| | | break; |
|---|
| | | } |
|---|
| | | } |
|---|
| | | } |
|---|
| | | return hiddenDangerLog; |
|---|
| | | } |
|---|
| | | |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Config.Oauth2; |
|---|
| | | |
|---|
| | | import cn.hutool.core.util.ObjectUtil; |
|---|
| | | import cn.hutool.core.util.StrUtil; |
|---|
| | | import com.alibaba.fastjson.JSON; |
|---|
| | | import com.gk.hotwork.Domain.AuthorizationInfo; |
|---|
| | | import com.gk.hotwork.Domain.Utils.CommonUtil; |
|---|
| | | import com.gk.hotwork.Domain.Utils.Constants; |
|---|
| | | import com.gk.hotwork.Domain.Utils.Msg; |
|---|
| | | import com.gk.hotwork.Domain.Vo.UserVo; |
|---|
| | | import com.gk.hotwork.Service.AuthorizationService; |
|---|
| | | import com.gk.hotwork.Service.UserService; |
|---|
| | | import io.jsonwebtoken.Claims; |
|---|
| | | import org.slf4j.Logger; |
|---|
| | | import org.slf4j.LoggerFactory; |
|---|
| | | import org.springframework.beans.factory.annotation.Value; |
|---|
| | | import org.springframework.http.HttpHeaders; |
|---|
| | | import org.springframework.http.HttpStatus; |
|---|
| | | import org.springframework.util.AntPathMatcher; |
|---|
| | | |
|---|
| | | import javax.servlet.*; |
|---|
| | | import javax.servlet.http.HttpServletRequest; |
|---|
| | | import javax.servlet.http.HttpServletResponse; |
|---|
| | | import java.io.IOException; |
|---|
| | | import java.io.PrintWriter; |
|---|
| | | import java.util.Map; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * AccessToken filter |
|---|
| | | * |
|---|
| | | * @author zhangby |
|---|
| | | * @date 2019-05-20 20:32 |
|---|
| | | */ |
|---|
| | | public class AccessTokenFilter implements Filter { |
|---|
| | | private final Logger logger = LoggerFactory.getLogger(this.getClass()); |
|---|
| | | @Value("${workname}") |
|---|
| | | private String workname; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * redis service |
|---|
| | | */ |
|---|
| | | IRedisService redisService = SpringContextUtil.getBean(IRedisService.class); |
|---|
| | | |
|---|
| | | UserService userService = SpringContextUtil.getBean(UserService.class); |
|---|
| | | |
|---|
| | | AuthorizationService authorizationService = SpringContextUtil.getBean(AuthorizationService.class); |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * do filter |
|---|
| | | * |
|---|
| | | * @param servletRequest servletRequest |
|---|
| | | * @param servletResponse servletResponse |
|---|
| | | * @param filterChain filterChain |
|---|
| | | * @throws IOException IOException |
|---|
| | | * @throws ServletException ServletException |
|---|
| | | */ |
|---|
| | | @Override |
|---|
| | | public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException { |
|---|
| | | HttpServletRequest request = (HttpServletRequest) servletRequest; |
|---|
| | | HttpServletResponse response = (HttpServletResponse) servletResponse; |
|---|
| | | response.setHeader("Access-Control-Allow-Origin", request.getHeader("Origin")); |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | try { |
|---|
| | | // filter url && !request.getMethod().equals("OPTIONS") |
|---|
| | | if (urlMatcher(request.getRequestURI(), Constants.FILTER_EXCLUDE_PATH)){ |
|---|
| | | String token = request.getHeader(HttpHeaders.AUTHORIZATION); |
|---|
| | | if (null != token && !token.equals("undefined")) { |
|---|
| | | /** 解析token */ |
|---|
| | | Claims claims = CommonUtil.parseJWT(token); |
|---|
| | | if (ObjectUtil.isNotNull(claims)) { |
|---|
| | | //设置当前登录用户 |
|---|
| | | System.setProperty(Constants.CURRENT_USER_ID, claims.get("user_id").toString()); |
|---|
| | | try { |
|---|
| | | //获取redis 查询token是否有效 [jti] |
|---|
| | | String tokenKey = StrUtil.format(RedisKeyEnum.AUTH_TOKEN.getKey(), claims.getId()); |
|---|
| | | Object userInfo = redisService.get(tokenKey); |
|---|
| | | if (ObjectUtil.isNotNull(userInfo)) { |
|---|
| | | Map map = JSON.parseObject(userInfo.toString(), Map.class); |
|---|
| | | UserVo userVo = userService.selectUserVoByName(workname,map.get("username").toString()); |
|---|
| | | if (null == userVo) { |
|---|
| | | msg.setCode("100"); |
|---|
| | | msg.setMessage("用户不存在"); |
|---|
| | | returnJson(response, msg); |
|---|
| | | return; |
|---|
| | | } |
|---|
| | | // if (userVo.getIssale() == 1){ |
|---|
| | | // if (userVo.getStatus()!=null && userVo.getStatus() != 1){ |
|---|
| | | // msg.setCode("100"); |
|---|
| | | // msg.setMessage("用户已失效"); |
|---|
| | | // returnJson(response, msg); |
|---|
| | | // return; |
|---|
| | | // } |
|---|
| | | // if (userVo.getExpiredate() != null && userVo.getExpiredate().getTime() < System.currentTimeMillis()){ |
|---|
| | | // msg.setCode("100"); |
|---|
| | | // msg.setMessage("用户已超期"); |
|---|
| | | // returnJson(response, msg); |
|---|
| | | // return; |
|---|
| | | // } |
|---|
| | | // |
|---|
| | | // Object loginObj = map.get("logintime"); |
|---|
| | | // Object authObj = map.get("auth"); |
|---|
| | | // if (loginObj != null && authObj != null){ |
|---|
| | | // //通过auth查询授权码最后登录时间 |
|---|
| | | // AuthorizationInfo authInfo = authorizationService.selectByUser(userVo.getCompanynumber(),authObj.toString()); |
|---|
| | | // if (authInfo == null){ |
|---|
| | | // msg.setCode("100"); |
|---|
| | | // msg.setMessage("授权码无效"); |
|---|
| | | // returnJson(response, msg); |
|---|
| | | // return; |
|---|
| | | // } |
|---|
| | | // if (authInfo.getLasttime().getTime() > Long.parseLong(loginObj.toString())){ |
|---|
| | | // redisService.set(tokenKey, userInfo, 0L); |
|---|
| | | // msg.setCode("100"); |
|---|
| | | // msg.setMessage("登录失效,请重新登录"); |
|---|
| | | // returnJson(response, msg); |
|---|
| | | // return; |
|---|
| | | // } |
|---|
| | | // } |
|---|
| | | // } |
|---|
| | | //更新登录超时时间 |
|---|
| | | redisService.set(tokenKey, userInfo, 60L*60L*18L); |
|---|
| | | } else { |
|---|
| | | logger.info("998：登录超时，无效认证"); |
|---|
| | | msg.setCode("100"); |
|---|
| | | msg.setMessage("登录超时，无效认证"); |
|---|
| | | returnJson(response, msg); |
|---|
| | | return; |
|---|
| | | } |
|---|
| | | } catch (Exception e) { |
|---|
| | | logger.info("401：非授权访问，无效的token"); |
|---|
| | | } |
|---|
| | | } else { |
|---|
| | | logger.info("500: 账户或密码不正确,登录失败"); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | else if(request.getMethod().equals("OPTIONS")) { |
|---|
| | | response.setHeader("Access-Control-Allow-Origin", request.getHeader("Origin")); |
|---|
| | | response.setHeader("Access-Control-Allow-Credentials", "true"); |
|---|
| | | response.setHeader("Access-Control-Allow-Methods", "POST, GET, PATCH, DELETE, PUT, OPTIONS"); |
|---|
| | | response.setHeader("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept, X-Auth-Token, Authorization"); |
|---|
| | | response.setHeader("Access-Control-Max-Age","3600"); |
|---|
| | | response.setStatus(HttpStatus.OK.value()); |
|---|
| | | return; |
|---|
| | | } |
|---|
| | | else { |
|---|
| | | logger.info("500: token不存在"); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | } catch (Exception e) { |
|---|
| | | e.printStackTrace(); |
|---|
| | | //系统异常 |
|---|
| | | msg.setCode("100"); |
|---|
| | | msg.setMessage("系统异常请稍后重试"); |
|---|
| | | returnJson(response, msg); |
|---|
| | | response.setStatus(HttpStatus.OK.value()); |
|---|
| | | } |
|---|
| | | filterChain.doFilter(servletRequest, servletResponse); |
|---|
| | | //过滤器结束之后销毁 |
|---|
| | | System.clearProperty(Constants.CURRENT_USER_ID); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public void init(FilterConfig filterConfig) throws ServletException { |
|---|
| | | } |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public void destroy() { |
|---|
| | | |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 认证是否需要，验证session url |
|---|
| | | * |
|---|
| | | * @param real_url |
|---|
| | | * @return |
|---|
| | | */ |
|---|
| | | private boolean urlMatcher(String real_url, String pathFilter) { |
|---|
| | | AntPathMatcher antPathMatcher = new AntPathMatcher(); |
|---|
| | | /** 验证添加项url */ |
|---|
| | | if (StrUtil.isNotBlank(pathFilter)) { |
|---|
| | | for (String path : pathFilter.split(",")) { |
|---|
| | | if (antPathMatcher.match(path.trim(), real_url.trim())) { |
|---|
| | | return false; |
|---|
| | | } |
|---|
| | | } |
|---|
| | | } |
|---|
| | | return true; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 返回url |
|---|
| | | * |
|---|
| | | * @param response |
|---|
| | | * @param |
|---|
| | | */ |
|---|
| | | private void returnJson(HttpServletResponse response, Msg msg) { |
|---|
| | | PrintWriter writer = null; |
|---|
| | | response.setCharacterEncoding("UTF-8"); |
|---|
| | | response.setContentType("text/html; charset=utf-8"); |
|---|
| | | response.setHeader("Access-Control-Allow-Credentials", "true"); |
|---|
| | | response.setHeader("Access-Control-Allow-Methods", "POST, GET, PATCH, DELETE, PUT, OPTIONS"); |
|---|
| | | response.setHeader("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept, X-Auth-Token, Authorization"); |
|---|
| | | response.setHeader("Access-Control-Max-Age","3600"); |
|---|
| | | try { |
|---|
| | | writer = response.getWriter(); |
|---|
| | | writer.print(JSON.toJSON(msg)); |
|---|
| | | } catch (IOException e) { |
|---|
| | | } finally { |
|---|
| | | if (writer != null) { |
|---|
| | | writer.close(); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Config.Oauth2; |
|---|
| | | |
|---|
| | | import com.alibaba.fastjson.JSON; |
|---|
| | | import org.slf4j.Logger; |
|---|
| | | import org.slf4j.LoggerFactory; |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.beans.factory.annotation.Value; |
|---|
| | | import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; |
|---|
| | | import org.springframework.data.redis.core.*; |
|---|
| | | import org.springframework.stereotype.Service; |
|---|
| | | |
|---|
| | | import javax.annotation.PostConstruct; |
|---|
| | | import java.util.*; |
|---|
| | | import java.util.concurrent.TimeUnit; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * redis service |
|---|
| | | * |
|---|
| | | * @author zhangby |
|---|
| | | * @date 2019-05-15 09:34 |
|---|
| | | */ |
|---|
| | | @Service |
|---|
| | | public class IRedisService { |
|---|
| | | /** |
|---|
| | | * logger |
|---|
| | | */ |
|---|
| | | private final Logger logger = LoggerFactory.getLogger(this.getClass()); |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * redis service |
|---|
| | | */ |
|---|
| | | @Autowired |
|---|
| | | protected StringRedisTemplate redisTemplate; |
|---|
| | | @Value("${spring.redis.database}") |
|---|
| | | private Integer database; |
|---|
| | | |
|---|
| | | @PostConstruct |
|---|
| | | public void initTest(){ |
|---|
| | | try { |
|---|
| | | this.set("redisConnect", "testConnection", (long) 60); |
|---|
| | | logger.info("redis-db connection测试连接成功"); |
|---|
| | | } catch (Exception e) { |
|---|
| | | logger.error("redis-db connection测试连接失败"); |
|---|
| | | } |
|---|
| | | |
|---|
| | | } |
|---|
| | | /** |
|---|
| | | * Write to redis cache |
|---|
| | | * |
|---|
| | | * @param key key |
|---|
| | | * @param value value |
|---|
| | | * @return boolean |
|---|
| | | */ |
|---|
| | | public boolean set(final String key, Object value) { |
|---|
| | | boolean result = false; |
|---|
| | | if (value != null) { |
|---|
| | | try { |
|---|
| | | ValueOperations operations = redisTemplate.opsForValue(); |
|---|
| | | if (value instanceof String) { |
|---|
| | | operations.set(key, value.toString()); |
|---|
| | | } else { |
|---|
| | | operations.set(key, JSON.toJSONString(value)); |
|---|
| | | } |
|---|
| | | result = true; |
|---|
| | | } catch (Exception e) { |
|---|
| | | logger.info("Writing redis cache failed! The error message is:" + e.getMessage()); |
|---|
| | | e.printStackTrace(); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | return result; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * Write redis cache (set expire survival time) |
|---|
| | | * |
|---|
| | | * @param key key |
|---|
| | | * @param value value |
|---|
| | | * @param expire time |
|---|
| | | * @return boolean |
|---|
| | | */ |
|---|
| | | public boolean set(final String key, Object value, Long expire) { |
|---|
| | | boolean result = false; |
|---|
| | | try { |
|---|
| | | ValueOperations operations = redisTemplate.opsForValue(); |
|---|
| | | if (value instanceof String) { |
|---|
| | | operations.set(key, value.toString()); |
|---|
| | | } else { |
|---|
| | | operations.set(key, JSON.toJSONString(value)); |
|---|
| | | } |
|---|
| | | redisTemplate.expire(key, expire, TimeUnit.SECONDS); |
|---|
| | | result = true; |
|---|
| | | } catch (Exception e) { |
|---|
| | | logger.info("Writing to the redis cache (setting the expire lifetime) failed! The error message is:" + e.getMessage()); |
|---|
| | | e.printStackTrace(); |
|---|
| | | } |
|---|
| | | return result; |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * Read redis cache |
|---|
| | | * |
|---|
| | | * @param key key |
|---|
| | | * @return object |
|---|
| | | */ |
|---|
| | | public Object get(final String key) { |
|---|
| | | Object result = null; |
|---|
| | | try { |
|---|
| | | ValueOperations operations = redisTemplate.opsForValue(); |
|---|
| | | result = operations.get(key); |
|---|
| | | } catch (Exception e) { |
|---|
| | | logger.info("Failed to read redis cache! The error message is:" + e.getMessage()); |
|---|
| | | e.printStackTrace(); |
|---|
| | | } |
|---|
| | | return result; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * Read redis to entity |
|---|
| | | * |
|---|
| | | * @param key redis key |
|---|
| | | * @param clazz 实体类class |
|---|
| | | * @param <T> 泛型 |
|---|
| | | * @return T |
|---|
| | | */ |
|---|
| | | public <T> T getBean(final String key, Class<T> clazz) { |
|---|
| | | return Optional.ofNullable(get(key)) |
|---|
| | | .map(o -> JSON.parseObject(o.toString(), clazz)) |
|---|
| | | .orElse(null); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * Read redis to List |
|---|
| | | * @param key |
|---|
| | | * @param clazz |
|---|
| | | * @param <T> |
|---|
| | | * @return |
|---|
| | | */ |
|---|
| | | public <T> List<T> getArrayBean(final String key, Class<T> clazz) { |
|---|
| | | return Optional.ofNullable(get(key)) |
|---|
| | | .map(o -> JSON.parseArray(o.toString(), clazz)) |
|---|
| | | .orElse(null); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * Determine if there is a corresponding key in the redis cache |
|---|
| | | * |
|---|
| | | * @param key key |
|---|
| | | * @return boolean |
|---|
| | | */ |
|---|
| | | public boolean exists(final String key) { |
|---|
| | | boolean result = false; |
|---|
| | | try { |
|---|
| | | result = redisTemplate.hasKey(key); |
|---|
| | | } catch (Exception e) { |
|---|
| | | logger.info("Determine if there is a corresponding key in the redis cache failed! The error message is:" + e.getMessage()); |
|---|
| | | e.printStackTrace(); |
|---|
| | | } |
|---|
| | | return result; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * Redis deletes the corresponding value according to the key |
|---|
| | | * |
|---|
| | | * @param key key |
|---|
| | | * @return boolean |
|---|
| | | */ |
|---|
| | | public boolean remove(final String key) { |
|---|
| | | boolean result = false; |
|---|
| | | try { |
|---|
| | | if (exists(key)) { |
|---|
| | | redisTemplate.delete(key); |
|---|
| | | } |
|---|
| | | result = true; |
|---|
| | | } catch (Exception e) { |
|---|
| | | logger.info("Redis fails to delete the corresponding value according to the key! The error message is:" + e.getMessage()); |
|---|
| | | e.printStackTrace(); |
|---|
| | | } |
|---|
| | | return result; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * Redis deletes the corresponding value according to the keywords batch |
|---|
| | | * |
|---|
| | | * @param keys keys |
|---|
| | | */ |
|---|
| | | public void remove(final String... keys) { |
|---|
| | | for (String key : keys) { |
|---|
| | | remove(key); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | public void setDbIndex(Integer dbIndex) { |
|---|
| | | if (dbIndex == null || dbIndex > 15 || dbIndex < 0) { |
|---|
| | | dbIndex = database; |
|---|
| | | } |
|---|
| | | JedisConnectionFactory connectionFactory = (JedisConnectionFactory) redisTemplate.getConnectionFactory(); |
|---|
| | | if (connectionFactory == null) { |
|---|
| | | return; |
|---|
| | | } |
|---|
| | | connectionFactory.setDatabase(dbIndex); |
|---|
| | | redisTemplate.setConnectionFactory(connectionFactory); |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void rightPush(String key, String value) { |
|---|
| | | redisTemplate.opsForList().rightPush(key, value); |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String leftPop(String key) { |
|---|
| | | return redisTemplate.opsForList().leftPop(key); |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Long listSize(String key) { |
|---|
| | | return redisTemplate.opsForList().size(key); |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Boolean hasKey(String key) { |
|---|
| | | return redisTemplate.hasKey(key); |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setExpiredTime(String key,long seconds) { |
|---|
| | | redisTemplate.expire(key, seconds, TimeUnit.SECONDS); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * @Description: 获取以某个prefix为前缀的所有value |
|---|
| | | * @date 2022/5/16 11:13 |
|---|
| | | */ |
|---|
| | | public List<String> getListKey(Set<String> keys) { |
|---|
| | | return redisTemplate.opsForValue().multiGet(keys); |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Set<String> scan(String matchKey) { |
|---|
| | | return redisTemplate.execute((RedisCallback<Set<String>>) connection -> { |
|---|
| | | Set<String> keysTmp = new HashSet<>(); |
|---|
| | | Cursor<byte[]> cursor = connection.scan(new ScanOptions.ScanOptionsBuilder().match(matchKey).count(1000).build()); |
|---|
| | | while (cursor.hasNext()) { |
|---|
| | | keysTmp.add(new String(cursor.next())); |
|---|
| | | } |
|---|
| | | return keysTmp; |
|---|
| | | }); |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void expireAt(String key, Date date) { |
|---|
| | | redisTemplate.expireAt(key, date); |
|---|
| | | } |
|---|
| | | |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Config.Oauth2; |
|---|
| | | |
|---|
| | | import org.springframework.security.oauth2.common.DefaultOAuth2AccessToken; |
|---|
| | | import org.springframework.security.oauth2.common.OAuth2AccessToken; |
|---|
| | | import org.springframework.security.oauth2.provider.OAuth2Authentication; |
|---|
| | | import org.springframework.security.oauth2.provider.token.store.JwtAccessTokenConverter; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 自定义token |
|---|
| | | * |
|---|
| | | * @author zhangby |
|---|
| | | * @date 2019-04-01 11:39 |
|---|
| | | */ |
|---|
| | | public class JwtAccessToken extends JwtAccessTokenConverter { |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public OAuth2AccessToken enhance(OAuth2AccessToken accessToken, OAuth2Authentication authentication) { |
|---|
| | | DefaultOAuth2AccessToken defaultOAuth2AccessToken = new DefaultOAuth2AccessToken(accessToken); |
|---|
| | | // 设置额外用户信息 |
|---|
| | | OauthUser baseUser = ((OauthUser) authentication.getPrincipal()); |
|---|
| | | // 将用户信息添加到token额外信息中 |
|---|
| | | defaultOAuth2AccessToken.getAdditionalInformation().put("user_id", baseUser.getId()); |
|---|
| | | defaultOAuth2AccessToken.getAdditionalInformation().put("company", baseUser.getCompany()); |
|---|
| | | defaultOAuth2AccessToken.getAdditionalInformation().put("department", baseUser.getDepartment()); |
|---|
| | | defaultOAuth2AccessToken.getAdditionalInformation().put("userType", baseUser.getUserType()); |
|---|
| | | defaultOAuth2AccessToken.getAdditionalInformation().put("idCard", baseUser.getIdcard()); |
|---|
| | | |
|---|
| | | return super.enhance(defaultOAuth2AccessToken, authentication); |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Config.Oauth2; |
|---|
| | | |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.beans.factory.annotation.Qualifier; |
|---|
| | | import org.springframework.context.annotation.Bean; |
|---|
| | | import org.springframework.context.annotation.Configuration; |
|---|
| | | import org.springframework.security.oauth2.provider.token.TokenStore; |
|---|
| | | import org.springframework.security.oauth2.provider.token.store.JwtAccessTokenConverter; |
|---|
| | | import org.springframework.security.oauth2.provider.token.store.JwtTokenStore; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 配置jwt |
|---|
| | | */ |
|---|
| | | @Configuration |
|---|
| | | public class JwtConfig { |
|---|
| | | |
|---|
| | | @Autowired |
|---|
| | | JwtAccessTokenConverter jwtAccessTokenConverter; |
|---|
| | | |
|---|
| | | @Bean |
|---|
| | | @Qualifier("tokenStore") |
|---|
| | | public TokenStore tokenStore() { |
|---|
| | | return new JwtTokenStore(jwtAccessTokenConverter); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @Bean |
|---|
| | | protected JwtAccessTokenConverter jwtTokenEnhancer() { |
|---|
| | | JwtAccessToken converter = new JwtAccessToken(); |
|---|
| | | converter.setSigningKey("springCloud_oauth_service"); |
|---|
| | | return converter; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Config.Oauth2; |
|---|
| | | |
|---|
| | | |
|---|
| | | import com.gk.hotwork.Domain.Utils.Constants; |
|---|
| | | import org.springframework.beans.BeansException; |
|---|
| | | import org.springframework.context.ApplicationContext; |
|---|
| | | import org.springframework.context.ApplicationContextAware; |
|---|
| | | import org.springframework.security.web.util.matcher.AntPathRequestMatcher; |
|---|
| | | import org.springframework.security.web.util.matcher.OrRequestMatcher; |
|---|
| | | import org.springframework.security.web.util.matcher.RequestMatcher; |
|---|
| | | import org.springframework.stereotype.Component; |
|---|
| | | import org.springframework.web.filter.GenericFilterBean; |
|---|
| | | |
|---|
| | | import javax.servlet.FilterChain; |
|---|
| | | import javax.servlet.ServletException; |
|---|
| | | import javax.servlet.ServletRequest; |
|---|
| | | import javax.servlet.ServletResponse; |
|---|
| | | import javax.servlet.http.HttpServletRequest; |
|---|
| | | import javax.servlet.http.HttpServletResponse; |
|---|
| | | import java.io.IOException; |
|---|
| | | import java.util.Optional; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 添加用户授权统一过滤【对登录类型支持】 |
|---|
| | | * |
|---|
| | | * @author zhangby |
|---|
| | | * @date 2019-04-09 16:41 |
|---|
| | | */ |
|---|
| | | @Component |
|---|
| | | public class LoginAuthenticationFilter extends GenericFilterBean implements ApplicationContextAware { |
|---|
| | | |
|---|
| | | private static final String OAUTH_TOKEN_URL = "/oauth/token"; |
|---|
| | | |
|---|
| | | private RequestMatcher requestMatcher; |
|---|
| | | |
|---|
| | | public LoginAuthenticationFilter(){ |
|---|
| | | this.requestMatcher = new OrRequestMatcher( |
|---|
| | | new AntPathRequestMatcher(OAUTH_TOKEN_URL, "GET"), |
|---|
| | | new AntPathRequestMatcher(OAUTH_TOKEN_URL, "POST") |
|---|
| | | ); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 过滤拦截 |
|---|
| | | * @param servletRequest |
|---|
| | | * @param servletResponse |
|---|
| | | * @param filterChain |
|---|
| | | * @throws IOException |
|---|
| | | * @throws ServletException |
|---|
| | | */ |
|---|
| | | @Override |
|---|
| | | public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException { |
|---|
| | | |
|---|
| | | HttpServletRequest request = (HttpServletRequest) servletRequest; |
|---|
| | | HttpServletResponse response = (HttpServletResponse) servletResponse; |
|---|
| | | |
|---|
| | | if(requestMatcher.matches(request)){ |
|---|
| | | try{ |
|---|
| | | //设置集成登录信息 |
|---|
| | | String auth_type = request.getParameter("auth_type"); |
|---|
| | | System.setProperty(Constants.AUTH_TYPE, Optional.ofNullable(auth_type).orElse("")); |
|---|
| | | //预处理 |
|---|
| | | filterChain.doFilter(request,response); |
|---|
| | | //后置处理 |
|---|
| | | }finally { |
|---|
| | | System.clearProperty(Constants.AUTH_TYPE); |
|---|
| | | } |
|---|
| | | }else{ |
|---|
| | | filterChain.doFilter(request,response); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { |
|---|
| | | |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Config.Oauth2; |
|---|
| | | |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.beans.factory.annotation.Qualifier; |
|---|
| | | import org.springframework.context.annotation.Configuration; |
|---|
| | | import org.springframework.security.authentication.AuthenticationManager; |
|---|
| | | import org.springframework.security.oauth2.config.annotation.configurers.ClientDetailsServiceConfigurer; |
|---|
| | | import org.springframework.security.oauth2.config.annotation.web.configuration.AuthorizationServerConfigurerAdapter; |
|---|
| | | import org.springframework.security.oauth2.config.annotation.web.configuration.EnableAuthorizationServer; |
|---|
| | | import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerEndpointsConfigurer; |
|---|
| | | import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerSecurityConfigurer; |
|---|
| | | import org.springframework.security.oauth2.provider.token.TokenStore; |
|---|
| | | import org.springframework.security.oauth2.provider.token.store.JwtAccessTokenConverter; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 配置oauth2.0 |
|---|
| | | * |
|---|
| | | * @author zhangby |
|---|
| | | * @date 2019/2/27 11:27 AM |
|---|
| | | */ |
|---|
| | | @Configuration |
|---|
| | | @EnableAuthorizationServer |
|---|
| | | public class OAuth2Config extends AuthorizationServerConfigurerAdapter { |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public void configure(ClientDetailsServiceConfigurer clients) throws Exception { |
|---|
| | | clients.inMemory() |
|---|
| | | .withClient("uaa-service") |
|---|
| | | .secret("123456") |
|---|
| | | .scopes("service") |
|---|
| | | .autoApprove(true) |
|---|
| | | .authorizedGrantTypes("implicit", "refresh_token", "password", "authorization_code") |
|---|
| | | //18小时过期 |
|---|
| | | .refreshTokenValiditySeconds(18*60*60) |
|---|
| | | .accessTokenValiditySeconds(18*60*60); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public void configure(AuthorizationServerEndpointsConfigurer endpoints) throws Exception { |
|---|
| | | endpoints.tokenStore(tokenStore) |
|---|
| | | .tokenEnhancer(tokenConverter) |
|---|
| | | .reuseRefreshTokens(false) |
|---|
| | | .authenticationManager(authenticationManager) |
|---|
| | | .userDetailsService(userServiceDetail); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @Autowired |
|---|
| | | private LoginAuthenticationFilter loginAuthenticationFilter; |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public void configure(AuthorizationServerSecurityConfigurer security) throws Exception { |
|---|
| | | security.allowFormAuthenticationForClients() |
|---|
| | | .tokenKeyAccess("isAuthenticated()") |
|---|
| | | .checkTokenAccess("permitAll()") |
|---|
| | | .addTokenEndpointAuthenticationFilter(loginAuthenticationFilter); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @Autowired |
|---|
| | | private UserServiceDetail userServiceDetail; |
|---|
| | | |
|---|
| | | @Autowired |
|---|
| | | @Qualifier("authenticationManagerBean") |
|---|
| | | private AuthenticationManager authenticationManager; |
|---|
| | | |
|---|
| | | @Autowired |
|---|
| | | TokenStore tokenStore; |
|---|
| | | |
|---|
| | | @Autowired |
|---|
| | | JwtAccessTokenConverter tokenConverter; |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Config.Oauth2; |
|---|
| | | |
|---|
| | | |
|---|
| | | import org.springframework.security.core.GrantedAuthority; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * oauth2.0授权 角色类 |
|---|
| | | * |
|---|
| | | * @author zhangby |
|---|
| | | * @date 2019-05-14 09:25 |
|---|
| | | */ |
|---|
| | | |
|---|
| | | public class OauthRole implements GrantedAuthority { |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 角色id |
|---|
| | | */ |
|---|
| | | private String id; |
|---|
| | | /** |
|---|
| | | * 角色名称 |
|---|
| | | */ |
|---|
| | | private String name; |
|---|
| | | |
|---|
| | | private String code; |
|---|
| | | |
|---|
| | | private String btnAccess; |
|---|
| | | |
|---|
| | | public OauthRole(String id, String name,String code,String btnAccess) { |
|---|
| | | this.name = name; |
|---|
| | | this.id = id; |
|---|
| | | this.code = code; |
|---|
| | | this.btnAccess = btnAccess; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public String getAuthority() { |
|---|
| | | return name; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getId() { |
|---|
| | | return id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setId(String id) { |
|---|
| | | this.id = id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getCode() { |
|---|
| | | return code; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setCode(String code) { |
|---|
| | | this.code = code; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getBtnAccess() { |
|---|
| | | return btnAccess; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setBtnAccess(String btnAccess) { |
|---|
| | | this.btnAccess = btnAccess; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getName() { |
|---|
| | | return name; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setName(String name) { |
|---|
| | | this.name = name; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Config.Oauth2; |
|---|
| | | |
|---|
| | | import com.google.common.collect.Lists; |
|---|
| | | import io.swagger.annotations.ApiModel; |
|---|
| | | import io.swagger.annotations.ApiModelProperty; |
|---|
| | | import org.springframework.security.core.GrantedAuthority; |
|---|
| | | import org.springframework.security.core.userdetails.UserDetails; |
|---|
| | | |
|---|
| | | import java.util.Collection; |
|---|
| | | import java.util.List; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * oauth2.0授权 用户类 |
|---|
| | | * |
|---|
| | | * @author zhangby |
|---|
| | | * @date 2019-05-13 16:22 |
|---|
| | | */ |
|---|
| | | @ApiModel(value = "OauthUser") |
|---|
| | | public class OauthUser implements UserDetails { |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 用户id |
|---|
| | | */ |
|---|
| | | @ApiModelProperty(hidden = true) |
|---|
| | | private String id; |
|---|
| | | /** |
|---|
| | | * 用户名 |
|---|
| | | */ |
|---|
| | | @ApiModelProperty(value = "username（登录名）", example = "admin") |
|---|
| | | private String username; |
|---|
| | | /** |
|---|
| | | * 密码 |
|---|
| | | */ |
|---|
| | | @ApiModelProperty(value = "password（密码）", example = "123") |
|---|
| | | private String password; |
|---|
| | | |
|---|
| | | |
|---|
| | | private String company; |
|---|
| | | |
|---|
| | | private Integer userType; |
|---|
| | | |
|---|
| | | private Long department; |
|---|
| | | |
|---|
| | | private String departmentName; |
|---|
| | | |
|---|
| | | private String idcard; |
|---|
| | | /** |
|---|
| | | * 用户角色 |
|---|
| | | */ |
|---|
| | | @ApiModelProperty(hidden = true) |
|---|
| | | private List<OauthRole> oauthRoles = Lists.newArrayList(); |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | @ApiModelProperty(hidden = true) |
|---|
| | | public Collection<? extends GrantedAuthority> getAuthorities() { |
|---|
| | | return this.oauthRoles; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | @ApiModelProperty(hidden = true) |
|---|
| | | public String getPassword() { |
|---|
| | | return this.password; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | @ApiModelProperty(hidden = true) |
|---|
| | | public String getUsername() { |
|---|
| | | return this.username; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | @ApiModelProperty(hidden = true) |
|---|
| | | public boolean isAccountNonExpired() { |
|---|
| | | return true; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | @ApiModelProperty(hidden = true) |
|---|
| | | public boolean isAccountNonLocked() { |
|---|
| | | return true; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | @ApiModelProperty(hidden = true) |
|---|
| | | public boolean isCredentialsNonExpired() { |
|---|
| | | return true; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | @ApiModelProperty(hidden = true) |
|---|
| | | public boolean isEnabled() { |
|---|
| | | return true; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getId() { |
|---|
| | | return id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setId(String id) { |
|---|
| | | this.id = id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setUsername(String username) { |
|---|
| | | this.username = username; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setPassword(String password) { |
|---|
| | | this.password = password; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public List<OauthRole> getOauthRoles() { |
|---|
| | | return oauthRoles; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setOauthRoles(List<OauthRole> oauthRoles) { |
|---|
| | | this.oauthRoles = oauthRoles; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getCompany() { |
|---|
| | | return company; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setCompany(String company) { |
|---|
| | | this.company = company; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Integer getUserType() { |
|---|
| | | return userType; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setUserType(Integer userType) { |
|---|
| | | this.userType = userType; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Long getDepartment() { |
|---|
| | | return department; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setDepartment(Long department) { |
|---|
| | | this.department = department; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getDepartmentName() { |
|---|
| | | return departmentName; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setDepartmentName(String departmentName) { |
|---|
| | | this.departmentName = departmentName; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getIdcard() { |
|---|
| | | return idcard; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setIdcard(String idcard) { |
|---|
| | | this.idcard = idcard; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Config.Oauth2; |
|---|
| | | |
|---|
| | | import cn.hutool.core.lang.Dict; |
|---|
| | | import cn.hutool.core.util.StrUtil; |
|---|
| | | |
|---|
| | | import java.util.ArrayList; |
|---|
| | | import java.util.List; |
|---|
| | | import java.util.stream.Stream; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * Redis key 枚举 |
|---|
| | | * |
|---|
| | | * @author zhangby |
|---|
| | | * @date 14/10/19 2:02 pm |
|---|
| | | */ |
|---|
| | | public enum RedisKeyEnum { |
|---|
| | | /** |
|---|
| | | * redis for access_token key |
|---|
| | | */ |
|---|
| | | AUTH_TOKEN("auth:token:{}"), |
|---|
| | | /** |
|---|
| | | * app user for redis key |
|---|
| | | */ |
|---|
| | | REDIS_KEY_USER_ID("user:id:{}"), |
|---|
| | | /** |
|---|
| | | * redis for dict key |
|---|
| | | */ |
|---|
| | | REDIS_KEY_DICT_TYPE("dict:type:{}"); |
|---|
| | | |
|---|
| | | private String key; |
|---|
| | | |
|---|
| | | RedisKeyEnum(String key) { |
|---|
| | | this.key = key; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getKey() { |
|---|
| | | return this.key; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 枚举转list |
|---|
| | | * |
|---|
| | | * @return |
|---|
| | | */ |
|---|
| | | public static List<Dict> toList() { |
|---|
| | | return Stream.of(values()) |
|---|
| | | .collect( |
|---|
| | | ArrayList::new, |
|---|
| | | (li, item) -> li.add(Dict.create() |
|---|
| | | .set("label", StrUtil.format(item.getKey(), "")) |
|---|
| | | .set("value", StrUtil.format(item.getKey(), "")) |
|---|
| | | ), |
|---|
| | | List::addAll |
|---|
| | | ); |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Config.Oauth2; |
|---|
| | | |
|---|
| | | import com.gk.hotwork.Domain.Utils.Constants; |
|---|
| | | import org.slf4j.Logger; |
|---|
| | | import org.slf4j.LoggerFactory; |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.context.annotation.Configuration; |
|---|
| | | import org.springframework.security.config.annotation.web.builders.HttpSecurity; |
|---|
| | | import org.springframework.security.oauth2.config.annotation.web.configuration.EnableResourceServer; |
|---|
| | | import org.springframework.security.oauth2.config.annotation.web.configuration.ResourceServerConfigurerAdapter; |
|---|
| | | import org.springframework.security.oauth2.config.annotation.web.configurers.ResourceServerSecurityConfigurer; |
|---|
| | | import org.springframework.security.oauth2.provider.token.TokenStore; |
|---|
| | | import org.springframework.security.oauth2.provider.token.store.JwtAccessTokenConverter; |
|---|
| | | import org.springframework.security.web.authentication.www.BasicAuthenticationFilter; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * resource config |
|---|
| | | * |
|---|
| | | * @author zhangby |
|---|
| | | * @date 2019-05-19 12:08 |
|---|
| | | */ |
|---|
| | | @Configuration |
|---|
| | | @EnableResourceServer |
|---|
| | | public class ResourceServerConfig extends ResourceServerConfigurerAdapter { |
|---|
| | | Logger log = LoggerFactory.getLogger(ResourceServerConfig.class); |
|---|
| | | |
|---|
| | | //去除部分不需要token的url FILTER_EXCLUDE_PATH |
|---|
| | | @Override |
|---|
| | | public void configure(HttpSecurity http) throws Exception { |
|---|
| | | http |
|---|
| | | .csrf().disable() |
|---|
| | | .logout().disable() |
|---|
| | | .addFilterBefore(new AccessTokenFilter(), BasicAuthenticationFilter.class) |
|---|
| | | .authorizeRequests() |
|---|
| | | .antMatchers(Constants.FILTER_EXCLUDE_PATH.split(",")).permitAll() |
|---|
| | | .antMatchers("/**").authenticated(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public void configure(ResourceServerSecurityConfigurer resources) throws Exception { |
|---|
| | | resources.resourceId("oauth-client").tokenStore(tokenStore); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @Autowired |
|---|
| | | TokenStore tokenStore; |
|---|
| | | |
|---|
| | | @Autowired |
|---|
| | | JwtAccessTokenConverter tokenConverter; |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Config.Oauth2; |
|---|
| | | |
|---|
| | | import org.springframework.beans.BeansException; |
|---|
| | | import org.springframework.context.ApplicationContext; |
|---|
| | | import org.springframework.context.ApplicationContextAware; |
|---|
| | | import org.springframework.stereotype.Component; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * Static injection of spring objects |
|---|
| | | * |
|---|
| | | * @author zhangby |
|---|
| | | * @date 2019-05-15 11:45 |
|---|
| | | */ |
|---|
| | | @Component |
|---|
| | | public class SpringContextUtil implements ApplicationContextAware { |
|---|
| | | |
|---|
| | | private static ApplicationContext applicationContext; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 设置 setApplicationContext |
|---|
| | | * @param applicationContext application |
|---|
| | | * @throws BeansException beansException |
|---|
| | | */ |
|---|
| | | @Override |
|---|
| | | public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { |
|---|
| | | if (SpringContextUtil.applicationContext == null) { |
|---|
| | | SpringContextUtil.applicationContext = applicationContext; |
|---|
| | | } |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 获取applicationContext |
|---|
| | | * @return ApplicationContext |
|---|
| | | */ |
|---|
| | | public static ApplicationContext getApplicationContext() { |
|---|
| | | return applicationContext; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 通过name获取 Bean. |
|---|
| | | * @param name 名称 |
|---|
| | | * @return Object |
|---|
| | | */ |
|---|
| | | public static Object getBean(String name) { |
|---|
| | | return getApplicationContext().getBean(name); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 通过class获取Bean. |
|---|
| | | * @param clazz class |
|---|
| | | * @param <T> T |
|---|
| | | * @return T |
|---|
| | | */ |
|---|
| | | public static <T> T getBean(Class<T> clazz) { |
|---|
| | | return getApplicationContext().getBean(clazz); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 通过name,以及Clazz返回指定的Bean |
|---|
| | | * @param name name |
|---|
| | | * @param clazz class |
|---|
| | | * @param <T> T |
|---|
| | | * @return T |
|---|
| | | */ |
|---|
| | | public static <T> T getBean(String name, Class<T> clazz) { |
|---|
| | | return getApplicationContext().getBean(name, clazz); |
|---|
| | | } |
|---|
| | | |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Config.Oauth2; |
|---|
| | | |
|---|
| | | import com.gk.hotwork.Domain.DepartmentInfo; |
|---|
| | | import com.gk.hotwork.Domain.UserInfo; |
|---|
| | | import com.gk.hotwork.Domain.Utils.CommonUtil; |
|---|
| | | import com.gk.hotwork.Domain.Utils.Constants; |
|---|
| | | import com.gk.hotwork.Service.DepartmentService; |
|---|
| | | import com.gk.hotwork.Service.RoleService; |
|---|
| | | import com.gk.hotwork.Service.UserService; |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.beans.factory.annotation.Value; |
|---|
| | | import org.springframework.security.core.userdetails.UserDetails; |
|---|
| | | import org.springframework.security.core.userdetails.UserDetailsService; |
|---|
| | | import org.springframework.security.core.userdetails.UsernameNotFoundException; |
|---|
| | | import org.springframework.stereotype.Service; |
|---|
| | | |
|---|
| | | import java.util.List; |
|---|
| | | import java.util.Optional; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 加载用户特定数据的核心接口（Core interface which loads user-specific data.） |
|---|
| | | * |
|---|
| | | * @author zhangby |
|---|
| | | * @date 2019-05-14 09:49 |
|---|
| | | */ |
|---|
| | | @Service |
|---|
| | | public class UserServiceDetail implements UserDetailsService { |
|---|
| | | |
|---|
| | | @Autowired |
|---|
| | | UserService userService; |
|---|
| | | @Autowired |
|---|
| | | RoleService roleService; |
|---|
| | | @Autowired |
|---|
| | | DepartmentService departmentService; |
|---|
| | | |
|---|
| | | @Value("${workname}") |
|---|
| | | private String workname; |
|---|
| | | /** |
|---|
| | | * 根据用户名查询用户 |
|---|
| | | */ |
|---|
| | | @Override |
|---|
| | | public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { |
|---|
| | | String authType = System.getProperty(Constants.AUTH_TYPE); |
|---|
| | | OauthUser oauthUser = new OauthUser(); |
|---|
| | | //查询登录用户 |
|---|
| | | UserInfo userInfo = userService.selectUserVoByName(workname,username); |
|---|
| | | Optional.of(userInfo).ifPresent(us ->{ |
|---|
| | | //查询角色 |
|---|
| | | List<OauthRole> roleByUser = roleService.selectOauthRoleByUser(us.getId().intValue()); |
|---|
| | | //数据类型转换 |
|---|
| | | List<OauthRole> oauthRoles = CommonUtil |
|---|
| | | .convers(roleByUser, role -> new OauthRole( |
|---|
| | | role.getId(), |
|---|
| | | role.getAuthority(),null,null) |
|---|
| | | ); |
|---|
| | | //数据结果集封装 |
|---|
| | | oauthUser.setId(us.getId().toString()); |
|---|
| | | oauthUser.setPassword(us.getPassword()); |
|---|
| | | oauthUser.setUsername(us.getRealname()); |
|---|
| | | oauthUser.setOauthRoles(oauthRoles); |
|---|
| | | oauthUser.setDepartment(us.getDepartment()); |
|---|
| | | if (us.getDepartment() != null) { |
|---|
| | | DepartmentInfo dep = departmentService.getById(us.getId()); |
|---|
| | | if (dep != null) { |
|---|
| | | oauthUser.setDepartmentName(dep.getDepartment()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | } |
|---|
| | | oauthUser.setCompany(us.getCompany()); |
|---|
| | | oauthUser.setUserType(us.getType()); |
|---|
| | | oauthUser.setIdcard(us.getIdcard()); |
|---|
| | | }); |
|---|
| | | //判断登录入口 |
|---|
| | | return oauthUser; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Config.Oauth2; |
|---|
| | | |
|---|
| | | import com.gk.hotwork.Domain.Utils.Base64Encrypt; |
|---|
| | | import com.gk.hotwork.Domain.Utils.MD5Utils; |
|---|
| | | import org.apache.tomcat.util.security.MD5Encoder; |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.context.annotation.Bean; |
|---|
| | | import org.springframework.context.annotation.Configuration; |
|---|
| | | import org.springframework.security.authentication.AuthenticationManager; |
|---|
| | | import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; |
|---|
| | | import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; |
|---|
| | | import org.springframework.security.config.annotation.web.builders.HttpSecurity; |
|---|
| | | import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; |
|---|
| | | import org.springframework.security.crypto.password.PasswordEncoder; |
|---|
| | | |
|---|
| | | import javax.servlet.http.HttpServletResponse; |
|---|
| | | |
|---|
| | | @Configuration |
|---|
| | | @EnableGlobalMethodSecurity(prePostEnabled = true) |
|---|
| | | public class WebSecurityConfig extends WebSecurityConfigurerAdapter { |
|---|
| | | |
|---|
| | | @Autowired |
|---|
| | | private UserServiceDetail userServiceDetail; |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | @Bean |
|---|
| | | public AuthenticationManager authenticationManagerBean() throws Exception { |
|---|
| | | return super.authenticationManagerBean(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | protected void configure(HttpSecurity http) throws Exception { |
|---|
| | | //CSRF:因为不再依赖于Cookie，所以你就不需要考虑对CSRF（跨站请求伪造）的防范 |
|---|
| | | http |
|---|
| | | .csrf().disable() |
|---|
| | | .exceptionHandling() |
|---|
| | | .authenticationEntryPoint((request, response, authException) -> response.sendError(HttpServletResponse.SC_UNAUTHORIZED)) |
|---|
| | | .and() |
|---|
| | | .logout().disable() |
|---|
| | | // .addFilter(loginAuthenticationFilter) |
|---|
| | | .authorizeRequests() |
|---|
| | | .regexMatchers("/actuator.*").permitAll() |
|---|
| | | .antMatchers("/**").authenticated() |
|---|
| | | .and() |
|---|
| | | .httpBasic(); |
|---|
| | | |
|---|
| | | } |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | protected void configure(AuthenticationManagerBuilder auth) throws Exception { |
|---|
| | | auth |
|---|
| | | .userDetailsService(userServiceDetail) |
|---|
| | | .passwordEncoder(new PasswordEncoder() { |
|---|
| | | @Override |
|---|
| | | public String encode(CharSequence rawPassword) { |
|---|
| | | return MD5Utils.encode(rawPassword.toString()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public boolean matches(CharSequence rawPassword, String encodedPassword) { |
|---|
| | | return encodedPassword.equals(MD5Utils.encode(rawPassword.toString())); |
|---|
| | | } |
|---|
| | | }); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * Configuration password encryption |
|---|
| | | * @return |
|---|
| | | */ |
|---|
| | | @Bean |
|---|
| | | PasswordEncoder passwordEncoder() { |
|---|
| | | return new PasswordEncoder() { |
|---|
| | | @Override |
|---|
| | | public String encode(CharSequence charSequence) { |
|---|
| | | return charSequence.toString(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public boolean matches(CharSequence charSequence, String s) { |
|---|
| | | return s.equals(charSequence.toString()); |
|---|
| | | } |
|---|
| | | }; |
|---|
| | | } |
|---|
| | | |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Config.ServiceContext; |
|---|
| | | |
|---|
| | | import org.springframework.beans.BeansException; |
|---|
| | | import org.springframework.context.ApplicationContext; |
|---|
| | | import org.springframework.context.ApplicationContextAware; |
|---|
| | | import org.springframework.stereotype.Component; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 配置类，解决定时任务无法注入service的问题 |
|---|
| | | */ |
|---|
| | | @Component |
|---|
| | | public class ApplicationContextUtil implements ApplicationContextAware { |
|---|
| | | |
|---|
| | | private static ApplicationContext applicationContext; |
|---|
| | | |
|---|
| | | public static ApplicationContext getApplicationContext() { |
|---|
| | | return applicationContext; |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { |
|---|
| | | ApplicationContextUtil.applicationContext = applicationContext; |
|---|
| | | |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | public static Object getBean(String beanName) { |
|---|
| | | return applicationContext.getBean(beanName); |
|---|
| | | } |
|---|
| | | |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Config.Swagger; |
|---|
| | | |
|---|
| | | |
|---|
| | | import org.springframework.context.annotation.Bean; |
|---|
| | | import org.springframework.context.annotation.Configuration; |
|---|
| | | import org.springframework.web.bind.annotation.RestController; |
|---|
| | | import springfox.documentation.builders.ApiInfoBuilder; |
|---|
| | | import springfox.documentation.builders.ParameterBuilder; |
|---|
| | | import springfox.documentation.builders.PathSelectors; |
|---|
| | | import springfox.documentation.builders.RequestHandlerSelectors; |
|---|
| | | import springfox.documentation.schema.ModelRef; |
|---|
| | | import springfox.documentation.service.Contact; |
|---|
| | | import springfox.documentation.service.Parameter; |
|---|
| | | import springfox.documentation.spi.DocumentationType; |
|---|
| | | import springfox.documentation.spring.web.plugins.Docket; |
|---|
| | | import springfox.documentation.swagger2.annotations.EnableSwagger2; |
|---|
| | | |
|---|
| | | import java.util.*; |
|---|
| | | |
|---|
| | | @Configuration |
|---|
| | | @EnableSwagger2 |
|---|
| | | public class SwaggerConfig { |
|---|
| | | |
|---|
| | | @Bean |
|---|
| | | public Docket docket() { |
|---|
| | | ParameterBuilder ticketPar = new ParameterBuilder(); |
|---|
| | | List<Parameter> pars = new ArrayList<Parameter>(); |
|---|
| | | ticketPar.name("Authorization").description("token") |
|---|
| | | .modelRef(new ModelRef("string")).parameterType("header") |
|---|
| | | .required(false).build(); //header中的ticket参数非必填，传空也可以 |
|---|
| | | pars.add(ticketPar.build()); |
|---|
| | | |
|---|
| | | return new Docket(DocumentationType.SWAGGER_2) |
|---|
| | | .select() |
|---|
| | | .apis(RequestHandlerSelectors.basePackage("com.gk.hotwork")) |
|---|
| | | .paths(PathSelectors.any()) |
|---|
| | | .build().globalOperationParameters(pars).apiInfo(new ApiInfoBuilder() |
|---|
| | | .description("特殊作业系统接口文档").contact(new Contact("李宇", "", "986321569@qq.com")) |
|---|
| | | .version("1.0").title("API文档").license("Apache2.0") |
|---|
| | | .licenseUrl("http://www.apache.org/licnesens/LINCENSE-2.0").build()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Config.Swagger; |
|---|
| | | |
|---|
| | | import org.springframework.context.annotation.Configuration; |
|---|
| | | import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; |
|---|
| | | import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | @Configuration |
|---|
| | | public class WebMvcConfig extends WebMvcConfigurerAdapter { |
|---|
| | | @Override |
|---|
| | | public void addResourceHandlers(ResourceHandlerRegistry registry) { |
|---|
| | | registry.addResourceHandler("swagger-ui.html") |
|---|
| | | .addResourceLocations("classpath:/META-INF/resources/"); |
|---|
| | | |
|---|
| | | registry.addResourceHandler("/webjars/**") |
|---|
| | | .addResourceLocations("classpath:/META-INF/resources/webjars/"); |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Config.ThreadExecutor; |
|---|
| | | import org.slf4j.Logger; |
|---|
| | | import org.slf4j.LoggerFactory; |
|---|
| | | import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler; |
|---|
| | | import org.springframework.beans.factory.annotation.Value; |
|---|
| | | import org.springframework.context.annotation.Bean; |
|---|
| | | import org.springframework.context.annotation.Configuration; |
|---|
| | | import org.springframework.scheduling.annotation.AsyncConfigurer; |
|---|
| | | import org.springframework.scheduling.annotation.EnableAsync; |
|---|
| | | import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; |
|---|
| | | |
|---|
| | | |
|---|
| | | import java.lang.reflect.Method; |
|---|
| | | import java.util.concurrent.Executor; |
|---|
| | | |
|---|
| | | import java.util.concurrent.ThreadPoolExecutor; |
|---|
| | | |
|---|
| | | @Configuration |
|---|
| | | @EnableAsync |
|---|
| | | public class ExecutorConfig implements AsyncConfigurer { |
|---|
| | | private Logger logger = LoggerFactory.getLogger(ExecutorConfig.class); |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 最小线程数(核心线程数) |
|---|
| | | */ |
|---|
| | | @Value("${threadPool.corePoolSize}") |
|---|
| | | private int corePoolSize; |
|---|
| | | /** |
|---|
| | | * 最大线程数 |
|---|
| | | */ |
|---|
| | | @Value("${threadPool.maxPoolSize}") |
|---|
| | | private int maxPoolSize; |
|---|
| | | /** |
|---|
| | | * 等待队列(队列最大长度) |
|---|
| | | */ |
|---|
| | | @Value("${threadPool.queueCapacity}") |
|---|
| | | private int queueCapacity; |
|---|
| | | |
|---|
| | | |
|---|
| | | @Bean(name = "SocketTaskExecutor") |
|---|
| | | public Executor asyncServiceExecutor() { |
|---|
| | | logger.info("start asyncServiceExecutor"); |
|---|
| | | |
|---|
| | | ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor(); |
|---|
| | | //配置核心线程数 |
|---|
| | | executor.setCorePoolSize(corePoolSize); |
|---|
| | | //配置最大线程数 |
|---|
| | | executor.setMaxPoolSize(maxPoolSize); |
|---|
| | | //配置队列大小 |
|---|
| | | executor.setQueueCapacity(queueCapacity); |
|---|
| | | //配置线程池中的线程的名称前缀 |
|---|
| | | executor.setThreadNamePrefix("async-service-"); |
|---|
| | | // rejection-policy：当pool已经达到max size的时候，如何处理新任务 |
|---|
| | | // CALLER_RUNS：不在新线程中执行任务，而是有调用者所在的线程来执行 |
|---|
| | | executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy()); |
|---|
| | | |
|---|
| | | //执行初始化 |
|---|
| | | executor.initialize(); |
|---|
| | | return executor; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 异步异常处理 |
|---|
| | | * |
|---|
| | | * @return |
|---|
| | | */ |
|---|
| | | @Override |
|---|
| | | public AsyncUncaughtExceptionHandler getAsyncUncaughtExceptionHandler() { |
|---|
| | | return new SpringAsyncExceptionHandler(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | class SpringAsyncExceptionHandler implements AsyncUncaughtExceptionHandler { |
|---|
| | | @Override |
|---|
| | | public void handleUncaughtException(Throwable throwable, Method method, Object... obj) { |
|---|
| | | logger.error("Exception occurs in async method", throwable.getMessage()); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Config.Upload; |
|---|
| | | |
|---|
| | | import org.springframework.boot.autoconfigure.EnableAutoConfiguration; |
|---|
| | | import org.springframework.boot.autoconfigure.web.servlet.MultipartAutoConfiguration; |
|---|
| | | import org.springframework.context.annotation.Bean; |
|---|
| | | import org.springframework.web.multipart.MultipartResolver; |
|---|
| | | import org.springframework.web.multipart.commons.CommonsMultipartResolver; |
|---|
| | | |
|---|
| | | @EnableAutoConfiguration(exclude = {MultipartAutoConfiguration.class}) |
|---|
| | | public class UploadConfig { |
|---|
| | | @Bean(name = "multipartResolver") |
|---|
| | | public MultipartResolver multipartResolver() { |
|---|
| | | CommonsMultipartResolver resolver = new CommonsMultipartResolver(); |
|---|
| | | resolver.setDefaultEncoding("UTF-8"); |
|---|
| | | resolver.setResolveLazily(true); |
|---|
| | | resolver.setMaxInMemorySize(40960); |
|---|
| | | //上传文件大小 |
|---|
| | | resolver.setMaxUploadSize(100 * 1024 * 1024); |
|---|
| | | return resolver; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Config.WebSocket; |
|---|
| | | |
|---|
| | | import org.springframework.context.annotation.Bean; |
|---|
| | | import org.springframework.context.annotation.Configuration; |
|---|
| | | import org.springframework.web.socket.server.standard.ServerEndpointExporter; |
|---|
| | | |
|---|
| | | @Configuration |
|---|
| | | public class WebSocketConfig { |
|---|
| | | |
|---|
| | | // @Bean |
|---|
| | | // public ServerEndpointExporter serverEndpointExporter(){ |
|---|
| | | // return new ServerEndpointExporter(); |
|---|
| | | // } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Config.WebSocket; |
|---|
| | | |
|---|
| | | import lombok.extern.slf4j.Slf4j; |
|---|
| | | import org.springframework.stereotype.Component; |
|---|
| | | |
|---|
| | | import javax.annotation.PostConstruct; |
|---|
| | | import javax.websocket.*; |
|---|
| | | import javax.websocket.server.PathParam; |
|---|
| | | import javax.websocket.server.ServerEndpoint; |
|---|
| | | import java.io.IOException; |
|---|
| | | import java.util.Map; |
|---|
| | | import java.util.concurrent.ConcurrentHashMap; |
|---|
| | | import java.util.concurrent.atomic.AtomicInteger; |
|---|
| | | |
|---|
| | | @Component("websocket") |
|---|
| | | @ServerEndpoint("/push/{uid}") |
|---|
| | | @Slf4j |
|---|
| | | public class WebSocketServer { |
|---|
| | | |
|---|
| | | @PostConstruct |
|---|
| | | public void init() { |
|---|
| | | System.out.println("websocket 加载"); |
|---|
| | | } |
|---|
| | | |
|---|
| | | //静态变量，用来记录当前在线连接数。应该把它设计成线程安全的。 |
|---|
| | | private static final AtomicInteger onlineCount = new AtomicInteger(0); |
|---|
| | | //concurrent包的线程安全Set，用来存放每个客户端对应的MyWebSocket对象。 |
|---|
| | | private static Map<Long,WebSocketServer> webSocketMap = new ConcurrentHashMap<>(); |
|---|
| | | |
|---|
| | | //与某个客户端的连接会话，需要通过它来给客户端发送数据 |
|---|
| | | private Session session; |
|---|
| | | |
|---|
| | | private Long uid; |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 连接建立成功调用的方法 |
|---|
| | | */ |
|---|
| | | @OnOpen |
|---|
| | | public void onOpen(Session session,@PathParam("uid") Long uid) { |
|---|
| | | this.session = session; |
|---|
| | | this.uid = uid; |
|---|
| | | if(webSocketMap.containsKey(uid)){ |
|---|
| | | webSocketMap.remove(uid); |
|---|
| | | webSocketMap.put(uid,this); |
|---|
| | | }else{ |
|---|
| | | webSocketMap.put(uid,this); |
|---|
| | | onlineCount.incrementAndGet(); |
|---|
| | | } |
|---|
| | | log.info("有新窗口开始监听:当前在线人数为" + onlineCount); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 连接关闭调用的方法 |
|---|
| | | */ |
|---|
| | | @OnClose |
|---|
| | | public void onClose() { |
|---|
| | | if (webSocketMap.containsKey(uid)) { |
|---|
| | | webSocketMap.remove(uid); |
|---|
| | | onlineCount.decrementAndGet(); |
|---|
| | | } |
|---|
| | | log.info("有一连接关闭！当前在线人数为" + onlineCount); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 收到客户端消息后调用的方法 |
|---|
| | | * @param message 客户端发送过来的消息 |
|---|
| | | */ |
|---|
| | | @OnMessage |
|---|
| | | public void onMessage(String message) throws IOException { |
|---|
| | | log.info("来自客户端的消息：{}",message); |
|---|
| | | sendMessage("收到消息，消息内容："+message); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @OnError |
|---|
| | | public void onError(Session session, Throwable error) { |
|---|
| | | log.error("发生错误：{}，Session ID： {}",error.getMessage(),session.getId()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void sendMessage(String message) throws IOException { |
|---|
| | | synchronized(session) { |
|---|
| | | this.session.getBasicRemote().sendText(message); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * @param uid |
|---|
| | | * @param message |
|---|
| | | */ |
|---|
| | | public static void sendMessage(@PathParam("uid") Long uid, String message) { |
|---|
| | | try { |
|---|
| | | if (webSocketMap.containsKey(uid)) webSocketMap.get(uid).sendMessage(message); |
|---|
| | | } catch (IOException e) { |
|---|
| | | log.error("发送消息出错：{}", e.getMessage()); |
|---|
| | | e.printStackTrace(); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 群发消息 |
|---|
| | | * @param message |
|---|
| | | * @throws IOException |
|---|
| | | */ |
|---|
| | | public static void broadcast(String message) throws IOException { |
|---|
| | | |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | public Session getSession() { |
|---|
| | | return session; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setSession(Session session) { |
|---|
| | | this.session = session; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Controller; |
|---|
| | | |
|---|
| | | import com.alibaba.fastjson.JSONObject; |
|---|
| | | import com.gk.hotwork.Controller.Base.BaseController; |
|---|
| | | import com.gk.hotwork.Domain.*; |
|---|
| | | import com.gk.hotwork.Domain.Utils.*; |
|---|
| | | import com.gk.hotwork.Domain.Vo.*; |
|---|
| | | import com.gk.hotwork.Service.AppFileService; |
|---|
| | | import com.gk.hotwork.Service.HelpDocService; |
|---|
| | | import io.swagger.annotations.Api; |
|---|
| | | import io.swagger.annotations.ApiImplicitParam; |
|---|
| | | import io.swagger.annotations.ApiImplicitParams; |
|---|
| | | import io.swagger.annotations.ApiOperation; |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.beans.factory.annotation.Value; |
|---|
| | | import org.springframework.web.bind.annotation.*; |
|---|
| | | |
|---|
| | | import java.util.Date; |
|---|
| | | import java.util.HashMap; |
|---|
| | | |
|---|
| | | |
|---|
| | | @Api(tags = "APP版本信息接口") |
|---|
| | | @RestController |
|---|
| | | public class AppFileController extends BaseController { |
|---|
| | | @Value("${appPath}") |
|---|
| | | private String appPath; |
|---|
| | | @Value("${app}") |
|---|
| | | private String app; |
|---|
| | | @Value("${appUrl}") |
|---|
| | | private String appUrl; |
|---|
| | | @Autowired |
|---|
| | | AppFileService appFileService; |
|---|
| | | @Autowired |
|---|
| | | HelpDocService helpDocService; |
|---|
| | | |
|---|
| | | @GetMapping("/appFile") |
|---|
| | | @ApiOperation(value = "获取App文件数据",response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "pageIndex",value = "当前页码"), |
|---|
| | | @ApiImplicitParam(name = "pageSize",value = "每页行数"), |
|---|
| | | @ApiImplicitParam(name = "sort",value = "排序规则"), |
|---|
| | | @ApiImplicitParam(name = "order",value = "排序字段"), |
|---|
| | | @ApiImplicitParam(name = "filetype",value = "文件类型"), |
|---|
| | | }) |
|---|
| | | public Msg getAppFileInfo(@RequestParam(defaultValue = "0") Integer pageIndex, @RequestParam(defaultValue = "10") Integer pageSize, String sort, String order, |
|---|
| | | @RequestParam(required = false) String filetype){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | |
|---|
| | | PageInfo pageInfo = new PageInfo(pageIndex, pageSize,sort,order); |
|---|
| | | HashMap<String, Object> condition = new HashMap<String, Object>(); |
|---|
| | | |
|---|
| | | if (StringUtils.isNotBlank(filetype)){ |
|---|
| | | condition.put("filetype",filetype.trim()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | pageInfo.setCondition(condition); |
|---|
| | | appFileService.selectDataGrid(pageInfo); |
|---|
| | | msg.setResult(pageInfo); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @GetMapping("/newAppFile") |
|---|
| | | @ApiOperation(value = "获取最新App文件数据",response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "filetype",value = "文件类型"), |
|---|
| | | }) |
|---|
| | | public Msg getNewAppFile(String filetype){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | AppFileInfo appFileInfo = appFileService.selectNew(filetype); |
|---|
| | | if (appFileInfo != null){ |
|---|
| | | msg.setResult(appFileInfo); |
|---|
| | | return msg; |
|---|
| | | }else { |
|---|
| | | msg.setCode("999"); |
|---|
| | | msg.setMessage("未找到文件"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation(value = "添加文件",response = Msg.class) |
|---|
| | | @PostMapping("/addAppFile") |
|---|
| | | public Msg addAppFile(AppFileVo appFileVo) throws Exception { |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | AppFileInfo appFileInfo = BeanUtils.copy(appFileVo, AppFileInfo.class); |
|---|
| | | |
|---|
| | | if (appFileVo.getFile() != null){ |
|---|
| | | String filePath = UploadUtil.uploadFile(appFileVo.getFile(),appPath); |
|---|
| | | appFileInfo.setFileurl(app + filePath); |
|---|
| | | } |
|---|
| | | appFileInfo.setCreated(new Date()); |
|---|
| | | appFileInfo.setUpdated(new Date()); |
|---|
| | | appFileService.save(appFileInfo); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation(value = "修改文件",response = Msg.class) |
|---|
| | | @PostMapping("/editAppFile") |
|---|
| | | public Msg editAppFile(AppFileVo appFileVo) throws Exception { |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | AppFileInfo appFileInfo = BeanUtils.copy(appFileVo, AppFileInfo.class); |
|---|
| | | |
|---|
| | | if (appFileVo.getFile() != null){ |
|---|
| | | String filePath = UploadUtil.uploadFile(appFileVo.getFile(),appPath); |
|---|
| | | appFileInfo.setFileurl(app+filePath); |
|---|
| | | } |
|---|
| | | appFileInfo.setUpdated(new Date()); |
|---|
| | | appFileService.updateById(appFileInfo); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation(value = "删除文件",response = Msg.class) |
|---|
| | | @PostMapping("/delAppFile") |
|---|
| | | public Msg delAppFile(@RequestBody JSONObject jsonObject){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | Long id = jsonObject.getLong("id"); |
|---|
| | | |
|---|
| | | AppFileInfo appFileInfo = appFileService.getById(id); |
|---|
| | | if (appFileInfo != null){ |
|---|
| | | appFileService.removeById(appFileInfo); |
|---|
| | | }else { |
|---|
| | | msg.setCode("999"); |
|---|
| | | msg.setMessage("未找到记录"); |
|---|
| | | } |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @GetMapping("/helpDoc") |
|---|
| | | @ApiOperation(value = "获取帮助文档数据",response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "pageIndex",value = "当前页码"), |
|---|
| | | @ApiImplicitParam(name = "pageSize",value = "每页行数"), |
|---|
| | | @ApiImplicitParam(name = "sort",value = "排序规则"), |
|---|
| | | @ApiImplicitParam(name = "order",value = "排序字段"), |
|---|
| | | @ApiImplicitParam(name = "name",value = "文件名称"), |
|---|
| | | }) |
|---|
| | | public Msg getHelpDocInfo(@RequestParam(defaultValue = "0") Integer pageIndex, @RequestParam(defaultValue = "10") Integer pageSize, String sort, String order, |
|---|
| | | String name){ |
|---|
| | | Msg msg = new Msg(true); |
|---|
| | | |
|---|
| | | PageInfo pageInfo = new PageInfo(pageIndex, pageSize,sort,order); |
|---|
| | | HashMap<String, Object> condition = new HashMap<>(4); |
|---|
| | | |
|---|
| | | if (StringUtils.isNotBlank(name)){ |
|---|
| | | condition.put("name",name.trim()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | pageInfo.setCondition(condition); |
|---|
| | | helpDocService.selectDataGrid(pageInfo); |
|---|
| | | msg.setResult(pageInfo); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation(value = "添加帮助文档",response = Msg.class) |
|---|
| | | @PostMapping("/addHelpDoc") |
|---|
| | | public Msg addHelpDoc(HelpDocVo helpDocVo) throws Exception { |
|---|
| | | Msg msg = new Msg(true); |
|---|
| | | HelpDocInfo helpDocInfo = BeanUtils.copy(helpDocVo, HelpDocInfo.class); |
|---|
| | | |
|---|
| | | if (helpDocVo.getFile() != null){ |
|---|
| | | String filePath = UploadUtil.uploadFile(helpDocVo.getFile(),appPath); |
|---|
| | | helpDocInfo.setFileurl(appUrl+filePath); |
|---|
| | | } |
|---|
| | | helpDocInfo.setCreated(new Date()); |
|---|
| | | helpDocInfo.setUpdated(new Date()); |
|---|
| | | helpDocService.save(helpDocInfo); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation(value = "修改帮助文档",response = Msg.class) |
|---|
| | | @PostMapping("/editHelpDoc") |
|---|
| | | public Msg editHelpDoc(HelpDocVo helpDocVo) throws Exception { |
|---|
| | | Msg msg = new Msg(true); |
|---|
| | | |
|---|
| | | HelpDocInfo helpDocInfo = BeanUtils.copy(helpDocVo, HelpDocInfo.class); |
|---|
| | | if (helpDocVo.getFile() != null){ |
|---|
| | | String filePath = UploadUtil.uploadFile(helpDocVo.getFile(),appPath); |
|---|
| | | helpDocInfo.setFileurl(appUrl+filePath); |
|---|
| | | } |
|---|
| | | helpDocInfo.setUpdated(new Date()); |
|---|
| | | |
|---|
| | | helpDocService.updateById(helpDocInfo); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation(value = "删除帮助文档（假删）",response = Msg.class) |
|---|
| | | @PostMapping("/delHelpDoc") |
|---|
| | | public Msg delHelpDoc(@RequestBody JSONObject jsonObject) { |
|---|
| | | Msg msg = new Msg(true); |
|---|
| | | Long id = jsonObject.getLong("id"); |
|---|
| | | HelpDocInfo helpDocInfo = helpDocService.getById(id); |
|---|
| | | if (helpDocInfo != null) { |
|---|
| | | helpDocInfo.setIsdel((byte) 1); |
|---|
| | | helpDocService.updateById(helpDocInfo); |
|---|
| | | } else { |
|---|
| | | msg.setCode("999"); |
|---|
| | | msg.setMessage("未找到记录"); |
|---|
| | | } |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Controller.Base; |
|---|
| | | |
|---|
| | | import cn.hutool.core.util.StrUtil; |
|---|
| | | import com.alibaba.fastjson.JSONObject; |
|---|
| | | import com.gk.hotwork.Config.Oauth2.IRedisService; |
|---|
| | | import com.gk.hotwork.Config.Oauth2.RedisKeyEnum; |
|---|
| | | import com.gk.hotwork.Domain.UserInfo; |
|---|
| | | import com.gk.hotwork.Domain.Utils.CommonUtil; |
|---|
| | | import com.gk.hotwork.Domain.Utils.Msg; |
|---|
| | | import com.google.common.net.HttpHeaders; |
|---|
| | | import io.jsonwebtoken.Claims; |
|---|
| | | import org.apache.log4j.Logger; |
|---|
| | | import org.springframework.web.bind.annotation.ModelAttribute; |
|---|
| | | |
|---|
| | | import javax.annotation.Resource; |
|---|
| | | import javax.servlet.http.HttpServletRequest; |
|---|
| | | import javax.servlet.http.HttpServletResponse; |
|---|
| | | import javax.servlet.http.HttpSession; |
|---|
| | | import java.io.IOException; |
|---|
| | | import java.io.PrintWriter; |
|---|
| | | |
|---|
| | | public class BaseController { |
|---|
| | | |
|---|
| | | protected static final Logger logger = Logger.getLogger(BaseController.class); |
|---|
| | | protected HttpServletRequest request; |
|---|
| | | protected HttpServletResponse response; |
|---|
| | | protected HttpSession session; |
|---|
| | | |
|---|
| | | @Resource |
|---|
| | | IRedisService redisService; |
|---|
| | | |
|---|
| | | @ModelAttribute |
|---|
| | | public void setReqAndResp(HttpServletRequest request, HttpServletResponse response){ |
|---|
| | | this.request = request; |
|---|
| | | this.response = response; |
|---|
| | | this.session = request.getSession(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 输出信息到页面 |
|---|
| | | * @param msg：要输出的信息（可以是js脚本等） |
|---|
| | | */ |
|---|
| | | public void printOutMsg(String msg){ |
|---|
| | | try { |
|---|
| | | this.response.setCharacterEncoding("UTF-8"); |
|---|
| | | this.response.setContentType("text/html;charset=utf-8"); |
|---|
| | | PrintWriter out = null; |
|---|
| | | out = this.response.getWriter(); |
|---|
| | | out.print(msg); |
|---|
| | | out.flush(); |
|---|
| | | out.close(); |
|---|
| | | } catch (IOException e) { |
|---|
| | | e.printStackTrace(); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 获取请求完整路径 |
|---|
| | | * @param request |
|---|
| | | * @return |
|---|
| | | */ |
|---|
| | | public String getUrl(HttpServletRequest request){ |
|---|
| | | String url = request.getRequestURI(); |
|---|
| | | String params = ""; |
|---|
| | | if(request.getQueryString()!=null){ |
|---|
| | | params = request.getQueryString().toString(); |
|---|
| | | } |
|---|
| | | if(!"".equals(params)){ |
|---|
| | | url = url+"?"+params; |
|---|
| | | } |
|---|
| | | return url; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * @Description: 获取用户 |
|---|
| | | * @param |
|---|
| | | * @date 2021/3/23 14:36 |
|---|
| | | */ |
|---|
| | | public UserInfo getUser() { |
|---|
| | | String token = this.request.getHeader(HttpHeaders.AUTHORIZATION); |
|---|
| | | //解析token |
|---|
| | | |
|---|
| | | Claims claims = CommonUtil.parseJWT(token); |
|---|
| | | if (null != claims){ |
|---|
| | | String tokenKey = StrUtil.format(RedisKeyEnum.AUTH_TOKEN.getKey(), claims.getId()); |
|---|
| | | Object o = redisService.get(tokenKey); |
|---|
| | | if (o == null) { |
|---|
| | | return null; |
|---|
| | | }else{ |
|---|
| | | JSONObject jo = JSONObject.parseObject(o.toString()); |
|---|
| | | UserInfo user = new UserInfo(); |
|---|
| | | user.setId(jo.getLong("id")); |
|---|
| | | user.setUsername(jo.getString("username")); |
|---|
| | | user.setRealname(jo.getString("realname")); |
|---|
| | | user.setType(jo.getInteger("type")); |
|---|
| | | user.setCompanyid(jo.getLong("companyid")); |
|---|
| | | user.setDepartment(jo.getLong("department")); |
|---|
| | | user.setDepartmentname(jo.getString("departmentname")); |
|---|
| | | return user; |
|---|
| | | } |
|---|
| | | }else{ |
|---|
| | | return null; |
|---|
| | | } |
|---|
| | | |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Msg success() { |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Msg success(Object object) { |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | msg.setResult(object); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Controller; |
|---|
| | | |
|---|
| | | import com.alibaba.fastjson.JSONObject; |
|---|
| | | import com.gk.hotwork.Domain.*; |
|---|
| | | import com.gk.hotwork.Domain.Utils.*; |
|---|
| | | import com.gk.hotwork.Service.*; |
|---|
| | | import io.swagger.annotations.*; |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.web.bind.annotation.*; |
|---|
| | | |
|---|
| | | import java.util.*; |
|---|
| | | |
|---|
| | | @Api(tags = "数据字典接口") |
|---|
| | | @RestController |
|---|
| | | public class DictionaryController { |
|---|
| | | @Autowired |
|---|
| | | DictionaryTypeService dictionaryTypeService; |
|---|
| | | @Autowired |
|---|
| | | DictionaryItemService dictionaryItemService; |
|---|
| | | |
|---|
| | | |
|---|
| | | @Autowired |
|---|
| | | UserService userService; |
|---|
| | | @Autowired |
|---|
| | | RoleService roleService; |
|---|
| | | @Autowired |
|---|
| | | UserRolesService userRolesService; |
|---|
| | | @Autowired |
|---|
| | | RolePermissionsService rolePermissionsService; |
|---|
| | | @Autowired |
|---|
| | | ExcelExportService excelExportService; |
|---|
| | | @Autowired |
|---|
| | | DistrictService districtService; |
|---|
| | | @Autowired |
|---|
| | | UserRolesService userRolesInfoService; |
|---|
| | | |
|---|
| | | @GetMapping("/dictionary-types") |
|---|
| | | @ApiOperation(value = "获取数据字典类型",response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "pageIndex",value = "当前页码"), |
|---|
| | | @ApiImplicitParam(name = "pageSize",value = "每页行数"), |
|---|
| | | @ApiImplicitParam(name = "name",value = "名称"), |
|---|
| | | }) |
|---|
| | | public Msg getDictionaryTypeInfo(@RequestParam(defaultValue = "0") Integer pageIndex, @RequestParam(defaultValue = "10") Integer pageSize, String name){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | |
|---|
| | | PageInfo pageInfo = new PageInfo(pageIndex, pageSize); |
|---|
| | | HashMap<String, Object> condition = new HashMap<String, Object>(); |
|---|
| | | |
|---|
| | | if (StringUtils.isNotBlank(name)) { |
|---|
| | | condition.put("name", name.trim()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | pageInfo.setCondition(condition); |
|---|
| | | dictionaryTypeService.selectDataGrid(pageInfo); |
|---|
| | | msg.setResult(pageInfo); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/adddictionary-types") |
|---|
| | | @ApiOperation(value = "添加数据字典类型",response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "code",value = "编码",required = true), |
|---|
| | | @ApiImplicitParam(name = "text",value = "名称",required = true), |
|---|
| | | @ApiImplicitParam(name = "description",value = "备注"), |
|---|
| | | @ApiImplicitParam(name = "operator",value = "操作人"), |
|---|
| | | }) |
|---|
| | | public Msg addDiactionaryTypeInfo(@RequestBody JSONObject jsonObject){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | String code = jsonObject.getString("code"); |
|---|
| | | String text = jsonObject.getString("text"); |
|---|
| | | String operator = jsonObject.getString("operator"); |
|---|
| | | DictionaryTypeInfo dictionaryExistCode = dictionaryTypeService.selctByCode(code); |
|---|
| | | if (dictionaryExistCode != null){ |
|---|
| | | msg.setCode("999"); |
|---|
| | | msg.setMessage("编码已存在"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | DictionaryTypeInfo dictionaryExistText = dictionaryTypeService.selctByText(text); |
|---|
| | | if (dictionaryExistText != null){ |
|---|
| | | msg.setCode("999"); |
|---|
| | | msg.setMessage("名称已存在"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | DictionaryTypeInfo dictionaryTypeInfo = new DictionaryTypeInfo(); |
|---|
| | | dictionaryTypeInfo.setCode(code); |
|---|
| | | dictionaryTypeInfo.setStatus((byte)1); |
|---|
| | | dictionaryTypeInfo.setText(text); |
|---|
| | | dictionaryTypeInfo.setCreatedby(operator); |
|---|
| | | dictionaryTypeInfo.setCreateddate(new Date()); |
|---|
| | | dictionaryTypeInfo.setModifiedby(operator); |
|---|
| | | dictionaryTypeInfo.setModifieddate(new Date()); |
|---|
| | | dictionaryTypeInfo.setDescription(jsonObject.getString("description")); |
|---|
| | | dictionaryTypeService.save(dictionaryTypeInfo); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/putdictionary-types") |
|---|
| | | @ApiOperation(value = "修改字典类型",response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "id",value = "id",required = true), |
|---|
| | | @ApiImplicitParam(name = "code",value = "编码",required = true), |
|---|
| | | @ApiImplicitParam(name = "text",value = "名称",required = true), |
|---|
| | | @ApiImplicitParam(name = "description",value = "备注"), |
|---|
| | | @ApiImplicitParam(name = "operator",value = "操作人"), |
|---|
| | | }) |
|---|
| | | public Msg putDiactionaryTypefo(@RequestBody JSONObject jsonObject){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | Long id = jsonObject.getLong("id"); |
|---|
| | | String code = jsonObject.getString("code"); |
|---|
| | | String text = jsonObject.getString("text"); |
|---|
| | | String operator = jsonObject.getString("operator"); |
|---|
| | | List<DictionaryTypeInfo> dictionaryTypes = dictionaryTypeService.selectExistInfo(id,code,null); |
|---|
| | | if (dictionaryTypes.size() > 0){ |
|---|
| | | msg.setCode("999"); |
|---|
| | | msg.setMessage("编码重复"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | List<DictionaryTypeInfo> dictionaryTypeInfoList = dictionaryTypeService.selectExistInfo(id,null,text); |
|---|
| | | if (dictionaryTypeInfoList.size() > 0){ |
|---|
| | | msg.setCode("999"); |
|---|
| | | msg.setMessage("名称重复"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | DictionaryTypeInfo dictionaryTypeInfo = new DictionaryTypeInfo(); |
|---|
| | | dictionaryTypeInfo.setId(jsonObject.getLong("id")); |
|---|
| | | dictionaryTypeInfo.setCode(code); |
|---|
| | | dictionaryTypeInfo.setText(text); |
|---|
| | | dictionaryTypeInfo.setModifiedby(operator); |
|---|
| | | dictionaryTypeInfo.setModifieddate(new Date()); |
|---|
| | | dictionaryTypeInfo.setDescription(jsonObject.getString("description")); |
|---|
| | | dictionaryTypeService.updateById(dictionaryTypeInfo); |
|---|
| | | return msg; |
|---|
| | | |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/deldictionary-types") |
|---|
| | | @ApiOperation(value = "删除字典类型", notes = "删除字典类型", response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(paramType="query",name = "id",value = "id",required = true), |
|---|
| | | @ApiImplicitParam(paramType="body",name = "lastmodifiedby",value = "更新人"), |
|---|
| | | |
|---|
| | | }) |
|---|
| | | public Msg delDiactionaryTypeInfo(@ApiParam(value = "id,lastmodifiedby") |
|---|
| | | @RequestBody JSONObject jsonObject){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | DictionaryTypeInfo dictionaryTypeInfo = new DictionaryTypeInfo(); |
|---|
| | | dictionaryTypeInfo.setId(jsonObject.getLong("id")); |
|---|
| | | dictionaryTypeInfo.setModifiedby(jsonObject.getString("lastmodifiedby")); |
|---|
| | | dictionaryTypeInfo.setModifieddate(new Date()); |
|---|
| | | dictionaryTypeInfo.setStatus((byte)0); |
|---|
| | | dictionaryTypeService.updateById(dictionaryTypeInfo); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @GetMapping("/dictionary-items") |
|---|
| | | @ApiOperation(value = "获取数据字典详情",response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "pageIndex",value = "当前页码"), |
|---|
| | | @ApiImplicitParam(name = "pageSize",value = "每页行数"), |
|---|
| | | @ApiImplicitParam(name = "name",value = "名称"), |
|---|
| | | @ApiImplicitParam(name = "dictionaryTypeId",value = "字典类型id"), |
|---|
| | | }) |
|---|
| | | public Msg getDiactionaryItemInfo(@RequestParam(defaultValue = "0") Integer pageIndex, @RequestParam(defaultValue = "10") Integer pageSize, |
|---|
| | | String name,Long dictionaryTypeId){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | |
|---|
| | | PageInfo pageInfo = new PageInfo(pageIndex, pageSize); |
|---|
| | | HashMap<String, Object> condition = new HashMap<String, Object>(); |
|---|
| | | |
|---|
| | | if (StringUtils.isNotBlank(name)) { |
|---|
| | | condition.put("name", name.trim()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | if (dictionaryTypeId != null){ |
|---|
| | | condition.put("dictionaryTypeId",dictionaryTypeId); |
|---|
| | | } |
|---|
| | | |
|---|
| | | pageInfo.setCondition(condition); |
|---|
| | | dictionaryItemService.selectDataGrid(pageInfo); |
|---|
| | | msg.setResult(pageInfo); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @GetMapping("/dictionaryAllItems") |
|---|
| | | @ApiOperation(value = "获取数据字典详情",response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "dictionaryType",value = "字典类型名称"), |
|---|
| | | }) |
|---|
| | | public Msg getDiactionaryItemInfo(String dictionaryType){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | |
|---|
| | | List<DictionaryItemInfo> dictionaryItems = dictionaryItemService.selectByType(dictionaryType); |
|---|
| | | msg.setResult(dictionaryItems); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/adddictionary-items") |
|---|
| | | @ApiOperation(value = "添加数据字典详情",response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "text",value = "字典标签",required = true), |
|---|
| | | @ApiImplicitParam(name = "value",value = "字典值",required = true), |
|---|
| | | @ApiImplicitParam(name = "description",value = "备注"), |
|---|
| | | @ApiImplicitParam(name = "dictionaryTypeId",value = "类型id"), |
|---|
| | | @ApiImplicitParam(name = "operator",value = "操作人"), |
|---|
| | | @ApiImplicitParam(name = "sort",value = "序号"), |
|---|
| | | @ApiImplicitParam(name = "status",value = "状态"), |
|---|
| | | }) |
|---|
| | | public Msg addDiactionaryItemInfo(@RequestBody JSONObject jsonObject){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | String value = jsonObject.getString("value"); |
|---|
| | | String text = jsonObject.getString("text"); |
|---|
| | | String operator = jsonObject.getString("operator"); |
|---|
| | | Long typeid = jsonObject.getLong("dictionaryTypeId"); |
|---|
| | | if (typeid == null){ |
|---|
| | | msg.setCode("999"); |
|---|
| | | msg.setMessage("未选择字典类型"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | DictionaryItemInfo dictionaryExistCode = dictionaryItemService.selctByText(text); |
|---|
| | | if (dictionaryExistCode != null){ |
|---|
| | | msg.setCode("999"); |
|---|
| | | msg.setMessage("字典标签已存在"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | DictionaryItemInfo dictionaryExistText = dictionaryItemService.selctByValue(value); |
|---|
| | | if (dictionaryExistText != null){ |
|---|
| | | msg.setCode("999"); |
|---|
| | | msg.setMessage("字典值已存在"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | DictionaryItemInfo dictionaryItemInfo = new DictionaryItemInfo(); |
|---|
| | | dictionaryItemInfo.setTypeid(typeid); |
|---|
| | | dictionaryItemInfo.setValue(value); |
|---|
| | | dictionaryItemInfo.setStatus(jsonObject.getByte("status")); |
|---|
| | | dictionaryItemInfo.setText(text); |
|---|
| | | dictionaryItemInfo.setSort(jsonObject.getInteger("sort")); |
|---|
| | | dictionaryItemInfo.setCreatedby(operator); |
|---|
| | | dictionaryItemInfo.setCreateddate(new Date()); |
|---|
| | | dictionaryItemInfo.setModifiedby(operator); |
|---|
| | | dictionaryItemInfo.setModifieddate(new Date()); |
|---|
| | | dictionaryItemInfo.setDescription(jsonObject.getString("description")); |
|---|
| | | dictionaryItemService.save(dictionaryItemInfo); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/putdictionary-items") |
|---|
| | | @ApiOperation(value = "修改字典详情",response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "id",value = "id",required = true), |
|---|
| | | @ApiImplicitParam(name = "text",value = "字典标签",required = true), |
|---|
| | | @ApiImplicitParam(name = "value",value = "字典值",required = true), |
|---|
| | | @ApiImplicitParam(name = "description",value = "备注"), |
|---|
| | | @ApiImplicitParam(name = "operator",value = "操作人"), |
|---|
| | | @ApiImplicitParam(name = "sort",value = "序号"), |
|---|
| | | @ApiImplicitParam(name = "status",value = "状态"), |
|---|
| | | }) |
|---|
| | | public Msg putDiactionaryItemfo(@RequestBody JSONObject jsonObject){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | Long id = jsonObject.getLong("id"); |
|---|
| | | |
|---|
| | | String value = jsonObject.getString("value"); |
|---|
| | | String text = jsonObject.getString("text"); |
|---|
| | | String operator = jsonObject.getString("operator"); |
|---|
| | | |
|---|
| | | List<DictionaryTypeInfo> dictionaryTypes = dictionaryItemService.selectExistInfo(id,value,null); |
|---|
| | | if (dictionaryTypes.size() > 0){ |
|---|
| | | msg.setCode("999"); |
|---|
| | | msg.setMessage("字典值重复"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | List<DictionaryTypeInfo> dictionaryTypeInfoList = dictionaryItemService.selectExistInfo(id,null,text); |
|---|
| | | if (dictionaryTypeInfoList.size() > 0){ |
|---|
| | | msg.setCode("999"); |
|---|
| | | msg.setMessage("字典标签重复"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | DictionaryItemInfo dictionaryItemInfo = new DictionaryItemInfo(); |
|---|
| | | dictionaryItemInfo.setId(id); |
|---|
| | | dictionaryItemInfo.setValue(value); |
|---|
| | | dictionaryItemInfo.setStatus(jsonObject.getByte("status")); |
|---|
| | | dictionaryItemInfo.setText(text); |
|---|
| | | dictionaryItemInfo.setSort(jsonObject.getInteger("sort")); |
|---|
| | | dictionaryItemInfo.setModifiedby(operator); |
|---|
| | | dictionaryItemInfo.setModifieddate(new Date()); |
|---|
| | | dictionaryItemInfo.setDescription(jsonObject.getString("description")); |
|---|
| | | dictionaryItemService.updateById(dictionaryItemInfo); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/deldictionary-items") |
|---|
| | | @ApiOperation(value = "删除字典详情", notes = "删除字典详情", response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(paramType="query",name = "id",value = "id",required = true), |
|---|
| | | @ApiImplicitParam(paramType="body",name = "lastmodifiedby",value = "更新人"), |
|---|
| | | |
|---|
| | | }) |
|---|
| | | public Msg delDiactionaryItemInfo(@ApiParam(value = "id,lastmodifiedby") |
|---|
| | | @RequestBody JSONObject jsonObject){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | DictionaryItemInfo dictionaryTypeInfo = new DictionaryItemInfo(); |
|---|
| | | dictionaryTypeInfo.setId(jsonObject.getLong("id")); |
|---|
| | | dictionaryItemService.removeById(dictionaryTypeInfo); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Controller; |
|---|
| | | |
|---|
| | | import com.alibaba.fastjson.JSONObject; |
|---|
| | | import com.baomidou.mybatisplus.core.metadata.IPage; |
|---|
| | | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|---|
| | | import com.gk.hotwork.Controller.Base.BaseController; |
|---|
| | | import com.gk.hotwork.Domain.ElementManagement; |
|---|
| | | import com.gk.hotwork.Domain.ElementTree; |
|---|
| | | import com.gk.hotwork.Domain.Utils.FilterObject; |
|---|
| | | import com.gk.hotwork.Domain.Utils.Msg; |
|---|
| | | import com.gk.hotwork.Service.ElementManagementService; |
|---|
| | | import io.swagger.annotations.Api; |
|---|
| | | import io.swagger.annotations.ApiImplicitParam; |
|---|
| | | import io.swagger.annotations.ApiImplicitParams; |
|---|
| | | import io.swagger.annotations.ApiOperation; |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.web.bind.annotation.PostMapping; |
|---|
| | | import org.springframework.web.bind.annotation.RequestBody; |
|---|
| | | import org.springframework.web.bind.annotation.RequestMapping; |
|---|
| | | import org.springframework.web.bind.annotation.RestController; |
|---|
| | | |
|---|
| | | import java.util.List; |
|---|
| | | |
|---|
| | | |
|---|
| | | @Api(tags = "安全生产标准化_要素管理") |
|---|
| | | @RestController |
|---|
| | | @RequestMapping("/elementManagement") |
|---|
| | | public class ElementManagementController extends BaseController { |
|---|
| | | |
|---|
| | | @Autowired |
|---|
| | | private ElementManagementService elementManagementService; |
|---|
| | | |
|---|
| | | @ApiOperation("分页") |
|---|
| | | @PostMapping("/page") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "pageIndex",value = "当前页码"), |
|---|
| | | @ApiImplicitParam(name = "pageSize",value = "每页行数"), |
|---|
| | | @ApiImplicitParam(name = "filter.name",value = "{}"), |
|---|
| | | }) |
|---|
| | | public Msg selectPage(@RequestBody FilterObject filterObject) { |
|---|
| | | Integer pageIndex = filterObject.getPageIndex(); |
|---|
| | | Integer pageSize = filterObject.getPageSize(); |
|---|
| | | IPage page = elementManagementService.selectPage(new Page<>(pageIndex, pageSize), filterObject.getFilter(), getUser()); |
|---|
| | | return success(page); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation("获取父要素列表") |
|---|
| | | @PostMapping("/getParentElement") |
|---|
| | | public Msg getParentElement() { |
|---|
| | | List<ElementManagement> list = elementManagementService.getParentElement(); |
|---|
| | | return success(list); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation("获取要素树") |
|---|
| | | @PostMapping("/getElementTree") |
|---|
| | | public Msg getElementTree() { |
|---|
| | | List<ElementTree> elementTreeList = elementManagementService.getElementTree(); |
|---|
| | | return success(elementTreeList); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation("/新增") |
|---|
| | | @PostMapping("/add") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "name",value = "要素名称"), |
|---|
| | | @ApiImplicitParam(name = "type",value = "要素级别"), |
|---|
| | | @ApiImplicitParam(name = "parentId",value = "父级要素"), |
|---|
| | | @ApiImplicitParam(name = "remark",value = "要素备注"), |
|---|
| | | |
|---|
| | | }) |
|---|
| | | public Msg add(@RequestBody ElementManagement param) { |
|---|
| | | elementManagementService.addOne(param, getUser()); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation("/修改") |
|---|
| | | @PostMapping("/mod") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "id",value = "id"), |
|---|
| | | @ApiImplicitParam(name = "name",value = "应急预案名称"), |
|---|
| | | @ApiImplicitParam(name = "fileType",value = "应急预案文件类型"), |
|---|
| | | @ApiImplicitParam(name = "fileList",value = "应急预案文件"), |
|---|
| | | @ApiImplicitParam(name = "remark",value = "应急预案备注"), |
|---|
| | | }) |
|---|
| | | public Msg mod(@RequestBody ElementManagement param) { |
|---|
| | | elementManagementService.modOne(param, getUser()); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation("/删除") |
|---|
| | | @PostMapping("/del") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "id",value = "id"), |
|---|
| | | }) |
|---|
| | | public Msg mod(@RequestBody JSONObject jsonObject) { |
|---|
| | | Long id = jsonObject.getLong("id"); |
|---|
| | | elementManagementService.delOne(id, getUser()); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Controller; |
|---|
| | | |
|---|
| | | import com.alibaba.fastjson.JSONObject; |
|---|
| | | import com.baomidou.mybatisplus.core.metadata.IPage; |
|---|
| | | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|---|
| | | import com.gk.hotwork.Controller.Base.BaseController; |
|---|
| | | import com.gk.hotwork.Domain.EmergencyPlan; |
|---|
| | | import com.gk.hotwork.Domain.Utils.FilterObject; |
|---|
| | | import com.gk.hotwork.Domain.Utils.Msg; |
|---|
| | | import com.gk.hotwork.Domain.Utils.UploadUtil; |
|---|
| | | import com.gk.hotwork.Service.EmergencyPlanService; |
|---|
| | | import io.swagger.annotations.Api; |
|---|
| | | import io.swagger.annotations.ApiImplicitParam; |
|---|
| | | import io.swagger.annotations.ApiImplicitParams; |
|---|
| | | import io.swagger.annotations.ApiOperation; |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.beans.factory.annotation.Value; |
|---|
| | | import org.springframework.web.bind.annotation.*; |
|---|
| | | import org.springframework.web.multipart.MultipartFile; |
|---|
| | | |
|---|
| | | import javax.servlet.http.HttpServletRequest; |
|---|
| | | import javax.servlet.http.HttpServletResponse; |
|---|
| | | import java.io.*; |
|---|
| | | import java.net.URLEncoder; |
|---|
| | | import java.util.HashMap; |
|---|
| | | import java.util.Map; |
|---|
| | | |
|---|
| | | |
|---|
| | | @Api(tags = "应急预案") |
|---|
| | | @RestController |
|---|
| | | @RequestMapping("/emergencyPlan") |
|---|
| | | public class EmergencyPlanController extends BaseController { |
|---|
| | | |
|---|
| | | @Autowired |
|---|
| | | private EmergencyPlanService emergencyPlanService; |
|---|
| | | |
|---|
| | | @Value("${emergencyPlanPath}") |
|---|
| | | private String emergencyPlanPath; |
|---|
| | | @Value("${emergencyPlanUrl}") |
|---|
| | | private String emergencyPlanUrl; |
|---|
| | | @Value("${emergencyPlan}") |
|---|
| | | private String emergencyPlan; |
|---|
| | | |
|---|
| | | @ApiOperation("分页") |
|---|
| | | @PostMapping("/page") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "pageIndex",value = "当前页码"), |
|---|
| | | @ApiImplicitParam(name = "pageSize",value = "每页行数"), |
|---|
| | | @ApiImplicitParam(name = "filter.name",value = "{}"), |
|---|
| | | }) |
|---|
| | | public Msg selectPage(@RequestBody FilterObject filterObject) { |
|---|
| | | Integer pageIndex = filterObject.getPageIndex(); |
|---|
| | | Integer pageSize = filterObject.getPageSize(); |
|---|
| | | IPage page = emergencyPlanService.selectPage(new Page<>(pageIndex, pageSize), filterObject.getFilter(), getUser()); |
|---|
| | | return success(page); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation("/图片+文件上传") |
|---|
| | | @PostMapping("/upload") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "file",value = "文件"), |
|---|
| | | }) |
|---|
| | | public Msg upload(@RequestParam(required = false) MultipartFile file) throws Exception { |
|---|
| | | String name= UploadUtil.uploadFile(file,emergencyPlanPath); |
|---|
| | | String url= emergencyPlan+name; |
|---|
| | | Map<String,String> map=new HashMap<>(); |
|---|
| | | map.put("fileName",name); |
|---|
| | | map.put("fileUrl",url); |
|---|
| | | return success(map); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation("/下载") |
|---|
| | | @PostMapping("/download") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "path",value = "文件路径"), |
|---|
| | | }) |
|---|
| | | public Msg upload(HttpServletRequest request, HttpServletResponse response, String path) throws Exception { |
|---|
| | | try { |
|---|
| | | response.setContentType("text/html;charset=UTF-8"); |
|---|
| | | request.setCharacterEncoding("UTF-8"); |
|---|
| | | |
|---|
| | | BufferedInputStream bis = null; |
|---|
| | | BufferedOutputStream bos = null; |
|---|
| | | File file = new File(emergencyPlanPath,path); |
|---|
| | | String fileName = file.getName(); |
|---|
| | | long fileLength = file.length(); |
|---|
| | | |
|---|
| | | response.setContentType("application/octet-stream"); |
|---|
| | | |
|---|
| | | String header = request.getHeader("User-Agent").toUpperCase(); |
|---|
| | | if (header.contains("MSIE") || header.contains("TRIDENT") || header.contains("EDGE")) { |
|---|
| | | fileName = URLEncoder.encode(fileName, "utf-8"); |
|---|
| | | fileName = fileName.replace("+", "%20"); //IE下载文件名空格变+号问题 |
|---|
| | | } else { |
|---|
| | | fileName = new String(fileName.getBytes(), "ISO8859-1"); |
|---|
| | | } |
|---|
| | | |
|---|
| | | response.setHeader("Content-disposition", "attachment; filename=\"" + fileName + "\""); |
|---|
| | | response.setHeader("Content-Length", String.valueOf(fileLength)); |
|---|
| | | |
|---|
| | | bis = new BufferedInputStream(new FileInputStream(file)); |
|---|
| | | bos = new BufferedOutputStream(response.getOutputStream()); |
|---|
| | | |
|---|
| | | byte[] buff = new byte[2048]; |
|---|
| | | int bytesRead; |
|---|
| | | |
|---|
| | | while (-1 != (bytesRead = bis.read(buff, 0, buff.length))) { |
|---|
| | | bos.write(buff, 0, bytesRead); |
|---|
| | | } |
|---|
| | | bis.close(); |
|---|
| | | bos.close(); |
|---|
| | | } catch (FileNotFoundException e) { |
|---|
| | | e.printStackTrace(); |
|---|
| | | } catch (IOException e) { |
|---|
| | | e.printStackTrace(); |
|---|
| | | } |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation("/新增") |
|---|
| | | @PostMapping("/add") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "name",value = "应急预案名称"), |
|---|
| | | @ApiImplicitParam(name = "fileType",value = "应急预案文件类型"), |
|---|
| | | @ApiImplicitParam(name = "fileList",value = "应急预案文件"), |
|---|
| | | @ApiImplicitParam(name = "remark",value = "应急预案备注"), |
|---|
| | | |
|---|
| | | }) |
|---|
| | | public Msg add(@RequestBody EmergencyPlan param) { |
|---|
| | | emergencyPlanService.addOne(param, getUser()); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation("/修改") |
|---|
| | | @PostMapping("/mod") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "id",value = "id"), |
|---|
| | | @ApiImplicitParam(name = "name",value = "应急预案名称"), |
|---|
| | | @ApiImplicitParam(name = "fileType",value = "应急预案文件类型"), |
|---|
| | | @ApiImplicitParam(name = "fileList",value = "应急预案文件"), |
|---|
| | | @ApiImplicitParam(name = "remark",value = "应急预案备注"), |
|---|
| | | }) |
|---|
| | | public Msg mod(@RequestBody EmergencyPlan param) { |
|---|
| | | emergencyPlanService.modOne(param, getUser()); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation("/删除") |
|---|
| | | @PostMapping("/del") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "id",value = "id"), |
|---|
| | | }) |
|---|
| | | public Msg mod(@RequestBody JSONObject jsonObject) { |
|---|
| | | Long id = jsonObject.getLong("id"); |
|---|
| | | emergencyPlanService.delOne(id, getUser()); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Controller; |
|---|
| | | |
|---|
| | | import com.alibaba.fastjson.JSONObject; |
|---|
| | | import com.gk.hotwork.Controller.Base.BaseController; |
|---|
| | | import com.gk.hotwork.Domain.Enum.ErrorCode; |
|---|
| | | import com.gk.hotwork.Domain.EquipmentInfo; |
|---|
| | | import com.gk.hotwork.Domain.GasWarnInfo; |
|---|
| | | import com.gk.hotwork.Domain.Utils.Msg; |
|---|
| | | import com.gk.hotwork.Domain.Utils.PageInfo; |
|---|
| | | import com.gk.hotwork.Domain.Utils.StringUtils; |
|---|
| | | import com.gk.hotwork.Service.EquipmentService; |
|---|
| | | import com.gk.hotwork.Service.GasWarnService; |
|---|
| | | import io.swagger.annotations.Api; |
|---|
| | | import io.swagger.annotations.ApiImplicitParam; |
|---|
| | | import io.swagger.annotations.ApiImplicitParams; |
|---|
| | | import io.swagger.annotations.ApiOperation; |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.web.bind.annotation.*; |
|---|
| | | |
|---|
| | | import java.util.Date; |
|---|
| | | import java.util.HashMap; |
|---|
| | | |
|---|
| | | @Api(tags = "设备数据接口") |
|---|
| | | @RestController |
|---|
| | | public class EquipmentController extends BaseController { |
|---|
| | | @Autowired |
|---|
| | | EquipmentService equipmentService; |
|---|
| | | @Autowired |
|---|
| | | GasWarnService gasWarnService; |
|---|
| | | |
|---|
| | | @GetMapping("/gasWarn") |
|---|
| | | @ApiOperation(value = "获取气体阈值信息",response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "pageIndex",value = "当前页码"), |
|---|
| | | @ApiImplicitParam(name = "pageSize",value = "每页行数"), |
|---|
| | | @ApiImplicitParam(name = "sort",value = "排序规则"), |
|---|
| | | @ApiImplicitParam(name = "order",value = "排序字段"), |
|---|
| | | @ApiImplicitParam(name = "gastype",value = "气体类型"), |
|---|
| | | @ApiImplicitParam(name = "warntype",value = "报警类型") |
|---|
| | | }) |
|---|
| | | public Msg getGasWarn(@RequestParam(defaultValue = "0") Integer pageIndex, @RequestParam(defaultValue = "10") Integer pageSize, String sort, String order, |
|---|
| | | String gastype, String warntype){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | |
|---|
| | | PageInfo pageInfo = new PageInfo(pageIndex, pageSize,sort,order); |
|---|
| | | HashMap<String, Object> condition = new HashMap<String, Object>(); |
|---|
| | | |
|---|
| | | if (StringUtils.isNotBlank(gastype)) { |
|---|
| | | condition.put("gastype", gastype.trim()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | if (StringUtils.isNotBlank(warntype)) { |
|---|
| | | condition.put("warntype", warntype.trim()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | pageInfo.setCondition(condition); |
|---|
| | | gasWarnService.selectDataGrid(pageInfo); |
|---|
| | | msg.setResult(pageInfo); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/addGasWarn") |
|---|
| | | @ApiOperation(value = "添加气体阈值信息",response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "gastype",value = "气体类型"), |
|---|
| | | @ApiImplicitParam(name = "warntype",value = "报警类型"), |
|---|
| | | @ApiImplicitParam(name = "max",value = "最大值"), |
|---|
| | | @ApiImplicitParam(name = "min",value = "最小值"), |
|---|
| | | @ApiImplicitParam(name = "gasunit",value = "气体单位"), |
|---|
| | | }) |
|---|
| | | public Msg addGasWarn(@RequestBody GasWarnInfo gasWarnInfo){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | if (StringUtils.isBlank(gasWarnInfo.getGastype())||StringUtils.isBlank(gasWarnInfo.getWarntype())){ |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("气体类型、报警类型不能为空"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | GasWarnInfo gasWarnInfoExist = gasWarnService.selectExistByType(null,gasWarnInfo.getWarntype(),gasWarnInfo.getGastype()); |
|---|
| | | if (gasWarnInfoExist != null){ |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("存在相同气体类型、报警类型的配置"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | gasWarnInfo.setUpdateby(getUser().getRealname()); |
|---|
| | | gasWarnInfo.setUpdatetime(new Date()); |
|---|
| | | gasWarnService.save(gasWarnInfo); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/putGasWarn") |
|---|
| | | @ApiOperation(value = "修改气体阈值信息",response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "gastype",value = "气体类型"), |
|---|
| | | @ApiImplicitParam(name = "warntype",value = "报警类型"), |
|---|
| | | @ApiImplicitParam(name = "max",value = "最大值"), |
|---|
| | | @ApiImplicitParam(name = "min",value = "最小值"), |
|---|
| | | @ApiImplicitParam(name = "gasunit",value = "气体单位"), |
|---|
| | | }) |
|---|
| | | public Msg putGasWarn(@RequestBody GasWarnInfo gasWarnInfo){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | if (StringUtils.isBlank(gasWarnInfo.getGastype())||StringUtils.isBlank(gasWarnInfo.getWarntype())){ |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("气体类型、报警类型不能为空"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | GasWarnInfo gasWarnInfoExist = gasWarnService.selectExistByType(gasWarnInfo.getId(),gasWarnInfo.getWarntype(),gasWarnInfo.getGastype()); |
|---|
| | | if (gasWarnInfoExist != null){ |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("存在相同气体类型、报警类型的配置"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | gasWarnInfo.setUpdateby(getUser().getRealname()); |
|---|
| | | gasWarnInfo.setUpdatetime(new Date()); |
|---|
| | | gasWarnService.updateById(gasWarnInfo); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/delGasWarn") |
|---|
| | | @ApiOperation(value = "删除气体阈值信息",response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "id",value = "id"), |
|---|
| | | }) |
|---|
| | | public Msg delGasWarn(@RequestBody JSONObject jsonObject){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | Long id = jsonObject.getLong("id"); |
|---|
| | | |
|---|
| | | if (id == null){ |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("id不能为空"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | gasWarnService.removeById(id); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @GetMapping("/equipment") |
|---|
| | | @ApiOperation(value = "获取设备信息",response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "pageIndex",value = "当前页码"), |
|---|
| | | @ApiImplicitParam(name = "pageSize",value = "每页行数"), |
|---|
| | | @ApiImplicitParam(name = "sort",value = "排序规则"), |
|---|
| | | @ApiImplicitParam(name = "order",value = "排序字段"), |
|---|
| | | @ApiImplicitParam(name = "name",value = "设备名称"), |
|---|
| | | @ApiImplicitParam(name = "number",value = "设备条码") |
|---|
| | | }) |
|---|
| | | public Msg equipmentService(@RequestParam(defaultValue = "0") Integer pageIndex, @RequestParam(defaultValue = "10") Integer pageSize, String sort, String order, |
|---|
| | | String name, String number){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | |
|---|
| | | PageInfo pageInfo = new PageInfo(pageIndex, pageSize,sort,order); |
|---|
| | | HashMap<String, Object> condition = new HashMap<String, Object>(); |
|---|
| | | |
|---|
| | | if (StringUtils.isNotBlank(name)) { |
|---|
| | | condition.put("name", name.trim()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | if (StringUtils.isNotBlank(number)) { |
|---|
| | | condition.put("number", number.trim()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | pageInfo.setCondition(condition); |
|---|
| | | equipmentService.selectDataGrid(pageInfo); |
|---|
| | | msg.setResult(pageInfo); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/addEquipment") |
|---|
| | | @ApiOperation(value = "添加设备信息",response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "name",value = "设备名称"), |
|---|
| | | @ApiImplicitParam(name = "number",value = "设备条码"), |
|---|
| | | @ApiImplicitParam(name = "isphoto",value = "是否有摄像头 1是 0否"), |
|---|
| | | @ApiImplicitParam(name = "photoname",value = "摄像头名称"), |
|---|
| | | @ApiImplicitParam(name = "photoaddress",value = "摄像头地址"), |
|---|
| | | }) |
|---|
| | | public Msg addEquipment(@RequestBody EquipmentInfo equipmentInfo){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | if (StringUtils.isBlank(equipmentInfo.getName())||StringUtils.isBlank(equipmentInfo.getNumber())){ |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("设备名称、设备条码不能为空"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | EquipmentInfo equipmentInfoExist = equipmentService.selectExistByNumber(null,equipmentInfo.getNumber()); |
|---|
| | | if (equipmentInfoExist != null){ |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("存在相同设备条码"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | if (equipmentInfo.getIsphoto() == 1 && (StringUtils.isBlank(equipmentInfo.getPhotoname()) |
|---|
| | | || StringUtils.isBlank(equipmentInfo.getPhotoaddress()))){ |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("摄像头名称、地址不能为空"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | equipmentInfo.setUpdateby(getUser().getRealname()); |
|---|
| | | equipmentInfo.setUpdatetime(new Date()); |
|---|
| | | equipmentService.save(equipmentInfo); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/putEquipment") |
|---|
| | | @ApiOperation(value = "修改设备信息",response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "id",value = "id"), |
|---|
| | | @ApiImplicitParam(name = "name",value = "设备名称"), |
|---|
| | | @ApiImplicitParam(name = "number",value = "设备条码"), |
|---|
| | | @ApiImplicitParam(name = "isphoto",value = "是否有摄像头 1是 0否"), |
|---|
| | | @ApiImplicitParam(name = "photoname",value = "摄像头名称"), |
|---|
| | | @ApiImplicitParam(name = "photoaddress",value = "摄像头地址"), |
|---|
| | | }) |
|---|
| | | public Msg putEquipment(@RequestBody EquipmentInfo equipmentInfo){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | if (StringUtils.isBlank(equipmentInfo.getName())||StringUtils.isBlank(equipmentInfo.getNumber())){ |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("设备名称、设备条码不能为空"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | EquipmentInfo equipmentInfoExist = equipmentService.selectExistByNumber(equipmentInfo.getId(),equipmentInfo.getNumber()); |
|---|
| | | if (equipmentInfoExist != null){ |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("存在相同设备条码"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | if (equipmentInfo.getIsphoto() == 1 && (StringUtils.isBlank(equipmentInfo.getPhotoname()) |
|---|
| | | || StringUtils.isBlank(equipmentInfo.getPhotoaddress()))){ |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("摄像头名称、地址不能为空"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | equipmentInfo.setUpdateby(getUser().getRealname()); |
|---|
| | | equipmentInfo.setUpdatetime(new Date()); |
|---|
| | | equipmentService.updateById(equipmentInfo); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/delEquipment") |
|---|
| | | @ApiOperation(value = "删除设备信息",response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "id",value = "id"), |
|---|
| | | }) |
|---|
| | | public Msg delEquipment(@RequestBody JSONObject jsonObject){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | Long id = jsonObject.getLong("id"); |
|---|
| | | |
|---|
| | | if (id == null){ |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("id不能为空"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | equipmentService.removeById(id); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Controller; |
|---|
| | | |
|---|
| | | import cn.hutool.json.JSONObject; |
|---|
| | | import com.gk.hotwork.Controller.Base.BaseController; |
|---|
| | | import com.gk.hotwork.Domain.FourColorMap2; |
|---|
| | | import com.gk.hotwork.Domain.Utils.Msg; |
|---|
| | | import com.gk.hotwork.Domain.dto.FourColorMapDto; |
|---|
| | | import com.gk.hotwork.Service.FourColorMap2Service; |
|---|
| | | import com.gk.hotwork.Service.FourColorMapService; |
|---|
| | | import io.swagger.annotations.Api; |
|---|
| | | import io.swagger.annotations.ApiImplicitParam; |
|---|
| | | import io.swagger.annotations.ApiImplicitParams; |
|---|
| | | import io.swagger.annotations.ApiOperation; |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.web.bind.annotation.*; |
|---|
| | | |
|---|
| | | import java.util.List; |
|---|
| | | import java.util.Map; |
|---|
| | | |
|---|
| | | @Api(tags = "四色图") |
|---|
| | | @RestController |
|---|
| | | @RequestMapping("fourColorMap") |
|---|
| | | public class FourColorMapController extends BaseController { |
|---|
| | | |
|---|
| | | @Autowired |
|---|
| | | private FourColorMapService fourColorMapService; |
|---|
| | | @Autowired |
|---|
| | | private FourColorMap2Service fourColorMap2Service; |
|---|
| | | |
|---|
| | | |
|---|
| | | @ApiOperation("新增四色图") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "id",value = "四色图ID"), |
|---|
| | | @ApiImplicitParam(name = "etype",value = "企业类型 1 - 60万吨 ， 2 - 130万吨"), |
|---|
| | | @ApiImplicitParam(name = "type",value = "四色图类型"), |
|---|
| | | @ApiImplicitParam(name = "name",value = "四色图名称"), |
|---|
| | | @ApiImplicitParam(name = "shapeType",value = "四色图形状"), |
|---|
| | | @ApiImplicitParam(name = "text",value = "四色图样式 - 显示文字"), |
|---|
| | | @ApiImplicitParam(name = "clampToGround",value = "四色图样式 - clampToGround"), |
|---|
| | | @ApiImplicitParam(name = "color",value = "四色图样式 - 颜色"), |
|---|
| | | @ApiImplicitParam(name = "geoType",value = "绘图形状"), |
|---|
| | | @ApiImplicitParam(name = "locations",value = "坐标数组数组") |
|---|
| | | }) |
|---|
| | | @RequestMapping(value = "/add",method = RequestMethod.POST) |
|---|
| | | public Msg insertOneMap(@RequestBody FourColorMapDto mapDto){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | String result = fourColorMapService.insertOneMapPoint(mapDto); |
|---|
| | | if(result == null){ |
|---|
| | | msg.setCode("200"); |
|---|
| | | }else { |
|---|
| | | msg.setCode("400"); |
|---|
| | | msg.setMessage(result); |
|---|
| | | } |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @RequestMapping(value = "/add2",method = RequestMethod.POST) |
|---|
| | | public Msg insertOneMap2(@RequestBody com.alibaba.fastjson.JSONObject mapJson){ |
|---|
| | | fourColorMap2Service.addOne(mapJson,getUser()); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @RequestMapping(value = "/get/list2",method = RequestMethod.POST) |
|---|
| | | public Msg getList2(Integer eType){ |
|---|
| | | List<FourColorMap2> list = fourColorMap2Service.getList2(eType); |
|---|
| | | return success(list); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | @RequestMapping(value = "/del2", method = RequestMethod.POST) |
|---|
| | | public Msg del2(@RequestBody JSONObject delBody){ |
|---|
| | | Long id = delBody.getLong("id"); |
|---|
| | | fourColorMap2Service.delOne(id); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation("删除四色图") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "id",value = "四色图ID") |
|---|
| | | }) |
|---|
| | | @RequestMapping(value = "/del",method = RequestMethod.GET) |
|---|
| | | public Msg deleteMap(@RequestParam String id){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | if(fourColorMapService.deleteMap(id) == true){ |
|---|
| | | msg.setCode("200"); |
|---|
| | | }else { |
|---|
| | | msg.setCode("400"); |
|---|
| | | msg.setMessage("删除失败"); |
|---|
| | | } |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation("ID查找四色图") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "id",value = "四色图ID") |
|---|
| | | }) |
|---|
| | | @RequestMapping(value = "/get/id",method = RequestMethod.GET) |
|---|
| | | public Msg findById(@RequestParam String id){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | JSONObject mapJson = fourColorMapService.getOnePointJsonById(id); |
|---|
| | | if(mapJson!=null && !mapJson.isEmpty()){ |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setResult(mapJson); |
|---|
| | | }else { |
|---|
| | | msg.setCode("201"); |
|---|
| | | msg.setMessage("未找到数据"); |
|---|
| | | } |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | @ApiOperation("查找全部四色图") |
|---|
| | | @RequestMapping(value = "/get/list",method = RequestMethod.GET) |
|---|
| | | public Msg findList(@RequestParam int etype){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | List<JSONObject> mapDtoList = fourColorMapService.getPointListJson(etype); |
|---|
| | | if(mapDtoList!=null && mapDtoList.size() > 0){ |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setResult(mapDtoList); |
|---|
| | | }else { |
|---|
| | | msg.setCode("201"); |
|---|
| | | msg.setMessage("未找到数据"); |
|---|
| | | } |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Controller; |
|---|
| | | |
|---|
| | | |
|---|
| | | import com.alibaba.fastjson.JSONObject; |
|---|
| | | import com.baomidou.mybatisplus.core.metadata.IPage; |
|---|
| | | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|---|
| | | import com.fasterxml.jackson.annotation.JsonFormat; |
|---|
| | | import com.gk.hotwork.Controller.Base.BaseController; |
|---|
| | | import com.gk.hotwork.Domain.Enum.HiddenDangerApplyStatus; |
|---|
| | | import com.gk.hotwork.Domain.Enum.HiddenDangerLevel; |
|---|
| | | import com.gk.hotwork.Domain.Enum.HiddenDangerReportSource; |
|---|
| | | import com.gk.hotwork.Domain.Enum.SourceType; |
|---|
| | | import com.gk.hotwork.Domain.HiddenDanger; |
|---|
| | | import com.gk.hotwork.Domain.Log.HiddenDangerLogAnno; |
|---|
| | | import com.gk.hotwork.Domain.TaskInfo; |
|---|
| | | import com.gk.hotwork.Domain.UserInfo; |
|---|
| | | import com.gk.hotwork.Domain.Utils.*; |
|---|
| | | import com.gk.hotwork.Domain.Vo.HiddenDangerAppVo; |
|---|
| | | import com.gk.hotwork.Domain.Vo.HiddenDangerVo; |
|---|
| | | import com.gk.hotwork.Domain.Vo.PageInfoExtension; |
|---|
| | | import com.gk.hotwork.Service.CompanyService; |
|---|
| | | import com.gk.hotwork.Service.HiddenDangerService; |
|---|
| | | import com.gk.hotwork.Service.TaskService; |
|---|
| | | import com.gk.hotwork.Service.UserService; |
|---|
| | | import io.swagger.annotations.Api; |
|---|
| | | import io.swagger.annotations.ApiImplicitParam; |
|---|
| | | import io.swagger.annotations.ApiImplicitParams; |
|---|
| | | import io.swagger.annotations.ApiOperation; |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.util.MultiValueMap; |
|---|
| | | import org.springframework.web.bind.annotation.*; |
|---|
| | | import org.springframework.web.multipart.MultipartFile; |
|---|
| | | import org.springframework.web.multipart.support.StandardMultipartHttpServletRequest; |
|---|
| | | |
|---|
| | | import java.util.HashMap; |
|---|
| | | import java.util.List; |
|---|
| | | import java.util.Map; |
|---|
| | | |
|---|
| | | @Api(tags = "隐患") |
|---|
| | | @RestController |
|---|
| | | @RequestMapping("hiddenDanger") |
|---|
| | | public class HiddenDangerController extends BaseController { |
|---|
| | | |
|---|
| | | |
|---|
| | | @Autowired |
|---|
| | | private HiddenDangerService hiddenDangerService; |
|---|
| | | @Autowired |
|---|
| | | private TaskService taskService; |
|---|
| | | @Autowired |
|---|
| | | private UserService userService; |
|---|
| | | @Autowired |
|---|
| | | private CompanyService companyService; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * @Description: 通用查询 |
|---|
| | | * @date 2021/10/9 15:47 |
|---|
| | | */ |
|---|
| | | @ApiOperation(value = "查询分页",notes = "上报页") |
|---|
| | | @ResponseBody |
|---|
| | | @PostMapping(value = "/reportPage") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "code",value = "隐患等级"), |
|---|
| | | @ApiImplicitParam(name = "status",value = "应还状态"), |
|---|
| | | @ApiImplicitParam(name = "rectifymeasure",value = "整改措施"), |
|---|
| | | @ApiImplicitParam(name = "rectifier",value = "整改人"), |
|---|
| | | @ApiImplicitParam(name = "rectifierid",value = "整改人id"), |
|---|
| | | @ApiImplicitParam(name = "note",value = "上报说明"), |
|---|
| | | @ApiImplicitParam(name = "files",value = "文件"), |
|---|
| | | }) |
|---|
| | | public Object hiddenDangerReportPage(@RequestBody FilterObject filterObject) { |
|---|
| | | Integer pageIndex = filterObject.getPageIndex(); |
|---|
| | | Integer pageSize = filterObject.getPageSize(); |
|---|
| | | IPage page = hiddenDangerService.selectReportPages(new Page<>(pageIndex, pageSize), filterObject.getFilter(), getUser()); |
|---|
| | | return success(page); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | @ApiOperation(value = "查询分页",notes = "整改页") |
|---|
| | | @ResponseBody |
|---|
| | | @PostMapping("/rectifyPage") |
|---|
| | | public Object hiddenDangerRectifyPage(@RequestBody FilterObject filterObject) { |
|---|
| | | Integer pageIndex = filterObject.getPageIndex(); |
|---|
| | | Integer pageSize = filterObject.getPageSize(); |
|---|
| | | IPage page = hiddenDangerService.selectRectifyPages(new Page<>(pageIndex, pageSize), filterObject.getFilter(), getUser()); |
|---|
| | | return success(page); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation(value = "查询分页",notes = "验收页") |
|---|
| | | @ResponseBody |
|---|
| | | @PostMapping("/acceptPage") |
|---|
| | | public Object hiddenDangerAcceptPage(@RequestBody FilterObject filterObject) { |
|---|
| | | Integer pageIndex = filterObject.getPageIndex(); |
|---|
| | | Integer pageSize = filterObject.getPageSize(); |
|---|
| | | IPage page = hiddenDangerService.selectAcceptPages(new Page<>(pageIndex, pageSize), filterObject.getFilter(), getUser()); |
|---|
| | | return success(page); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | @ApiOperation(value = "整改统计") |
|---|
| | | @ResponseBody |
|---|
| | | @PostMapping("/rectifyStatisticsPage") |
|---|
| | | public Object hiddenDangerRectifyStatistics(@RequestBody FilterObject filterObject) { |
|---|
| | | Integer pageIndex = filterObject.getPageIndex(); |
|---|
| | | Integer pageSize = filterObject.getPageSize(); |
|---|
| | | PageInfoExtension<Map> page = hiddenDangerService.selectRectifyStatisticsPages(new Page<>(pageIndex, pageSize), filterObject.getFilter(), getUser()); |
|---|
| | | return success(page); |
|---|
| | | } |
|---|
| | | /** |
|---|
| | | * @Description: 最近一周的作业 |
|---|
| | | * @date 2021/10/11 15:07 |
|---|
| | | */ |
|---|
| | | @ApiOperation(value = "查询最近的作业") |
|---|
| | | @ResponseBody |
|---|
| | | @PostMapping("/taskInfo") |
|---|
| | | public Object hiddenDangerPage(@RequestBody FilterObject filterObject) { |
|---|
| | | Integer pageIndex = filterObject.getPageIndex(); |
|---|
| | | Integer pageSize = filterObject.getPageSize(); |
|---|
| | | IPage page = taskService.selectTaskInPeriod(new Page<>(pageIndex,pageSize),filterObject.getFilter(),getUser()); |
|---|
| | | return success(page); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * @Description: web |
|---|
| | | */ |
|---|
| | | |
|---|
| | | |
|---|
| | | @ApiOperation(value = "web新增隐患") |
|---|
| | | @ResponseBody |
|---|
| | | @PostMapping("/report") |
|---|
| | | @HiddenDangerLogAnno(operation = "上报", detail = "上报隐患") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "level",value = "隐患等级"), |
|---|
| | | @ApiImplicitParam(name = "rectifydeadline",value = "整改截止时间(yyyy-MM-dd HH:mm)"), |
|---|
| | | @ApiImplicitParam(name = "rectifymeasure",value = "整改措施"), |
|---|
| | | @ApiImplicitParam(name = "rectifier",value = "整改人"), |
|---|
| | | @ApiImplicitParam(name = "rectifierid",value = "整改人id"), |
|---|
| | | @ApiImplicitParam(name = "note",value = "上报说明"), |
|---|
| | | @ApiImplicitParam(name = "files",value = "文件"), |
|---|
| | | }) |
|---|
| | | public Object hiddenDangerReport(HiddenDangerVo hiddenDangerVo) { |
|---|
| | | HiddenDanger hiddenDanger = hiddenDangerService.addReport(hiddenDangerVo, getUser(), HiddenDangerReportSource.NORMAL); |
|---|
| | | return success(hiddenDanger); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | @ApiOperation(value = "web隐患整改") |
|---|
| | | @ResponseBody |
|---|
| | | @PostMapping("/rectify") |
|---|
| | | @HiddenDangerLogAnno(operation = "整改", detail = "整改隐患") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "id",value = "id"), |
|---|
| | | @ApiImplicitParam(name = "note",value = "整改说明"), |
|---|
| | | @ApiImplicitParam(name = "files",value = "文件"), |
|---|
| | | }) |
|---|
| | | public Object hiddenDangerRectify(HiddenDangerVo hiddenDangerVo) { |
|---|
| | | HiddenDanger hiddenDanger = hiddenDangerService.hiddenDangerRectify(hiddenDangerVo); |
|---|
| | | return success(hiddenDanger); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | @ApiOperation(value = "web/app验收整改") |
|---|
| | | @ResponseBody |
|---|
| | | @PostMapping("/accept") |
|---|
| | | @HiddenDangerLogAnno(operation = "验收", detail = "验收整改") |
|---|
| | | @ApiImplicitParam(name = "id",value = "id") |
|---|
| | | public Object hiddenDangerAccept(@RequestBody JSONObject jsonObject) { |
|---|
| | | Long id = jsonObject.getLong("id"); |
|---|
| | | HiddenDanger hiddenDanger = hiddenDangerService.acceptHiddenDanger(id, getUser()); |
|---|
| | | return success(hiddenDanger); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | @ApiOperation(value = "web/app驳回整改") |
|---|
| | | @ResponseBody |
|---|
| | | @PostMapping("/reject") |
|---|
| | | @HiddenDangerLogAnno(operation = "驳回整改", detail = "驳回整改") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "id",value = "id"), |
|---|
| | | @ApiImplicitParam(name = "rejectnote",value = "驳回说明"), |
|---|
| | | }) |
|---|
| | | public Object hiddenDangerReject(@RequestBody JSONObject jsonObject) { |
|---|
| | | Long id = jsonObject.getLong("id"); |
|---|
| | | String rejectNote = jsonObject.getString("rejectnote"); |
|---|
| | | HiddenDanger hiddenDanger = hiddenDangerService.rejectHiddenDanger(id, rejectNote,getUser()); |
|---|
| | | return success(hiddenDanger); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * @Description: app |
|---|
| | | */ |
|---|
| | | |
|---|
| | | |
|---|
| | | @ApiOperation(value = "上传图片",notes = "上传图片") |
|---|
| | | @PostMapping("/uploadPic") |
|---|
| | | @ResponseBody |
|---|
| | | public Msg uploadPic(StandardMultipartHttpServletRequest req){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | |
|---|
| | | MultiValueMap<String, MultipartFile> multipartFiles = req.getMultiFileMap(); |
|---|
| | | MultipartFile picFile = multipartFiles.get("files").get(0); |
|---|
| | | if (null == picFile){ |
|---|
| | | msg.setCode("404"); |
|---|
| | | msg.setMessage("上传文件为空"); |
|---|
| | | }else { |
|---|
| | | try { |
|---|
| | | String picmame = UploadUtil.uploadFile(picFile, Properties.hiddenDangerPath); |
|---|
| | | msg.setResult(Properties.hiddenDanger+picmame); |
|---|
| | | }catch (Exception e){ |
|---|
| | | e.printStackTrace(); |
|---|
| | | msg.setCode("500"); |
|---|
| | | msg.setMessage("上传失败"); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | @ApiOperation(value = "app隐患上报") |
|---|
| | | @ResponseBody |
|---|
| | | @PostMapping("/app/report") |
|---|
| | | @HiddenDangerLogAnno(operation = "上报", detail = "上报隐患",source = SourceType.APP) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "level",value = "隐患等级"), |
|---|
| | | @ApiImplicitParam(name = "rectifydeadline",value = "整改截止时间(yyyy-MM-dd HH:mm)"), |
|---|
| | | @ApiImplicitParam(name = "rectifymeasure",value = "整改措施"), |
|---|
| | | @ApiImplicitParam(name = "rectifier",value = "整改人"), |
|---|
| | | @ApiImplicitParam(name = "rectifierid",value = "整改人id"), |
|---|
| | | @ApiImplicitParam(name = "note",value = "上报说明"), |
|---|
| | | @ApiImplicitParam(name = "urls",value = "文件"), |
|---|
| | | }) |
|---|
| | | public Object hiddenDangerAppReport(@RequestBody HiddenDangerAppVo hiddenDangerAppVo) { |
|---|
| | | HiddenDanger hiddenDanger = hiddenDangerService.addReportByApp(hiddenDangerAppVo, getUser()); |
|---|
| | | return success(hiddenDanger); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | @ApiOperation(value = "app隐患整改") |
|---|
| | | @ResponseBody |
|---|
| | | @PostMapping("/app/rectify") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "id",value = "id"), |
|---|
| | | @ApiImplicitParam(name = "note",value = "整改说明"), |
|---|
| | | @ApiImplicitParam(name = "files",value = "文件"), |
|---|
| | | }) |
|---|
| | | @HiddenDangerLogAnno(operation = "整改", detail = "整改隐患",source = SourceType.APP) |
|---|
| | | public Object hiddenDangerAppRectify(@RequestBody HiddenDangerAppVo hiddenDangerAppVo) { |
|---|
| | | HiddenDanger hiddenDanger = hiddenDangerService.rectifyHiddenDangerByApp(hiddenDangerAppVo, getUser()); |
|---|
| | | return success(hiddenDanger); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | @GetMapping("/statistics") |
|---|
| | | @ApiOperation(value = "统计隐患数据",response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "pageIndex",value = "当前页码"), |
|---|
| | | @ApiImplicitParam(name = "pageSize",value = "每页行数"), |
|---|
| | | @ApiImplicitParam(name = "sort",value = "排序规则"), |
|---|
| | | @ApiImplicitParam(name = "order",value = "排序字段"), |
|---|
| | | @ApiImplicitParam(name = "starttime",value = "开始时间"), |
|---|
| | | @ApiImplicitParam(name = "endtime",value = "结束时间"), |
|---|
| | | @ApiImplicitParam(name = "company",value = "单位"), |
|---|
| | | }) |
|---|
| | | public Msg getStatisticsInfo(@RequestParam(defaultValue = "0") Integer pageIndex, @RequestParam(defaultValue = "10") Integer pageSize, String sort,String order, |
|---|
| | | String company, String starttime,String endtime){ |
|---|
| | | |
|---|
| | | PageInfo pageInfo = new PageInfo(pageIndex, pageSize,sort,order); |
|---|
| | | HashMap<String, Object> condition = new HashMap<>(); |
|---|
| | | |
|---|
| | | if (StringUtils.isNotBlank(company)) { |
|---|
| | | condition.put("company", company.trim()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | if (StringUtils.isNotBlank(starttime)) { |
|---|
| | | condition.put("starttime", starttime.trim()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | if (StringUtils.isNotBlank(endtime)) { |
|---|
| | | condition.put("endtime", endtime.trim()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | UserInfo userInfo = userService.selectByUser(getUser().getUsername()); |
|---|
| | | |
|---|
| | | if (!companyService.isMain(userInfo.getCompany())){ |
|---|
| | | condition.put("company", userInfo.getCompany()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | pageInfo.setCondition(condition); |
|---|
| | | hiddenDangerService.selectStatisticsData(pageInfo); |
|---|
| | | return success(pageInfo); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @GetMapping("/info") |
|---|
| | | @ApiOperation(value = "隐患数据详情",response = Msg.class) |
|---|
| | | public Msg getHiddenDangerData(@RequestParam(defaultValue = "0") Integer pageIndex, @RequestParam(defaultValue = "10") Integer pageSize, String sort,String order, |
|---|
| | | String company, String starttime,String endtime){ |
|---|
| | | |
|---|
| | | PageInfo pageInfo = new PageInfo(pageIndex, pageSize,sort,order); |
|---|
| | | HashMap<String, Object> condition = new HashMap<>(); |
|---|
| | | |
|---|
| | | if (StringUtils.isNotBlank(company)) { |
|---|
| | | condition.put("company", company.trim()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | if (StringUtils.isNotBlank(starttime)) { |
|---|
| | | condition.put("starttime", starttime.trim()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | if (StringUtils.isNotBlank(endtime)) { |
|---|
| | | condition.put("endtime", endtime.trim()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | UserInfo userInfo = userService.selectByUser(getUser().getUsername()); |
|---|
| | | |
|---|
| | | if (!companyService.isMain(userInfo.getCompany())){ |
|---|
| | | condition.put("company", userInfo.getCompany()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | pageInfo.setCondition(condition); |
|---|
| | | hiddenDangerService.selectDataGrid(pageInfo); |
|---|
| | | return success(pageInfo); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | @GetMapping("/app/analysis") |
|---|
| | | public Msg getAnalysis() { |
|---|
| | | Map result = hiddenDangerService.getAppAnalysis(getUser()); |
|---|
| | | return success(result); |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Controller; |
|---|
| | | |
|---|
| | | import cn.hutool.core.lang.Dict; |
|---|
| | | import cn.hutool.core.util.ObjectUtil; |
|---|
| | | import cn.hutool.core.util.StrUtil; |
|---|
| | | import cn.hutool.http.HttpRequest; |
|---|
| | | import com.alibaba.fastjson.JSON; |
|---|
| | | import com.alibaba.fastjson.JSONObject; |
|---|
| | | import com.gk.hotwork.Config.Oauth2.IRedisService; |
|---|
| | | import com.gk.hotwork.Config.Oauth2.OauthRole; |
|---|
| | | import com.gk.hotwork.Config.Oauth2.RedisKeyEnum; |
|---|
| | | import com.gk.hotwork.Domain.AuthorizationInfo; |
|---|
| | | import com.gk.hotwork.Domain.ExamScoreInfo; |
|---|
| | | import com.gk.hotwork.Domain.Exception.BusinessException; |
|---|
| | | import com.gk.hotwork.Domain.UserFace; |
|---|
| | | import com.gk.hotwork.Domain.UserInfo; |
|---|
| | | import com.gk.hotwork.Domain.Utils.CommonUtil; |
|---|
| | | import com.gk.hotwork.Domain.Utils.Msg; |
|---|
| | | import com.gk.hotwork.Domain.Vo.ExamScoreVo; |
|---|
| | | import com.gk.hotwork.Domain.Vo.UserVo; |
|---|
| | | import com.gk.hotwork.Service.*; |
|---|
| | | import com.google.common.net.HttpHeaders; |
|---|
| | | import io.jsonwebtoken.Claims; |
|---|
| | | import io.swagger.annotations.Api; |
|---|
| | | import io.swagger.annotations.ApiOperation; |
|---|
| | | import io.swagger.annotations.ApiParam; |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.beans.factory.annotation.Value; |
|---|
| | | import org.springframework.web.bind.annotation.*; |
|---|
| | | import springfox.documentation.annotations.ApiIgnore; |
|---|
| | | |
|---|
| | | import javax.servlet.http.HttpServletRequest; |
|---|
| | | import java.util.*; |
|---|
| | | |
|---|
| | | @Api(tags = "登录登出接口") |
|---|
| | | @RequestMapping("/auth") |
|---|
| | | @RestController |
|---|
| | | public class LoginController { |
|---|
| | | @Autowired |
|---|
| | | IRedisService redisService; |
|---|
| | | @Autowired |
|---|
| | | UserService userService; |
|---|
| | | @Autowired |
|---|
| | | AuthorizationService authorizationService; |
|---|
| | | @Autowired |
|---|
| | | RoleService roleService; |
|---|
| | | @Autowired |
|---|
| | | ExamScoreService examScoreService; |
|---|
| | | @Autowired |
|---|
| | | UserFaceService userFaceService; |
|---|
| | | @Value("${host}") |
|---|
| | | private String host; |
|---|
| | | @Value("${workname}") |
|---|
| | | private String workname; |
|---|
| | | /** |
|---|
| | | * login produces = "application/json" |
|---|
| | | * |
|---|
| | | * @param jsonParam {"username":"用户名","password":"密码"} |
|---|
| | | * @return User |
|---|
| | | */ |
|---|
| | | @PostMapping("/login") |
|---|
| | | @ApiOperation(value = "管理端登录授权", notes = "登录授权接口，获取token") |
|---|
| | | public Msg login(@ApiParam(value = "username,password") @RequestBody JSONObject jsonParam) { |
|---|
| | | String username = jsonParam.getString("username"); |
|---|
| | | String password = jsonParam.getString("password"); |
|---|
| | | |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | try { |
|---|
| | | //query user |
|---|
| | | UserVo user = userService.selectUserVoByName(workname,username); |
|---|
| | | if (null == user) { |
|---|
| | | msg.setCode("100"); |
|---|
| | | msg.setMessage("用户不存在"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | //Call login interface |
|---|
| | | String rs = HttpRequest.post( host + "/oauth/token") |
|---|
| | | .setConnectionTimeout(10000) |
|---|
| | | .setReadTimeout(10000) |
|---|
| | | .header("Authorization", "Basic dWFhLXNlcnZpY2U6MTIzNDU2") |
|---|
| | | .form(Dict.create() |
|---|
| | | .set("username", username) |
|---|
| | | .set("password", password) |
|---|
| | | .set("grant_type", "password") |
|---|
| | | .set("auth_type", "") |
|---|
| | | ).execute().body(); |
|---|
| | | Map map = JSON.parseObject(rs, Map.class); |
|---|
| | | Object access_token = map.get("access_token"); |
|---|
| | | //Verify that the access_token is empty |
|---|
| | | if (ObjectUtil.isNull(access_token)) { |
|---|
| | | msg.setCode("103"); |
|---|
| | | msg.setMessage("密码不正确"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | user.setToken("Bearer "+access_token); |
|---|
| | | //add redis |
|---|
| | | String token_key = StrUtil.format(RedisKeyEnum.AUTH_TOKEN.getKey(), map.get("jti")); |
|---|
| | | redisService.set(token_key, user, 60L*60L*18L); |
|---|
| | | |
|---|
| | | user.setTokenexpired(60L*60L*18L); |
|---|
| | | /** 登录成功刷新用户 */ |
|---|
| | | List<OauthRole> roleByUser = roleService.selectOauthRoleByUser(1); |
|---|
| | | if (null != user.getType()&& user.getType() == 1){ |
|---|
| | | OauthRole oauthRole = new OauthRole("","超级管理员","super_admin",""); |
|---|
| | | roleByUser.add(oauthRole); |
|---|
| | | user.setRoles(roleByUser); |
|---|
| | | }else { |
|---|
| | | roleByUser = roleService.selectOauthRoleByUser(user.getId().intValue()); |
|---|
| | | user.setRoles(roleByUser); |
|---|
| | | } |
|---|
| | | |
|---|
| | | List<ExamScoreVo> exam = examScoreService.selectByAll(user.getUsername()); |
|---|
| | | user.setExam(exam); |
|---|
| | | user.setPassword(null); |
|---|
| | | UserFace userFace = userFaceService.selectByUserId(user.getId()); |
|---|
| | | if (userFace != null) |
|---|
| | | user.setCode(userFace.getCode()); |
|---|
| | | msg.setResult(user); |
|---|
| | | } catch (Exception e) { |
|---|
| | | e.printStackTrace(); |
|---|
| | | msg.setCode("102"); |
|---|
| | | msg.setMessage("登录失败请稍后重试"); |
|---|
| | | } |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | @GetMapping("/verify") |
|---|
| | | @ApiOperation(value = "登录验证", notes = "登录验证：flag【true 成功】，【false 失败】", response = Msg.class) |
|---|
| | | public Msg verifyLogin(@ApiIgnore HttpServletRequest request) { |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | UserVo userVo = new UserVo(); |
|---|
| | | String token = request.getHeader(HttpHeaders.AUTHORIZATION); |
|---|
| | | //解析token |
|---|
| | | Claims claims = CommonUtil.parseJWT(token); |
|---|
| | | if (null != claims){ |
|---|
| | | String tokenKey = StrUtil.format(RedisKeyEnum.AUTH_TOKEN.getKey(), claims.getId()); |
|---|
| | | Object userInfo = redisService.get(tokenKey); |
|---|
| | | if (null != userInfo){ |
|---|
| | | Map map = JSON.parseObject(userInfo.toString(), Map.class); |
|---|
| | | |
|---|
| | | userVo = userService.selectUserVoByName(workname,map.get("username").toString()); |
|---|
| | | if (null == userVo) { |
|---|
| | | msg.setCode("100"); |
|---|
| | | msg.setMessage("用户不存在"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 登录成功刷新用户 */ |
|---|
| | | List<OauthRole> roleByUser = roleService.selectOauthRoleByUser(1); |
|---|
| | | if (null != userVo.getType()&& userVo.getType() == 1){ |
|---|
| | | OauthRole oauthRole = new OauthRole("","超级管理员","super_admin",""); |
|---|
| | | roleByUser.add(oauthRole); |
|---|
| | | userVo.setRoles(roleByUser); |
|---|
| | | }else { |
|---|
| | | roleByUser = roleService.selectOauthRoleByUser(userVo.getId().intValue()); |
|---|
| | | userVo.setRoles(roleByUser); |
|---|
| | | } |
|---|
| | | List<ExamScoreVo> exam = examScoreService.selectByAll(userVo.getUsername()); |
|---|
| | | userVo.setExam(exam); |
|---|
| | | |
|---|
| | | userVo.setToken(map.get("token").toString()); |
|---|
| | | userVo.setTokenexpired(60L*60L*18L); |
|---|
| | | userVo.setPassword(null); |
|---|
| | | //更新登录超时时间 |
|---|
| | | redisService.set(tokenKey, userInfo, 60L*60L*18L); |
|---|
| | | }else { |
|---|
| | | msg.setCode("100"); |
|---|
| | | msg.setMessage("登录失效,请重新登录"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | } |
|---|
| | | msg.setResult(userVo); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * logout |
|---|
| | | * |
|---|
| | | * @return |
|---|
| | | */ |
|---|
| | | @PostMapping("/logout") |
|---|
| | | @ApiOperation(value = "退出登录", notes = "退出登录接口", produces = "application/json", response = Msg.class) |
|---|
| | | public Msg logout(@ApiIgnore HttpServletRequest request) { |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | /** 解析token */ |
|---|
| | | String header = request.getHeader(HttpHeaders.AUTHORIZATION); |
|---|
| | | if (header != null && !header.equals("undefined")) { |
|---|
| | | Claims claims = CommonUtil.parseJWT(header); |
|---|
| | | Optional.ofNullable(claims).ifPresent(cl -> { |
|---|
| | | String token_key = "auth:token:" + cl.getId(); |
|---|
| | | redisService.remove(token_key); |
|---|
| | | }); |
|---|
| | | } |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/user-face") |
|---|
| | | Msg userInfo(@RequestBody JSONObject userInfo) { |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | try { |
|---|
| | | Long userId = userInfo.getLong("userId"); |
|---|
| | | String code = userInfo.getString("code"); |
|---|
| | | userFaceService.copeWith(userId, code); |
|---|
| | | } catch (BusinessException e) { |
|---|
| | | msg.setCode("102"); |
|---|
| | | msg.setMessage(e.getMessage()); |
|---|
| | | } catch (Exception e) { |
|---|
| | | msg.setCode("102"); |
|---|
| | | msg.setMessage("操作失败"); |
|---|
| | | } |
|---|
| | | return msg; |
|---|
| | | |
|---|
| | | |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Controller; |
|---|
| | | |
|---|
| | | import com.alibaba.fastjson.JSONObject; |
|---|
| | | import com.baomidou.mybatisplus.core.metadata.IPage; |
|---|
| | | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|---|
| | | import com.gk.hotwork.Controller.Base.BaseController; |
|---|
| | | import com.gk.hotwork.Domain.MajorEquipmentAlarm; |
|---|
| | | import com.gk.hotwork.Domain.Utils.FilterObject; |
|---|
| | | import com.gk.hotwork.Domain.Utils.Msg; |
|---|
| | | import com.gk.hotwork.Service.MajorEquipmentAlarmService; |
|---|
| | | import io.swagger.annotations.Api; |
|---|
| | | import io.swagger.annotations.ApiImplicitParam; |
|---|
| | | import io.swagger.annotations.ApiImplicitParams; |
|---|
| | | import io.swagger.annotations.ApiOperation; |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.web.bind.annotation.PostMapping; |
|---|
| | | import org.springframework.web.bind.annotation.RequestBody; |
|---|
| | | import org.springframework.web.bind.annotation.RequestMapping; |
|---|
| | | import org.springframework.web.bind.annotation.RestController; |
|---|
| | | |
|---|
| | | |
|---|
| | | @Api(tags = "重大危险源检测_设备报警信息") |
|---|
| | | @RestController |
|---|
| | | @RequestMapping("/majorEquipmentAlarm") |
|---|
| | | public class MajorEquipmentAlarmController extends BaseController { |
|---|
| | | |
|---|
| | | @Autowired |
|---|
| | | private MajorEquipmentAlarmService majorEquipmentAlarmService; |
|---|
| | | |
|---|
| | | @ApiOperation("分页") |
|---|
| | | @PostMapping("/page") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "pageIndex",value = "当前页码"), |
|---|
| | | @ApiImplicitParam(name = "pageSize",value = "每页行数"), |
|---|
| | | @ApiImplicitParam(name = "filter.equipmentName",value = "{}"), |
|---|
| | | @ApiImplicitParam(name = "filter.status",value = "{}"), |
|---|
| | | }) |
|---|
| | | public Msg selectPage(@RequestBody FilterObject filterObject) { |
|---|
| | | Integer pageIndex = filterObject.getPageIndex(); |
|---|
| | | Integer pageSize = filterObject.getPageSize(); |
|---|
| | | IPage page = majorEquipmentAlarmService.selectPage(new Page<>(pageIndex, pageSize), filterObject.getFilter(), getUser()); |
|---|
| | | return success(page); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation("/新增") |
|---|
| | | @PostMapping("/add") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "equipmentId",value = "设备id"), |
|---|
| | | @ApiImplicitParam(name = "status",value = "状态"), |
|---|
| | | @ApiImplicitParam(name = "alarmTime",value = "报警时间"), |
|---|
| | | @ApiImplicitParam(name = "alarmInfo",value = "报警信息"), |
|---|
| | | @ApiImplicitParam(name = "remark",value = "备注"), |
|---|
| | | }) |
|---|
| | | public Msg add(@RequestBody MajorEquipmentAlarm param) { |
|---|
| | | majorEquipmentAlarmService.addOne(param, getUser()); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation("/修改") |
|---|
| | | @PostMapping("/mod") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "id",value = "id"), |
|---|
| | | @ApiImplicitParam(name = "equipmentId",value = "设备id"), |
|---|
| | | @ApiImplicitParam(name = "equipmentId",value = "设备id"), |
|---|
| | | @ApiImplicitParam(name = "status",value = "状态"), |
|---|
| | | @ApiImplicitParam(name = "alarmTime",value = "报警时间"), |
|---|
| | | @ApiImplicitParam(name = "alarmInfo",value = "报警信息"), |
|---|
| | | @ApiImplicitParam(name = "remark",value = "备注"), |
|---|
| | | }) |
|---|
| | | public Msg mod(@RequestBody MajorEquipmentAlarm param) { |
|---|
| | | majorEquipmentAlarmService.modOne(param, getUser()); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation("/删除") |
|---|
| | | @PostMapping("/del") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "id",value = "id"), |
|---|
| | | }) |
|---|
| | | public Msg mod(@RequestBody JSONObject jsonObject) { |
|---|
| | | Long id = jsonObject.getLong("id"); |
|---|
| | | majorEquipmentAlarmService.delOne(id, getUser()); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Controller; |
|---|
| | | |
|---|
| | | import com.alibaba.fastjson.JSONObject; |
|---|
| | | import com.baomidou.mybatisplus.core.metadata.IPage; |
|---|
| | | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|---|
| | | import com.gk.hotwork.Controller.Base.BaseController; |
|---|
| | | import com.gk.hotwork.Domain.MajorEquipment; |
|---|
| | | import com.gk.hotwork.Domain.Utils.FilterObject; |
|---|
| | | import com.gk.hotwork.Domain.Utils.Msg; |
|---|
| | | import com.gk.hotwork.Service.MajorEquipmentService; |
|---|
| | | import io.swagger.annotations.Api; |
|---|
| | | import io.swagger.annotations.ApiImplicitParam; |
|---|
| | | import io.swagger.annotations.ApiImplicitParams; |
|---|
| | | import io.swagger.annotations.ApiOperation; |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.web.bind.annotation.PostMapping; |
|---|
| | | import org.springframework.web.bind.annotation.RequestBody; |
|---|
| | | import org.springframework.web.bind.annotation.RequestMapping; |
|---|
| | | import org.springframework.web.bind.annotation.RestController; |
|---|
| | | |
|---|
| | | import java.util.List; |
|---|
| | | |
|---|
| | | |
|---|
| | | @Api(tags = "重大危险源检测_生产设备管理") |
|---|
| | | @RestController |
|---|
| | | @RequestMapping("/majorEquipment") |
|---|
| | | public class MajorEquipmentController extends BaseController { |
|---|
| | | |
|---|
| | | @Autowired |
|---|
| | | private MajorEquipmentService majorEquipmentService; |
|---|
| | | |
|---|
| | | @ApiOperation("分页") |
|---|
| | | @PostMapping("/page") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "pageIndex",value = "当前页码"), |
|---|
| | | @ApiImplicitParam(name = "pageSize",value = "每页行数"), |
|---|
| | | @ApiImplicitParam(name = "filter.name",value = "{}"), |
|---|
| | | @ApiImplicitParam(name = "filter.status",value = "{}"), |
|---|
| | | }) |
|---|
| | | public Msg selectPage(@RequestBody FilterObject filterObject) { |
|---|
| | | Integer pageIndex = filterObject.getPageIndex(); |
|---|
| | | Integer pageSize = filterObject.getPageSize(); |
|---|
| | | IPage page = majorEquipmentService.selectPage(new Page<>(pageIndex, pageSize), filterObject.getFilter(), getUser()); |
|---|
| | | return success(page); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation("获取所有的设备") |
|---|
| | | @PostMapping("/getMajorEquipment") |
|---|
| | | public Msg getParentElement() { |
|---|
| | | List<MajorEquipment> list = majorEquipmentService.getMajorEquipment(); |
|---|
| | | return success(list); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | @ApiOperation("/新增") |
|---|
| | | @PostMapping("/add") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "serialNumber",value = "设备编号"), |
|---|
| | | @ApiImplicitParam(name = "name",value = "设备名称"), |
|---|
| | | @ApiImplicitParam(name = "status",value = "状态"), |
|---|
| | | @ApiImplicitParam(name = "volume",value = "容积"), |
|---|
| | | @ApiImplicitParam(name = "userId",value = "负责人"), |
|---|
| | | }) |
|---|
| | | public Msg add(@RequestBody MajorEquipment param) { |
|---|
| | | majorEquipmentService.addOne(param, getUser()); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation("/修改") |
|---|
| | | @PostMapping("/mod") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "id",value = "id"), |
|---|
| | | @ApiImplicitParam(name = "serialNumber",value = "设备编号"), |
|---|
| | | @ApiImplicitParam(name = "name",value = "设备名称"), |
|---|
| | | @ApiImplicitParam(name = "status",value = "状态"), |
|---|
| | | @ApiImplicitParam(name = "volume",value = "容积"), |
|---|
| | | @ApiImplicitParam(name = "userId",value = "负责人"), |
|---|
| | | }) |
|---|
| | | public Msg mod(@RequestBody MajorEquipment param) { |
|---|
| | | majorEquipmentService.modOne(param, getUser()); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation("/删除") |
|---|
| | | @PostMapping("/del") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "id",value = "id"), |
|---|
| | | }) |
|---|
| | | public Msg mod(@RequestBody JSONObject jsonObject) { |
|---|
| | | Long id = jsonObject.getLong("id"); |
|---|
| | | majorEquipmentService.delOne(id, getUser()); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Controller; |
|---|
| | | |
|---|
| | | import com.alibaba.fastjson.JSONObject; |
|---|
| | | import com.baomidou.mybatisplus.core.metadata.IPage; |
|---|
| | | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|---|
| | | import com.gk.hotwork.Controller.Base.BaseController; |
|---|
| | | import com.gk.hotwork.Domain.MajorEquipmentData; |
|---|
| | | import com.gk.hotwork.Domain.Utils.FilterObject; |
|---|
| | | import com.gk.hotwork.Domain.Utils.Msg; |
|---|
| | | import com.gk.hotwork.Service.MajorEquipmentDataService; |
|---|
| | | import io.swagger.annotations.Api; |
|---|
| | | import io.swagger.annotations.ApiImplicitParam; |
|---|
| | | import io.swagger.annotations.ApiImplicitParams; |
|---|
| | | import io.swagger.annotations.ApiOperation; |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.web.bind.annotation.PostMapping; |
|---|
| | | import org.springframework.web.bind.annotation.RequestBody; |
|---|
| | | import org.springframework.web.bind.annotation.RequestMapping; |
|---|
| | | import org.springframework.web.bind.annotation.RestController; |
|---|
| | | |
|---|
| | | import java.util.List; |
|---|
| | | |
|---|
| | | |
|---|
| | | @Api(tags = "重大危险源检测_仪表实时数据") |
|---|
| | | @RestController |
|---|
| | | @RequestMapping("/majorEquipmentData") |
|---|
| | | public class MajorEquipmentDataController extends BaseController { |
|---|
| | | |
|---|
| | | @Autowired |
|---|
| | | private MajorEquipmentDataService majorEquipmentDataService; |
|---|
| | | |
|---|
| | | @ApiOperation("分页") |
|---|
| | | @PostMapping("/page") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "pageIndex",value = "当前页码"), |
|---|
| | | @ApiImplicitParam(name = "pageSize",value = "每页行数"), |
|---|
| | | @ApiImplicitParam(name = "filter.equipmentName",value = "{}"), |
|---|
| | | }) |
|---|
| | | public Msg selectPage(@RequestBody FilterObject filterObject) { |
|---|
| | | Integer pageIndex = filterObject.getPageIndex(); |
|---|
| | | Integer pageSize = filterObject.getPageSize(); |
|---|
| | | IPage page = majorEquipmentDataService.selectPage(new Page<>(pageIndex, pageSize), filterObject.getFilter(), getUser()); |
|---|
| | | return success(page); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation("/新增") |
|---|
| | | @PostMapping("/add") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "equipmentId",value = "设备id"), |
|---|
| | | @ApiImplicitParam(name = "rangeLowerLimit",value = "仪表量程下限"), |
|---|
| | | @ApiImplicitParam(name = "rangeUpperLimit",value = "仪表量程上限"), |
|---|
| | | @ApiImplicitParam(name = "highHighLiquidAlarm",value = "高高液位报警值"), |
|---|
| | | @ApiImplicitParam(name = "highLiquidAlarm",value = "高液位报警值"), |
|---|
| | | @ApiImplicitParam(name = "lowLiquidAlarm",value = "低液位报警值"), |
|---|
| | | @ApiImplicitParam(name = "lowLowLiquidAlarm",value = "低低液位报警值"), |
|---|
| | | }) |
|---|
| | | public Msg add(@RequestBody MajorEquipmentData param) { |
|---|
| | | majorEquipmentDataService.addOne(param, getUser()); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation("/导入") |
|---|
| | | @PostMapping("/import") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "equipmentName",value = "设备名称"), |
|---|
| | | @ApiImplicitParam(name = "equipmentSerialNumber",value = "设备编号"), |
|---|
| | | @ApiImplicitParam(name = "monitoringTime",value = "监测时间"), |
|---|
| | | @ApiImplicitParam(name = "rangeLowerLimit",value = "仪表量程下限"), |
|---|
| | | @ApiImplicitParam(name = "rangeUpperLimit",value = "仪表量程上限"), |
|---|
| | | @ApiImplicitParam(name = "highHighLiquidAlarm",value = "高高液位报警值"), |
|---|
| | | @ApiImplicitParam(name = "highLiquidAlarm",value = "高液位报警值"), |
|---|
| | | @ApiImplicitParam(name = "lowLiquidAlarm",value = "低液位报警值"), |
|---|
| | | @ApiImplicitParam(name = "lowLowLiquidAlarm",value = "低低液位报警值"), |
|---|
| | | }) |
|---|
| | | public Msg importData(@RequestBody List<MajorEquipmentData> param) { |
|---|
| | | majorEquipmentDataService.importData(param, getUser()); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation("/修改") |
|---|
| | | @PostMapping("/mod") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "id",value = "id"), |
|---|
| | | @ApiImplicitParam(name = "equipmentId",value = "设备id"), |
|---|
| | | @ApiImplicitParam(name = "rangeLowerLimit",value = "仪表量程下限"), |
|---|
| | | @ApiImplicitParam(name = "rangeUpperLimit",value = "仪表量程上限"), |
|---|
| | | @ApiImplicitParam(name = "highHighLiquidAlarm",value = "高高液位报警值"), |
|---|
| | | @ApiImplicitParam(name = "highLiquidAlarm",value = "高液位报警值"), |
|---|
| | | @ApiImplicitParam(name = "lowLiquidAlarm",value = "低液位报警值"), |
|---|
| | | @ApiImplicitParam(name = "lowLowLiquidAlarm",value = "低低液位报警值"), |
|---|
| | | }) |
|---|
| | | public Msg mod(@RequestBody MajorEquipmentData param) { |
|---|
| | | majorEquipmentDataService.modOne(param, getUser()); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation("/删除") |
|---|
| | | @PostMapping("/del") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "id",value = "id"), |
|---|
| | | }) |
|---|
| | | public Msg mod(@RequestBody JSONObject jsonObject) { |
|---|
| | | Long id = jsonObject.getLong("id"); |
|---|
| | | majorEquipmentDataService.delOne(id, getUser()); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Controller; |
|---|
| | | |
|---|
| | | import com.alibaba.fastjson.JSONArray; |
|---|
| | | import com.alibaba.fastjson.JSONObject; |
|---|
| | | import com.gk.hotwork.Controller.Base.BaseController; |
|---|
| | | import com.gk.hotwork.Domain.*; |
|---|
| | | import com.gk.hotwork.Domain.Utils.*; |
|---|
| | | import com.gk.hotwork.Domain.Vo.SelfCheckVo; |
|---|
| | | import com.gk.hotwork.Service.*; |
|---|
| | | import io.swagger.annotations.Api; |
|---|
| | | import io.swagger.annotations.ApiImplicitParam; |
|---|
| | | import io.swagger.annotations.ApiImplicitParams; |
|---|
| | | import io.swagger.annotations.ApiOperation; |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.beans.factory.annotation.Value; |
|---|
| | | import org.springframework.util.MultiValueMap; |
|---|
| | | import org.springframework.web.bind.annotation.*; |
|---|
| | | import org.springframework.web.multipart.MultipartFile; |
|---|
| | | import org.springframework.web.multipart.support.StandardMultipartHttpServletRequest; |
|---|
| | | |
|---|
| | | import java.io.File; |
|---|
| | | import java.io.FileInputStream; |
|---|
| | | import java.io.InputStream; |
|---|
| | | import java.text.SimpleDateFormat; |
|---|
| | | import java.util.ArrayList; |
|---|
| | | import java.util.Date; |
|---|
| | | import java.util.HashMap; |
|---|
| | | import java.util.List; |
|---|
| | | |
|---|
| | | |
|---|
| | | @Api(tags = "巡检接口") |
|---|
| | | @RestController |
|---|
| | | public class PatrolController extends BaseController{ |
|---|
| | | @Value("${patrolPath}") |
|---|
| | | private String patrolPath; //配置文件配置的物理保存地址 |
|---|
| | | @Value("${patrolUrl}") |
|---|
| | | private String patrolUrl; //配置文件配置的url |
|---|
| | | |
|---|
| | | @Autowired |
|---|
| | | SelfCheckService selfCheckService; |
|---|
| | | @Autowired |
|---|
| | | UserService userService; |
|---|
| | | @Autowired |
|---|
| | | ExcelExportService excelExportService; |
|---|
| | | |
|---|
| | | @GetMapping("/getSelfCheck") |
|---|
| | | @ApiOperation(value = "根据类型获取检查内容",response = Msg.class) |
|---|
| | | public Msg getSelfCheck(SelfCheckInfo selfCheck){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | |
|---|
| | | List<SelfCheckVo> selfChecks = selfCheckService.selectByType(selfCheck.getType()); |
|---|
| | | if (selfChecks.size() > 0) { |
|---|
| | | msg.setResult(selfChecks); |
|---|
| | | return msg; |
|---|
| | | }else { |
|---|
| | | msg.setCode("999"); |
|---|
| | | msg.setMessage("未找到该检查内容"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation(value = "上传图片",notes = "上传图片") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(paramType="query",name = "files",value = "文件"), |
|---|
| | | }) |
|---|
| | | @PostMapping("/uploadPic") |
|---|
| | | @ResponseBody |
|---|
| | | public Msg uploadPic(StandardMultipartHttpServletRequest req){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | |
|---|
| | | MultiValueMap<String, MultipartFile> multipartFiles = req.getMultiFileMap(); |
|---|
| | | MultipartFile picFile = multipartFiles.get("files").get(0); |
|---|
| | | if (null == picFile){ |
|---|
| | | msg.setCode("404"); |
|---|
| | | msg.setMessage("上传文件为空"); |
|---|
| | | }else { |
|---|
| | | try { |
|---|
| | | String picmame = UploadUtil.uploadFile(picFile,patrolPath); |
|---|
| | | msg.setResult(patrolUrl+picmame); |
|---|
| | | }catch (Exception e){ |
|---|
| | | e.printStackTrace(); |
|---|
| | | msg.setCode("500"); |
|---|
| | | msg.setMessage("上传失败"); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @GetMapping("/selfCheck") |
|---|
| | | @ApiOperation(value = "获取自定义检查内容",response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "pageIndex",value = "当前页码"), |
|---|
| | | @ApiImplicitParam(name = "pageSize",value = "每页行数"), |
|---|
| | | @ApiImplicitParam(name = "sort",value = "排序规则"), |
|---|
| | | @ApiImplicitParam(name = "order",value = "排序字段"), |
|---|
| | | @ApiImplicitParam(name = "type",value = "检查类型"), |
|---|
| | | @ApiImplicitParam(name = "tasktype",value = "作业类型"), |
|---|
| | | @ApiImplicitParam(name = "content",value = "检查内容"), |
|---|
| | | }) |
|---|
| | | public Msg getSelfCheckList(@RequestParam(defaultValue = "0") Integer pageIndex, @RequestParam(defaultValue = "10") Integer pageSize, String sort, String order, |
|---|
| | | String tasktype, String type,String content){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | |
|---|
| | | PageInfo pageInfo = new PageInfo(pageIndex, pageSize,sort,order); |
|---|
| | | HashMap<String, Object> condition = new HashMap<String, Object>(); |
|---|
| | | |
|---|
| | | if (StringUtils.isNotBlank(tasktype)) { |
|---|
| | | condition.put("tasktype", tasktype.trim()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | if (StringUtils.isNotBlank(type)) { |
|---|
| | | condition.put("type", type.trim()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | if (StringUtils.isNotBlank(content)) { |
|---|
| | | condition.put("content", content.trim()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | pageInfo.setCondition(condition); |
|---|
| | | selfCheckService.selectDataGrid(pageInfo); |
|---|
| | | msg.setResult(pageInfo); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/addselfCheck") |
|---|
| | | @ApiOperation(value = "添加自定义检查内容",response = Msg.class) |
|---|
| | | public Msg addSelfCheckList(@RequestBody SelfCheckInfo selfCheckInfo){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | |
|---|
| | | if (StringUtils.isBlank(selfCheckInfo.getTasktype())){ |
|---|
| | | msg.setCode("999"); |
|---|
| | | msg.setMessage("作业类型不能为空"); |
|---|
| | | return msg; |
|---|
| | | }else if (StringUtils.isBlank(selfCheckInfo.getType())){ |
|---|
| | | msg.setCode("999"); |
|---|
| | | msg.setMessage("检查类型不能为空"); |
|---|
| | | return msg; |
|---|
| | | }else if (StringUtils.isBlank(selfCheckInfo.getContent())){ |
|---|
| | | msg.setCode("999"); |
|---|
| | | msg.setMessage("检查内容不能为空"); |
|---|
| | | return msg; |
|---|
| | | }else if (StringUtils.isBlank(selfCheckInfo.getStandard())){ |
|---|
| | | msg.setCode("999"); |
|---|
| | | msg.setMessage("参考判断不能为空"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | selfCheckInfo.setCreatedby(getUser().getRealname()); |
|---|
| | | selfCheckInfo.setModifiedby(getUser().getRealname()); |
|---|
| | | selfCheckInfo.setCreateddate(new Date()); |
|---|
| | | selfCheckInfo.setModifieddate(new Date()); |
|---|
| | | selfCheckInfo.setIsdel((byte)0); |
|---|
| | | selfCheckService.save(selfCheckInfo); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/putselfCheck") |
|---|
| | | @ApiOperation(value = "修改自定义检查内容",response = Msg.class) |
|---|
| | | public Msg editSelfCheckList(@RequestBody SelfCheckInfo selfCheckInfo){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | |
|---|
| | | if (StringUtils.isBlank(selfCheckInfo.getTasktype())){ |
|---|
| | | msg.setCode("999"); |
|---|
| | | msg.setMessage("作业类型不能为空"); |
|---|
| | | return msg; |
|---|
| | | }else if (StringUtils.isBlank(selfCheckInfo.getType())){ |
|---|
| | | msg.setCode("999"); |
|---|
| | | msg.setMessage("检查类型不能为空"); |
|---|
| | | return msg; |
|---|
| | | }else if (StringUtils.isBlank(selfCheckInfo.getContent())){ |
|---|
| | | msg.setCode("999"); |
|---|
| | | msg.setMessage("检查内容不能为空"); |
|---|
| | | return msg; |
|---|
| | | }else if (StringUtils.isBlank(selfCheckInfo.getStandard())){ |
|---|
| | | msg.setCode("999"); |
|---|
| | | msg.setMessage("参考判断不能为空"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | selfCheckInfo.setModifiedby(getUser().getRealname()); |
|---|
| | | selfCheckInfo.setModifieddate(new Date()); |
|---|
| | | selfCheckService.updateById(selfCheckInfo); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/delselfCheck") |
|---|
| | | @ApiOperation(value = "删除自定义检查内容",response = Msg.class) |
|---|
| | | public Msg delSelfCheckList(@RequestBody JSONObject jsonObject){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | Long id = jsonObject.getLong("id"); |
|---|
| | | SelfCheckInfo selfCheckInfo = selfCheckService.getById(id); |
|---|
| | | if (selfCheckInfo != null){ |
|---|
| | | selfCheckInfo.setIsdel((byte)1); |
|---|
| | | selfCheckInfo.setModifiedby(getUser().getRealname()); |
|---|
| | | selfCheckInfo.setModifieddate(new Date()); |
|---|
| | | selfCheckService.updateById(selfCheckInfo); |
|---|
| | | return msg; |
|---|
| | | }else { |
|---|
| | | msg.setCode("999"); |
|---|
| | | msg.setMessage("未找到检查内容"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/selfChecks") |
|---|
| | | @ApiOperation(value = "删除自定义检查内容",response = Msg.class) |
|---|
| | | public Msg bashDelSelfCheckList(@RequestBody JSONObject jsonObject){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | JSONArray ids = jsonObject.getJSONArray("ids"); |
|---|
| | | List<Long> idList = ids.toJavaList(Long.class); |
|---|
| | | List<SelfCheckInfo> selfCheckInfoList = selfCheckService.selectByIds(idList); |
|---|
| | | if (selfCheckInfoList != null && selfCheckInfoList.size() > 0){ |
|---|
| | | for (SelfCheckInfo selfCheckInfo : selfCheckInfoList) { |
|---|
| | | selfCheckInfo.setIsdel((byte)1); |
|---|
| | | selfCheckInfo.setModifiedby(getUser().getRealname()); |
|---|
| | | selfCheckInfo.setModifieddate(new Date()); |
|---|
| | | selfCheckService.updateById(selfCheckInfo); |
|---|
| | | } |
|---|
| | | return msg; |
|---|
| | | }else { |
|---|
| | | msg.setCode("999"); |
|---|
| | | msg.setMessage("未找到检查内容"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/importSelfCheck") |
|---|
| | | @ApiOperation(value = "导入自定义检查内容",response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "file",value = "文件",required = true), |
|---|
| | | }) |
|---|
| | | public Msg addSelfCheckList(MultipartFile file){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | |
|---|
| | | String filesave =""; |
|---|
| | | try { |
|---|
| | | SimpleDateFormat sdf = new SimpleDateFormat( "yyyyMMddHHmmssSSS" ); |
|---|
| | | if (file == null) |
|---|
| | | { |
|---|
| | | msg.setCode("404"); |
|---|
| | | msg.setMessage("未找到上传文件"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | long size = file.getSize(); |
|---|
| | | if(0 == size) |
|---|
| | | { |
|---|
| | | msg.setCode("404"); |
|---|
| | | msg.setMessage("上传文件大小为空"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | if(!FileOptUtils.isDirExists(patrolPath)){ |
|---|
| | | msg.setCode("500"); |
|---|
| | | msg.setMessage("发生错误或不为目录"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | filesave = patrolPath + getUser().getRealname() + "_" + sdf.format(new Date()) +".xlsx"; |
|---|
| | | |
|---|
| | | file.transferTo(new File(filesave)); |
|---|
| | | InputStream in = new FileInputStream(filesave); |
|---|
| | | String name = file.getOriginalFilename(); |
|---|
| | | Boolean isExcel2007 = name.substring(name.lastIndexOf(".") + 1).endsWith("xlsx")? true:false; |
|---|
| | | BooleanReason blret = excelExportService.imporSelfCheckExcel(in,getUser().getRealname(),isExcel2007); |
|---|
| | | if(blret.getValue().equals(false)) |
|---|
| | | { |
|---|
| | | msg.setCode("500"); |
|---|
| | | msg.setMessage(blret.getResultmsg()); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | } catch (Exception e) { |
|---|
| | | e.printStackTrace(); |
|---|
| | | msg.setCode("500"); |
|---|
| | | msg.setMessage("导入发生错误"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Controller; |
|---|
| | | |
|---|
| | | import com.alibaba.fastjson.JSONObject; |
|---|
| | | import com.gk.hotwork.Domain.PermissionInfo; |
|---|
| | | import com.gk.hotwork.Domain.Utils.Msg; |
|---|
| | | import com.gk.hotwork.Domain.Vo.Menu; |
|---|
| | | import com.gk.hotwork.Service.PermissionService; |
|---|
| | | import io.swagger.annotations.*; |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.web.bind.annotation.*; |
|---|
| | | |
|---|
| | | import java.util.Date; |
|---|
| | | import java.util.List; |
|---|
| | | |
|---|
| | | @Api(tags = "菜单接口") |
|---|
| | | @RestController |
|---|
| | | public class PermissionController { |
|---|
| | | @Autowired |
|---|
| | | PermissionService permissionService; |
|---|
| | | |
|---|
| | | @GetMapping("/permissions") |
|---|
| | | @ApiOperation(value = "获取菜单数据", notes = "获取菜单数据", response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(paramType="query",name = "userId",value = "用户id",required = true)}) |
|---|
| | | public Msg getPermission(@RequestParam String userId){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | List<Menu> menus = permissionService.selectByUserId(userId); |
|---|
| | | msg.setResult(menus); |
|---|
| | | |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/addpermissions") |
|---|
| | | @ApiOperation(value = "添加菜单", notes = "添加菜单", response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(paramType="query",name = "component",value = "接口路径"), |
|---|
| | | @ApiImplicitParam(paramType="query",name = "icon",value = "图标"), |
|---|
| | | @ApiImplicitParam(paramType="query",name = "level",value = "第几级菜单",required = true), |
|---|
| | | @ApiImplicitParam(paramType="query",name = "name",value = "名称",required = true), |
|---|
| | | @ApiImplicitParam(paramType="query",name = "parentidId",value = "父级id"), |
|---|
| | | @ApiImplicitParam(paramType="query",name = "path",value = "路径"), |
|---|
| | | @ApiImplicitParam(paramType="query",name = "sortorder",value = "排序",required = true), |
|---|
| | | @ApiImplicitParam(paramType="query",name = "status",value = "状态",required = true), |
|---|
| | | @ApiImplicitParam(paramType="query",name = "title",value = "标题"), |
|---|
| | | @ApiImplicitParam(paramType="query",name = "type",value = "类型",required = true), |
|---|
| | | @ApiImplicitParam(paramType="query",name = "operator",value = "操作人"), |
|---|
| | | |
|---|
| | | }) |
|---|
| | | public Msg addPermission(@ApiParam(value = "component,icon,level,name,parentidId,path,sortorder,status,title,type,operator") |
|---|
| | | @RequestBody JSONObject jsonObject){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | PermissionInfo permissionInfo = new PermissionInfo(); |
|---|
| | | permissionInfo.setName(jsonObject.getString("name")); |
|---|
| | | permissionInfo.setLevel(jsonObject.getInteger("level")); |
|---|
| | | permissionInfo.setTitle(jsonObject.getString("title")); |
|---|
| | | permissionInfo.setPath(jsonObject.getString("path")); |
|---|
| | | permissionInfo.setComponent(jsonObject.getString("component")); |
|---|
| | | permissionInfo.setIcon(jsonObject.getString("icon")); |
|---|
| | | permissionInfo.setStatus(jsonObject.getInteger("status")); |
|---|
| | | permissionInfo.setSortorder(jsonObject.getDouble("sortorder")); |
|---|
| | | permissionInfo.setType(jsonObject.getInteger("type")); |
|---|
| | | permissionInfo.setExpand(true); |
|---|
| | | permissionInfo.setChecked(false); |
|---|
| | | permissionInfo.setSelected(false); |
|---|
| | | permissionInfo.setCreatedby(jsonObject.getString("operator")); |
|---|
| | | permissionInfo.setCreateddate(new Date()); |
|---|
| | | permissionInfo.setLastmodifiedby(jsonObject.getString("operator")); |
|---|
| | | permissionInfo.setLastmodifieddate(new Date()); |
|---|
| | | permissionInfo.setParentid(jsonObject.getInteger("parentid")); |
|---|
| | | |
|---|
| | | if (permissionInfo.getParentid() != null) { |
|---|
| | | PermissionInfo parentPermission = permissionService.getById(permissionInfo.getParentid()); |
|---|
| | | permissionInfo.setLevel(parentPermission.getLevel()+1); |
|---|
| | | } |
|---|
| | | |
|---|
| | | permissionService.save(permissionInfo); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/putpermissions") |
|---|
| | | @ApiOperation(value = "修改菜单", notes = "修改菜单", response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(paramType="query",name = "id",value = "id",required = true), |
|---|
| | | @ApiImplicitParam(paramType="body",name = "component",value = "接口路径"), |
|---|
| | | @ApiImplicitParam(paramType="body",name = "icon",value = "图标"), |
|---|
| | | @ApiImplicitParam(paramType="body",name = "level",value = "第几级菜单",required = true), |
|---|
| | | @ApiImplicitParam(paramType="body",name = "name",value = "名称",required = true), |
|---|
| | | @ApiImplicitParam(paramType="body",name = "parentidId",value = "父级id"), |
|---|
| | | @ApiImplicitParam(paramType="body",name = "path",value = "路径"), |
|---|
| | | @ApiImplicitParam(paramType="body",name = "sortorder",value = "排序",required = true), |
|---|
| | | @ApiImplicitParam(paramType="body",name = "status",value = "状态",required = true), |
|---|
| | | @ApiImplicitParam(paramType="body",name = "title",value = "标题"), |
|---|
| | | @ApiImplicitParam(paramType="body",name = "type",value = "类型",required = true), |
|---|
| | | @ApiImplicitParam(paramType="body",name = "operator",value = "操作人"), |
|---|
| | | |
|---|
| | | }) |
|---|
| | | public Msg editPermission(@ApiParam(value = "component,icon,level,name,parentidId,path,sortorder,status,title,type,operator") |
|---|
| | | @RequestBody JSONObject jsonObject){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | PermissionInfo permissionInfo = new PermissionInfo(); |
|---|
| | | permissionInfo.setId(jsonObject.getInteger("id")); |
|---|
| | | permissionInfo.setName(jsonObject.getString("name")); |
|---|
| | | permissionInfo.setLevel(jsonObject.getInteger("level")); |
|---|
| | | permissionInfo.setTitle(jsonObject.getString("title")); |
|---|
| | | permissionInfo.setPath(jsonObject.getString("path")); |
|---|
| | | permissionInfo.setComponent(jsonObject.getString("component")); |
|---|
| | | permissionInfo.setIcon(jsonObject.getString("icon")); |
|---|
| | | permissionInfo.setStatus(jsonObject.getInteger("status")); |
|---|
| | | permissionInfo.setSortorder(jsonObject.getDouble("sortorder")); |
|---|
| | | permissionInfo.setType(jsonObject.getInteger("type")); |
|---|
| | | permissionInfo.setExpand(true); |
|---|
| | | permissionInfo.setChecked(false); |
|---|
| | | permissionInfo.setSelected(false); |
|---|
| | | permissionInfo.setCreatedby(jsonObject.getString("operator")); |
|---|
| | | permissionInfo.setLastmodifiedby(jsonObject.getString("operator")); |
|---|
| | | permissionInfo.setLastmodifieddate(new Date()); |
|---|
| | | permissionInfo.setParentid(jsonObject.getInteger("parentid")); |
|---|
| | | permissionService.updateById(permissionInfo); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/delpermissions") |
|---|
| | | @ApiOperation(value = "删除菜单", notes = "删除菜单", response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(paramType="query",name = "id",value = "id",required = true), |
|---|
| | | @ApiImplicitParam(paramType="body",name = "operator",value = "操作人"), |
|---|
| | | |
|---|
| | | }) |
|---|
| | | public Msg delPermission(@ApiParam(value = "id,operator") |
|---|
| | | @RequestBody JSONObject jsonObject){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | PermissionInfo permissionInfo = permissionService.getById(jsonObject.getInteger("id")); |
|---|
| | | permissionInfo.setStatus(0); |
|---|
| | | permissionService.updateById(permissionInfo); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Controller; |
|---|
| | | |
|---|
| | | import com.alibaba.fastjson.JSONObject; |
|---|
| | | import com.gk.hotwork.Controller.Base.BaseController; |
|---|
| | | import com.gk.hotwork.Domain.Exception.BusinessException; |
|---|
| | | import com.gk.hotwork.Domain.Utils.Msg; |
|---|
| | | import com.gk.hotwork.Domain.Vo.RegisterVo; |
|---|
| | | import com.gk.hotwork.Service.UserService; |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.beans.factory.annotation.Value; |
|---|
| | | import org.springframework.web.bind.annotation.RequestBody; |
|---|
| | | import org.springframework.web.bind.annotation.RequestMapping; |
|---|
| | | import org.springframework.web.bind.annotation.RestController; |
|---|
| | | |
|---|
| | | @RestController |
|---|
| | | @RequestMapping("/register") |
|---|
| | | public class RegisterController extends BaseController { |
|---|
| | | |
|---|
| | | @Autowired |
|---|
| | | private UserService userService; |
|---|
| | | |
|---|
| | | |
|---|
| | | @RequestMapping("/add") |
|---|
| | | public Msg add(@RequestBody RegisterVo registerVo) { |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | try { |
|---|
| | | userService.register(registerVo); |
|---|
| | | } catch (BusinessException e) { |
|---|
| | | e.printStackTrace(); |
|---|
| | | msg.setCode("400"); |
|---|
| | | msg.setMessage(e.getMessage()); |
|---|
| | | } catch (Exception e) { |
|---|
| | | e.printStackTrace(); |
|---|
| | | msg.setCode("401"); |
|---|
| | | msg.setMessage("系统错误,请联系管理员"); |
|---|
| | | } |
|---|
| | | return msg; |
|---|
| | | |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Controller; |
|---|
| | | |
|---|
| | | |
|---|
| | | import com.alibaba.fastjson.JSONObject; |
|---|
| | | import com.baomidou.mybatisplus.core.metadata.IPage; |
|---|
| | | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|---|
| | | import com.gk.hotwork.Controller.Base.BaseController; |
|---|
| | | import com.gk.hotwork.Domain.Exception.BusinessException; |
|---|
| | | import com.gk.hotwork.Domain.Reserve; |
|---|
| | | import com.gk.hotwork.Domain.Utils.FilterObject; |
|---|
| | | import com.gk.hotwork.Domain.Utils.Msg; |
|---|
| | | import com.gk.hotwork.Domain.Vo.PageInfoExtension; |
|---|
| | | import com.gk.hotwork.Service.ReserveService; |
|---|
| | | import io.swagger.annotations.Api; |
|---|
| | | import io.swagger.annotations.ApiImplicitParam; |
|---|
| | | import io.swagger.annotations.ApiImplicitParams; |
|---|
| | | import io.swagger.annotations.ApiOperation; |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.web.bind.annotation.PostMapping; |
|---|
| | | import org.springframework.web.bind.annotation.RequestBody; |
|---|
| | | import org.springframework.web.bind.annotation.RequestMapping; |
|---|
| | | import org.springframework.web.bind.annotation.RestController; |
|---|
| | | |
|---|
| | | import java.util.Date; |
|---|
| | | import java.util.Map; |
|---|
| | | |
|---|
| | | |
|---|
| | | @RestController |
|---|
| | | @RequestMapping("reserve") |
|---|
| | | @Api(tags = "预约") |
|---|
| | | public class ReserveController extends BaseController { |
|---|
| | | |
|---|
| | | @Autowired |
|---|
| | | private ReserveService reserveService; |
|---|
| | | |
|---|
| | | |
|---|
| | | @PostMapping("pageList") |
|---|
| | | Msg reservePageList(@RequestBody FilterObject filter) { |
|---|
| | | Integer pageIndex = filter.getPageIndex(); |
|---|
| | | Integer pageSize = filter.getPageSize(); |
|---|
| | | IPage page = reserveService.selectPage(new Page<>(pageIndex, pageSize), filter.getFilter(), getUser()); |
|---|
| | | return success(page); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | @PostMapping("add") |
|---|
| | | @ApiOperation("新增预约") |
|---|
| | | Msg makeAAppointment(@RequestBody Reserve reserve) { |
|---|
| | | reserveService.addOne(reserve,getUser()); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | @PostMapping("mod") |
|---|
| | | @ApiOperation("修改预约") |
|---|
| | | Msg modAppointment(@RequestBody Reserve reserve) { |
|---|
| | | reserveService.modOne(reserve,getUser()); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | @PostMapping("statistics") |
|---|
| | | @ApiOperation("根据部门统计") |
|---|
| | | Msg statistics(@RequestBody FilterObject filter) { |
|---|
| | | Integer pageIndex = filter.getPageIndex(); |
|---|
| | | Integer pageSize = filter.getPageSize(); |
|---|
| | | PageInfoExtension<Map> extension = reserveService.statistics(new Page<>(pageIndex,pageSize),filter.getFilter(),getUser()); |
|---|
| | | return success(extension); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Controller; |
|---|
| | | |
|---|
| | | import com.alibaba.fastjson.JSONObject; |
|---|
| | | import com.baomidou.mybatisplus.core.metadata.IPage; |
|---|
| | | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|---|
| | | import com.gk.hotwork.Controller.Base.BaseController; |
|---|
| | | import com.gk.hotwork.Domain.Enum.ErrorCode; |
|---|
| | | import com.gk.hotwork.Domain.Exception.BusinessException; |
|---|
| | | import com.gk.hotwork.Domain.RiskAnaUnit; |
|---|
| | | import com.gk.hotwork.Domain.Utils.FileOptUtils; |
|---|
| | | import com.gk.hotwork.Domain.Utils.FilterObject; |
|---|
| | | import com.gk.hotwork.Domain.Utils.Msg; |
|---|
| | | import com.gk.hotwork.Domain.Vo.RiskAnaUintExoprtVo; |
|---|
| | | import com.gk.hotwork.Service.ExcelExportService; |
|---|
| | | import com.gk.hotwork.Service.RiskAnaUnitService; |
|---|
| | | import io.swagger.annotations.Api; |
|---|
| | | import io.swagger.annotations.ApiImplicitParam; |
|---|
| | | import io.swagger.annotations.ApiImplicitParams; |
|---|
| | | import io.swagger.annotations.ApiOperation; |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.web.bind.annotation.*; |
|---|
| | | import org.springframework.web.multipart.MultipartFile; |
|---|
| | | |
|---|
| | | import javax.servlet.http.HttpServletRequest; |
|---|
| | | import javax.servlet.http.HttpServletResponse; |
|---|
| | | import java.io.File; |
|---|
| | | import java.io.FileInputStream; |
|---|
| | | import java.io.InputStream; |
|---|
| | | import java.util.Map; |
|---|
| | | import java.util.List; |
|---|
| | | |
|---|
| | | import static com.gk.hotwork.Domain.Utils.Properties.filePath; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * @author celin |
|---|
| | | * @date 2022/3/16 14:39 |
|---|
| | | */ |
|---|
| | | @Api(tags = "风险分析单元") |
|---|
| | | @RestController |
|---|
| | | @RequestMapping("/riskAnaUnit") |
|---|
| | | public class RiskAnaUintController extends BaseController { |
|---|
| | | |
|---|
| | | @Autowired |
|---|
| | | private RiskAnaUnitService riskAnaUnitService; |
|---|
| | | @Autowired |
|---|
| | | private ExcelExportService excelExportService; |
|---|
| | | |
|---|
| | | @ApiOperation("分页") |
|---|
| | | @PostMapping("/page") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "pageIndex", value = "当前页码"), |
|---|
| | | @ApiImplicitParam(name = "pageSize", value = "每页行数"), |
|---|
| | | @ApiImplicitParam(name = "filter.riskUnitName", value = "{}"), |
|---|
| | | @ApiImplicitParam(name = "filter.hazardDep", value = "{}"), |
|---|
| | | @ApiImplicitParam(name = "filter.riskUnitName", value = "{}"), |
|---|
| | | }) |
|---|
| | | public Msg selectPage(@RequestBody FilterObject filterObject) { |
|---|
| | | Integer pageIndex = filterObject.getPageIndex(); |
|---|
| | | Integer pageSize = filterObject.getPageSize(); |
|---|
| | | IPage<RiskAnaUnit> page = riskAnaUnitService.selectPage(new Page<>(pageIndex, pageSize), filterObject.getFilter(), getUser()); |
|---|
| | | return success(page); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation("新增") |
|---|
| | | @PostMapping("/add") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "hazardDepId", value = "部门id"), |
|---|
| | | @ApiImplicitParam(name = "hazardLiablePersonId", value = "负责人"), |
|---|
| | | @ApiImplicitParam(name = "riskUnitName", value = "风险单元名称"), |
|---|
| | | }) |
|---|
| | | public Msg add(@RequestBody RiskAnaUnit riskAnaUnitVo) { |
|---|
| | | riskAnaUnitService.addOne(riskAnaUnitVo, getUser()); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | @ApiOperation("修改") |
|---|
| | | @PostMapping("/mod") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "id", value = "id"), |
|---|
| | | @ApiImplicitParam(name = "hazardDepId", value = "部门id"), |
|---|
| | | @ApiImplicitParam(name = "hazardLiablePerson", value = "负责人"), |
|---|
| | | @ApiImplicitParam(name = "hazardLiablePersonId", value = "负责人"), |
|---|
| | | @ApiImplicitParam(name = "riskUnitName", value = "风险单元名称"), |
|---|
| | | }) |
|---|
| | | public Msg mod(@RequestBody RiskAnaUnit riskAnaUnit) { |
|---|
| | | riskAnaUnitService.modOne(riskAnaUnit, getUser()); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation("删除") |
|---|
| | | @PostMapping("/del") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "id", value = "id"), |
|---|
| | | }) |
|---|
| | | public Msg del(@RequestBody JSONObject jsonObj) { |
|---|
| | | Long id = jsonObj.getLong("id"); |
|---|
| | | riskAnaUnitService.delOne(id, getUser()); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | @ApiOperation("风险分析个数部门分布") |
|---|
| | | @PostMapping("/department-analysis") |
|---|
| | | public Msg analysis(){ |
|---|
| | | List<Map> list = riskAnaUnitService.selectDepartmentAnalysis(); |
|---|
| | | return success(list); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation("风险分析单元数据导出") |
|---|
| | | @GetMapping("/export") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "filter.riskUnitName", value = "{}"), |
|---|
| | | @ApiImplicitParam(name = "filter.hazardDep", value = "{}"), |
|---|
| | | @ApiImplicitParam(name = "filter.riskUnitName", value = "{}"), |
|---|
| | | }) |
|---|
| | | public Msg infoExport(HttpServletRequest request, HttpServletResponse response) throws Exception { |
|---|
| | | |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | |
|---|
| | | List<RiskAnaUintExoprtVo> listVo = riskAnaUnitService.getInfo(request, response); |
|---|
| | | msg.setResult(listVo); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation("风险分析单元数据导入") |
|---|
| | | @PostMapping("/import") |
|---|
| | | public Msg infoImport(MultipartFile file) { |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | |
|---|
| | | String filesave =""; |
|---|
| | | try { |
|---|
| | | if (file == null) |
|---|
| | | { |
|---|
| | | msg.setCode("404"); |
|---|
| | | msg.setMessage("上传文件未找到"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | long size = file.getSize(); |
|---|
| | | if(0 == size) |
|---|
| | | { |
|---|
| | | msg.setCode("404"); |
|---|
| | | msg.setMessage("上传文件大小为空"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | if (!FileOptUtils.isDirExists(filePath)) { |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("发生错误或不为目录"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | if (!FileOptUtils.isDirExists(filePath)) { |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("发生错误或不为目录"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | filesave = filePath + getUser().getRealname() + "_" + ".xlsx"; |
|---|
| | | |
|---|
| | | file.transferTo(new File(filesave)); |
|---|
| | | InputStream in = new FileInputStream(filesave); |
|---|
| | | String name = file.getOriginalFilename(); |
|---|
| | | Boolean isExcel2007 = name.substring(name.lastIndexOf(".") + 1).endsWith("xlsx") ? true : false; |
|---|
| | | //riskEventService.importRiskEventData(param, getUser()); |
|---|
| | | excelExportService.importRiskAnaUnitExcel(in, getUser().getRealname(), isExcel2007); |
|---|
| | | |
|---|
| | | } catch (BusinessException e) { |
|---|
| | | e.printStackTrace(); |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage(e.getMessage()); |
|---|
| | | } catch (Exception e) { |
|---|
| | | e.printStackTrace(); |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("导入发生错误"); |
|---|
| | | } |
|---|
| | | |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Controller; |
|---|
| | | |
|---|
| | | |
|---|
| | | import com.alibaba.fastjson.JSONObject; |
|---|
| | | import com.baomidou.mybatisplus.core.metadata.IPage; |
|---|
| | | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|---|
| | | import com.gk.hotwork.Controller.Base.BaseController; |
|---|
| | | import com.gk.hotwork.Domain.RiskControlClassify; |
|---|
| | | import com.gk.hotwork.Domain.Utils.FilterObject; |
|---|
| | | import com.gk.hotwork.Domain.Utils.Msg; |
|---|
| | | import com.gk.hotwork.Service.RiskControlClassifyService; |
|---|
| | | import io.swagger.annotations.Api; |
|---|
| | | import io.swagger.annotations.ApiImplicitParam; |
|---|
| | | import io.swagger.annotations.ApiImplicitParams; |
|---|
| | | import io.swagger.annotations.ApiOperation; |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.web.bind.annotation.*; |
|---|
| | | |
|---|
| | | import java.util.List; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * @author celin |
|---|
| | | * @date 2022/3/16 15:06 |
|---|
| | | */ |
|---|
| | | |
|---|
| | | @Api(tags = "风险管控分类") |
|---|
| | | @RestController |
|---|
| | | @RequestMapping("/riskControlClassify") |
|---|
| | | public class RiskControlClassifyController extends BaseController { |
|---|
| | | |
|---|
| | | @Autowired |
|---|
| | | private RiskControlClassifyService riskControlClassifyService; |
|---|
| | | |
|---|
| | | @ApiOperation("分页") |
|---|
| | | @PostMapping("/page") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "pageIndex",value = "当前页码"), |
|---|
| | | @ApiImplicitParam(name = "pageSize",value = "每页行数"), |
|---|
| | | @ApiImplicitParam(name = "filter",value = "{}"), |
|---|
| | | }) |
|---|
| | | public Msg selectPage(@RequestBody FilterObject filterObj) { |
|---|
| | | Integer pageIndex = filterObj.getPageIndex(); |
|---|
| | | Integer pageSize = filterObj.getPageSize(); |
|---|
| | | IPage page = riskControlClassifyService.selectPage(new Page<>(pageIndex, pageSize), filterObj.getFilter(), getUser()); |
|---|
| | | return success(page); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | @ApiOperation(value = "普通查询", notes = "级联") |
|---|
| | | @GetMapping("/all") |
|---|
| | | public Msg selectAll() { |
|---|
| | | List<RiskControlClassify> list = riskControlClassifyService.selectAll(getUser()); |
|---|
| | | return success(list); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation(value = "新增") |
|---|
| | | @PostMapping("/add") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "name",value = "措施分类"), |
|---|
| | | @ApiImplicitParam(name = "note",value = "备注"), |
|---|
| | | @ApiImplicitParam(name = "orderIndex",value = "排序"), |
|---|
| | | @ApiImplicitParam(name = "parentId",value = "父分类"), |
|---|
| | | }) |
|---|
| | | public Msg add(@RequestBody RiskControlClassify riskControlClassifyVo) { |
|---|
| | | riskControlClassifyService.addOne(riskControlClassifyVo, getUser()); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation(value = "修改") |
|---|
| | | @PostMapping("/mod") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "id",value = "id"), |
|---|
| | | @ApiImplicitParam(name = "name",value = "措施分类"), |
|---|
| | | @ApiImplicitParam(name = "note",value = "备注"), |
|---|
| | | @ApiImplicitParam(name = "orderIndex",value = "排序"), |
|---|
| | | @ApiImplicitParam(name = "parentId",value = "父分类"), |
|---|
| | | }) |
|---|
| | | public Msg mod(@RequestBody RiskControlClassify riskControlClassifyVo) { |
|---|
| | | riskControlClassifyService.modOne(riskControlClassifyVo, getUser()); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation(value = "删除") |
|---|
| | | @PostMapping("/del") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "id",value = "id"), |
|---|
| | | }) |
|---|
| | | public Msg del(@RequestBody JSONObject jsonObject) { |
|---|
| | | Long id = jsonObject.getLong("id"); |
|---|
| | | riskControlClassifyService.delOne(id, getUser()); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Controller; |
|---|
| | | |
|---|
| | | |
|---|
| | | import com.alibaba.fastjson.JSONObject; |
|---|
| | | import com.baomidou.mybatisplus.core.metadata.IPage; |
|---|
| | | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|---|
| | | import com.gk.hotwork.Controller.Base.BaseController; |
|---|
| | | import com.gk.hotwork.Domain.Enum.ErrorCode; |
|---|
| | | import com.gk.hotwork.Domain.Exception.BusinessException; |
|---|
| | | import com.gk.hotwork.Domain.RiskControlMeasure; |
|---|
| | | import com.gk.hotwork.Domain.Utils.FileOptUtils; |
|---|
| | | import com.gk.hotwork.Domain.Utils.FilterObject; |
|---|
| | | import com.gk.hotwork.Domain.Utils.Msg; |
|---|
| | | import com.gk.hotwork.Domain.Vo.RiskControlMeasureExportVo; |
|---|
| | | import com.gk.hotwork.Service.ExcelExportService; |
|---|
| | | import com.gk.hotwork.Service.RiskControlMeasureService; |
|---|
| | | import io.swagger.annotations.Api; |
|---|
| | | import io.swagger.annotations.ApiImplicitParam; |
|---|
| | | import io.swagger.annotations.ApiImplicitParams; |
|---|
| | | import io.swagger.annotations.ApiOperation; |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.web.bind.annotation.*; |
|---|
| | | import org.springframework.web.multipart.MultipartFile; |
|---|
| | | |
|---|
| | | import javax.servlet.http.HttpServletRequest; |
|---|
| | | import javax.servlet.http.HttpServletResponse; |
|---|
| | | import java.io.*; |
|---|
| | | import java.util.List; |
|---|
| | | |
|---|
| | | import static com.gk.hotwork.Domain.Utils.Properties.filePath; |
|---|
| | | |
|---|
| | | |
|---|
| | | @Api(tags = "安全风险管控措施") |
|---|
| | | @RestController |
|---|
| | | @RequestMapping("/riskControlMeasure") |
|---|
| | | public class RiskControlMeasureController extends BaseController { |
|---|
| | | |
|---|
| | | @Autowired |
|---|
| | | private RiskControlMeasureService riskControlMeasureService; |
|---|
| | | @Autowired |
|---|
| | | private ExcelExportService excelExportService; |
|---|
| | | |
|---|
| | | @ApiOperation("分页") |
|---|
| | | @PostMapping("/page") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "pageIndex",value = "当前页码"), |
|---|
| | | @ApiImplicitParam(name = "pageSize",value = "每页行数"), |
|---|
| | | @ApiImplicitParam(name = "filter.riskEventName",value = "{}"), |
|---|
| | | @ApiImplicitParam(name = "filter.riskUnitName",value = "{}"), |
|---|
| | | @ApiImplicitParam(name = "filter.dataSrc",value = "{}"), |
|---|
| | | }) |
|---|
| | | public Msg selectPage(@RequestBody FilterObject filterObject) { |
|---|
| | | Integer pageIndex = filterObject.getPageIndex(); |
|---|
| | | Integer pageSize = filterObject.getPageSize(); |
|---|
| | | IPage page = riskControlMeasureService.selectPage(new Page<>(pageIndex, pageSize), filterObject.getFilter(), getUser()); |
|---|
| | | return success(page); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation("ID查找管控措施") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "id",value = "管控措施ID") |
|---|
| | | }) |
|---|
| | | @GetMapping("/get/id") |
|---|
| | | public Msg selectById(Long id){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | RiskControlMeasure measure = riskControlMeasureService.getById(id); |
|---|
| | | if(measure != null && measure.getId() > 0){ |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setResult(measure); |
|---|
| | | }else { |
|---|
| | | msg.setCode(ErrorCode.ERROR_50001.getCode()); |
|---|
| | | msg.setMessage(ErrorCode.ERROR_50001.getMsg()); |
|---|
| | | } |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | @ApiOperation("新增") |
|---|
| | | @PostMapping("/add") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "riskEventId",value = "所属安全事件id"), |
|---|
| | | @ApiImplicitParam(name = "dataSrc",value = "自动化监控:1;隐患排查2 (数据字典)"), |
|---|
| | | @ApiImplicitParam(name = "riskMeasureDesc",value = "管控措施描述"), |
|---|
| | | @ApiImplicitParam(name = "classify1",value = "分类1"), |
|---|
| | | @ApiImplicitParam(name = "classify2",value = "分类2"), |
|---|
| | | @ApiImplicitParam(name = "classify3",value = "企业自定义分类"), |
|---|
| | | @ApiImplicitParam(name = "troubleshootContent",value = "隐患排查内容"), |
|---|
| | | }) |
|---|
| | | public Msg add(@RequestBody RiskControlMeasure riskControlMeasureVo) { |
|---|
| | | riskControlMeasureService.addOne(riskControlMeasureVo, getUser()); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation("修改") |
|---|
| | | @PostMapping("/mod") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "id",value = "id"), |
|---|
| | | @ApiImplicitParam(name = "riskEventId",value = "所属安全事件id"), |
|---|
| | | @ApiImplicitParam(name = "dataSrc",value = "自动化监控:1;隐患排查2 (数据字典)"), |
|---|
| | | @ApiImplicitParam(name = "riskMeasureDesc",value = "管控措施描述"), |
|---|
| | | @ApiImplicitParam(name = "classify1",value = "分类1"), |
|---|
| | | @ApiImplicitParam(name = "classify3",value = "企业自定义分类"), |
|---|
| | | @ApiImplicitParam(name = "troubleshootContent",value = "隐患排查内容"), |
|---|
| | | }) |
|---|
| | | public Msg mod(@RequestBody RiskControlMeasure riskControlMeasureVo) { |
|---|
| | | riskControlMeasureService.modOne(riskControlMeasureVo, getUser()); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation("删除") |
|---|
| | | @PostMapping("/del") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "id",value = "id"), |
|---|
| | | }) |
|---|
| | | public Msg del(@RequestBody JSONObject jsonObject) { |
|---|
| | | Long id = jsonObject.getLong("id"); |
|---|
| | | riskControlMeasureService.delOne(id, getUser()); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation("安全风险管控措施数据导出") |
|---|
| | | @GetMapping("/export") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "filter.riskEventName",value = "{}"), |
|---|
| | | @ApiImplicitParam(name = "filter.dataSrc",value = "{}"), |
|---|
| | | }) |
|---|
| | | public Msg infoExport(HttpServletRequest request, HttpServletResponse response) throws Exception { |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | |
|---|
| | | List<RiskControlMeasureExportVo> list = riskControlMeasureService.getRiskControlMeasureList(request, response); |
|---|
| | | |
|---|
| | | msg.setResult(list); |
|---|
| | | |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | //List<RiskControlMeasureExportVo> list = riskControlMeasureService.getRiskControlMeasureList(); |
|---|
| | | |
|---|
| | | |
|---|
| | | @ApiOperation("安全风险管控措施数据导入") |
|---|
| | | @PostMapping("/import") |
|---|
| | | public Msg infoImport(MultipartFile file) { |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | |
|---|
| | | String filesave =""; |
|---|
| | | try { |
|---|
| | | if (file == null) |
|---|
| | | { |
|---|
| | | msg.setCode("404"); |
|---|
| | | msg.setMessage("上传文件未找到"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | long size = file.getSize(); |
|---|
| | | if(0 == size) |
|---|
| | | { |
|---|
| | | msg.setCode("404"); |
|---|
| | | msg.setMessage("上传文件大小为空"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | if (!FileOptUtils.isDirExists(filePath)) { |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("发生错误或不为目录"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | if (!FileOptUtils.isDirExists(filePath)) { |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("发生错误或不为目录"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | filesave = filePath + getUser().getRealname() + "_" + ".xlsx"; |
|---|
| | | |
|---|
| | | file.transferTo(new File(filesave)); |
|---|
| | | InputStream in = new FileInputStream(filesave); |
|---|
| | | String name = file.getOriginalFilename(); |
|---|
| | | Boolean isExcel2007 = name.substring(name.lastIndexOf(".") + 1).endsWith("xlsx") ? true : false; |
|---|
| | | //riskEventService.importRiskEventData(param, getUser()); |
|---|
| | | excelExportService.importRiskControlMeasureExcel(in, getUser().getRealname(), isExcel2007); |
|---|
| | | |
|---|
| | | } catch (BusinessException e) { |
|---|
| | | e.printStackTrace(); |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage(e.getMessage()); |
|---|
| | | } catch (Exception e) { |
|---|
| | | e.printStackTrace(); |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("导入发生错误"); |
|---|
| | | } |
|---|
| | | |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Controller; |
|---|
| | | |
|---|
| | | import com.alibaba.fastjson.JSONObject; |
|---|
| | | import com.baomidou.mybatisplus.core.metadata.IPage; |
|---|
| | | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|---|
| | | import com.gk.hotwork.Controller.Base.BaseController; |
|---|
| | | import com.gk.hotwork.Domain.Enum.ErrorCode; |
|---|
| | | import com.gk.hotwork.Domain.Exception.BusinessException; |
|---|
| | | import com.gk.hotwork.Domain.RiskEvent; |
|---|
| | | import com.gk.hotwork.Domain.Utils.FileOptUtils; |
|---|
| | | import com.gk.hotwork.Domain.Utils.FilterObject; |
|---|
| | | import com.gk.hotwork.Domain.Utils.Msg; |
|---|
| | | import com.gk.hotwork.Domain.Vo.RiskEventExportVo; |
|---|
| | | import com.gk.hotwork.Service.ExcelExportService; |
|---|
| | | import com.gk.hotwork.Service.RiskEventService; |
|---|
| | | import io.swagger.annotations.Api; |
|---|
| | | import io.swagger.annotations.ApiImplicitParam; |
|---|
| | | import io.swagger.annotations.ApiImplicitParams; |
|---|
| | | import io.swagger.annotations.ApiOperation; |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.web.bind.annotation.*; |
|---|
| | | import org.springframework.web.multipart.MultipartFile; |
|---|
| | | |
|---|
| | | import javax.servlet.http.HttpServletRequest; |
|---|
| | | import javax.servlet.http.HttpServletResponse; |
|---|
| | | import java.io.File; |
|---|
| | | import java.io.FileInputStream; |
|---|
| | | import java.io.InputStream; |
|---|
| | | import java.text.SimpleDateFormat; |
|---|
| | | import java.util.Date; |
|---|
| | | import java.util.List; |
|---|
| | | |
|---|
| | | import static com.gk.hotwork.Domain.Utils.Properties.filePath; |
|---|
| | | |
|---|
| | | |
|---|
| | | @Api(tags = "安全风险事件") |
|---|
| | | @RestController |
|---|
| | | @RequestMapping("/riskEvent") |
|---|
| | | public class RiskEventController extends BaseController { |
|---|
| | | |
|---|
| | | @Autowired |
|---|
| | | private RiskEventService riskEventService; |
|---|
| | | |
|---|
| | | @Autowired |
|---|
| | | private ExcelExportService excelExportService; |
|---|
| | | |
|---|
| | | @ApiOperation("分页") |
|---|
| | | @PostMapping("/page") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "pageIndex",value = "当前页码"), |
|---|
| | | @ApiImplicitParam(name = "pageSize",value = "每页行数"), |
|---|
| | | @ApiImplicitParam(name = "filter.riskEventName",value = "{}"), |
|---|
| | | @ApiImplicitParam(name = "filter.riskUnitName",value = "{}"), |
|---|
| | | }) |
|---|
| | | public Msg selectPage(@RequestBody FilterObject filterObject) { |
|---|
| | | Integer pageIndex = filterObject.getPageIndex(); |
|---|
| | | Integer pageSize = filterObject.getPageSize(); |
|---|
| | | IPage page = riskEventService.selectPage(new Page<>(pageIndex, pageSize), filterObject.getFilter(), getUser()); |
|---|
| | | return success(page); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation("/新增") |
|---|
| | | @PostMapping("/add") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "riskUnitId",value = "所属安全风险单元id"), |
|---|
| | | @ApiImplicitParam(name = "riskEventName",value = "安全风险事件名称"), |
|---|
| | | }) |
|---|
| | | public Msg add(@RequestBody RiskEvent riskEventVo) { |
|---|
| | | riskEventService.addOne(riskEventVo, getUser()); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation("/修改") |
|---|
| | | @PostMapping("/mod") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "id",value = "id"), |
|---|
| | | @ApiImplicitParam(name = "riskUnitId",value = "所属安全风险单元id"), |
|---|
| | | @ApiImplicitParam(name = "riskEventName",value = "安全风险事件名称"), |
|---|
| | | }) |
|---|
| | | public Msg mod(@RequestBody RiskEvent riskEventVo) { |
|---|
| | | riskEventService.modOne(riskEventVo, getUser()); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation("/删除") |
|---|
| | | @PostMapping("/del") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "id",value = "id"), |
|---|
| | | }) |
|---|
| | | public Msg mod(@RequestBody JSONObject jsonObject) { |
|---|
| | | Long id = jsonObject.getLong("id"); |
|---|
| | | riskEventService.delOne(id, getUser()); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation("安全风险事件导出") |
|---|
| | | @GetMapping("/export") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "filter.riskEventName",value = "{}"), |
|---|
| | | @ApiImplicitParam(name = "filter.riskUnitName",value = "{}"), |
|---|
| | | }) |
|---|
| | | public Msg infoExport(HttpServletRequest request, HttpServletResponse response) throws Exception { |
|---|
| | | |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | |
|---|
| | | List<RiskEventExportVo> riskEventList = riskEventService.getRiskEventList(request, response); |
|---|
| | | msg.setResult(riskEventList); |
|---|
| | | |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation("/安全风险事件导入") |
|---|
| | | @PostMapping("/import") |
|---|
| | | public Msg infoImport(MultipartFile file) { |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | |
|---|
| | | String filesave =""; |
|---|
| | | try { |
|---|
| | | if (file == null) |
|---|
| | | { |
|---|
| | | msg.setCode("404"); |
|---|
| | | msg.setMessage("上传文件未找到"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | long size = file.getSize(); |
|---|
| | | if(0 == size) |
|---|
| | | { |
|---|
| | | msg.setCode("404"); |
|---|
| | | msg.setMessage("上传文件大小为空"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | if (!FileOptUtils.isDirExists(filePath)) { |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("发生错误或不为目录"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | if (!FileOptUtils.isDirExists(filePath)) { |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("发生错误或不为目录"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | filesave = filePath + getUser().getRealname() + "_" + ".xlsx"; |
|---|
| | | |
|---|
| | | file.transferTo(new File(filesave)); |
|---|
| | | InputStream in = new FileInputStream(filesave); |
|---|
| | | String name = file.getOriginalFilename(); |
|---|
| | | Boolean isExcel2007 = name.substring(name.lastIndexOf(".") + 1).endsWith("xlsx") ? true : false; |
|---|
| | | //riskEventService.importRiskEventData(param, getUser()); |
|---|
| | | excelExportService.importRiskEventExcel(in, getUser().getRealname(), isExcel2007); |
|---|
| | | |
|---|
| | | } catch (BusinessException e) { |
|---|
| | | e.printStackTrace(); |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage(e.getMessage()); |
|---|
| | | } catch (Exception e) { |
|---|
| | | e.printStackTrace(); |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("导入发生错误"); |
|---|
| | | } |
|---|
| | | |
|---|
| | | return msg; |
|---|
| | | // |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Controller; |
|---|
| | | |
|---|
| | | import com.gk.hotwork.Controller.Base.BaseController; |
|---|
| | | import com.gk.hotwork.Domain.RiskMap; |
|---|
| | | import com.gk.hotwork.Domain.Utils.Msg; |
|---|
| | | import com.gk.hotwork.Domain.Vo.RiskMapVO; |
|---|
| | | import com.gk.hotwork.Service.RiskMapService; |
|---|
| | | import io.swagger.annotations.Api; |
|---|
| | | import io.swagger.annotations.ApiImplicitParam; |
|---|
| | | import io.swagger.annotations.ApiImplicitParams; |
|---|
| | | import io.swagger.annotations.ApiOperation; |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.web.bind.annotation.*; |
|---|
| | | |
|---|
| | | import java.util.List; |
|---|
| | | |
|---|
| | | @Api(tags = "安全风险分布图") |
|---|
| | | @RestController |
|---|
| | | @RequestMapping("/riskMap") |
|---|
| | | public class RiskMapController extends BaseController { |
|---|
| | | |
|---|
| | | @Autowired |
|---|
| | | private RiskMapService riskMapService; |
|---|
| | | |
|---|
| | | @ApiOperation("添加一张图") |
|---|
| | | @PostMapping("/add") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "createUid",value = "创建人ID"), |
|---|
| | | @ApiImplicitParam(name = "img",value = "图片路径"), |
|---|
| | | @ApiImplicitParam(name = "descInfo",value = "描述信息") |
|---|
| | | }) |
|---|
| | | public Msg insertOne(@RequestBody RiskMapVO riskMapVO){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | if(getUser()!=null && getUser().getId()!=null && riskMapVO.getCreateUid()!=null && getUser().getId().equals(riskMapVO.getCreateUid())){ |
|---|
| | | String rs = riskMapService.saveOne(riskMapVO); |
|---|
| | | if(rs == null){ |
|---|
| | | msg.setCode("200"); |
|---|
| | | }else { |
|---|
| | | msg.setCode("500"); |
|---|
| | | msg.setMessage(rs); |
|---|
| | | } |
|---|
| | | }else { |
|---|
| | | msg.setCode("301"); |
|---|
| | | msg.setMessage("权限错误"); |
|---|
| | | } |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | @ApiOperation("查找列表") |
|---|
| | | @GetMapping("/list") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "status",value = "状态 0-有效 , 1-删除 ，不传查所有状态",required = false) |
|---|
| | | }) |
|---|
| | | public Msg getList(@RequestParam(required = false) Byte status){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | List<RiskMapVO> voList = riskMapService.listByStatus(status); |
|---|
| | | if(voList == null || voList.size() == 0){ |
|---|
| | | msg.setMessage("未找到数据"); |
|---|
| | | }else { |
|---|
| | | msg.setResult(voList); |
|---|
| | | } |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation("删除图片") |
|---|
| | | @GetMapping("/del") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "id",value = "图片ID"), |
|---|
| | | }) |
|---|
| | | public Msg delete(@RequestParam Long id){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | boolean rs = riskMapService.deleteOne(id,getUser().getId()); |
|---|
| | | if(rs == true){ |
|---|
| | | msg.setCode("200"); |
|---|
| | | }else { |
|---|
| | | msg.setCode("300"); |
|---|
| | | msg.setMessage("删除失败"); |
|---|
| | | } |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Controller; |
|---|
| | | |
|---|
| | | import com.alibaba.fastjson.JSONObject; |
|---|
| | | import com.baomidou.mybatisplus.core.metadata.IPage; |
|---|
| | | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|---|
| | | import com.gk.hotwork.Controller.Base.BaseController; |
|---|
| | | import com.gk.hotwork.Domain.Enum.ErrorCode; |
|---|
| | | import com.gk.hotwork.Domain.Exception.BusinessException; |
|---|
| | | import com.gk.hotwork.Domain.RiskSource; |
|---|
| | | import com.gk.hotwork.Domain.UserInfo; |
|---|
| | | import com.gk.hotwork.Domain.Utils.FileOptUtils; |
|---|
| | | import com.gk.hotwork.Domain.Utils.JsonUtils; |
|---|
| | | import com.gk.hotwork.Domain.Utils.Msg; |
|---|
| | | import com.gk.hotwork.Domain.Vo.RiskEventExportVo; |
|---|
| | | import com.gk.hotwork.Domain.Vo.RiskSourceSearchVo; |
|---|
| | | import com.gk.hotwork.Domain.Vo.RiskSourceVo; |
|---|
| | | import com.gk.hotwork.Domain.dto.RiskSourceDto; |
|---|
| | | import com.gk.hotwork.Domain.dto.RiskSourceUpdateDto; |
|---|
| | | import com.gk.hotwork.Service.ExcelExportService; |
|---|
| | | import com.gk.hotwork.Service.RiskSourceService; |
|---|
| | | import io.swagger.annotations.Api; |
|---|
| | | import io.swagger.annotations.ApiImplicitParam; |
|---|
| | | import io.swagger.annotations.ApiImplicitParams; |
|---|
| | | import io.swagger.annotations.ApiOperation; |
|---|
| | | import org.springframework.beans.BeanUtils; |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.web.bind.annotation.*; |
|---|
| | | import org.springframework.web.multipart.MultipartFile; |
|---|
| | | |
|---|
| | | import javax.servlet.http.HttpServletRequest; |
|---|
| | | import javax.servlet.http.HttpServletResponse; |
|---|
| | | import java.io.File; |
|---|
| | | import java.io.FileInputStream; |
|---|
| | | import java.io.InputStream; |
|---|
| | | import java.util.ArrayList; |
|---|
| | | import java.util.HashMap; |
|---|
| | | import java.util.List; |
|---|
| | | import java.util.Map; |
|---|
| | | |
|---|
| | | import static com.gk.hotwork.Domain.Utils.Properties.filePath; |
|---|
| | | |
|---|
| | | @Api(tags = "风险源管理") |
|---|
| | | @RestController |
|---|
| | | @RequestMapping("/riskSource") |
|---|
| | | public class RiskSourceController extends BaseController { |
|---|
| | | |
|---|
| | | @Autowired |
|---|
| | | private RiskSourceService riskSourceService; |
|---|
| | | |
|---|
| | | @Autowired |
|---|
| | | private ExcelExportService excelExportService; |
|---|
| | | |
|---|
| | | @ApiOperation("新增风险源") |
|---|
| | | @PostMapping("/new") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "name",value = "风险源名称"), |
|---|
| | | @ApiImplicitParam(name = "type",value = "风险源类型，1-设施设备，2-作业活动"), |
|---|
| | | @ApiImplicitParam(name = "level",value = "风险等级，1-低风险，2-一般风险，3-较大风险，4-重大风险"), |
|---|
| | | @ApiImplicitParam(name = "accidentDesc",value = "可能导致的事故描述"), |
|---|
| | | @ApiImplicitParam(name = "location",value = "区域位置"), |
|---|
| | | @ApiImplicitParam(name = "depId",value = "所属部门ID"), |
|---|
| | | |
|---|
| | | }) |
|---|
| | | public Msg createNew(@RequestBody RiskSourceDto riskSourceDto){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | UserInfo userInfo = getUser(); |
|---|
| | | |
|---|
| | | if(userInfo!=null && userInfo.getId() > 0){ |
|---|
| | | riskSourceDto.setCreateUid(userInfo.getId()); |
|---|
| | | riskSourceDto.setCreateUname(userInfo.getRealname()); |
|---|
| | | riskSourceDto.setEditUid(userInfo.getId()); |
|---|
| | | riskSourceDto.setEditUname(userInfo.getRealname()); |
|---|
| | | |
|---|
| | | if(riskSourceService.insertOne(riskSourceDto)){ |
|---|
| | | msg.setCode("200"); |
|---|
| | | }else { |
|---|
| | | msg.setCode(ErrorCode.ERROR_60001.getCode()); |
|---|
| | | msg.setMessage("接口调用错误"); |
|---|
| | | } |
|---|
| | | }else { |
|---|
| | | msg.setMessage("权限错误"); |
|---|
| | | msg.setCode(ErrorCode.ERROR_20001.getCode()); |
|---|
| | | } |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation("ID查找风险源") |
|---|
| | | @GetMapping("/find/id") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "id",value = "风险源id"), |
|---|
| | | |
|---|
| | | }) |
|---|
| | | public Msg getOneById(@RequestParam Long id){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | RiskSource riskSource = riskSourceService.findById(id); |
|---|
| | | if(riskSource!=null && riskSource.getId() > 0){ |
|---|
| | | RiskSourceDto dto = new RiskSourceDto(); |
|---|
| | | BeanUtils.copyProperties(riskSource,dto); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setResult(dto); |
|---|
| | | }else { |
|---|
| | | msg.setCode(ErrorCode.ERROR_50001.getCode()); |
|---|
| | | msg.setMessage("未找到数据"); |
|---|
| | | } |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation("ID查找风险源") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "name",value = "风险源名称"), |
|---|
| | | @ApiImplicitParam(name = "type",value = "风险源类型，1-设施设备，2-作业活动"), |
|---|
| | | @ApiImplicitParam(name = "level",value = "风险等级，1-低风险，2-一般风险，3-较大风险，4-重大风险"), |
|---|
| | | @ApiImplicitParam(name = "status",value = "状态，1-有效，2-无效，3-删除"), |
|---|
| | | @ApiImplicitParam(name = "location",value = "区域位置"), |
|---|
| | | @ApiImplicitParam(name = "depId",value = "所属部门ID"), |
|---|
| | | @ApiImplicitParam(name = "depName",value = "所属部门名称"), |
|---|
| | | @ApiImplicitParam(name = "startTime",value = "查询条件-创建时间-开始"), |
|---|
| | | @ApiImplicitParam(name = "endTime",value = "查询条件-创建时间-结束"), |
|---|
| | | @ApiImplicitParam(name = "pageIndex",value = "查询的页数"), |
|---|
| | | @ApiImplicitParam(name = "pageSize",value = "分页条目数") |
|---|
| | | }) |
|---|
| | | // @PostMapping("/find/list") |
|---|
| | | @RequestMapping(value = "/find/list",method = RequestMethod.POST) |
|---|
| | | public Msg getListByConditions(@RequestBody RiskSourceSearchVo searchVo){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | IPage<RiskSource> page = riskSourceService.findRiskSourceListByConditions(new Page<>(searchVo.getPageIndex(),searchVo.getPageSize()),searchVo); |
|---|
| | | if(page!=null && page.getRecords()!=null && page.getRecords().size()>0){ |
|---|
| | | List<RiskSourceDto> dtoList = new ArrayList<>(); |
|---|
| | | page.getRecords().forEach(riskSource -> { |
|---|
| | | RiskSourceDto dto = new RiskSourceDto(); |
|---|
| | | BeanUtils.copyProperties(riskSource,dto); |
|---|
| | | dtoList.add(dto); |
|---|
| | | }); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setResult(dtoList); |
|---|
| | | Map<String,Object> pageInfo = new HashMap<>(); |
|---|
| | | pageInfo.put("page",page.getPages()); |
|---|
| | | pageInfo.put("pageSize",searchVo.getPageSize()); |
|---|
| | | pageInfo.put("totalCount",page.getTotal()); |
|---|
| | | msg.setMessage(JsonUtils.toJson(pageInfo)); |
|---|
| | | }else { |
|---|
| | | msg.setCode(ErrorCode.ERROR_50001.getCode()); |
|---|
| | | msg.setMessage("未找到数据"); |
|---|
| | | } |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | @ApiOperation("更新风险源信息") |
|---|
| | | @PostMapping("/update/one") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "id",value = "风险源ID",required = true), |
|---|
| | | @ApiImplicitParam(name = "name",value = "风险源名称，不超过15个字符"), |
|---|
| | | @ApiImplicitParam(name = "type",value = "风险源类型，1-设施设备，2-作业活动"), |
|---|
| | | @ApiImplicitParam(name = "level",value = "风险等级，1-低风险，2-一般风险，3-较大风险，4-重大风险"), |
|---|
| | | @ApiImplicitParam(name = "location",value = "区域位置，不超过30个字符"), |
|---|
| | | @ApiImplicitParam(name = "depId",value = "所属部门ID"), |
|---|
| | | @ApiImplicitParam(name = "accidentDesc",value = "可能导致的事故描述，不超过50个字符") |
|---|
| | | |
|---|
| | | }) |
|---|
| | | public Msg updateOne(@RequestBody RiskSourceUpdateDto riskSourceUpdateDto){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | riskSourceUpdateDto.setEditUid(getUser().getId()); |
|---|
| | | if(riskSourceService.updateById(riskSourceUpdateDto)){ |
|---|
| | | msg.setCode("200"); |
|---|
| | | }else { |
|---|
| | | msg.setCode(ErrorCode.ERROR_50002.getCode()); |
|---|
| | | msg.setMessage("更新出错"); |
|---|
| | | } |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | @ApiOperation("删除") |
|---|
| | | @PostMapping("/del/one") |
|---|
| | | public Msg delOne(@RequestBody JSONObject json) { |
|---|
| | | Long id = json.getLong("id"); |
|---|
| | | riskSourceService.delOne(id, getUser()); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation("风险源导出") |
|---|
| | | @GetMapping("/export") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "filter.riskEventName",value = "{}"), |
|---|
| | | @ApiImplicitParam(name = "filter.riskUnitName",value = "{}"), |
|---|
| | | }) |
|---|
| | | public Msg RiskSourceExport(HttpServletRequest request, HttpServletResponse response) throws Exception { |
|---|
| | | |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | |
|---|
| | | List<RiskSourceVo> riskSourceExport = riskSourceService.getRiskSourceExport(request, response); |
|---|
| | | msg.setResult(riskSourceExport); |
|---|
| | | |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation("/安全风险事件导入") |
|---|
| | | @PostMapping("/import") |
|---|
| | | public Msg infoImport(MultipartFile file) { |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | |
|---|
| | | String filesave =""; |
|---|
| | | try { |
|---|
| | | if (file == null) |
|---|
| | | { |
|---|
| | | msg.setCode("404"); |
|---|
| | | msg.setMessage("上传文件未找到"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | long size = file.getSize(); |
|---|
| | | if(0 == size) |
|---|
| | | { |
|---|
| | | msg.setCode("404"); |
|---|
| | | msg.setMessage("上传文件大小为空"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | if (!FileOptUtils.isDirExists(filePath)) { |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("发生错误或不为目录"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | if (!FileOptUtils.isDirExists(filePath)) { |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("发生错误或不为目录"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | filesave = filePath + getUser().getRealname() + "_" + ".xlsx"; |
|---|
| | | |
|---|
| | | file.transferTo(new File(filesave)); |
|---|
| | | InputStream in = new FileInputStream(filesave); |
|---|
| | | String name = file.getOriginalFilename(); |
|---|
| | | Boolean isExcel2007 = name.substring(name.lastIndexOf(".") + 1).endsWith("xlsx") ? true : false; |
|---|
| | | //riskEventService.importRiskEventData(param, getUser()); |
|---|
| | | excelExportService.importRiskSourceExcel(in, getUser().getRealname(), isExcel2007); |
|---|
| | | |
|---|
| | | } catch (BusinessException e) { |
|---|
| | | e.printStackTrace(); |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage(e.getMessage()); |
|---|
| | | } catch (Exception e) { |
|---|
| | | e.printStackTrace(); |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("导入发生错误"); |
|---|
| | | } |
|---|
| | | |
|---|
| | | return msg; |
|---|
| | | // |
|---|
| | | } |
|---|
| | | |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Controller; |
|---|
| | | |
|---|
| | | import com.alibaba.fastjson.JSONArray; |
|---|
| | | import com.alibaba.fastjson.JSONObject; |
|---|
| | | import com.gk.hotwork.Domain.RoleInfo; |
|---|
| | | import com.gk.hotwork.Domain.RolePermissionsInfo; |
|---|
| | | import com.gk.hotwork.Domain.Utils.*; |
|---|
| | | import com.gk.hotwork.Domain.Vo.Menu; |
|---|
| | | import com.gk.hotwork.Service.*; |
|---|
| | | import io.swagger.annotations.*; |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.web.bind.annotation.*; |
|---|
| | | |
|---|
| | | import java.util.*; |
|---|
| | | |
|---|
| | | @Api(tags = "角色管理数据接口") |
|---|
| | | @RestController |
|---|
| | | public class RoleController { |
|---|
| | | |
|---|
| | | @Autowired |
|---|
| | | UserService userService; |
|---|
| | | @Autowired |
|---|
| | | RoleService roleService; |
|---|
| | | @Autowired |
|---|
| | | UserRolesService userRolesService; |
|---|
| | | @Autowired |
|---|
| | | RolePermissionsService rolePermissionsService; |
|---|
| | | @Autowired |
|---|
| | | ExcelExportService excelExportService; |
|---|
| | | |
|---|
| | | @GetMapping("/role") |
|---|
| | | @ApiOperation(value = "获取角色数据",response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "name",value = "角色名"), |
|---|
| | | }) |
|---|
| | | public Msg getRoleInfo(String name){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | List<RoleInfo> roleInfos = roleService.selectList(name); |
|---|
| | | msg.setResult(roleInfos); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @GetMapping("/rolepermissions") |
|---|
| | | @ApiOperation(value = "获取角色菜单数据",response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "roleId",value = "角色id"), |
|---|
| | | }) |
|---|
| | | public Msg getRolePermissions(String roleId){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | List<Menu> roleInfos = rolePermissionsService.selectMenuList(roleId); |
|---|
| | | msg.setResult(roleInfos); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/addrole") |
|---|
| | | @ApiOperation(value = "添加角色数据",response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "name",value = "角色名",required = true), |
|---|
| | | @ApiImplicitParam(name = "operator",value = "操作人"), |
|---|
| | | @ApiImplicitParam(name = "btnaccess",value = "按钮权限"), |
|---|
| | | }) |
|---|
| | | public Msg addRoleInfo(@RequestBody JSONObject jsonObject){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | String name = jsonObject.getString("name"); |
|---|
| | | String operator = jsonObject.getString("operator"); |
|---|
| | | String btnaccess = jsonObject.getString("btnaccess"); |
|---|
| | | RoleInfo roleInfo = new RoleInfo(); |
|---|
| | | roleInfo.setName(name); |
|---|
| | | RoleInfo roleInfoExist = roleService.selectRoleByName(roleInfo); |
|---|
| | | if (roleInfoExist != null){ |
|---|
| | | msg.setCode("500"); |
|---|
| | | msg.setMessage("角色名重复"); |
|---|
| | | return msg; |
|---|
| | | }else { |
|---|
| | | roleInfo.setBtnaccess(btnaccess); |
|---|
| | | roleInfo.setCreatedby(operator); |
|---|
| | | roleInfo.setCreateddate(new Date()); |
|---|
| | | roleInfo.setLastmodifiedby(operator); |
|---|
| | | roleInfo.setLastmodifieddate(new Date()); |
|---|
| | | roleInfo.setIsdel((byte)0); |
|---|
| | | roleService.save(roleInfo); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/putrole") |
|---|
| | | @ApiOperation(value = "修改角色数据",response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "id",value = "角色id",required = true), |
|---|
| | | @ApiImplicitParam(name = "name",value = "角色名",required = true), |
|---|
| | | @ApiImplicitParam(name = "btnaccess",value = "按钮权限"), |
|---|
| | | @ApiImplicitParam(name = "operator",value = "操作人"), |
|---|
| | | }) |
|---|
| | | public Msg putRoleInfo(@RequestBody JSONObject jsonObject){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | String name = jsonObject.getString("name"); |
|---|
| | | String operator = jsonObject.getString("operator"); |
|---|
| | | String btnaccess = jsonObject.getString("btnaccess"); |
|---|
| | | Long id = jsonObject.getLong("id"); |
|---|
| | | List<RoleInfo> roleInfoExist = roleService.selectExistRole(id,name); |
|---|
| | | if (roleInfoExist.size() > 0){ |
|---|
| | | msg.setCode("500"); |
|---|
| | | msg.setMessage("角色名重复"); |
|---|
| | | return msg; |
|---|
| | | }else { |
|---|
| | | RoleInfo roleInfo = new RoleInfo(); |
|---|
| | | roleInfo.setId(id); |
|---|
| | | roleInfo.setName(name); |
|---|
| | | roleInfo.setBtnaccess(btnaccess); |
|---|
| | | roleInfo.setLastmodifiedby(operator); |
|---|
| | | roleInfo.setLastmodifieddate(new Date()); |
|---|
| | | roleService.updateById(roleInfo); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/rolepermissions") |
|---|
| | | @ApiOperation(value = "获取角色菜单数据",response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "id",value = "角色id"), |
|---|
| | | }) |
|---|
| | | public Msg putRolePermissions(@ApiParam(value = "permissionIds,id") |
|---|
| | | @RequestBody JSONObject jsonObject){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | JSONArray permissionId = jsonObject.getJSONArray("permissionIds"); |
|---|
| | | Long roleid = jsonObject.getLong("id"); |
|---|
| | | rolePermissionsService.delRolePermissionByRoleId(roleid); |
|---|
| | | for (int i = 0; i < permissionId.size(); i++) { |
|---|
| | | RolePermissionsInfo rolePermissionsInfo = new RolePermissionsInfo(); |
|---|
| | | rolePermissionsInfo.setRoleid(roleid); |
|---|
| | | rolePermissionsInfo.setPermissionid(Long.parseLong(permissionId.get(i).toString())); |
|---|
| | | rolePermissionsService.save(rolePermissionsInfo); |
|---|
| | | } |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/delrole") |
|---|
| | | @ApiOperation(value = "删除角色数据", response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(paramType="query",name = "id",value = "id",required = true), |
|---|
| | | @ApiImplicitParam(paramType="body",name = "operator",value = "更新人"), |
|---|
| | | |
|---|
| | | }) |
|---|
| | | public Msg delRoleInfo(@ApiParam(value = "id,operator") |
|---|
| | | @RequestBody JSONObject jsonObject){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | Long id = jsonObject.getLong("id"); |
|---|
| | | if (id == 1 || id == 2 || id == 3){ |
|---|
| | | msg.setCode("999"); |
|---|
| | | msg.setMessage("内置角色不允许删除"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | RoleInfo roleInfo = new RoleInfo(); |
|---|
| | | roleInfo.setId(jsonObject.getLong("id")); |
|---|
| | | roleInfo.setLastmodifiedby(jsonObject.getString("operator")); |
|---|
| | | roleInfo.setLastmodifieddate(new Date()); |
|---|
| | | roleInfo.setIsdel((byte)1); |
|---|
| | | roleService.updateById(roleInfo); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Controller; |
|---|
| | | |
|---|
| | | import com.alibaba.fastjson.JSONObject; |
|---|
| | | import com.baomidou.mybatisplus.core.metadata.IPage; |
|---|
| | | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|---|
| | | import com.gk.hotwork.Controller.Base.BaseController; |
|---|
| | | import com.gk.hotwork.Domain.SafetyInspectionItem; |
|---|
| | | import com.gk.hotwork.Domain.Utils.FilterObject; |
|---|
| | | import com.gk.hotwork.Domain.Utils.Msg; |
|---|
| | | import com.gk.hotwork.Service.SafetyInspectionItemService; |
|---|
| | | import io.swagger.annotations.Api; |
|---|
| | | import io.swagger.annotations.ApiImplicitParam; |
|---|
| | | import io.swagger.annotations.ApiImplicitParams; |
|---|
| | | import io.swagger.annotations.ApiOperation; |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.web.bind.annotation.PostMapping; |
|---|
| | | import org.springframework.web.bind.annotation.RequestBody; |
|---|
| | | import org.springframework.web.bind.annotation.RequestMapping; |
|---|
| | | import org.springframework.web.bind.annotation.RestController; |
|---|
| | | |
|---|
| | | import java.util.List; |
|---|
| | | |
|---|
| | | |
|---|
| | | @Api(tags = "安全生产标准化_检查清单检查项") |
|---|
| | | @RestController |
|---|
| | | @RequestMapping("/safetyInspectionItem") |
|---|
| | | public class SafetyInspectionItemController extends BaseController { |
|---|
| | | |
|---|
| | | @Autowired |
|---|
| | | private SafetyInspectionItemService safetyInspectionItemService; |
|---|
| | | |
|---|
| | | @ApiOperation("根据B级要素id获取分页数据") |
|---|
| | | @PostMapping("/page") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "pageIndex",value = "当前页码"), |
|---|
| | | @ApiImplicitParam(name = "pageSize",value = "每页行数"), |
|---|
| | | @ApiImplicitParam(name = "element_b",value = "B要素的id"), |
|---|
| | | }) |
|---|
| | | public Msg selectPage(@RequestBody FilterObject filterObject) { |
|---|
| | | Integer pageIndex = filterObject.getPageIndex(); |
|---|
| | | Integer pageSize = filterObject.getPageSize(); |
|---|
| | | IPage page = safetyInspectionItemService.selectPage(new Page<>(pageIndex, pageSize), filterObject.getFilter(), getUser()); |
|---|
| | | return success(page); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation("/A级要素下面的检查项") |
|---|
| | | @PostMapping("/infoElementA") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "id",value = "id"), |
|---|
| | | }) |
|---|
| | | public Msg infoElementA(@RequestBody JSONObject jsonObject) { |
|---|
| | | Long id = jsonObject.getLong("id"); |
|---|
| | | List<SafetyInspectionItem> list = safetyInspectionItemService.infoElementA(id, getUser()); |
|---|
| | | return success(list); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | @ApiOperation("/新增") |
|---|
| | | @PostMapping("/add") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "elementA",value = "A级要素id"), |
|---|
| | | @ApiImplicitParam(name = "elementB",value = "B级要素id"), |
|---|
| | | @ApiImplicitParam(name = "standardization_requirements",value = "标准化要求"), |
|---|
| | | @ApiImplicitParam(name = "enterprise_standard",value = "企业达标标准"), |
|---|
| | | @ApiImplicitParam(name = "review_method",value = "评审方法"), |
|---|
| | | @ApiImplicitParam(name = "veto",value = "否决项"), |
|---|
| | | @ApiImplicitParam(name = "deductionList",value = "扣分项集合"), |
|---|
| | | }) |
|---|
| | | public Msg add(@RequestBody SafetyInspectionItem param) { |
|---|
| | | safetyInspectionItemService.addOne(param, getUser()); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation("/修改") |
|---|
| | | @PostMapping("/mod") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "id",value = "id"), |
|---|
| | | @ApiImplicitParam(name = "elementA",value = "A级要素id"), |
|---|
| | | @ApiImplicitParam(name = "elementB",value = "B级要素id"), |
|---|
| | | @ApiImplicitParam(name = "standardization_requirements",value = "标准化要求"), |
|---|
| | | @ApiImplicitParam(name = "enterprise_standard",value = "企业达标标准"), |
|---|
| | | @ApiImplicitParam(name = "review_method",value = "评审方法"), |
|---|
| | | @ApiImplicitParam(name = "veto",value = "否决项"), |
|---|
| | | @ApiImplicitParam(name = "deductionList",value = "扣分项集合"), |
|---|
| | | }) |
|---|
| | | public Msg mod(@RequestBody SafetyInspectionItem param) { |
|---|
| | | safetyInspectionItemService.modOne(param, getUser()); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation("/删除") |
|---|
| | | @PostMapping("/del") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "id",value = "id"), |
|---|
| | | }) |
|---|
| | | public Msg mod(@RequestBody JSONObject jsonObject) { |
|---|
| | | Long id = jsonObject.getLong("id"); |
|---|
| | | safetyInspectionItemService.delOne(id, getUser()); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | @ApiOperation("/详情") |
|---|
| | | @PostMapping("/info") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "id",value = "id"), |
|---|
| | | }) |
|---|
| | | public Msg info(@RequestBody JSONObject jsonObject) { |
|---|
| | | Long id = jsonObject.getLong("id"); |
|---|
| | | SafetyInspectionItem safetyInspectionItem = safetyInspectionItemService.info(id, getUser()); |
|---|
| | | return success(safetyInspectionItem); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Controller; |
|---|
| | | |
|---|
| | | import com.alibaba.fastjson.JSONObject; |
|---|
| | | import com.baomidou.mybatisplus.core.metadata.IPage; |
|---|
| | | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|---|
| | | import com.gk.hotwork.Controller.Base.BaseController; |
|---|
| | | import com.gk.hotwork.Domain.SafetySelfInspection; |
|---|
| | | import com.gk.hotwork.Domain.SafetySelfInspectionItem; |
|---|
| | | import com.gk.hotwork.Domain.Utils.FilterObject; |
|---|
| | | import com.gk.hotwork.Domain.Utils.Msg; |
|---|
| | | import com.gk.hotwork.Service.SafetySelfInspectionService; |
|---|
| | | import io.swagger.annotations.Api; |
|---|
| | | import io.swagger.annotations.ApiImplicitParam; |
|---|
| | | import io.swagger.annotations.ApiImplicitParams; |
|---|
| | | import io.swagger.annotations.ApiOperation; |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.web.bind.annotation.PostMapping; |
|---|
| | | import org.springframework.web.bind.annotation.RequestBody; |
|---|
| | | import org.springframework.web.bind.annotation.RequestMapping; |
|---|
| | | import org.springframework.web.bind.annotation.RestController; |
|---|
| | | |
|---|
| | | |
|---|
| | | @Api(tags = "安全生产标准化_自查清单") |
|---|
| | | @RestController |
|---|
| | | @RequestMapping("/safetySelfInspection") |
|---|
| | | public class SafetySelfInspectionController extends BaseController { |
|---|
| | | |
|---|
| | | @Autowired |
|---|
| | | private SafetySelfInspectionService safetySelfInspectionService; |
|---|
| | | |
|---|
| | | @ApiOperation("分页") |
|---|
| | | @PostMapping("/page") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "pageIndex",value = "当前页码"), |
|---|
| | | @ApiImplicitParam(name = "pageSize",value = "每页行数"), |
|---|
| | | @ApiImplicitParam(name = "inspectionName",value = "自查清单名称"), |
|---|
| | | @ApiImplicitParam(name = "inspectorName",value = "检查人名称"), |
|---|
| | | @ApiImplicitParam(name = "checkedCompanyId",value = "被检查公司id"), |
|---|
| | | @ApiImplicitParam(name = "inspectionStartTime",value = "开始时间"), |
|---|
| | | @ApiImplicitParam(name = "inspectionEndTime",value = "结束时间"), |
|---|
| | | @ApiImplicitParam(name = "status",value = "状态"), |
|---|
| | | }) |
|---|
| | | public Msg selectPage(@RequestBody FilterObject filterObject) { |
|---|
| | | Integer pageIndex = filterObject.getPageIndex(); |
|---|
| | | Integer pageSize = filterObject.getPageSize(); |
|---|
| | | IPage page = safetySelfInspectionService.selectPage(new Page<>(pageIndex, pageSize), filterObject.getFilter(), getUser()); |
|---|
| | | return success(page); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation("/自查清单详情") |
|---|
| | | @PostMapping("/info") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "id",value = "自查清单id"), |
|---|
| | | @ApiImplicitParam(name = "unqualified",value = "不合格筛选"), |
|---|
| | | }) |
|---|
| | | public Msg info(@RequestBody JSONObject jsonObject) { |
|---|
| | | Long id = jsonObject.getLong("id"); |
|---|
| | | String unqualified = jsonObject.getString("unqualified"); |
|---|
| | | SafetySelfInspection safetySelfInspection= safetySelfInspectionService.infoOne(id,unqualified,getUser()); |
|---|
| | | return success(safetySelfInspection); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation("/自查清单结单") |
|---|
| | | @PostMapping("/finish") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "id",value = "自查清单id"), |
|---|
| | | }) |
|---|
| | | public Msg finish(@RequestBody JSONObject jsonObject) { |
|---|
| | | Long id = jsonObject.getLong("id"); |
|---|
| | | safetySelfInspectionService.finish(id, getUser()); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | @ApiOperation("/自查清单详情_检查项详情") |
|---|
| | | @PostMapping("/itemInfo") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "id",value = "自查清单检查项id"), |
|---|
| | | }) |
|---|
| | | public Msg itemInfo(@RequestBody JSONObject jsonObject) { |
|---|
| | | Long id = jsonObject.getLong("id"); |
|---|
| | | SafetySelfInspectionItem safetySelfInspectionItem= safetySelfInspectionService.itemInfoOne(id, getUser()); |
|---|
| | | return success(safetySelfInspectionItem); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | @ApiOperation("/自查清单详情_检查项评审") |
|---|
| | | @PostMapping("/modItemInfo") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "safetyInspectionItemResult",value = "评审结果"), |
|---|
| | | @ApiImplicitParam(name = "selfDeductionList",value = "扣分项集合"), |
|---|
| | | }) |
|---|
| | | public Msg modItemInfo(@RequestBody SafetySelfInspectionItem param) { |
|---|
| | | safetySelfInspectionService.modItemInfo(param, getUser()); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | @ApiOperation("/新增") |
|---|
| | | @PostMapping("/add") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "inspectionName",value = "自查清单名称"), |
|---|
| | | @ApiImplicitParam(name = "inspector",value = "检查人id"), |
|---|
| | | @ApiImplicitParam(name = "checkedCompanyId",value = "被检查公司id"), |
|---|
| | | @ApiImplicitParam(name = "checkedCompanyName",value = "被检查公司"), |
|---|
| | | @ApiImplicitParam(name = "inspectionTime",value = "检查时间"), |
|---|
| | | @ApiImplicitParam(name = "status",value = "状态"), |
|---|
| | | @ApiImplicitParam(name = "itemList",value = "检查项集合"), |
|---|
| | | }) |
|---|
| | | public Msg add(@RequestBody SafetySelfInspection param) { |
|---|
| | | safetySelfInspectionService.addOne(param, getUser()); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation("/修改") |
|---|
| | | @PostMapping("/mod") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "id",value = "id"), |
|---|
| | | @ApiImplicitParam(name = "inspectionName",value = "自查清单名称"), |
|---|
| | | @ApiImplicitParam(name = "inspector",value = "检查人id"), |
|---|
| | | @ApiImplicitParam(name = "checkedCompanyId",value = "被检查公司id"), |
|---|
| | | @ApiImplicitParam(name = "checkedCompanyName",value = "被检查公司"), |
|---|
| | | @ApiImplicitParam(name = "inspectionTime",value = "检查时间"), |
|---|
| | | @ApiImplicitParam(name = "status",value = "状态"), |
|---|
| | | @ApiImplicitParam(name = "itemList",value = "检查项集合"), |
|---|
| | | }) |
|---|
| | | public Msg mod(@RequestBody SafetySelfInspection param) { |
|---|
| | | safetySelfInspectionService.modOne(param, getUser()); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation("/删除") |
|---|
| | | @PostMapping("/del") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "id",value = "id"), |
|---|
| | | }) |
|---|
| | | public Msg mod(@RequestBody JSONObject jsonObject) { |
|---|
| | | Long id = jsonObject.getLong("id"); |
|---|
| | | safetySelfInspectionService.delOne(id, getUser()); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Controller; |
|---|
| | | |
|---|
| | | import cn.hutool.core.date.DateUtil; |
|---|
| | | import com.alibaba.fastjson.JSONObject; |
|---|
| | | import com.gk.hotwork.Controller.Base.BaseController; |
|---|
| | | import com.gk.hotwork.Domain.*; |
|---|
| | | import com.gk.hotwork.Domain.Enum.ErrorCode; |
|---|
| | | import com.gk.hotwork.Domain.Enum.Etype; |
|---|
| | | import com.gk.hotwork.Domain.Exception.BusinessException; |
|---|
| | | import com.gk.hotwork.Domain.Utils.BeanUtils; |
|---|
| | | import com.gk.hotwork.Domain.Utils.Msg; |
|---|
| | | import com.gk.hotwork.Domain.Utils.PageInfo; |
|---|
| | | import com.gk.hotwork.Domain.Utils.StringUtils; |
|---|
| | | import com.gk.hotwork.Domain.Utils.UploadUtil; |
|---|
| | | import com.gk.hotwork.Domain.Vo.TaskCheck; |
|---|
| | | import com.gk.hotwork.Domain.Vo.TaskEnclosureVo; |
|---|
| | | import com.gk.hotwork.Domain.Vo.TaskVo; |
|---|
| | | import com.gk.hotwork.Domain.Vo.TaskWorkerVo; |
|---|
| | | import com.gk.hotwork.Scheduls.warning.Warning; |
|---|
| | | import com.gk.hotwork.Service.*; |
|---|
| | | import com.spire.doc.interfaces.IField; |
|---|
| | | import io.swagger.annotations.Api; |
|---|
| | | |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.beans.factory.annotation.Value; |
|---|
| | | import org.springframework.validation.BindingResult; |
|---|
| | | import org.springframework.validation.FieldError; |
|---|
| | | import org.springframework.validation.annotation.Validated; |
|---|
| | | import org.springframework.web.bind.annotation.*; |
|---|
| | | |
|---|
| | | import java.util.*; |
|---|
| | | import java.util.stream.Collectors; |
|---|
| | | import io.swagger.annotations.ApiImplicitParam; |
|---|
| | | import io.swagger.annotations.ApiImplicitParams; |
|---|
| | | import io.swagger.annotations.ApiOperation; |
|---|
| | | import org.springframework.util.MultiValueMap; |
|---|
| | | import org.springframework.web.bind.annotation.PostMapping; |
|---|
| | | import org.springframework.web.bind.annotation.RequestMapping; |
|---|
| | | import org.springframework.web.bind.annotation.ResponseBody; |
|---|
| | | import org.springframework.web.bind.annotation.RestController; |
|---|
| | | import org.springframework.web.multipart.MultipartFile; |
|---|
| | | import org.springframework.web.multipart.support.StandardMultipartHttpServletRequest; |
|---|
| | | import sun.security.krb5.internal.crypto.EType; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * @author : jingjy |
|---|
| | | * @date : 2021/8/19 16:50 |
|---|
| | | */ |
|---|
| | | @Api(tags = "任务流程数据接口") |
|---|
| | | @RestController |
|---|
| | | @RequestMapping("/task") |
|---|
| | | public class TaskController extends BaseController { |
|---|
| | | @Autowired |
|---|
| | | private TaskService taskService; |
|---|
| | | @Autowired |
|---|
| | | private TaskAnalysisService taskAnalysisService; |
|---|
| | | @Autowired |
|---|
| | | private TaskSecurityService taskSecurityService; |
|---|
| | | @Autowired |
|---|
| | | private TaskWorkerService taskWorkerService; |
|---|
| | | @Autowired |
|---|
| | | private TaskLogService taskLogService; |
|---|
| | | @Autowired |
|---|
| | | private UserService userService; |
|---|
| | | @Autowired |
|---|
| | | private DepartmentService departmentService; |
|---|
| | | @Autowired |
|---|
| | | private InvolveDepService involveDepService; |
|---|
| | | @Autowired |
|---|
| | | private TaskInvolveDepService taskInvolveDepService; |
|---|
| | | @Autowired |
|---|
| | | private TaskEquipmentService taskEquipmentService; |
|---|
| | | @Autowired |
|---|
| | | private TaskEnclosureService taskEnclosureService; |
|---|
| | | @Autowired |
|---|
| | | private TaskRiskService taskRiskService; |
|---|
| | | @Autowired |
|---|
| | | private EquipmentService equipmentService; |
|---|
| | | @Autowired |
|---|
| | | private TaskEquipmentBindService taskEquipmentBindService; |
|---|
| | | @Autowired |
|---|
| | | private SubTaskService subTaskService; |
|---|
| | | @Autowired |
|---|
| | | CompanyService companyService; |
|---|
| | | @Autowired |
|---|
| | | private TaskReviewService taskReviewService; |
|---|
| | | @Autowired |
|---|
| | | private WarningService warningService; |
|---|
| | | |
|---|
| | | @Value("${workCode}") |
|---|
| | | private String workCode; |
|---|
| | | @Value("${taskPath}") |
|---|
| | | private String taskPath; |
|---|
| | | @Value("${taskUrl}") |
|---|
| | | private String taskUrl; |
|---|
| | | @Value("${task}") |
|---|
| | | private String task; |
|---|
| | | |
|---|
| | | @ApiOperation(value = "获取任务信息",notes = "获取任务信息") |
|---|
| | | @GetMapping("/info") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "pageIndex",value = "当前分页"), |
|---|
| | | @ApiImplicitParam(name = "pageSize",value = "分页每页数量"), |
|---|
| | | @ApiImplicitParam(name = "sort",value = "排序列名"), |
|---|
| | | @ApiImplicitParam(name = "order",value = "排序方式（正序反序）"), |
|---|
| | | @ApiImplicitParam(name = "starttime",value = "开始时间"), |
|---|
| | | @ApiImplicitParam(name = "endtime",value = "结束时间"), |
|---|
| | | @ApiImplicitParam(name = "company",value = "单位"), |
|---|
| | | }) |
|---|
| | | public Msg getTaskInfos(@RequestParam(value = "code", required = false) String code, |
|---|
| | | @RequestParam(value = "level", required = false) String level, |
|---|
| | | @RequestParam(value = "status", required = false) Byte status, |
|---|
| | | String company, String starttime,String endtime, Byte flag, |
|---|
| | | String type, |
|---|
| | | @RequestParam(defaultValue = "0") Integer pageIndex, |
|---|
| | | @RequestParam(defaultValue = "10") Integer pageSize, |
|---|
| | | String sort, String order){ |
|---|
| | | |
|---|
| | | PageInfo pageInfo = new PageInfo(pageIndex, pageSize,sort,order); |
|---|
| | | |
|---|
| | | Map<String, Object> condition = new HashMap<>(4); |
|---|
| | | if (StringUtils.isNotBlank(code)) { |
|---|
| | | condition.put("code", code); |
|---|
| | | } |
|---|
| | | if (StringUtils.isNotBlank(level)) { |
|---|
| | | condition.put("level", level); |
|---|
| | | } |
|---|
| | | if (null != status){ |
|---|
| | | condition.put("status", status); |
|---|
| | | } |
|---|
| | | if (null != flag){ |
|---|
| | | condition.put("flag", flag); |
|---|
| | | } |
|---|
| | | if (StringUtils.isNotBlank(company)) { |
|---|
| | | condition.put("company", company); |
|---|
| | | } |
|---|
| | | if (StringUtils.isNotBlank(type)) { |
|---|
| | | condition.put("type", type); |
|---|
| | | } |
|---|
| | | if (StringUtils.isNotBlank(starttime)) { |
|---|
| | | condition.put("starttime", starttime); |
|---|
| | | } |
|---|
| | | if (StringUtils.isNotBlank(endtime)) { |
|---|
| | | condition.put("endtime", endtime); |
|---|
| | | } |
|---|
| | | pageInfo.setCondition(condition); |
|---|
| | | taskService.selectDataGrid(pageInfo); |
|---|
| | | |
|---|
| | | return success(pageInfo); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation(value = "根据任务编号获取任务信息",notes = "根据任务编号获取任务信息") |
|---|
| | | @GetMapping("/get") |
|---|
| | | @ApiImplicitParam(name = "code",value = "任务编号") |
|---|
| | | public Msg getTaskVoByCode(@RequestParam String code){ |
|---|
| | | if (StringUtils.isBlank(code)){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10001); |
|---|
| | | } |
|---|
| | | TaskVo taskVo; |
|---|
| | | TaskInfo taskInfo = taskService.getTaskByCode(code); |
|---|
| | | if (taskInfo == null){ |
|---|
| | | return new Msg(ErrorCode.ERROR_50001); |
|---|
| | | } |
|---|
| | | taskVo = taskService.getTaskVoByCode(code); |
|---|
| | | return success(taskVo); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation(value = "创建任务信息",notes = "创建任务信息") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(paramType="TaskVo",name = "taskVo",value = "任务类"), |
|---|
| | | }) |
|---|
| | | @PostMapping("/create") |
|---|
| | | public Msg createTask(@Validated @RequestBody TaskVo taskVo){ |
|---|
| | | UserInfo userInfo = userService.getById(getUser().getId()); |
|---|
| | | if (taskVo.getIsanalysis() == 1){ |
|---|
| | | if (StringUtils.isBlank(taskVo.getAnalysisarea()) || StringUtils.isBlank(taskVo.getAnalysismedium())){ |
|---|
| | | throw new BusinessException("需要气体检测分析时必须填写分析点名称和分析介质"); |
|---|
| | | } |
|---|
| | | taskService.saveTaskForAnalysis(taskVo,userInfo); |
|---|
| | | }else { |
|---|
| | | Byte level = taskVo.getLevel(); |
|---|
| | | if (taskVo.getIsholiday().equals((byte)1)){ |
|---|
| | | level++; |
|---|
| | | } |
|---|
| | | |
|---|
| | | if (userInfo.getDepartment() == null){ |
|---|
| | | return new Msg(ErrorCode.ERROR_50001,"用户部门信息不能为空"); |
|---|
| | | } |
|---|
| | | |
|---|
| | | DepartmentInfo dep = departmentService.getById(userInfo.getDepartment()); |
|---|
| | | if (dep == null){ |
|---|
| | | return new Msg(ErrorCode.ERROR_50001,"用户部门信息不存在"); |
|---|
| | | } |
|---|
| | | taskVo.setDepartment(dep.getDepartment()); |
|---|
| | | DepartmentInfo departmentInfo = departmentService.selectSafetyDepartment(); |
|---|
| | | if (departmentInfo == null && !level.equals(TaskInfo.LEVEL_SECOND)){ |
|---|
| | | return new Msg(ErrorCode.ERROR_50001,"安全部门信息不能为空"); |
|---|
| | | } |
|---|
| | | List<InvolveDepInfo> depInfos = involveDepService.list(); |
|---|
| | | if (depInfos.size() == 0 && !level.equals(TaskInfo.LEVEL_SECOND)){ |
|---|
| | | return new Msg(ErrorCode.ERROR_50001,"相关部门信息不能为空"); |
|---|
| | | } |
|---|
| | | //判断吨位是否传 |
|---|
| | | try { |
|---|
| | | Etype.parse(taskVo.getEtype()); |
|---|
| | | } catch (BusinessException e) { |
|---|
| | | return new Msg(ErrorCode.ERROR_50001,e.getMessage()); |
|---|
| | | } |
|---|
| | | String taskCode = taskService.generateCode(userInfo,workCode); |
|---|
| | | |
|---|
| | | //任务为一级特级时，要添加相关部门审核流程 |
|---|
| | | List<TaskInvolveDepartment>departments = new ArrayList<>(); |
|---|
| | | if (!level.equals(TaskInfo.LEVEL_SECOND)){ |
|---|
| | | for (InvolveDepInfo depInfo : depInfos){ |
|---|
| | | TaskInvolveDepartment department = new TaskInvolveDepartment(); |
|---|
| | | department.setDepartment(depInfo.getDepartment()); |
|---|
| | | department.setTaskcode(taskCode); |
|---|
| | | department.setCreatedat(new Date()); |
|---|
| | | department.setCreatedby(userInfo.getRealname()); |
|---|
| | | departments.add(department); |
|---|
| | | } |
|---|
| | | taskInvolveDepService.saveBatch(departments); |
|---|
| | | } |
|---|
| | | TaskInfo taskInfo = BeanUtils.copy(taskVo,TaskInfo.class); |
|---|
| | | if (departmentInfo != null && !level.equals(TaskInfo.LEVEL_SECOND)){ |
|---|
| | | taskInfo.setSecuritydep(departmentInfo.getDepartment()); |
|---|
| | | } |
|---|
| | | taskInfo.setStatus(TaskInfo.UNCOMMITTED); |
|---|
| | | taskInfo.setCode(taskCode); |
|---|
| | | taskInfo.setCreatedat(new Date()); |
|---|
| | | taskInfo.setModifiedby(userInfo.getRealname()); |
|---|
| | | taskVo.setCode(taskCode); |
|---|
| | | |
|---|
| | | List<TaskSecurity> taskSecurities = taskVo.getTaskSecurities(); |
|---|
| | | |
|---|
| | | //subTask存储 |
|---|
| | | |
|---|
| | | String option = "CREATE"; |
|---|
| | | subTaskService.saveSubTasks(taskVo.getSubTaskInfos(),taskCode,userInfo,option); |
|---|
| | | |
|---|
| | | taskService.save(taskInfo); |
|---|
| | | taskSecurityService.saveBatch(taskSecurities); |
|---|
| | | String content = "创建任务信息"; |
|---|
| | | TaskLog taskLog = new TaskLog(taskCode,content,userInfo.getRealname(),new Date(),getUser().getCompany()); |
|---|
| | | taskLogService.save(taskLog); |
|---|
| | | } |
|---|
| | | |
|---|
| | | return success(taskVo); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation(value = "修改任务信息",notes = "修改任务信息") |
|---|
| | | @PostMapping("/update") |
|---|
| | | public Msg updateTask(@Validated @RequestBody TaskVo taskVo, BindingResult bindingResult){ |
|---|
| | | if (bindingResult.hasErrors()) { |
|---|
| | | StringBuilder stringBuilder = new StringBuilder(); |
|---|
| | | for (String s : bindingResult.getFieldErrors().stream() |
|---|
| | | .map(FieldError::getDefaultMessage).collect(Collectors.toList())) { |
|---|
| | | stringBuilder.append(s).append(","); |
|---|
| | | } |
|---|
| | | return new Msg(ErrorCode.ERROR_10002,stringBuilder.toString()); |
|---|
| | | } |
|---|
| | | if (taskVo.getId() == null){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10004); |
|---|
| | | } |
|---|
| | | UserInfo userInfo = userService.getById(getUser().getId()); |
|---|
| | | TaskInfo taskInfoExist = taskService.getById(taskVo.getId()); |
|---|
| | | if (taskInfoExist == null){ |
|---|
| | | return new Msg(ErrorCode.ERROR_50001); |
|---|
| | | } |
|---|
| | | TaskInfo taskInfo = BeanUtils.copy(taskVo,TaskInfo.class); |
|---|
| | | taskInfo.setModifiedat(new Date()); |
|---|
| | | taskInfo.setModifiedby(userInfo.getRealname()); |
|---|
| | | String taskCode = taskVo.getCode(); |
|---|
| | | String option = "UPDATE"; |
|---|
| | | subTaskService.saveSubTasks(taskVo.getSubTaskInfos(),taskCode,userInfo, option); |
|---|
| | | //吨位不可以改 |
|---|
| | | taskInfo.setEtype(null); |
|---|
| | | taskService.updateById(taskInfo); |
|---|
| | | |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation(value = "第二步创建信息",notes = "第二步创建信息") |
|---|
| | | @PostMapping("/create/second") |
|---|
| | | public Msg updateTask(@RequestBody TaskVo taskVo){ |
|---|
| | | if (taskVo.getCode() == null){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10004); |
|---|
| | | } |
|---|
| | | TaskInfo taskInfoExist = taskService.getTaskByCode(taskVo.getCode()); |
|---|
| | | if (taskInfoExist == null){ |
|---|
| | | return new Msg(ErrorCode.ERROR_50001); |
|---|
| | | } |
|---|
| | | Date now = new Date(); |
|---|
| | | UserInfo userInfo = userService.getById(getUser().getId()); |
|---|
| | | List<TaskSecurity>securities = taskVo.getTaskSecurities(); |
|---|
| | | if (securities == null || securities.size() == 0){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10002,"安全措施为空"); |
|---|
| | | } |
|---|
| | | securities.forEach(item->{ |
|---|
| | | item.setTaskcode(taskVo.getCode()); |
|---|
| | | item.setCreatedat(now); |
|---|
| | | item.setCreatedby(userInfo.getRealname()); |
|---|
| | | item.setConfirmedby(userInfo.getRealname()); |
|---|
| | | }); |
|---|
| | | TaskRisk risk = taskVo.getTaskRisk(); |
|---|
| | | if (risk == null) { |
|---|
| | | return new Msg(ErrorCode.ERROR_10002,"请填写安全风险"); |
|---|
| | | } |
|---|
| | | risk.setCreatedat(now); |
|---|
| | | risk.setCreatedby(userInfo.getRealname()); |
|---|
| | | List<TaskEquipment>equipments = taskVo.getTaskEquipments(); |
|---|
| | | if (equipments == null || equipments.size() == 0){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10002,"请选择安全设备"); |
|---|
| | | } |
|---|
| | | equipments.forEach(item->{ |
|---|
| | | item.setTaskcode(taskVo.getCode()); |
|---|
| | | item.setCreatedat(now); |
|---|
| | | item.setCreatedby(userInfo.getRealname()); |
|---|
| | | }); |
|---|
| | | taskSecurityService.saveBatch(securities); |
|---|
| | | taskRiskService.save(risk); |
|---|
| | | taskEquipmentService.saveBatch(equipments); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation(value = "第二步更新信息",notes = "第二步更新信息") |
|---|
| | | @PostMapping("/update/second") |
|---|
| | | public Msg updateTaskSecond(@RequestBody TaskVo taskVo){ |
|---|
| | | if (taskVo.getCode() == null){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10004); |
|---|
| | | } |
|---|
| | | TaskInfo taskInfoExist = taskService.getTaskByCode(taskVo.getCode()); |
|---|
| | | if (taskInfoExist == null){ |
|---|
| | | return new Msg(ErrorCode.ERROR_50001); |
|---|
| | | } |
|---|
| | | |
|---|
| | | UserInfo userInfo = userService.getById(getUser().getId()); |
|---|
| | | taskSecurityService.removeByTaskCode(taskVo.getCode()); |
|---|
| | | taskEquipmentService.removeByTaskCode(taskVo.getCode()); |
|---|
| | | taskRiskService.removeByCode(taskVo.getCode()); |
|---|
| | | //更新删除原先的，重新插入 |
|---|
| | | Date now = new Date(); |
|---|
| | | List<TaskSecurity> taskSecurities = taskVo.getTaskSecurities(); |
|---|
| | | if (taskSecurities == null || taskSecurities.size() == 0){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10002,"安全措施为空"); |
|---|
| | | } |
|---|
| | | taskSecurities.forEach(item->{ |
|---|
| | | item.setTaskcode(taskVo.getCode()); |
|---|
| | | item.setCreatedat(now); |
|---|
| | | item.setCreatedby(userInfo.getRealname()); |
|---|
| | | item.setConfirmedby(userInfo.getRealname()); |
|---|
| | | }); |
|---|
| | | taskSecurityService.saveBatch(taskSecurities); |
|---|
| | | |
|---|
| | | List<TaskEquipment> taskEquipments = taskVo.getTaskEquipments(); |
|---|
| | | if (taskEquipments == null || taskEquipments.size() == 0){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10002,"请选择安全设备"); |
|---|
| | | } |
|---|
| | | taskEquipments.forEach(item->{ |
|---|
| | | item.setTaskcode(taskVo.getCode()); |
|---|
| | | item.setCreatedat(now); |
|---|
| | | item.setCreatedby(userInfo.getRealname()); |
|---|
| | | }); |
|---|
| | | taskEquipmentService.saveBatch(taskEquipments); |
|---|
| | | |
|---|
| | | TaskRisk risk = taskVo.getTaskRisk(); |
|---|
| | | if (risk == null) { |
|---|
| | | return new Msg(ErrorCode.ERROR_10002,"请填写安全风险"); |
|---|
| | | } |
|---|
| | | risk.setTaskcode(taskVo.getCode()); |
|---|
| | | risk.setCreatedat(now); |
|---|
| | | risk.setCreatedby(userInfo.getRealname()); |
|---|
| | | taskRiskService.save(risk); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | @ApiOperation(value = "创建任务信息", notes = "安卓端") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(paramType = "TaskVo", name = "task", value = "任务类"), |
|---|
| | | }) |
|---|
| | | @PostMapping("/app/create") |
|---|
| | | public synchronized Msg appCreateTask(@RequestBody TaskVo taskVo) { |
|---|
| | | if (taskVo == null){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10001); |
|---|
| | | } |
|---|
| | | try { |
|---|
| | | UserInfo userInfo = userService.getById(getUser().getId()); |
|---|
| | | if (taskVo.getIsanalysis() == 1){ |
|---|
| | | taskService.saveTaskForAnalysis(taskVo,userInfo); |
|---|
| | | }else { |
|---|
| | | taskService.saveTaskByApp(taskVo, getUser()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | return success(); |
|---|
| | | } catch (BusinessException e) { |
|---|
| | | e.printStackTrace(); |
|---|
| | | return new Msg(ErrorCode.ERROR_10002, e.getMessage()); |
|---|
| | | } catch (Exception e) { |
|---|
| | | e.printStackTrace(); |
|---|
| | | return new Msg(ErrorCode.ERROR_40001, "系统内部错误"); |
|---|
| | | } |
|---|
| | | |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation(value = "删除任务信息",notes = "删除任务信息") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "id",value = "任务id"), |
|---|
| | | }) |
|---|
| | | @PostMapping("/delete") |
|---|
| | | public Msg deleteTask(Long id){ |
|---|
| | | TaskInfo taskInfo = taskService.getById(id); |
|---|
| | | if (id == null || taskInfo == null){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10001); |
|---|
| | | } |
|---|
| | | if (!taskInfo.getFlag().equals(TaskInfo.WAIT_REVIEW)){ |
|---|
| | | return new Msg(ErrorCode.ERROR_50005,"当前状态无法作废"); |
|---|
| | | } |
|---|
| | | Byte isDeleted = 1; |
|---|
| | | UserInfo userInfo = userService.getById(getUser().getId()); |
|---|
| | | taskInfo.setIsdel(isDeleted); |
|---|
| | | taskService.updateById(taskInfo); |
|---|
| | | String taskCode = taskInfo.getCode(); |
|---|
| | | taskSecurityService.deleteByTaskCode(taskCode); |
|---|
| | | taskWorkerService.deleteByTaskCode(taskCode); |
|---|
| | | taskEnclosureService.removeByTaskCode(taskCode); |
|---|
| | | taskRiskService.deleteByTaskCode(taskCode); |
|---|
| | | taskAnalysisService.deleteByTaskCode(taskCode); |
|---|
| | | taskReviewService.deleteByTaskCode(taskCode); |
|---|
| | | String content = "删除任务"; |
|---|
| | | TaskLog taskLog = new TaskLog(taskInfo.getCode(),content,userInfo.getRealname(),new Date(),getUser().getCompany()); |
|---|
| | | taskLogService.save(taskLog); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation(value = "web端上传图片",notes = "web端上传图片") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(paramType="query",name = "files",value = "文件"), |
|---|
| | | }) |
|---|
| | | @PostMapping("/web/upload") |
|---|
| | | @ResponseBody |
|---|
| | | public Msg upload(StandardMultipartHttpServletRequest req){ |
|---|
| | | MultiValueMap<String, MultipartFile> multipartFiles = req.getMultiFileMap(); |
|---|
| | | |
|---|
| | | MultipartFile picFile = null; |
|---|
| | | if (multipartFiles.get("files") == null){ |
|---|
| | | if(multipartFiles.get("file") != null){ |
|---|
| | | picFile = multipartFiles.get("file").get(0); |
|---|
| | | } |
|---|
| | | }else { |
|---|
| | | picFile = multipartFiles.get("files").get(0); |
|---|
| | | } |
|---|
| | | if (null == picFile){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10001); |
|---|
| | | }else { |
|---|
| | | try { |
|---|
| | | String picName = UploadUtil.uploadFile(picFile,taskPath); |
|---|
| | | HashMap<String, String> map = new HashMap<>(4); |
|---|
| | | map.put("name",picFile.getOriginalFilename()); |
|---|
| | | map.put("path",task+picName); |
|---|
| | | return success(map); |
|---|
| | | }catch (Exception e){ |
|---|
| | | e.printStackTrace(); |
|---|
| | | return new Msg(ErrorCode.ERROR_40001); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation(value = "上传图片",notes = "上传图片") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(paramType="query",name = "files",value = "文件"), |
|---|
| | | }) |
|---|
| | | @PostMapping("/uploadPic") |
|---|
| | | @ResponseBody |
|---|
| | | public Msg uploadPic(StandardMultipartHttpServletRequest req){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | |
|---|
| | | MultiValueMap<String, MultipartFile> multipartFiles = req.getMultiFileMap(); |
|---|
| | | MultipartFile picFile = multipartFiles.get("files").get(0); |
|---|
| | | if (null == picFile){ |
|---|
| | | msg.setCode("404"); |
|---|
| | | msg.setMessage("上传文件为空"); |
|---|
| | | }else { |
|---|
| | | try { |
|---|
| | | String picmame = UploadUtil.uploadFile(picFile,taskPath); |
|---|
| | | msg.setResult(task+picmame); |
|---|
| | | }catch (Exception e){ |
|---|
| | | e.printStackTrace(); |
|---|
| | | msg.setCode("500"); |
|---|
| | | msg.setMessage("上传失败"); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/upload") |
|---|
| | | public Msg uploadFiles(TaskEnclosureVo taskEnclosureVo) throws Exception { |
|---|
| | | MultipartFile[]files = taskEnclosureVo.getFile(); |
|---|
| | | List<TaskEnclosure>enclosures = new ArrayList<>(); |
|---|
| | | UserInfo userInfo = userService.getById(getUser().getId()); |
|---|
| | | if (files != null && files.length > 0) { |
|---|
| | | for (MultipartFile file : files) { |
|---|
| | | String name = UploadUtil.uploadFile(file, taskPath); |
|---|
| | | TaskEnclosure enclosure = new TaskEnclosure(); |
|---|
| | | String fileType = file.getContentType(); |
|---|
| | | if (fileType != null && fileType.contains("image")){ |
|---|
| | | enclosure.setFiletype((byte)1); |
|---|
| | | }else if (fileType != null && fileType.contains("pdf")){ |
|---|
| | | enclosure.setFiletype((byte)2); |
|---|
| | | } |
|---|
| | | enclosure.setTaskcode(taskEnclosureVo.getTaskcode()); |
|---|
| | | enclosure.setFilename(name); |
|---|
| | | enclosure.setType(taskEnclosureVo.getType()); |
|---|
| | | enclosure.setFileurl(task + name); |
|---|
| | | enclosure.setCreatedat(new Date()); |
|---|
| | | enclosure.setCreatedby(userInfo.getRealname()); |
|---|
| | | enclosure.setOriginalname(file.getOriginalFilename()); |
|---|
| | | enclosures.add(enclosure); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | taskEnclosureService.saveBatch(enclosures); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/getFiles") |
|---|
| | | public Msg getFiles(String taskCode){ |
|---|
| | | return success(taskEnclosureService.getListByTaskCode(taskCode)); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/deleteFile") |
|---|
| | | public Msg deleteFile(String id){ |
|---|
| | | TaskEnclosure taskEnclosure = taskEnclosureService.getById(id); |
|---|
| | | if (taskEnclosure == null){ |
|---|
| | | return new Msg(ErrorCode.ERROR_50001); |
|---|
| | | } |
|---|
| | | taskEnclosureService.removeById(id); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/analysis/add") |
|---|
| | | public Msg addAnalysis(@RequestBody TaskAnalysis analysis, BindingResult bindingResult){ |
|---|
| | | if (bindingResult.hasErrors()) { |
|---|
| | | StringBuilder stringBuilder = new StringBuilder(); |
|---|
| | | for (String s : bindingResult.getFieldErrors().stream() |
|---|
| | | .map(FieldError::getDefaultMessage).collect(Collectors.toList())) { |
|---|
| | | stringBuilder.append(s).append(","); |
|---|
| | | } |
|---|
| | | return new Msg(ErrorCode.ERROR_10002,stringBuilder.toString()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | UserInfo userInfo = userService.getById(getUser().getId()); |
|---|
| | | analysis.setAnalysisat(new Date()); |
|---|
| | | analysis.setCreatedat(new Date()); |
|---|
| | | analysis.setCreatedby(userInfo.getRealname()); |
|---|
| | | taskAnalysisService.save(analysis); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation(value = "获取部门任务信息",notes = "获取部门任务信息") |
|---|
| | | @GetMapping("/info/dep") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "pageIndex",value = "当前分页"), |
|---|
| | | @ApiImplicitParam(name = "pageSize",value = "分页每页数量"), |
|---|
| | | @ApiImplicitParam(name = "sort",value = "排序列名"), |
|---|
| | | @ApiImplicitParam(name = "order",value = "排序方式（正序反序）") |
|---|
| | | }) |
|---|
| | | public Msg getTaskInfosByDep(@RequestParam(value = "code", required = false) String code, |
|---|
| | | @RequestParam(value = "level", required = false) String level, |
|---|
| | | @RequestParam(value = "status", required = false) String status, |
|---|
| | | @RequestParam(defaultValue = "0") Integer pageIndex, |
|---|
| | | @RequestParam(defaultValue = "10") Integer pageSize, |
|---|
| | | String sort, String order){ |
|---|
| | | |
|---|
| | | PageInfo pageInfo = new PageInfo(pageIndex, pageSize,sort,order); |
|---|
| | | UserInfo userInfo = userService.getById(getUser().getId()); |
|---|
| | | Map<String, Object> condition = new HashMap<>(4); |
|---|
| | | if (StringUtils.isNotBlank(code)) { |
|---|
| | | condition.put("code", code); |
|---|
| | | } |
|---|
| | | if (StringUtils.isNotBlank(level)) { |
|---|
| | | condition.put("level", level); |
|---|
| | | } |
|---|
| | | if (StringUtils.isNotBlank(status)) { |
|---|
| | | condition.put("status", status); |
|---|
| | | } |
|---|
| | | condition.put("unit",userInfo.getCompany()); |
|---|
| | | condition.put("department",userInfo.getDepartment()); |
|---|
| | | pageInfo.setCondition(condition); |
|---|
| | | taskService.selectDataGridByDep(pageInfo); |
|---|
| | | |
|---|
| | | return success(pageInfo); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation(value = "获取可查看任务信息",notes = "获取可查看任务信息") |
|---|
| | | @GetMapping("/info/viewable") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "pageIndex",value = "当前分页"), |
|---|
| | | @ApiImplicitParam(name = "pageSize",value = "分页每页数量"), |
|---|
| | | @ApiImplicitParam(name = "sort",value = "排序列名"), |
|---|
| | | @ApiImplicitParam(name = "order",value = "排序方式（正序反序）"), |
|---|
| | | @ApiImplicitParam(name = "code",value = "作业编号"), |
|---|
| | | @ApiImplicitParam(name = "level",value = "作业级别"), |
|---|
| | | @ApiImplicitParam(name = "status",value = "审批状态"), |
|---|
| | | @ApiImplicitParam(name = "flag",value = "作业状态"), |
|---|
| | | @ApiImplicitParam(name = "starttime",value = "开始时间"), |
|---|
| | | @ApiImplicitParam(name = "endtime",value = "结束时间"), |
|---|
| | | @ApiImplicitParam(name = "time",value = "查询时间"), |
|---|
| | | @ApiImplicitParam(name = "applicant",value = "申请人"), |
|---|
| | | @ApiImplicitParam(name = "tasktype",value = "作业类型"), |
|---|
| | | @ApiImplicitParam(name = "department",value = "部门"), |
|---|
| | | @ApiImplicitParam(name = "constructionunit",value = "施工单位"), |
|---|
| | | }) |
|---|
| | | public Msg getTaskInfosViewable(@RequestParam(value = "code", required = false) String code, |
|---|
| | | @RequestParam(value = "level", required = false) String level, |
|---|
| | | @RequestParam(value = "status", required = false) String status, |
|---|
| | | @RequestParam(value = "flag", required = false) String flag, |
|---|
| | | @RequestParam(value = "applicant", required = false) String applicant, |
|---|
| | | @RequestParam(value = "starttime", required = false) String starttime, |
|---|
| | | @RequestParam(value = "endtime", required = false) String endtime, |
|---|
| | | @RequestParam(value = "tasktype", required = false) String tasktype, |
|---|
| | | @RequestParam(value = "department", required = false) String department, |
|---|
| | | @RequestParam(value = "time", required = false) String time, |
|---|
| | | @RequestParam(value = "constructionunit", required = false) String constructionunit, |
|---|
| | | @RequestParam(defaultValue = "0") Integer pageIndex, |
|---|
| | | @RequestParam(defaultValue = "10") Integer pageSize, |
|---|
| | | String sort, String order){ |
|---|
| | | |
|---|
| | | PageInfo pageInfo = new PageInfo(pageIndex, pageSize,sort,order); |
|---|
| | | UserInfo userInfo = userService.getById(getUser().getId()); |
|---|
| | | Map<String, Object> condition = new HashMap<>(4); |
|---|
| | | if (StringUtils.isNotBlank(code)) { |
|---|
| | | condition.put("code", code); |
|---|
| | | } |
|---|
| | | if (StringUtils.isNotBlank(level)) { |
|---|
| | | condition.put("level", level); |
|---|
| | | } |
|---|
| | | if (StringUtils.isNotBlank(status)) { |
|---|
| | | condition.put("status", status); |
|---|
| | | } |
|---|
| | | if (StringUtils.isNotBlank(starttime)) { |
|---|
| | | condition.put("starttime", starttime); |
|---|
| | | } |
|---|
| | | if (StringUtils.isNotBlank(endtime)) { |
|---|
| | | condition.put("endtime", endtime); |
|---|
| | | } |
|---|
| | | if (StringUtils.isNotBlank(tasktype)) { |
|---|
| | | condition.put("tasktype", tasktype); |
|---|
| | | } |
|---|
| | | if (StringUtils.isNotBlank(department)) { |
|---|
| | | condition.put("department", department); |
|---|
| | | } |
|---|
| | | if(time != null && time.length()>0){ |
|---|
| | | condition.put("time", time); |
|---|
| | | } |
|---|
| | | if (StringUtils.isNotBlank(constructionunit)) { |
|---|
| | | condition.put("constructionunit", constructionunit); |
|---|
| | | } |
|---|
| | | List<String>list = new ArrayList<>(); |
|---|
| | | if (StringUtils.isNotBlank(flag)) { |
|---|
| | | |
|---|
| | | list = StringUtils.toList(flag); |
|---|
| | | for (String s : list){ |
|---|
| | | for (int i = 0; i < s.length(); i++) { |
|---|
| | | System.out.println(s.charAt(i)); |
|---|
| | | if (!Character.isDigit(s.charAt(i))) { |
|---|
| | | return new Msg(ErrorCode.ERROR_10003,"flag参数错误"); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | |
|---|
| | | } |
|---|
| | | } |
|---|
| | | condition.put("list", list); |
|---|
| | | if (StringUtils.isNotBlank(applicant)) { |
|---|
| | | condition.put("applicant", applicant); |
|---|
| | | } |
|---|
| | | condition.put("unit",userInfo.getCompany()); |
|---|
| | | condition.put("department",userInfo.getDepartment()); |
|---|
| | | condition.put("userType",userInfo.getType()); |
|---|
| | | pageInfo.setCondition(condition); |
|---|
| | | taskService.selectDataGridViewable(pageInfo); |
|---|
| | | |
|---|
| | | return success(pageInfo); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | @ApiOperation(value = "获取进行中的任务") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "time",value = "查询时间，不传则用当前时间",example = "2022-05-12 14:00:00"), |
|---|
| | | @ApiImplicitParam(name = "type",value = "项目标识 1 - 60万吨 ，2 - 130万吨 ，不传则查全部") |
|---|
| | | }) |
|---|
| | | @RequestMapping(value = "/get/active",method = RequestMethod.GET) |
|---|
| | | public Msg getInProgressTask(@RequestParam(required = false) String time,@RequestParam(required = false) Byte type){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | Date queryTime = null; |
|---|
| | | if(time != null && !time.isEmpty()){ |
|---|
| | | try { |
|---|
| | | queryTime = DateUtil.parseDateTime(time); |
|---|
| | | } catch (Exception e) { |
|---|
| | | e.printStackTrace(); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | msg.setResult(taskService.selectActiveTaskLocation(queryTime,type)); |
|---|
| | | if(msg.getResult() != null){ |
|---|
| | | msg.setCode("200"); |
|---|
| | | }else { |
|---|
| | | msg.setCode("300"); |
|---|
| | | msg.setMessage("无作业数据"); |
|---|
| | | } |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation(value = "气体检测中心可操作任务信息",notes = "气体检测中心可操作任务信息") |
|---|
| | | @GetMapping("/info/testing") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "pageIndex",value = "当前分页"), |
|---|
| | | @ApiImplicitParam(name = "pageSize",value = "分页每页数量"), |
|---|
| | | @ApiImplicitParam(name = "sort",value = "排序列名"), |
|---|
| | | @ApiImplicitParam(name = "order",value = "排序方式（正序反序）") |
|---|
| | | }) |
|---|
| | | public Msg getTaskInfosTesting(@RequestParam(value = "code", required = false) String code, |
|---|
| | | @RequestParam(value = "level", required = false) String level, |
|---|
| | | @RequestParam(value = "status", required = false) String status, |
|---|
| | | @RequestParam(value = "searchflag", required = false) String searchflag, |
|---|
| | | @RequestParam(defaultValue = "0") Integer pageIndex, |
|---|
| | | @RequestParam(defaultValue = "10") Integer pageSize, |
|---|
| | | String sort, String order){ |
|---|
| | | |
|---|
| | | PageInfo pageInfo = new PageInfo(pageIndex, pageSize,sort,order); |
|---|
| | | UserInfo userInfo = userService.getById(getUser().getId()); |
|---|
| | | Map<String, Object> condition = new HashMap<>(4); |
|---|
| | | if (StringUtils.isNotBlank(code)) { |
|---|
| | | condition.put("code", code); |
|---|
| | | } |
|---|
| | | if (StringUtils.isNotBlank(level)) { |
|---|
| | | condition.put("level", level); |
|---|
| | | } |
|---|
| | | if (StringUtils.isNotBlank(status)) { |
|---|
| | | condition.put("status", status); |
|---|
| | | } |
|---|
| | | if (StringUtils.isBlank(searchflag)) { |
|---|
| | | searchflag = "0"; |
|---|
| | | } |
|---|
| | | condition.put("searchflag", searchflag); |
|---|
| | | |
|---|
| | | // 当前用户的部门是分析部门 或者 当前用户的部门是作业的申请部门 且 当前用户是安全员 |
|---|
| | | if (userInfo.getDepartment() == null) { |
|---|
| | | return new Msg(ErrorCode.ERROR_50004,"用户未有部门"); |
|---|
| | | } |
|---|
| | | DepartmentInfo dep = departmentService.getById(userInfo.getDepartment()); |
|---|
| | | if (dep == null) { |
|---|
| | | return new Msg(ErrorCode.ERROR_50004,"用户部门不存在"); |
|---|
| | | } |
|---|
| | | if (departmentService.isAnalysis(dep.getDepartment())) { |
|---|
| | | pageInfo.setCondition(condition); |
|---|
| | | taskService.selectDataGridTesting(pageInfo); |
|---|
| | | }else if(userInfo.getIssecurityofficer().equals((byte)1)){ |
|---|
| | | pageInfo.setCondition(condition); |
|---|
| | | condition.put("specificDepartment", userInfo.getDepartment()); |
|---|
| | | taskService.selectDataGridTesting(pageInfo); |
|---|
| | | } |
|---|
| | | |
|---|
| | | return success(pageInfo); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation(value = "获取待审批任务信息",notes = "获取待审批任务信息") |
|---|
| | | @GetMapping("/info/review") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "pageIndex",value = "当前分页"), |
|---|
| | | @ApiImplicitParam(name = "pageSize",value = "分页每页数量"), |
|---|
| | | @ApiImplicitParam(name = "sort",value = "排序列名"), |
|---|
| | | @ApiImplicitParam(name = "order",value = "排序方式（正序反序）"), |
|---|
| | | @ApiImplicitParam(name = "code",value = "作业编号"), |
|---|
| | | @ApiImplicitParam(name = "level",value = "作业级别"), |
|---|
| | | @ApiImplicitParam(name = "status",value = "审批状态"), |
|---|
| | | @ApiImplicitParam(name = "flag",value = "作业状态"), |
|---|
| | | @ApiImplicitParam(name = "starttime",value = "开始时间"), |
|---|
| | | @ApiImplicitParam(name = "endtime",value = "结束时间"), |
|---|
| | | @ApiImplicitParam(name = "applicant",value = "申请人"), |
|---|
| | | @ApiImplicitParam(name = "tasktype",value = "作业类型"), |
|---|
| | | @ApiImplicitParam(name = "department",value = "部门"), |
|---|
| | | @ApiImplicitParam(name = "constructionunit",value = "施工单位"), |
|---|
| | | }) |
|---|
| | | public Msg getWaitReviewTaskInfos(@RequestParam(value = "code", required = false) String code, |
|---|
| | | @RequestParam(value = "level", required = false) String level, |
|---|
| | | @RequestParam(value = "status", required = false) String status, |
|---|
| | | @RequestParam(value = "flag", required = false) String flag, |
|---|
| | | @RequestParam(value = "applicant", required = false) String applicant, |
|---|
| | | @RequestParam(value = "starttime", required = false) String starttime, |
|---|
| | | @RequestParam(value = "endtime", required = false) String endtime, |
|---|
| | | @RequestParam(value = "tasktype", required = false) String tasktype, |
|---|
| | | @RequestParam(value = "department", required = false) String department, |
|---|
| | | @RequestParam(value = "constructionunit", required = false) String constructionunit, |
|---|
| | | @RequestParam(defaultValue = "0") Integer pageIndex, |
|---|
| | | @RequestParam(defaultValue = "10") Integer pageSize, |
|---|
| | | String sort, String order){ |
|---|
| | | |
|---|
| | | PageInfo pageInfo = new PageInfo(pageIndex, pageSize,sort,order); |
|---|
| | | UserInfo userInfo = userService.getById(getUser().getId()); |
|---|
| | | |
|---|
| | | Map<String, Object> condition = new HashMap<>(4); |
|---|
| | | if (StringUtils.isNotBlank(code)) { |
|---|
| | | condition.put("code", code); |
|---|
| | | } |
|---|
| | | if (StringUtils.isNotBlank(level)) { |
|---|
| | | condition.put("level", level); |
|---|
| | | } |
|---|
| | | if (StringUtils.isNotBlank(status)) { |
|---|
| | | condition.put("status", status); |
|---|
| | | } |
|---|
| | | if (StringUtils.isNotBlank(flag)) { |
|---|
| | | condition.put("flag", flag); |
|---|
| | | } |
|---|
| | | if (StringUtils.isNotBlank(starttime)) { |
|---|
| | | condition.put("starttime", starttime); |
|---|
| | | } |
|---|
| | | if (StringUtils.isNotBlank(endtime)) { |
|---|
| | | condition.put("endtime", endtime); |
|---|
| | | } |
|---|
| | | if (StringUtils.isNotBlank(tasktype)) { |
|---|
| | | condition.put("tasktype", tasktype); |
|---|
| | | } |
|---|
| | | if (StringUtils.isNotBlank(department)) { |
|---|
| | | condition.put("department", department); |
|---|
| | | } |
|---|
| | | if (StringUtils.isNotBlank(constructionunit)) { |
|---|
| | | condition.put("constructionunit", constructionunit); |
|---|
| | | } |
|---|
| | | condition.put("unit",userInfo.getCompany()); |
|---|
| | | condition.put("department",userInfo.getDepartment()); |
|---|
| | | condition.put("applicant",userInfo.getRealname()); |
|---|
| | | condition.put("isCompany",userInfo.getIscompany()); |
|---|
| | | condition.put("isDepartment",userInfo.getIsdepartment()); |
|---|
| | | pageInfo.setCondition(condition); |
|---|
| | | taskService.getWaitReviewDataGrid(pageInfo); |
|---|
| | | |
|---|
| | | return success(pageInfo); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation(value = "获取待处理任务信息",notes = "获取待处理任务信息") |
|---|
| | | @GetMapping("/info/pending") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "type",value = "类型（1.当前用户为动火人；2.监火人；3.分析人）") |
|---|
| | | }) |
|---|
| | | public Msg getPendingTask(@RequestParam(value = "type", required = false) String type){ |
|---|
| | | if (StringUtils.isBlank(type)){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10002); |
|---|
| | | } |
|---|
| | | UserInfo userInfo = userService.getById(getUser().getId()); |
|---|
| | | List<TaskVo>taskVos = taskService.getPendingTask(type,userInfo.getRealname()); |
|---|
| | | return success(taskVos); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation(value = "获取进行中任务信息",notes = "获取进行中任务信息") |
|---|
| | | @GetMapping("/info/doing") |
|---|
| | | public Msg getPendingTask(){ |
|---|
| | | List<TaskVo>taskVos = taskService.getDoingTask(); |
|---|
| | | return success(taskVos); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation(value = "提交任务到检测中心",notes = "提交任务到检测中心") |
|---|
| | | @PostMapping("/gasCheck") |
|---|
| | | public Msg gasCheck(Long id){ |
|---|
| | | TaskInfo taskInfo = taskService.getById(id); |
|---|
| | | UserInfo userInfo = userService.getById(getUser().getId()); |
|---|
| | | if (!taskInfo.getApplicant().equals(userInfo.getRealname())){ |
|---|
| | | return new Msg(ErrorCode.ERROR_50004,"只有申请人才能提交"); |
|---|
| | | } |
|---|
| | | |
|---|
| | | if (!taskInfo.getIsanalysis() .equals((byte)1)){ |
|---|
| | | return new Msg(ErrorCode.ERROR_50004,"当前任务不需要检测"); |
|---|
| | | } |
|---|
| | | |
|---|
| | | if (!(taskInfo.getStatus().equals(TaskInfo.REJECTED) || taskInfo.getStatus().equals(TaskInfo.UNCOMMITTED))){ |
|---|
| | | return new Msg(ErrorCode.ERROR_50004,"当前状态不允许提交任务到检测中心"); |
|---|
| | | } |
|---|
| | | |
|---|
| | | //校验完成修改状态 |
|---|
| | | taskInfo.setStatus(TaskInfo.TEST_COMMITTED); |
|---|
| | | taskInfo.setModifiedat(new Date()); |
|---|
| | | taskInfo.setModifiedby(userInfo.getRealname()); |
|---|
| | | taskService.updateById(taskInfo); |
|---|
| | | String content = "提交任务到检测中心"; |
|---|
| | | TaskLog taskLog = new TaskLog(taskInfo.getCode(),content,userInfo.getRealname(),new Date(),getUser().getCompany()); |
|---|
| | | taskLogService.save(taskLog); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/submit") |
|---|
| | | public Msg submitTask(Long id){ |
|---|
| | | TaskInfo taskInfo = taskService.getById(id); |
|---|
| | | UserInfo userInfo = userService.getById(getUser().getId()); |
|---|
| | | if (!taskInfo.getApplicant().equals(userInfo.getRealname())){ |
|---|
| | | return new Msg(ErrorCode.ERROR_50004,"只有申请人才能提交"); |
|---|
| | | } |
|---|
| | | |
|---|
| | | if (taskInfo.getIsanalysis() .equals((byte)1)){ |
|---|
| | | if (!taskInfo.getStatus().equals(TaskInfo.TEST_CHECKED)){ |
|---|
| | | return new Msg(ErrorCode.ERROR_50004,"当前任务未完成气体检测，不能提交施工部门审核"); |
|---|
| | | } |
|---|
| | | }else { |
|---|
| | | if (!(taskInfo.getStatus().equals(TaskInfo.REJECTED) || taskInfo.getStatus().equals(TaskInfo.UNCOMMITTED))){ |
|---|
| | | return new Msg(ErrorCode.ERROR_50004,"当前状态不允许提交"); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | |
|---|
| | | List<TaskSecurity>securities = taskSecurityService.getListByTaskCode(taskInfo.getCode()); |
|---|
| | | if (securities == null || securities.size() == 0){ |
|---|
| | | return new Msg(ErrorCode.ERROR_50004,"安全措施不能为空"); |
|---|
| | | } |
|---|
| | | List<TaskEnclosure>enclosures = taskEnclosureService.getListByTaskCode(taskInfo.getCode()); |
|---|
| | | if (enclosures == null || enclosures.size() == 0) { |
|---|
| | | return new Msg(ErrorCode.ERROR_50004,"文件不能为空"); |
|---|
| | | } |
|---|
| | | List<TaskEquipment>equipments = taskEquipmentService.getListByTaskCode(taskInfo.getCode()); |
|---|
| | | if (equipments == null || equipments.size() == 0) { |
|---|
| | | return new Msg(ErrorCode.ERROR_50004,"设备不能为空"); |
|---|
| | | } |
|---|
| | | |
|---|
| | | TaskRisk risk = taskRiskService.getTaskRiskByCode(taskInfo.getCode()); |
|---|
| | | if (risk == null){ |
|---|
| | | return new Msg(ErrorCode.ERROR_50004,"安全风险不能为空"); |
|---|
| | | } |
|---|
| | | |
|---|
| | | //校验完成修改状态 |
|---|
| | | taskInfo.setStatus(TaskInfo.COMMITTED); |
|---|
| | | taskInfo.setModifiedat(new Date()); |
|---|
| | | taskInfo.setModifiedby(userInfo.getRealname()); |
|---|
| | | taskService.updateById(taskInfo); |
|---|
| | | String content = "任务提交"; |
|---|
| | | TaskLog taskLog = new TaskLog(taskInfo.getCode(),content,userInfo.getRealname(),new Date(),getUser().getCompany()); |
|---|
| | | taskLogService.save(taskLog); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation(value = "app修改提交任务信息",notes = "app修改提交任务信息") |
|---|
| | | @PostMapping("/app/update") |
|---|
| | | public Msg appUpdateTask(@RequestBody TaskVo taskVo){ |
|---|
| | | if (taskVo == null){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10001); |
|---|
| | | } |
|---|
| | | if (StringUtils.isBlank(taskVo.getCode())){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10004); |
|---|
| | | } |
|---|
| | | TaskInfo taskInfoExist = taskService.getTaskByCode(taskVo.getCode()); |
|---|
| | | if (taskInfoExist == null){ |
|---|
| | | return new Msg(ErrorCode.ERROR_50001); |
|---|
| | | } |
|---|
| | | |
|---|
| | | UserInfo userInfo = userService.getById(getUser().getId()); |
|---|
| | | taskVo.setId(taskInfoExist.getId()); |
|---|
| | | if (taskInfoExist.getIsanalysis() == 1 && (taskInfoExist.getStatus().equals(TaskInfo.REJECTED) || taskInfoExist.getStatus().equals(TaskInfo.UNCOMMITTED))){ |
|---|
| | | taskService.updateTaskByAppForAnalysis(taskVo,userInfo); |
|---|
| | | }else { |
|---|
| | | TaskRisk risk = taskVo.getTaskRisk(); |
|---|
| | | if (risk == null) { |
|---|
| | | return new Msg(ErrorCode.ERROR_10002,"请填写安全风险"); |
|---|
| | | } |
|---|
| | | List<TaskEquipment> taskEquipments = taskVo.getTaskEquipments(); |
|---|
| | | if (taskEquipments == null || taskEquipments.size() == 0){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10002,"请选择安全设备"); |
|---|
| | | } |
|---|
| | | |
|---|
| | | List<TaskSecurity> taskSecurities = taskVo.getTaskSecurities(); |
|---|
| | | if (taskSecurities == null || taskSecurities.size() == 0){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10002,"安全措施为空"); |
|---|
| | | } |
|---|
| | | if (taskVo.getTaskReviews() == null || taskVo.getTaskReviews().size() < 1 |
|---|
| | | || taskVo.getTaskReviews().get(0).getIsagree() == null){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10002,"审核信息不能为空"); |
|---|
| | | } |
|---|
| | | taskService.updateTaskByApp(taskVo,userInfo); |
|---|
| | | } |
|---|
| | | |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation(value = "检测中心检测",notes = "检测中心检测") |
|---|
| | | @PostMapping("/testingCenter/review") |
|---|
| | | public Msg testingCenterReview(@RequestBody TaskVo taskVo){ |
|---|
| | | if (StringUtils.isBlank(taskVo.getCode())){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10002); |
|---|
| | | } |
|---|
| | | TaskInfo taskInfo = taskService.getTaskByCode(taskVo.getCode()); |
|---|
| | | if (taskInfo == null){ |
|---|
| | | return new Msg(ErrorCode.ERROR_50001); |
|---|
| | | } |
|---|
| | | if (taskVo.getTaskReviews() == null || taskVo.getTaskReviews().size() < 1 |
|---|
| | | || taskVo.getTaskReviews().get(0).getIsagree() == null){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10002,"审核信息不能为空"); |
|---|
| | | } |
|---|
| | | TaskReview taskReview = taskVo.getTaskReviews().get(0); |
|---|
| | | String content; |
|---|
| | | UserInfo userInfo = userService.getById(getUser().getId()); |
|---|
| | | |
|---|
| | | if (taskInfo.getStatus().equals(TaskInfo.TEST_COMMITTED)){ |
|---|
| | | if (taskReview.getIsagree() == 1){ |
|---|
| | | taskInfo.setStatus(TaskInfo.TEST_CHECKED); |
|---|
| | | List<TaskAnalysis>taskAnalyses = taskVo.getTaskAnalyses(); |
|---|
| | | taskAnalyses.forEach(item->{ |
|---|
| | | item.setTaskcode(taskVo.getCode()); |
|---|
| | | item.setCreatedby(userInfo.getRealname()); |
|---|
| | | item.setCreatedat(new Date()); |
|---|
| | | }); |
|---|
| | | taskAnalysisService.saveBatch(taskAnalyses); |
|---|
| | | content = "检测中心确认"; |
|---|
| | | }else { |
|---|
| | | taskInfo.setStatus(TaskInfo.REJECTED); |
|---|
| | | content = "检测中心驳回"; |
|---|
| | | } |
|---|
| | | }else if (taskInfo.getStatus().equals(TaskInfo.APPROVED) && taskInfo.getFlag().equals(TaskInfo.DOING)){ |
|---|
| | | if (taskReview.getIsagree() == 1){ |
|---|
| | | List<TaskAnalysis>taskAnalyses = taskVo.getTaskAnalyses(); |
|---|
| | | taskAnalyses.forEach(item->{ |
|---|
| | | item.setTaskcode(taskVo.getCode()); |
|---|
| | | item.setCreatedby(userInfo.getRealname()); |
|---|
| | | item.setCreatedat(new Date()); |
|---|
| | | }); |
|---|
| | | taskAnalysisService.saveBatch(taskAnalyses); |
|---|
| | | content = "检测中心任务中提交数据"; |
|---|
| | | }else { |
|---|
| | | content = "检测中心提交检测异常"; |
|---|
| | | String warnContent = "在任务 "+taskInfo.getCode()+" 中，检测中心提交检测异常"; |
|---|
| | | WarningInfo warningInfo = new WarningInfo(); |
|---|
| | | warningInfo.setCreatedat(new Date()); |
|---|
| | | warningInfo.setTaskcode(taskInfo.getCode()); |
|---|
| | | warningInfo.setContent(warnContent); |
|---|
| | | warningInfo.setType(WarningInfo.WARNING); |
|---|
| | | warningService.save(warningInfo); |
|---|
| | | } |
|---|
| | | }else { |
|---|
| | | return new Msg(ErrorCode.ERROR_50004,"当前状态不允许确认"); |
|---|
| | | } |
|---|
| | | |
|---|
| | | taskInfo.setModifiedby(userInfo.getRealname()); |
|---|
| | | taskInfo.setModifiedat(new Date()); |
|---|
| | | taskReviewService.saveReview(taskReview); |
|---|
| | | taskService.updateById(taskInfo); |
|---|
| | | TaskLog taskLog = new TaskLog(taskInfo.getCode(),content,userInfo.getRealname(),new Date(),getUser().getCompany()); |
|---|
| | | taskLogService.save(taskLog); |
|---|
| | | |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation(value = "施工单位确认",notes = "施工单位确认") |
|---|
| | | @PostMapping("/construction/review") |
|---|
| | | public Msg constructionReview(@RequestBody TaskVo taskVo){ |
|---|
| | | if (StringUtils.isBlank(taskVo.getCode())){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10002); |
|---|
| | | } |
|---|
| | | TaskInfo taskInfo = taskService.getTaskByCode(taskVo.getCode()); |
|---|
| | | if (taskInfo == null){ |
|---|
| | | return new Msg(ErrorCode.ERROR_50001); |
|---|
| | | } |
|---|
| | | if (!taskInfo.getStatus().equals(TaskInfo.COMMITTED)){ |
|---|
| | | return new Msg(ErrorCode.ERROR_50004,"当前状态不允许确认"); |
|---|
| | | } |
|---|
| | | if (taskVo.getTaskReviews() == null || taskVo.getTaskReviews().size() < 1 |
|---|
| | | || taskVo.getTaskReviews().get(0).getIsagree() == null){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10002,"审核信息不能为空"); |
|---|
| | | } |
|---|
| | | TaskReview taskReview = taskVo.getTaskReviews().get(0); |
|---|
| | | String content; |
|---|
| | | UserInfo userInfo = userService.getById(getUser().getId()); |
|---|
| | | if (!userInfo.getCompany().equals(taskInfo.getConstructionunit()) && !userInfo.getDepartment().equals(taskInfo.getConstructionunit())){ |
|---|
| | | return new Msg(ErrorCode.ERROR_70001); |
|---|
| | | } |
|---|
| | | if (taskReview.getIsagree() == 1){ |
|---|
| | | taskInfo.setStatus(TaskInfo.CONTRACTOR_APPROVED); |
|---|
| | | taskInfo.setConstructionopinion(taskVo.getConstructionopinion() == null?"同意":taskVo.getConstructionopinion()); |
|---|
| | | taskInfo.setConstructionname(userInfo.getRealname()); |
|---|
| | | taskInfo.setConstructiontime(new Date()); |
|---|
| | | taskInfo.setModifiedby(userInfo.getRealname()); |
|---|
| | | taskInfo.setModifiedat(new Date()); |
|---|
| | | |
|---|
| | | List<TaskWorkerVo>workers = taskVo.getTaskWorkers(); |
|---|
| | | List<TaskSecurity>securities = taskVo.getTaskSecurities(); |
|---|
| | | List<TaskEnclosure>enclosures = taskVo.getResources(); |
|---|
| | | List<TaskEquipment>equipments = taskVo.getTaskEquipments(); |
|---|
| | | TaskRisk risk = taskRiskService.getTaskRiskByCode(taskVo.getCode()); |
|---|
| | | risk.setConfirmat(new Date()); |
|---|
| | | taskRiskService.updateById(risk); |
|---|
| | | taskWorkerService.saveBatch(workers, userInfo); |
|---|
| | | taskSecurityService.saveBatch(securities); |
|---|
| | | taskEquipmentService.saveBatch(equipments); |
|---|
| | | taskEnclosureService.saveBatch(enclosures); |
|---|
| | | content = "施工单位确认"; |
|---|
| | | }else { |
|---|
| | | taskInfo.setStatus(TaskInfo.REJECTED); |
|---|
| | | taskInfo.setConstructionopinion(taskVo.getConstructionopinion() == null?"驳回":taskVo.getConstructionopinion()); |
|---|
| | | taskInfo.setConstructionname(userInfo.getRealname()); |
|---|
| | | taskInfo.setConstructiontime(new Date()); |
|---|
| | | taskInfo.setModifiedby(userInfo.getRealname()); |
|---|
| | | taskInfo.setModifiedat(new Date()); |
|---|
| | | content = "施工单位驳回"; |
|---|
| | | } |
|---|
| | | taskService.updateById(taskInfo); |
|---|
| | | taskReviewService.saveReview(taskReview); |
|---|
| | | TaskLog taskLog = new TaskLog(taskInfo.getCode(),content,userInfo.getRealname(),new Date(),getUser().getCompany()); |
|---|
| | | taskLogService.save(taskLog); |
|---|
| | | |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation(value = "动火部位审核",notes = "动火部位审核") |
|---|
| | | @PostMapping("/part/review") |
|---|
| | | public Msg partReview(@RequestBody TaskVo taskVo){ |
|---|
| | | if (StringUtils.isBlank(taskVo.getCode())){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10002); |
|---|
| | | } |
|---|
| | | TaskInfo taskInfo = taskService.getTaskByCode(taskVo.getCode()); |
|---|
| | | if (taskInfo == null){ |
|---|
| | | return new Msg(ErrorCode.ERROR_50001); |
|---|
| | | } |
|---|
| | | if (!taskInfo.getStatus().equals(TaskInfo.CONTRACTOR_APPROVED)){ |
|---|
| | | return new Msg(ErrorCode.ERROR_50004,"当前状态不允许确认"); |
|---|
| | | } |
|---|
| | | if (taskVo.getTaskReviews() == null || taskVo.getTaskReviews().size() < 1 |
|---|
| | | || taskVo.getTaskReviews().get(0).getIsagree() == null){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10002,"审核信息不能为空"); |
|---|
| | | } |
|---|
| | | TaskReview taskReview = taskVo.getTaskReviews().get(0); |
|---|
| | | UserInfo userInfo = userService.getById(getUser().getId()); |
|---|
| | | String content; |
|---|
| | | Byte level = taskInfo.getLevel(); |
|---|
| | | if (taskInfo.getIsholiday().equals((byte)1)){ |
|---|
| | | level++; |
|---|
| | | } |
|---|
| | | if (taskReview.getIsagree() == 1){ |
|---|
| | | if (StringUtils.isBlank(taskVo.getApproversupervisor())){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10002,"需要指定监火人"); |
|---|
| | | } |
|---|
| | | if (StringUtils.isBlank(taskVo.getAnalyst())){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10002,"需要指定分析人"); |
|---|
| | | } |
|---|
| | | if (level.equals(TaskInfo.LEVEL_SECOND)){ |
|---|
| | | taskInfo.setStatus(TaskInfo.APPROVED); |
|---|
| | | taskInfo.setFlag(TaskInfo.WAIT_CHECK); |
|---|
| | | }else { |
|---|
| | | taskInfo.setStatus(TaskInfo.PART_APPROVED); |
|---|
| | | } |
|---|
| | | taskInfo.setApplyunitopinion(taskVo.getApplyunitopinion() == null?"同意":taskVo.getApplyunitopinion()); |
|---|
| | | taskInfo.setApplyunitname(userInfo.getRealname()); |
|---|
| | | taskInfo.setApplyunittime(new Date()); |
|---|
| | | taskInfo.setModifiedby(userInfo.getRealname()); |
|---|
| | | taskInfo.setModifiedat(new Date()); |
|---|
| | | taskInfo.setAnalyst(taskVo.getAnalyst()); |
|---|
| | | taskInfo.setApproversupervisor(taskVo.getApproversupervisor()); |
|---|
| | | content = "动火部位审核通过"; |
|---|
| | | }else { |
|---|
| | | taskInfo.setStatus(TaskInfo.REJECTED); |
|---|
| | | taskInfo.setApplyunitopinion(taskVo.getApplyunitopinion() == null?"驳回":taskVo.getApplyunitopinion()); |
|---|
| | | taskInfo.setApplyunitname(userInfo.getRealname()); |
|---|
| | | taskInfo.setApplyunittime(new Date()); |
|---|
| | | taskInfo.setModifiedby(userInfo.getRealname()); |
|---|
| | | taskInfo.setModifiedat(new Date()); |
|---|
| | | taskEquipmentService.removeByTaskCodeByConstruction(taskInfo.getCode()); |
|---|
| | | content = "动火部位审核驳回"; |
|---|
| | | } |
|---|
| | | taskService.updateById(taskInfo); |
|---|
| | | taskReviewService.saveReview(taskReview); |
|---|
| | | |
|---|
| | | TaskLog taskLog = new TaskLog(taskInfo.getCode(),content,userInfo.getRealname(),new Date(),getUser().getCompany()); |
|---|
| | | taskLogService.save(taskLog); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation(value = "相关部门审核",notes = "相关部门审核") |
|---|
| | | @PostMapping("/involve/review") |
|---|
| | | public Msg involveReview(@RequestBody TaskVo taskVo){ |
|---|
| | | if (StringUtils.isBlank(taskVo.getCode())){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10002); |
|---|
| | | } |
|---|
| | | TaskInfo taskInfo = taskService.getTaskByCode(taskVo.getCode()); |
|---|
| | | if (taskInfo == null){ |
|---|
| | | return new Msg(ErrorCode.ERROR_50001); |
|---|
| | | } |
|---|
| | | if (!taskInfo.getStatus().equals(TaskInfo.PART_APPROVED)){ |
|---|
| | | return new Msg(ErrorCode.ERROR_50004,"当前状态不允许确认"); |
|---|
| | | } |
|---|
| | | if (taskVo.getTaskReviews() == null || taskVo.getTaskReviews().size() < 1 |
|---|
| | | || taskVo.getTaskReviews().get(0).getIsagree() == null){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10002,"审核信息不能为空"); |
|---|
| | | } |
|---|
| | | TaskReview taskReview = taskVo.getTaskReviews().get(0); |
|---|
| | | UserInfo userInfo = userService.getById(getUser().getId()); |
|---|
| | | List<TaskInvolveDepartment>departments = taskInvolveDepService.getListByTaskCode(taskVo.getCode()); |
|---|
| | | boolean isReviewed = false; |
|---|
| | | if (taskReview.getIsagree() == 1){ |
|---|
| | | for (TaskInvolveDepartment department : departments){ |
|---|
| | | if (department.getDepartment().equals(userInfo.getDepartment())){ |
|---|
| | | department.setStatus((byte)1); |
|---|
| | | department.setContent(taskVo.getRelevantopinion() == null?"同意":taskVo.getRelevantopinion()); |
|---|
| | | department.setReviewedby(userInfo.getRealname()); |
|---|
| | | department.setReviewedat(new Date()); |
|---|
| | | taskInvolveDepService.updateById(department); |
|---|
| | | String content = department.getDepartment()+"审核通过"; |
|---|
| | | TaskLog taskLog = new TaskLog(taskInfo.getCode(),content,userInfo.getRealname(),new Date(),getUser().getCompany()); |
|---|
| | | taskLogService.save(taskLog); |
|---|
| | | isReviewed = true; |
|---|
| | | } |
|---|
| | | } |
|---|
| | | }else { |
|---|
| | | for (TaskInvolveDepartment department : departments){ |
|---|
| | | if (department.getDepartment().equals(userInfo.getDepartment())){ |
|---|
| | | department.setStatus((byte)2); |
|---|
| | | department.setContent(taskVo.getRelevantopinion() == null?"驳回":taskVo.getRelevantopinion()); |
|---|
| | | department.setReviewedby(userInfo.getRealname()); |
|---|
| | | department.setReviewedat(new Date()); |
|---|
| | | taskInvolveDepService.updateById(department); |
|---|
| | | String content = department.getDepartment()+"审核驳回"; |
|---|
| | | TaskLog taskLog = new TaskLog(taskInfo.getCode(),content,userInfo.getRealname(),new Date(),getUser().getCompany()); |
|---|
| | | taskLogService.save(taskLog); |
|---|
| | | isReviewed = true; |
|---|
| | | } |
|---|
| | | } |
|---|
| | | taskInfo.setStatus(TaskInfo.REJECTED); |
|---|
| | | taskInfo.setRelevantopinion(taskVo.getRelevantopinion() == null?"驳回":taskVo.getRelevantopinion()); |
|---|
| | | taskInfo.setApplyunitname(userInfo.getRealname()); |
|---|
| | | taskInfo.setApplyunittime(new Date()); |
|---|
| | | taskInfo.setModifiedby(userInfo.getRealname()); |
|---|
| | | taskInfo.setModifiedat(new Date()); |
|---|
| | | taskService.updateById(taskInfo); |
|---|
| | | taskEquipmentService.removeByTaskCodeByConstruction(taskInfo.getCode()); |
|---|
| | | if (!isReviewed){ |
|---|
| | | return new Msg(ErrorCode.ERROR_70001); |
|---|
| | | } |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | if (!isReviewed){ |
|---|
| | | return new Msg(ErrorCode.ERROR_70001); |
|---|
| | | } |
|---|
| | | boolean isAllAgree = true; |
|---|
| | | for (TaskInvolveDepartment department : departments){ |
|---|
| | | if (!department.getStatus().equals((byte)1)) { |
|---|
| | | isAllAgree = false; |
|---|
| | | } |
|---|
| | | } |
|---|
| | | if (isAllAgree){ |
|---|
| | | taskInfo.setStatus(TaskInfo.RELEVANT_APPROVED); |
|---|
| | | taskInfo.setRelevantopinion(departments.get(0).getContent()); |
|---|
| | | taskInfo.setRelevanttime(new Date()); |
|---|
| | | taskInfo.setModifiedby(userInfo.getRealname()); |
|---|
| | | taskInfo.setModifiedat(new Date()); |
|---|
| | | taskService.updateById(taskInfo); |
|---|
| | | } |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation(value = "安全部门审核",notes = "安全部门审核") |
|---|
| | | @PostMapping("/security/review") |
|---|
| | | public Msg securityReview(@RequestBody TaskVo taskVo){ |
|---|
| | | if (StringUtils.isBlank(taskVo.getCode())){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10002); |
|---|
| | | } |
|---|
| | | TaskInfo taskInfo = taskService.getTaskByCode(taskVo.getCode()); |
|---|
| | | Byte level = taskInfo.getLevel(); |
|---|
| | | if (taskInfo == null){ |
|---|
| | | return new Msg(ErrorCode.ERROR_50001); |
|---|
| | | } |
|---|
| | | |
|---|
| | | if (taskInfo.getIsholiday().equals((byte)1)){ |
|---|
| | | level++; |
|---|
| | | } |
|---|
| | | |
|---|
| | | if (!taskInfo.getStatus().equals(TaskInfo.RELEVANT_APPROVED)){ |
|---|
| | | return new Msg(ErrorCode.ERROR_50004,"当前状态不允许确认"); |
|---|
| | | } |
|---|
| | | if (taskVo.getTaskReviews() == null || taskVo.getTaskReviews().size() < 1 |
|---|
| | | || taskVo.getTaskReviews().get(0).getIsagree() == null){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10002,"审核信息不能为空"); |
|---|
| | | } |
|---|
| | | TaskReview taskReview = taskVo.getTaskReviews().get(0); |
|---|
| | | String content; |
|---|
| | | UserInfo userInfo = userService.getById(getUser().getId()); |
|---|
| | | if (taskReview.getIsagree() == 1){ |
|---|
| | | if (level.equals(TaskInfo.LEVEL_ONE)){ |
|---|
| | | taskInfo.setStatus(TaskInfo.APPROVED); |
|---|
| | | taskInfo.setFlag(TaskInfo.WAIT_CHECK); |
|---|
| | | }else { |
|---|
| | | taskInfo.setStatus(TaskInfo.SECURITY_APPROVED); |
|---|
| | | } |
|---|
| | | taskInfo.setSecurityopinion(taskVo.getSecurityopinion() == null?"同意":taskVo.getSecurityopinion()); |
|---|
| | | taskInfo.setSecurityname(userInfo.getRealname()); |
|---|
| | | taskInfo.setSecuritytime(new Date()); |
|---|
| | | taskInfo.setModifiedby(userInfo.getRealname()); |
|---|
| | | taskInfo.setModifiedat(new Date()); |
|---|
| | | content = "安全部门审核通过"; |
|---|
| | | }else { |
|---|
| | | taskInfo.setStatus(TaskInfo.REJECTED); |
|---|
| | | taskInfo.setSecurityopinion(taskVo.getSecurityopinion() == null?"驳回":taskVo.getSecurityopinion()); |
|---|
| | | taskInfo.setSecurityname(userInfo.getRealname()); |
|---|
| | | taskInfo.setSecuritytime(new Date()); |
|---|
| | | taskInfo.setModifiedby(userInfo.getRealname()); |
|---|
| | | taskInfo.setModifiedat(new Date()); |
|---|
| | | content = "安全部门审核驳回"; |
|---|
| | | taskEquipmentService.removeByTaskCodeByConstruction(taskInfo.getCode()); |
|---|
| | | } |
|---|
| | | taskService.updateById(taskInfo); |
|---|
| | | taskReviewService.saveReview(taskReview); |
|---|
| | | TaskLog taskLog = new TaskLog(taskInfo.getCode(),content,userInfo.getRealname(),new Date(),getUser().getCompany()); |
|---|
| | | taskLogService.save(taskLog); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation(value = "单位负责人审核",notes = "单位负责人审核") |
|---|
| | | @PostMapping("/leader/review") |
|---|
| | | public Msg leaderReview(@RequestBody TaskVo taskVo){ |
|---|
| | | if (StringUtils.isBlank(taskVo.getCode())){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10002); |
|---|
| | | } |
|---|
| | | TaskInfo taskInfo = taskService.getTaskByCode(taskVo.getCode()); |
|---|
| | | if (taskInfo == null){ |
|---|
| | | return new Msg(ErrorCode.ERROR_50001); |
|---|
| | | } |
|---|
| | | if (!taskInfo.getStatus().equals(TaskInfo.SECURITY_APPROVED)){ |
|---|
| | | return new Msg(ErrorCode.ERROR_50004,"当前状态不允许确认"); |
|---|
| | | } |
|---|
| | | if (taskVo.getTaskReviews() == null || taskVo.getTaskReviews().size() < 1 |
|---|
| | | || taskVo.getTaskReviews().get(0).getIsagree() == null){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10002,"审核信息不能为空"); |
|---|
| | | } |
|---|
| | | TaskReview taskReview = taskVo.getTaskReviews().get(0); |
|---|
| | | String content; |
|---|
| | | UserInfo userInfo = userService.getById(getUser().getId()); |
|---|
| | | if (taskReview.getIsagree() == 1){ |
|---|
| | | taskInfo.setStatus(TaskInfo.APPROVED); |
|---|
| | | taskInfo.setFlag(TaskInfo.WAIT_CHECK); |
|---|
| | | taskInfo.setEnterpriseopinion(taskVo.getEnterpriseopinion() == null?"同意":taskVo.getEnterpriseopinion()); |
|---|
| | | taskInfo.setEnterprisename(userInfo.getRealname()); |
|---|
| | | taskInfo.setEnterprisetime(new Date()); |
|---|
| | | taskInfo.setModifiedby(userInfo.getRealname()); |
|---|
| | | taskInfo.setModifiedat(new Date()); |
|---|
| | | content = "单位负责人审核通过"; |
|---|
| | | }else { |
|---|
| | | taskInfo.setStatus(TaskInfo.REJECTED); |
|---|
| | | taskInfo.setEnterpriseopinion(taskVo.getEnterpriseopinion() == null?"驳回":taskVo.getEnterpriseopinion()); |
|---|
| | | taskInfo.setEnterprisename(userInfo.getRealname()); |
|---|
| | | taskInfo.setEnterprisetime(new Date()); |
|---|
| | | taskInfo.setModifiedby(userInfo.getRealname()); |
|---|
| | | taskInfo.setModifiedat(new Date()); |
|---|
| | | content = "单位负责人审核驳回"; |
|---|
| | | taskEquipmentService.removeByTaskCodeByConstruction(taskInfo.getCode()); |
|---|
| | | } |
|---|
| | | taskReviewService.saveReview(taskReview); |
|---|
| | | taskService.updateById(taskInfo); |
|---|
| | | TaskLog taskLog = new TaskLog(taskInfo.getCode(),content,userInfo.getRealname(),new Date(),getUser().getCompany()); |
|---|
| | | taskLogService.save(taskLog); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation(value = "申请人撤销",notes = "申请人撤销") |
|---|
| | | @PostMapping("/revoke") |
|---|
| | | public Msg revoke(@RequestBody TaskVo taskVo){ |
|---|
| | | if (StringUtils.isBlank(taskVo.getCode())){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10002); |
|---|
| | | } |
|---|
| | | TaskInfo taskInfo = taskService.getTaskByCode(taskVo.getCode()); |
|---|
| | | if (taskInfo == null){ |
|---|
| | | return new Msg(ErrorCode.ERROR_50001); |
|---|
| | | } |
|---|
| | | if (!taskInfo.getStatus().equals(TaskInfo.COMMITTED)){ |
|---|
| | | return new Msg(ErrorCode.ERROR_50004,"当前状态不允许取消"); |
|---|
| | | } |
|---|
| | | UserInfo userInfo = userService.getById(getUser().getId()); |
|---|
| | | if (!userInfo.getRealname().equals(taskInfo.getApplicant())){ |
|---|
| | | return new Msg(ErrorCode.ERROR_50004,"只有申请人才能撤销"); |
|---|
| | | } |
|---|
| | | String content = "撤销申请"; |
|---|
| | | taskInfo.setStatus(TaskInfo.UNCOMMITTED); |
|---|
| | | taskInfo.setModifiedby(userInfo.getRealname()); |
|---|
| | | taskInfo.setModifiedat(new Date()); |
|---|
| | | taskService.updateById(taskInfo); |
|---|
| | | |
|---|
| | | TaskLog taskLog = new TaskLog(taskInfo.getCode(),content,userInfo.getRealname(),new Date(),getUser().getCompany()); |
|---|
| | | taskLogService.save(taskLog); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation(value = "监火人检查",notes = "监火人检查") |
|---|
| | | @PostMapping("/supervisor/check") |
|---|
| | | public Msg supervisorCheck(@RequestBody TaskCheck taskCheck){ |
|---|
| | | if (taskCheck == null || StringUtils.isBlank(taskCheck.getCode())){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10001); |
|---|
| | | } |
|---|
| | | TaskReview taskReview = taskCheck.getTaskReview(); |
|---|
| | | if (taskReview == null || taskReview.getIsagree() == null){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10001,"审核信息不能为空"); |
|---|
| | | } |
|---|
| | | UserInfo userInfo = userService.getById(getUser().getId()); |
|---|
| | | TaskInfo taskInfo = taskService.getTaskByCode(taskCheck.getCode()); |
|---|
| | | if (taskInfo == null){ |
|---|
| | | return new Msg(ErrorCode.ERROR_50001); |
|---|
| | | } |
|---|
| | | Date now = new Date(); |
|---|
| | | if (now.getTime() < taskInfo.getStarttime().getTime() || now.getTime() > taskInfo.getEndtime().getTime()){ |
|---|
| | | return new Msg(ErrorCode.ERROR_50004,"不在预计的工作时间"); |
|---|
| | | } |
|---|
| | | byte isAgree = taskCheck.getTaskReview().getIsagree(); |
|---|
| | | byte agree = 1; |
|---|
| | | byte refuse = 0; |
|---|
| | | if (isAgree == agree){ |
|---|
| | | for (EquipmentInfo equipmentInfo:taskCheck.getEquipments()){ |
|---|
| | | EquipmentInfo equipmentInfoExist = equipmentService.selectByNumber(equipmentInfo.getNumber()); |
|---|
| | | TaskEquipmentBindInfo taskEquipmentBindInfo = new TaskEquipmentBindInfo(); |
|---|
| | | if (equipmentInfoExist == null){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10004,"未找到该条码对应的设备"); |
|---|
| | | }else { |
|---|
| | | taskEquipmentBindInfo.setEquipmentname(equipmentInfoExist.getName()); |
|---|
| | | } |
|---|
| | | taskEquipmentBindInfo.setTaskcode(taskCheck.getCode()); |
|---|
| | | taskEquipmentBindInfo.setEquipmentnumber(equipmentInfo.getNumber()); |
|---|
| | | taskEquipmentBindInfo.setUpdateby(getUser().getRealname()); |
|---|
| | | taskEquipmentBindInfo.setUpdatetime(new Date()); |
|---|
| | | taskEquipmentBindService.save(taskEquipmentBindInfo); |
|---|
| | | } |
|---|
| | | taskInfo.setSupervisoropinion(taskCheck.getContent()); |
|---|
| | | taskInfo.setFlag(TaskInfo.WAIT_START); |
|---|
| | | taskInfo.setModifiedby(userInfo.getRealname()); |
|---|
| | | taskInfo.setModifiedat(new Date()); |
|---|
| | | taskService.updateById(taskInfo); |
|---|
| | | String content = "监火人检查任务通过"; |
|---|
| | | TaskLog taskLog = new TaskLog(taskInfo.getCode(),content,userInfo.getRealname(),new Date(),getUser().getCompany()); |
|---|
| | | taskLogService.save(taskLog); |
|---|
| | | |
|---|
| | | }else if (isAgree == refuse){ |
|---|
| | | taskInfo.setSupervisoropinion(taskCheck.getContent()); |
|---|
| | | taskInfo.setFlag(TaskInfo.WAIT_RECTIFY); |
|---|
| | | taskInfo.setModifiedby(userInfo.getRealname()); |
|---|
| | | taskInfo.setModifiedat(new Date()); |
|---|
| | | taskService.updateById(taskInfo); |
|---|
| | | List<TaskEnclosure> resources = taskCheck.getResources(); |
|---|
| | | if (resources == null || resources.size() == 0){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10002); |
|---|
| | | } |
|---|
| | | taskEnclosureService.removeByTaskCodeAndType(taskInfo.getCode(),"检查整改问题"); |
|---|
| | | |
|---|
| | | resources.forEach(item->{ |
|---|
| | | item.setTaskcode(taskCheck.getCode()); |
|---|
| | | item.setCreatedat(new Date()); |
|---|
| | | item.setCreatedby(userInfo.getRealname()); |
|---|
| | | }); |
|---|
| | | taskEnclosureService.saveBatch(taskCheck.getResources()); |
|---|
| | | String content = "监火人检查任务不通过"; |
|---|
| | | TaskLog taskLog = new TaskLog(taskInfo.getCode(),content,userInfo.getRealname(),new Date(),getUser().getCompany()); |
|---|
| | | taskLogService.save(taskLog); |
|---|
| | | } |
|---|
| | | taskReviewService.saveReview(taskReview); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/addEquipments") |
|---|
| | | @ApiOperation(value = "添加作业设备数据",response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "taskcode",value = "作业编号"), |
|---|
| | | @ApiImplicitParam(name = "equipmentnumber",value = "设备条码"), |
|---|
| | | }) |
|---|
| | | public Msg addTaskEquipments(@RequestBody TaskCheck taskCheck){ |
|---|
| | | if (taskCheck == null || StringUtils.isBlank(taskCheck.getCode())){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10001); |
|---|
| | | } |
|---|
| | | TaskReview taskReview = taskCheck.getTaskReview(); |
|---|
| | | if (taskReview == null || taskReview.getIsagree() == null){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10001,"审核信息不能为空"); |
|---|
| | | } |
|---|
| | | |
|---|
| | | UserInfo userInfo = userService.getById(getUser().getId()); |
|---|
| | | TaskInfo taskInfo = taskService.getTaskByCode(taskCheck.getCode()); |
|---|
| | | if (taskInfo == null){ |
|---|
| | | return new Msg(ErrorCode.ERROR_50001); |
|---|
| | | } |
|---|
| | | if (!taskInfo.getFlag().equals(TaskInfo.WAIT_START)){ |
|---|
| | | return new Msg(ErrorCode.ERROR_50004); |
|---|
| | | } |
|---|
| | | |
|---|
| | | Date now = new Date(); |
|---|
| | | if (now.getTime() < taskInfo.getStarttime().getTime() || now.getTime() > taskInfo.getEndtime().getTime()){ |
|---|
| | | return new Msg(ErrorCode.ERROR_50004,"不在预计的工作时间"); |
|---|
| | | } |
|---|
| | | if (taskCheck.getEquipments() == null || taskCheck.getEquipments().size() == 0){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10002,"设备信息不能为空"); |
|---|
| | | } |
|---|
| | | |
|---|
| | | List<TaskEquipmentBindInfo>equipmentBindInfos = new ArrayList<>(); |
|---|
| | | List<EquipmentInfo>equipmentInfos = new ArrayList<>(); |
|---|
| | | for (EquipmentInfo equipmentInfo:taskCheck.getEquipments()){ |
|---|
| | | EquipmentInfo equipmentInfoExist = equipmentService.selectByNumber(equipmentInfo.getNumber()); |
|---|
| | | taskEquipmentBindService.removeByTaskCode(taskCheck.getCode(),userInfo.getRealname()); |
|---|
| | | TaskEquipmentBindInfo taskEquipmentBindInfo = new TaskEquipmentBindInfo(); |
|---|
| | | if (equipmentInfoExist == null){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10004,equipmentInfo.getNumber()+" 未找到该条码对应的设备"); |
|---|
| | | }else if (equipmentInfoExist.getStatus() == (byte)1){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10004,equipmentInfo.getNumber()+" 该设备正在使用中"); |
|---|
| | | }else { |
|---|
| | | taskEquipmentBindInfo.setEquipmentname(equipmentInfoExist.getName()); |
|---|
| | | } |
|---|
| | | taskEquipmentBindInfo.setTaskcode(taskCheck.getCode()); |
|---|
| | | taskEquipmentBindInfo.setEquipmentnumber(equipmentInfo.getNumber()); |
|---|
| | | taskEquipmentBindInfo.setUpdateby(userInfo.getRealname()); |
|---|
| | | taskEquipmentBindInfo.setUpdatetime(new Date()); |
|---|
| | | equipmentBindInfos.add(taskEquipmentBindInfo); |
|---|
| | | byte using = 1; |
|---|
| | | equipmentInfoExist.setStatus(using); |
|---|
| | | equipmentInfos.add(equipmentInfoExist); |
|---|
| | | } |
|---|
| | | taskEquipmentBindService.saveBatch(equipmentBindInfos); |
|---|
| | | equipmentService.updateBatchById(equipmentInfos); |
|---|
| | | taskInfo.setSupervisoropinion(taskCheck.getContent()); |
|---|
| | | taskInfo.setFlag(TaskInfo.DOING); |
|---|
| | | taskInfo.setModifiedby(userInfo.getRealname()); |
|---|
| | | taskInfo.setModifiedat(new Date()); |
|---|
| | | taskService.updateById(taskInfo); |
|---|
| | | taskReviewService.saveReview(taskReview); |
|---|
| | | String content = "绑定设备，准备开始工作"; |
|---|
| | | TaskLog taskLog = new TaskLog(taskInfo.getCode(),content,userInfo.getRealname(),new Date(),getUser().getCompany()); |
|---|
| | | taskLogService.save(taskLog); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/flag/check") |
|---|
| | | @ApiOperation(value = "将异常任务修改成待检查",response = Msg.class) |
|---|
| | | public Msg changeStatus(@RequestBody TaskCheck taskCheck){ |
|---|
| | | if (StringUtils.isBlank(taskCheck.getCode())){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10001); |
|---|
| | | } |
|---|
| | | TaskInfo taskInfo = taskService.getTaskByCode(taskCheck.getCode()); |
|---|
| | | if (taskInfo == null){ |
|---|
| | | return new Msg(ErrorCode.ERROR_50001); |
|---|
| | | } |
|---|
| | | if (!(taskInfo.getFlag().equals(TaskInfo.WAIT_RECTIFY) || taskInfo.getFlag().equals(TaskInfo.ABORT) )){ |
|---|
| | | return new Msg(ErrorCode.ERROR_50004); |
|---|
| | | } |
|---|
| | | |
|---|
| | | taskInfo.setFlag(TaskInfo.WAIT_CHECK); |
|---|
| | | taskInfo.setModifiedat(new Date()); |
|---|
| | | taskInfo.setModifiedby(getUser().getRealname()); |
|---|
| | | taskService.updateById(taskInfo); |
|---|
| | | |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/flag/abort") |
|---|
| | | @ApiOperation(value = "将进行中的任务改为中止",response = Msg.class) |
|---|
| | | public Msg changeStatusAbort(@RequestBody TaskCheck taskCheck){ |
|---|
| | | if (StringUtils.isBlank(taskCheck.getCode())){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10001); |
|---|
| | | } |
|---|
| | | TaskInfo taskInfo = taskService.getTaskByCode(taskCheck.getCode()); |
|---|
| | | if (taskInfo == null){ |
|---|
| | | return new Msg(ErrorCode.ERROR_50001); |
|---|
| | | } |
|---|
| | | if (!(taskInfo.getFlag().equals(TaskInfo.DOING))){ |
|---|
| | | return new Msg(ErrorCode.ERROR_50004); |
|---|
| | | } |
|---|
| | | |
|---|
| | | UserInfo userInfo = userService.getById(getUser().getId()); |
|---|
| | | taskInfo.setFlag(TaskInfo.ABORT); |
|---|
| | | taskInfo.setModifiedat(new Date()); |
|---|
| | | taskInfo.setModifiedby(getUser().getRealname()); |
|---|
| | | taskInfo.setContent(taskCheck.getContent()); |
|---|
| | | taskEnclosureService.removeAndSave(taskCheck,userInfo); |
|---|
| | | |
|---|
| | | List<EquipmentInfo>equipmentInfos = equipmentService.selectUsingByTask(taskCheck.getCode()); |
|---|
| | | equipmentInfos.forEach(item->{ |
|---|
| | | byte free = 0; |
|---|
| | | item.setStatus(free); |
|---|
| | | item.setUpdatetime(new Date()); |
|---|
| | | item.setUpdateby(getUser().getRealname()); |
|---|
| | | }); |
|---|
| | | equipmentService.updateBatchById(equipmentInfos); |
|---|
| | | taskService.updateById(taskInfo); |
|---|
| | | |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/flag/complete") |
|---|
| | | @ApiOperation(value = "将进行中的任务改为已完成",response = Msg.class) |
|---|
| | | public Msg changeStatusComplete(@RequestBody TaskCheck taskCheck){ |
|---|
| | | if (StringUtils.isBlank(taskCheck.getCode())){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10001); |
|---|
| | | } |
|---|
| | | TaskInfo taskInfo = taskService.getTaskByCode(taskCheck.getCode()); |
|---|
| | | if (taskInfo == null){ |
|---|
| | | return new Msg(ErrorCode.ERROR_50001); |
|---|
| | | } |
|---|
| | | if (!(taskInfo.getFlag().equals(TaskInfo.DOING))){ |
|---|
| | | return new Msg(ErrorCode.ERROR_50004); |
|---|
| | | } |
|---|
| | | |
|---|
| | | taskInfo.setFlag(TaskInfo.COMPLETE); |
|---|
| | | taskInfo.setModifiedat(new Date()); |
|---|
| | | taskInfo.setModifiedby(getUser().getRealname()); |
|---|
| | | taskInfo.setOpinion(taskCheck.getContent()); |
|---|
| | | if (taskCheck.getResources() != null && taskCheck.getResources().size() != 0){ |
|---|
| | | taskEnclosureService.removeByTaskCodeAndType(taskInfo.getCode(),"检查整改问题"); |
|---|
| | | List<TaskEnclosure> resources = taskCheck.getResources(); |
|---|
| | | resources.forEach(item->{ |
|---|
| | | item.setTaskcode(taskCheck.getCode()); |
|---|
| | | item.setCreatedat(new Date()); |
|---|
| | | item.setCreatedby(getUser().getRealname()); |
|---|
| | | }); |
|---|
| | | taskEnclosureService.saveBatch(taskCheck.getResources()); |
|---|
| | | } |
|---|
| | | List<EquipmentInfo>equipmentInfos = equipmentService.selectUsingByTask(taskCheck.getCode()); |
|---|
| | | equipmentInfos.forEach(item->{ |
|---|
| | | byte free = 0; |
|---|
| | | item.setStatus(free); |
|---|
| | | item.setUpdatetime(new Date()); |
|---|
| | | item.setUpdateby(getUser().getRealname()); |
|---|
| | | }); |
|---|
| | | equipmentService.updateBatchById(equipmentInfos); |
|---|
| | | taskService.updateById(taskInfo); |
|---|
| | | |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation(value = "变更监护人",response = Msg.class) |
|---|
| | | @PostMapping("/changeSupervisor") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "taskcode",value = "任务编号"), |
|---|
| | | @ApiImplicitParam(name = "approversupervisor",value = "监护人") |
|---|
| | | }) |
|---|
| | | public Msg changeSupervisor(@RequestBody JSONObject object){ |
|---|
| | | String taskCode = object.getString("taskcode"); |
|---|
| | | if (StringUtils.isBlank(taskCode)){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10001); |
|---|
| | | } |
|---|
| | | TaskInfo taskInfo = taskService.getTaskByCode(taskCode); |
|---|
| | | UserInfo userInfo = userService.getById(getUser().getId()); |
|---|
| | | List<Byte>statusList = Arrays.asList(TaskInfo.REJECTED,TaskInfo.UNCOMMITTED,TaskInfo.COMMITTED,TaskInfo.CONTRACTOR_APPROVED); |
|---|
| | | if(statusList.contains(taskInfo.getStatus()) || taskInfo.getFlag().equals(TaskInfo.COMPLETE)){ |
|---|
| | | return new Msg(ErrorCode.ERROR_50004,"当前任务状态不允许修改监护人"); |
|---|
| | | } |
|---|
| | | String approversupervisor = object.getString("approversupervisor"); |
|---|
| | | if (StringUtils.isBlank(approversupervisor)){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10001,"监护人不能为空"); |
|---|
| | | } |
|---|
| | | UserInfo userInfo1 = userService.selectByRealName(null,approversupervisor); |
|---|
| | | if (userInfo1 == null){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10001,"所选监护人未录入系统"); |
|---|
| | | } |
|---|
| | | //修改监护人 |
|---|
| | | taskInfo.setApproversupervisor(approversupervisor); |
|---|
| | | |
|---|
| | | String content = "变更监护人，由 "+taskInfo.getApproversupervisor()+" 变更为 "+approversupervisor; |
|---|
| | | TaskLog taskLog = new TaskLog(taskInfo.getCode(),content,userInfo.getRealname(),new Date(),userInfo.getCompany()); |
|---|
| | | taskLogService.save(taskLog); |
|---|
| | | |
|---|
| | | taskService.updateById(taskInfo); |
|---|
| | | |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation(value = "修改作业人",response = Msg.class) |
|---|
| | | @PostMapping("/changeWorker") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "code",value = "任务编号"), |
|---|
| | | @ApiImplicitParam(name = "status",value = "审批状态"), |
|---|
| | | @ApiImplicitParam(name = "flag",value = "任务状态"), |
|---|
| | | }) |
|---|
| | | public Msg changeWorker(@RequestBody List<TaskWorkerVo> taskWorkers){ |
|---|
| | | if (taskWorkers == null || taskWorkers.size() < 1 || StringUtils.isBlank(taskWorkers.get(0).getTaskcode())){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10001); |
|---|
| | | } |
|---|
| | | String taskCode = taskWorkers.get(0).getTaskcode(); |
|---|
| | | TaskInfo taskInfo = taskService.getTaskByCode(taskCode); |
|---|
| | | UserInfo userInfo = userService.getById(getUser().getId()); |
|---|
| | | |
|---|
| | | List<TaskWorker> taskWorkerList = taskWorkerService.getListByTaskCode(taskInfo.getCode()); |
|---|
| | | |
|---|
| | | StringBuilder s = new StringBuilder(); |
|---|
| | | StringBuilder s1 = new StringBuilder(); |
|---|
| | | taskWorkerList.forEach(item-> s.append(item.getWorker()).append("，")); |
|---|
| | | taskWorkers.forEach(item-> s1.append(item.getWorker()).append("，")); |
|---|
| | | String content = "变更作业人员，由 "+s.toString()+" 变更为 "+s1.toString(); |
|---|
| | | TaskLog taskLog = new TaskLog(taskInfo.getCode(),content,userInfo.getRealname(),new Date(),userInfo.getCompany()); |
|---|
| | | taskLogService.save(taskLog); |
|---|
| | | taskWorkerService.deleteByTaskCode(taskInfo.getCode()); |
|---|
| | | taskWorkerService.saveBatch(taskWorkers,userInfo); |
|---|
| | | |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | @ApiOperation(value = "修改任务状态（Status/Flag）",response = Msg.class) |
|---|
| | | @PostMapping("/changeStatusFlag") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "code",value = "任务编号"), |
|---|
| | | @ApiImplicitParam(name = "status",value = "审批状态"), |
|---|
| | | @ApiImplicitParam(name = "flag",value = "任务状态"), |
|---|
| | | }) |
|---|
| | | public Msg changeStatusFlag(@RequestBody JSONObject object){ |
|---|
| | | if (StringUtils.isBlank(object.getString("code"))){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10001); |
|---|
| | | } |
|---|
| | | TaskInfo taskInfo = taskService.getTaskByCode(object.getString("code")); |
|---|
| | | if (taskInfo == null){ |
|---|
| | | return new Msg(ErrorCode.ERROR_50001); |
|---|
| | | } |
|---|
| | | if (object.getString("status")!=null){ |
|---|
| | | taskInfo.setStatus(object.getByte("status")); |
|---|
| | | } |
|---|
| | | if (object.getString("flag")!=null){ |
|---|
| | | taskInfo.setFlag(object.getByte("flag")); |
|---|
| | | } |
|---|
| | | taskService.updateById(taskInfo); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation(value = "获取任务状态（Flag）",response = Msg.class) |
|---|
| | | @GetMapping("/getFlag") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "code",value = "任务编号") |
|---|
| | | }) |
|---|
| | | public Msg getFlagByTaskCode(@RequestParam String code){ |
|---|
| | | if (StringUtils.isBlank(code)){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10001); |
|---|
| | | } |
|---|
| | | TaskInfo taskInfo = taskService.getTaskByCode(code); |
|---|
| | | if (taskInfo == null){ |
|---|
| | | return new Msg(ErrorCode.ERROR_50001); |
|---|
| | | } |
|---|
| | | return success(taskInfo.getFlag()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @GetMapping("/statistics") |
|---|
| | | @ApiOperation(value = "统计隐患数据",response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "pageIndex",value = "当前页码"), |
|---|
| | | @ApiImplicitParam(name = "pageSize",value = "每页行数"), |
|---|
| | | @ApiImplicitParam(name = "sort",value = "排序规则"), |
|---|
| | | @ApiImplicitParam(name = "order",value = "排序字段"), |
|---|
| | | @ApiImplicitParam(name = "starttime",value = "开始时间"), |
|---|
| | | @ApiImplicitParam(name = "endtime",value = "结束时间"), |
|---|
| | | @ApiImplicitParam(name = "company",value = "单位"), |
|---|
| | | }) |
|---|
| | | public Msg getUserInfo(@RequestParam(defaultValue = "0") Integer pageIndex, @RequestParam(defaultValue = "10") Integer pageSize, String sort,String order, |
|---|
| | | String company, String type, String starttime,String endtime, Byte status, Byte flag){ |
|---|
| | | |
|---|
| | | PageInfo pageInfo = new PageInfo(pageIndex, pageSize,sort,order); |
|---|
| | | HashMap<String, Object> condition = new HashMap<>(); |
|---|
| | | |
|---|
| | | if (StringUtils.isNotBlank(company)) { |
|---|
| | | condition.put("company", company.trim()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | if (StringUtils.isNotBlank(starttime)) { |
|---|
| | | condition.put("starttime", starttime.trim()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | if (StringUtils.isNotBlank(endtime)) { |
|---|
| | | condition.put("endtime", endtime.trim()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | if (StringUtils.isNotBlank(type)) { |
|---|
| | | condition.put("type", type.trim()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | if (null != status) { |
|---|
| | | condition.put("status", status); |
|---|
| | | } |
|---|
| | | |
|---|
| | | if (null != flag) { |
|---|
| | | condition.put("flag", flag); |
|---|
| | | } |
|---|
| | | |
|---|
| | | UserInfo userInfo = userService.selectByUser(getUser().getUsername()); |
|---|
| | | |
|---|
| | | if (!companyService.isMain(userInfo.getCompany())){ |
|---|
| | | condition.put("company", userInfo.getCompany()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | pageInfo.setCondition(condition); |
|---|
| | | taskService.selectStatisticsData(pageInfo); |
|---|
| | | return success(pageInfo); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | //获取在作业中的作业 包括作业类型 作业内容和作业开始事件和结束事件 |
|---|
| | | @GetMapping("/workShow/taskList") |
|---|
| | | public Msg workShowTaskList() { |
|---|
| | | List<TaskVo> taskList = taskService.getWorkShowTaskList(getUser()); |
|---|
| | | return success(taskList); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | //获取在作业中的作业的人员信息，常调用; |
|---|
| | | @GetMapping("/workShow/personList") |
|---|
| | | public Msg workShowPersonList(){ |
|---|
| | | List<TaskVo> taskList = taskService.getWorkShowPersonList(getUser()); |
|---|
| | | return success(taskList); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @GetMapping("/workCert-regenerate") |
|---|
| | | public Msg workShowPerson(@RequestParam String code){ |
|---|
| | | taskService.generateAllWorkCert(code); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Controller; |
|---|
| | | |
|---|
| | | import com.alibaba.fastjson.JSONArray; |
|---|
| | | import com.alibaba.fastjson.JSONObject; |
|---|
| | | import com.gk.hotwork.Controller.Base.BaseController; |
|---|
| | | import com.gk.hotwork.Domain.*; |
|---|
| | | import com.gk.hotwork.Domain.Enum.ErrorCode; |
|---|
| | | import com.gk.hotwork.Domain.Utils.BeanUtils; |
|---|
| | | import com.gk.hotwork.Domain.Utils.Msg; |
|---|
| | | import com.gk.hotwork.Domain.Utils.PageInfo; |
|---|
| | | import com.gk.hotwork.Domain.Utils.StringUtils; |
|---|
| | | import com.gk.hotwork.Domain.Vo.EquipmentVo; |
|---|
| | | import com.gk.hotwork.Domain.Vo.TaskCheck; |
|---|
| | | import com.gk.hotwork.Service.*; |
|---|
| | | import io.swagger.annotations.Api; |
|---|
| | | import io.swagger.annotations.ApiImplicitParam; |
|---|
| | | import io.swagger.annotations.ApiImplicitParams; |
|---|
| | | import io.swagger.annotations.ApiOperation; |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.validation.BindingResult; |
|---|
| | | import org.springframework.validation.FieldError; |
|---|
| | | import org.springframework.validation.annotation.Validated; |
|---|
| | | import org.springframework.web.bind.annotation.*; |
|---|
| | | |
|---|
| | | import java.util.ArrayList; |
|---|
| | | import java.util.Date; |
|---|
| | | import java.util.HashMap; |
|---|
| | | import java.util.List; |
|---|
| | | import java.util.stream.Collectors; |
|---|
| | | |
|---|
| | | @Api(tags = "作业设备数据接口") |
|---|
| | | @RestController |
|---|
| | | public class TaskEquipmentController extends BaseController { |
|---|
| | | @Autowired |
|---|
| | | TaskEquipmentBindService taskEquipmentBindService; |
|---|
| | | @Autowired |
|---|
| | | TaskGasService taskGasService; |
|---|
| | | @Autowired |
|---|
| | | TaskLocationService taskLocationService; |
|---|
| | | @Autowired |
|---|
| | | EquipmentService equipmentService; |
|---|
| | | @Autowired |
|---|
| | | GasWarnService gasWarnService; |
|---|
| | | @Autowired |
|---|
| | | VideoService videoService; |
|---|
| | | @Autowired |
|---|
| | | TaskService taskService; |
|---|
| | | |
|---|
| | | @PostMapping("/addTaskEquipment") |
|---|
| | | @ApiOperation(value = "添加作业设备数据",response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "taskcode",value = "作业编号"), |
|---|
| | | @ApiImplicitParam(name = "equipmentnumber",value = "设备条码"), |
|---|
| | | }) |
|---|
| | | public Msg addTaskEquipment(@Validated @RequestBody TaskEquipmentBindInfo taskEquipmentBindInfo, BindingResult bindingResult){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | |
|---|
| | | if (bindingResult.hasErrors()) { |
|---|
| | | StringBuilder stringBuilder = new StringBuilder(); |
|---|
| | | for (String s : bindingResult.getFieldErrors().stream() |
|---|
| | | .map(FieldError::getDefaultMessage).collect(Collectors.toList())) { |
|---|
| | | stringBuilder.append(s).append(","); |
|---|
| | | } |
|---|
| | | return new Msg(ErrorCode.ERROR_10002,stringBuilder.toString()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | EquipmentInfo equipmentInfo = equipmentService.selectByNumber(taskEquipmentBindInfo.getEquipmentnumber()); |
|---|
| | | if (equipmentInfo == null){ |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("未找到该条码对应的设备"); |
|---|
| | | return msg; |
|---|
| | | }else { |
|---|
| | | taskEquipmentBindInfo.setEquipmentname(equipmentInfo.getName()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | taskEquipmentBindInfo.setUpdateby(getUser().getRealname()); |
|---|
| | | taskEquipmentBindInfo.setUpdatetime(new Date()); |
|---|
| | | taskEquipmentBindService.save(taskEquipmentBindInfo); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/addTaskGas") |
|---|
| | | @ApiOperation(value = "添加作业气体数据",response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "taskcode",value = "作业编号"), |
|---|
| | | @ApiImplicitParam(name = "gastype",value = "气体类型"), |
|---|
| | | @ApiImplicitParam(name = "gasvalue",value = "气体浓度值"), |
|---|
| | | @ApiImplicitParam(name = "gasunit",value = "气体单位"), |
|---|
| | | }) |
|---|
| | | public Msg addTaskGas(@Validated @RequestBody List<TaskGasInfo> taskGasInfoList, BindingResult bindingResult){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | if (bindingResult.hasErrors()) { |
|---|
| | | StringBuilder stringBuilder = new StringBuilder(); |
|---|
| | | for (String s : bindingResult.getFieldErrors().stream() |
|---|
| | | .map(FieldError::getDefaultMessage).collect(Collectors.toList())) { |
|---|
| | | stringBuilder.append(s).append(","); |
|---|
| | | } |
|---|
| | | return new Msg(ErrorCode.ERROR_10002,stringBuilder.toString()); |
|---|
| | | } |
|---|
| | | for (TaskGasInfo taskGasInfo : taskGasInfoList){ |
|---|
| | | TaskInfo taskInfo = taskService.getTaskByCode(taskGasInfo.getTaskcode()); |
|---|
| | | if (!taskInfo.getFlag().equals(TaskInfo.DOING)){ |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | taskGasInfo.setIswarn((byte)0); |
|---|
| | | taskGasInfo.setIsyujing((byte)0); |
|---|
| | | GasWarnInfo gasWarnInfo = gasWarnService.selectByType(taskGasInfo.getGastype(),"报警"); |
|---|
| | | if (gasWarnInfo != null){ |
|---|
| | | if (taskGasInfo.getGasvalue().compareTo(gasWarnInfo.getMax()) > 0 |
|---|
| | | || taskGasInfo.getGasvalue().compareTo(gasWarnInfo.getMin()) < 0){ |
|---|
| | | taskGasInfo.setIswarn((byte)1); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | |
|---|
| | | GasWarnInfo gasWarnInfo1 = gasWarnService.selectByType(taskGasInfo.getGastype(),"预警"); |
|---|
| | | if (gasWarnInfo1 != null){ |
|---|
| | | if (taskGasInfo.getGasvalue().compareTo(gasWarnInfo1.getMax()) > 0 |
|---|
| | | || taskGasInfo.getGasvalue().compareTo(gasWarnInfo1.getMin()) < 0){ |
|---|
| | | taskGasInfo.setIsyujing((byte)1); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | taskGasInfo.setIssms((byte)0); |
|---|
| | | taskGasInfo.setIsmend((byte)0); |
|---|
| | | taskGasInfo.setTaskworker(getUser().getRealname()); |
|---|
| | | taskGasInfo.setUpdatetime(new Date()); |
|---|
| | | taskGasService.save(taskGasInfo); |
|---|
| | | } |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/addTaskLocation") |
|---|
| | | @ApiOperation(value = "添加作业人员位置数据",response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "taskcode",value = "作业编号"), |
|---|
| | | @ApiImplicitParam(name = "gastype",value = "气体类型"), |
|---|
| | | @ApiImplicitParam(name = "gasvalue",value = "气体浓度值"), |
|---|
| | | @ApiImplicitParam(name = "gasunit",value = "气体单位"), |
|---|
| | | }) |
|---|
| | | public Msg addTaskLocation(@Validated @RequestBody TaskLocationInfo taskLocationInfo, BindingResult bindingResult){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | if (bindingResult.hasErrors()) { |
|---|
| | | StringBuilder stringBuilder = new StringBuilder(); |
|---|
| | | for (String s : bindingResult.getFieldErrors().stream() |
|---|
| | | .map(FieldError::getDefaultMessage).collect(Collectors.toList())) { |
|---|
| | | stringBuilder.append(s).append(","); |
|---|
| | | } |
|---|
| | | return new Msg(ErrorCode.ERROR_10002,stringBuilder.toString()); |
|---|
| | | } |
|---|
| | | TaskInfo taskInfo = taskService.getTaskByCode(taskLocationInfo.getTaskcode()); |
|---|
| | | if (!taskInfo.getFlag().equals(TaskInfo.DOING)){ |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | taskLocationInfo.setTaskworker(getUser().getRealname()); |
|---|
| | | taskLocationInfo.setUpdatetime(new Date()); |
|---|
| | | taskLocationService.save(taskLocationInfo); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @GetMapping("/getTaskGas") |
|---|
| | | @ApiOperation(value = "获取作业气体浓度",response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "pageIndex",value = "当前页码"), |
|---|
| | | @ApiImplicitParam(name = "pageSize",value = "每页行数"), |
|---|
| | | @ApiImplicitParam(name = "sort",value = "排序规则"), |
|---|
| | | @ApiImplicitParam(name = "order",value = "排序字段"), |
|---|
| | | @ApiImplicitParam(name = "taskcode",value = "作业编号"), |
|---|
| | | @ApiImplicitParam(name = "gastype",value = "气体类型") |
|---|
| | | }) |
|---|
| | | public Msg getTaskGas(@RequestParam(defaultValue = "0") Integer pageIndex, @RequestParam(defaultValue = "10") Integer pageSize, String sort, String order, |
|---|
| | | String taskcode, String gastype){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | |
|---|
| | | PageInfo pageInfo = new PageInfo(pageIndex, pageSize,sort,order); |
|---|
| | | HashMap<String, Object> condition = new HashMap<String, Object>(); |
|---|
| | | |
|---|
| | | if (StringUtils.isNotBlank(gastype)) { |
|---|
| | | condition.put("gastype", gastype.trim()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | if (StringUtils.isNotBlank(taskcode)) { |
|---|
| | | condition.put("taskcode", taskcode.trim()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | pageInfo.setCondition(condition); |
|---|
| | | taskGasService.selectDataGrid(pageInfo); |
|---|
| | | msg.setResult(pageInfo); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @GetMapping("/getTaskVideo") |
|---|
| | | @ApiOperation(value = "获取视频token",response = Msg.class) |
|---|
| | | public Msg getTaskVideo(){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | VideoInfo videoInfo = videoService.getById(1); |
|---|
| | | msg.setResult(videoInfo.getToken()); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @GetMapping("getEquipment") |
|---|
| | | @ApiOperation(value = "根据Number获取设备信息",response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "number",value = "设备编号"), |
|---|
| | | }) |
|---|
| | | public Msg getEquipmentByNumber(@RequestParam("number") String number){ |
|---|
| | | if (StringUtils.isBlank(number)){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10001); |
|---|
| | | } |
|---|
| | | EquipmentInfo equipmentInfo = equipmentService.selectByNumber(number); |
|---|
| | | return success(equipmentInfo); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("getEquipments") |
|---|
| | | @ApiOperation(value = "根据Number获取设备信息",response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "number",value = "设备编号"), |
|---|
| | | }) |
|---|
| | | public Msg getEquipmentsByNumbers(@RequestBody JSONObject jsonObject){ |
|---|
| | | JSONArray array = jsonObject.getJSONArray("numbers"); |
|---|
| | | if (array == null || array.size() < 1){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10001); |
|---|
| | | } |
|---|
| | | List<EquipmentInfo> equipmentInfos = new ArrayList<>(); |
|---|
| | | for (int i = 0; i < array.size(); i++){ |
|---|
| | | String number = array.getString(i); |
|---|
| | | if (StringUtils.isBlank(number)){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10001); |
|---|
| | | } |
|---|
| | | EquipmentInfo equipmentInfo = equipmentService.selectByNumber(number); |
|---|
| | | equipmentInfos.add(equipmentInfo); |
|---|
| | | } |
|---|
| | | return success(equipmentInfos); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @GetMapping("/lastGas") |
|---|
| | | public Msg getLastGas(@RequestParam("taskCode") String taskCode, |
|---|
| | | @RequestParam("worker") String worker){ |
|---|
| | | if (StringUtils.isBlank(taskCode)){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10001); |
|---|
| | | } |
|---|
| | | List<TaskGasInfo> taskGasInfos = taskGasService.selectLastGas(taskCode,worker); |
|---|
| | | return success(taskGasInfos); |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Controller; |
|---|
| | | import java.util.Date; |
|---|
| | | |
|---|
| | | import com.alibaba.fastjson.JSONObject; |
|---|
| | | import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|---|
| | | import com.baomidou.mybatisplus.core.metadata.IPage; |
|---|
| | | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|---|
| | | import com.gk.hotwork.Controller.Base.BaseController; |
|---|
| | | import com.gk.hotwork.Domain.*; |
|---|
| | | import com.gk.hotwork.Domain.Enum.ErrorCode; |
|---|
| | | import com.gk.hotwork.Domain.Exception.BusinessException; |
|---|
| | | import com.gk.hotwork.Domain.Utils.*; |
|---|
| | | import com.gk.hotwork.Domain.Utils.Properties; |
|---|
| | | import com.gk.hotwork.Domain.Vo.DepartmentVo; |
|---|
| | | import com.gk.hotwork.Domain.Vo.UserVo; |
|---|
| | | import com.gk.hotwork.Domain.Vo.WorkCertVo; |
|---|
| | | import com.gk.hotwork.Service.*; |
|---|
| | | import io.swagger.annotations.*; |
|---|
| | | import org.apache.catalina.User; |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.beans.factory.annotation.Value; |
|---|
| | | import org.springframework.web.bind.annotation.*; |
|---|
| | | import org.springframework.web.multipart.MultipartFile; |
|---|
| | | |
|---|
| | | import java.io.File; |
|---|
| | | import java.io.FileInputStream; |
|---|
| | | import java.io.InputStream; |
|---|
| | | import java.text.SimpleDateFormat; |
|---|
| | | import java.util.*; |
|---|
| | | |
|---|
| | | @Api(tags = "用户管理数据接口") |
|---|
| | | @RestController |
|---|
| | | public class UserController extends BaseController { |
|---|
| | | |
|---|
| | | @Autowired |
|---|
| | | UserService userService; |
|---|
| | | @Autowired |
|---|
| | | RoleService roleService; |
|---|
| | | @Autowired |
|---|
| | | UserRolesService userRolesService; |
|---|
| | | @Autowired |
|---|
| | | RolePermissionsService rolePermissionsService; |
|---|
| | | @Autowired |
|---|
| | | ExcelExportService excelExportService; |
|---|
| | | @Autowired |
|---|
| | | DistrictService districtService; |
|---|
| | | @Autowired |
|---|
| | | UserRolesService userRolesInfoService; |
|---|
| | | @Autowired |
|---|
| | | CompanyService companyService; |
|---|
| | | @Autowired |
|---|
| | | DepartmentService departmentService; |
|---|
| | | @Autowired |
|---|
| | | InvolveDepService involveDepService; |
|---|
| | | @Autowired |
|---|
| | | ExamScoreService examscoreService; |
|---|
| | | @Autowired |
|---|
| | | WorkCertService workCertService; |
|---|
| | | @Autowired |
|---|
| | | private BlackListService blackListService; |
|---|
| | | @Autowired |
|---|
| | | private DeviceLocationService deviceLocationService; |
|---|
| | | @Value("${workname}") |
|---|
| | | private String workname; |
|---|
| | | @Value("${workCert}") |
|---|
| | | private String workCert; |
|---|
| | | |
|---|
| | | @Value("${filePath}") |
|---|
| | | private String filePath; //配置文件配置的物理保存地址 |
|---|
| | | @Value("${slice.size}") |
|---|
| | | private Integer sliceSize; |
|---|
| | | |
|---|
| | | @GetMapping("/user") |
|---|
| | | @ApiOperation(value = "获取用户数据",response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "pageIndex",value = "当前页码"), |
|---|
| | | @ApiImplicitParam(name = "pageSize",value = "每页行数"), |
|---|
| | | @ApiImplicitParam(name = "sort",value = "排序规则"), |
|---|
| | | @ApiImplicitParam(name = "order",value = "排序字段"), |
|---|
| | | @ApiImplicitParam(name = "username",value = "用户名"), |
|---|
| | | @ApiImplicitParam(name = "company",value = "单位"), |
|---|
| | | @ApiImplicitParam(name = "department",value = "部门"), |
|---|
| | | @ApiImplicitParam(name = "realname",value = "姓名"), |
|---|
| | | @ApiImplicitParam(name = "idcard",value = "身份证号"), |
|---|
| | | @ApiImplicitParam(name = "ispass",value = "是否通过考试"), |
|---|
| | | }) |
|---|
| | | public Msg getUserInfo(@RequestParam(defaultValue = "0") Integer pageIndex, @RequestParam(defaultValue = "10") Integer pageSize, String sort,String order, |
|---|
| | | String username,String company, String department,String realname, String idcard,Byte ispass,@RequestParam(required = false,defaultValue = "true") Boolean isMain){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | |
|---|
| | | PageInfo pageInfo = new PageInfo(pageIndex, pageSize,sort,order); |
|---|
| | | HashMap<String, Object> condition = new HashMap<String, Object>(); |
|---|
| | | |
|---|
| | | if (StringUtils.isNotBlank(username)) { |
|---|
| | | condition.put("username", username.trim()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | if (StringUtils.isNotBlank(company)) { |
|---|
| | | condition.put("company", company.trim()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | if (StringUtils.isNotBlank(department)) { |
|---|
| | | condition.put("department", department.trim()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | if (StringUtils.isNotBlank(realname)){ |
|---|
| | | condition.put("realname",realname.trim()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | if (StringUtils.isNotBlank(idcard)){ |
|---|
| | | condition.put("idcard",idcard.trim()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | if (ispass != null){ |
|---|
| | | condition.put("ispass",ispass); |
|---|
| | | } |
|---|
| | | |
|---|
| | | UserInfo userInfo = userService.selectByUser(getUser().getUsername()); |
|---|
| | | if (userInfo.getType() == 3){ |
|---|
| | | condition.put("username", userInfo.getUsername()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | // if (!companyService.isMain(userInfo.getCompany())){ |
|---|
| | | // condition.put("company", userInfo.getCompany()); |
|---|
| | | // } |
|---|
| | | //是系统菜单下的就显示主体，否则非主体 |
|---|
| | | // if (isMain) { |
|---|
| | | // condition.put("isMain", 1); |
|---|
| | | // } else { |
|---|
| | | // condition.put("isMain", 0); |
|---|
| | | // } |
|---|
| | | |
|---|
| | | pageInfo.setCondition(condition); |
|---|
| | | userService.selectUserDataGrid(pageInfo); |
|---|
| | | msg.setResult(pageInfo); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation("/获取所有未被删除的人员") |
|---|
| | | @PostMapping("/getUserList") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | }) |
|---|
| | | public Msg getUserList() { |
|---|
| | | return success(userService.getUserList()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | @GetMapping("/userList") |
|---|
| | | @ApiOperation(value = "获取对应单位、部门的人员",response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "company",value = "单位"), |
|---|
| | | @ApiImplicitParam(name = "department",value = "部门"), |
|---|
| | | }) |
|---|
| | | public Msg getUserList(String company,String department){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | HashMap<String, Object> condition = new HashMap<String, Object>(); |
|---|
| | | if (StringUtils.isNotBlank(company)) { |
|---|
| | | condition.put("company", company.trim()); |
|---|
| | | } |
|---|
| | | if (StringUtils.isNotBlank(department)) { |
|---|
| | | condition.put("department", department.trim()); |
|---|
| | | } |
|---|
| | | condition.put("examtype",workname); |
|---|
| | | List<UserVo> userVoList = new ArrayList<>(); |
|---|
| | | List<UserVo> userInfoList = userService.selectAll(condition); |
|---|
| | | // for (UserVo userVo : userInfoList){ |
|---|
| | | // List<WorkCertInfo> workCertInfo = workCertService.selectByMobile(userVo.getUsername()); |
|---|
| | | // if (workCertInfo.size() > 0){ |
|---|
| | | // userVo.setBranch(workCertInfo.get(0).getBranch()); |
|---|
| | | // userVo.setNumber(workCertInfo.get(0).getCertname()); |
|---|
| | | // userVoList.add(userVo); |
|---|
| | | // } |
|---|
| | | // } |
|---|
| | | msg.setResult(userInfoList); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | @PostMapping("/adduser") |
|---|
| | | @ApiOperation(value = "添加用户数据",response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "username",value = "手机号",required = true), |
|---|
| | | @ApiImplicitParam(name = "password",value = "密码",required = true), |
|---|
| | | @ApiImplicitParam(name = "type",value = "用户类型",required = true), |
|---|
| | | @ApiImplicitParam(name = "email",value = "邮箱"), |
|---|
| | | @ApiImplicitParam(name = "company",value = "单位"), |
|---|
| | | @ApiImplicitParam(name = "department",value = "部门"), |
|---|
| | | @ApiImplicitParam(name = "job",value = "职务"), |
|---|
| | | @ApiImplicitParam(name = "realname",value = "姓名"), |
|---|
| | | @ApiImplicitParam(name = "idcard",value = "身份证"), |
|---|
| | | @ApiImplicitParam(name = "iscompany",value = "是否单位负责人"), |
|---|
| | | @ApiImplicitParam(name = "isdepartment",value = "是否部门负责人"), |
|---|
| | | @ApiImplicitParam(name = "status",value = "状态"), |
|---|
| | | }) |
|---|
| | | public Msg addUserInfo(@RequestBody JSONObject jsonObject){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | UserInfo userInfo = new UserInfo(); |
|---|
| | | UserInfo userInfoCurrent = userService.selectByUser(getUser().getUsername()); |
|---|
| | | String password = jsonObject.getString("password"); |
|---|
| | | String PW_PATTERN = "(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.*[~!@#$%^&*_.]).{8,}"; |
|---|
| | | if (!password.matches(PW_PATTERN)){ |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("密码必须8位以上,并且包含大小写字母、数字、特殊符号三种以上"); |
|---|
| | | return msg; |
|---|
| | | }else { |
|---|
| | | userInfo.setPassword(MD5Utils.encode(password)); |
|---|
| | | } |
|---|
| | | String username = jsonObject.getString("username"); |
|---|
| | | if (StringUtils.isNotBlank(username) && username.length() == 11){ |
|---|
| | | userInfo.setUsername(username); |
|---|
| | | }else{ |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("手机号必须为11位数"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | try { |
|---|
| | | userInfo.setType(jsonObject.getInteger("type")); |
|---|
| | | }catch (Exception e) { |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("用户类型必须为数字"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | String realname = jsonObject.getString("realname"); |
|---|
| | | if (StringUtils.isBlank(realname)){ |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("姓名不能为空"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | String idcard = jsonObject.getString("idcard"); |
|---|
| | | if (StringUtils.isNotBlank(idcard)){ |
|---|
| | | UserInfo idCardExist = userService.selectByIdCard(null,idcard); |
|---|
| | | if (null != idCardExist){ |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("身份证重复"); |
|---|
| | | return msg; |
|---|
| | | }else{ |
|---|
| | | userInfo.setIdcard(idcard); |
|---|
| | | } |
|---|
| | | |
|---|
| | | if (!IdCardUtil.strongVerifyIdNumber(idcard)) { |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("身份证非法"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | } |
|---|
| | | Long companyid = jsonObject.getLong("companyid"); |
|---|
| | | if (companyid == null) { |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("单位参数为空"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | CompanyInfo companyInfo = companyService.getById(companyid); |
|---|
| | | if (companyInfo == null) { |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("单位不存在"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | if (jsonObject.getLong("department") != null) { |
|---|
| | | DepartmentInfo department = departmentService.getById(jsonObject.getLong("department")); |
|---|
| | | if (department == null) { |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("部门不存在"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | userInfo.setDepartment(department.getId()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | userInfo.setEmail(jsonObject.getString("email")); |
|---|
| | | userInfo.setCompany(companyInfo.getCompany()); |
|---|
| | | userInfo.setCompanyid(companyid); |
|---|
| | | if (!companyService.isMain(userInfoCurrent.getCompany())){ |
|---|
| | | userInfo.setCompany(userInfoCurrent.getCompany()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | userInfo.setJob(jsonObject.getString("job")); |
|---|
| | | userInfo.setIscompany(jsonObject.getByte("iscompany")); |
|---|
| | | userInfo.setIsdepartment(jsonObject.getByte("isdepartment")); |
|---|
| | | userInfo.setStatus(jsonObject.getByte("status")); |
|---|
| | | userInfo.setCreatedby(getUser().getRealname()); |
|---|
| | | userInfo.setIssecurityofficer(jsonObject.getByte("issecurityofficer")); |
|---|
| | | userInfo.setRealname(realname); |
|---|
| | | userInfo.setCreateddate(new Date()); |
|---|
| | | userInfo.setLastmodifiedby(getUser().getRealname()); |
|---|
| | | userInfo.setLastmodifieddate(new Date()); |
|---|
| | | userInfo.setIsdel((byte)0); |
|---|
| | | userInfo.setIsupload((byte)0); |
|---|
| | | List<UserInfo> userInfoExist = userService.selectUserInfo(null,userInfo.getUsername()); |
|---|
| | | if (userInfoExist.size() > 0){ |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("用户名重复"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | String empNo = jsonObject.getString("empNo"); |
|---|
| | | String deviceNo = jsonObject.getString("deviceNo"); |
|---|
| | | if (StringUtils.isNotBlank(empNo) |
|---|
| | | && StringUtils.isNotBlank(deviceNo)){ |
|---|
| | | try { |
|---|
| | | Msg msg1 = userService.saveEmployee(realname,empNo,deviceNo); |
|---|
| | | if (!msg.getCode().equals(ErrorCode.SUCCESS.getCode())){ |
|---|
| | | return msg1; |
|---|
| | | } |
|---|
| | | userInfo.setEmpNo(empNo); |
|---|
| | | userInfo.setDeviceNo(deviceNo); |
|---|
| | | userInfo.setCardId(msg.getResult().toString()); |
|---|
| | | } catch (Exception e) { |
|---|
| | | e.printStackTrace(); |
|---|
| | | return new Msg(ErrorCode.ERROR_60002); |
|---|
| | | } |
|---|
| | | |
|---|
| | | } |
|---|
| | | |
|---|
| | | int userSize = userService.selectUserSize(); |
|---|
| | | int sli = (userSize + 1) % sliceSize; |
|---|
| | | userInfo.setSlice(sli + ""); |
|---|
| | | if (sli == 0) |
|---|
| | | userInfo.setSlice(sliceSize + ""); |
|---|
| | | userService.save(userInfo); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/importUser") |
|---|
| | | @ApiOperation(value = "导入用户数据",response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "file",value = "文件",required = true), |
|---|
| | | }) |
|---|
| | | @ResponseBody |
|---|
| | | public Msg importUser(MultipartFile file){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | |
|---|
| | | String filesave =""; |
|---|
| | | try { |
|---|
| | | SimpleDateFormat sdf = new SimpleDateFormat( "yyyyMMddHHmmssSSS" ); |
|---|
| | | if (file == null) |
|---|
| | | { |
|---|
| | | msg.setCode("404"); |
|---|
| | | msg.setMessage("未找到上传文件"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | long size = file.getSize(); |
|---|
| | | if(0 == size) |
|---|
| | | { |
|---|
| | | msg.setCode("404"); |
|---|
| | | msg.setMessage("上传文件大小为空"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | if (!FileOptUtils.isDirExists(filePath)) { |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("发生错误或不为目录"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | filesave = filePath + getUser().getRealname() + "_" + sdf.format(new Date()) + ".xlsx"; |
|---|
| | | |
|---|
| | | file.transferTo(new File(filesave)); |
|---|
| | | InputStream in = new FileInputStream(filesave); |
|---|
| | | String name = file.getOriginalFilename(); |
|---|
| | | Boolean isExcel2007 = name.substring(name.lastIndexOf(".") + 1).endsWith("xlsx") ? true : false; |
|---|
| | | excelExportService.importUserExcel(in, getUser().getRealname(), isExcel2007); |
|---|
| | | |
|---|
| | | } catch (BusinessException e) { |
|---|
| | | e.printStackTrace(); |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage(e.getMessage()); |
|---|
| | | } catch (Exception e) { |
|---|
| | | e.printStackTrace(); |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("导入发生错误"); |
|---|
| | | } |
|---|
| | | |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/importSupplierUser") |
|---|
| | | @ApiOperation(value = "导入供应商用户数据",response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "file",value = "文件",required = true), |
|---|
| | | }) |
|---|
| | | @ResponseBody |
|---|
| | | public Msg importSupplierUser(MultipartFile file){ |
|---|
| | | UserInfo userInfo = userService.selectByUser(getUser().getUsername()); |
|---|
| | | String filesave =""; |
|---|
| | | try { |
|---|
| | | SimpleDateFormat sdf = new SimpleDateFormat( "yyyyMMddHHmmssSSS" ); |
|---|
| | | if (file == null) |
|---|
| | | { |
|---|
| | | return new Msg(ErrorCode.ERROR_10001,"未找到上传文件"); |
|---|
| | | } |
|---|
| | | |
|---|
| | | long size = file.getSize(); |
|---|
| | | if(0 == size) |
|---|
| | | { |
|---|
| | | return new Msg(ErrorCode.ERROR_10004,"上传文件大小为空"); |
|---|
| | | } |
|---|
| | | |
|---|
| | | if(!FileOptUtils.isDirExists(filePath)){ |
|---|
| | | return new Msg(ErrorCode.ERROR_40001,"发生错误或不为目录"); |
|---|
| | | } |
|---|
| | | |
|---|
| | | filesave = filePath + getUser().getRealname() + "_" + sdf.format(new Date()) +".xlsx"; |
|---|
| | | |
|---|
| | | file.transferTo(new File(filesave)); |
|---|
| | | InputStream in = new FileInputStream(filesave); |
|---|
| | | String name = file.getOriginalFilename(); |
|---|
| | | Boolean isExcel2007 = name.substring(name.lastIndexOf(".") + 1).endsWith("xlsx")? true:false; |
|---|
| | | BooleanReason blret = excelExportService.importSupplierUserExcel(in,userInfo.getRealname(),userInfo.getCompany(),isExcel2007); |
|---|
| | | if(blret.getValue().equals(false)) |
|---|
| | | { |
|---|
| | | return new Msg(ErrorCode.ERROR_10004,blret.getResultmsg()); |
|---|
| | | } |
|---|
| | | } catch (Exception e) { |
|---|
| | | e.printStackTrace(); |
|---|
| | | return new Msg(ErrorCode.ERROR_10004,"导入发生错误"); |
|---|
| | | } |
|---|
| | | |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/putuser") |
|---|
| | | @ApiOperation(value = "修改用户数据",response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "id",value = "用户id",required = true), |
|---|
| | | @ApiImplicitParam(name = "username",value = "手机号",required = true), |
|---|
| | | @ApiImplicitParam(name = "password",value = "密码",required = true), |
|---|
| | | @ApiImplicitParam(name = "type",value = "用户类型",required = true), |
|---|
| | | @ApiImplicitParam(name = "email",value = "邮箱"), |
|---|
| | | @ApiImplicitParam(name = "company",value = "单位"), |
|---|
| | | @ApiImplicitParam(name = "department",value = "部门"), |
|---|
| | | @ApiImplicitParam(name = "job",value = "职务"), |
|---|
| | | @ApiImplicitParam(name = "realname",value = "姓名"), |
|---|
| | | @ApiImplicitParam(name = "idcard",value = "身份证"), |
|---|
| | | @ApiImplicitParam(name = "iscompany",value = "是否单位负责人"), |
|---|
| | | @ApiImplicitParam(name = "isdepartment",value = "是否部门负责人"), |
|---|
| | | @ApiImplicitParam(name = "status",value = "状态"), |
|---|
| | | }) |
|---|
| | | public Msg putUserInfo(@RequestBody JSONObject jsonObject){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | UserInfo userInfo = new UserInfo(); |
|---|
| | | userInfo.setId(jsonObject.getLong("id")); |
|---|
| | | String password = jsonObject.getString("password"); |
|---|
| | | String PW_PATTERN = "(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.*[~!@#$%^&*_.]).{8,}"; |
|---|
| | | |
|---|
| | | if (StringUtils.isNotBlank(password)){ |
|---|
| | | if (!password.matches(PW_PATTERN)){ |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("密码必须8位以上,并且包含大小写字母、数字、特殊符号三种以上"); |
|---|
| | | return msg; |
|---|
| | | }else { |
|---|
| | | userInfo.setPassword(MD5Utils.encode(password)); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | |
|---|
| | | String username = jsonObject.getString("username"); |
|---|
| | | if (StringUtils.isNotBlank(username) && username.length() == 11){ |
|---|
| | | userInfo.setUsername(username); |
|---|
| | | }else{ |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("手机号必须为11位数"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | try { |
|---|
| | | userInfo.setType(jsonObject.getInteger("type")); |
|---|
| | | }catch (Exception e) { |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("用户类型必须为数字"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | String realname = jsonObject.getString("realname"); |
|---|
| | | if (StringUtils.isBlank(realname)){ |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("姓名不能为空"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | String idcard = jsonObject.getString("idcard"); |
|---|
| | | if (StringUtils.isNotBlank(idcard)){ |
|---|
| | | UserInfo idCardExist = userService.selectByIdCard(userInfo.getId(),idcard); |
|---|
| | | if (null != idCardExist){ |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("身份证重复"); |
|---|
| | | return msg; |
|---|
| | | }else{ |
|---|
| | | userInfo.setIdcard(idcard); |
|---|
| | | } |
|---|
| | | if (!IdCardUtil.strongVerifyIdNumber(idcard)) { |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("身份证非法"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | } |
|---|
| | | |
|---|
| | | Long companyid = jsonObject.getLong("companyid"); |
|---|
| | | if (companyid == null) { |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("单位参数为空"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | CompanyInfo companyInfo = companyService.getById(companyid); |
|---|
| | | if (companyInfo == null) { |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("单位不存在"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | userInfo.setEmail(jsonObject.getString("email")); |
|---|
| | | userInfo.setCompany(companyInfo.getCompany()); |
|---|
| | | userInfo.setCompanyid(companyInfo.getId()); |
|---|
| | | userInfo.setDepartment(jsonObject.getLong("department")); |
|---|
| | | userInfo.setJob(jsonObject.getString("job")); |
|---|
| | | userInfo.setIscompany(jsonObject.getByte("iscompany")); |
|---|
| | | userInfo.setIsdepartment(jsonObject.getByte("isdepartment")); |
|---|
| | | userInfo.setIssecurityofficer(jsonObject.getByte("issecurityofficer")); |
|---|
| | | userInfo.setStatus(jsonObject.getByte("status")); |
|---|
| | | userInfo.setLastmodifiedby(getUser().getRealname()); |
|---|
| | | userInfo.setLastmodifieddate(new Date()); |
|---|
| | | userInfo.setIsdel((byte)0); |
|---|
| | | userInfo.setRealname(realname); |
|---|
| | | List<UserInfo> userInfoExist = userService.selectUserInfo(userInfo.getId(),userInfo.getUsername()); |
|---|
| | | if (userInfoExist.size() > 0){ |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("用户名重复"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | userService.updateById(userInfo); |
|---|
| | | return msg; |
|---|
| | | |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/userroles") |
|---|
| | | @ApiOperation(value = "修改用户角色",response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "id",value = "用户id",required = true), |
|---|
| | | @ApiImplicitParam(name = "roles",value = "用户名",required = true), |
|---|
| | | |
|---|
| | | }) |
|---|
| | | public Msg updateUserRole(@RequestBody JSONObject jsonObject){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | Long userid = jsonObject.getLong("id"); |
|---|
| | | String roles = jsonObject.getString("roles"); |
|---|
| | | if (StringUtils.isNotBlank(roles)){ |
|---|
| | | userRolesInfoService.deleteByUserId(userid); |
|---|
| | | roles = roles.replace("[","").replace("]",""); |
|---|
| | | List<String> list = StringUtils.toList(roles); |
|---|
| | | for (String role : list){ |
|---|
| | | UserRolesInfo userRolesInfo = new UserRolesInfo(); |
|---|
| | | userRolesInfo.setUserid(userid); |
|---|
| | | userRolesInfo.setRoleid(Long.parseLong(role.trim())); |
|---|
| | | userRolesInfoService.save(userRolesInfo); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | return msg; |
|---|
| | | |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/deluser") |
|---|
| | | @ApiOperation(value = "删除用户数据", notes = "删除用户数据", response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(paramType="query",name = "id",value = "id",required = true), |
|---|
| | | @ApiImplicitParam(paramType="body",name = "lastmodifiedby",value = "更新人"), |
|---|
| | | |
|---|
| | | }) |
|---|
| | | public Msg delUserInfo(@ApiParam(value = "id") |
|---|
| | | @RequestBody JSONObject jsonObject){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | UserInfo userInfo = new UserInfo(); |
|---|
| | | userInfo.setId(jsonObject.getLong("id")); |
|---|
| | | userInfo.setLastmodifiedby(getUser().getRealname()); |
|---|
| | | userInfo.setLastmodifieddate(new Date()); |
|---|
| | | userInfo.setStatus((byte)0); |
|---|
| | | userService.updateById(userInfo); |
|---|
| | | String cardId = userInfo.getCardId(); |
|---|
| | | if (StringUtils.isNotBlank(cardId)){ |
|---|
| | | try { |
|---|
| | | String isValid = "1"; |
|---|
| | | Msg msg1 = userService.setCardValid(isValid,cardId); |
|---|
| | | if (!msg1.getCode().equals(ErrorCode.SUCCESS.getCode())){ |
|---|
| | | return msg1; |
|---|
| | | } |
|---|
| | | Msg msg2 = userService.delEmployee(cardId); |
|---|
| | | if (!msg2.getCode().equals(ErrorCode.SUCCESS.getCode())){ |
|---|
| | | return msg2; |
|---|
| | | } |
|---|
| | | } catch (Exception e) { |
|---|
| | | e.printStackTrace(); |
|---|
| | | return new Msg(ErrorCode.ERROR_60002); |
|---|
| | | } |
|---|
| | | userInfo.setDeviceNo(""); |
|---|
| | | userInfo.setEmpNo(""); |
|---|
| | | userInfo.setCardId(""); |
|---|
| | | } |
|---|
| | | |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/importDistrict") |
|---|
| | | @ApiOperation(value = "导入省市数据",response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "file",value = "文件",required = true), |
|---|
| | | @ApiImplicitParam(name = "operator",value = "操作人",required = true), |
|---|
| | | }) |
|---|
| | | @ResponseBody |
|---|
| | | public Msg importDistrict(String operator,MultipartFile file){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | |
|---|
| | | String filesave =""; |
|---|
| | | try { |
|---|
| | | SimpleDateFormat sdf = new SimpleDateFormat( "yyyyMMddHHmmssSSS" ); |
|---|
| | | if (file == null) |
|---|
| | | { |
|---|
| | | msg.setCode("404"); |
|---|
| | | msg.setMessage("未找到上传文件"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | long size = file.getSize(); |
|---|
| | | if(0 == size) |
|---|
| | | { |
|---|
| | | msg.setCode("404"); |
|---|
| | | msg.setMessage("上传文件大小为空"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | if(!FileOptUtils.isDirExists(filePath)){ |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("发生错误或不为目录"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | filesave = filePath + operator + "_" + sdf.format(new Date()) +".xlsx"; |
|---|
| | | |
|---|
| | | file.transferTo(new File(filesave)); |
|---|
| | | InputStream in = new FileInputStream(filesave); |
|---|
| | | String name = file.getOriginalFilename(); |
|---|
| | | Boolean isExcel2007 = name.substring(name.lastIndexOf(".") + 1).endsWith("xlsx")? true:false; |
|---|
| | | BooleanReason blret = excelExportService.importDistrictExcel(in,operator,isExcel2007); |
|---|
| | | if(blret.getValue().equals(false)) |
|---|
| | | { |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage(blret.getResultmsg()); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | } catch (Exception e) { |
|---|
| | | e.printStackTrace(); |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("导入发生错误"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @GetMapping("/district") |
|---|
| | | @ApiOperation(value = "获取省市区数据",response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "type",value = "类型"), |
|---|
| | | @ApiImplicitParam(name = "parentname",value = "上级名称"), |
|---|
| | | @ApiImplicitParam(name = "parenttype",value = "上级类型"), |
|---|
| | | }) |
|---|
| | | public Msg getdistrictInfo(String type,String parentname,String parenttype){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | List<DistrictInfo> districtInfoList = new ArrayList<> (); |
|---|
| | | if (parenttype.equals("0")){ |
|---|
| | | districtInfoList = districtService.selectDistrictInfo(type, parenttype); |
|---|
| | | }else { |
|---|
| | | districtInfoList = districtService.selectDistrictByName(type,parentname,parenttype); |
|---|
| | | } |
|---|
| | | msg.setResult(districtInfoList); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @GetMapping("/districtByName") |
|---|
| | | @ApiOperation(value = "获取省市区数据",response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "province",value = "省份"), |
|---|
| | | @ApiImplicitParam(name = "city",value = "城市"), |
|---|
| | | @ApiImplicitParam(name = "area",value = "区县"), |
|---|
| | | @ApiImplicitParam(name = "town",value = "街道"), |
|---|
| | | @ApiImplicitParam(name = "community",value = "社区"), |
|---|
| | | }) |
|---|
| | | public Msg getDistrictByName(String province,String city,String area,String town,String community){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | |
|---|
| | | if (StringUtils.isBlank(province)){ |
|---|
| | | List<DistrictInfo> provinceList = districtService.selectDistrictInfo("1", "0"); |
|---|
| | | Map<String,Object> map = new HashMap<> (); |
|---|
| | | map.put("provinceList",provinceList); |
|---|
| | | msg.setResult(map); |
|---|
| | | }else if (StringUtils.isBlank(city)){ |
|---|
| | | List<DistrictInfo> provinceList = districtService.selectDistrictInfo("1", "0"); |
|---|
| | | DistrictInfo provinceInfo = districtService.selectInfoByName(province,(byte)1); |
|---|
| | | List<DistrictInfo> cityList = districtService.selectDistrictInfo("2", provinceInfo.getCode()); |
|---|
| | | Map<String,Object> map = new HashMap<> (); |
|---|
| | | map.put("provinceList",provinceList); |
|---|
| | | map.put("cityList",cityList); |
|---|
| | | msg.setResult(map); |
|---|
| | | }else if (StringUtils.isBlank(area)){ |
|---|
| | | List<DistrictInfo> provinceList = districtService.selectDistrictInfo("1", "0"); |
|---|
| | | DistrictInfo provinceInfo = districtService.selectInfoByName(province,(byte)1); |
|---|
| | | List<DistrictInfo> cityList = districtService.selectDistrictInfo("2", provinceInfo.getCode()); |
|---|
| | | DistrictInfo cityInfo = districtService.selectInfoByName(city,(byte)2); |
|---|
| | | List<DistrictInfo> areaList = districtService.selectDistrictInfo("3", cityInfo.getCode()); |
|---|
| | | Map<String,Object> map = new HashMap<> (); |
|---|
| | | map.put("provinceList",provinceList); |
|---|
| | | map.put("cityList",cityList); |
|---|
| | | map.put("areaList",areaList); |
|---|
| | | msg.setResult(map); |
|---|
| | | }else if (StringUtils.isBlank(town)){ |
|---|
| | | List<DistrictInfo> provinceList = districtService.selectDistrictInfo("1", "0"); |
|---|
| | | DistrictInfo provinceInfo = districtService.selectInfoByName(province,(byte)1); |
|---|
| | | List<DistrictInfo> cityList = districtService.selectDistrictInfo("2", provinceInfo.getCode()); |
|---|
| | | DistrictInfo cityInfo = districtService.selectInfoByName(city,(byte)2); |
|---|
| | | List<DistrictInfo> areaList = districtService.selectDistrictInfo("3", cityInfo.getCode()); |
|---|
| | | DistrictInfo areaInfo = districtService.selectInfoByName(area,(byte)3); |
|---|
| | | List<DistrictInfo> townList = districtService.selectDistrictInfo("4", areaInfo.getCode()); |
|---|
| | | |
|---|
| | | Map<String,Object> map = new HashMap<> (); |
|---|
| | | map.put("provinceList",provinceList); |
|---|
| | | map.put("cityList",cityList); |
|---|
| | | map.put("areaList",areaList); |
|---|
| | | map.put("townList",townList); |
|---|
| | | msg.setResult(map); |
|---|
| | | }else{ |
|---|
| | | List<DistrictInfo> provinceList = districtService.selectDistrictInfo("1", "0"); |
|---|
| | | DistrictInfo provinceInfo = districtService.selectInfoByName(province,(byte)1); |
|---|
| | | List<DistrictInfo> cityList = districtService.selectDistrictInfo("2", provinceInfo.getCode()); |
|---|
| | | DistrictInfo cityInfo = districtService.selectInfoByName(city,(byte)2); |
|---|
| | | List<DistrictInfo> areaList = districtService.selectDistrictInfo("3", cityInfo.getCode()); |
|---|
| | | DistrictInfo areaInfo = districtService.selectInfoByName(area,(byte)3); |
|---|
| | | List<DistrictInfo> townList = districtService.selectDistrictInfo("4", areaInfo.getCode()); |
|---|
| | | DistrictInfo townInfo = districtService.selectInfoByName(town,(byte)4); |
|---|
| | | List<DistrictInfo> communityList = districtService.selectDistrictInfo("5", townInfo.getCode()); |
|---|
| | | |
|---|
| | | Map<String,Object> map = new HashMap<> (); |
|---|
| | | map.put("provinceList",provinceList); |
|---|
| | | map.put("cityList",cityList); |
|---|
| | | map.put("areaList",areaList); |
|---|
| | | map.put("townList",townList); |
|---|
| | | map.put("communityList",communityList); |
|---|
| | | msg.setResult(map); |
|---|
| | | } |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @GetMapping("/company") |
|---|
| | | @ApiOperation(value = "获取单位数据",response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "pageIndex",value = "当前页码"), |
|---|
| | | @ApiImplicitParam(name = "pageSize",value = "每页行数"), |
|---|
| | | @ApiImplicitParam(name = "sort",value = "排序规则"), |
|---|
| | | @ApiImplicitParam(name = "order",value = "排序字段"), |
|---|
| | | @ApiImplicitParam(name = "code",value = "单位代码"), |
|---|
| | | @ApiImplicitParam(name = "company",value = "单位名称"), |
|---|
| | | @ApiImplicitParam(name = "province",value = "省份"), |
|---|
| | | @ApiImplicitParam(name = "city",value = "城市"), |
|---|
| | | @ApiImplicitParam(name = "area",value = "区县"), |
|---|
| | | @ApiImplicitParam(name = "town",value = "街道"), |
|---|
| | | @ApiImplicitParam(name = "community",value = "社区"), |
|---|
| | | @ApiImplicitParam(name = "isMain",value = "是否是主体"), |
|---|
| | | }) |
|---|
| | | public Msg getCompanyInfo(@RequestParam(defaultValue = "0") Integer pageIndex, @RequestParam(defaultValue = "10") Integer pageSize, String sort,String order, |
|---|
| | | String code,String company,String province,String city,String area,String town,String community,@RequestParam(defaultValue = "true") Boolean isMain){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | |
|---|
| | | PageInfo pageInfo = new PageInfo(pageIndex, pageSize,sort,order); |
|---|
| | | HashMap<String, Object> condition = new HashMap<String, Object>(); |
|---|
| | | |
|---|
| | | if (StringUtils.isNotBlank(code)) { |
|---|
| | | condition.put("code", code.trim()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | if (StringUtils.isNotBlank(company)) { |
|---|
| | | condition.put("company", company.trim()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | if (StringUtils.isNotBlank(province)) { |
|---|
| | | condition.put("province", province.trim()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | if (StringUtils.isNotBlank(city)) { |
|---|
| | | condition.put("city", city.trim()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | if (StringUtils.isNotBlank(area)) { |
|---|
| | | condition.put("area", area.trim()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | if (StringUtils.isNotBlank(town)) { |
|---|
| | | condition.put("town", town.trim()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | if (StringUtils.isNotBlank(community)) { |
|---|
| | | condition.put("community", community.trim()); |
|---|
| | | } |
|---|
| | | UserInfo userInfo = userService.selectByUser(getUser().getUsername()); |
|---|
| | | if (!companyService.isMain(userInfo.getCompany())){ |
|---|
| | | condition.put("company",userInfo.getCompany()); |
|---|
| | | } |
|---|
| | | //是系统菜单下的就显示主体，否则非主体 |
|---|
| | | // if (isMain) { |
|---|
| | | // condition.put("isMain", 1); |
|---|
| | | // } else { |
|---|
| | | // condition.put("isMain", 0); |
|---|
| | | // } |
|---|
| | | pageInfo.setCondition(condition); |
|---|
| | | companyService.selectDataGrid(pageInfo); |
|---|
| | | msg.setResult(pageInfo); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @GetMapping("/companyList") |
|---|
| | | @ApiOperation(value = "获取所有单位",response = Msg.class) |
|---|
| | | public Msg getCompanyList(){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | |
|---|
| | | List<CompanyInfo> companyList = companyService.selectByAll(); |
|---|
| | | msg.setResult(companyList); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/addCompany") |
|---|
| | | @ApiOperation(value = "添加单位信息",response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "code",value = "单位代码"), |
|---|
| | | @ApiImplicitParam(name = "company",value = "单位名称"), |
|---|
| | | @ApiImplicitParam(name = "contactname",value = "联系人"), |
|---|
| | | @ApiImplicitParam(name = "contactphone",value = "联系电话"), |
|---|
| | | @ApiImplicitParam(name = "province",value = "省份"), |
|---|
| | | @ApiImplicitParam(name = "city",value = "城市"), |
|---|
| | | @ApiImplicitParam(name = "area",value = "区县"), |
|---|
| | | @ApiImplicitParam(name = "town",value = "街道"), |
|---|
| | | @ApiImplicitParam(name = "community",value = "社区"), |
|---|
| | | }) |
|---|
| | | public Msg addCompanyInfo(@RequestBody JSONObject jsonObject){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | CompanyInfo companyInfo = new CompanyInfo(); |
|---|
| | | companyInfo.setCode(jsonObject.getString("code")); |
|---|
| | | companyInfo.setCompany(jsonObject.getString("company")); |
|---|
| | | companyInfo.setContactname(jsonObject.getString("contactname")); |
|---|
| | | companyInfo.setContactphone(jsonObject.getString("contactphone")); |
|---|
| | | companyInfo.setIsmain(jsonObject.getByte("ismain")); |
|---|
| | | companyInfo.setProvince(jsonObject.getString("province")); |
|---|
| | | companyInfo.setCity(jsonObject.getString("city")); |
|---|
| | | companyInfo.setArea(jsonObject.getString("area")); |
|---|
| | | companyInfo.setTown(jsonObject.getString("town")); |
|---|
| | | companyInfo.setCommunity(jsonObject.getString("community")); |
|---|
| | | companyInfo.setCreatedby(getUser().getRealname()); |
|---|
| | | companyInfo.setCreateddate(new Date()); |
|---|
| | | companyInfo.setLastmodifiedby(getUser().getRealname()); |
|---|
| | | companyInfo.setLastmodifieddate(new Date()); |
|---|
| | | companyInfo.setIsdel((byte)0); |
|---|
| | | if(StringUtils.isNotBlank(companyInfo.getCode())){ |
|---|
| | | if (companyInfo.getCode().length() > 6){ |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("单位代码不能超过6位"); |
|---|
| | | return msg; |
|---|
| | | }else { |
|---|
| | | companyInfo.setCode(companyInfo.getCode().toUpperCase()); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | if (companyInfo.getIsmain() == 1){ |
|---|
| | | CompanyInfo companyMain = companyService.selectExistMain(null); |
|---|
| | | if (companyMain != null){ |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("已存在主体单位"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | } |
|---|
| | | CompanyInfo companyInfoExist = companyService.selectExistByName(null,companyInfo.getCompany()); |
|---|
| | | if (null != companyInfoExist){ |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("单位名称重复"); |
|---|
| | | return msg; |
|---|
| | | }else { |
|---|
| | | companyService.save(companyInfo); |
|---|
| | | } |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/putCompany") |
|---|
| | | @ApiOperation(value = "修改单位信息",response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "code",value = "单位代码"), |
|---|
| | | @ApiImplicitParam(name = "company",value = "单位名称"), |
|---|
| | | @ApiImplicitParam(name = "contactname",value = "联系人"), |
|---|
| | | @ApiImplicitParam(name = "contactphone",value = "联系电话"), |
|---|
| | | @ApiImplicitParam(name = "province",value = "省份"), |
|---|
| | | @ApiImplicitParam(name = "city",value = "城市"), |
|---|
| | | @ApiImplicitParam(name = "area",value = "区县"), |
|---|
| | | @ApiImplicitParam(name = "town",value = "街道"), |
|---|
| | | @ApiImplicitParam(name = "community",value = "社区"), |
|---|
| | | }) |
|---|
| | | public Msg putCompanyInfo(@RequestBody JSONObject jsonObject){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | CompanyInfo companyInfo = new CompanyInfo(); |
|---|
| | | companyInfo.setId(jsonObject.getLong("id")); |
|---|
| | | companyInfo.setCode(jsonObject.getString("code")); |
|---|
| | | companyInfo.setCompany(jsonObject.getString("company")); |
|---|
| | | companyInfo.setContactname(jsonObject.getString("contactname")); |
|---|
| | | companyInfo.setContactphone(jsonObject.getString("contactphone")); |
|---|
| | | companyInfo.setIsmain(jsonObject.getByte("ismain")); |
|---|
| | | companyInfo.setProvince(jsonObject.getString("province")); |
|---|
| | | companyInfo.setCity(jsonObject.getString("city")); |
|---|
| | | companyInfo.setArea(jsonObject.getString("area")); |
|---|
| | | companyInfo.setTown(jsonObject.getString("town")); |
|---|
| | | companyInfo.setCommunity(jsonObject.getString("community")); |
|---|
| | | companyInfo.setLastmodifiedby(getUser().getRealname()); |
|---|
| | | companyInfo.setLastmodifieddate(new Date()); |
|---|
| | | companyInfo.setIsdel((byte)0); |
|---|
| | | if(StringUtils.isNotBlank(companyInfo.getCode())){ |
|---|
| | | if (companyInfo.getCode().length() > 6){ |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("单位代码不能超过6位"); |
|---|
| | | return msg; |
|---|
| | | }else { |
|---|
| | | companyInfo.setCode(companyInfo.getCode().toUpperCase()); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | if (companyInfo.getIsmain() == 1){ |
|---|
| | | CompanyInfo companyMain = companyService.selectExistMain(companyInfo.getId()); |
|---|
| | | if (companyMain != null){ |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("已存在主体单位"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | } |
|---|
| | | CompanyInfo companyInfoExist = companyService.selectExistByName(companyInfo.getId(),companyInfo.getCompany()); |
|---|
| | | if (null != companyInfoExist){ |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("单位名称重复"); |
|---|
| | | return msg; |
|---|
| | | }else { |
|---|
| | | companyService.updateById(companyInfo); |
|---|
| | | } |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/delCompany") |
|---|
| | | @ApiOperation(value = "删除单位信息", notes = "删除单位信息", response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(paramType="query",name = "id",value = "id",required = true) |
|---|
| | | }) |
|---|
| | | public Msg delCompanyInfo(@ApiParam(value = "id") |
|---|
| | | @RequestBody JSONObject jsonObject){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | CompanyInfo companyInfo = new CompanyInfo(); |
|---|
| | | companyInfo.setId(jsonObject.getLong("id")); |
|---|
| | | companyInfo.setLastmodifiedby(getUser().getRealname()); |
|---|
| | | companyInfo.setLastmodifieddate(new Date()); |
|---|
| | | companyInfo.setIsdel((byte)1); |
|---|
| | | companyService.updateById(companyInfo); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @GetMapping("/department") |
|---|
| | | @ApiOperation(value = "获取部门信息",response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "pageIndex",value = "当前页码"), |
|---|
| | | @ApiImplicitParam(name = "pageSize",value = "每页行数"), |
|---|
| | | @ApiImplicitParam(name = "sort",value = "排序规则"), |
|---|
| | | @ApiImplicitParam(name = "order",value = "排序字段"), |
|---|
| | | @ApiImplicitParam(name = "department",value = "部门") |
|---|
| | | }) |
|---|
| | | public Msg getDepartmentInfo(@RequestParam(defaultValue = "0") Integer pageIndex, @RequestParam(defaultValue = "10") Integer pageSize, String sort,String order, |
|---|
| | | String department){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | |
|---|
| | | PageInfo pageInfo = new PageInfo(pageIndex, pageSize,sort,order); |
|---|
| | | HashMap<String, Object> condition = new HashMap<String, Object>(); |
|---|
| | | |
|---|
| | | if (StringUtils.isNotBlank(department)) { |
|---|
| | | condition.put("department", department.trim()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | pageInfo.setCondition(condition); |
|---|
| | | departmentService.selectDataGrid(pageInfo); |
|---|
| | | msg.setResult(pageInfo); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @GetMapping("/departmentList") |
|---|
| | | @ApiOperation(value = "获取所有部门",response = Msg.class) |
|---|
| | | public Msg getDepartmentList(){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | |
|---|
| | | List<DepartmentVo> departmentVoList = departmentService.selectByAll(); |
|---|
| | | msg.setResult(departmentVoList); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/addDepartment") |
|---|
| | | @ApiOperation(value = "添加部门信息",response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "department",value = "部门"), |
|---|
| | | @ApiImplicitParam(name = "issafety",value = "是否为安全部门 1或0"), |
|---|
| | | @ApiImplicitParam(name = "isinvolve",value = "是否为涉及部门 1或0"), |
|---|
| | | @ApiImplicitParam(name = "isanalysis",value = "是否为检测中心 1或0"), |
|---|
| | | }) |
|---|
| | | public Msg addDepartmentInfo(@RequestBody JSONObject jsonObject){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | DepartmentInfo departmentInfo = new DepartmentInfo(); |
|---|
| | | departmentInfo.setDepartment(jsonObject.getString("department")); |
|---|
| | | departmentInfo.setCreatedby(getUser().getRealname()); |
|---|
| | | departmentInfo.setCreateddate(new Date()); |
|---|
| | | departmentInfo.setLastmodifiedby(getUser().getRealname()); |
|---|
| | | departmentInfo.setLastmodifieddate(new Date()); |
|---|
| | | departmentInfo.setIsdel((byte)0); |
|---|
| | | |
|---|
| | | Byte issafety = jsonObject.getByte("issafety"); |
|---|
| | | if (issafety == 1){ |
|---|
| | | DepartmentInfo department = departmentService.selectSafety(null); |
|---|
| | | if (department != null){ |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("已存在安全管理部门"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | } |
|---|
| | | departmentInfo.setIssafety(issafety); |
|---|
| | | |
|---|
| | | Byte isanalysis = jsonObject.getByte("isanalysis"); |
|---|
| | | if (isanalysis == 1){ |
|---|
| | | DepartmentInfo department = departmentService.selectAnalysis(null); |
|---|
| | | if (department != null){ |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("已存在检测中心"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | } |
|---|
| | | departmentInfo.setIsanalysis(isanalysis); |
|---|
| | | |
|---|
| | | DepartmentInfo departmentInfoExist = departmentService.selectExistByName(null,departmentInfo.getDepartment()); |
|---|
| | | if (null != departmentInfoExist){ |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("部门名称重复"); |
|---|
| | | return msg; |
|---|
| | | }else { |
|---|
| | | departmentService.save(departmentInfo); |
|---|
| | | } |
|---|
| | | |
|---|
| | | Byte isinvole = jsonObject.getByte("isinvolve"); |
|---|
| | | if (isinvole != null && isinvole == 1){ |
|---|
| | | InvolveDepInfo involveDepInfo = new InvolveDepInfo(); |
|---|
| | | involveDepInfo.setDepartment(departmentInfo.getDepartment()); |
|---|
| | | involveDepInfo.setLastmodifiedby(getUser().getRealname()); |
|---|
| | | involveDepInfo.setLastmodifieddate(new Date()); |
|---|
| | | involveDepService.save(involveDepInfo); |
|---|
| | | } |
|---|
| | | |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/putDepartment") |
|---|
| | | @ApiOperation(value = "修改部门信息",response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "id",value = "id"), |
|---|
| | | @ApiImplicitParam(name = "department",value = "部门"), |
|---|
| | | @ApiImplicitParam(name = "issafety",value = "是否为安全部门 1或0"), |
|---|
| | | @ApiImplicitParam(name = "isinvolve",value = "是否为涉及部门 1或0"), |
|---|
| | | }) |
|---|
| | | public Msg putDepartmentInfo(@RequestBody JSONObject jsonObject){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | DepartmentInfo departmentInfo = departmentService.getById(jsonObject.getLong("id")); |
|---|
| | | departmentInfo.setDepartment(jsonObject.getString("department")); |
|---|
| | | departmentInfo.setIssafety(jsonObject.getByte("issafety")); |
|---|
| | | departmentInfo.setLastmodifiedby(getUser().getRealname()); |
|---|
| | | departmentInfo.setLastmodifieddate(new Date()); |
|---|
| | | |
|---|
| | | Byte issafety = jsonObject.getByte("issafety"); |
|---|
| | | if (issafety == 1){ |
|---|
| | | DepartmentInfo department = departmentService.selectSafety(departmentInfo.getId()); |
|---|
| | | if (department != null){ |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("已存在安全管理部门"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | } |
|---|
| | | |
|---|
| | | Byte isanalysis = jsonObject.getByte("isanalysis"); |
|---|
| | | if (isanalysis == 1){ |
|---|
| | | DepartmentInfo department = departmentService.selectAnalysis(departmentInfo.getId()); |
|---|
| | | if (department != null && department.getId() != null){ |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("已存在检测中心"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | } |
|---|
| | | departmentInfo.setIsanalysis(isanalysis); |
|---|
| | | |
|---|
| | | DepartmentInfo departmentInfoExist = departmentService.selectExistByName(departmentInfo.getId(),departmentInfo.getDepartment()); |
|---|
| | | if (null != departmentInfoExist){ |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("部门名称重复"); |
|---|
| | | return msg; |
|---|
| | | }else { |
|---|
| | | departmentService.updateById(departmentInfo); |
|---|
| | | } |
|---|
| | | |
|---|
| | | involveDepService.deleteByName(departmentInfo.getDepartment()); |
|---|
| | | Byte isinvole = jsonObject.getByte("isinvolve"); |
|---|
| | | if (isinvole != null && isinvole == 1){ |
|---|
| | | InvolveDepInfo involveDepInfo = new InvolveDepInfo(); |
|---|
| | | involveDepInfo.setDepartment(departmentInfo.getDepartment()); |
|---|
| | | involveDepInfo.setLastmodifiedby(getUser().getRealname()); |
|---|
| | | involveDepInfo.setLastmodifieddate(new Date()); |
|---|
| | | involveDepService.save(involveDepInfo); |
|---|
| | | } |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/delDepartment") |
|---|
| | | @ApiOperation(value = "删除部门信息", notes = "删除部门信息", response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(paramType="query",name = "id",value = "id",required = true) |
|---|
| | | }) |
|---|
| | | public Msg delDepartmentInfo(@ApiParam(value = "id") |
|---|
| | | @RequestBody JSONObject jsonObject){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | msg.setMessage("success"); |
|---|
| | | DepartmentInfo departmentInfo = departmentService.getById(jsonObject.getLong("id")); |
|---|
| | | departmentInfo.setLastmodifiedby(getUser().getRealname()); |
|---|
| | | departmentInfo.setLastmodifieddate(new Date()); |
|---|
| | | departmentInfo.setIsdel((byte)1); |
|---|
| | | departmentService.updateById(departmentInfo); |
|---|
| | | involveDepService.deleteByName(departmentInfo.getDepartment()); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | @GetMapping(value = "/getWorkCert") |
|---|
| | | @ApiOperation(value = "获取作业证书",httpMethod = "GET") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "mobile",value = "手机号",required = true), |
|---|
| | | }) |
|---|
| | | public Msg getWorkCert(String mobile){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | if (StringUtils.isBlank(mobile)){ |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("手机号不能为空"); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | List<WorkCertInfo> workCertInfos = workCertService.selectByMobile(mobile); |
|---|
| | | msg.setResult(workCertInfos); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping(value = "/addWorkCert") |
|---|
| | | @ApiOperation(value = "新增作业证书",httpMethod = "POST") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "realname",value = "姓名",required = true), |
|---|
| | | @ApiImplicitParam(name = "mobile",value = "手机号",required = true), |
|---|
| | | @ApiImplicitParam(name = "idcard",value = "身份证"), |
|---|
| | | @ApiImplicitParam(name = "certname",value = "文件名"), |
|---|
| | | @ApiImplicitParam(name = "starttime",value = "有效开始时间"), |
|---|
| | | @ApiImplicitParam(name = "endtime",value = "有效结束时间"), |
|---|
| | | @ApiImplicitParam(name = "file",value = "上传文件,单个"), |
|---|
| | | }) |
|---|
| | | Object addWorkCert(WorkCertVo workCertVo){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | try { |
|---|
| | | WorkCertInfo workCertInfo = BeanUtils.copy(workCertVo,WorkCertInfo.class); |
|---|
| | | if (workCertVo.getFile() != null) { |
|---|
| | | String name = UploadUtil.uploadFile(workCertVo.getFile(), Properties.workCertPath); |
|---|
| | | workCertInfo.setCertpath(workCert+name); |
|---|
| | | }else { |
|---|
| | | msg.setCode(ErrorCode.ERROR_10004.getCode()); |
|---|
| | | msg.setMessage("上传文件不能为空"); |
|---|
| | | } |
|---|
| | | workCertInfo.setCreateby(getUser().getRealname()); |
|---|
| | | workCertInfo.setCreatetime(new Date()); |
|---|
| | | workCertInfo.setIsdel((byte)0); |
|---|
| | | workCertService.save(workCertInfo); |
|---|
| | | } catch (Exception e) { |
|---|
| | | e.printStackTrace(); |
|---|
| | | msg.setCode("400"); |
|---|
| | | msg.setMessage(e.getMessage()); |
|---|
| | | } |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping(value = "/editWorkCert") |
|---|
| | | @ApiOperation(value = "修改作业证书",httpMethod = "POST") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "id",value = "id",required = true), |
|---|
| | | @ApiImplicitParam(name = "certname",value = "文件名"), |
|---|
| | | @ApiImplicitParam(name = "starttime",value = "有效开始时间"), |
|---|
| | | @ApiImplicitParam(name = "endtime",value = "有效结束时间"), |
|---|
| | | @ApiImplicitParam(name = "file",value = "上传文件,单个"), |
|---|
| | | }) |
|---|
| | | Object editWorkCert(WorkCertVo workCertVo){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | try { |
|---|
| | | WorkCertInfo workCertInfo = workCertService.getById(workCertVo.getId()); |
|---|
| | | if (workCertVo.getFile() != null) { |
|---|
| | | String name = UploadUtil.uploadFile(workCertVo.getFile(), Properties.workCertPath); |
|---|
| | | workCertInfo.setCertpath(workCert+name); |
|---|
| | | } |
|---|
| | | workCertInfo.setStarttime(workCertVo.getStarttime()); |
|---|
| | | workCertInfo.setEndtime(workCertVo.getEndtime()); |
|---|
| | | workCertInfo.setCreateby(getUser().getRealname()); |
|---|
| | | workCertInfo.setCreatetime(new Date()); |
|---|
| | | workCertService.updateById(workCertInfo); |
|---|
| | | } catch (Exception e) { |
|---|
| | | e.printStackTrace(); |
|---|
| | | msg.setCode("400"); |
|---|
| | | msg.setMessage(e.getMessage()); |
|---|
| | | } |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping(value = "/delWorkCert") |
|---|
| | | @ApiOperation(value = "删除作业证书",httpMethod = "POST") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "id",value = "id",required = true), |
|---|
| | | }) |
|---|
| | | public Msg delWorkCert(@RequestBody WorkCertVo workCertVo){ |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("200"); |
|---|
| | | try { |
|---|
| | | WorkCertInfo workCertInfo = workCertService.getById(workCertVo.getId()); |
|---|
| | | workCertInfo.setCreateby(getUser().getRealname()); |
|---|
| | | workCertInfo.setCreatetime(new Date()); |
|---|
| | | workCertInfo.setIsdel((byte)1); |
|---|
| | | workCertService.updateById(workCertInfo); |
|---|
| | | } catch (Exception e) { |
|---|
| | | e.printStackTrace(); |
|---|
| | | msg.setCode("400"); |
|---|
| | | msg.setMessage(e.getMessage()); |
|---|
| | | } |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @GetMapping("/blackList") |
|---|
| | | @ApiOperation(value = "获取黑名单详情",httpMethod = "POST") |
|---|
| | | public Msg getBlackList(@RequestParam(defaultValue = "0") Integer pageIndex, |
|---|
| | | @RequestParam(defaultValue = "10") Integer pageSize, String sort,String order, |
|---|
| | | String company){ |
|---|
| | | PageInfo pageInfo = new PageInfo(pageIndex, pageSize,sort,order); |
|---|
| | | HashMap<String, Object> condition = new HashMap<>(); |
|---|
| | | |
|---|
| | | if (StringUtils.isNotBlank(company)) { |
|---|
| | | condition.put("company", company.trim()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | pageInfo.setCondition(condition); |
|---|
| | | blackListService.selectDataGrid(pageInfo); |
|---|
| | | return success(pageInfo); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/banCompany") |
|---|
| | | @ApiOperation(value = "添加黑名单",httpMethod = "POST") |
|---|
| | | public Msg banCompanyByName(@RequestBody JSONObject object){ |
|---|
| | | String company = object.getString("company"); |
|---|
| | | if (StringUtils.isBlank(company)){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10001); |
|---|
| | | } |
|---|
| | | BlackListInfo blackListInfoExist = blackListService.getBlackListByName(company); |
|---|
| | | if (blackListInfoExist != null){return new Msg(ErrorCode.ERROR_50003,"指定公司已存在黑名单");} |
|---|
| | | |
|---|
| | | CompanyInfo companyInfo = companyService.selectByName(company); |
|---|
| | | if (companyInfo != null){ |
|---|
| | | List<UserInfo> userInfos = userService.selectByCompany(company); |
|---|
| | | userInfos.forEach(item -> { |
|---|
| | | item.setStatus((byte)0); |
|---|
| | | item.setLastmodifiedby(getUser().getRealname()); |
|---|
| | | item.setLastmodifieddate(new Date()); |
|---|
| | | }); |
|---|
| | | userService.updateBatchById(userInfos); |
|---|
| | | |
|---|
| | | companyInfo.setIsbanned((byte)1); |
|---|
| | | companyInfo.setLastmodifiedby(getUser().getRealname()); |
|---|
| | | companyInfo.setLastmodifieddate(new Date()); |
|---|
| | | companyService.updateById(companyInfo); |
|---|
| | | } |
|---|
| | | BlackListInfo blackListInfo = new BlackListInfo(); |
|---|
| | | blackListInfo.setCompany(company); |
|---|
| | | blackListInfo.setCreatedat(new Date()); |
|---|
| | | blackListInfo.setCreatedby(getUser().getRealname()); |
|---|
| | | blackListService.save(blackListInfo); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/cancelBan") |
|---|
| | | @ApiOperation(value = "添加黑名单",httpMethod = "POST") |
|---|
| | | public Msg cancelBanCompanyByName(@RequestBody JSONObject object){ |
|---|
| | | String company = object.getString("company"); |
|---|
| | | if (StringUtils.isBlank(company)){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10001); |
|---|
| | | } |
|---|
| | | BlackListInfo blackListInfoExist = blackListService.getBlackListByName(company); |
|---|
| | | if (blackListInfoExist == null){return new Msg(ErrorCode.ERROR_50003,"指定公司不存在黑名单");} |
|---|
| | | |
|---|
| | | CompanyInfo companyInfo = companyService.selectByName(company); |
|---|
| | | if (companyInfo != null){ |
|---|
| | | List<UserInfo> userInfos = userService.selectByCompany(company); |
|---|
| | | userInfos.forEach(item -> { |
|---|
| | | item.setStatus((byte)1); |
|---|
| | | item.setLastmodifiedby(getUser().getRealname()); |
|---|
| | | item.setLastmodifieddate(new Date()); |
|---|
| | | }); |
|---|
| | | userService.updateBatchById(userInfos); |
|---|
| | | |
|---|
| | | companyInfo.setIsbanned((byte)0); |
|---|
| | | companyInfo.setLastmodifiedby(getUser().getRealname()); |
|---|
| | | companyInfo.setLastmodifieddate(new Date()); |
|---|
| | | companyService.updateById(companyInfo); |
|---|
| | | } |
|---|
| | | blackListService.removeById(blackListInfoExist); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/bindCard") |
|---|
| | | @ApiOperation(value = "绑定人员卡",response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "username",value = "用户名"), |
|---|
| | | @ApiImplicitParam(name = "empNo",value = "人员卡编号"), |
|---|
| | | @ApiImplicitParam(name = "deviceNo",value = "人员卡MC地址"), |
|---|
| | | }) |
|---|
| | | public Msg test(@RequestBody JSONObject jsonObject){ |
|---|
| | | String empNo = jsonObject.getString("empNo"); |
|---|
| | | String deviceNo = jsonObject.getString("deviceNo"); |
|---|
| | | String username = jsonObject.getString("username"); |
|---|
| | | |
|---|
| | | UserInfo userInfo = userService.selectByUser(username); |
|---|
| | | |
|---|
| | | if (userInfo == null || StringUtils.isBlank(userInfo.getRealname())){ |
|---|
| | | return new Msg(ErrorCode.ERROR_20001); |
|---|
| | | } |
|---|
| | | String realname = userInfo.getRealname(); |
|---|
| | | // String realname = jsonObject.getString("username"); |
|---|
| | | if (StringUtils.isBlank(empNo) |
|---|
| | | || StringUtils.isBlank(deviceNo)){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10002); |
|---|
| | | } |
|---|
| | | |
|---|
| | | try { |
|---|
| | | Msg msg = userService.saveEmployee(realname,empNo,deviceNo); |
|---|
| | | if (!msg.getCode().equals(ErrorCode.SUCCESS.getCode())){ |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | userInfo.setEmpNo(empNo); |
|---|
| | | userInfo.setDeviceNo(deviceNo); |
|---|
| | | userInfo.setCardId(msg.getResult().toString()); |
|---|
| | | userService.updateById(userInfo); |
|---|
| | | } catch (Exception e) { |
|---|
| | | e.printStackTrace(); |
|---|
| | | return new Msg(ErrorCode.ERROR_60002); |
|---|
| | | } |
|---|
| | | |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/setCardValid") |
|---|
| | | @ApiOperation(value = "设置人员卡无效",response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "username",value = "用户名"), |
|---|
| | | @ApiImplicitParam(name = "isValid",value = "有效标记（0.有效，1.无效）"), |
|---|
| | | }) |
|---|
| | | public Msg setCardValid(@RequestBody JSONObject jsonObject){ |
|---|
| | | String username = jsonObject.getString("username"); |
|---|
| | | |
|---|
| | | UserInfo userInfo = userService.selectByUser(username); |
|---|
| | | |
|---|
| | | if (userInfo == null || StringUtils.isBlank(userInfo.getRealname())){ |
|---|
| | | return new Msg(ErrorCode.ERROR_20001); |
|---|
| | | } |
|---|
| | | String isValid = jsonObject.getString("isValid"); |
|---|
| | | String cardId = userInfo.getCardId(); |
|---|
| | | try { |
|---|
| | | Msg msg = userService.setCardValid(isValid,cardId); |
|---|
| | | if (!msg.getCode().equals(ErrorCode.SUCCESS.getCode())){ |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | } catch (Exception e) { |
|---|
| | | e.printStackTrace(); |
|---|
| | | return new Msg(ErrorCode.ERROR_60002); |
|---|
| | | } |
|---|
| | | |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation(value = "删除人员卡",response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "username",value = "用户名"), |
|---|
| | | }) |
|---|
| | | @PostMapping("/deleteEmp") |
|---|
| | | public Msg deleteEmp(@RequestBody JSONObject jsonObject){ |
|---|
| | | String username = jsonObject.getString("username"); |
|---|
| | | |
|---|
| | | UserInfo userInfo = userService.selectByUser(username); |
|---|
| | | |
|---|
| | | if (userInfo == null || StringUtils.isBlank(userInfo.getRealname())){ |
|---|
| | | return new Msg(ErrorCode.ERROR_20001); |
|---|
| | | } |
|---|
| | | String cardId = userInfo.getCardId(); |
|---|
| | | try { |
|---|
| | | Msg msg = userService.delEmployee(cardId); |
|---|
| | | if (!msg.getCode().equals(ErrorCode.SUCCESS.getCode())){ |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | } catch (Exception e) { |
|---|
| | | e.printStackTrace(); |
|---|
| | | return new Msg(ErrorCode.ERROR_60002); |
|---|
| | | } |
|---|
| | | userInfo.setDeviceNo(""); |
|---|
| | | userInfo.setEmpNo(""); |
|---|
| | | userInfo.setCardId(""); |
|---|
| | | userService.updateById(userInfo); |
|---|
| | | |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/setInvalidDel") |
|---|
| | | @ApiOperation(value = "设置人员卡无效并删除",response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "username",value = "用户名"), |
|---|
| | | }) |
|---|
| | | public Msg setInvalidDel(@RequestBody JSONObject jsonObject){ |
|---|
| | | String username = jsonObject.getString("username"); |
|---|
| | | |
|---|
| | | UserInfo userInfo = userService.selectByUser(username); |
|---|
| | | |
|---|
| | | if (userInfo == null || StringUtils.isBlank(userInfo.getRealname())){ |
|---|
| | | return new Msg(ErrorCode.ERROR_20001); |
|---|
| | | } |
|---|
| | | String isValid = "1"; |
|---|
| | | String cardId = userInfo.getCardId(); |
|---|
| | | if (StringUtils.isBlank(cardId)){ |
|---|
| | | return new Msg(ErrorCode.ERROR_50001,"当前用户没有绑定人员卡"); |
|---|
| | | } |
|---|
| | | try { |
|---|
| | | Msg msg = userService.setCardValid(isValid,cardId); |
|---|
| | | if (!msg.getCode().equals(ErrorCode.SUCCESS.getCode())){ |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | Msg msg1 = userService.delEmployee(cardId); |
|---|
| | | if (!msg1.getCode().equals(ErrorCode.SUCCESS.getCode())){ |
|---|
| | | return msg1; |
|---|
| | | } |
|---|
| | | } catch (Exception e) { |
|---|
| | | e.printStackTrace(); |
|---|
| | | return new Msg(ErrorCode.ERROR_60002); |
|---|
| | | } |
|---|
| | | |
|---|
| | | userInfo.setDeviceNo(""); |
|---|
| | | userInfo.setEmpNo(""); |
|---|
| | | userInfo.setCardId(""); |
|---|
| | | userService.updateById(userInfo); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/getRealGps") |
|---|
| | | public Msg getRealGps(@RequestBody JSONObject jsonObject){ |
|---|
| | | try { |
|---|
| | | Msg msg = userService.getRealGps(); |
|---|
| | | if (!msg.getCode().equals(ErrorCode.SUCCESS.getCode())){ |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | return success(msg); |
|---|
| | | } catch (Exception e) { |
|---|
| | | e.printStackTrace(); |
|---|
| | | return new Msg(ErrorCode.ERROR_60002); |
|---|
| | | } |
|---|
| | | |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/getGps") |
|---|
| | | @ApiOperation(value = "获取当前所有绑卡用户位置",response = Msg.class) |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "username",value = "用户名（非必填）"), |
|---|
| | | }) |
|---|
| | | public Msg getGps(@RequestBody JSONObject jsonObject){ |
|---|
| | | String username = jsonObject.getString("username"); |
|---|
| | | List<UserInfo> userInfo = userService.getGps(username); |
|---|
| | | return success(userInfo); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * @Description: 通过用户名能查location表最新一条位置数据 |
|---|
| | | * @date 2021/12/27 9:06 |
|---|
| | | */ |
|---|
| | | @PostMapping("/location") |
|---|
| | | @ApiOperation(value = "查询人员实时位置接口", response = Msg.class) |
|---|
| | | public Msg getLocation(@RequestBody String username) { |
|---|
| | | UserInfo user = userService.selectByUser(username); |
|---|
| | | if (user == null) |
|---|
| | | throw new BusinessException("用户不存在"); |
|---|
| | | DeviceLocation deviceLocation = deviceLocationService.selectByUser(user); |
|---|
| | | return success(deviceLocation); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * @Description: 通过开始时间、结束时间、用户名查到location表一段坐标lis |
|---|
| | | * @date 2021/12/27 9:35 |
|---|
| | | */ |
|---|
| | | @PostMapping("/location-list") |
|---|
| | | @ApiOperation(value = "查询人员轨迹接口") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "username",value = "用户名"), |
|---|
| | | @ApiImplicitParam(name = "starttime",value = "开始时间"), |
|---|
| | | @ApiImplicitParam(name = "endtime",value = "结束时间") |
|---|
| | | }) |
|---|
| | | public Msg getLocationList(@RequestBody JSONObject jsonObj) { |
|---|
| | | String username = jsonObj.getString("username"); |
|---|
| | | Date starttime = jsonObj.getDate("starttime"); |
|---|
| | | Date endtime = jsonObj.getDate("endtime"); |
|---|
| | | List<DeviceLocation> locationList = deviceLocationService.selectUserLocations(username, starttime, endtime); |
|---|
| | | return success(locationList); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/department-userList") |
|---|
| | | @ApiOperation("/查找部门下的人员进行分页") |
|---|
| | | public Msg getUserPageInDepartment(@RequestBody FilterObject filterObject){ |
|---|
| | | Integer pageIndex = filterObject.getPageIndex(); |
|---|
| | | Integer pageSize = filterObject.getPageSize(); |
|---|
| | | IPage<UserVo> page = userService.selectUserPageInDepartment(new Page<>(pageIndex, pageSize), filterObject.getFilter(), getUser()); |
|---|
| | | return success(page); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * @Description: 忘记密码 <=> 修改密码 |
|---|
| | | * @date 2022/5/6 15:19 |
|---|
| | | */ |
|---|
| | | @PostMapping("/pwd-change") |
|---|
| | | @ApiOperation("修改密码") |
|---|
| | | public Msg pwdChange(@RequestBody JSONObject pwdBody) { |
|---|
| | | String username = pwdBody.getString("username"); |
|---|
| | | String password = pwdBody.getString("password"); |
|---|
| | | String phone = pwdBody.getString("phone"); |
|---|
| | | userService.pwdChange(username, password, phone); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * @Description: 换取账号 |
|---|
| | | */ |
|---|
| | | @PostMapping("/getAccount") |
|---|
| | | @ApiOperation("换取账号") |
|---|
| | | @ApiImplicitParams({ |
|---|
| | | @ApiImplicitParam(name = "username",value = "用户名"), |
|---|
| | | @ApiImplicitParam(name = "department",value = "部门"), |
|---|
| | | }) |
|---|
| | | public Msg getAccount(@RequestBody JSONObject accountBody) { |
|---|
| | | String username = accountBody.getString("username"); |
|---|
| | | String password = accountBody.getString("department"); |
|---|
| | | return success(userService.getAccount(username, password)); |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Controller; |
|---|
| | | |
|---|
| | | import com.gk.hotwork.Controller.Base.BaseController; |
|---|
| | | import com.gk.hotwork.Domain.Enum.ErrorCode; |
|---|
| | | import com.gk.hotwork.Domain.UserInfo; |
|---|
| | | import com.gk.hotwork.Domain.Utils.Msg; |
|---|
| | | import com.gk.hotwork.Domain.Utils.PageInfo; |
|---|
| | | import com.gk.hotwork.Domain.Utils.StringUtils; |
|---|
| | | import com.gk.hotwork.Domain.WarningInfo; |
|---|
| | | import com.gk.hotwork.Service.UserService; |
|---|
| | | import com.gk.hotwork.Service.WarningService; |
|---|
| | | import io.swagger.annotations.Api; |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.web.bind.annotation.*; |
|---|
| | | |
|---|
| | | import java.util.Date; |
|---|
| | | import java.util.HashMap; |
|---|
| | | import java.util.Map; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * @author : jingjy |
|---|
| | | * @date : 2021/9/10 9:26 |
|---|
| | | */ |
|---|
| | | @Api(tags = "任务流程数据接口") |
|---|
| | | @RestController |
|---|
| | | @RequestMapping("/warning") |
|---|
| | | public class WarningController extends BaseController { |
|---|
| | | @Autowired |
|---|
| | | private WarningService warningService; |
|---|
| | | @Autowired |
|---|
| | | private UserService userService; |
|---|
| | | |
|---|
| | | @GetMapping("/info") |
|---|
| | | public Msg getWarningInfo(@RequestParam(value = "code", required = false) String code, |
|---|
| | | @RequestParam(value = "isDeal", required = false) String isDeal, |
|---|
| | | @RequestParam(value = "type", required = false) String type, |
|---|
| | | @RequestParam(defaultValue = "0") Integer pageIndex, |
|---|
| | | @RequestParam(value = "startTime", required = false) String startTime, |
|---|
| | | @RequestParam(value = "endTime", required = false) String endTime, |
|---|
| | | @RequestParam(defaultValue = "10") Integer pageSize, |
|---|
| | | String sort, String order){ |
|---|
| | | PageInfo pageInfo = new PageInfo(pageIndex, pageSize,sort,order); |
|---|
| | | |
|---|
| | | Map<String, Object> condition = new HashMap<>(4); |
|---|
| | | if (StringUtils.isNotBlank(code)) { |
|---|
| | | condition.put("code", code); |
|---|
| | | } |
|---|
| | | if (StringUtils.isNotBlank(isDeal)) { |
|---|
| | | condition.put("isDeal", isDeal); |
|---|
| | | } |
|---|
| | | if (StringUtils.isNotBlank(type)) { |
|---|
| | | condition.put("type", type); |
|---|
| | | } |
|---|
| | | if (StringUtils.isNotBlank(startTime)){ |
|---|
| | | condition.put("startTime", startTime); |
|---|
| | | } |
|---|
| | | if (StringUtils.isNotBlank(endTime)){ |
|---|
| | | condition.put("endTime", endTime); |
|---|
| | | } |
|---|
| | | pageInfo.setCondition(condition); |
|---|
| | | warningService.selectDataGrid(pageInfo); |
|---|
| | | |
|---|
| | | return success(pageInfo); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @PostMapping("/deal") |
|---|
| | | public Msg dealWarning(String id){ |
|---|
| | | UserInfo userInfo = userService.getById(getUser().getId()); |
|---|
| | | if (StringUtils.isBlank(id)){ |
|---|
| | | return new Msg(ErrorCode.ERROR_10001); |
|---|
| | | } |
|---|
| | | WarningInfo warningInfo = warningService.getById(id); |
|---|
| | | if (warningInfo == null || warningInfo.getIsdeal() == 1){ |
|---|
| | | return new Msg(ErrorCode.ERROR_50001,"警告信息未找到或已处理"); |
|---|
| | | } |
|---|
| | | warningInfo.setIsdeal((byte)1); |
|---|
| | | warningInfo.setDealat(new Date()); |
|---|
| | | warningInfo.setDealby(userInfo.getRealname()); |
|---|
| | | warningService.updateById(warningInfo); |
|---|
| | | return success(); |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Controller; |
|---|
| | | |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.core.metadata.IPage; |
|---|
| | | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|---|
| | | import com.gk.hotwork.Controller.Base.BaseController; |
|---|
| | | import com.gk.hotwork.Domain.Utils.FilterObject; |
|---|
| | | import com.gk.hotwork.Domain.Utils.Msg; |
|---|
| | | import com.gk.hotwork.Service.TaskService; |
|---|
| | | import io.swagger.annotations.Api; |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.web.bind.annotation.*; |
|---|
| | | |
|---|
| | | import java.util.Map; |
|---|
| | | import java.util.List; |
|---|
| | | |
|---|
| | | @Api(tags = "数据可视") |
|---|
| | | @RestController |
|---|
| | | @RequestMapping("/workShow") |
|---|
| | | public class WorkShowController extends BaseController { |
|---|
| | | |
|---|
| | | @Autowired |
|---|
| | | private TaskService taskService; |
|---|
| | | |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * @Description: 今日作业总数 |
|---|
| | | * @date 2021/9/9 14:08 |
|---|
| | | */ |
|---|
| | | @GetMapping("/work-today") |
|---|
| | | public Msg workToday() { |
|---|
| | | List<Map> data = taskService.getWorkToday(); |
|---|
| | | return success(data); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * @Description: 4个总数 |
|---|
| | | * @date 2021/9/10 14:29 |
|---|
| | | */ |
|---|
| | | @GetMapping("/four-total") |
|---|
| | | public Msg fourTotal() { |
|---|
| | | Map data = taskService.getFourTotal(); |
|---|
| | | return success(data); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * @Description: 今日作业总数列表 |
|---|
| | | * @date 2021/9/9 14:48 |
|---|
| | | */ |
|---|
| | | @PostMapping("/work-today-detail") |
|---|
| | | public Msg workTodayDetail(@RequestBody FilterObject filterObject) { |
|---|
| | | Integer pageIndex = filterObject.getPageIndex(); |
|---|
| | | Integer pageSize = filterObject.getPageSize(); |
|---|
| | | IPage page = taskService.getWorkTodayDetail(new Page<>(pageIndex, pageSize), filterObject.getFilter()); |
|---|
| | | return success(page); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * @Description: period内特殊作业类型对比(period天内动火作业总数, 审批完成) |
|---|
| | | * @date 2021/9/9 16:00 |
|---|
| | | */ |
|---|
| | | @GetMapping("/work-period/{period}") |
|---|
| | | public Msg specialCompareInMonth(@PathVariable String period) { |
|---|
| | | List<Map> data = taskService.getSpecialCompareInPeriod(period); |
|---|
| | | return success(data); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * @Description: 30天 每一天的作业总数(审批完成) |
|---|
| | | * @date 2021/9/9 16:48 |
|---|
| | | */ |
|---|
| | | @GetMapping("/work-everyday-month") |
|---|
| | | public Msg workEverydayInMonth() { |
|---|
| | | Map data = taskService.getWorkEverydayInMonth(); |
|---|
| | | return success(data); |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.annotation.IdType; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableField; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableId; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableName; |
|---|
| | | |
|---|
| | | import java.io.Serializable; |
|---|
| | | import java.util.Date; |
|---|
| | | |
|---|
| | | @TableName("appfile") |
|---|
| | | public class AppFileInfo implements Serializable { |
|---|
| | | @TableField(exist = false) |
|---|
| | | private static final long serialVersionUID = 1L; |
|---|
| | | |
|---|
| | | @TableId(type = IdType.AUTO) |
|---|
| | | private Long id; |
|---|
| | | |
|---|
| | | /** 文件类型 filetype 仓储、监管**/ |
|---|
| | | private String filetype; |
|---|
| | | |
|---|
| | | /** 文件名称 filename **/ |
|---|
| | | private String filename; |
|---|
| | | |
|---|
| | | /** 文件链接 fileurl **/ |
|---|
| | | private String fileurl; |
|---|
| | | |
|---|
| | | /** 版本号 version **/ |
|---|
| | | private Integer version; |
|---|
| | | |
|---|
| | | /** 备注 remark **/ |
|---|
| | | private String remark; |
|---|
| | | |
|---|
| | | /** 创建时间 created **/ |
|---|
| | | private Date created; |
|---|
| | | |
|---|
| | | /** 更新时间 updated **/ |
|---|
| | | private Date updated; |
|---|
| | | |
|---|
| | | /** id **/ |
|---|
| | | public Long getId() { |
|---|
| | | return id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** id **/ |
|---|
| | | public void setId(Long id) { |
|---|
| | | this.id = id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 文件类型 filetype **/ |
|---|
| | | public String getFiletype() { |
|---|
| | | return filetype; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 文件类型 filetype **/ |
|---|
| | | public void setFiletype(String filetype) { |
|---|
| | | this.filetype = filetype == null ? null : filetype.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 文件名称 filename **/ |
|---|
| | | public String getFilename() { |
|---|
| | | return filename; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 文件名称 filename **/ |
|---|
| | | public void setFilename(String filename) { |
|---|
| | | this.filename = filename == null ? null : filename.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 文件链接 fileurl **/ |
|---|
| | | public String getFileurl() { |
|---|
| | | return fileurl; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 文件链接 fileurl **/ |
|---|
| | | public void setFileurl(String fileurl) { |
|---|
| | | this.fileurl = fileurl == null ? null : fileurl.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 版本号 version **/ |
|---|
| | | public Integer getVersion() { |
|---|
| | | return version; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 版本号 version **/ |
|---|
| | | public void setVersion(Integer version) { |
|---|
| | | this.version = version; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 备注 remark **/ |
|---|
| | | public String getRemark() { |
|---|
| | | return remark; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 备注 remark **/ |
|---|
| | | public void setRemark(String remark) { |
|---|
| | | this.remark = remark == null ? null : remark.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建时间 created **/ |
|---|
| | | public Date getCreated() { |
|---|
| | | return created; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建时间 created **/ |
|---|
| | | public void setCreated(Date created) { |
|---|
| | | this.created = created; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 更新时间 updated **/ |
|---|
| | | public Date getUpdated() { |
|---|
| | | return updated; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 更新时间 updated **/ |
|---|
| | | public void setUpdated(Date updated) { |
|---|
| | | this.updated = updated; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.annotation.IdType; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableField; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableId; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableName; |
|---|
| | | |
|---|
| | | import java.util.Date; |
|---|
| | | |
|---|
| | | @TableName("authorization") |
|---|
| | | public class AuthorizationInfo { |
|---|
| | | @TableField(exist = false) |
|---|
| | | private static final long serialVersionUID = 1L; |
|---|
| | | |
|---|
| | | @TableId(type = IdType.AUTO) |
|---|
| | | private Long id; |
|---|
| | | |
|---|
| | | /** 企业编号 enterprisenumber **/ |
|---|
| | | private String enterprisenumber; |
|---|
| | | |
|---|
| | | /** 授权码 authcode **/ |
|---|
| | | private String authcode; |
|---|
| | | |
|---|
| | | /** 授权码前三位（唯一确定一家企业） authcodeprefix **/ |
|---|
| | | private String authcodeprefix; |
|---|
| | | |
|---|
| | | /** 合同编号 contractcode **/ |
|---|
| | | private String contractcode; |
|---|
| | | |
|---|
| | | /** 创建时间 createdat **/ |
|---|
| | | private Date createdat; |
|---|
| | | |
|---|
| | | /** 创建人 createdby **/ |
|---|
| | | private String createdby; |
|---|
| | | |
|---|
| | | /** 标记 flag **/ |
|---|
| | | private Byte flag; |
|---|
| | | |
|---|
| | | /** 最后使用时间 lasttime **/ |
|---|
| | | private Date lasttime; |
|---|
| | | |
|---|
| | | /** 是否使用（0.未启用；1.已启用） status **/ |
|---|
| | | private Byte status; |
|---|
| | | |
|---|
| | | /** id **/ |
|---|
| | | public Long getId() { |
|---|
| | | return id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** id **/ |
|---|
| | | public void setId(Long id) { |
|---|
| | | this.id = id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 企业编号 enterprisenumber **/ |
|---|
| | | public String getEnterprisenumber() { |
|---|
| | | return enterprisenumber; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 企业编号 enterprisenumber **/ |
|---|
| | | public void setEnterprisenumber(String enterprisenumber) { |
|---|
| | | this.enterprisenumber = enterprisenumber == null ? null : enterprisenumber.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 授权码 authcode **/ |
|---|
| | | public String getAuthcode() { |
|---|
| | | return authcode; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 授权码 authcode **/ |
|---|
| | | public void setAuthcode(String authcode) { |
|---|
| | | this.authcode = authcode == null ? null : authcode.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 授权码前三位（唯一确定一家企业） authcodeprefix **/ |
|---|
| | | public String getAuthcodeprefix() { |
|---|
| | | return authcodeprefix; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 授权码前三位（唯一确定一家企业） authcodeprefix **/ |
|---|
| | | public void setAuthcodeprefix(String authcodeprefix) { |
|---|
| | | this.authcodeprefix = authcodeprefix == null ? null : authcodeprefix.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 合同编号 contractcode **/ |
|---|
| | | public String getContractcode() { |
|---|
| | | return contractcode; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 合同编号 contractcode **/ |
|---|
| | | public void setContractcode(String contractcode) { |
|---|
| | | this.contractcode = contractcode == null ? null : contractcode.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建时间 createdat **/ |
|---|
| | | public Date getCreatedat() { |
|---|
| | | return createdat; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建时间 createdat **/ |
|---|
| | | public void setCreatedat(Date createdat) { |
|---|
| | | this.createdat = createdat; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建人 createdby **/ |
|---|
| | | public String getCreatedby() { |
|---|
| | | return createdby; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建人 createdby **/ |
|---|
| | | public void setCreatedby(String createdby) { |
|---|
| | | this.createdby = createdby == null ? null : createdby.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 标记 flag **/ |
|---|
| | | public Byte getFlag() { |
|---|
| | | return flag; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 标记 flag **/ |
|---|
| | | public void setFlag(Byte flag) { |
|---|
| | | this.flag = flag; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最后使用时间 lasttime **/ |
|---|
| | | public Date getLasttime() { |
|---|
| | | return lasttime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最后使用时间 lasttime **/ |
|---|
| | | public void setLasttime(Date lasttime) { |
|---|
| | | this.lasttime = lasttime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 是否使用（0.未启用；1.已启用） status **/ |
|---|
| | | public Byte getStatus() { |
|---|
| | | return status; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 是否使用（0.未启用；1.已启用） status **/ |
|---|
| | | public void setStatus(Byte status) { |
|---|
| | | this.status = status; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.annotation.IdType; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableField; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableId; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableName; |
|---|
| | | |
|---|
| | | import java.io.Serializable; |
|---|
| | | import java.util.Date; |
|---|
| | | |
|---|
| | | @TableName("blacklist") |
|---|
| | | public class BlackListInfo implements Serializable { |
|---|
| | | @TableField(exist = false) |
|---|
| | | private static final long serialVersionUID = 1L; |
|---|
| | | |
|---|
| | | /** 供应商黑名单 id **/ |
|---|
| | | @TableId(type = IdType.AUTO) |
|---|
| | | private Long id; |
|---|
| | | |
|---|
| | | /** 供应商名称 company **/ |
|---|
| | | private String company; |
|---|
| | | |
|---|
| | | /** 联系人 contactname **/ |
|---|
| | | private String contactname; |
|---|
| | | |
|---|
| | | /** 创建人 createdby **/ |
|---|
| | | private String createdby; |
|---|
| | | |
|---|
| | | /** 创建时间 createdat **/ |
|---|
| | | private Date createdat; |
|---|
| | | |
|---|
| | | /** 修改人 modifiedby **/ |
|---|
| | | private String modifiedby; |
|---|
| | | |
|---|
| | | /** 修改时间 modifiedat **/ |
|---|
| | | private Date modifiedat; |
|---|
| | | |
|---|
| | | /** 标记 flag **/ |
|---|
| | | private Byte flag; |
|---|
| | | |
|---|
| | | /** 供应商黑名单 id **/ |
|---|
| | | public Long getId() { |
|---|
| | | return id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 供应商黑名单 id **/ |
|---|
| | | public void setId(Long id) { |
|---|
| | | this.id = id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 供应商名称 company **/ |
|---|
| | | public String getCompany() { |
|---|
| | | return company; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 供应商名称 company **/ |
|---|
| | | public void setCompany(String company) { |
|---|
| | | this.company = company == null ? null : company.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 联系人 contactname **/ |
|---|
| | | public String getContactname() { |
|---|
| | | return contactname; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 联系人 contactname **/ |
|---|
| | | public void setContactname(String contactname) { |
|---|
| | | this.contactname = contactname == null ? null : contactname.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建人 createdby **/ |
|---|
| | | public String getCreatedby() { |
|---|
| | | return createdby; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建人 createdby **/ |
|---|
| | | public void setCreatedby(String createdby) { |
|---|
| | | this.createdby = createdby == null ? null : createdby.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建时间 createdat **/ |
|---|
| | | public Date getCreatedat() { |
|---|
| | | return createdat; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建时间 createdat **/ |
|---|
| | | public void setCreatedat(Date createdat) { |
|---|
| | | this.createdat = createdat; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 修改人 modifiedby **/ |
|---|
| | | public String getModifiedby() { |
|---|
| | | return modifiedby; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 修改人 modifiedby **/ |
|---|
| | | public void setModifiedby(String modifiedby) { |
|---|
| | | this.modifiedby = modifiedby == null ? null : modifiedby.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 修改时间 modifiedat **/ |
|---|
| | | public Date getModifiedat() { |
|---|
| | | return modifiedat; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 修改时间 modifiedat **/ |
|---|
| | | public void setModifiedat(Date modifiedat) { |
|---|
| | | this.modifiedat = modifiedat; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 标记 flag **/ |
|---|
| | | public Byte getFlag() { |
|---|
| | | return flag; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 标记 flag **/ |
|---|
| | | public void setFlag(Byte flag) { |
|---|
| | | this.flag = flag; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.annotation.IdType; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableField; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableId; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableName; |
|---|
| | | |
|---|
| | | import java.io.Serializable; |
|---|
| | | import java.util.Date; |
|---|
| | | |
|---|
| | | @TableName("company") |
|---|
| | | public class CompanyInfo implements Serializable { |
|---|
| | | @TableField(exist = false) |
|---|
| | | private static final long serialVersionUID = 1L; |
|---|
| | | |
|---|
| | | @TableId(type = IdType.AUTO) |
|---|
| | | private Long id; |
|---|
| | | |
|---|
| | | /** 单位代码 code **/ |
|---|
| | | private String code; |
|---|
| | | |
|---|
| | | /** 单位名称 company **/ |
|---|
| | | private String company; |
|---|
| | | |
|---|
| | | /** 是否为主体单位 ismain **/ |
|---|
| | | private Byte ismain; |
|---|
| | | |
|---|
| | | /** 联系人 contactname **/ |
|---|
| | | private String contactname; |
|---|
| | | |
|---|
| | | /** 联系电话 contactphone **/ |
|---|
| | | private String contactphone; |
|---|
| | | |
|---|
| | | /** 省份 province **/ |
|---|
| | | private String province; |
|---|
| | | |
|---|
| | | /** 城市 city **/ |
|---|
| | | private String city; |
|---|
| | | |
|---|
| | | /** 区县 area **/ |
|---|
| | | private String area; |
|---|
| | | |
|---|
| | | /** 乡镇 town **/ |
|---|
| | | private String town; |
|---|
| | | |
|---|
| | | /** 社区 community **/ |
|---|
| | | private String community; |
|---|
| | | |
|---|
| | | /** 是否删除 isdel **/ |
|---|
| | | private Byte isdel; |
|---|
| | | |
|---|
| | | /** 创建人 createdby **/ |
|---|
| | | private String createdby; |
|---|
| | | |
|---|
| | | /** 创建时间 createddate **/ |
|---|
| | | private Date createddate; |
|---|
| | | |
|---|
| | | /** 更新人 lastmodifiedby **/ |
|---|
| | | private String lastmodifiedby; |
|---|
| | | |
|---|
| | | /** 更新时间 lastmodifieddate **/ |
|---|
| | | private Date lastmodifieddate; |
|---|
| | | |
|---|
| | | private String longitude; |
|---|
| | | |
|---|
| | | private String latitude; |
|---|
| | | |
|---|
| | | private Byte isbanned; |
|---|
| | | |
|---|
| | | /** id id **/ |
|---|
| | | public Long getId() { |
|---|
| | | return id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** id id **/ |
|---|
| | | public void setId(Long id) { |
|---|
| | | this.id = id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 名称 company **/ |
|---|
| | | public String getCompany() { |
|---|
| | | return company; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 名称 company **/ |
|---|
| | | public void setCompany(String company) { |
|---|
| | | this.company = company == null ? null : company.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 联系人 contactname **/ |
|---|
| | | public String getContactname() { |
|---|
| | | return contactname; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 联系人 contactname **/ |
|---|
| | | public void setContactname(String contactname) { |
|---|
| | | this.contactname = contactname == null ? null : contactname.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 联系电话 contactphone **/ |
|---|
| | | public String getContactphone() { |
|---|
| | | return contactphone; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 联系电话 contactphone **/ |
|---|
| | | public void setContactphone(String contactphone) { |
|---|
| | | this.contactphone = contactphone == null ? null : contactphone.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 省份 province **/ |
|---|
| | | public String getProvince() { |
|---|
| | | return province; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 省份 province **/ |
|---|
| | | public void setProvince(String province) { |
|---|
| | | this.province = province == null ? null : province.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 城市 city **/ |
|---|
| | | public String getCity() { |
|---|
| | | return city; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 城市 city **/ |
|---|
| | | public void setCity(String city) { |
|---|
| | | this.city = city == null ? null : city.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 区县 area **/ |
|---|
| | | public String getArea() { |
|---|
| | | return area; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 区县 area **/ |
|---|
| | | public void setArea(String area) { |
|---|
| | | this.area = area == null ? null : area.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 乡镇 town **/ |
|---|
| | | public String getTown() { |
|---|
| | | return town; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 乡镇 town **/ |
|---|
| | | public void setTown(String town) { |
|---|
| | | this.town = town == null ? null : town.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 社区 community **/ |
|---|
| | | public String getCommunity() { |
|---|
| | | return community; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 社区 community **/ |
|---|
| | | public void setCommunity(String community) { |
|---|
| | | this.community = community == null ? null : community.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 是否删除 isdel **/ |
|---|
| | | public Byte getIsdel() { |
|---|
| | | return isdel; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 是否删除 isdel **/ |
|---|
| | | public void setIsdel(Byte isdel) { |
|---|
| | | this.isdel = isdel; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getCreatedby() { |
|---|
| | | return createdby; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setCreatedby(String createdby) { |
|---|
| | | this.createdby = createdby; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Date getCreateddate() { |
|---|
| | | return createddate; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setCreateddate(Date createddate) { |
|---|
| | | this.createddate = createddate; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getLastmodifiedby() { |
|---|
| | | return lastmodifiedby; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setLastmodifiedby(String lastmodifiedby) { |
|---|
| | | this.lastmodifiedby = lastmodifiedby; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Date getLastmodifieddate() { |
|---|
| | | return lastmodifieddate; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setLastmodifieddate(Date lastmodifieddate) { |
|---|
| | | this.lastmodifieddate = lastmodifieddate; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getCode() { |
|---|
| | | return code; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setCode(String code) { |
|---|
| | | this.code = code; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Byte getIsmain() { |
|---|
| | | return ismain; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setIsmain(Byte ismain) { |
|---|
| | | this.ismain = ismain; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getLongitude() { |
|---|
| | | return longitude; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setLongitude(String longitude) { |
|---|
| | | this.longitude = longitude; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getLatitude() { |
|---|
| | | return latitude; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setLatitude(String latitude) { |
|---|
| | | this.latitude = latitude; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Byte getIsbanned() { |
|---|
| | | return isbanned; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setIsbanned(Byte isbanned) { |
|---|
| | | this.isbanned = isbanned; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.annotation.IdType; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableField; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableId; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableName; |
|---|
| | | |
|---|
| | | import java.io.Serializable; |
|---|
| | | import java.util.Date; |
|---|
| | | |
|---|
| | | @TableName("department") |
|---|
| | | public class DepartmentInfo implements Serializable { |
|---|
| | | @TableField(exist = false) |
|---|
| | | private static final long serialVersionUID = 1L; |
|---|
| | | |
|---|
| | | @TableId(type = IdType.AUTO) |
|---|
| | | private Long id; |
|---|
| | | |
|---|
| | | /** 部门名称 **/ |
|---|
| | | private String department; |
|---|
| | | |
|---|
| | | /** 是否为安全部门 issafety **/ |
|---|
| | | private Byte issafety; |
|---|
| | | |
|---|
| | | /** 是否为检测中心 isanalysis **/ |
|---|
| | | private Byte isanalysis; |
|---|
| | | |
|---|
| | | /** 是否删除 isdel **/ |
|---|
| | | private Byte isdel; |
|---|
| | | |
|---|
| | | public Date getCreateddate() { |
|---|
| | | return createddate; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setCreateddate(Date createddate) { |
|---|
| | | this.createddate = createddate; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getLastmodifiedby() { |
|---|
| | | return lastmodifiedby; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setLastmodifiedby(String lastmodifiedby) { |
|---|
| | | this.lastmodifiedby = lastmodifiedby; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Date getLastmodifieddate() { |
|---|
| | | return lastmodifieddate; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setLastmodifieddate(Date lastmodifieddate) { |
|---|
| | | this.lastmodifieddate = lastmodifieddate; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建人 createdby **/ |
|---|
| | | private String createdby; |
|---|
| | | |
|---|
| | | /** 创建时间 createddate **/ |
|---|
| | | private Date createddate; |
|---|
| | | |
|---|
| | | /** 更新人 lastmodifiedby **/ |
|---|
| | | private String lastmodifiedby; |
|---|
| | | |
|---|
| | | /** 更新时间 lastmodifieddate **/ |
|---|
| | | private Date lastmodifieddate; |
|---|
| | | |
|---|
| | | /** id **/ |
|---|
| | | public Long getId() { |
|---|
| | | return id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** id **/ |
|---|
| | | public void setId(Long id) { |
|---|
| | | this.id = id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** department **/ |
|---|
| | | public String getDepartment() { |
|---|
| | | return department; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** department **/ |
|---|
| | | public void setDepartment(String department) { |
|---|
| | | this.department = department == null ? null : department.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 是否为安全部门 issafety **/ |
|---|
| | | public Byte getIssafety() { |
|---|
| | | return issafety; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 是否为安全部门 issafety **/ |
|---|
| | | public void setIssafety(Byte issafety) { |
|---|
| | | this.issafety = issafety; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Byte getIsanalysis() { |
|---|
| | | return isanalysis; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setIsanalysis(Byte isanalysis) { |
|---|
| | | this.isanalysis = isanalysis; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 是否删除 isdel **/ |
|---|
| | | public Byte getIsdel() { |
|---|
| | | return isdel; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 是否删除 isdel **/ |
|---|
| | | public void setIsdel(Byte isdel) { |
|---|
| | | this.isdel = isdel; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getCreatedby() { |
|---|
| | | return createdby; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setCreatedby(String createdby) { |
|---|
| | | this.createdby = createdby; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain; |
|---|
| | | |
|---|
| | | |
|---|
| | | import java.io.Serializable; |
|---|
| | | import java.math.BigDecimal; |
|---|
| | | import java.util.Date; |
|---|
| | | |
|---|
| | | |
|---|
| | | public class DeviceLocation implements Serializable { |
|---|
| | | |
|---|
| | | private Long id; |
|---|
| | | //总图ID |
|---|
| | | private Long rootAreaId; |
|---|
| | | //定位地图ID |
|---|
| | | private Long areaId; |
|---|
| | | //(可选)车间/房间号(需要特殊配置才会生效) |
|---|
| | | private String gateId; |
|---|
| | | //固定为"Tag" |
|---|
| | | private String deviceType; |
|---|
| | | //标签编号 |
|---|
| | | private String uid; |
|---|
| | | //标签编号(为兼容性而保留，与uid 含义相同) |
|---|
| | | private String tagId; |
|---|
| | | //用户自定义编号 |
|---|
| | | private String userId; |
|---|
| | | //通讯中继编号 |
|---|
| | | private String routerId; |
|---|
| | | //触发时间,采用标准的UTC格式 ,本地时间需要用户软件依据时区自行转换 |
|---|
| | | private Date raiseTime; |
|---|
| | | //X轴坐标 |
|---|
| | | private BigDecimal x; |
|---|
| | | //Y轴坐标 |
|---|
| | | private BigDecimal y; |
|---|
| | | //Z轴坐标(地图配置时自定义) |
|---|
| | | private BigDecimal z; |
|---|
| | | //整型 楼层(地图配置时自定义) |
|---|
| | | private Integer floor; |
|---|
| | | //方向标志, 整型： 4~门口 5~离开 |
|---|
| | | private Integer direction; |
|---|
| | | //(引擎V2.41 版以上) 速度,米/秒 |
|---|
| | | private BigDecimal speed; |
|---|
| | | // (引擎V2.41 版以上)当标签进入静止状态后，会继续输出一段时间的定位信息,此时silent=true |
|---|
| | | private Boolean silent; |
|---|
| | | // (可选)经度 |
|---|
| | | private BigDecimal longitude; |
|---|
| | | // (可选)纬度 |
|---|
| | | private BigDecimal latitude; |
|---|
| | | // (可选)海拔 |
|---|
| | | private BigDecimal altitude; |
|---|
| | | //(可选)经纬度坐标系 "wgs84"(默认值), "gcj02"(谷歌标准) ,"bd09"(百度标准) |
|---|
| | | private String gpsType; |
|---|
| | | //(可选)定位模式, ”ble“ ~蓝牙定位 , "gps"~GPS 定位 注:经纬度和海拔是可选字段，需要特殊配置才会生效 |
|---|
| | | private String mode; |
|---|
| | | |
|---|
| | | private Date createTime; |
|---|
| | | |
|---|
| | | public Long getRootAreaId() { |
|---|
| | | return rootAreaId; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setRootAreaId(Long rootAreaId) { |
|---|
| | | this.rootAreaId = rootAreaId; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Long getAreaId() { |
|---|
| | | return areaId; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setAreaId(Long areaId) { |
|---|
| | | this.areaId = areaId; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getGateId() { |
|---|
| | | return gateId; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setGateId(String gateId) { |
|---|
| | | this.gateId = gateId; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getDeviceType() { |
|---|
| | | return deviceType; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setDeviceType(String deviceType) { |
|---|
| | | this.deviceType = deviceType; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getUid() { |
|---|
| | | return uid; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setUid(String uid) { |
|---|
| | | this.uid = uid; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getTagId() { |
|---|
| | | return tagId; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setTagId(String tagId) { |
|---|
| | | this.tagId = tagId; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getUserId() { |
|---|
| | | return userId; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setUserId(String userId) { |
|---|
| | | this.userId = userId; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getRouterId() { |
|---|
| | | return routerId; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setRouterId(String routerId) { |
|---|
| | | this.routerId = routerId; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Date getRaiseTime() { |
|---|
| | | return raiseTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setRaiseTime(Date raiseTime) { |
|---|
| | | this.raiseTime = raiseTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public BigDecimal getX() { |
|---|
| | | return x; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setX(BigDecimal x) { |
|---|
| | | this.x = x; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public BigDecimal getY() { |
|---|
| | | return y; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setY(BigDecimal y) { |
|---|
| | | this.y = y; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public BigDecimal getZ() { |
|---|
| | | return z; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setZ(BigDecimal z) { |
|---|
| | | this.z = z; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Integer getFloor() { |
|---|
| | | return floor; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setFloor(Integer floor) { |
|---|
| | | this.floor = floor; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Integer getDirection() { |
|---|
| | | return direction; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setDirection(Integer direction) { |
|---|
| | | this.direction = direction; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public BigDecimal getSpeed() { |
|---|
| | | return speed; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setSpeed(BigDecimal speed) { |
|---|
| | | this.speed = speed; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Boolean getSilent() { |
|---|
| | | return silent; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setSilent(Boolean silent) { |
|---|
| | | this.silent = silent; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public BigDecimal getLongitude() { |
|---|
| | | return longitude; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setLongitude(BigDecimal longitude) { |
|---|
| | | this.longitude = longitude; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public BigDecimal getLatitude() { |
|---|
| | | return latitude; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setLatitude(BigDecimal latitude) { |
|---|
| | | this.latitude = latitude; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public BigDecimal getAltitude() { |
|---|
| | | return altitude; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setAltitude(BigDecimal altitude) { |
|---|
| | | this.altitude = altitude; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getGpsType() { |
|---|
| | | return gpsType; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setGpsType(String gpsType) { |
|---|
| | | this.gpsType = gpsType; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getMode() { |
|---|
| | | return mode; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setMode(String mode) { |
|---|
| | | this.mode = mode; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Date getCreateTime() { |
|---|
| | | return createTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setCreateTime(Date createTime) { |
|---|
| | | this.createTime = createTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Long getId() { |
|---|
| | | return id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setId(Long id) { |
|---|
| | | this.id = id; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.annotation.IdType; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableId; |
|---|
| | | import org.springframework.data.relational.core.mapping.Table; |
|---|
| | | |
|---|
| | | import java.io.Serializable; |
|---|
| | | import java.math.BigDecimal; |
|---|
| | | import java.util.Date; |
|---|
| | | |
|---|
| | | @Table("device_ping") |
|---|
| | | public class DevicePing implements Serializable { |
|---|
| | | |
|---|
| | | @TableId(type = IdType.AUTO) |
|---|
| | | private Long id; |
|---|
| | | //"Router" 代表通讯基站/网关,"Beacon" 表示是定位信标, "Tag" 表示标签, "Station" 代表定位基站 |
|---|
| | | private String deviceType; |
|---|
| | | //标签编号 |
|---|
| | | private String uid; |
|---|
| | | |
|---|
| | | private Date raiseTime; |
|---|
| | | //电压数值 |
|---|
| | | private BigDecimal volt; |
|---|
| | | //电压单位 "%"或者"V" |
|---|
| | | private String voltUnit; |
|---|
| | | //是否静止 |
|---|
| | | private Boolean silent; |
|---|
| | | //仅在deviceType="Beacon" 时有效, 表示转发基站的编号(信标的状态必须通过某个基站转发) |
|---|
| | | private String routerId; |
|---|
| | | //0x02 处在一键呼救报警状态 , 0x04 静止状态 |
|---|
| | | private String state; |
|---|
| | | |
|---|
| | | private Date createTime; |
|---|
| | | |
|---|
| | | public String getDeviceType() { |
|---|
| | | return deviceType; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setDeviceType(String deviceType) { |
|---|
| | | this.deviceType = deviceType; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getUid() { |
|---|
| | | return uid; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setUid(String uid) { |
|---|
| | | this.uid = uid; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Date getRaiseTime() { |
|---|
| | | return raiseTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setRaiseTime(Date raiseTime) { |
|---|
| | | this.raiseTime = raiseTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public BigDecimal getVolt() { |
|---|
| | | return volt; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setVolt(BigDecimal volt) { |
|---|
| | | this.volt = volt; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getVoltUnit() { |
|---|
| | | return voltUnit; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setVoltUnit(String voltUnit) { |
|---|
| | | this.voltUnit = voltUnit; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Boolean getSilent() { |
|---|
| | | return silent; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setSilent(Boolean silent) { |
|---|
| | | this.silent = silent; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getRouterId() { |
|---|
| | | return routerId; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setRouterId(String routerId) { |
|---|
| | | this.routerId = routerId; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getState() { |
|---|
| | | return state; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setState(String state) { |
|---|
| | | this.state = state; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Date getCreateTime() { |
|---|
| | | return createTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setCreateTime(Date createTime) { |
|---|
| | | this.createTime = createTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Long getId() { |
|---|
| | | return id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setId(Long id) { |
|---|
| | | this.id = id; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.annotation.IdType; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableId; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableName; |
|---|
| | | |
|---|
| | | import java.io.Serializable; |
|---|
| | | import java.util.Date; |
|---|
| | | |
|---|
| | | @TableName("device_presskey") |
|---|
| | | public class DevicePressKey implements Serializable { |
|---|
| | | |
|---|
| | | @TableId(type = IdType.AUTO) |
|---|
| | | private Long id; |
|---|
| | | |
|---|
| | | private String deviceType; |
|---|
| | | |
|---|
| | | private String uid; |
|---|
| | | //按键值(保留字段,固定为1) |
|---|
| | | private String keyCode; |
|---|
| | | // 触发时间,采用标准的UTC格式 ,本地时间需要用户软件依据时区自行转换 |
|---|
| | | private Date raiseTime; |
|---|
| | | //本次呼救的ID, 呼救过程中保持相同 |
|---|
| | | private Long sessionId; |
|---|
| | | //地图编号(按键时刻所在的地图) |
|---|
| | | private Long areaId; |
|---|
| | | |
|---|
| | | private Date createTime; |
|---|
| | | |
|---|
| | | public String getDeviceType() { |
|---|
| | | return deviceType; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setDeviceType(String deviceType) { |
|---|
| | | this.deviceType = deviceType; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getUid() { |
|---|
| | | return uid; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setUid(String uid) { |
|---|
| | | this.uid = uid; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getKeyCode() { |
|---|
| | | return keyCode; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setKeyCode(String keyCode) { |
|---|
| | | this.keyCode = keyCode; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Date getRaiseTime() { |
|---|
| | | return raiseTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setRaiseTime(Date raiseTime) { |
|---|
| | | this.raiseTime = raiseTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Long getSessionId() { |
|---|
| | | return sessionId; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setSessionId(Long sessionId) { |
|---|
| | | this.sessionId = sessionId; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Long getAreaId() { |
|---|
| | | return areaId; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setAreaId(Long areaId) { |
|---|
| | | this.areaId = areaId; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Long getId() { |
|---|
| | | return id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setId(Long id) { |
|---|
| | | this.id = id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Date getCreateTime() { |
|---|
| | | return createTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setCreateTime(Date createTime) { |
|---|
| | | this.createTime = createTime; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.annotation.IdType; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableField; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableId; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableName; |
|---|
| | | |
|---|
| | | import java.io.Serializable; |
|---|
| | | import java.util.Date; |
|---|
| | | |
|---|
| | | @TableName("dictionaryitem") |
|---|
| | | public class DictionaryItemInfo implements Serializable { |
|---|
| | | @TableField(exist = false) |
|---|
| | | private static final long serialVersionUID = 1L; |
|---|
| | | |
|---|
| | | @TableId(type = IdType.AUTO) |
|---|
| | | private Long id; |
|---|
| | | |
|---|
| | | /** 序号 sort **/ |
|---|
| | | private Integer sort; |
|---|
| | | |
|---|
| | | /** 是否使用1使用 0禁用 status **/ |
|---|
| | | private Byte status; |
|---|
| | | |
|---|
| | | /** 字典标签 text **/ |
|---|
| | | private String text; |
|---|
| | | |
|---|
| | | /** 字典值 value **/ |
|---|
| | | private String value; |
|---|
| | | |
|---|
| | | /** 创建人 createdby **/ |
|---|
| | | private String createdby; |
|---|
| | | |
|---|
| | | /** 创建时间 createddate **/ |
|---|
| | | private Date createddate; |
|---|
| | | |
|---|
| | | /** 更新人 modifiedby **/ |
|---|
| | | private String modifiedby; |
|---|
| | | |
|---|
| | | /** 更新时间 modifieddate **/ |
|---|
| | | private Date modifieddate; |
|---|
| | | |
|---|
| | | /** 备注 description **/ |
|---|
| | | private String description; |
|---|
| | | |
|---|
| | | /** 字典类型id typeid **/ |
|---|
| | | private Long typeid; |
|---|
| | | |
|---|
| | | /** id **/ |
|---|
| | | public Long getId() { |
|---|
| | | return id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** id **/ |
|---|
| | | public void setId(Long id) { |
|---|
| | | this.id = id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 序号 sort **/ |
|---|
| | | public Integer getSort() { |
|---|
| | | return sort; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 序号 sort **/ |
|---|
| | | public void setSort(Integer sort) { |
|---|
| | | this.sort = sort; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 是否使用1使用 0禁用 status **/ |
|---|
| | | public Byte getStatus() { |
|---|
| | | return status; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 是否使用1使用 0禁用 status **/ |
|---|
| | | public void setStatus(Byte status) { |
|---|
| | | this.status = status; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 字典标签 text **/ |
|---|
| | | public String getText() { |
|---|
| | | return text; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 字典标签 text **/ |
|---|
| | | public void setText(String text) { |
|---|
| | | this.text = text == null ? null : text.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 字典值 value **/ |
|---|
| | | public String getValue() { |
|---|
| | | return value; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 字典值 value **/ |
|---|
| | | public void setValue(String value) { |
|---|
| | | this.value = value == null ? null : value.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建人 createdby **/ |
|---|
| | | public String getCreatedby() { |
|---|
| | | return createdby; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建人 createdby **/ |
|---|
| | | public void setCreatedby(String createdby) { |
|---|
| | | this.createdby = createdby == null ? null : createdby.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建时间 createddate **/ |
|---|
| | | public Date getCreateddate() { |
|---|
| | | return createddate; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建时间 createddate **/ |
|---|
| | | public void setCreateddate(Date createddate) { |
|---|
| | | this.createddate = createddate; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 更新人 modifiedby **/ |
|---|
| | | public String getModifiedby() { |
|---|
| | | return modifiedby; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 更新人 modifiedby **/ |
|---|
| | | public void setModifiedby(String modifiedby) { |
|---|
| | | this.modifiedby = modifiedby == null ? null : modifiedby.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 更新时间 modifieddate **/ |
|---|
| | | public Date getModifieddate() { |
|---|
| | | return modifieddate; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 更新时间 modifieddate **/ |
|---|
| | | public void setModifieddate(Date modifieddate) { |
|---|
| | | this.modifieddate = modifieddate; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 备注 description **/ |
|---|
| | | public String getDescription() { |
|---|
| | | return description; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 备注 description **/ |
|---|
| | | public void setDescription(String description) { |
|---|
| | | this.description = description == null ? null : description.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 字典类型id typeid **/ |
|---|
| | | public Long getTypeid() { |
|---|
| | | return typeid; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 字典类型id typeid **/ |
|---|
| | | public void setTypeid(Long typeid) { |
|---|
| | | this.typeid = typeid; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.annotation.IdType; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableField; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableId; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableName; |
|---|
| | | |
|---|
| | | import java.io.Serializable; |
|---|
| | | import java.util.Date; |
|---|
| | | |
|---|
| | | @TableName("dictionarytype") |
|---|
| | | public class DictionaryTypeInfo implements Serializable { |
|---|
| | | @TableField(exist = false) |
|---|
| | | private static final long serialVersionUID = 1L; |
|---|
| | | |
|---|
| | | @TableId(type = IdType.AUTO) |
|---|
| | | private Long id; |
|---|
| | | |
|---|
| | | /** 编码 code **/ |
|---|
| | | private String code; |
|---|
| | | |
|---|
| | | /** 状态1使用 0禁用 status **/ |
|---|
| | | private Byte status; |
|---|
| | | |
|---|
| | | /** 类型名称 text **/ |
|---|
| | | private String text; |
|---|
| | | |
|---|
| | | /** 创建人 createdby **/ |
|---|
| | | private String createdby; |
|---|
| | | |
|---|
| | | /** 创建时间 createddate **/ |
|---|
| | | private Date createddate; |
|---|
| | | |
|---|
| | | /** 更新人 modifiedby **/ |
|---|
| | | private String modifiedby; |
|---|
| | | |
|---|
| | | /** 更新时间 modifieddate **/ |
|---|
| | | private Date modifieddate; |
|---|
| | | |
|---|
| | | /** 备注 description **/ |
|---|
| | | private String description; |
|---|
| | | |
|---|
| | | /** id **/ |
|---|
| | | public Long getId() { |
|---|
| | | return id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** id **/ |
|---|
| | | public void setId(Long id) { |
|---|
| | | this.id = id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 编码 code **/ |
|---|
| | | public String getCode() { |
|---|
| | | return code; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 编码 code **/ |
|---|
| | | public void setCode(String code) { |
|---|
| | | this.code = code == null ? null : code.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 状态1使用 0禁用 status **/ |
|---|
| | | public Byte getStatus() { |
|---|
| | | return status; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 状态1使用 0禁用 status **/ |
|---|
| | | public void setStatus(Byte status) { |
|---|
| | | this.status = status; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 类型名称 text **/ |
|---|
| | | public String getText() { |
|---|
| | | return text; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 类型名称 text **/ |
|---|
| | | public void setText(String text) { |
|---|
| | | this.text = text == null ? null : text.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建人 createdby **/ |
|---|
| | | public String getCreatedby() { |
|---|
| | | return createdby; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建人 createdby **/ |
|---|
| | | public void setCreatedby(String createdby) { |
|---|
| | | this.createdby = createdby == null ? null : createdby.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建时间 createddate **/ |
|---|
| | | public Date getCreateddate() { |
|---|
| | | return createddate; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建时间 createddate **/ |
|---|
| | | public void setCreateddate(Date createddate) { |
|---|
| | | this.createddate = createddate; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 更新人 modifiedby **/ |
|---|
| | | public String getModifiedby() { |
|---|
| | | return modifiedby; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 更新人 modifiedby **/ |
|---|
| | | public void setModifiedby(String modifiedby) { |
|---|
| | | this.modifiedby = modifiedby == null ? null : modifiedby.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 更新时间 modifieddate **/ |
|---|
| | | public Date getModifieddate() { |
|---|
| | | return modifieddate; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 更新时间 modifieddate **/ |
|---|
| | | public void setModifieddate(Date modifieddate) { |
|---|
| | | this.modifieddate = modifieddate; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 备注 description **/ |
|---|
| | | public String getDescription() { |
|---|
| | | return description; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 备注 description **/ |
|---|
| | | public void setDescription(String description) { |
|---|
| | | this.description = description == null ? null : description.trim(); |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain; |
|---|
| | | |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.annotation.IdType; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableField; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableId; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableName; |
|---|
| | | |
|---|
| | | import java.io.Serializable; |
|---|
| | | |
|---|
| | | @TableName("district") |
|---|
| | | public class DistrictInfo implements Serializable { |
|---|
| | | @TableField(exist = false) |
|---|
| | | private static final long serialVersionUID = 1L; |
|---|
| | | |
|---|
| | | @TableId(type = IdType.AUTO) |
|---|
| | | private Long id; |
|---|
| | | |
|---|
| | | /** code **/ |
|---|
| | | private String code; |
|---|
| | | |
|---|
| | | /** name **/ |
|---|
| | | private String name; |
|---|
| | | |
|---|
| | | /** parentcode **/ |
|---|
| | | private String parentcode; |
|---|
| | | |
|---|
| | | /** 1省份2城市3区县4乡镇5居委会 type **/ |
|---|
| | | private Byte type; |
|---|
| | | |
|---|
| | | /** id **/ |
|---|
| | | public Long getId() { |
|---|
| | | return id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** id **/ |
|---|
| | | public void setId(Long id) { |
|---|
| | | this.id = id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** code **/ |
|---|
| | | public String getCode() { |
|---|
| | | return code; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** code **/ |
|---|
| | | public void setCode(String code) { |
|---|
| | | this.code = code == null ? null : code.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** name **/ |
|---|
| | | public String getName() { |
|---|
| | | return name; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** name **/ |
|---|
| | | public void setName(String name) { |
|---|
| | | this.name = name == null ? null : name.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** parentcode **/ |
|---|
| | | public String getParentcode() { |
|---|
| | | return parentcode; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** parentcode **/ |
|---|
| | | public void setParentcode(String parentcode) { |
|---|
| | | this.parentcode = parentcode == null ? null : parentcode.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 1省份2城市3区县4乡镇5居委会 type **/ |
|---|
| | | public Byte getType() { |
|---|
| | | return type; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 1省份2城市3区县4乡镇5居委会 type **/ |
|---|
| | | public void setType(Byte type) { |
|---|
| | | this.type = type; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain.Do; |
|---|
| | | |
|---|
| | | import io.swagger.models.auth.In; |
|---|
| | | |
|---|
| | | import java.io.Serializable; |
|---|
| | | |
|---|
| | | public class SafetySelfInspectionItemQualifiedCountDO implements Serializable { |
|---|
| | | |
|---|
| | | private Integer itemSum; |
|---|
| | | |
|---|
| | | private Integer qualifiedItem; |
|---|
| | | |
|---|
| | | public Integer getItemSum() { |
|---|
| | | return itemSum; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setItemSum(Integer itemSum) { |
|---|
| | | this.itemSum = itemSum; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Integer getQualifiedItem() { |
|---|
| | | return qualifiedItem; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setQualifiedItem(Integer qualifiedItem) { |
|---|
| | | this.qualifiedItem = qualifiedItem; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.annotation.IdType; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableField; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableId; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableName; |
|---|
| | | |
|---|
| | | import java.io.Serializable; |
|---|
| | | import java.util.Date; |
|---|
| | | import java.util.List; |
|---|
| | | |
|---|
| | | @TableName("element_management") |
|---|
| | | public class ElementManagement implements Serializable { |
|---|
| | | |
|---|
| | | private final static long serialVersionUID = 1L; |
|---|
| | | |
|---|
| | | /** 要素名称 name **/ |
|---|
| | | private String name; |
|---|
| | | |
|---|
| | | /** 要素级别 type 0:A级要素 1:B级要素**/ |
|---|
| | | private Integer type; |
|---|
| | | |
|---|
| | | /** 父要素id parent_id **/ |
|---|
| | | private Long parentId; |
|---|
| | | |
|---|
| | | /** 要素备注 remark **/ |
|---|
| | | private String remark; |
|---|
| | | |
|---|
| | | /** B级要素得分 point **/ |
|---|
| | | private Integer point; |
|---|
| | | |
|---|
| | | /** A级要素权重 weight **/ |
|---|
| | | private Float weight; |
|---|
| | | |
|---|
| | | @TableField(exist = false) |
|---|
| | | /** 父级要素名称 parentName **/ |
|---|
| | | private String parentName; |
|---|
| | | |
|---|
| | | /** 主键id id **/ |
|---|
| | | @TableId(type = IdType.AUTO) |
|---|
| | | private Long id; |
|---|
| | | |
|---|
| | | /** 有效标识 valid_flag **/ |
|---|
| | | private Boolean validFlag; |
|---|
| | | |
|---|
| | | /** 创建时间 create_time **/ |
|---|
| | | private Date createTime; |
|---|
| | | |
|---|
| | | /** 创建人 create_by **/ |
|---|
| | | private String createBy; |
|---|
| | | |
|---|
| | | /** 最新更新时间 update_time **/ |
|---|
| | | private Date updateTime; |
|---|
| | | |
|---|
| | | /** 最后更新人 update_by **/ |
|---|
| | | private String updateBy; |
|---|
| | | |
|---|
| | | |
|---|
| | | /** 主键id id **/ |
|---|
| | | public Long getId() { |
|---|
| | | return id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 主键id id **/ |
|---|
| | | public void setId(Long id) { |
|---|
| | | this.id = id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 有效标识 valid_flag **/ |
|---|
| | | public Boolean getValidFlag() { |
|---|
| | | return validFlag; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 有效标识 valid_flag **/ |
|---|
| | | public void setValidFlag(Boolean validFlag) { |
|---|
| | | this.validFlag = validFlag; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建时间 create_time **/ |
|---|
| | | public Date getCreateTime() { |
|---|
| | | return createTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建时间 create_time **/ |
|---|
| | | public void setCreateTime(Date createTime) { |
|---|
| | | this.createTime = createTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建人 create_by **/ |
|---|
| | | public String getCreateBy() { |
|---|
| | | return createBy; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建人 create_by **/ |
|---|
| | | public void setCreateBy(String createBy) { |
|---|
| | | this.createBy = createBy == null ? null : createBy.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最新更新时间 update_time **/ |
|---|
| | | public Date getUpdateTime() { |
|---|
| | | return updateTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最新更新时间 update_time **/ |
|---|
| | | public void setUpdateTime(Date updateTime) { |
|---|
| | | this.updateTime = updateTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最后更新人 update_by **/ |
|---|
| | | public String getUpdateBy() { |
|---|
| | | return updateBy; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最后更新人 update_by **/ |
|---|
| | | public void setUpdateBy(String updateBy) { |
|---|
| | | this.updateBy = updateBy == null ? null : updateBy.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | public String getName() { |
|---|
| | | return name; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setName(String name) { |
|---|
| | | this.name = name; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Integer getType() { |
|---|
| | | return type; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setType(Integer type) { |
|---|
| | | this.type = type; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Long getParentId() { |
|---|
| | | return parentId; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setParentId(Long parentId) { |
|---|
| | | this.parentId = parentId; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getRemark() { |
|---|
| | | return remark; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setRemark(String remark) { |
|---|
| | | this.remark = remark; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getParentName() { |
|---|
| | | return parentName; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setParentName(String parentName) { |
|---|
| | | this.parentName = parentName; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Integer getPoint() { |
|---|
| | | return point; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setPoint(Integer point) { |
|---|
| | | this.point = point; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Float getWeight() { |
|---|
| | | return weight; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setWeight(Float weight) { |
|---|
| | | this.weight = weight; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.annotation.IdType; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableField; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableId; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableName; |
|---|
| | | |
|---|
| | | import java.io.Serializable; |
|---|
| | | import java.util.Date; |
|---|
| | | import java.util.List; |
|---|
| | | |
|---|
| | | public class ElementTree implements Serializable { |
|---|
| | | |
|---|
| | | private final static long serialVersionUID = 1L; |
|---|
| | | |
|---|
| | | /** 类型 type **/ |
|---|
| | | private Integer type; |
|---|
| | | |
|---|
| | | /** 标签 label **/ |
|---|
| | | private String label; |
|---|
| | | |
|---|
| | | /** 值 value **/ |
|---|
| | | private Long value; |
|---|
| | | |
|---|
| | | /** 子节点 **/ |
|---|
| | | private List<ElementTree> children; |
|---|
| | | |
|---|
| | | |
|---|
| | | public String getLabel() { |
|---|
| | | return label; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setLabel(String label) { |
|---|
| | | this.label = label; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Long getValue() { |
|---|
| | | return value; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setValue(Long value) { |
|---|
| | | this.value = value; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public List<ElementTree> getChildren() { |
|---|
| | | return children; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setChildren(List<ElementTree> children) { |
|---|
| | | this.children = children; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Integer getType() { |
|---|
| | | return type; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setType(Integer type) { |
|---|
| | | this.type = type; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.annotation.IdType; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableField; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableId; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableName; |
|---|
| | | |
|---|
| | | import java.io.Serializable; |
|---|
| | | import java.util.Date; |
|---|
| | | import java.util.List; |
|---|
| | | |
|---|
| | | @TableName("emergency_plan") |
|---|
| | | public class EmergencyPlan implements Serializable { |
|---|
| | | |
|---|
| | | private final static long serialVersionUID = 1L; |
|---|
| | | |
|---|
| | | /** 应急预案名称 name **/ |
|---|
| | | private String name; |
|---|
| | | |
|---|
| | | /** 应急预案文件类型 file_type 0:图片 1：文件**/ |
|---|
| | | private Integer fileType; |
|---|
| | | |
|---|
| | | /** 应急预案文件 **/ |
|---|
| | | @TableField(exist = false) |
|---|
| | | private List<EmergencyPlanFile> fileList; |
|---|
| | | |
|---|
| | | /** 应急预案文件 **/ |
|---|
| | | @TableField(exist = false) |
|---|
| | | private List<String> viewerList; |
|---|
| | | |
|---|
| | | /** 应急预案备注 remark **/ |
|---|
| | | private String remark; |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | /** 主键id id **/ |
|---|
| | | @TableId(type = IdType.AUTO) |
|---|
| | | private Long id; |
|---|
| | | |
|---|
| | | /** 有效标识 valid_flag **/ |
|---|
| | | private Boolean validFlag; |
|---|
| | | |
|---|
| | | /** 创建时间 create_time **/ |
|---|
| | | private Date createTime; |
|---|
| | | |
|---|
| | | /** 创建人 create_by **/ |
|---|
| | | private String createBy; |
|---|
| | | |
|---|
| | | /** 最新更新时间 update_time **/ |
|---|
| | | private Date updateTime; |
|---|
| | | |
|---|
| | | /** 最后更新人 update_by **/ |
|---|
| | | private String updateBy; |
|---|
| | | |
|---|
| | | |
|---|
| | | /** 主键id id **/ |
|---|
| | | public Long getId() { |
|---|
| | | return id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 主键id id **/ |
|---|
| | | public void setId(Long id) { |
|---|
| | | this.id = id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 有效标识 valid_flag **/ |
|---|
| | | public Boolean getValidFlag() { |
|---|
| | | return validFlag; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 有效标识 valid_flag **/ |
|---|
| | | public void setValidFlag(Boolean validFlag) { |
|---|
| | | this.validFlag = validFlag; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建时间 create_time **/ |
|---|
| | | public Date getCreateTime() { |
|---|
| | | return createTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建时间 create_time **/ |
|---|
| | | public void setCreateTime(Date createTime) { |
|---|
| | | this.createTime = createTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建人 create_by **/ |
|---|
| | | public String getCreateBy() { |
|---|
| | | return createBy; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建人 create_by **/ |
|---|
| | | public void setCreateBy(String createBy) { |
|---|
| | | this.createBy = createBy == null ? null : createBy.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最新更新时间 update_time **/ |
|---|
| | | public Date getUpdateTime() { |
|---|
| | | return updateTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最新更新时间 update_time **/ |
|---|
| | | public void setUpdateTime(Date updateTime) { |
|---|
| | | this.updateTime = updateTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最后更新人 update_by **/ |
|---|
| | | public String getUpdateBy() { |
|---|
| | | return updateBy; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最后更新人 update_by **/ |
|---|
| | | public void setUpdateBy(String updateBy) { |
|---|
| | | this.updateBy = updateBy == null ? null : updateBy.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | public String getName() { |
|---|
| | | return name; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setName(String name) { |
|---|
| | | this.name = name; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Integer getFileType() { |
|---|
| | | return fileType; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setFileType(Integer fileType) { |
|---|
| | | this.fileType = fileType; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getRemark() { |
|---|
| | | return remark; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setRemark(String remark) { |
|---|
| | | this.remark = remark; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public List<EmergencyPlanFile> getFileList() { |
|---|
| | | return fileList; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setFileList(List<EmergencyPlanFile> fileList) { |
|---|
| | | this.fileList = fileList; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public List<String> getViewerList() { |
|---|
| | | return viewerList; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setViewerList(List<String> viewerList) { |
|---|
| | | this.viewerList = viewerList; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.annotation.IdType; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableField; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableId; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableName; |
|---|
| | | |
|---|
| | | import java.io.Serializable; |
|---|
| | | import java.util.Date; |
|---|
| | | |
|---|
| | | @TableName("emergency_plan_file") |
|---|
| | | public class EmergencyPlanFile implements Serializable { |
|---|
| | | |
|---|
| | | private final static long serialVersionUID = 1L; |
|---|
| | | |
|---|
| | | |
|---|
| | | /** 文件名称 file_name **/ |
|---|
| | | private String fileName; |
|---|
| | | |
|---|
| | | /** 文件路径 file_url **/ |
|---|
| | | private String fileUrl; |
|---|
| | | |
|---|
| | | /** 应急预案id emergency_plan_id **/ |
|---|
| | | private Long emergencyPlanId; |
|---|
| | | |
|---|
| | | @TableField(exist = false) |
|---|
| | | private String url; |
|---|
| | | @TableField(exist = false) |
|---|
| | | private String uid; |
|---|
| | | @TableField(exist = false) |
|---|
| | | private String status; |
|---|
| | | |
|---|
| | | |
|---|
| | | /** 主键id id **/ |
|---|
| | | @TableId(type = IdType.AUTO) |
|---|
| | | private Long id; |
|---|
| | | |
|---|
| | | /** 有效标识 valid_flag **/ |
|---|
| | | private Boolean validFlag; |
|---|
| | | |
|---|
| | | /** 创建时间 create_time **/ |
|---|
| | | private Date createTime; |
|---|
| | | |
|---|
| | | /** 创建人 create_by **/ |
|---|
| | | private String createBy; |
|---|
| | | |
|---|
| | | /** 最新更新时间 update_time **/ |
|---|
| | | private Date updateTime; |
|---|
| | | |
|---|
| | | /** 最后更新人 update_by **/ |
|---|
| | | private String updateBy; |
|---|
| | | |
|---|
| | | /** 主键id id **/ |
|---|
| | | public Long getId() { |
|---|
| | | return id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 主键id id **/ |
|---|
| | | public void setId(Long id) { |
|---|
| | | this.id = id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 有效标识 valid_flag **/ |
|---|
| | | public Boolean getValidFlag() { |
|---|
| | | return validFlag; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 有效标识 valid_flag **/ |
|---|
| | | public void setValidFlag(Boolean validFlag) { |
|---|
| | | this.validFlag = validFlag; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建时间 create_time **/ |
|---|
| | | public Date getCreateTime() { |
|---|
| | | return createTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建时间 create_time **/ |
|---|
| | | public void setCreateTime(Date createTime) { |
|---|
| | | this.createTime = createTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建人 create_by **/ |
|---|
| | | public String getCreateBy() { |
|---|
| | | return createBy; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建人 create_by **/ |
|---|
| | | public void setCreateBy(String createBy) { |
|---|
| | | this.createBy = createBy == null ? null : createBy.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最新更新时间 update_time **/ |
|---|
| | | public Date getUpdateTime() { |
|---|
| | | return updateTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最新更新时间 update_time **/ |
|---|
| | | public void setUpdateTime(Date updateTime) { |
|---|
| | | this.updateTime = updateTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最后更新人 update_by **/ |
|---|
| | | public String getUpdateBy() { |
|---|
| | | return updateBy; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最后更新人 update_by **/ |
|---|
| | | public void setUpdateBy(String updateBy) { |
|---|
| | | this.updateBy = updateBy == null ? null : updateBy.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getFileName() { |
|---|
| | | return fileName; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setFileName(String fileName) { |
|---|
| | | this.fileName = fileName; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getFileUrl() { |
|---|
| | | return fileUrl; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setFileUrl(String fileUrl) { |
|---|
| | | this.fileUrl = fileUrl; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Long getEmergencyPlanId() { |
|---|
| | | return emergencyPlanId; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setEmergencyPlanId(Long emergencyPlanId) { |
|---|
| | | this.emergencyPlanId = emergencyPlanId; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getUrl() { |
|---|
| | | return url; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setUrl(String url) { |
|---|
| | | this.url = url; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getUid() { |
|---|
| | | return uid; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setUid(String uid) { |
|---|
| | | this.uid = uid; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getStatus() { |
|---|
| | | return status; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setStatus(String status) { |
|---|
| | | this.status = status; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain.Enum; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.core.enums.IEnum; |
|---|
| | | import com.fasterxml.jackson.annotation.JsonValue; |
|---|
| | | |
|---|
| | | import java.io.Serializable; |
|---|
| | | |
|---|
| | | |
|---|
| | | public enum ApplyStatus implements IEnum { |
|---|
| | | APPROVING("APPROVING", "待审批"), |
|---|
| | | PASS("PASS", "通过"), |
|---|
| | | REFUSE("REFUSE","拒绝"); |
|---|
| | | |
|---|
| | | private String code; |
|---|
| | | |
|---|
| | | private String msg; |
|---|
| | | |
|---|
| | | ApplyStatus(String code, String msg) { |
|---|
| | | this.code = code; |
|---|
| | | this.msg = msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getCode() { |
|---|
| | | return code; |
|---|
| | | } |
|---|
| | | @JsonValue |
|---|
| | | public String getMsg() { |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | public static ApplyStatus parse(String code){ |
|---|
| | | for(ApplyStatus as:ApplyStatus.values()){ |
|---|
| | | if(as.getCode().equals(code)){ |
|---|
| | | return as; |
|---|
| | | } |
|---|
| | | } |
|---|
| | | return null; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public Serializable getValue() { |
|---|
| | | return this.code; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain.Enum; |
|---|
| | | |
|---|
| | | import com.fasterxml.jackson.annotation.JsonValue; |
|---|
| | | |
|---|
| | | public enum AssessAppealStatus { |
|---|
| | | UNAPPEALED("UNAPPEALED","未申诉"), |
|---|
| | | APPEALING("APPEALING","申诉中"), |
|---|
| | | PASSED("PASSED","申诉通过"), |
|---|
| | | UNPASSED("UNPASSED","申诉未通过") |
|---|
| | | ; |
|---|
| | | |
|---|
| | | |
|---|
| | | private String code; |
|---|
| | | |
|---|
| | | @JsonValue |
|---|
| | | private String msg; |
|---|
| | | |
|---|
| | | |
|---|
| | | AssessAppealStatus(String code, String msg) { |
|---|
| | | this.code = code; |
|---|
| | | this.msg = msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | public String getCode() { |
|---|
| | | return code; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setCode(String code) { |
|---|
| | | this.code = code; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getMsg() { |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setMsg(String msg) { |
|---|
| | | this.msg = msg; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain.Enum; |
|---|
| | | |
|---|
| | | import com.fasterxml.jackson.annotation.JsonValue; |
|---|
| | | |
|---|
| | | public enum AssessApplyStatus { |
|---|
| | | |
|---|
| | | TOSUBMIT("TOSUBMIT","待提交") , |
|---|
| | | |
|---|
| | | PENDING("PENDING","待审批") , |
|---|
| | | |
|---|
| | | APPROVED("APPROVED","审批通过"), |
|---|
| | | |
|---|
| | | REJECT("REJECT","驳回"),; |
|---|
| | | |
|---|
| | | |
|---|
| | | private String code; |
|---|
| | | |
|---|
| | | @JsonValue |
|---|
| | | private String msg; |
|---|
| | | |
|---|
| | | AssessApplyStatus(String code, String msg) { |
|---|
| | | this.code = code; |
|---|
| | | this.msg = msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain.Enum; |
|---|
| | | |
|---|
| | | public enum AssessPunishment { |
|---|
| | | M0("M0","吊销企业许可证"), |
|---|
| | | M1("M1","暂停使用1个月"), |
|---|
| | | M2("M2","暂停使用3个月"), |
|---|
| | | M3("M3","暂停使用6个月"); |
|---|
| | | |
|---|
| | | |
|---|
| | | private String code; |
|---|
| | | |
|---|
| | | private String msg; |
|---|
| | | |
|---|
| | | AssessPunishment(String code, String msg) { |
|---|
| | | this.code = code; |
|---|
| | | this.msg = msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain.Enum; |
|---|
| | | |
|---|
| | | import com.fasterxml.jackson.annotation.JsonValue; |
|---|
| | | |
|---|
| | | public enum AssessType { |
|---|
| | | |
|---|
| | | SALE("SALE","销售评定"), |
|---|
| | | ACCESS("ACCESS","准入评定"),; |
|---|
| | | |
|---|
| | | |
|---|
| | | private String code; |
|---|
| | | |
|---|
| | | @JsonValue |
|---|
| | | private String msg; |
|---|
| | | |
|---|
| | | |
|---|
| | | AssessType(String code, String msg) { |
|---|
| | | this.code = code; |
|---|
| | | this.msg = msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain.Enum; |
|---|
| | | |
|---|
| | | import com.fasterxml.jackson.annotation.JsonValue; |
|---|
| | | |
|---|
| | | public enum CertificatePersonType { |
|---|
| | | |
|---|
| | | DRIVER("DRIVER", "驾驶员"), |
|---|
| | | ESCORT("ESCORT", "押运员"),; |
|---|
| | | |
|---|
| | | private String code; |
|---|
| | | |
|---|
| | | private String msg; |
|---|
| | | |
|---|
| | | CertificatePersonType(String code, String msg) { |
|---|
| | | this.code = code; |
|---|
| | | this.msg = msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getCode() { |
|---|
| | | return code; |
|---|
| | | } |
|---|
| | | @JsonValue |
|---|
| | | public String getMsg() { |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | public static CertificatePersonType parse(String code){ |
|---|
| | | for(CertificatePersonType cs:CertificatePersonType.values()){ |
|---|
| | | if(cs.getCode().equals(code)){ |
|---|
| | | return cs; |
|---|
| | | } |
|---|
| | | } |
|---|
| | | return null; |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain.Enum; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.core.enums.IEnum; |
|---|
| | | import com.fasterxml.jackson.annotation.JsonValue; |
|---|
| | | |
|---|
| | | import java.io.Serializable; |
|---|
| | | |
|---|
| | | public enum CertificateStatus implements IEnum { |
|---|
| | | TOSUBMIT("TOSUBMIT", "待提交"), |
|---|
| | | PENDING("PENDING", "待审批"), |
|---|
| | | APPROVED("APPROVED","已审批"); |
|---|
| | | |
|---|
| | | private String code; |
|---|
| | | |
|---|
| | | private String msg; |
|---|
| | | |
|---|
| | | CertificateStatus(String code, String msg) { |
|---|
| | | this.code = code; |
|---|
| | | this.msg = msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getCode() { |
|---|
| | | return code; |
|---|
| | | } |
|---|
| | | @JsonValue |
|---|
| | | public String getMsg() { |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | public static CertificateStatus parse(String code){ |
|---|
| | | for(CertificateStatus cs:CertificateStatus.values()){ |
|---|
| | | if(cs.getCode().equals(code)){ |
|---|
| | | return cs; |
|---|
| | | } |
|---|
| | | } |
|---|
| | | return null; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public Serializable getValue() { |
|---|
| | | return this.code; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain.Enum; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.core.enums.IEnum; |
|---|
| | | import com.fasterxml.jackson.annotation.JsonValue; |
|---|
| | | |
|---|
| | | import java.io.Serializable; |
|---|
| | | |
|---|
| | | public enum CommitStatus implements IEnum { |
|---|
| | | DEL("DEL", "删除"), |
|---|
| | | MOD("MOD", "修改"),; |
|---|
| | | |
|---|
| | | private String code; |
|---|
| | | |
|---|
| | | private String msg; |
|---|
| | | |
|---|
| | | CommitStatus(String code, String msg) { |
|---|
| | | this.code = code; |
|---|
| | | this.msg = msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getCode() { |
|---|
| | | return code; |
|---|
| | | } |
|---|
| | | @JsonValue |
|---|
| | | public String getMsg() { |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | public static CommitStatus parse(String code){ |
|---|
| | | for(CommitStatus cs:CommitStatus.values()){ |
|---|
| | | if(cs.getCode().equals(code)){ |
|---|
| | | return cs; |
|---|
| | | } |
|---|
| | | } |
|---|
| | | return null; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public Serializable getValue() { |
|---|
| | | return this.code; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain.Enum; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.core.enums.IEnum; |
|---|
| | | import com.fasterxml.jackson.annotation.JsonValue; |
|---|
| | | |
|---|
| | | import java.io.Serializable; |
|---|
| | | |
|---|
| | | public enum DocumentType implements IEnum { |
|---|
| | | |
|---|
| | | |
|---|
| | | RESCUE("RESCUE", "应急救援预案"), |
|---|
| | | FLOW("FLOW", "流向信息管理承诺书"), |
|---|
| | | ; |
|---|
| | | |
|---|
| | | private String code; |
|---|
| | | private String msg; |
|---|
| | | |
|---|
| | | DocumentType(String code, String msg) { |
|---|
| | | this.code = code; |
|---|
| | | this.msg = msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getCode() { |
|---|
| | | return code; |
|---|
| | | } |
|---|
| | | @JsonValue |
|---|
| | | public String getMsg() { |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | public static DocumentType parse(String code){ |
|---|
| | | for(DocumentType dt:DocumentType.values()){ |
|---|
| | | if(dt.getCode().equals(code)){ |
|---|
| | | return dt; |
|---|
| | | } |
|---|
| | | } |
|---|
| | | return null; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public Serializable getValue() { |
|---|
| | | return this.code; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain.Enum; |
|---|
| | | |
|---|
| | | import java.util.Random; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * @author : jingjy |
|---|
| | | * @date : 2021/5/24 10:13 |
|---|
| | | * @Description: 生成流向码的基本元素 |
|---|
| | | */ |
|---|
| | | public enum Element { |
|---|
| | | /** |
|---|
| | | * 基本元素为数字0-9及大写字母A-Z（不含I、O）共34种数字或字母 |
|---|
| | | **/ |
|---|
| | | A("A"), |
|---|
| | | B("B"), |
|---|
| | | C("C"), |
|---|
| | | D("D"), |
|---|
| | | E("E"), |
|---|
| | | F("F"), |
|---|
| | | G("G"), |
|---|
| | | H("H"), |
|---|
| | | J("J"), |
|---|
| | | K("K"), |
|---|
| | | L("L"), |
|---|
| | | M("M"), |
|---|
| | | N("N"), |
|---|
| | | P("P"), |
|---|
| | | Q("Q"), |
|---|
| | | R("R"), |
|---|
| | | S("S"), |
|---|
| | | T("T"), |
|---|
| | | U("U"), |
|---|
| | | V("V"), |
|---|
| | | W("W"), |
|---|
| | | X("X"), |
|---|
| | | Y("Y"), |
|---|
| | | Z("Z"), |
|---|
| | | ZERO(0), |
|---|
| | | ONE(1), |
|---|
| | | TWO(2), |
|---|
| | | THREE(3), |
|---|
| | | FOUR(4), |
|---|
| | | FIVE(5), |
|---|
| | | SIX(6), |
|---|
| | | SEVEN(7), |
|---|
| | | EIGHT(8), |
|---|
| | | NINE(9), |
|---|
| | | ; |
|---|
| | | |
|---|
| | | Element(Object i) { |
|---|
| | | this.i = i; |
|---|
| | | } |
|---|
| | | |
|---|
| | | private final Object i; |
|---|
| | | private static int random = (int) (Math.random() * 10); |
|---|
| | | private static Random rand = new Random(random); |
|---|
| | | |
|---|
| | | public static <T extends Enum<T>> T random(Class<T> ec) { |
|---|
| | | return random(ec.getEnumConstants()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | public static <T> T random(T[] values) { |
|---|
| | | return values[rand.nextInt(values.length)]; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Object getValue() { |
|---|
| | | return i; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain.Enum; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * @author : jingjy |
|---|
| | | * @date : 2021/4/13 10:16 |
|---|
| | | */ |
|---|
| | | public enum EnterpriseSafetySupervision { |
|---|
| | | /** |
|---|
| | | * PRODUCE:烟花爆竹生产 |
|---|
| | | * WHOLESALER:烟花爆竹批发经营 |
|---|
| | | * RETAILER：烟花爆竹零售经营（长期） |
|---|
| | | * TEMP_RETAILER：烟花爆竹零售经营（短期） |
|---|
| | | */ |
|---|
| | | PRODUCE("PRODUCE","烟花爆竹生产"), |
|---|
| | | WHOLESALER("WHOLESALER","烟花爆竹批发经营"), |
|---|
| | | RETAILER("RETAILER","烟花爆竹零售经营（长期）"), |
|---|
| | | TEMP_RETAILER("TEMP_RETAILER","烟花爆竹零售经营（短期）"); |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | EnterpriseSafetySupervision(String code, String msg) { |
|---|
| | | this.code = code; |
|---|
| | | this.msg = msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | private String code; |
|---|
| | | private String msg; |
|---|
| | | |
|---|
| | | public String getCode() { |
|---|
| | | return code; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getMsg() { |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | public static boolean isInclude(String msg){ |
|---|
| | | boolean include = false; |
|---|
| | | for (EnterpriseSafetySupervision e: EnterpriseSafetySupervision.values()){ |
|---|
| | | if(msg.equals(e.getMsg())){ |
|---|
| | | include = true; |
|---|
| | | break; |
|---|
| | | } |
|---|
| | | } |
|---|
| | | return include; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain.Enum; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.core.enums.IEnum; |
|---|
| | | import com.fasterxml.jackson.annotation.JsonValue; |
|---|
| | | |
|---|
| | | import java.io.Serializable; |
|---|
| | | |
|---|
| | | public enum EnterpriseSize implements IEnum { |
|---|
| | | MICRO("MICRO","微型"), |
|---|
| | | SMALL("SMALL","小型"), |
|---|
| | | MEDIUM("MEDIUM","中型"), |
|---|
| | | LARGE("LARGE","大型"); |
|---|
| | | |
|---|
| | | |
|---|
| | | EnterpriseSize(String code, String msg) { |
|---|
| | | this.code = code; |
|---|
| | | this.msg = msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | private String code; |
|---|
| | | @JsonValue |
|---|
| | | private String msg; |
|---|
| | | |
|---|
| | | public String getCode() { |
|---|
| | | return code; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getMsg() { |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public static EnterpriseSize parse(String code){ |
|---|
| | | for(EnterpriseSize es:EnterpriseSize.values()){ |
|---|
| | | if(es.getCode().equals(code)){ |
|---|
| | | return es; |
|---|
| | | } |
|---|
| | | } |
|---|
| | | return null; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public Serializable getValue() { |
|---|
| | | return this.code; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain.Enum; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.core.enums.IEnum; |
|---|
| | | import com.fasterxml.jackson.annotation.JsonValue; |
|---|
| | | |
|---|
| | | import java.io.Serializable; |
|---|
| | | |
|---|
| | | public enum EnterpriseStatus implements IEnum { |
|---|
| | | |
|---|
| | | OFF("OFF","停止"), |
|---|
| | | ON("ON","正常"); |
|---|
| | | EnterpriseStatus(String code, String msg) { |
|---|
| | | this.code = code; |
|---|
| | | this.msg = msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | private String code; |
|---|
| | | @JsonValue |
|---|
| | | private String msg; |
|---|
| | | |
|---|
| | | public String getCode() { |
|---|
| | | return code; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getMsg() { |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public static EnterpriseStatus parse(String code){ |
|---|
| | | for(EnterpriseStatus es:EnterpriseStatus.values()){ |
|---|
| | | if(es.getCode().equals(code)){ |
|---|
| | | return es; |
|---|
| | | } |
|---|
| | | } |
|---|
| | | return null; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public Serializable getValue() { |
|---|
| | | return this.code; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain.Enum; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * @author : jingjy |
|---|
| | | * @date : 2021/4/14 10:57 |
|---|
| | | */ |
|---|
| | | public enum ErrorCode { |
|---|
| | | /** |
|---|
| | | * 错误码 |
|---|
| | | * SUCCESS ： 200；成功 |
|---|
| | | * ERROR_999 : 999；自定义错误 |
|---|
| | | */ |
|---|
| | | SUCCESS("200","success"), |
|---|
| | | ERROR_PARAMS_ERROR("400","参数错误"), |
|---|
| | | ERROR_NOT_FOUND_DATA("300","数据未找到"), |
|---|
| | | ERROR_DATABASE_ERROR("301","数据库错误"), |
|---|
| | | ERROR_PAGE_SIZE_TOOMANY("305","分页条目数超过最大值"), |
|---|
| | | ERROR_SERVER_ERROR("500","服务端错误"), |
|---|
| | | ERROR_API_ERROR("501","API调用错误"), |
|---|
| | | // 参数错误 |
|---|
| | | ERROR_10001("10001","参数为空"), |
|---|
| | | ERROR_10002("10002","参数不全"), |
|---|
| | | ERROR_10003("10003","参数类型错误"), |
|---|
| | | ERROR_10004("10004","参数无效"), |
|---|
| | | // 用户错误 |
|---|
| | | ERROR_20001("20001","用户不存在"), |
|---|
| | | ERROR_20002("20002","用户未登陆"), |
|---|
| | | ERROR_20003("20003","用户名或密码错误"), |
|---|
| | | ERROR_20004("20004","用户账户已被禁用"), |
|---|
| | | ERROR_20005("20005","用户已存在"), |
|---|
| | | // 业务错误 |
|---|
| | | ERROR_30001("30001","系统业务出现问题"), |
|---|
| | | // 系统错误 |
|---|
| | | ERROR_40001("40001","系统内部错误"), |
|---|
| | | // 数据错误 |
|---|
| | | ERROR_50001("50001","数据未找到"), |
|---|
| | | ERROR_50002("50002","数据有误"), |
|---|
| | | ERROR_50003("50003","数据已存在"), |
|---|
| | | ERROR_50004("50004","数据不允许修改"), |
|---|
| | | ERROR_50005("50004","数据不允许删除"), |
|---|
| | | // 接口错误 |
|---|
| | | ERROR_60001("60001","系统内部接口调用异常"), |
|---|
| | | ERROR_60002("60002","系统外部接口调用异常"), |
|---|
| | | ERROR_60003("60003","接口禁止访问"), |
|---|
| | | ERROR_60004("60004","接口地址无效"), |
|---|
| | | ERROR_60005("60005","接口请求超时"), |
|---|
| | | ERROR_60006("60006","接口负载过高"), |
|---|
| | | // 权限错误 |
|---|
| | | ERROR_70001("70001","没有访问权限"), |
|---|
| | | |
|---|
| | | ERROR_999("999","自定义错误") |
|---|
| | | ; |
|---|
| | | |
|---|
| | | ErrorCode(String code, String msg) { |
|---|
| | | this.code = code; |
|---|
| | | this.msg = msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | private final String code; |
|---|
| | | private final String msg; |
|---|
| | | |
|---|
| | | public String getCode() { |
|---|
| | | return code; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getMsg() { |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain.Enum; |
|---|
| | | |
|---|
| | | import com.gk.hotwork.Domain.Exception.BusinessException; |
|---|
| | | |
|---|
| | | public enum Etype { |
|---|
| | | |
|---|
| | | E_60(1, "60吨位"), |
|---|
| | | E_130(2, "130吨位"), |
|---|
| | | |
|---|
| | | ; |
|---|
| | | |
|---|
| | | |
|---|
| | | int code; |
|---|
| | | String msg; |
|---|
| | | |
|---|
| | | Etype(int code, String msg) { |
|---|
| | | this.code = code; |
|---|
| | | this.msg = msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public static Etype parse(Integer code) { |
|---|
| | | if (code == null) throw new BusinessException("参数为空"); |
|---|
| | | for (Etype etype : Etype.values()) { |
|---|
| | | if (etype.code == code) { |
|---|
| | | return etype; |
|---|
| | | } |
|---|
| | | } |
|---|
| | | throw new BusinessException("找不到对应类型"); |
|---|
| | | } |
|---|
| | | |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain.Enum; |
|---|
| | | |
|---|
| | | import com.fasterxml.jackson.annotation.JsonValue; |
|---|
| | | |
|---|
| | | public enum HiddenDangerApplyOperation { |
|---|
| | | |
|---|
| | | REPORT("REPORT","上报"), |
|---|
| | | RECTIFICATION("RECTIFICATION","整改"); |
|---|
| | | |
|---|
| | | HiddenDangerApplyOperation(String code, String msg) { |
|---|
| | | this.code = code; |
|---|
| | | this.msg = msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | String code; |
|---|
| | | @JsonValue |
|---|
| | | String msg; |
|---|
| | | |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain.Enum; |
|---|
| | | |
|---|
| | | import com.fasterxml.jackson.annotation.JsonValue; |
|---|
| | | |
|---|
| | | public enum HiddenDangerApplyStatus { |
|---|
| | | |
|---|
| | | TORECTIFY("UNCONFIRMED","待整改"), |
|---|
| | | TOACCEPT("TOACCEPT","整改待验收"), |
|---|
| | | REJECTED("REJECTED","驳回待整改"), |
|---|
| | | COMPLETED("COMPLETED","已完成"), |
|---|
| | | ; |
|---|
| | | |
|---|
| | | |
|---|
| | | HiddenDangerApplyStatus(String code, String msg) { |
|---|
| | | this.code = code; |
|---|
| | | this.msg = msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | String code; |
|---|
| | | @JsonValue |
|---|
| | | String msg; |
|---|
| | | |
|---|
| | | |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain.Enum; |
|---|
| | | |
|---|
| | | import com.fasterxml.jackson.annotation.JsonValue; |
|---|
| | | |
|---|
| | | public enum HiddenDangerLevel { |
|---|
| | | |
|---|
| | | URGENT("URGENT","重大隐患"), |
|---|
| | | COMMON("COMMON","一般隐患"); |
|---|
| | | |
|---|
| | | HiddenDangerLevel(String code, String msg) { |
|---|
| | | this.code = code; |
|---|
| | | this.msg = msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | String code; |
|---|
| | | @JsonValue |
|---|
| | | String msg; |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain.Enum; |
|---|
| | | |
|---|
| | | public enum HiddenDangerReportSource { |
|---|
| | | NORMAL(1, "隐患上报"), |
|---|
| | | SAFE_CHECK(2,"巡检上报"), |
|---|
| | | ; |
|---|
| | | |
|---|
| | | int code; |
|---|
| | | String msg; |
|---|
| | | |
|---|
| | | |
|---|
| | | HiddenDangerReportSource(int code, String msg) { |
|---|
| | | this.code = code; |
|---|
| | | this.msg = msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public int getCode() { |
|---|
| | | return code; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getMsg() { |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain.Enum; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.annotation.IEnum; |
|---|
| | | import com.fasterxml.jackson.annotation.JsonValue; |
|---|
| | | |
|---|
| | | import java.io.Serializable; |
|---|
| | | |
|---|
| | | public enum HiddenDangerReportStatus implements IEnum { |
|---|
| | | |
|---|
| | | PENDING("PENDING", "待提交"), |
|---|
| | | COMMITTED("COMMITTED", "已提交"),; |
|---|
| | | |
|---|
| | | private String code; |
|---|
| | | |
|---|
| | | private String msg; |
|---|
| | | |
|---|
| | | HiddenDangerReportStatus(String code, String msg) { |
|---|
| | | this.code = code; |
|---|
| | | this.msg = msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getCode() { |
|---|
| | | return code; |
|---|
| | | } |
|---|
| | | @JsonValue |
|---|
| | | public String getMsg() { |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | public static HiddenDangerReportStatus parse(String code){ |
|---|
| | | for(HiddenDangerReportStatus cs:HiddenDangerReportStatus.values()){ |
|---|
| | | if(cs.getCode().equals(code)){ |
|---|
| | | return cs; |
|---|
| | | } |
|---|
| | | } |
|---|
| | | return null; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public Serializable getValue() { |
|---|
| | | return this.code; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain.Enum; |
|---|
| | | |
|---|
| | | public enum MsgType{ |
|---|
| | | NOTIFICATION("notify","通知"), |
|---|
| | | ALERT("alert","消息提示"), |
|---|
| | | MESSAGE("message","通知"); |
|---|
| | | |
|---|
| | | |
|---|
| | | MsgType(String code, String type) { |
|---|
| | | this.code = code; |
|---|
| | | this.type = type; |
|---|
| | | } |
|---|
| | | |
|---|
| | | private String code; |
|---|
| | | private String type; |
|---|
| | | |
|---|
| | | public String getCode() { |
|---|
| | | return code; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setCode(String code) { |
|---|
| | | this.code = code; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getType() { |
|---|
| | | return type; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setType(String type) { |
|---|
| | | this.type = type; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain.Enum; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.core.enums.IEnum; |
|---|
| | | import com.fasterxml.jackson.annotation.JsonValue; |
|---|
| | | |
|---|
| | | import java.io.Serializable; |
|---|
| | | |
|---|
| | | public enum PersonnelCategory implements IEnum { |
|---|
| | | |
|---|
| | | |
|---|
| | | SECURITY("SECURITY", "安全人员"), |
|---|
| | | SPECIAL("SPECIAL", "特种人员"), |
|---|
| | | |
|---|
| | | ; |
|---|
| | | |
|---|
| | | private String code; |
|---|
| | | private String msg; |
|---|
| | | |
|---|
| | | PersonnelCategory(String code, String msg) { |
|---|
| | | this.code = code; |
|---|
| | | this.msg = msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getCode() { |
|---|
| | | return code; |
|---|
| | | } |
|---|
| | | @JsonValue |
|---|
| | | public String getMsg() { |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | public static PersonnelCategory parse(String code){ |
|---|
| | | for(PersonnelCategory pc:PersonnelCategory.values()){ |
|---|
| | | if(pc.getCode().equals(code)){ |
|---|
| | | return pc; |
|---|
| | | } |
|---|
| | | } |
|---|
| | | return null; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public Serializable getValue() { |
|---|
| | | return this.code; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain.Enum; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * @author : jingjy |
|---|
| | | * @date : 2021/5/12 16:13 |
|---|
| | | */ |
|---|
| | | public enum ProvinceCode { |
|---|
| | | /** |
|---|
| | | * 错误码 |
|---|
| | | * SUCCESS ： 200；成功 |
|---|
| | | * ERROR_999 : 999；自定义错误 |
|---|
| | | */ |
|---|
| | | BEIJING("北京市","京"), |
|---|
| | | TIANJIN("天津市","津"), |
|---|
| | | HEBEI("河北省","冀"), |
|---|
| | | SHANXI("山西省","晋"), |
|---|
| | | NEIMENG("内蒙古自治区","蒙"), |
|---|
| | | LIAONING("辽宁省" , "辽"), |
|---|
| | | JILIN("吉林省" ,"吉"), |
|---|
| | | HEILONGJIANG("黑龙江省" ,"黑"), |
|---|
| | | SHANGHAI("上海市","沪"), |
|---|
| | | JIANGSU("江苏省" , "苏"), |
|---|
| | | ZHEJIANG("浙江省","浙"), |
|---|
| | | ANHUI("安徽省","皖"), |
|---|
| | | FUJIAN("福建省" ,"闽"), |
|---|
| | | JIANGXI("江西省","赣"), |
|---|
| | | SHANDONG("山东省","鲁"), |
|---|
| | | HENAN("河南省","豫"), |
|---|
| | | HUBEI("湖北省","鄂"), |
|---|
| | | HUNAN("湖南省","湘"), |
|---|
| | | GUANGDONG("广东省","粤"), |
|---|
| | | GUANGXI("广西壮族自治区","桂"), |
|---|
| | | HAINAN("海南省","琼"), |
|---|
| | | SICHUAN("四川省","川"), |
|---|
| | | GUIZHOU("贵州省", "贵"), |
|---|
| | | YUNNAN("云南省","云"), |
|---|
| | | CHONGQING("重庆市","渝"), |
|---|
| | | XIZANG("西藏自治区" , "藏"), |
|---|
| | | ShAANXI("陕西省","陕"), |
|---|
| | | GANSU("甘肃省","甘"), |
|---|
| | | QINGHAI("青海省","青"), |
|---|
| | | NINGXIA("宁夏回族自治区","宁"), |
|---|
| | | XINJIANG("新疆维吾尔自治区","新"), |
|---|
| | | XIANGGANG("香港特别行政区","港"), |
|---|
| | | AOMENG("澳门特别行政区","澳"), |
|---|
| | | TAIWAN("台湾省","台"), |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | ; |
|---|
| | | |
|---|
| | | ProvinceCode(String name, String abbr) { |
|---|
| | | this.name = name; |
|---|
| | | this.abbr = abbr; |
|---|
| | | } |
|---|
| | | |
|---|
| | | private final String name; |
|---|
| | | private final String abbr; |
|---|
| | | |
|---|
| | | public String getName() { |
|---|
| | | return name; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getAbbr() { |
|---|
| | | return abbr; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain.Enum; |
|---|
| | | |
|---|
| | | import com.fasterxml.jackson.annotation.JsonValue; |
|---|
| | | |
|---|
| | | public enum PunishStatus { |
|---|
| | | |
|---|
| | | UNPUNISH("UNPUNISH", "未处罚"), |
|---|
| | | PUNISHING("PUNISHING","处罚中"), |
|---|
| | | END("END", "处罚结束"),; |
|---|
| | | |
|---|
| | | |
|---|
| | | String code; |
|---|
| | | @JsonValue |
|---|
| | | String msg; |
|---|
| | | |
|---|
| | | PunishStatus(String code, String msg) { |
|---|
| | | this.code = code; |
|---|
| | | this.msg = msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getCode() { |
|---|
| | | return code; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setCode(String code) { |
|---|
| | | this.code = code; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getMsg() { |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setMsg(String msg) { |
|---|
| | | this.msg = msg; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain.Enum; |
|---|
| | | |
|---|
| | | public enum RedisServiceEnum { |
|---|
| | | |
|---|
| | | |
|---|
| | | SMS_SERVICE("sms-service:","短信通知"); |
|---|
| | | |
|---|
| | | RedisServiceEnum(String service, String desc) { |
|---|
| | | this.service = service; |
|---|
| | | this.desc = desc; |
|---|
| | | } |
|---|
| | | |
|---|
| | | String service; |
|---|
| | | String desc; |
|---|
| | | |
|---|
| | | public String getService() { |
|---|
| | | return service; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getDesc() { |
|---|
| | | return desc; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain.Enum; |
|---|
| | | |
|---|
| | | public enum ResultCodes { |
|---|
| | | OK("200","一切 ok"), |
|---|
| | | CLIENT_ERROR("A0001","用户端错误"), |
|---|
| | | CLIENT_REGEISTER_ERROR_("A0100","用户注册错误"), |
|---|
| | | CLIENT_NOT_ALLOW_PRIVACY_AGREEMENT("A0101","用户未同意隐私协议"), |
|---|
| | | CLIENT_REGEISTER_AREA_NOT_SUPPORT("A0102","注册国家或地区受限"), |
|---|
| | | CLIENT_USERNAME_ERROR("A0110","用户名校验失败"), |
|---|
| | | CLIENT_USERNAME_EXIST("A0111","用户名已存在"), |
|---|
| | | CLIENT_USERNAME_CONTAINS_SENSITIVE_WORD("A0112","用户名包含敏感词"), |
|---|
| | | CLIENT_USERNAME_CONTAINS_INVALID_SYMBOL("A0113","用户名包含特殊字符"), |
|---|
| | | CLIENT_PASSWORD_CHECK_ERROR("A0120","密码校验失败"), |
|---|
| | | CLIENT_PASSWORD_LENGTH_ERROR("A0121","密码长度错误"), |
|---|
| | | CLIENT_PASSWORD_RULE_ERROR("A0122","密码强度不够"), |
|---|
| | | CLIENT_CHECK_CODE_ERROR("A0130","校验码错误"), |
|---|
| | | CLIENT_CHECK_CODE_SMS_ERROR("A0131","短信校验码错误"), |
|---|
| | | CLIENT_CHECK_CODE_EMAIL_ERROR("A0132","邮件校验码错误"), |
|---|
| | | CLIENT_CHECK_CODE_AUDIO_ERROR("A0133","语音校验码错误"), |
|---|
| | | CLIENT_LICENSE_ERROR("A0140","用户证件异常"), |
|---|
| | | |
|---|
| | | CLIENT_USER_INFO_ERROR("A0150","用户基本信息校验失败"), |
|---|
| | | CLIENT_USER_PHONE_RULE_ERROR("A0151","手机格式校验失败"), |
|---|
| | | CLIENT_USER_ADDRESS_RULE_ERROR("A0152","地址格式校验失败"), |
|---|
| | | CLIENT_USER_MAIL_RULE_ERROR("A0153","邮箱格式校验失败"), |
|---|
| | | |
|---|
| | | CLIENT_LOGIN_ABNORMAL("A0200","用户登陆异常"), |
|---|
| | | CLIENT_PASSWORD_NULL("A0209","用户密码不可为空"), |
|---|
| | | CLIENT_PASSWORD_ERROR("A0210","用户密码错误"), |
|---|
| | | CLIENT_PASSWORD_INPUT_LIMIT_ERROR("A0211","用户输入密码次数超限"), |
|---|
| | | CLIENT_CREDENTIALS_EXPIRED("A0212","用户认证过期"), |
|---|
| | | CLIENT_CREDENTIALS_LACK("A0213","用户认证标识缺少"), |
|---|
| | | CLIENT_CREDENTIALS_TOKEN_INVALID("A0215","用户认证token无效"), |
|---|
| | | CLIENT_IDENTITY_CHECK_ERROR("A0220","用户身份校验失败"), |
|---|
| | | |
|---|
| | | CLIENT_LOGIN_OUTTIME("A0230","用户登陆已过期"), |
|---|
| | | |
|---|
| | | CLIENT_PERMISSION_ERROR("A0300","访问权限异常"), |
|---|
| | | CLIENT_PERMISSION_NOT_ALLOW("A0301","访问未授权"), |
|---|
| | | CLIENT_PERMISSION_AUTH_APPLY("A0302","正在授权中"), |
|---|
| | | CLIENT_PERMISSION_AUTH_REJECT("A0303","用户授权申请被拒绝"), |
|---|
| | | CLIENT_PERMISSION_AUTH_INTERCEPT("A0310","因访问对象隐私设置被拦截"), |
|---|
| | | CLIENT_PERMISSION_AUTH_EXPIRED("A0311","授权已过期"), |
|---|
| | | CLIENT_PERMISSION_API_NOAUTH("A0312","无权限使用API"), |
|---|
| | | CLIENT_PERMISSION_API_INTERCEPT("A0320","用户访问被拦截"), |
|---|
| | | |
|---|
| | | CLIENT_SIGN_ERROR("A0340","用户签名异常"), |
|---|
| | | CLIENT_SIGN_RSA_ERROR("A0341","RSA 签名错误"), |
|---|
| | | CLIENT_PARAM_ERROR("A0400","用户请求参数错误"), |
|---|
| | | CLIENT_PARAM_INVALID("A0402","参数无效"), |
|---|
| | | CLIENT_PARAM_REQUIRED_EMPTY("A0410","请求必填参数为空"), |
|---|
| | | CLIENT_PARAM_FORMAT_ERROR("A0421","参数格式不匹配"), |
|---|
| | | CLIENT_PARAM_BATCH_OVER_LIMIT("A0426","请求批量处理总个数超出限制"), |
|---|
| | | CLIENT_PARAM_JSON_PRASE_ERROR("A0427","请求 JSON 解析失败"), |
|---|
| | | CLIENT_PARAM_ILLEGAL("A0430","参数非法"), |
|---|
| | | CLIENT_ORDER_OVERTIME("A0444","订单已超时"), |
|---|
| | | CLIENT_ORDER_CLOSE("A0443","订单已关闭"), |
|---|
| | | |
|---|
| | | // 项目 |
|---|
| | | CLIENT_PROJECT_NOT_EXIST("A0450","项目不存在"), |
|---|
| | | // 菜单 |
|---|
| | | CLIENT_MENU_NOT_EXIST("A0460", "菜单不存在"), |
|---|
| | | CLIENT_MENU_PARENT_NOT_EXIST("A0461", "父菜单不存在"), |
|---|
| | | |
|---|
| | | // 用户 |
|---|
| | | CLIENT_ACCOUNT_USERNAME_EXISTED("A0480","账户名已存在"), |
|---|
| | | CLIENT_ACCOUNT_USERNAME_NULL("A0480","账户名不可为空"), |
|---|
| | | CLIENT_ACCOUNT_PASSWORD_NULL("A0481","账户密码不可为空"), |
|---|
| | | CLIENT_ACCOUNT_NOT_EXIST("A0201","用户账户不存在"), |
|---|
| | | CLIENT_ACCOUNT_FROZEN("A0202","用户账户被冻结"), |
|---|
| | | CLIENT_ACCOUNT_DELETE("A0203","用户账户已作废"), |
|---|
| | | CLIENT_ACCOUNT_DISABLED("A0204","用户账户不可用"), |
|---|
| | | CLIENT_ACCOUNT_ALREADY_ABANDON("A0205","用户账户已经弃用"), |
|---|
| | | CLIENT_ACCOUNT_HAS_NO_ROLE("A0206","用户账户未分配角色"), |
|---|
| | | CLIENT_ACCOUNT_ONLY_ONE_ROLE("A0207","用户账户只能拥有一个角色"), |
|---|
| | | |
|---|
| | | // |
|---|
| | | |
|---|
| | | // 角色 |
|---|
| | | CLIENT_ROLE_NOT_EXIST("A0250","角色不存在"), |
|---|
| | | CLIENT_ROLE_CODE_NOT_ON("A0251","角色未启用"), |
|---|
| | | CLIENT_ROLE_HAS_NO_PROJECT("A0252","角色未分配项目"), |
|---|
| | | CLIENT_ROLE_CODE_NOT_EXIST("A0253","角色code不存在"), |
|---|
| | | CLIENT_ROLE_DISABLED("A0253","角色未启用"), |
|---|
| | | |
|---|
| | | // 部门 |
|---|
| | | CLIENT_DEP_NOT_EXIST("A0270","部门不存在"), |
|---|
| | | CLIENT_DEP_NAME_EXIST("A0271","部门名称已存在"), |
|---|
| | | CLIENT_DEP_DISABLED("A0272","部门未启用"), |
|---|
| | | |
|---|
| | | // 权限 |
|---|
| | | CLIENT_PERMISSION_NOT_EXIST("A0280","权限不存在"), |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | // 前端 |
|---|
| | | CLIENT_PARAM_NULL("C0001","请求关键参数为空"), |
|---|
| | | |
|---|
| | | // Redis |
|---|
| | | REDIS_KEY_NULL("R0001","系统redis入参为空"), |
|---|
| | | |
|---|
| | | |
|---|
| | | // 业务错误 |
|---|
| | | BUSINESS_ERROR("Y0001", "业务错误"), |
|---|
| | | |
|---|
| | | // 系统 |
|---|
| | | SERVER_ERROR("B0001","系统执行出错"), |
|---|
| | | SERVER_UPDATE_ERROR("B0002","数据更新失败"), |
|---|
| | | SERVER_ADD_ERROR("B00003","数据新增失败"), |
|---|
| | | SERVER_DEL_ERROR("B00004","数据删除失败"), |
|---|
| | | SERVER_PARAM_NULL("B00005","系统入参为空"), |
|---|
| | | SERVER_BATCH_ADD_ERROR("B00006","数据批量新增失败"), |
|---|
| | | SERVER_BATCH_UPDATE_ERROR("B00007","数据批量修改失败"), |
|---|
| | | SERVER_DATABASE_DATA_DUPLICATED("B00008","数据库内部记录重复"), |
|---|
| | | SERVER_UPDATE_DATA_NO_CHANGE("B00009","更新数据没有发生变化"), |
|---|
| | | SERVER_EXEC_OUTTIME("B0100","系统执行超时"), |
|---|
| | | SERVER_DEL_OVER_SIZE("B00010","批量删除个数过多"), |
|---|
| | | |
|---|
| | | |
|---|
| | | // RPC |
|---|
| | | RPC_RESULT_NULL("R0001","RPC没有返回"), |
|---|
| | | RPC_DATA_NULL("R0002","RPC数据为空"), |
|---|
| | | RPC_DATA_TYPE_NOT_MATCH("R0003","RPC数据返回类型不匹配"), |
|---|
| | | RPC_ACCESS_EXCEPTION("R0004","RPC访问异常"), |
|---|
| | | |
|---|
| | | // 请求 |
|---|
| | | CLIENT_METHOD_NOT_MATCH("M0001","请求方法不匹配") |
|---|
| | | ; |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | ResultCodes(String code, String desc) { |
|---|
| | | this.code = code; |
|---|
| | | this.desc = desc; |
|---|
| | | } |
|---|
| | | |
|---|
| | | private String code; |
|---|
| | | private String desc; |
|---|
| | | |
|---|
| | | public String getCode() { |
|---|
| | | return code; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setCode(String code) { |
|---|
| | | this.code = code; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getDesc() { |
|---|
| | | return desc; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setDesc(String desc) { |
|---|
| | | this.desc = desc; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain.Enum; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.annotation.EnumValue; |
|---|
| | | import com.fasterxml.jackson.annotation.JsonValue; |
|---|
| | | |
|---|
| | | public enum SendStatus { |
|---|
| | | |
|---|
| | | UN_SEND(0,"未发送"), |
|---|
| | | SUCCESS(1, "发送成功"), |
|---|
| | | FAILURE(2, "发送失败"), |
|---|
| | | |
|---|
| | | ; |
|---|
| | | |
|---|
| | | |
|---|
| | | SendStatus(int status, String msg) { |
|---|
| | | this.status = status; |
|---|
| | | this.msg = msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | int status; |
|---|
| | | @JsonValue |
|---|
| | | String msg; |
|---|
| | | |
|---|
| | | public int getStatus() { |
|---|
| | | return status; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getMsg() { |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain.Enum; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.annotation.EnumValue; |
|---|
| | | import com.fasterxml.jackson.annotation.JsonValue; |
|---|
| | | |
|---|
| | | public enum SmsSource { |
|---|
| | | |
|---|
| | | WARN(1,"报警信息"); |
|---|
| | | |
|---|
| | | |
|---|
| | | SmsSource(int code, String msg) { |
|---|
| | | this.code = code; |
|---|
| | | this.msg = msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | int code; |
|---|
| | | @JsonValue |
|---|
| | | String msg; |
|---|
| | | |
|---|
| | | public int getCode() { |
|---|
| | | return code; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getMsg() { |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain.Enum; |
|---|
| | | |
|---|
| | | import com.fasterxml.jackson.annotation.JsonValue; |
|---|
| | | |
|---|
| | | public enum SourceType { |
|---|
| | | |
|---|
| | | WEB("WEB","网页"), |
|---|
| | | APP("APP","安卓"); |
|---|
| | | |
|---|
| | | |
|---|
| | | SourceType(String code, String msg) { |
|---|
| | | this.code = code; |
|---|
| | | this.msg = msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | String code; |
|---|
| | | @JsonValue |
|---|
| | | String msg; |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain.Enum; |
|---|
| | | |
|---|
| | | public enum TaskType { |
|---|
| | | HOT(1,"动火作业"), |
|---|
| | | SPACE(2,"受限空间作业"), |
|---|
| | | HOISTING(3,"吊装作业"), |
|---|
| | | BLIND(4,"盲板抽堵作业"), |
|---|
| | | ELECTRIC(5,"临时用电作业"), |
|---|
| | | HIGH(6,"高处作业"), |
|---|
| | | BREAK(7,"断路作业"), |
|---|
| | | SOILD(8,"动土作业"), |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | ; |
|---|
| | | |
|---|
| | | |
|---|
| | | TaskType(int code, String msg) { |
|---|
| | | this.code = code; |
|---|
| | | this.msg = msg; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public int code; |
|---|
| | | public String msg; |
|---|
| | | |
|---|
| | | public static Byte getTaskType(String msg) { |
|---|
| | | int taskTypeCode = 0; |
|---|
| | | for (TaskType type : TaskType.values()){ |
|---|
| | | if (type.msg.equals(msg)){ |
|---|
| | | taskTypeCode = type.code; |
|---|
| | | } |
|---|
| | | } |
|---|
| | | return (byte) taskTypeCode; |
|---|
| | | } |
|---|
| | | |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.annotation.IdType; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableField; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableId; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableName; |
|---|
| | | |
|---|
| | | import java.io.Serializable; |
|---|
| | | import java.util.Date; |
|---|
| | | |
|---|
| | | @TableName("equipment") |
|---|
| | | public class EquipmentInfo implements Serializable { |
|---|
| | | @TableField(exist = false) |
|---|
| | | private static final long serialVersionUID = 1L; |
|---|
| | | |
|---|
| | | @TableId(type = IdType.AUTO) |
|---|
| | | private Long id; |
|---|
| | | |
|---|
| | | /** 设备名称 name **/ |
|---|
| | | private String name; |
|---|
| | | |
|---|
| | | /** 设备条码 number **/ |
|---|
| | | private String number; |
|---|
| | | |
|---|
| | | /** 是否有摄像头 isphoto **/ |
|---|
| | | private Byte isphoto; |
|---|
| | | |
|---|
| | | /** 摄像头名称 photoname **/ |
|---|
| | | private String photoname; |
|---|
| | | |
|---|
| | | /** 摄像头地址 photoaddress **/ |
|---|
| | | private String photoaddress; |
|---|
| | | |
|---|
| | | /** 更新时间 updatetime **/ |
|---|
| | | private Date updatetime; |
|---|
| | | |
|---|
| | | /** 更新人 updateby **/ |
|---|
| | | private String updateby; |
|---|
| | | |
|---|
| | | /** 状态（0：未领用；1：使用中） status **/ |
|---|
| | | private Byte status; |
|---|
| | | |
|---|
| | | @TableField(exist = false) |
|---|
| | | private Boolean isFireMan; |
|---|
| | | |
|---|
| | | /** 设备表 id **/ |
|---|
| | | public Long getId() { |
|---|
| | | return id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 设备表 id **/ |
|---|
| | | public void setId(Long id) { |
|---|
| | | this.id = id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 设备名称 name **/ |
|---|
| | | public String getName() { |
|---|
| | | return name; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 设备名称 name **/ |
|---|
| | | public void setName(String name) { |
|---|
| | | this.name = name == null ? null : name.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 设备条码 number **/ |
|---|
| | | public String getNumber() { |
|---|
| | | return number; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 设备条码 number **/ |
|---|
| | | public void setNumber(String number) { |
|---|
| | | this.number = number == null ? null : number.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 是否有摄像头 isphoto **/ |
|---|
| | | public Byte getIsphoto() { |
|---|
| | | return isphoto; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 是否有摄像头 isphoto **/ |
|---|
| | | public void setIsphoto(Byte isphoto) { |
|---|
| | | this.isphoto = isphoto; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 摄像头名称 photoname **/ |
|---|
| | | public String getPhotoname() { |
|---|
| | | return photoname; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 摄像头名称 photoname **/ |
|---|
| | | public void setPhotoname(String photoname) { |
|---|
| | | this.photoname = photoname == null ? null : photoname.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 摄像头地址 photoaddress **/ |
|---|
| | | public String getPhotoaddress() { |
|---|
| | | return photoaddress; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 摄像头地址 photoaddress **/ |
|---|
| | | public void setPhotoaddress(String photoaddress) { |
|---|
| | | this.photoaddress = photoaddress == null ? null : photoaddress.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 更新时间 updatetime **/ |
|---|
| | | public Date getUpdatetime() { |
|---|
| | | return updatetime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 更新时间 updatetime **/ |
|---|
| | | public void setUpdatetime(Date updatetime) { |
|---|
| | | this.updatetime = updatetime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 更新人 updateby **/ |
|---|
| | | public String getUpdateby() { |
|---|
| | | return updateby; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 更新人 updateby **/ |
|---|
| | | public void setUpdateby(String updateby) { |
|---|
| | | this.updateby = updateby == null ? null : updateby.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Byte getStatus() { |
|---|
| | | return status; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setStatus(Byte status) { |
|---|
| | | this.status = status; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Boolean getIsFireMan() { |
|---|
| | | return isFireMan; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setIsFireMan(Boolean fireMan) { |
|---|
| | | isFireMan = fireMan; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.annotation.IdType; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableField; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableId; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableName; |
|---|
| | | |
|---|
| | | import java.io.Serializable; |
|---|
| | | import java.util.Date; |
|---|
| | | |
|---|
| | | @TableName("examscore") |
|---|
| | | public class ExamScoreInfo implements Serializable { |
|---|
| | | @TableField(exist = false) |
|---|
| | | private static final long serialVersionUID = 1L; |
|---|
| | | |
|---|
| | | @TableId(type = IdType.AUTO) |
|---|
| | | private Long id; |
|---|
| | | |
|---|
| | | /** 真实姓名 realname **/ |
|---|
| | | private String realname; |
|---|
| | | |
|---|
| | | /** 手机号 mobile **/ |
|---|
| | | private String mobile; |
|---|
| | | |
|---|
| | | /** 身份证 idcard **/ |
|---|
| | | private String idcard; |
|---|
| | | |
|---|
| | | /** 考试类型 examtype **/ |
|---|
| | | private String examtype; |
|---|
| | | |
|---|
| | | /** 分数 score **/ |
|---|
| | | private Integer score; |
|---|
| | | |
|---|
| | | /** 有效期结束时间 starttime **/ |
|---|
| | | private Date starttime; |
|---|
| | | |
|---|
| | | /** 有效期结束时间 endtime **/ |
|---|
| | | private Date endtime; |
|---|
| | | |
|---|
| | | /** 创建时间 createtime **/ |
|---|
| | | private Date createtime; |
|---|
| | | |
|---|
| | | /** id id **/ |
|---|
| | | public Long getId() { |
|---|
| | | return id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** id id **/ |
|---|
| | | public void setId(Long id) { |
|---|
| | | this.id = id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 真实姓名 realname **/ |
|---|
| | | public String getRealname() { |
|---|
| | | return realname; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 真实姓名 realname **/ |
|---|
| | | public void setRealname(String realname) { |
|---|
| | | this.realname = realname == null ? null : realname.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 手机号 mobile **/ |
|---|
| | | public String getMobile() { |
|---|
| | | return mobile; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 手机号 mobile **/ |
|---|
| | | public void setMobile(String mobile) { |
|---|
| | | this.mobile = mobile == null ? null : mobile.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 身份证 idcard **/ |
|---|
| | | public String getIdcard() { |
|---|
| | | return idcard; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 身份证 idcard **/ |
|---|
| | | public void setIdcard(String idcard) { |
|---|
| | | this.idcard = idcard == null ? null : idcard.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 考试类型 examtype **/ |
|---|
| | | public String getExamtype() { |
|---|
| | | return examtype; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 考试类型 examtype **/ |
|---|
| | | public void setExamtype(String examtype) { |
|---|
| | | this.examtype = examtype == null ? null : examtype.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 分数 score **/ |
|---|
| | | public Integer getScore() { |
|---|
| | | return score; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 分数 score **/ |
|---|
| | | public void setScore(Integer score) { |
|---|
| | | this.score = score; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 有效期结束时间 starttime **/ |
|---|
| | | public Date getStarttime() { |
|---|
| | | return starttime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 有效期结束时间 starttime **/ |
|---|
| | | public void setStarttime(Date starttime) { |
|---|
| | | this.starttime = starttime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 有效期结束时间 endtime **/ |
|---|
| | | public Date getEndtime() { |
|---|
| | | return endtime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 有效期结束时间 endtime **/ |
|---|
| | | public void setEndtime(Date endtime) { |
|---|
| | | this.endtime = endtime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建时间 createtime **/ |
|---|
| | | public Date getCreatetime() { |
|---|
| | | return createtime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建时间 createtime **/ |
|---|
| | | public void setCreatetime(Date createtime) { |
|---|
| | | this.createtime = createtime; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain.Exception; |
|---|
| | | |
|---|
| | | public class AusinessException extends RuntimeException { |
|---|
| | | |
|---|
| | | private String code; |
|---|
| | | |
|---|
| | | private String message; |
|---|
| | | |
|---|
| | | public AusinessException(String code, String message) { |
|---|
| | | super(message); |
|---|
| | | this.message = message; |
|---|
| | | this.code = code; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public AusinessException(E e, String message) { |
|---|
| | | super(message); |
|---|
| | | this.message = message; |
|---|
| | | this.code = e.getCode(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getCode() { |
|---|
| | | return code; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setCode(String code) { |
|---|
| | | this.code = code; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public String getMessage() { |
|---|
| | | return message; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setMessage(String message) { |
|---|
| | | this.message = message; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain.Exception; |
|---|
| | | |
|---|
| | | import com.gk.hotwork.Domain.Enum.ResultCodes; |
|---|
| | | |
|---|
| | | public class BusinessException extends RuntimeException{ |
|---|
| | | private String code; |
|---|
| | | private String error; |
|---|
| | | |
|---|
| | | public BusinessException(String message) { |
|---|
| | | super(message); |
|---|
| | | } |
|---|
| | | |
|---|
| | | public BusinessException(ResultCodes code) { |
|---|
| | | super(code.getDesc()); |
|---|
| | | this.code = code.getCode(); |
|---|
| | | this.error = code.getDesc(); |
|---|
| | | |
|---|
| | | } |
|---|
| | | |
|---|
| | | public BusinessException(String code, String error) { |
|---|
| | | super(error); |
|---|
| | | this.code = code; |
|---|
| | | this.error = error; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public BusinessException(E e, String error) { |
|---|
| | | super(error); |
|---|
| | | this.code = e.getCode(); |
|---|
| | | this.error = error; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getCode() { |
|---|
| | | return code; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setCode(String code) { |
|---|
| | | this.code = code; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getError() { |
|---|
| | | return error; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setError(String error) { |
|---|
| | | this.error = error; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain.Exception; |
|---|
| | | |
|---|
| | | public enum E { |
|---|
| | | |
|---|
| | | DATA_PARAM_NULL("B0100","数据传参为空"), |
|---|
| | | DATA_PARAM_CHECK_INVALID("B0101","数据校验非法"), |
|---|
| | | DATA_DATABASE_EXIST("B0111","数据记录已存在"), |
|---|
| | | DATA_DATABASE_DUPLICATED("B0113","数据记录重复"), |
|---|
| | | DATA_DATABASE_NO_EXISTENT("B0114","查询不到对应记录"), |
|---|
| | | DATA_DATABASE_EXIST_BUT_NOT_VALID("B0115","记录无效"), |
|---|
| | | DATA_STATUS_NOT_EXIST("B0120","数据状态不存在"), |
|---|
| | | NOT_DELETE("B0131","无法删除"), |
|---|
| | | ADD_FAIL("B0132","新增失败"), |
|---|
| | | UPDATE_FAIL("B0133","修改失败"), |
|---|
| | | DATA_BING_RELATION("B0116","数据已被绑定关系"), |
|---|
| | | DATA_OPERATION_NO_PERMISSION("B0122","数据没有操作权限"), |
|---|
| | | DATA_STATUS_CHECK_INVALID("B0121","数据状态不合法"), |
|---|
| | | EXPORT_FAIL("B0134","导出失败！"), |
|---|
| | | ; |
|---|
| | | private String code; |
|---|
| | | private String desc; |
|---|
| | | |
|---|
| | | E(String code, String desc) { |
|---|
| | | this.code = code; |
|---|
| | | this.desc = desc; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getCode() { |
|---|
| | | return code; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getDesc() { |
|---|
| | | return desc; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain.Exception.Handler; |
|---|
| | | |
|---|
| | | import com.gk.hotwork.Domain.Exception.BusinessException; |
|---|
| | | import com.gk.hotwork.Domain.Utils.Msg; |
|---|
| | | import org.apache.log4j.LogManager; |
|---|
| | | import org.apache.log4j.Logger; |
|---|
| | | import org.springframework.web.bind.annotation.ControllerAdvice; |
|---|
| | | import org.springframework.web.bind.annotation.ExceptionHandler; |
|---|
| | | import org.springframework.web.bind.annotation.ResponseBody; |
|---|
| | | |
|---|
| | | @ControllerAdvice |
|---|
| | | public class CustomExceptionHandler { |
|---|
| | | |
|---|
| | | private Logger logger = LogManager.getLogger(CustomExceptionHandler.class); |
|---|
| | | @ResponseBody |
|---|
| | | @ExceptionHandler(value = BusinessException.class) |
|---|
| | | public Msg errorHandler(BusinessException ex){ |
|---|
| | | logger.warn(ex); |
|---|
| | | Msg msg = new Msg(); |
|---|
| | | msg.setCode("400"); |
|---|
| | | msg.setMessage(ex.getMessage()); |
|---|
| | | return msg; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.annotation.IdType; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableId; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableName; |
|---|
| | | |
|---|
| | | import java.io.Serializable; |
|---|
| | | import java.util.Date; |
|---|
| | | |
|---|
| | | @TableName("four_color_map2") |
|---|
| | | public class FourColorMap2 implements Serializable { |
|---|
| | | |
|---|
| | | private static final long serialVersionUID = 1L; |
|---|
| | | /** 主键Id id **/ |
|---|
| | | @TableId(type = IdType.AUTO) |
|---|
| | | private Long id; |
|---|
| | | |
|---|
| | | /** 类型 type **/ |
|---|
| | | private String type; |
|---|
| | | |
|---|
| | | /** 坐标 geometry **/ |
|---|
| | | private String geometry; |
|---|
| | | |
|---|
| | | /** 四色图属性 properties **/ |
|---|
| | | private String properties; |
|---|
| | | |
|---|
| | | /** 吨位类型(1:60,2:130) etype **/ |
|---|
| | | private Integer etype; |
|---|
| | | |
|---|
| | | /** 标识 valid_flag **/ |
|---|
| | | private Boolean validFlag; |
|---|
| | | |
|---|
| | | private String createBy; |
|---|
| | | |
|---|
| | | private Date createTime; |
|---|
| | | |
|---|
| | | private Date updateTime; |
|---|
| | | |
|---|
| | | |
|---|
| | | /** 主键Id id **/ |
|---|
| | | public Long getId() { |
|---|
| | | return id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 主键Id id **/ |
|---|
| | | public void setId(Long id) { |
|---|
| | | this.id = id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 类型 type **/ |
|---|
| | | public String getType() { |
|---|
| | | return type; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 类型 type **/ |
|---|
| | | public void setType(String type) { |
|---|
| | | this.type = type == null ? null : type.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 坐标 geometry **/ |
|---|
| | | public String getGeometry() { |
|---|
| | | return geometry; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 坐标 geometry **/ |
|---|
| | | public void setGeometry(String geometry) { |
|---|
| | | this.geometry = geometry == null ? null : geometry.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 四色图属性 properties **/ |
|---|
| | | public String getProperties() { |
|---|
| | | return properties; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 四色图属性 properties **/ |
|---|
| | | public void setProperties(String properties) { |
|---|
| | | this.properties = properties == null ? null : properties.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 吨位类型(1:60,2:130) etype **/ |
|---|
| | | public Integer getEtype() { |
|---|
| | | return etype; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 吨位类型(1:60,2:130) etype **/ |
|---|
| | | public void setEtype(Integer etype) { |
|---|
| | | this.etype = etype ; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 标识 valid_flag **/ |
|---|
| | | public Boolean getValidFlag() { |
|---|
| | | return validFlag; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 标识 valid_flag **/ |
|---|
| | | public void setValidFlag(Boolean validFlag) { |
|---|
| | | this.validFlag = validFlag; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getCreateBy() { |
|---|
| | | return createBy; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setCreateBy(String createBy) { |
|---|
| | | this.createBy = createBy; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Date getCreateTime() { |
|---|
| | | return createTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setCreateTime(Date createTime) { |
|---|
| | | this.createTime = createTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Date getUpdateTime() { |
|---|
| | | return updateTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setUpdateTime(Date updateTime) { |
|---|
| | | this.updateTime = updateTime; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain; |
|---|
| | | |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.annotation.IdType; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableField; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableId; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableName; |
|---|
| | | |
|---|
| | | import java.io.Serializable; |
|---|
| | | |
|---|
| | | @TableName("four_color_map") |
|---|
| | | public class FourColorPoint implements Serializable{ |
|---|
| | | |
|---|
| | | @TableId(type = IdType.INPUT) |
|---|
| | | private String id; |
|---|
| | | |
|---|
| | | private Integer etype; |
|---|
| | | |
|---|
| | | private String name; |
|---|
| | | |
|---|
| | | private String type; |
|---|
| | | |
|---|
| | | private String text; |
|---|
| | | |
|---|
| | | private String shapeType; |
|---|
| | | |
|---|
| | | @TableField(value = "clamp_toground") |
|---|
| | | private boolean clampToGround; |
|---|
| | | |
|---|
| | | private String color; |
|---|
| | | |
|---|
| | | private String geoType; |
|---|
| | | |
|---|
| | | public String getId() { |
|---|
| | | return id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setId(String id) { |
|---|
| | | this.id = id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Integer getEtype() { |
|---|
| | | return etype; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setEtype(Integer etype) { |
|---|
| | | this.etype = etype; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getName() { |
|---|
| | | return name; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setName(String name) { |
|---|
| | | this.name = name; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getType() { |
|---|
| | | return type; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setType(String type) { |
|---|
| | | this.type = type; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getText() { |
|---|
| | | return text; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setText(String text) { |
|---|
| | | this.text = text; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getShapeType() { |
|---|
| | | return shapeType; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setShapeType(String shapeType) { |
|---|
| | | this.shapeType = shapeType; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public boolean isClampToGround() { |
|---|
| | | return clampToGround; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setClampToGround(boolean clampToGround) { |
|---|
| | | this.clampToGround = clampToGround; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getColor() { |
|---|
| | | return color; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setColor(String color) { |
|---|
| | | this.color = color; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getGeoType() { |
|---|
| | | return geoType; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setGeoType(String geoType) { |
|---|
| | | this.geoType = geoType; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.annotation.IdType; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableId; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableName; |
|---|
| | | |
|---|
| | | import java.io.Serializable; |
|---|
| | | |
|---|
| | | @TableName("four_color_map_coord") |
|---|
| | | public class FourColorPointCoord implements Serializable{ |
|---|
| | | |
|---|
| | | @TableId(type = IdType.AUTO) |
|---|
| | | private Long id; |
|---|
| | | |
|---|
| | | private String pointId; |
|---|
| | | |
|---|
| | | private Float lon; |
|---|
| | | |
|---|
| | | private Float lat; |
|---|
| | | |
|---|
| | | private Float hei; |
|---|
| | | |
|---|
| | | public Long getId() { |
|---|
| | | return id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setId(Long id) { |
|---|
| | | this.id = id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getPointId() { |
|---|
| | | return pointId; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setPointId(String pointId) { |
|---|
| | | this.pointId = pointId; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Float getLon() { |
|---|
| | | return lon; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setLon(Float lon) { |
|---|
| | | this.lon = lon; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Float getLat() { |
|---|
| | | return lat; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setLat(Float lat) { |
|---|
| | | this.lat = lat; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Float getHei() { |
|---|
| | | return hei; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setHei(Float hei) { |
|---|
| | | this.hei = hei; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.annotation.IdType; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableField; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableId; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableName; |
|---|
| | | |
|---|
| | | import java.io.Serializable; |
|---|
| | | import java.math.BigDecimal; |
|---|
| | | import java.util.Date; |
|---|
| | | |
|---|
| | | @TableName("gaswarn") |
|---|
| | | public class GasWarnInfo implements Serializable { |
|---|
| | | @TableField(exist = false) |
|---|
| | | private static final long serialVersionUID = 1L; |
|---|
| | | |
|---|
| | | @TableId(type = IdType.AUTO) |
|---|
| | | private Long id; |
|---|
| | | |
|---|
| | | /** 气体类型 gastype **/ |
|---|
| | | private String gastype; |
|---|
| | | |
|---|
| | | /** 报警类型（预警、报警） warntype **/ |
|---|
| | | private String warntype; |
|---|
| | | |
|---|
| | | /** 最大值 max **/ |
|---|
| | | private BigDecimal max; |
|---|
| | | |
|---|
| | | /** 最小值 min **/ |
|---|
| | | private BigDecimal min; |
|---|
| | | |
|---|
| | | /** 气体单位 gasunit **/ |
|---|
| | | private String gasunit; |
|---|
| | | |
|---|
| | | /** 更新时间 updatetime **/ |
|---|
| | | private Date updatetime; |
|---|
| | | |
|---|
| | | /** 更新人 updateby **/ |
|---|
| | | private String updateby; |
|---|
| | | |
|---|
| | | /** 气体报警阈值 id **/ |
|---|
| | | public Long getId() { |
|---|
| | | return id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 气体报警阈值 id **/ |
|---|
| | | public void setId(Long id) { |
|---|
| | | this.id = id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 气体类型 gastype **/ |
|---|
| | | public String getGastype() { |
|---|
| | | return gastype; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 气体类型 gastype **/ |
|---|
| | | public void setGastype(String gastype) { |
|---|
| | | this.gastype = gastype == null ? null : gastype.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 报警类型（预警、报警） warntype **/ |
|---|
| | | public String getWarntype() { |
|---|
| | | return warntype; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 报警类型（预警、报警） warntype **/ |
|---|
| | | public void setWarntype(String warntype) { |
|---|
| | | this.warntype = warntype == null ? null : warntype.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最大值 max **/ |
|---|
| | | public BigDecimal getMax() { |
|---|
| | | return max; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最大值 max **/ |
|---|
| | | public void setMax(BigDecimal max) { |
|---|
| | | this.max = max; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最小值 min **/ |
|---|
| | | public BigDecimal getMin() { |
|---|
| | | return min; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最小值 min **/ |
|---|
| | | public void setMin(BigDecimal min) { |
|---|
| | | this.min = min; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 气体单位 gasunit **/ |
|---|
| | | public String getGasunit() { |
|---|
| | | return gasunit; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 气体单位 gasunit **/ |
|---|
| | | public void setGasunit(String gasunit) { |
|---|
| | | this.gasunit = gasunit == null ? null : gasunit.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 更新时间 updatetime **/ |
|---|
| | | public Date getUpdatetime() { |
|---|
| | | return updatetime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 更新时间 updatetime **/ |
|---|
| | | public void setUpdatetime(Date updatetime) { |
|---|
| | | this.updatetime = updatetime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 更新人 updateby **/ |
|---|
| | | public String getUpdateby() { |
|---|
| | | return updateby; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 更新人 updateby **/ |
|---|
| | | public void setUpdateby(String updateby) { |
|---|
| | | this.updateby = updateby == null ? null : updateby.trim(); |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.annotation.IdType; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableField; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableId; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableName; |
|---|
| | | |
|---|
| | | import java.util.Date; |
|---|
| | | |
|---|
| | | @TableName("helpdoc") |
|---|
| | | public class HelpDocInfo { |
|---|
| | | @TableField(exist = false) |
|---|
| | | private static final long serialVersionUID = 1L; |
|---|
| | | |
|---|
| | | /** id **/ |
|---|
| | | @TableId(type = IdType.AUTO) |
|---|
| | | private Long id; |
|---|
| | | |
|---|
| | | /** 文件类型 filetype **/ |
|---|
| | | private String filetype; |
|---|
| | | |
|---|
| | | /** 文件名称 filename **/ |
|---|
| | | private String filename; |
|---|
| | | |
|---|
| | | /** 文件链接 fileurl **/ |
|---|
| | | private String fileurl; |
|---|
| | | |
|---|
| | | /** 版本号 version **/ |
|---|
| | | private Integer version; |
|---|
| | | |
|---|
| | | /** 备注 remark **/ |
|---|
| | | private String remark; |
|---|
| | | |
|---|
| | | /** 创建人 createdby **/ |
|---|
| | | private String createdby; |
|---|
| | | |
|---|
| | | /** 创建时间 created **/ |
|---|
| | | private Date created; |
|---|
| | | |
|---|
| | | /** 更新时间 updated **/ |
|---|
| | | private Date updated; |
|---|
| | | |
|---|
| | | /** 是否删除 isdel **/ |
|---|
| | | private Byte isdel; |
|---|
| | | |
|---|
| | | /** 标记 flag **/ |
|---|
| | | private Byte flag; |
|---|
| | | |
|---|
| | | /** id **/ |
|---|
| | | public Long getId() { |
|---|
| | | return id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** id **/ |
|---|
| | | public void setId(Long id) { |
|---|
| | | this.id = id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 文件类型 filetype **/ |
|---|
| | | public String getFiletype() { |
|---|
| | | return filetype; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 文件类型 filetype **/ |
|---|
| | | public void setFiletype(String filetype) { |
|---|
| | | this.filetype = filetype == null ? null : filetype.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 文件名称 filename **/ |
|---|
| | | public String getFilename() { |
|---|
| | | return filename; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 文件名称 filename **/ |
|---|
| | | public void setFilename(String filename) { |
|---|
| | | this.filename = filename == null ? null : filename.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 文件链接 fileurl **/ |
|---|
| | | public String getFileurl() { |
|---|
| | | return fileurl; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 文件链接 fileurl **/ |
|---|
| | | public void setFileurl(String fileurl) { |
|---|
| | | this.fileurl = fileurl == null ? null : fileurl.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 版本号 version **/ |
|---|
| | | public Integer getVersion() { |
|---|
| | | return version; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 版本号 version **/ |
|---|
| | | public void setVersion(Integer version) { |
|---|
| | | this.version = version; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 备注 remark **/ |
|---|
| | | public String getRemark() { |
|---|
| | | return remark; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 备注 remark **/ |
|---|
| | | public void setRemark(String remark) { |
|---|
| | | this.remark = remark == null ? null : remark.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建人 createdby **/ |
|---|
| | | public String getCreatedby() { |
|---|
| | | return createdby; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建人 createdby **/ |
|---|
| | | public void setCreatedby(String createdby) { |
|---|
| | | this.createdby = createdby == null ? null : createdby.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建时间 created **/ |
|---|
| | | public Date getCreated() { |
|---|
| | | return created; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建时间 created **/ |
|---|
| | | public void setCreated(Date created) { |
|---|
| | | this.created = created; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 更新时间 updated **/ |
|---|
| | | public Date getUpdated() { |
|---|
| | | return updated; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 更新时间 updated **/ |
|---|
| | | public void setUpdated(Date updated) { |
|---|
| | | this.updated = updated; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 是否删除 isdel **/ |
|---|
| | | public Byte getIsdel() { |
|---|
| | | return isdel; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 是否删除 isdel **/ |
|---|
| | | public void setIsdel(Byte isdel) { |
|---|
| | | this.isdel = isdel; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 标记 flag **/ |
|---|
| | | public Byte getFlag() { |
|---|
| | | return flag; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 标记 flag **/ |
|---|
| | | public void setFlag(Byte flag) { |
|---|
| | | this.flag = flag; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.annotation.IdType; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableField; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableId; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableName; |
|---|
| | | import com.fasterxml.jackson.annotation.JsonFormat; |
|---|
| | | import com.gk.hotwork.Domain.Enum.HiddenDangerApplyStatus; |
|---|
| | | import com.gk.hotwork.Domain.Enum.HiddenDangerLevel; |
|---|
| | | |
|---|
| | | import java.io.Serializable; |
|---|
| | | import java.util.Date; |
|---|
| | | import java.util.List; |
|---|
| | | |
|---|
| | | @TableName("hiddendanger") |
|---|
| | | public class HiddenDanger implements Serializable { |
|---|
| | | |
|---|
| | | @TableField(exist = false) |
|---|
| | | private static final long serialVersionUID = 1L; |
|---|
| | | |
|---|
| | | /** 主键id id **/ |
|---|
| | | @TableId(type = IdType.AUTO) |
|---|
| | | private Long id; |
|---|
| | | |
|---|
| | | private String code; |
|---|
| | | |
|---|
| | | /** 隐患级别 level **/ |
|---|
| | | private HiddenDangerLevel level; |
|---|
| | | |
|---|
| | | /** 单子状态(未确认，已确认，已整改) status **/ |
|---|
| | | private HiddenDangerApplyStatus status; |
|---|
| | | |
|---|
| | | /** 提出人 requestor **/ |
|---|
| | | private String requestor; |
|---|
| | | |
|---|
| | | /** 提出人id requestorid **/ |
|---|
| | | private Long requestorid; |
|---|
| | | |
|---|
| | | /** 创建(提出)时间 createtime **/ |
|---|
| | | @JsonFormat(pattern = "yyyy-MM-dd HH:mm" , timezone = "GMT+8") |
|---|
| | | private Date createtime; |
|---|
| | | |
|---|
| | | /** 创建说明 createnote **/ |
|---|
| | | private String createnote; |
|---|
| | | |
|---|
| | | |
|---|
| | | /** 整改时间 rectifytime **/ |
|---|
| | | @JsonFormat(pattern = "yyyy-MM-dd HH:mm" , timezone = "GMT+8") |
|---|
| | | private Date rectifytime; |
|---|
| | | |
|---|
| | | /** 整改说明 rectifynote **/ |
|---|
| | | private String rectifynote; |
|---|
| | | |
|---|
| | | private String rectifymeasure; |
|---|
| | | |
|---|
| | | private String rectifier; |
|---|
| | | |
|---|
| | | private Long rectifierid; |
|---|
| | | |
|---|
| | | /** 有效标识 validflag **/ |
|---|
| | | private Boolean validflag; |
|---|
| | | |
|---|
| | | @JsonFormat(pattern = "yyyy-MM-dd HH:mm" , timezone = "GMT+8") |
|---|
| | | private Date rectifydeadline; |
|---|
| | | |
|---|
| | | @JsonFormat(pattern = "yyyy-MM-dd HH:mm" , timezone = "GMT+8") |
|---|
| | | private Date accepttime; |
|---|
| | | |
|---|
| | | @JsonFormat(pattern = "yyyy-MM-dd HH:mm" , timezone = "GMT+8") |
|---|
| | | private Date rejecttime; |
|---|
| | | |
|---|
| | | private String rejectnote; |
|---|
| | | |
|---|
| | | private String acceptnote; |
|---|
| | | |
|---|
| | | private Integer source; |
|---|
| | | |
|---|
| | | //上报文件 |
|---|
| | | @TableField(exist = false) |
|---|
| | | private List<HiddenDangerResource> reportResources; |
|---|
| | | |
|---|
| | | //整改文件 |
|---|
| | | @TableField(exist = false) |
|---|
| | | private List<HiddenDangerResource> rectifyResources; |
|---|
| | | |
|---|
| | | @TableField(exist = false) |
|---|
| | | private Integer countNum; |
|---|
| | | |
|---|
| | | @TableField(exist = false) |
|---|
| | | private String constructionunit; |
|---|
| | | |
|---|
| | | /** 隐患id id **/ |
|---|
| | | public Long getId() { |
|---|
| | | return id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 隐患id id **/ |
|---|
| | | public void setId(Long id) { |
|---|
| | | this.id = id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public HiddenDangerLevel getLevel() { |
|---|
| | | return level; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setLevel(HiddenDangerLevel level) { |
|---|
| | | this.level = level; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public List<HiddenDangerResource> getReportResources() { |
|---|
| | | return reportResources; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setReportResources(List<HiddenDangerResource> reportResources) { |
|---|
| | | this.reportResources = reportResources; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public List<HiddenDangerResource> getRectifyResources() { |
|---|
| | | return rectifyResources; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setRectifyResources(List<HiddenDangerResource> rectifyResources) { |
|---|
| | | this.rectifyResources = rectifyResources; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 隐患级别 level **/ |
|---|
| | | |
|---|
| | | |
|---|
| | | public HiddenDangerApplyStatus getStatus() { |
|---|
| | | return status; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setStatus(HiddenDangerApplyStatus status) { |
|---|
| | | this.status = status; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 提出人 requestor **/ |
|---|
| | | public String getRequestor() { |
|---|
| | | return requestor; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 提出人 requestor **/ |
|---|
| | | public void setRequestor(String requestor) { |
|---|
| | | this.requestor = requestor == null ? null : requestor.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | /** 提出人id requestorid **/ |
|---|
| | | public Long getRequestorid() { |
|---|
| | | return requestorid; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 提出人id requestorid **/ |
|---|
| | | public void setRequestorid(Long requestorid) { |
|---|
| | | this.requestorid = requestorid; |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | /** 创建(提出)时间 createtime **/ |
|---|
| | | public Date getCreatetime() { |
|---|
| | | return createtime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建(提出)时间 createtime **/ |
|---|
| | | public void setCreatetime(Date createtime) { |
|---|
| | | this.createtime = createtime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建说明 createnote **/ |
|---|
| | | public String getCreatenote() { |
|---|
| | | return createnote; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建说明 createnote **/ |
|---|
| | | public void setCreatenote(String createnote) { |
|---|
| | | this.createnote = createnote == null ? null : createnote.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 整改时间 rectifytime **/ |
|---|
| | | public Date getRectifytime() { |
|---|
| | | return rectifytime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 整改时间 rectifytime **/ |
|---|
| | | public void setRectifytime(Date rectifytime) { |
|---|
| | | this.rectifytime = rectifytime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 整改说明 rectifynote **/ |
|---|
| | | public String getRectifynote() { |
|---|
| | | return rectifynote; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 整改说明 rectifynote **/ |
|---|
| | | public void setRectifynote(String rectifynote) { |
|---|
| | | this.rectifynote = rectifynote == null ? null : rectifynote.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | public Boolean getValidflag() { |
|---|
| | | return validflag; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setValidflag(Boolean validflag) { |
|---|
| | | this.validflag = validflag; |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | public Integer getCountNum() { |
|---|
| | | return countNum; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setCountNum(Integer countNum) { |
|---|
| | | this.countNum = countNum; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getConstructionunit() { |
|---|
| | | return constructionunit; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setConstructionunit(String constructionunit) { |
|---|
| | | this.constructionunit = constructionunit; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getRectifymeasure() { |
|---|
| | | return rectifymeasure; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setRectifymeasure(String rectifymeasure) { |
|---|
| | | this.rectifymeasure = rectifymeasure; |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | public String getRectifier() { |
|---|
| | | return rectifier; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setRectifier(String rectifier) { |
|---|
| | | this.rectifier = rectifier; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Date getRectifydeadline() { |
|---|
| | | return rectifydeadline; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setRectifydeadline(Date rectifydeadline) { |
|---|
| | | this.rectifydeadline = rectifydeadline; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Long getRectifierid() { |
|---|
| | | return rectifierid; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setRectifierid(Long rectifierid) { |
|---|
| | | this.rectifierid = rectifierid; |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | public Date getAccepttime() { |
|---|
| | | return accepttime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setAccepttime(Date accepttime) { |
|---|
| | | this.accepttime = accepttime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Date getRejecttime() { |
|---|
| | | return rejecttime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setRejecttime(Date rejecttime) { |
|---|
| | | this.rejecttime = rejecttime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getRejectnote() { |
|---|
| | | return rejectnote; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setRejectnote(String rejectnote) { |
|---|
| | | this.rejectnote = rejectnote; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getAcceptnote() { |
|---|
| | | return acceptnote; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setAcceptnote(String acceptnote) { |
|---|
| | | this.acceptnote = acceptnote; |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | public String getCode() { |
|---|
| | | return code; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setCode(String code) { |
|---|
| | | this.code = code; |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | public Integer getSource() { |
|---|
| | | return source; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setSource(Integer source) { |
|---|
| | | this.source = source; |
|---|
| | | } |
|---|
| | | } |
|---|
| | | |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.annotation.IdType; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableId; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableName; |
|---|
| | | import com.gk.hotwork.Domain.Enum.SourceType; |
|---|
| | | |
|---|
| | | import java.io.Serializable; |
|---|
| | | import java.util.Date; |
|---|
| | | |
|---|
| | | @TableName("hiddendangerLog") |
|---|
| | | public class HiddenDangerLog implements Serializable { |
|---|
| | | /** 主键id id **/ |
|---|
| | | @TableId(type = IdType.AUTO) |
|---|
| | | private Long id; |
|---|
| | | |
|---|
| | | /** 操作人 operator **/ |
|---|
| | | private String operator; |
|---|
| | | |
|---|
| | | /** 操作人id operatorid **/ |
|---|
| | | private Long operatorid; |
|---|
| | | |
|---|
| | | /** 操作 operation **/ |
|---|
| | | private String operation; |
|---|
| | | |
|---|
| | | /** 操作时间 operationtime **/ |
|---|
| | | private Date operationtime; |
|---|
| | | |
|---|
| | | /** 内容 detail **/ |
|---|
| | | private String detail; |
|---|
| | | |
|---|
| | | /** 内容 detail **/ |
|---|
| | | private SourceType source; |
|---|
| | | |
|---|
| | | /** 额外 extra **/ |
|---|
| | | private String extra; |
|---|
| | | |
|---|
| | | /** 有效表示 validflag **/ |
|---|
| | | private Boolean validflag; |
|---|
| | | |
|---|
| | | /** 主键id id **/ |
|---|
| | | public Long getId() { |
|---|
| | | return id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 主键id id **/ |
|---|
| | | public void setId(Long id) { |
|---|
| | | this.id = id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 操作人 operator **/ |
|---|
| | | public String getOperator() { |
|---|
| | | return operator; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 操作人 operator **/ |
|---|
| | | public void setOperator(String operator) { |
|---|
| | | this.operator = operator == null ? null : operator.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 操作人id operatorid **/ |
|---|
| | | public Long getOperatorid() { |
|---|
| | | return operatorid; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 操作人id operatorid **/ |
|---|
| | | public void setOperatorid(Long operatorid) { |
|---|
| | | this.operatorid = operatorid; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 操作 operation **/ |
|---|
| | | public String getOperation() { |
|---|
| | | return operation; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 操作 operation **/ |
|---|
| | | public void setOperation(String operation) { |
|---|
| | | this.operation = operation == null ? null : operation.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 操作时间 operationtime **/ |
|---|
| | | public Date getOperationtime() { |
|---|
| | | return operationtime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 操作时间 operationtime **/ |
|---|
| | | public void setOperationtime(Date operationtime) { |
|---|
| | | this.operationtime = operationtime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 内容 detail **/ |
|---|
| | | public String getDetail() { |
|---|
| | | return detail; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 内容 detail **/ |
|---|
| | | public void setDetail(String detail) { |
|---|
| | | this.detail = detail == null ? null : detail.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 额外 extra **/ |
|---|
| | | public String getExtra() { |
|---|
| | | return extra; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 额外 extra **/ |
|---|
| | | public void setExtra(String extra) { |
|---|
| | | this.extra = extra == null ? null : extra.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 有效表示 validflag **/ |
|---|
| | | public Boolean getValidflag() { |
|---|
| | | return validflag; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 有效表示 validflag **/ |
|---|
| | | public void setValidflag(Boolean validflag) { |
|---|
| | | this.validflag = validflag; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public SourceType getSource() { |
|---|
| | | return source; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setSource(SourceType source) { |
|---|
| | | this.source = source; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.annotation.IdType; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableField; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableId; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableName; |
|---|
| | | import com.gk.hotwork.Domain.Enum.HiddenDangerApplyOperation; |
|---|
| | | import com.gk.hotwork.Domain.Enum.SourceType; |
|---|
| | | |
|---|
| | | import java.io.Serializable; |
|---|
| | | import java.util.Date; |
|---|
| | | |
|---|
| | | @TableName("hiddendangerresource") |
|---|
| | | public class HiddenDangerResource implements Serializable { |
|---|
| | | |
|---|
| | | @TableField(exist = false) |
|---|
| | | private static final long serialVersionUID = 1L; |
|---|
| | | |
|---|
| | | /** 主键id id **/ |
|---|
| | | @TableId(type = IdType.AUTO) |
|---|
| | | private Long id; |
|---|
| | | |
|---|
| | | /** 操作(上传隐患、上传整改) operation **/ |
|---|
| | | private HiddenDangerApplyOperation operation; |
|---|
| | | |
|---|
| | | /** 所属隐患id belongid **/ |
|---|
| | | private Long belongid; |
|---|
| | | |
|---|
| | | /** 源文件名 originalfilename **/ |
|---|
| | | private String originalfilename; |
|---|
| | | |
|---|
| | | /** 文件名 filename **/ |
|---|
| | | private String filename; |
|---|
| | | |
|---|
| | | /** 文件类型 type **/ |
|---|
| | | private String type; |
|---|
| | | |
|---|
| | | /** 相对路径地址 url **/ |
|---|
| | | private String url; |
|---|
| | | |
|---|
| | | /** 创建时间 createtime **/ |
|---|
| | | private Date createtime; |
|---|
| | | |
|---|
| | | /** 有效标识 validflag **/ |
|---|
| | | private Boolean validflag; |
|---|
| | | |
|---|
| | | /** 排序 order **/ |
|---|
| | | private Integer sort; |
|---|
| | | |
|---|
| | | private SourceType source; |
|---|
| | | |
|---|
| | | /** 主键id id **/ |
|---|
| | | public Long getId() { |
|---|
| | | return id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 主键id id **/ |
|---|
| | | public void setId(Long id) { |
|---|
| | | this.id = id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public HiddenDangerApplyOperation getOperation() { |
|---|
| | | return operation; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setOperation(HiddenDangerApplyOperation operation) { |
|---|
| | | this.operation = operation; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 所属隐患id belongid **/ |
|---|
| | | public Long getBelongid() { |
|---|
| | | return belongid; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 所属隐患id belongid **/ |
|---|
| | | public void setBelongid(Long belongid) { |
|---|
| | | this.belongid = belongid; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 源文件名 originalfilename **/ |
|---|
| | | public String getOriginalfilename() { |
|---|
| | | return originalfilename; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 源文件名 originalfilename **/ |
|---|
| | | public void setOriginalfilename(String originalfilename) { |
|---|
| | | this.originalfilename = originalfilename == null ? null : originalfilename.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 文件名 filename **/ |
|---|
| | | public String getFilename() { |
|---|
| | | return filename; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 文件名 filename **/ |
|---|
| | | public void setFilename(String filename) { |
|---|
| | | this.filename = filename == null ? null : filename.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 文件类型 type **/ |
|---|
| | | public String getType() { |
|---|
| | | return type; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 文件类型 type **/ |
|---|
| | | public void setType(String type) { |
|---|
| | | this.type = type == null ? null : type.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 相对路径地址 url **/ |
|---|
| | | public String getUrl() { |
|---|
| | | return url; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 相对路径地址 url **/ |
|---|
| | | public void setUrl(String url) { |
|---|
| | | this.url = url == null ? null : url.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建时间 createtime **/ |
|---|
| | | public Date getCreatetime() { |
|---|
| | | return createtime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建时间 createtime **/ |
|---|
| | | public void setCreatetime(Date createtime) { |
|---|
| | | this.createtime = createtime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Boolean getValidflag() { |
|---|
| | | return validflag; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setValidflag(Boolean validflag) { |
|---|
| | | this.validflag = validflag; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Integer getSort() { |
|---|
| | | return sort; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setSort(Integer sort) { |
|---|
| | | this.sort = sort; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public SourceType getSource() { |
|---|
| | | return source; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setSource(SourceType source) { |
|---|
| | | this.source = source; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.annotation.IdType; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableField; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableId; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableName; |
|---|
| | | |
|---|
| | | import java.io.Serializable; |
|---|
| | | import java.util.Date; |
|---|
| | | |
|---|
| | | @TableName("involvedep") |
|---|
| | | public class InvolveDepInfo implements Serializable { |
|---|
| | | @TableField(exist = false) |
|---|
| | | private static final long serialVersionUID = 1L; |
|---|
| | | |
|---|
| | | @TableId(type = IdType.AUTO) |
|---|
| | | private Long id; |
|---|
| | | |
|---|
| | | /** department **/ |
|---|
| | | private String department; |
|---|
| | | |
|---|
| | | /** 更新人 lastmodifiedby **/ |
|---|
| | | private String lastmodifiedby; |
|---|
| | | |
|---|
| | | /** 更新时间 lastmodifieddate **/ |
|---|
| | | private Date lastmodifieddate; |
|---|
| | | |
|---|
| | | /** id id **/ |
|---|
| | | public Long getId() { |
|---|
| | | return id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** id id **/ |
|---|
| | | public void setId(Long id) { |
|---|
| | | this.id = id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** department **/ |
|---|
| | | public String getDepartment() { |
|---|
| | | return department; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** department **/ |
|---|
| | | public void setDepartment(String department) { |
|---|
| | | this.department = department == null ? null : department.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 更新人 lastmodifiedby **/ |
|---|
| | | public String getLastmodifiedby() { |
|---|
| | | return lastmodifiedby; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 更新人 lastmodifiedby **/ |
|---|
| | | public void setLastmodifiedby(String lastmodifiedby) { |
|---|
| | | this.lastmodifiedby = lastmodifiedby == null ? null : lastmodifiedby.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 更新时间 lastmodifieddate **/ |
|---|
| | | public Date getLastmodifieddate() { |
|---|
| | | return lastmodifieddate; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 更新时间 lastmodifieddate **/ |
|---|
| | | public void setLastmodifieddate(Date lastmodifieddate) { |
|---|
| | | this.lastmodifieddate = lastmodifieddate; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain.Log; |
|---|
| | | |
|---|
| | | import com.gk.hotwork.Domain.Enum.SourceType; |
|---|
| | | |
|---|
| | | import java.lang.annotation.ElementType; |
|---|
| | | import java.lang.annotation.Retention; |
|---|
| | | import java.lang.annotation.RetentionPolicy; |
|---|
| | | import java.lang.annotation.Target; |
|---|
| | | |
|---|
| | | @Target(ElementType.METHOD) |
|---|
| | | @Retention(RetentionPolicy.RUNTIME) |
|---|
| | | public @interface HiddenDangerLogAnno { |
|---|
| | | |
|---|
| | | String operation() default ""; |
|---|
| | | String detail() default ""; |
|---|
| | | SourceType source() default SourceType.WEB; |
|---|
| | | |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.annotation.IdType; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableField; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableId; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableName; |
|---|
| | | |
|---|
| | | import java.io.Serializable; |
|---|
| | | import java.util.Date; |
|---|
| | | |
|---|
| | | @TableName("major_equipment") |
|---|
| | | public class MajorEquipment implements Serializable { |
|---|
| | | |
|---|
| | | private final static long serialVersionUID = 1L; |
|---|
| | | |
|---|
| | | /** 设备区域 area_id **/ |
|---|
| | | private Integer areaId; |
|---|
| | | |
|---|
| | | /** 设备区域名称 **/ |
|---|
| | | @TableField(exist = false) |
|---|
| | | private String areaName; |
|---|
| | | |
|---|
| | | /** 设备编号 serial_number **/ |
|---|
| | | private String serialNumber; |
|---|
| | | |
|---|
| | | /** 设备名称 name **/ |
|---|
| | | private String name; |
|---|
| | | |
|---|
| | | /** 状态 status 0:在用 1:停用**/ |
|---|
| | | private Integer status; |
|---|
| | | |
|---|
| | | /** 容积 volume **/ |
|---|
| | | private Float volume; |
|---|
| | | |
|---|
| | | /** 负责人 user_id **/ |
|---|
| | | private Long userId; |
|---|
| | | |
|---|
| | | /** 负责人名称 **/ |
|---|
| | | @TableField(exist = false) |
|---|
| | | private String userName; |
|---|
| | | |
|---|
| | | /** 主键id id **/ |
|---|
| | | @TableId(type = IdType.AUTO) |
|---|
| | | private Long id; |
|---|
| | | |
|---|
| | | /** 有效标识 valid_flag **/ |
|---|
| | | private Boolean validFlag; |
|---|
| | | |
|---|
| | | /** 创建时间 create_time **/ |
|---|
| | | private Date createTime; |
|---|
| | | |
|---|
| | | /** 创建人 create_by **/ |
|---|
| | | private String createBy; |
|---|
| | | |
|---|
| | | /** 最新更新时间 update_time **/ |
|---|
| | | private Date updateTime; |
|---|
| | | |
|---|
| | | /** 最后更新人 update_by **/ |
|---|
| | | private String updateBy; |
|---|
| | | |
|---|
| | | |
|---|
| | | /** 主键id id **/ |
|---|
| | | public Long getId() { |
|---|
| | | return id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 主键id id **/ |
|---|
| | | public void setId(Long id) { |
|---|
| | | this.id = id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 有效标识 valid_flag **/ |
|---|
| | | public Boolean getValidFlag() { |
|---|
| | | return validFlag; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 有效标识 valid_flag **/ |
|---|
| | | public void setValidFlag(Boolean validFlag) { |
|---|
| | | this.validFlag = validFlag; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建时间 create_time **/ |
|---|
| | | public Date getCreateTime() { |
|---|
| | | return createTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建时间 create_time **/ |
|---|
| | | public void setCreateTime(Date createTime) { |
|---|
| | | this.createTime = createTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建人 create_by **/ |
|---|
| | | public String getCreateBy() { |
|---|
| | | return createBy; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建人 create_by **/ |
|---|
| | | public void setCreateBy(String createBy) { |
|---|
| | | this.createBy = createBy == null ? null : createBy.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最新更新时间 update_time **/ |
|---|
| | | public Date getUpdateTime() { |
|---|
| | | return updateTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最新更新时间 update_time **/ |
|---|
| | | public void setUpdateTime(Date updateTime) { |
|---|
| | | this.updateTime = updateTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最后更新人 update_by **/ |
|---|
| | | public String getUpdateBy() { |
|---|
| | | return updateBy; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最后更新人 update_by **/ |
|---|
| | | public void setUpdateBy(String updateBy) { |
|---|
| | | this.updateBy = updateBy == null ? null : updateBy.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | public String getName() { |
|---|
| | | return name; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setName(String name) { |
|---|
| | | this.name = name; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getSerialNumber() { |
|---|
| | | return serialNumber; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setSerialNumber(String serialNumber) { |
|---|
| | | this.serialNumber = serialNumber; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Integer getStatus() { |
|---|
| | | return status; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setStatus(Integer status) { |
|---|
| | | this.status = status; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Float getVolume() { |
|---|
| | | return volume; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setVolume(Float volume) { |
|---|
| | | this.volume = volume; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Long getUserId() { |
|---|
| | | return userId; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setUserId(Long userId) { |
|---|
| | | this.userId = userId; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getUserName() { |
|---|
| | | return userName; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setUserName(String userName) { |
|---|
| | | this.userName = userName; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Integer getAreaId() { |
|---|
| | | return areaId; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setAreaId(Integer areaId) { |
|---|
| | | this.areaId = areaId; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getAreaName() { |
|---|
| | | return areaName; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setAreaName(String areaName) { |
|---|
| | | this.areaName = areaName; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.annotation.IdType; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableField; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableId; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableName; |
|---|
| | | import com.fasterxml.jackson.annotation.JsonFormat; |
|---|
| | | |
|---|
| | | import java.io.Serializable; |
|---|
| | | import java.util.Date; |
|---|
| | | |
|---|
| | | @TableName("major_equipment_alarm") |
|---|
| | | public class MajorEquipmentAlarm implements Serializable { |
|---|
| | | |
|---|
| | | private final static long serialVersionUID = 1L; |
|---|
| | | |
|---|
| | | /** 设备id equipment_id **/ |
|---|
| | | private Long equipmentId; |
|---|
| | | |
|---|
| | | /** 设备名称 **/ |
|---|
| | | @TableField(exist = false) |
|---|
| | | private String equipmentName; |
|---|
| | | |
|---|
| | | /** 设备编号 **/ |
|---|
| | | @TableField(exist = false) |
|---|
| | | private String equipmentSerialNumber; |
|---|
| | | |
|---|
| | | /** 状态 status 0：未处理 1：已处理**/ |
|---|
| | | private Integer status; |
|---|
| | | |
|---|
| | | /** 报警时间 alarm_time **/ |
|---|
| | | @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") |
|---|
| | | private Date alarmTime; |
|---|
| | | |
|---|
| | | /** 报警信息 alarm_info **/ |
|---|
| | | private String alarmInfo; |
|---|
| | | |
|---|
| | | /** 备注 remark **/ |
|---|
| | | private String remark; |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | /** 主键id id **/ |
|---|
| | | @TableId(type = IdType.AUTO) |
|---|
| | | private Long id; |
|---|
| | | |
|---|
| | | /** 有效标识 valid_flag **/ |
|---|
| | | private Boolean validFlag; |
|---|
| | | |
|---|
| | | /** 创建时间 create_time **/ |
|---|
| | | private Date createTime; |
|---|
| | | |
|---|
| | | /** 创建人 create_by **/ |
|---|
| | | private String createBy; |
|---|
| | | |
|---|
| | | /** 最新更新时间 update_time **/ |
|---|
| | | private Date updateTime; |
|---|
| | | |
|---|
| | | /** 最后更新人 update_by **/ |
|---|
| | | private String updateBy; |
|---|
| | | |
|---|
| | | |
|---|
| | | /** 主键id id **/ |
|---|
| | | public Long getId() { |
|---|
| | | return id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 主键id id **/ |
|---|
| | | public void setId(Long id) { |
|---|
| | | this.id = id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 有效标识 valid_flag **/ |
|---|
| | | public Boolean getValidFlag() { |
|---|
| | | return validFlag; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 有效标识 valid_flag **/ |
|---|
| | | public void setValidFlag(Boolean validFlag) { |
|---|
| | | this.validFlag = validFlag; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建时间 create_time **/ |
|---|
| | | public Date getCreateTime() { |
|---|
| | | return createTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建时间 create_time **/ |
|---|
| | | public void setCreateTime(Date createTime) { |
|---|
| | | this.createTime = createTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建人 create_by **/ |
|---|
| | | public String getCreateBy() { |
|---|
| | | return createBy; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建人 create_by **/ |
|---|
| | | public void setCreateBy(String createBy) { |
|---|
| | | this.createBy = createBy == null ? null : createBy.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最新更新时间 update_time **/ |
|---|
| | | public Date getUpdateTime() { |
|---|
| | | return updateTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最新更新时间 update_time **/ |
|---|
| | | public void setUpdateTime(Date updateTime) { |
|---|
| | | this.updateTime = updateTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最后更新人 update_by **/ |
|---|
| | | public String getUpdateBy() { |
|---|
| | | return updateBy; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最后更新人 update_by **/ |
|---|
| | | public void setUpdateBy(String updateBy) { |
|---|
| | | this.updateBy = updateBy == null ? null : updateBy.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | public Long getEquipmentId() { |
|---|
| | | return equipmentId; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setEquipmentId(Long equipmentId) { |
|---|
| | | this.equipmentId = equipmentId; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Integer getStatus() { |
|---|
| | | return status; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setStatus(Integer status) { |
|---|
| | | this.status = status; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Date getAlarmTime() { |
|---|
| | | return alarmTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setAlarmTime(Date alarmTime) { |
|---|
| | | this.alarmTime = alarmTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getAlarmInfo() { |
|---|
| | | return alarmInfo; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setAlarmInfo(String alarmInfo) { |
|---|
| | | this.alarmInfo = alarmInfo; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getRemark() { |
|---|
| | | return remark; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setRemark(String remark) { |
|---|
| | | this.remark = remark; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getEquipmentName() { |
|---|
| | | return equipmentName; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setEquipmentName(String equipmentName) { |
|---|
| | | this.equipmentName = equipmentName; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getEquipmentSerialNumber() { |
|---|
| | | return equipmentSerialNumber; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setEquipmentSerialNumber(String equipmentSerialNumber) { |
|---|
| | | this.equipmentSerialNumber = equipmentSerialNumber; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.annotation.IdType; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableField; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableId; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableName; |
|---|
| | | import com.fasterxml.jackson.annotation.JsonFormat; |
|---|
| | | |
|---|
| | | import java.io.Serializable; |
|---|
| | | import java.util.Date; |
|---|
| | | |
|---|
| | | @TableName("major_equipment_data") |
|---|
| | | public class MajorEquipmentData implements Serializable { |
|---|
| | | |
|---|
| | | private final static long serialVersionUID = 1L; |
|---|
| | | |
|---|
| | | /** 设备id equipment_id **/ |
|---|
| | | private Long equipmentId; |
|---|
| | | |
|---|
| | | /** 监测时间 monitoring_time **/ |
|---|
| | | @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") |
|---|
| | | private Date monitoringTime; |
|---|
| | | |
|---|
| | | /** 设备名称 **/ |
|---|
| | | @TableField(exist = false) |
|---|
| | | private String equipmentName; |
|---|
| | | |
|---|
| | | /** 设备编号 **/ |
|---|
| | | @TableField(exist = false) |
|---|
| | | private String equipmentSerialNumber; |
|---|
| | | |
|---|
| | | /** 导入excel的序号 **/ |
|---|
| | | @TableField(exist = false) |
|---|
| | | private String index; |
|---|
| | | |
|---|
| | | /** 仪表量程下限 range_lower_limit **/ |
|---|
| | | private Float rangeLowerLimit; |
|---|
| | | |
|---|
| | | /** 仪表量程上限 range_upper_limit **/ |
|---|
| | | private Float rangeUpperLimit; |
|---|
| | | |
|---|
| | | /** 高高液位报警值 high_high_liquid_alarm **/ |
|---|
| | | private Float highHighLiquidAlarm; |
|---|
| | | |
|---|
| | | /** 高液位报警值 high_liquid_alarm **/ |
|---|
| | | private Float highLiquidAlarm; |
|---|
| | | |
|---|
| | | /** 低液位报警值 low_liquid_alarm**/ |
|---|
| | | private Float lowLiquidAlarm; |
|---|
| | | |
|---|
| | | /** 低低液位报警值 low_low_liquid_alarm**/ |
|---|
| | | private Float lowLowLiquidAlarm; |
|---|
| | | |
|---|
| | | |
|---|
| | | /** 主键id id **/ |
|---|
| | | @TableId(type = IdType.AUTO) |
|---|
| | | private Long id; |
|---|
| | | |
|---|
| | | /** 有效标识 valid_flag **/ |
|---|
| | | private Boolean validFlag; |
|---|
| | | |
|---|
| | | /** 创建时间 create_time **/ |
|---|
| | | private Date createTime; |
|---|
| | | |
|---|
| | | /** 创建人 create_by **/ |
|---|
| | | private String createBy; |
|---|
| | | |
|---|
| | | /** 最新更新时间 update_time **/ |
|---|
| | | private Date updateTime; |
|---|
| | | |
|---|
| | | /** 最后更新人 update_by **/ |
|---|
| | | private String updateBy; |
|---|
| | | |
|---|
| | | |
|---|
| | | /** 主键id id **/ |
|---|
| | | public Long getId() { |
|---|
| | | return id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 主键id id **/ |
|---|
| | | public void setId(Long id) { |
|---|
| | | this.id = id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 有效标识 valid_flag **/ |
|---|
| | | public Boolean getValidFlag() { |
|---|
| | | return validFlag; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 有效标识 valid_flag **/ |
|---|
| | | public void setValidFlag(Boolean validFlag) { |
|---|
| | | this.validFlag = validFlag; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建时间 create_time **/ |
|---|
| | | public Date getCreateTime() { |
|---|
| | | return createTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建时间 create_time **/ |
|---|
| | | public void setCreateTime(Date createTime) { |
|---|
| | | this.createTime = createTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建人 create_by **/ |
|---|
| | | public String getCreateBy() { |
|---|
| | | return createBy; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建人 create_by **/ |
|---|
| | | public void setCreateBy(String createBy) { |
|---|
| | | this.createBy = createBy == null ? null : createBy.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最新更新时间 update_time **/ |
|---|
| | | public Date getUpdateTime() { |
|---|
| | | return updateTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最新更新时间 update_time **/ |
|---|
| | | public void setUpdateTime(Date updateTime) { |
|---|
| | | this.updateTime = updateTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最后更新人 update_by **/ |
|---|
| | | public String getUpdateBy() { |
|---|
| | | return updateBy; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最后更新人 update_by **/ |
|---|
| | | public void setUpdateBy(String updateBy) { |
|---|
| | | this.updateBy = updateBy == null ? null : updateBy.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | public Long getEquipmentId() { |
|---|
| | | return equipmentId; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setEquipmentId(Long equipmentId) { |
|---|
| | | this.equipmentId = equipmentId; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Float getRangeLowerLimit() { |
|---|
| | | return rangeLowerLimit; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setRangeLowerLimit(Float rangeLowerLimit) { |
|---|
| | | this.rangeLowerLimit = rangeLowerLimit; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Float getRangeUpperLimit() { |
|---|
| | | return rangeUpperLimit; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setRangeUpperLimit(Float rangeUpperLimit) { |
|---|
| | | this.rangeUpperLimit = rangeUpperLimit; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Float getHighHighLiquidAlarm() { |
|---|
| | | return highHighLiquidAlarm; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setHighHighLiquidAlarm(Float highHighLiquidAlarm) { |
|---|
| | | this.highHighLiquidAlarm = highHighLiquidAlarm; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Float getHighLiquidAlarm() { |
|---|
| | | return highLiquidAlarm; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setHighLiquidAlarm(Float highLiquidAlarm) { |
|---|
| | | this.highLiquidAlarm = highLiquidAlarm; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Float getLowLiquidAlarm() { |
|---|
| | | return lowLiquidAlarm; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setLowLiquidAlarm(Float lowLiquidAlarm) { |
|---|
| | | this.lowLiquidAlarm = lowLiquidAlarm; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Float getLowLowLiquidAlarm() { |
|---|
| | | return lowLowLiquidAlarm; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setLowLowLiquidAlarm(Float lowLowLiquidAlarm) { |
|---|
| | | this.lowLowLiquidAlarm = lowLowLiquidAlarm; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getEquipmentName() { |
|---|
| | | return equipmentName; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setEquipmentName(String equipmentName) { |
|---|
| | | this.equipmentName = equipmentName; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getEquipmentSerialNumber() { |
|---|
| | | return equipmentSerialNumber; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setEquipmentSerialNumber(String equipmentSerialNumber) { |
|---|
| | | this.equipmentSerialNumber = equipmentSerialNumber; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Date getMonitoringTime() { |
|---|
| | | return monitoringTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setMonitoringTime(Date monitoringTime) { |
|---|
| | | this.monitoringTime = monitoringTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getIndex() { |
|---|
| | | return index; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setIndex(String index) { |
|---|
| | | this.index = index; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.annotation.IdType; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableField; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableId; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableName; |
|---|
| | | |
|---|
| | | import java.io.Serializable; |
|---|
| | | import java.util.Date; |
|---|
| | | |
|---|
| | | @TableName("permission") |
|---|
| | | public class PermissionInfo implements Serializable { |
|---|
| | | @TableField(exist = false) |
|---|
| | | private static final long serialVersionUID = 1L; |
|---|
| | | |
|---|
| | | @TableId(type = IdType.AUTO) |
|---|
| | | private Integer id; |
|---|
| | | |
|---|
| | | /** 名称 name **/ |
|---|
| | | private String name; |
|---|
| | | |
|---|
| | | /** 菜单层级 level **/ |
|---|
| | | private Integer level; |
|---|
| | | |
|---|
| | | /** 菜单标题 title **/ |
|---|
| | | private String title; |
|---|
| | | |
|---|
| | | /** 页面路径/资源链接url path **/ |
|---|
| | | private String path; |
|---|
| | | |
|---|
| | | /** 前端组件 component **/ |
|---|
| | | private String component; |
|---|
| | | |
|---|
| | | /** 图标 icon **/ |
|---|
| | | private String icon; |
|---|
| | | |
|---|
| | | /** 按钮权限类型 buttonType **/ |
|---|
| | | private String buttontype; |
|---|
| | | |
|---|
| | | /** 状态 status 是否启用 1启用 -1禁用**/ |
|---|
| | | private Integer status; |
|---|
| | | |
|---|
| | | /** 描述 description **/ |
|---|
| | | private String description; |
|---|
| | | |
|---|
| | | /** 排序 sortOrder **/ |
|---|
| | | private Double sortorder; |
|---|
| | | |
|---|
| | | /** 类型 type 1菜单 2按钮 3功能 4数据权限 **/ |
|---|
| | | private Integer type; |
|---|
| | | |
|---|
| | | /** 拓展 节点展开 前端所需 expand **/ |
|---|
| | | private Boolean expand; |
|---|
| | | |
|---|
| | | /** 是否勾选 前端所需 checked **/ |
|---|
| | | private Boolean checked; |
|---|
| | | |
|---|
| | | /** 是否选中 前端所需 selected **/ |
|---|
| | | private Boolean selected; |
|---|
| | | |
|---|
| | | /** 创建人 createdBy **/ |
|---|
| | | private String createdby; |
|---|
| | | |
|---|
| | | /** 创建时间 createdDate **/ |
|---|
| | | private Date createddate; |
|---|
| | | |
|---|
| | | /** 更新人 lastModifiedBy **/ |
|---|
| | | private String lastmodifiedby; |
|---|
| | | |
|---|
| | | /** 更新时间 lastModifiedDate **/ |
|---|
| | | private Date lastmodifieddate; |
|---|
| | | |
|---|
| | | /** 父id parentid **/ |
|---|
| | | private Integer parentid; |
|---|
| | | |
|---|
| | | /** id id **/ |
|---|
| | | public Integer getId() { |
|---|
| | | return id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** id id **/ |
|---|
| | | public void setId(Integer id) { |
|---|
| | | this.id = id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 名称 name **/ |
|---|
| | | public String getName() { |
|---|
| | | return name; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 名称 name **/ |
|---|
| | | public void setName(String name) { |
|---|
| | | this.name = name == null ? null : name.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 级别 level **/ |
|---|
| | | public Integer getLevel() { |
|---|
| | | return level; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 级别 level **/ |
|---|
| | | public void setLevel(Integer level) { |
|---|
| | | this.level = level; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 名称 title **/ |
|---|
| | | public String getTitle() { |
|---|
| | | return title; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 名称 title **/ |
|---|
| | | public void setTitle(String title) { |
|---|
| | | this.title = title == null ? null : title.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 路径 path **/ |
|---|
| | | public String getPath() { |
|---|
| | | return path; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 路径 path **/ |
|---|
| | | public void setPath(String path) { |
|---|
| | | this.path = path == null ? null : path.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 接口路径 component **/ |
|---|
| | | public String getComponent() { |
|---|
| | | return component; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 接口路径 component **/ |
|---|
| | | public void setComponent(String component) { |
|---|
| | | this.component = component == null ? null : component.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 图标 icon **/ |
|---|
| | | public String getIcon() { |
|---|
| | | return icon; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 图标 icon **/ |
|---|
| | | public void setIcon(String icon) { |
|---|
| | | this.icon = icon == null ? null : icon.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 按钮类型 buttonType **/ |
|---|
| | | public String getButtontype() { |
|---|
| | | return buttontype; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 按钮类型 buttonType **/ |
|---|
| | | public void setButtontype(String buttontype) { |
|---|
| | | this.buttontype = buttontype == null ? null : buttontype.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 状态 status **/ |
|---|
| | | public Integer getStatus() { |
|---|
| | | return status; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 状态 status **/ |
|---|
| | | public void setStatus(Integer status) { |
|---|
| | | this.status = status; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 描述 description **/ |
|---|
| | | public String getDescription() { |
|---|
| | | return description; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 描述 description **/ |
|---|
| | | public void setDescription(String description) { |
|---|
| | | this.description = description == null ? null : description.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 排序 sortOrder **/ |
|---|
| | | public Double getSortorder() { |
|---|
| | | return sortorder; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 排序 sortOrder **/ |
|---|
| | | public void setSortorder(Double sortorder) { |
|---|
| | | this.sortorder = sortorder; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 类型 type **/ |
|---|
| | | public Integer getType() { |
|---|
| | | return type; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 类型 type **/ |
|---|
| | | public void setType(Integer type) { |
|---|
| | | this.type = type; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 拓展 expand **/ |
|---|
| | | public Boolean getExpand() { |
|---|
| | | return expand; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 拓展 expand **/ |
|---|
| | | public void setExpand(Boolean expand) { |
|---|
| | | this.expand = expand; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 是否检查 checked **/ |
|---|
| | | public Boolean getChecked() { |
|---|
| | | return checked; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 是否检查 checked **/ |
|---|
| | | public void setChecked(Boolean checked) { |
|---|
| | | this.checked = checked; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 是否选中 selected **/ |
|---|
| | | public Boolean getSelected() { |
|---|
| | | return selected; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 是否选中 selected **/ |
|---|
| | | public void setSelected(Boolean selected) { |
|---|
| | | this.selected = selected; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建人 createdBy **/ |
|---|
| | | public String getCreatedby() { |
|---|
| | | return createdby; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建人 createdBy **/ |
|---|
| | | public void setCreatedby(String createdby) { |
|---|
| | | this.createdby = createdby == null ? null : createdby.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建时间 createdDate **/ |
|---|
| | | public Date getCreateddate() { |
|---|
| | | return createddate; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建时间 createdDate **/ |
|---|
| | | public void setCreateddate(Date createddate) { |
|---|
| | | this.createddate = createddate; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 更新人 lastModifiedBy **/ |
|---|
| | | public String getLastmodifiedby() { |
|---|
| | | return lastmodifiedby; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 更新人 lastModifiedBy **/ |
|---|
| | | public void setLastmodifiedby(String lastmodifiedby) { |
|---|
| | | this.lastmodifiedby = lastmodifiedby == null ? null : lastmodifiedby.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 更新时间 lastModifiedDate **/ |
|---|
| | | public Date getLastmodifieddate() { |
|---|
| | | return lastmodifieddate; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 更新时间 lastModifiedDate **/ |
|---|
| | | public void setLastmodifieddate(Date lastmodifieddate) { |
|---|
| | | this.lastmodifieddate = lastmodifieddate; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Integer getParentid() { |
|---|
| | | return parentid; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setParentid(Integer parentid) { |
|---|
| | | this.parentid = parentid; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.annotation.IdType; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableId; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableName; |
|---|
| | | import com.fasterxml.jackson.annotation.JsonFormat; |
|---|
| | | |
|---|
| | | import java.io.Serializable; |
|---|
| | | import java.util.Date; |
|---|
| | | |
|---|
| | | @TableName("reserve") |
|---|
| | | public class Reserve implements Serializable { |
|---|
| | | |
|---|
| | | private static final long serialVersionUID = 1L; |
|---|
| | | |
|---|
| | | @TableId(type = IdType.AUTO) |
|---|
| | | /** 主键id id **/ |
|---|
| | | private Long id; |
|---|
| | | |
|---|
| | | /** 受限空间 space **/ |
|---|
| | | private Integer space; |
|---|
| | | |
|---|
| | | /** 吊装作业 hoisting **/ |
|---|
| | | private Integer hoisting; |
|---|
| | | |
|---|
| | | /** 动土作业 soild **/ |
|---|
| | | private Integer soild; |
|---|
| | | |
|---|
| | | /** 断路 break **/ |
|---|
| | | private Integer breaks; |
|---|
| | | |
|---|
| | | /** 高处作业 high **/ |
|---|
| | | private Integer high; |
|---|
| | | |
|---|
| | | /** 临时用电 electricity **/ |
|---|
| | | private Integer electricity; |
|---|
| | | |
|---|
| | | /** 盲板 blindboard **/ |
|---|
| | | private Integer blindboard; |
|---|
| | | |
|---|
| | | /** 动火方式 fire **/ |
|---|
| | | private Integer fire; |
|---|
| | | |
|---|
| | | /** 预约时间 appointment **/ |
|---|
| | | @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd") |
|---|
| | | private Date appointment; |
|---|
| | | |
|---|
| | | /** 创建时间 createtime **/ |
|---|
| | | private Date createtime; |
|---|
| | | |
|---|
| | | /** 更新时间 updatetime **/ |
|---|
| | | private Date updatetime; |
|---|
| | | |
|---|
| | | /** 有效标识 validflag **/ |
|---|
| | | private Boolean validflag; |
|---|
| | | |
|---|
| | | /** 创建人id createby **/ |
|---|
| | | private Long createby; |
|---|
| | | |
|---|
| | | /** 创建人name createbyname **/ |
|---|
| | | private String createbyname; |
|---|
| | | |
|---|
| | | /** 更新人name updatebyname **/ |
|---|
| | | private String updatebyname; |
|---|
| | | |
|---|
| | | private String createbydepartment; |
|---|
| | | |
|---|
| | | /** 主键id id **/ |
|---|
| | | public Long getId() { |
|---|
| | | return id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 主键id id **/ |
|---|
| | | public void setId(Long id) { |
|---|
| | | this.id = id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 受限空间 space **/ |
|---|
| | | public Integer getSpace() { |
|---|
| | | return space; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 受限空间 space **/ |
|---|
| | | public void setSpace(Integer space) { |
|---|
| | | this.space = space; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 吊装作业 hoisting **/ |
|---|
| | | public Integer getHoisting() { |
|---|
| | | return hoisting; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 吊装作业 hoisting **/ |
|---|
| | | public void setHoisting(Integer hoisting) { |
|---|
| | | this.hoisting = hoisting; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 动土作业 soild **/ |
|---|
| | | public Integer getSoild() { |
|---|
| | | return soild; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 动土作业 soild **/ |
|---|
| | | public void setSoild(Integer soild) { |
|---|
| | | this.soild = soild; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 断路 break **/ |
|---|
| | | public Integer getBreaks() { |
|---|
| | | return breaks; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setBreaks(Integer breaks) { |
|---|
| | | this.breaks = breaks; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 高处作业 high **/ |
|---|
| | | public Integer getHigh() { |
|---|
| | | return high; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 高处作业 high **/ |
|---|
| | | public void setHigh(Integer high) { |
|---|
| | | this.high = high; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 临时用电 electricity **/ |
|---|
| | | public Integer getElectricity() { |
|---|
| | | return electricity; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 临时用电 electricity **/ |
|---|
| | | public void setElectricity(Integer electricity) { |
|---|
| | | this.electricity = electricity; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 盲板 blindboard **/ |
|---|
| | | public Integer getBlindboard() { |
|---|
| | | return blindboard; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 盲板 blindboard **/ |
|---|
| | | public void setBlindboard(Integer blindboard) { |
|---|
| | | this.blindboard = blindboard; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 动火方式 fire **/ |
|---|
| | | public Integer getFire() { |
|---|
| | | return fire; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 动火方式 fire **/ |
|---|
| | | public void setFire(Integer fire) { |
|---|
| | | this.fire = fire; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 预约时间 appointment **/ |
|---|
| | | public Date getAppointment() { |
|---|
| | | return appointment; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 预约时间 appointment **/ |
|---|
| | | public void setAppointment(Date appointment) { |
|---|
| | | this.appointment = appointment; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建时间 createtime **/ |
|---|
| | | public Date getCreatetime() { |
|---|
| | | return createtime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建时间 createtime **/ |
|---|
| | | public void setCreatetime(Date createtime) { |
|---|
| | | this.createtime = createtime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 更新时间 updatetime **/ |
|---|
| | | public Date getUpdatetime() { |
|---|
| | | return updatetime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 更新时间 updatetime **/ |
|---|
| | | public void setUpdatetime(Date updatetime) { |
|---|
| | | this.updatetime = updatetime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 有效标识 validflag **/ |
|---|
| | | public Boolean getValidflag() { |
|---|
| | | return validflag; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 有效标识 validflag **/ |
|---|
| | | public void setValidflag(Boolean validflag) { |
|---|
| | | this.validflag = validflag; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建人id createby **/ |
|---|
| | | public Long getCreateby() { |
|---|
| | | return createby; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建人id createby **/ |
|---|
| | | public void setCreateby(Long createby) { |
|---|
| | | this.createby = createby; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建人name createbyname **/ |
|---|
| | | public String getCreatebyname() { |
|---|
| | | return createbyname; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建人name createbyname **/ |
|---|
| | | public void setCreatebyname(String createbyname) { |
|---|
| | | this.createbyname = createbyname == null ? null : createbyname.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 更新人name updatebyname **/ |
|---|
| | | public String getUpdatebyname() { |
|---|
| | | return updatebyname; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 更新人name updatebyname **/ |
|---|
| | | public void setUpdatebyname(String updatebyname) { |
|---|
| | | this.updatebyname = updatebyname == null ? null : updatebyname.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getCreatebydepartment() { |
|---|
| | | return createbydepartment; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setCreatebydepartment(String createbydepartment) { |
|---|
| | | this.createbydepartment = createbydepartment; |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.annotation.IdType; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableId; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableName; |
|---|
| | | |
|---|
| | | import java.io.Serializable; |
|---|
| | | import java.util.Date; |
|---|
| | | |
|---|
| | | @TableName("risk_ana_unit") |
|---|
| | | public class RiskAnaUnit implements Serializable { |
|---|
| | | |
|---|
| | | private static final long serialVersionUID = 1L; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 主键 id |
|---|
| | | **/ |
|---|
| | | @TableId(type = IdType.AUTO) |
|---|
| | | private Long id; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 危险源编码 hazard_code |
|---|
| | | **/ |
|---|
| | | private String hazardCode; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 安全风险分析对象所属部门 hazard_dep |
|---|
| | | **/ |
|---|
| | | private String hazardDep; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 安全风险分析对象所属部分负责人姓名 hazard_liable_person |
|---|
| | | **/ |
|---|
| | | private String hazardLiablePerson; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 安全风险分析单元名称 risk_uint_name |
|---|
| | | **/ |
|---|
| | | private String riskUnitName; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 创建时间 create_time |
|---|
| | | **/ |
|---|
| | | private Date createTime; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 最新修改时间 update_time |
|---|
| | | **/ |
|---|
| | | private Date updateTime; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 创建人 create_by |
|---|
| | | **/ |
|---|
| | | private String createBy; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 最后修改人 update_by |
|---|
| | | **/ |
|---|
| | | private String updateBy; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 是否有效 valid_flag |
|---|
| | | **/ |
|---|
| | | private Boolean validFlag; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 安全风险分析对象所属部分负责人姓名id hazard_liable_person_id |
|---|
| | | **/ |
|---|
| | | private Long hazardLiablePersonId; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 安全风险分析对象所属部门id hazard_dep_id |
|---|
| | | **/ |
|---|
| | | private Long hazardDepId; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 主键 id |
|---|
| | | **/ |
|---|
| | | public Long getId() { |
|---|
| | | return id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 主键 id |
|---|
| | | **/ |
|---|
| | | public void setId(Long id) { |
|---|
| | | this.id = id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 危险源编码 hazard_code |
|---|
| | | **/ |
|---|
| | | public String getHazardCode() { |
|---|
| | | return hazardCode; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 危险源编码 hazard_code |
|---|
| | | **/ |
|---|
| | | public void setHazardCode(String hazardCode) { |
|---|
| | | this.hazardCode = hazardCode == null ? null : hazardCode.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 安全风险分析对象所属部门 hazard_dep |
|---|
| | | **/ |
|---|
| | | public String getHazardDep() { |
|---|
| | | return hazardDep; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 安全风险分析对象所属部门 hazard_dep |
|---|
| | | **/ |
|---|
| | | public void setHazardDep(String hazardDep) { |
|---|
| | | this.hazardDep = hazardDep == null ? null : hazardDep.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 安全风险分析对象所属部分负责人姓名 hazard_liable_person |
|---|
| | | **/ |
|---|
| | | public String getHazardLiablePerson() { |
|---|
| | | return hazardLiablePerson; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 安全风险分析对象所属部分负责人姓名 hazard_liable_person |
|---|
| | | **/ |
|---|
| | | public void setHazardLiablePerson(String hazardLiablePerson) { |
|---|
| | | this.hazardLiablePerson = hazardLiablePerson == null ? null : hazardLiablePerson.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 安全风险分析单元名称 risk_uint_name |
|---|
| | | **/ |
|---|
| | | public String getRiskUnitName() { |
|---|
| | | return riskUnitName; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 安全风险分析单元名称 risk_uint_name |
|---|
| | | **/ |
|---|
| | | public void setRiskUnitName(String riskUnitName) { |
|---|
| | | this.riskUnitName = riskUnitName == null ? null : riskUnitName.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 创建时间 create_time |
|---|
| | | **/ |
|---|
| | | public Date getCreateTime() { |
|---|
| | | return createTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 创建时间 create_time |
|---|
| | | **/ |
|---|
| | | public void setCreateTime(Date createTime) { |
|---|
| | | this.createTime = createTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 最新修改时间 update_time |
|---|
| | | **/ |
|---|
| | | public Date getUpdateTime() { |
|---|
| | | return updateTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 最新修改时间 update_time |
|---|
| | | **/ |
|---|
| | | public void setUpdateTime(Date updateTime) { |
|---|
| | | this.updateTime = updateTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 创建人 create_by |
|---|
| | | **/ |
|---|
| | | public String getCreateBy() { |
|---|
| | | return createBy; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 创建人 create_by |
|---|
| | | **/ |
|---|
| | | public void setCreateBy(String createBy) { |
|---|
| | | this.createBy = createBy == null ? null : createBy.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 最后修改人 update_by |
|---|
| | | **/ |
|---|
| | | public String getUpdateBy() { |
|---|
| | | return updateBy; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 最后修改人 update_by |
|---|
| | | **/ |
|---|
| | | public void setUpdateBy(String updateBy) { |
|---|
| | | this.updateBy = updateBy == null ? null : updateBy.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 是否有效 valid_flag |
|---|
| | | **/ |
|---|
| | | public Boolean getValidFlag() { |
|---|
| | | return validFlag; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 是否有效 valid_flag |
|---|
| | | **/ |
|---|
| | | public void setValidFlag(Boolean validFlag) { |
|---|
| | | this.validFlag = validFlag; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 安全风险分析对象所属部分负责人姓名id hazard_liable_person_id |
|---|
| | | **/ |
|---|
| | | public Long getHazardLiablePersonId() { |
|---|
| | | return hazardLiablePersonId; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 安全风险分析对象所属部分负责人姓名id hazard_liable_person_id |
|---|
| | | **/ |
|---|
| | | public void setHazardLiablePersonId(Long hazardLiablePersonId) { |
|---|
| | | this.hazardLiablePersonId = hazardLiablePersonId; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 安全风险分析对象所属部门id hazard_dep_id |
|---|
| | | **/ |
|---|
| | | public Long getHazardDepId() { |
|---|
| | | return hazardDepId; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 安全风险分析对象所属部门id hazard_dep_id |
|---|
| | | **/ |
|---|
| | | public void setHazardDepId(Long hazardDepId) { |
|---|
| | | this.hazardDepId = hazardDepId; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.annotation.IdType; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableField; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableId; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableName; |
|---|
| | | |
|---|
| | | import java.io.Serializable; |
|---|
| | | import java.util.Date; |
|---|
| | | import java.util.List; |
|---|
| | | |
|---|
| | | @TableName("risk_control_classify") |
|---|
| | | public class RiskControlClassify implements Serializable { |
|---|
| | | |
|---|
| | | private final static long serialVersionUID = 1L; |
|---|
| | | /** 主键id id **/ |
|---|
| | | @TableId(type = IdType.AUTO) |
|---|
| | | private Long id; |
|---|
| | | |
|---|
| | | /** 措施分类 name **/ |
|---|
| | | private String name; |
|---|
| | | |
|---|
| | | /** 备注 note **/ |
|---|
| | | private String note; |
|---|
| | | |
|---|
| | | /** 排序 order_index **/ |
|---|
| | | private Integer orderIndex; |
|---|
| | | |
|---|
| | | /** 父类id parent_id **/ |
|---|
| | | private Long parentId; |
|---|
| | | |
|---|
| | | /** 创建时间 create_time **/ |
|---|
| | | private Date createTime; |
|---|
| | | |
|---|
| | | /** 创建人 create_by **/ |
|---|
| | | private String createBy; |
|---|
| | | |
|---|
| | | /** 最后更新时间 update_time **/ |
|---|
| | | private Date updateTime; |
|---|
| | | |
|---|
| | | /** 最后更信任 update_by **/ |
|---|
| | | private String updateBy; |
|---|
| | | |
|---|
| | | /** 有效标识 valid_flag **/ |
|---|
| | | private Boolean validFlag; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * @Description: 子类 |
|---|
| | | */ |
|---|
| | | @TableField(exist = false) |
|---|
| | | private List<RiskControlClassify> subClassify; |
|---|
| | | |
|---|
| | | /** 主键id id **/ |
|---|
| | | public Long getId() { |
|---|
| | | return id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 主键id id **/ |
|---|
| | | public void setId(Long id) { |
|---|
| | | this.id = id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 措施分类 name **/ |
|---|
| | | public String getName() { |
|---|
| | | return name; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 措施分类 name **/ |
|---|
| | | public void setName(String name) { |
|---|
| | | this.name = name == null ? null : name.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 备注 note **/ |
|---|
| | | public String getNote() { |
|---|
| | | return note; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 备注 note **/ |
|---|
| | | public void setNote(String note) { |
|---|
| | | this.note = note == null ? null : note.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 排序 order_index **/ |
|---|
| | | public Integer getOrderIndex() { |
|---|
| | | return orderIndex; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 排序 order_index **/ |
|---|
| | | public void setOrderIndex(Integer orderIndex) { |
|---|
| | | this.orderIndex = orderIndex; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 父类id parent_id **/ |
|---|
| | | public Long getParentId() { |
|---|
| | | return parentId; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 父类id parent_id **/ |
|---|
| | | public void setParentId(Long parentId) { |
|---|
| | | this.parentId = parentId; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建时间 create_time **/ |
|---|
| | | public Date getCreateTime() { |
|---|
| | | return createTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建时间 create_time **/ |
|---|
| | | public void setCreateTime(Date createTime) { |
|---|
| | | this.createTime = createTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建人 create_by **/ |
|---|
| | | public String getCreateBy() { |
|---|
| | | return createBy; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建人 create_by **/ |
|---|
| | | public void setCreateBy(String createBy) { |
|---|
| | | this.createBy = createBy == null ? null : createBy.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最后更新时间 update_time **/ |
|---|
| | | public Date getUpdateTime() { |
|---|
| | | return updateTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最后更新时间 update_time **/ |
|---|
| | | public void setUpdateTime(Date updateTime) { |
|---|
| | | this.updateTime = updateTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最后更信任 update_by **/ |
|---|
| | | public String getUpdateBy() { |
|---|
| | | return updateBy; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最后更信任 update_by **/ |
|---|
| | | public void setUpdateBy(String updateBy) { |
|---|
| | | this.updateBy = updateBy; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 有效标识 valid_flag **/ |
|---|
| | | public Boolean getValidFlag() { |
|---|
| | | return validFlag; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 有效标识 valid_flag **/ |
|---|
| | | public void setValidFlag(Boolean validFlag) { |
|---|
| | | this.validFlag = validFlag; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public List<RiskControlClassify> getSubClassify() { |
|---|
| | | return subClassify; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setSubClassify(List<RiskControlClassify> subClassify) { |
|---|
| | | this.subClassify = subClassify; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.annotation.IdType; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableField; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableId; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableName; |
|---|
| | | |
|---|
| | | import java.io.Serializable; |
|---|
| | | import java.util.Date; |
|---|
| | | |
|---|
| | | @TableName("risk_control_measure") |
|---|
| | | public class RiskControlMeasure implements Serializable { |
|---|
| | | |
|---|
| | | private final static long serialVersionUID = 1L; |
|---|
| | | /** |
|---|
| | | * id |
|---|
| | | **/ |
|---|
| | | @TableId(type = IdType.AUTO) |
|---|
| | | private Long id; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 所属安全事件id risk_event_id |
|---|
| | | **/ |
|---|
| | | private Long riskEventId; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 自动化监控:1;隐患排查2 data_src |
|---|
| | | **/ |
|---|
| | | private String dataSrc; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 管控措施描述 risk_measure_desc |
|---|
| | | **/ |
|---|
| | | private String riskMeasureDesc; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * classify1 |
|---|
| | | **/ |
|---|
| | | private String classify1; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * classify2 |
|---|
| | | **/ |
|---|
| | | private String classify2; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 企业自己定义 classify3 |
|---|
| | | **/ |
|---|
| | | private String classify3; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 隐患排查内容 troubleshoot_content |
|---|
| | | **/ |
|---|
| | | private String troubleshootContent; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * --周期时间数值 time_effect |
|---|
| | | **/ |
|---|
| | | private String timeEffect; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * --周期时间单位 time_unit |
|---|
| | | **/ |
|---|
| | | private String timeUnit; |
|---|
| | | /** |
|---|
| | | * 有效标识 valid_flag |
|---|
| | | **/ |
|---|
| | | private Boolean validFlag; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 创建时间 create_time |
|---|
| | | **/ |
|---|
| | | private Date createTime; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 最新修改时间 update_time |
|---|
| | | **/ |
|---|
| | | private Date updateTime; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 创建人 create_by |
|---|
| | | **/ |
|---|
| | | private String createBy; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 最后修改人 update_by |
|---|
| | | **/ |
|---|
| | | private String updateBy; |
|---|
| | | |
|---|
| | | @TableField(exist = false) |
|---|
| | | private RiskEvent riskEvent; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * id |
|---|
| | | **/ |
|---|
| | | public Long getId() { |
|---|
| | | |
|---|
| | | return id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getTimeEffect() { |
|---|
| | | return timeEffect; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setTimeEffect(String timeEffect) { |
|---|
| | | this.timeEffect = timeEffect; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getTimeUnit() { |
|---|
| | | return timeUnit; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setTimeUnit(String timeUnit) { |
|---|
| | | this.timeUnit = timeUnit; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * id |
|---|
| | | **/ |
|---|
| | | public void setId(Long id) { |
|---|
| | | this.id = id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 所属安全事件id risk_event_id |
|---|
| | | **/ |
|---|
| | | public Long getRiskEventId() { |
|---|
| | | return riskEventId; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 所属安全事件id risk_event_id |
|---|
| | | **/ |
|---|
| | | public void setRiskEventId(Long riskEventId) { |
|---|
| | | this.riskEventId = riskEventId; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 自动化监控:1;隐患排查2 data_src |
|---|
| | | **/ |
|---|
| | | public String getDataSrc() { |
|---|
| | | return dataSrc; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 自动化监控:1;隐患排查2 data_src |
|---|
| | | **/ |
|---|
| | | public void setDataSrc(String dataSrc) { |
|---|
| | | this.dataSrc = dataSrc == null ? null : dataSrc.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 管控措施描述 risk_measure_desc |
|---|
| | | **/ |
|---|
| | | public String getRiskMeasureDesc() { |
|---|
| | | return riskMeasureDesc; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 管控措施描述 risk_measure_desc |
|---|
| | | **/ |
|---|
| | | public void setRiskMeasureDesc(String riskMeasureDesc) { |
|---|
| | | this.riskMeasureDesc = riskMeasureDesc == null ? null : riskMeasureDesc.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * classify1 |
|---|
| | | **/ |
|---|
| | | public String getClassify1() { |
|---|
| | | return classify1; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * classify1 |
|---|
| | | **/ |
|---|
| | | public void setClassify1(String classify1) { |
|---|
| | | this.classify1 = classify1 == null ? null : classify1.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * classify2 |
|---|
| | | **/ |
|---|
| | | public String getClassify2() { |
|---|
| | | return classify2; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * classify2 |
|---|
| | | **/ |
|---|
| | | public void setClassify2(String classify2) { |
|---|
| | | this.classify2 = classify2 == null ? null : classify2.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 企业自己定义 classify3 |
|---|
| | | **/ |
|---|
| | | public String getClassify3() { |
|---|
| | | return classify3; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 企业自己定义 classify3 |
|---|
| | | **/ |
|---|
| | | public void setClassify3(String classify3) { |
|---|
| | | this.classify3 = classify3 == null ? null : classify3.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 隐患排查内容 troubleshoot_content |
|---|
| | | **/ |
|---|
| | | public String getTroubleshootContent() { |
|---|
| | | return troubleshootContent; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 隐患排查内容 troubleshoot_content |
|---|
| | | **/ |
|---|
| | | public void setTroubleshootContent(String troubleshootContent) { |
|---|
| | | this.troubleshootContent = troubleshootContent == null ? null : troubleshootContent.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 有效标识 valid_flag |
|---|
| | | **/ |
|---|
| | | public Boolean getValidFlag() { |
|---|
| | | return validFlag; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 有效标识 valid_flag |
|---|
| | | **/ |
|---|
| | | public void setValidFlag(Boolean validFlag) { |
|---|
| | | this.validFlag = validFlag; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 创建时间 create_time |
|---|
| | | **/ |
|---|
| | | public Date getCreateTime() { |
|---|
| | | return createTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 创建时间 create_time |
|---|
| | | **/ |
|---|
| | | public void setCreateTime(Date createTime) { |
|---|
| | | this.createTime = createTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 最新修改时间 update_time |
|---|
| | | **/ |
|---|
| | | public Date getUpdateTime() { |
|---|
| | | return updateTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 最新修改时间 update_time |
|---|
| | | **/ |
|---|
| | | public void setUpdateTime(Date updateTime) { |
|---|
| | | this.updateTime = updateTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 创建人 create_by |
|---|
| | | **/ |
|---|
| | | public String getCreateBy() { |
|---|
| | | return createBy; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 创建人 create_by |
|---|
| | | **/ |
|---|
| | | public void setCreateBy(String createBy) { |
|---|
| | | this.createBy = createBy == null ? null : createBy.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 最后修改人 update_by |
|---|
| | | **/ |
|---|
| | | public String getUpdateBy() { |
|---|
| | | return updateBy; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 最后修改人 update_by |
|---|
| | | **/ |
|---|
| | | public void setUpdateBy(String updateBy) { |
|---|
| | | this.updateBy = updateBy == null ? null : updateBy.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | public RiskEvent getRiskEvent() { |
|---|
| | | return riskEvent; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setRiskEvent(RiskEvent riskEvent) { |
|---|
| | | this.riskEvent = riskEvent; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.annotation.IdType; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableField; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableId; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableName; |
|---|
| | | |
|---|
| | | import java.io.Serializable; |
|---|
| | | import java.util.Date; |
|---|
| | | |
|---|
| | | @TableName("risk_event") |
|---|
| | | public class RiskEvent implements Serializable { |
|---|
| | | |
|---|
| | | private final static long serialVersionUID = 1L; |
|---|
| | | /** 主键id id **/ |
|---|
| | | @TableId(type = IdType.AUTO) |
|---|
| | | private Long id; |
|---|
| | | |
|---|
| | | /** 所属安全风险单元id risk_unit_id **/ |
|---|
| | | private Long riskUnitId; |
|---|
| | | |
|---|
| | | /** 安全风险事件名称 risk_event_name **/ |
|---|
| | | private String riskEventName; |
|---|
| | | |
|---|
| | | /** 有效标识 valid_flag **/ |
|---|
| | | private Boolean validFlag; |
|---|
| | | |
|---|
| | | /** 创建时间 create_time **/ |
|---|
| | | private Date createTime; |
|---|
| | | |
|---|
| | | /** 创建人 create_by **/ |
|---|
| | | private String createBy; |
|---|
| | | |
|---|
| | | /** 最新更新时间 update_time **/ |
|---|
| | | private Date updateTime; |
|---|
| | | |
|---|
| | | /** 最后更新人 update_by **/ |
|---|
| | | private String updateBy; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * @Description: 所属风险单元 |
|---|
| | | */ |
|---|
| | | @TableField(exist = false) |
|---|
| | | private RiskAnaUnit riskAnaUnit; |
|---|
| | | |
|---|
| | | /** 主键id id **/ |
|---|
| | | public Long getId() { |
|---|
| | | return id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 主键id id **/ |
|---|
| | | public void setId(Long id) { |
|---|
| | | this.id = id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 所属安全风险单元id risk_unit_id **/ |
|---|
| | | public Long getRiskUnitId() { |
|---|
| | | return riskUnitId; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 所属安全风险单元id risk_unit_id **/ |
|---|
| | | public void setRiskUnitId(Long riskUnitId) { |
|---|
| | | this.riskUnitId = riskUnitId; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 安全风险事件名称 risk_event_name **/ |
|---|
| | | public String getRiskEventName() { |
|---|
| | | return riskEventName; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 安全风险事件名称 risk_event_name **/ |
|---|
| | | public void setRiskEventName(String riskEventName) { |
|---|
| | | this.riskEventName = riskEventName == null ? null : riskEventName.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 有效标识 valid_flag **/ |
|---|
| | | public Boolean getValidFlag() { |
|---|
| | | return validFlag; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 有效标识 valid_flag **/ |
|---|
| | | public void setValidFlag(Boolean validFlag) { |
|---|
| | | this.validFlag = validFlag; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建时间 create_time **/ |
|---|
| | | public Date getCreateTime() { |
|---|
| | | return createTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建时间 create_time **/ |
|---|
| | | public void setCreateTime(Date createTime) { |
|---|
| | | this.createTime = createTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建人 create_by **/ |
|---|
| | | public String getCreateBy() { |
|---|
| | | return createBy; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建人 create_by **/ |
|---|
| | | public void setCreateBy(String createBy) { |
|---|
| | | this.createBy = createBy == null ? null : createBy.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最新更新时间 update_time **/ |
|---|
| | | public Date getUpdateTime() { |
|---|
| | | return updateTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最新更新时间 update_time **/ |
|---|
| | | public void setUpdateTime(Date updateTime) { |
|---|
| | | this.updateTime = updateTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最后更新人 update_by **/ |
|---|
| | | public String getUpdateBy() { |
|---|
| | | return updateBy; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最后更新人 update_by **/ |
|---|
| | | public void setUpdateBy(String updateBy) { |
|---|
| | | this.updateBy = updateBy == null ? null : updateBy.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | public RiskAnaUnit getRiskAnaUnit() { |
|---|
| | | return riskAnaUnit; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setRiskAnaUnit(RiskAnaUnit riskAnaUnit) { |
|---|
| | | this.riskAnaUnit = riskAnaUnit; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.annotation.IdType; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableField; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableId; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableName; |
|---|
| | | |
|---|
| | | import java.util.Date; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 安全风险分布图 |
|---|
| | | */ |
|---|
| | | @TableName(value = "risk_map") |
|---|
| | | public class RiskMap { |
|---|
| | | |
|---|
| | | //ID,主键 |
|---|
| | | @TableId(type = IdType.AUTO) |
|---|
| | | private Long id; |
|---|
| | | |
|---|
| | | |
|---|
| | | //状态 0-正常 1-物理删除 |
|---|
| | | private Byte status; |
|---|
| | | |
|---|
| | | //图片路径 |
|---|
| | | private String img; |
|---|
| | | |
|---|
| | | //创建人ID |
|---|
| | | private Long createUid; |
|---|
| | | |
|---|
| | | //创建时间 |
|---|
| | | private Date createTime; |
|---|
| | | |
|---|
| | | private Long editUid; |
|---|
| | | |
|---|
| | | //最后编辑时间 |
|---|
| | | private Date editTime; |
|---|
| | | |
|---|
| | | //创建人名字 |
|---|
| | | private String createUname; |
|---|
| | | |
|---|
| | | //最后编辑人名字 |
|---|
| | | private String editUname; |
|---|
| | | |
|---|
| | | //描述 |
|---|
| | | private String descInfo; |
|---|
| | | |
|---|
| | | public Long getId() { |
|---|
| | | return id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setId(Long id) { |
|---|
| | | this.id = id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | public Byte getStatus() { |
|---|
| | | return status; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setStatus(Byte status) { |
|---|
| | | this.status = status; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getImg() { |
|---|
| | | return img; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setImg(String img) { |
|---|
| | | this.img = img; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Date getCreateTime() { |
|---|
| | | return createTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setCreateTime(Date createTime) { |
|---|
| | | this.createTime = createTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Date getEditTime() { |
|---|
| | | return editTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setEditTime(Date editTime) { |
|---|
| | | this.editTime = editTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getCreateUname() { |
|---|
| | | return createUname; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setCreateUname(String createUname) { |
|---|
| | | this.createUname = createUname; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getEditUname() { |
|---|
| | | return editUname; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setEditUname(String editUname) { |
|---|
| | | this.editUname = editUname; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getDescInfo() { |
|---|
| | | return descInfo; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setDescInfo(String descInfo) { |
|---|
| | | this.descInfo = descInfo; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Long getCreateUid() { |
|---|
| | | return createUid; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setCreateUid(Long createUid) { |
|---|
| | | this.createUid = createUid; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Long getEditUid() { |
|---|
| | | return editUid; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setEditUid(Long editUid) { |
|---|
| | | this.editUid = editUid; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.annotation.IdType; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableId; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableName; |
|---|
| | | |
|---|
| | | import java.io.Serializable; |
|---|
| | | import java.util.Date; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 风险源 |
|---|
| | | */ |
|---|
| | | @TableName("risk_source") |
|---|
| | | public class RiskSource implements Serializable { |
|---|
| | | |
|---|
| | | private final static long serialVersionUID = 1L; |
|---|
| | | |
|---|
| | | //ID，主键 |
|---|
| | | @TableId(type = IdType.AUTO) |
|---|
| | | private Long id; |
|---|
| | | |
|---|
| | | //风险源名称 |
|---|
| | | private String name; |
|---|
| | | |
|---|
| | | //风险源类型，1-设施设备，2-作业活动 |
|---|
| | | private Byte type; |
|---|
| | | |
|---|
| | | //风险等级，1-低风险，2-一般风险，3-较大风险，4-重大风险 |
|---|
| | | private Byte level; |
|---|
| | | |
|---|
| | | //状态，1-有效，2-无效，3-删除 |
|---|
| | | private Byte status; |
|---|
| | | |
|---|
| | | //可能导致的事故描述 |
|---|
| | | private String accidentDesc; |
|---|
| | | |
|---|
| | | //区域位置 |
|---|
| | | private String location; |
|---|
| | | |
|---|
| | | //所属部门ID |
|---|
| | | private Long depId; |
|---|
| | | |
|---|
| | | //所属部门名称 |
|---|
| | | private String depName; |
|---|
| | | |
|---|
| | | //创建时间 |
|---|
| | | private Date createTime; |
|---|
| | | |
|---|
| | | //创建人ID |
|---|
| | | private Long createUid; |
|---|
| | | |
|---|
| | | //创建人姓名 |
|---|
| | | private String createUname; |
|---|
| | | |
|---|
| | | //最新编辑时间 |
|---|
| | | private Date editTime; |
|---|
| | | |
|---|
| | | //最新编辑人ID |
|---|
| | | private Long editUid; |
|---|
| | | |
|---|
| | | //最新编辑人姓名 |
|---|
| | | private String editUname; |
|---|
| | | |
|---|
| | | public Long getId() { |
|---|
| | | return id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setId(Long id) { |
|---|
| | | this.id = id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getName() { |
|---|
| | | return name; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setName(String name) { |
|---|
| | | this.name = name; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Byte getType() { |
|---|
| | | return type; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setType(Byte type) { |
|---|
| | | this.type = type; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Byte getLevel() { |
|---|
| | | return level; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setLevel(Byte level) { |
|---|
| | | this.level = level; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Byte getStatus() { |
|---|
| | | return status; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setStatus(Byte status) { |
|---|
| | | this.status = status; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getAccidentDesc() { |
|---|
| | | return accidentDesc; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setAccidentDesc(String accidentDesc) { |
|---|
| | | this.accidentDesc = accidentDesc; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getLocation() { |
|---|
| | | return location; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setLocation(String location) { |
|---|
| | | this.location = location; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Long getDepId() { |
|---|
| | | return depId; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setDepId(Long depId) { |
|---|
| | | this.depId = depId; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getDepName() { |
|---|
| | | return depName; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setDepName(String depName) { |
|---|
| | | this.depName = depName; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Date getCreateTime() { |
|---|
| | | return createTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setCreateTime(Date createTime) { |
|---|
| | | this.createTime = createTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Long getCreateUid() { |
|---|
| | | return createUid; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setCreateUid(Long createUid) { |
|---|
| | | this.createUid = createUid; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getCreateUname() { |
|---|
| | | return createUname; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setCreateUname(String createUname) { |
|---|
| | | this.createUname = createUname; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Date getEditTime() { |
|---|
| | | return editTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setEditTime(Date editTime) { |
|---|
| | | this.editTime = editTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Long getEditUid() { |
|---|
| | | return editUid; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setEditUid(Long editUid) { |
|---|
| | | this.editUid = editUid; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getEditUname() { |
|---|
| | | return editUname; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setEditUname(String editUname) { |
|---|
| | | this.editUname = editUname; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.annotation.IdType; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableField; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableId; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableName; |
|---|
| | | |
|---|
| | | import java.io.Serializable; |
|---|
| | | import java.util.Date; |
|---|
| | | |
|---|
| | | @TableName("role") |
|---|
| | | public class RoleInfo implements Serializable { |
|---|
| | | @TableField(exist = false) |
|---|
| | | private static final long serialVersionUID = 1L; |
|---|
| | | |
|---|
| | | @TableId(type = IdType.AUTO) |
|---|
| | | /** id **/ |
|---|
| | | private Long id; |
|---|
| | | |
|---|
| | | /** name **/ |
|---|
| | | private String name; |
|---|
| | | |
|---|
| | | /** createdby **/ |
|---|
| | | private String createdby; |
|---|
| | | |
|---|
| | | /** createddate **/ |
|---|
| | | private Date createddate; |
|---|
| | | |
|---|
| | | /** lastmodifiedby **/ |
|---|
| | | private String lastmodifiedby; |
|---|
| | | |
|---|
| | | /** lastmodifieddate **/ |
|---|
| | | private Date lastmodifieddate; |
|---|
| | | |
|---|
| | | /** description **/ |
|---|
| | | private String description; |
|---|
| | | |
|---|
| | | /** code **/ |
|---|
| | | private String code; |
|---|
| | | |
|---|
| | | /** btnaccess **/ |
|---|
| | | private String btnaccess; |
|---|
| | | |
|---|
| | | private Byte isdel; |
|---|
| | | |
|---|
| | | /** id **/ |
|---|
| | | public Long getId() { |
|---|
| | | return id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** id **/ |
|---|
| | | public void setId(Long id) { |
|---|
| | | this.id = id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** name **/ |
|---|
| | | public String getName() { |
|---|
| | | return name; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** name **/ |
|---|
| | | public void setName(String name) { |
|---|
| | | this.name = name == null ? null : name.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** createdby **/ |
|---|
| | | public String getCreatedby() { |
|---|
| | | return createdby; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** createdby **/ |
|---|
| | | public void setCreatedby(String createdby) { |
|---|
| | | this.createdby = createdby == null ? null : createdby.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** createddate **/ |
|---|
| | | public Date getCreateddate() { |
|---|
| | | return createddate; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** createddate **/ |
|---|
| | | public void setCreateddate(Date createddate) { |
|---|
| | | this.createddate = createddate; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** lastmodifiedby **/ |
|---|
| | | public String getLastmodifiedby() { |
|---|
| | | return lastmodifiedby; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** lastmodifiedby **/ |
|---|
| | | public void setLastmodifiedby(String lastmodifiedby) { |
|---|
| | | this.lastmodifiedby = lastmodifiedby == null ? null : lastmodifiedby.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** lastmodifieddate **/ |
|---|
| | | public Date getLastmodifieddate() { |
|---|
| | | return lastmodifieddate; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** lastmodifieddate **/ |
|---|
| | | public void setLastmodifieddate(Date lastmodifieddate) { |
|---|
| | | this.lastmodifieddate = lastmodifieddate; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** description **/ |
|---|
| | | public String getDescription() { |
|---|
| | | return description; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** description **/ |
|---|
| | | public void setDescription(String description) { |
|---|
| | | this.description = description == null ? null : description.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** code **/ |
|---|
| | | public String getCode() { |
|---|
| | | return code; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** code **/ |
|---|
| | | public void setCode(String code) { |
|---|
| | | this.code = code == null ? null : code.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** btnaccess **/ |
|---|
| | | public String getBtnaccess() { |
|---|
| | | return btnaccess; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** btnaccess **/ |
|---|
| | | public void setBtnaccess(String btnaccess) { |
|---|
| | | this.btnaccess = btnaccess == null ? null : btnaccess.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Byte getIsdel() { |
|---|
| | | return isdel; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setIsdel(Byte isdel) { |
|---|
| | | this.isdel = isdel; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.annotation.IdType; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableField; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableId; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableName; |
|---|
| | | |
|---|
| | | import java.io.Serializable; |
|---|
| | | |
|---|
| | | @TableName("rolepermissions") |
|---|
| | | public class RolePermissionsInfo implements Serializable { |
|---|
| | | @TableField(exist = false) |
|---|
| | | private static final long serialVersionUID = 1L; |
|---|
| | | |
|---|
| | | @TableId(type = IdType.AUTO) |
|---|
| | | /** id **/ |
|---|
| | | private Long id; |
|---|
| | | |
|---|
| | | /** roleid **/ |
|---|
| | | private Long roleid; |
|---|
| | | |
|---|
| | | /** permissionid **/ |
|---|
| | | private Long permissionid; |
|---|
| | | |
|---|
| | | /** id **/ |
|---|
| | | public Long getId() { |
|---|
| | | return id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** id **/ |
|---|
| | | public void setId(Long id) { |
|---|
| | | this.id = id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** roleid **/ |
|---|
| | | public Long getRoleid() { |
|---|
| | | return roleid; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** roleid **/ |
|---|
| | | public void setRoleid(Long roleid) { |
|---|
| | | this.roleid = roleid; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** permissionid **/ |
|---|
| | | public Long getPermissionid() { |
|---|
| | | return permissionid; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** permissionid **/ |
|---|
| | | public void setPermissionid(Long permissionid) { |
|---|
| | | this.permissionid = permissionid; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.annotation.IdType; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableField; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableId; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableName; |
|---|
| | | |
|---|
| | | import java.io.Serializable; |
|---|
| | | import java.util.Date; |
|---|
| | | import java.util.List; |
|---|
| | | |
|---|
| | | @TableName("safety_inspection_item") |
|---|
| | | public class SafetyInspectionItem implements Serializable { |
|---|
| | | |
|---|
| | | private final static long serialVersionUID = 1L; |
|---|
| | | |
|---|
| | | /** A级要素id element_a **/ |
|---|
| | | private Long elementA; |
|---|
| | | |
|---|
| | | /** B级要素id element_b **/ |
|---|
| | | private Long elementB; |
|---|
| | | |
|---|
| | | /** 标准化要求 standardization_requirements **/ |
|---|
| | | private String standardizationRequirements; |
|---|
| | | |
|---|
| | | /** 企业达标标准 enterprise_standard **/ |
|---|
| | | private String enterpriseStandard; |
|---|
| | | |
|---|
| | | /** 评审方法 review_method **/ |
|---|
| | | private String reviewMethod; |
|---|
| | | |
|---|
| | | /** 否决项 veto **/ |
|---|
| | | private String veto; |
|---|
| | | |
|---|
| | | @TableField(exist = false) |
|---|
| | | /** A级要素名称 **/ |
|---|
| | | private String elementAName; |
|---|
| | | |
|---|
| | | @TableField(exist = false) |
|---|
| | | /** B级要素名称 **/ |
|---|
| | | private String elementBName; |
|---|
| | | |
|---|
| | | @TableField(exist = false) |
|---|
| | | /** 扣分项集合 **/ |
|---|
| | | private List<SafetyInspectionItemDeduction> deductionList; |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | /** 主键id id **/ |
|---|
| | | @TableId(type = IdType.AUTO) |
|---|
| | | private Long id; |
|---|
| | | |
|---|
| | | /** 有效标识 valid_flag **/ |
|---|
| | | private Boolean validFlag; |
|---|
| | | |
|---|
| | | /** 创建时间 create_time **/ |
|---|
| | | private Date createTime; |
|---|
| | | |
|---|
| | | /** 创建人 create_by **/ |
|---|
| | | private String createBy; |
|---|
| | | |
|---|
| | | /** 最新更新时间 update_time **/ |
|---|
| | | private Date updateTime; |
|---|
| | | |
|---|
| | | /** 最后更新人 update_by **/ |
|---|
| | | private String updateBy; |
|---|
| | | |
|---|
| | | |
|---|
| | | /** 主键id id **/ |
|---|
| | | public Long getId() { |
|---|
| | | return id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 主键id id **/ |
|---|
| | | public void setId(Long id) { |
|---|
| | | this.id = id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 有效标识 valid_flag **/ |
|---|
| | | public Boolean getValidFlag() { |
|---|
| | | return validFlag; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 有效标识 valid_flag **/ |
|---|
| | | public void setValidFlag(Boolean validFlag) { |
|---|
| | | this.validFlag = validFlag; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建时间 create_time **/ |
|---|
| | | public Date getCreateTime() { |
|---|
| | | return createTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建时间 create_time **/ |
|---|
| | | public void setCreateTime(Date createTime) { |
|---|
| | | this.createTime = createTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建人 create_by **/ |
|---|
| | | public String getCreateBy() { |
|---|
| | | return createBy; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建人 create_by **/ |
|---|
| | | public void setCreateBy(String createBy) { |
|---|
| | | this.createBy = createBy == null ? null : createBy.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最新更新时间 update_time **/ |
|---|
| | | public Date getUpdateTime() { |
|---|
| | | return updateTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最新更新时间 update_time **/ |
|---|
| | | public void setUpdateTime(Date updateTime) { |
|---|
| | | this.updateTime = updateTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最后更新人 update_by **/ |
|---|
| | | public String getUpdateBy() { |
|---|
| | | return updateBy; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最后更新人 update_by **/ |
|---|
| | | public void setUpdateBy(String updateBy) { |
|---|
| | | this.updateBy = updateBy == null ? null : updateBy.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Long getElementA() { |
|---|
| | | return elementA; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setElementA(Long elementA) { |
|---|
| | | this.elementA = elementA; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Long getElementB() { |
|---|
| | | return elementB; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setElementB(Long elementB) { |
|---|
| | | this.elementB = elementB; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getStandardizationRequirements() { |
|---|
| | | return standardizationRequirements; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setStandardizationRequirements(String standardizationRequirements) { |
|---|
| | | this.standardizationRequirements = standardizationRequirements; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getEnterpriseStandard() { |
|---|
| | | return enterpriseStandard; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setEnterpriseStandard(String enterpriseStandard) { |
|---|
| | | this.enterpriseStandard = enterpriseStandard; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getReviewMethod() { |
|---|
| | | return reviewMethod; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setReviewMethod(String reviewMethod) { |
|---|
| | | this.reviewMethod = reviewMethod; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getVeto() { |
|---|
| | | return veto; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setVeto(String veto) { |
|---|
| | | this.veto = veto; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getElementAName() { |
|---|
| | | return elementAName; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setElementAName(String elementAName) { |
|---|
| | | this.elementAName = elementAName; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getElementBName() { |
|---|
| | | return elementBName; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setElementBName(String elementBName) { |
|---|
| | | this.elementBName = elementBName; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public List<SafetyInspectionItemDeduction> getDeductionList() { |
|---|
| | | return deductionList; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setDeductionList(List<SafetyInspectionItemDeduction> deductionList) { |
|---|
| | | this.deductionList = deductionList; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.annotation.IdType; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableField; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableId; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableName; |
|---|
| | | |
|---|
| | | import java.io.Serializable; |
|---|
| | | import java.util.Date; |
|---|
| | | |
|---|
| | | @TableName("safety_inspection_item_deduction") |
|---|
| | | public class SafetyInspectionItemDeduction implements Serializable { |
|---|
| | | |
|---|
| | | private final static long serialVersionUID = 1L; |
|---|
| | | |
|---|
| | | /** 检查项id safety_inspection_item_id **/ |
|---|
| | | private Long safetyInspectionItemId; |
|---|
| | | |
|---|
| | | /** 扣分项名称 name **/ |
|---|
| | | private String name; |
|---|
| | | |
|---|
| | | /** 扣分项说明 remark **/ |
|---|
| | | private String remark; |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | /** 主键id id **/ |
|---|
| | | @TableId(type = IdType.AUTO) |
|---|
| | | private Long id; |
|---|
| | | |
|---|
| | | /** 有效标识 valid_flag **/ |
|---|
| | | private Boolean validFlag; |
|---|
| | | |
|---|
| | | /** 创建时间 create_time **/ |
|---|
| | | private Date createTime; |
|---|
| | | |
|---|
| | | /** 创建人 create_by **/ |
|---|
| | | private String createBy; |
|---|
| | | |
|---|
| | | /** 最新更新时间 update_time **/ |
|---|
| | | private Date updateTime; |
|---|
| | | |
|---|
| | | /** 最后更新人 update_by **/ |
|---|
| | | private String updateBy; |
|---|
| | | |
|---|
| | | |
|---|
| | | /** 主键id id **/ |
|---|
| | | public Long getId() { |
|---|
| | | return id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 主键id id **/ |
|---|
| | | public void setId(Long id) { |
|---|
| | | this.id = id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 有效标识 valid_flag **/ |
|---|
| | | public Boolean getValidFlag() { |
|---|
| | | return validFlag; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 有效标识 valid_flag **/ |
|---|
| | | public void setValidFlag(Boolean validFlag) { |
|---|
| | | this.validFlag = validFlag; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建时间 create_time **/ |
|---|
| | | public Date getCreateTime() { |
|---|
| | | return createTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建时间 create_time **/ |
|---|
| | | public void setCreateTime(Date createTime) { |
|---|
| | | this.createTime = createTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建人 create_by **/ |
|---|
| | | public String getCreateBy() { |
|---|
| | | return createBy; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建人 create_by **/ |
|---|
| | | public void setCreateBy(String createBy) { |
|---|
| | | this.createBy = createBy == null ? null : createBy.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最新更新时间 update_time **/ |
|---|
| | | public Date getUpdateTime() { |
|---|
| | | return updateTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最新更新时间 update_time **/ |
|---|
| | | public void setUpdateTime(Date updateTime) { |
|---|
| | | this.updateTime = updateTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最后更新人 update_by **/ |
|---|
| | | public String getUpdateBy() { |
|---|
| | | return updateBy; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最后更新人 update_by **/ |
|---|
| | | public void setUpdateBy(String updateBy) { |
|---|
| | | this.updateBy = updateBy == null ? null : updateBy.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Long getSafetyInspectionItemId() { |
|---|
| | | return safetyInspectionItemId; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setSafetyInspectionItemId(Long safetyInspectionItemId) { |
|---|
| | | this.safetyInspectionItemId = safetyInspectionItemId; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getName() { |
|---|
| | | return name; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setName(String name) { |
|---|
| | | this.name = name; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getRemark() { |
|---|
| | | return remark; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setRemark(String remark) { |
|---|
| | | this.remark = remark; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.annotation.IdType; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableField; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableId; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableName; |
|---|
| | | import com.fasterxml.jackson.annotation.JsonFormat; |
|---|
| | | |
|---|
| | | import java.io.Serializable; |
|---|
| | | import java.util.Date; |
|---|
| | | import java.util.List; |
|---|
| | | |
|---|
| | | @TableName("safety_self_inspection") |
|---|
| | | public class SafetySelfInspection implements Serializable { |
|---|
| | | |
|---|
| | | private final static long serialVersionUID = 1L; |
|---|
| | | |
|---|
| | | /** 自查清单名称 inspection_name **/ |
|---|
| | | private String inspectionName; |
|---|
| | | |
|---|
| | | /** 检查时间 inspection_time **/ |
|---|
| | | @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8") |
|---|
| | | private Date inspectionTime; |
|---|
| | | |
|---|
| | | /** 检察人员 inspector **/ |
|---|
| | | private Long inspector; |
|---|
| | | |
|---|
| | | /** 被检查公司id **/ |
|---|
| | | private Long checkedCompanyId; |
|---|
| | | |
|---|
| | | /** 被检查公司名字 **/ |
|---|
| | | private String checkedCompanyName; |
|---|
| | | |
|---|
| | | /** 状态 0:暂存 1:评审中 2:已评审 status **/ |
|---|
| | | private Integer status; |
|---|
| | | |
|---|
| | | /** 不合格项数 **/ |
|---|
| | | @TableField(exist = false) |
|---|
| | | private Integer unqualifiedItem; |
|---|
| | | |
|---|
| | | /** 项数 **/ |
|---|
| | | @TableField(exist = false) |
|---|
| | | private Integer itemSum; |
|---|
| | | |
|---|
| | | /** 合格率 **/ |
|---|
| | | @TableField(exist = false) |
|---|
| | | private String qualifiedRate; |
|---|
| | | |
|---|
| | | /** 角色id **/ |
|---|
| | | @TableField(exist = false) |
|---|
| | | private Long roleid; |
|---|
| | | |
|---|
| | | /** 检察人员 **/ |
|---|
| | | @TableField(exist = false) |
|---|
| | | private String inspectorName; |
|---|
| | | |
|---|
| | | /** 检查开始时间 **/ |
|---|
| | | @TableField(exist = false) |
|---|
| | | @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8") |
|---|
| | | private Date inspectionStartTime; |
|---|
| | | |
|---|
| | | /** 检查结束时间 **/ |
|---|
| | | @TableField(exist = false) |
|---|
| | | @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8") |
|---|
| | | private Date inspectionEndTime; |
|---|
| | | |
|---|
| | | /** 检查项集合 **/ |
|---|
| | | @TableField(exist = false) |
|---|
| | | private List<SafetySelfInspectionItem> itemList; |
|---|
| | | |
|---|
| | | |
|---|
| | | /** 主键id id **/ |
|---|
| | | @TableId(type = IdType.AUTO) |
|---|
| | | private Long id; |
|---|
| | | |
|---|
| | | /** 有效标识 valid_flag **/ |
|---|
| | | private Boolean validFlag; |
|---|
| | | |
|---|
| | | /** 创建时间 create_time **/ |
|---|
| | | private Date createTime; |
|---|
| | | |
|---|
| | | /** 创建人 create_by **/ |
|---|
| | | private String createBy; |
|---|
| | | |
|---|
| | | /** 最新更新时间 update_time **/ |
|---|
| | | private Date updateTime; |
|---|
| | | |
|---|
| | | /** 最后更新人 update_by **/ |
|---|
| | | private String updateBy; |
|---|
| | | |
|---|
| | | |
|---|
| | | public Long getCheckedCompanyId() { |
|---|
| | | return checkedCompanyId; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setCheckedCompanyId(Long checkedCompanyId) { |
|---|
| | | this.checkedCompanyId = checkedCompanyId; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getCheckedCompanyName() { |
|---|
| | | return checkedCompanyName; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setCheckedCompanyName(String checkedCompanyName) { |
|---|
| | | this.checkedCompanyName = checkedCompanyName; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Integer getItemSum() { |
|---|
| | | return itemSum; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setItemSum(Integer itemSum) { |
|---|
| | | this.itemSum = itemSum; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Long getRoleid() { |
|---|
| | | return roleid; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setRoleid(Long roleid) { |
|---|
| | | this.roleid = roleid; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Integer getUnqualifiedItem() { |
|---|
| | | return unqualifiedItem; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setUnqualifiedItem(Integer unqualifiedItem) { |
|---|
| | | this.unqualifiedItem = unqualifiedItem; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getQualifiedRate() { |
|---|
| | | return qualifiedRate; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setQualifiedRate(String qualifiedRate) { |
|---|
| | | this.qualifiedRate = qualifiedRate; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 主键id id **/ |
|---|
| | | public Long getId() { |
|---|
| | | return id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 主键id id **/ |
|---|
| | | public void setId(Long id) { |
|---|
| | | this.id = id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 有效标识 valid_flag **/ |
|---|
| | | public Boolean getValidFlag() { |
|---|
| | | return validFlag; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 有效标识 valid_flag **/ |
|---|
| | | public void setValidFlag(Boolean validFlag) { |
|---|
| | | this.validFlag = validFlag; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建时间 create_time **/ |
|---|
| | | public Date getCreateTime() { |
|---|
| | | return createTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建时间 create_time **/ |
|---|
| | | public void setCreateTime(Date createTime) { |
|---|
| | | this.createTime = createTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建人 create_by **/ |
|---|
| | | public String getCreateBy() { |
|---|
| | | return createBy; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建人 create_by **/ |
|---|
| | | public void setCreateBy(String createBy) { |
|---|
| | | this.createBy = createBy == null ? null : createBy.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最新更新时间 update_time **/ |
|---|
| | | public Date getUpdateTime() { |
|---|
| | | return updateTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最新更新时间 update_time **/ |
|---|
| | | public void setUpdateTime(Date updateTime) { |
|---|
| | | this.updateTime = updateTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最后更新人 update_by **/ |
|---|
| | | public String getUpdateBy() { |
|---|
| | | return updateBy; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最后更新人 update_by **/ |
|---|
| | | public void setUpdateBy(String updateBy) { |
|---|
| | | this.updateBy = updateBy == null ? null : updateBy.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getInspectionName() { |
|---|
| | | return inspectionName; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setInspectionName(String inspectionName) { |
|---|
| | | this.inspectionName = inspectionName; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Date getInspectionTime() { |
|---|
| | | return inspectionTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setInspectionTime(Date inspectionTime) { |
|---|
| | | this.inspectionTime = inspectionTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Long getInspector() { |
|---|
| | | return inspector; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setInspector(Long inspector) { |
|---|
| | | this.inspector = inspector; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Integer getStatus() { |
|---|
| | | return status; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setStatus(Integer status) { |
|---|
| | | this.status = status; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getInspectorName() { |
|---|
| | | return inspectorName; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setInspectorName(String inspectorName) { |
|---|
| | | this.inspectorName = inspectorName; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Date getInspectionStartTime() { |
|---|
| | | return inspectionStartTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setInspectionStartTime(Date inspectionStartTime) { |
|---|
| | | this.inspectionStartTime = inspectionStartTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Date getInspectionEndTime() { |
|---|
| | | return inspectionEndTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setInspectionEndTime(Date inspectionEndTime) { |
|---|
| | | this.inspectionEndTime = inspectionEndTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public List<SafetySelfInspectionItem> getItemList() { |
|---|
| | | return itemList; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setItemList(List<SafetySelfInspectionItem> itemList) { |
|---|
| | | this.itemList = itemList; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.annotation.IdType; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableField; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableId; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableName; |
|---|
| | | import com.fasterxml.jackson.annotation.JsonFormat; |
|---|
| | | |
|---|
| | | import java.io.Serializable; |
|---|
| | | import java.util.Date; |
|---|
| | | import java.util.List; |
|---|
| | | |
|---|
| | | @TableName("safety_self_inspection_item") |
|---|
| | | public class SafetySelfInspectionItem implements Serializable { |
|---|
| | | |
|---|
| | | private final static long serialVersionUID = 1L; |
|---|
| | | |
|---|
| | | /** 自查清单记录id safety_self_inspection_id **/ |
|---|
| | | private Long safetySelfInspectionId; |
|---|
| | | |
|---|
| | | /** 检查项id safety_inspection_item_id **/ |
|---|
| | | private Long safetyInspectionItemId; |
|---|
| | | |
|---|
| | | /** 检查结果0：否决 1：扣分 safety_inspection_item_result **/ |
|---|
| | | private Integer safetyInspectionItemResult; |
|---|
| | | |
|---|
| | | /** 否决项说明 **/ |
|---|
| | | private String safetyInspectionItemResultDesc; |
|---|
| | | |
|---|
| | | /** A级要素名称 **/ |
|---|
| | | @TableField(exist = false) |
|---|
| | | private String elementAName; |
|---|
| | | /** B级要素名称 **/ |
|---|
| | | @TableField(exist = false) |
|---|
| | | private String elementBName; |
|---|
| | | /** A级要素 **/ |
|---|
| | | @TableField(exist = false) |
|---|
| | | private Integer elementA; |
|---|
| | | /** A级要素权重 **/ |
|---|
| | | @TableField(exist = false) |
|---|
| | | private Float elementAWeight; |
|---|
| | | /** B级要素 **/ |
|---|
| | | @TableField(exist = false) |
|---|
| | | private Integer elementB; |
|---|
| | | /** B级要素 **/ |
|---|
| | | @TableField(exist = false) |
|---|
| | | private Integer point; |
|---|
| | | |
|---|
| | | |
|---|
| | | /** 标准化要求 standardization_requirements **/ |
|---|
| | | @TableField(exist = false) |
|---|
| | | private String standardizationRequirements; |
|---|
| | | |
|---|
| | | /** 企业达标标准 enterprise_standard **/ |
|---|
| | | @TableField(exist = false) |
|---|
| | | private String enterpriseStandard; |
|---|
| | | |
|---|
| | | /** 评审方法 review_method **/ |
|---|
| | | @TableField(exist = false) |
|---|
| | | private String reviewMethod; |
|---|
| | | |
|---|
| | | /** 否决项 veto **/ |
|---|
| | | @TableField(exist = false) |
|---|
| | | private String veto; |
|---|
| | | |
|---|
| | | @TableField(exist = false) |
|---|
| | | /** 扣分项集合 **/ |
|---|
| | | private List<SafetySelfInspectionItemDeduction> selfDeductionList; |
|---|
| | | |
|---|
| | | |
|---|
| | | /** 主键id id **/ |
|---|
| | | @TableId(type = IdType.AUTO) |
|---|
| | | private Long id; |
|---|
| | | |
|---|
| | | /** 有效标识 valid_flag **/ |
|---|
| | | private Boolean validFlag; |
|---|
| | | |
|---|
| | | /** 创建时间 create_time **/ |
|---|
| | | private Date createTime; |
|---|
| | | |
|---|
| | | /** 创建人 create_by **/ |
|---|
| | | private String createBy; |
|---|
| | | |
|---|
| | | /** 最新更新时间 update_time **/ |
|---|
| | | private Date updateTime; |
|---|
| | | |
|---|
| | | /** 最后更新人 update_by **/ |
|---|
| | | private String updateBy; |
|---|
| | | |
|---|
| | | |
|---|
| | | /** 主键id id **/ |
|---|
| | | public Long getId() { |
|---|
| | | return id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 主键id id **/ |
|---|
| | | public void setId(Long id) { |
|---|
| | | this.id = id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 有效标识 valid_flag **/ |
|---|
| | | public Boolean getValidFlag() { |
|---|
| | | return validFlag; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 有效标识 valid_flag **/ |
|---|
| | | public void setValidFlag(Boolean validFlag) { |
|---|
| | | this.validFlag = validFlag; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建时间 create_time **/ |
|---|
| | | public Date getCreateTime() { |
|---|
| | | return createTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建时间 create_time **/ |
|---|
| | | public void setCreateTime(Date createTime) { |
|---|
| | | this.createTime = createTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建人 create_by **/ |
|---|
| | | public String getCreateBy() { |
|---|
| | | return createBy; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建人 create_by **/ |
|---|
| | | public void setCreateBy(String createBy) { |
|---|
| | | this.createBy = createBy == null ? null : createBy.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最新更新时间 update_time **/ |
|---|
| | | public Date getUpdateTime() { |
|---|
| | | return updateTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最新更新时间 update_time **/ |
|---|
| | | public void setUpdateTime(Date updateTime) { |
|---|
| | | this.updateTime = updateTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最后更新人 update_by **/ |
|---|
| | | public String getUpdateBy() { |
|---|
| | | return updateBy; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最后更新人 update_by **/ |
|---|
| | | public void setUpdateBy(String updateBy) { |
|---|
| | | this.updateBy = updateBy == null ? null : updateBy.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Long getSafetySelfInspectionId() { |
|---|
| | | return safetySelfInspectionId; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setSafetySelfInspectionId(Long safetySelfInspectionId) { |
|---|
| | | this.safetySelfInspectionId = safetySelfInspectionId; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Long getSafetyInspectionItemId() { |
|---|
| | | return safetyInspectionItemId; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setSafetyInspectionItemId(Long safetyInspectionItemId) { |
|---|
| | | this.safetyInspectionItemId = safetyInspectionItemId; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Integer getSafetyInspectionItemResult() { |
|---|
| | | return safetyInspectionItemResult; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setSafetyInspectionItemResult(Integer safetyInspectionItemResult) { |
|---|
| | | this.safetyInspectionItemResult = safetyInspectionItemResult; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getSafetyInspectionItemResultDesc() { |
|---|
| | | return safetyInspectionItemResultDesc; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setSafetyInspectionItemResultDesc(String safetyInspectionItemResultDesc) { |
|---|
| | | this.safetyInspectionItemResultDesc = safetyInspectionItemResultDesc; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getElementAName() { |
|---|
| | | return elementAName; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setElementAName(String elementAName) { |
|---|
| | | this.elementAName = elementAName; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getElementBName() { |
|---|
| | | return elementBName; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setElementBName(String elementBName) { |
|---|
| | | this.elementBName = elementBName; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getStandardizationRequirements() { |
|---|
| | | return standardizationRequirements; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setStandardizationRequirements(String standardizationRequirements) { |
|---|
| | | this.standardizationRequirements = standardizationRequirements; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getEnterpriseStandard() { |
|---|
| | | return enterpriseStandard; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setEnterpriseStandard(String enterpriseStandard) { |
|---|
| | | this.enterpriseStandard = enterpriseStandard; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getReviewMethod() { |
|---|
| | | return reviewMethod; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setReviewMethod(String reviewMethod) { |
|---|
| | | this.reviewMethod = reviewMethod; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getVeto() { |
|---|
| | | return veto; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setVeto(String veto) { |
|---|
| | | this.veto = veto; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public List<SafetySelfInspectionItemDeduction> getSelfDeductionList() { |
|---|
| | | return selfDeductionList; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setSelfDeductionList(List<SafetySelfInspectionItemDeduction> selfDeductionList) { |
|---|
| | | this.selfDeductionList = selfDeductionList; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Integer getElementA() { |
|---|
| | | return elementA; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setElementA(Integer elementA) { |
|---|
| | | this.elementA = elementA; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Integer getElementB() { |
|---|
| | | return elementB; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setElementB(Integer elementB) { |
|---|
| | | this.elementB = elementB; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Integer getPoint() { |
|---|
| | | return point; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setPoint(Integer point) { |
|---|
| | | this.point = point; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Float getElementAWeight() { |
|---|
| | | return elementAWeight; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setElementAWeight(Float elementAWeight) { |
|---|
| | | this.elementAWeight = elementAWeight; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.annotation.IdType; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableField; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableId; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableName; |
|---|
| | | |
|---|
| | | import java.io.Serializable; |
|---|
| | | import java.util.Date; |
|---|
| | | |
|---|
| | | @TableName("safety_self_inspection_item_deduction") |
|---|
| | | public class SafetySelfInspectionItemDeduction implements Serializable { |
|---|
| | | |
|---|
| | | private final static long serialVersionUID = 1L; |
|---|
| | | |
|---|
| | | /** 自查清单记录的检查项id safety_self_inspection_item_id **/ |
|---|
| | | private Long safetySelfInspectionItemId; |
|---|
| | | |
|---|
| | | /** 扣分项id safety_inspection_item_deduction_id **/ |
|---|
| | | private Long safetyInspectionItemDeductionId; |
|---|
| | | |
|---|
| | | /** 扣分数 point **/ |
|---|
| | | private Integer point; |
|---|
| | | |
|---|
| | | /** 备注 remark **/ |
|---|
| | | private String remark; |
|---|
| | | |
|---|
| | | /** 名称 name **/ |
|---|
| | | @TableField(exist = false) |
|---|
| | | private String name; |
|---|
| | | |
|---|
| | | |
|---|
| | | /** 主键id id **/ |
|---|
| | | @TableId(type = IdType.AUTO) |
|---|
| | | private Long id; |
|---|
| | | |
|---|
| | | /** 有效标识 valid_flag **/ |
|---|
| | | private Boolean validFlag; |
|---|
| | | |
|---|
| | | /** 创建时间 create_time **/ |
|---|
| | | private Date createTime; |
|---|
| | | |
|---|
| | | /** 创建人 create_by **/ |
|---|
| | | private String createBy; |
|---|
| | | |
|---|
| | | /** 最新更新时间 update_time **/ |
|---|
| | | private Date updateTime; |
|---|
| | | |
|---|
| | | /** 最后更新人 update_by **/ |
|---|
| | | private String updateBy; |
|---|
| | | |
|---|
| | | |
|---|
| | | /** 主键id id **/ |
|---|
| | | public Long getId() { |
|---|
| | | return id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 主键id id **/ |
|---|
| | | public void setId(Long id) { |
|---|
| | | this.id = id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 有效标识 valid_flag **/ |
|---|
| | | public Boolean getValidFlag() { |
|---|
| | | return validFlag; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 有效标识 valid_flag **/ |
|---|
| | | public void setValidFlag(Boolean validFlag) { |
|---|
| | | this.validFlag = validFlag; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建时间 create_time **/ |
|---|
| | | public Date getCreateTime() { |
|---|
| | | return createTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建时间 create_time **/ |
|---|
| | | public void setCreateTime(Date createTime) { |
|---|
| | | this.createTime = createTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建人 create_by **/ |
|---|
| | | public String getCreateBy() { |
|---|
| | | return createBy; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建人 create_by **/ |
|---|
| | | public void setCreateBy(String createBy) { |
|---|
| | | this.createBy = createBy == null ? null : createBy.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最新更新时间 update_time **/ |
|---|
| | | public Date getUpdateTime() { |
|---|
| | | return updateTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最新更新时间 update_time **/ |
|---|
| | | public void setUpdateTime(Date updateTime) { |
|---|
| | | this.updateTime = updateTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最后更新人 update_by **/ |
|---|
| | | public String getUpdateBy() { |
|---|
| | | return updateBy; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 最后更新人 update_by **/ |
|---|
| | | public void setUpdateBy(String updateBy) { |
|---|
| | | this.updateBy = updateBy == null ? null : updateBy.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Long getSafetySelfInspectionItemId() { |
|---|
| | | return safetySelfInspectionItemId; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setSafetySelfInspectionItemId(Long safetySelfInspectionItemId) { |
|---|
| | | this.safetySelfInspectionItemId = safetySelfInspectionItemId; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Long getSafetyInspectionItemDeductionId() { |
|---|
| | | return safetyInspectionItemDeductionId; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setSafetyInspectionItemDeductionId(Long safetyInspectionItemDeductionId) { |
|---|
| | | this.safetyInspectionItemDeductionId = safetyInspectionItemDeductionId; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Integer getPoint() { |
|---|
| | | return point; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setPoint(Integer point) { |
|---|
| | | this.point = point; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getRemark() { |
|---|
| | | return remark; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setRemark(String remark) { |
|---|
| | | this.remark = remark; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getName() { |
|---|
| | | return name; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setName(String name) { |
|---|
| | | this.name = name; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.annotation.IdType; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableField; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableId; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableName; |
|---|
| | | import io.swagger.annotations.ApiModel; |
|---|
| | | import io.swagger.annotations.ApiModelProperty; |
|---|
| | | |
|---|
| | | import java.io.Serializable; |
|---|
| | | import java.util.Date; |
|---|
| | | |
|---|
| | | @ApiModel("检查内容类") |
|---|
| | | @TableName("selfcheck") |
|---|
| | | public class SelfCheckInfo implements Serializable { |
|---|
| | | @TableField(exist = false) |
|---|
| | | private static final long serialVersionUID = 1L; |
|---|
| | | |
|---|
| | | @TableId(type = IdType.AUTO) |
|---|
| | | private Long id; |
|---|
| | | |
|---|
| | | |
|---|
| | | /** 作业类型 tasktype **/ |
|---|
| | | @ApiModelProperty("作业类型") |
|---|
| | | private String tasktype; |
|---|
| | | |
|---|
| | | /** 类型 type **/ |
|---|
| | | @ApiModelProperty("类型") |
|---|
| | | private String type; |
|---|
| | | |
|---|
| | | /** 检查类型 填空、判断 type **/ |
|---|
| | | @ApiModelProperty("检查类型") |
|---|
| | | private String checktype; |
|---|
| | | |
|---|
| | | |
|---|
| | | /** 检查内容 content **/ |
|---|
| | | @ApiModelProperty("检查内容") |
|---|
| | | private String content; |
|---|
| | | |
|---|
| | | /** 参考判断 standard **/ |
|---|
| | | @ApiModelProperty("参考判断") |
|---|
| | | private String standard; |
|---|
| | | |
|---|
| | | /** 排序 sort **/ |
|---|
| | | @ApiModelProperty("排序") |
|---|
| | | private Integer sort; |
|---|
| | | |
|---|
| | | /** 是否删除 isdel **/ |
|---|
| | | @ApiModelProperty("是否删除") |
|---|
| | | private Byte isdel; |
|---|
| | | |
|---|
| | | /** 备注 description **/ |
|---|
| | | @ApiModelProperty("备注") |
|---|
| | | private String description; |
|---|
| | | |
|---|
| | | /** 创建人 createdby **/ |
|---|
| | | @ApiModelProperty("创建人") |
|---|
| | | private String createdby; |
|---|
| | | |
|---|
| | | /** 创建时间 createddate **/ |
|---|
| | | @ApiModelProperty("创建时间") |
|---|
| | | private Date createddate; |
|---|
| | | |
|---|
| | | /** 更新人 modifiedby **/ |
|---|
| | | @ApiModelProperty("更新人") |
|---|
| | | private String modifiedby; |
|---|
| | | |
|---|
| | | /** 更新时间 modifieddate **/ |
|---|
| | | @ApiModelProperty("更新时间") |
|---|
| | | private Date modifieddate; |
|---|
| | | |
|---|
| | | /** id id **/ |
|---|
| | | public Long getId() { |
|---|
| | | return id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** id id **/ |
|---|
| | | public void setId(Long id) { |
|---|
| | | this.id = id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 类型 type **/ |
|---|
| | | public String getType() { |
|---|
| | | return type; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 类型 type **/ |
|---|
| | | public void setType(String type) { |
|---|
| | | this.type = type == null ? null : type.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 检查内容 content **/ |
|---|
| | | public String getContent() { |
|---|
| | | return content; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 检查内容 content **/ |
|---|
| | | public void setContent(String content) { |
|---|
| | | this.content = content == null ? null : content.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 参考判断 standard **/ |
|---|
| | | public String getStandard() { |
|---|
| | | return standard; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 参考判断 standard **/ |
|---|
| | | public void setStandard(String standard) { |
|---|
| | | this.standard = standard == null ? null : standard.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 排序 sort **/ |
|---|
| | | public Integer getSort() { |
|---|
| | | return sort; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 排序 sort **/ |
|---|
| | | public void setSort(Integer sort) { |
|---|
| | | this.sort = sort; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 是否删除 isdel **/ |
|---|
| | | public Byte getIsdel() { |
|---|
| | | return isdel; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 是否删除 isdel **/ |
|---|
| | | public void setIsdel(Byte isdel) { |
|---|
| | | this.isdel = isdel; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 备注 description **/ |
|---|
| | | public String getDescription() { |
|---|
| | | return description; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 备注 description **/ |
|---|
| | | public void setDescription(String description) { |
|---|
| | | this.description = description == null ? null : description.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建人 createdby **/ |
|---|
| | | public String getCreatedby() { |
|---|
| | | return createdby; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建人 createdby **/ |
|---|
| | | public void setCreatedby(String createdby) { |
|---|
| | | this.createdby = createdby == null ? null : createdby.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建时间 createddate **/ |
|---|
| | | public Date getCreateddate() { |
|---|
| | | return createddate; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建时间 createddate **/ |
|---|
| | | public void setCreateddate(Date createddate) { |
|---|
| | | this.createddate = createddate; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 更新人 modifiedby **/ |
|---|
| | | public String getModifiedby() { |
|---|
| | | return modifiedby; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 更新人 modifiedby **/ |
|---|
| | | public void setModifiedby(String modifiedby) { |
|---|
| | | this.modifiedby = modifiedby == null ? null : modifiedby.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 更新时间 modifieddate **/ |
|---|
| | | public Date getModifieddate() { |
|---|
| | | return modifieddate; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 更新时间 modifieddate **/ |
|---|
| | | public void setModifieddate(Date modifieddate) { |
|---|
| | | this.modifieddate = modifieddate; |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | public String getChecktype() { |
|---|
| | | return checktype; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setChecktype(String checktype) { |
|---|
| | | this.checktype = checktype; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getTasktype() { |
|---|
| | | return tasktype; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setTasktype(String tasktype) { |
|---|
| | | this.tasktype = tasktype; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.annotation.IdType; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableId; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableName; |
|---|
| | | import com.gk.hotwork.Domain.Enum.SendStatus; |
|---|
| | | import com.gk.hotwork.Domain.Enum.SmsSource; |
|---|
| | | |
|---|
| | | import java.io.Serializable; |
|---|
| | | import java.util.Date; |
|---|
| | | |
|---|
| | | @TableName("sms_log") |
|---|
| | | public class SmsLog implements Serializable { |
|---|
| | | /** 主键id id **/ |
|---|
| | | @TableId(type = IdType.AUTO) |
|---|
| | | private Long id; |
|---|
| | | |
|---|
| | | /** 手机号 phone **/ |
|---|
| | | private String phone; |
|---|
| | | |
|---|
| | | /** 发送内容 content **/ |
|---|
| | | private String content; |
|---|
| | | |
|---|
| | | /** 发送时间 send_time **/ |
|---|
| | | private Date sendTime; |
|---|
| | | |
|---|
| | | /** 创建时间 create_time **/ |
|---|
| | | private Date createTime; |
|---|
| | | |
|---|
| | | /** 创建人 createby **/ |
|---|
| | | private String createby; |
|---|
| | | |
|---|
| | | /** 来源 source **/ |
|---|
| | | private Integer source; |
|---|
| | | |
|---|
| | | private String phoneUser; |
|---|
| | | |
|---|
| | | private Integer sendStatus; |
|---|
| | | |
|---|
| | | private String failureReason; |
|---|
| | | |
|---|
| | | /** 主键id id **/ |
|---|
| | | public Long getId() { |
|---|
| | | return id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 主键id id **/ |
|---|
| | | public void setId(Long id) { |
|---|
| | | this.id = id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 手机号 phone **/ |
|---|
| | | public String getPhone() { |
|---|
| | | return phone; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 手机号 phone **/ |
|---|
| | | public void setPhone(String phone) { |
|---|
| | | this.phone = phone == null ? null : phone.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 发送内容 content **/ |
|---|
| | | public String getContent() { |
|---|
| | | return content; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 发送内容 content **/ |
|---|
| | | public void setContent(String content) { |
|---|
| | | this.content = content == null ? null : content.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 发送时间 send_time **/ |
|---|
| | | public Date getSendTime() { |
|---|
| | | return sendTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 发送时间 send_time **/ |
|---|
| | | public void setSendTime(Date sendTime) { |
|---|
| | | this.sendTime = sendTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建时间 create_time **/ |
|---|
| | | public Date getCreateTime() { |
|---|
| | | return createTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建时间 create_time **/ |
|---|
| | | public void setCreateTime(Date createTime) { |
|---|
| | | this.createTime = createTime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建人 createby **/ |
|---|
| | | public String getCreateby() { |
|---|
| | | return createby; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 创建人 createby **/ |
|---|
| | | public void setCreateby(String createby) { |
|---|
| | | this.createby = createby == null ? null : createby.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | public String getPhoneUser() { |
|---|
| | | return phoneUser; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setPhoneUser(String phoneUser) { |
|---|
| | | this.phoneUser = phoneUser; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getFailureReason() { |
|---|
| | | return failureReason; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setFailureReason(String failureReason) { |
|---|
| | | this.failureReason = failureReason; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Integer getSource() { |
|---|
| | | return source; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setSource(Integer source) { |
|---|
| | | this.source = source; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Integer getSendStatus() { |
|---|
| | | return sendStatus; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setSendStatus(Integer sendStatus) { |
|---|
| | | this.sendStatus = sendStatus; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.annotation.IdType; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableField; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableId; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableName; |
|---|
| | | |
|---|
| | | import java.io.Serializable; |
|---|
| | | import java.util.Date; |
|---|
| | | |
|---|
| | | @TableName("smslog") |
|---|
| | | public class SmsLogInfo implements Serializable { |
|---|
| | | @TableField(exist = false) |
|---|
| | | private static final long serialVersionUID = 1L; |
|---|
| | | |
|---|
| | | @TableId(type = IdType.AUTO) |
|---|
| | | /** id id **/ |
|---|
| | | private Long id; |
|---|
| | | |
|---|
| | | /** 手机号 mobile **/ |
|---|
| | | private String mobile; |
|---|
| | | |
|---|
| | | /** 发送时间 sendtime **/ |
|---|
| | | private Date sendtime; |
|---|
| | | |
|---|
| | | /** 发送次数 times **/ |
|---|
| | | private Integer times; |
|---|
| | | |
|---|
| | | /**时间类型 1小时 2天**/ |
|---|
| | | private Byte type; |
|---|
| | | |
|---|
| | | /** id id **/ |
|---|
| | | public Long getId() { |
|---|
| | | return id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** id id **/ |
|---|
| | | public void setId(Long id) { |
|---|
| | | this.id = id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 手机号 mobile **/ |
|---|
| | | public String getMobile() { |
|---|
| | | return mobile; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 手机号 mobile **/ |
|---|
| | | public void setMobile(String mobile) { |
|---|
| | | this.mobile = mobile == null ? null : mobile.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 发送时间 sendtime **/ |
|---|
| | | public Date getSendtime() { |
|---|
| | | return sendtime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 发送时间 sendtime **/ |
|---|
| | | public void setSendtime(Date sendtime) { |
|---|
| | | this.sendtime = sendtime; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 发送次数 times **/ |
|---|
| | | public Integer getTimes() { |
|---|
| | | return times; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 发送次数 times **/ |
|---|
| | | public void setTimes(Integer times) { |
|---|
| | | this.times = times; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Byte getType() { |
|---|
| | | return type; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setType(Byte type) { |
|---|
| | | this.type = type; |
|---|
| | | } |
|---|
| | | } |
|---|
| 对比新文件 |
| | |
|---|
| | | package com.gk.hotwork.Domain; |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.annotation.IdType; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableField; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableId; |
|---|
| | | import com.baomidou.mybatisplus.annotation.TableName; |
|---|
| | | |
|---|
| | | import java.io.Serializable; |
|---|
| | | import java.util.List; |
|---|
| | | |
|---|
| | | @TableName("subtask") |
|---|
| | | public class SubTaskInfo implements Serializable { |
|---|
| | | |
|---|
| | | @TableField(exist = false) |
|---|
| | | private static final long serialVersionUID = 1L; |
|---|
| | | |
|---|
| | | @TableId(type = IdType.AUTO) |
|---|
| | | private Long id; |
|---|
| | | |
|---|
| | | /** 任务编号 taskcode **/ |
|---|
| | | private String taskcode; |
|---|
| | | |
|---|
| | | /** 作业类型 type **/ |
|---|
| | | private String type; |
|---|
| | | |
|---|
| | | /** 作业类别 category **/ |
|---|
| | | private String category; |
|---|
| | | |
|---|
| | | /** 作业级别 level **/ |
|---|
| | | private Byte level; |
|---|
| | | |
|---|
| | | /** 是否选中（0：否；1：是） checked **/ |
|---|
| | | private Byte checked; |
|---|
| | | |
|---|
| | | /** 受限空间分类 spacecategory **/ |
|---|
| | | private String spacecategory; |
|---|
| | | |
|---|
| | | /** 受限空间名称 spacename **/ |
|---|
| | | private String spacename; |
|---|
| | | |
|---|
| | | /** 受限空间介质名称 spacemedium **/ |
|---|
| | | private String spacemedium; |
|---|
| | | |
|---|
| | | /** 是否酸碱腐蚀 acibase **/ |
|---|
| | | private String acibase; |
|---|
| | | |
|---|
| | | /** 吊装作业重量（单位：t） hoistingweight **/ |
|---|
| | | private Double hoistingweight; |
|---|
| | | |
|---|
| | | /** 动土作业深度（单位：m） soildepth **/ |
|---|
| | | private Double soildepth; |
|---|
| | | |
|---|
| | | /** 动土作业面积（单位：㎡） soilarea **/ |
|---|
| | | private Double soilarea; |
|---|
| | | |
|---|
| | | /** 动土文件地址 soilfile **/ |
|---|
| | | @TableField(exist = false) |
|---|
| | | private List<TaskEnclosure> soilfile; |
|---|
| | | |
|---|
| | | /** 断路原因 breakreason **/ |
|---|
| | | private String breakreason; |
|---|
| | | |
|---|
| | | @TableField(exist = false) |
|---|
| | | private List<TaskEnclosure> breakfile; |
|---|
| | | |
|---|
| | | /** 高处作业作业高度 workheight **/ |
|---|
| | | private Double workheight; |
|---|
| | | |
|---|
| | | /** 电源接入点 electricityarea **/ |
|---|
| | | private String electricityarea; |
|---|
| | | |
|---|
| | | /** 工作电压 voltage **/ |
|---|
| | | private String voltage; |
|---|
| | | |
|---|
| | | /** 功率 power **/ |
|---|
| | | private String power; |
|---|
| | | |
|---|
| | | /** 设备管道名称 pipename **/ |
|---|
| | | private String pipename; |
|---|
| | | |
|---|
| | | /** 设备管道介质 pipemedium **/ |
|---|
| | | private String pipemedium; |
|---|
| | | |
|---|
| | | /** 设备管道温度 pipetemperature **/ |
|---|
| | | private String pipetemperature; |
|---|
| | | |
|---|
| | | /** 设备管道压力 pipepressure **/ |
|---|
| | | private String pipepressure; |
|---|
| | | |
|---|
| | | /** 盲板材质 blindboardmaterial **/ |
|---|
| | | private String blindboardmaterial; |
|---|
| | | |
|---|
| | | /** 盲板规格 blindboardspecification **/ |
|---|
| | | private String blindboardspecification; |
|---|
| | | |
|---|
| | | /** 盲板编号 blindboardnumber **/ |
|---|
| | | private String blindboardnumber; |
|---|
| | | |
|---|
| | | /** 生产单位作业指挥 commander **/ |
|---|
| | | private String commander; |
|---|
| | | |
|---|
| | | /** 盲板位置图 blindboardlocation **/ |
|---|
| | | @TableField(exist = false) |
|---|
| | | private List<TaskEnclosure> blindboardlocation; |
|---|
| | | |
|---|
| | | /** 动火方式 firetype **/ |
|---|
| | | private String firetype; |
|---|
| | | |
|---|
| | | private String hoistinglevel; |
|---|
| | | |
|---|
| | | private String heightlevel; |
|---|
| | | |
|---|
| | | /** id **/ |
|---|
| | | public Long getId() { |
|---|
| | | return id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** id **/ |
|---|
| | | public void setId(Long id) { |
|---|
| | | this.id = id; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 任务编号 taskcode **/ |
|---|
| | | public String getTaskcode() { |
|---|
| | | return taskcode; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 任务编号 taskcode **/ |
|---|
| | | public void setTaskcode(String taskcode) { |
|---|
| | | this.taskcode = taskcode == null ? null : taskcode.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 作业类型 type **/ |
|---|
| | | public String getType() { |
|---|
| | | return type; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 作业类型 type **/ |
|---|
| | | public void setType(String type) { |
|---|
| | | this.type = type == null ? null : type.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 作业类别 category **/ |
|---|
| | | public String getCategory() { |
|---|
| | | return category; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 作业类别 category **/ |
|---|
| | | public void setCategory(String category) { |
|---|
| | | this.category = category == null ? null : category.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 作业级别 level **/ |
|---|
| | | public Byte getLevel() { |
|---|
| | | return level; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 作业级别 level **/ |
|---|
| | | public void setLevel(Byte level) { |
|---|
| | | this.level = level; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 是否选中（0：否；1：是） checked **/ |
|---|
| | | public Byte getChecked() { |
|---|
| | | return checked; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 是否选中（0：否；1：是） checked **/ |
|---|
| | | public void setChecked(Byte checked) { |
|---|
| | | this.checked = checked; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 受限空间分类 spacecategory **/ |
|---|
| | | public String getSpacecategory() { |
|---|
| | | return spacecategory; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 受限空间分类 spacecategory **/ |
|---|
| | | public void setSpacecategory(String spacecategory) { |
|---|
| | | this.spacecategory = spacecategory == null ? null : spacecategory.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 受限空间名称 spacename **/ |
|---|
| | | public String getSpacename() { |
|---|
| | | return spacename; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 受限空间名称 spacename **/ |
|---|
| | | public void setSpacename(String spacename) { |
|---|
| | | this.spacename = spacename == null ? null : spacename.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 受限空间介质名称 spacemedium **/ |
|---|
| | | public String getSpacemedium() { |
|---|
| | | return spacemedium; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 受限空间介质名称 spacemedium **/ |
|---|
| | | public void setSpacemedium(String spacemedium) { |
|---|
| | | this.spacemedium = spacemedium == null ? null : spacemedium.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 是否酸碱腐蚀 acibase **/ |
|---|
| | | public String getAcibase() { |
|---|
| | | return acibase; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 是否酸碱腐蚀 acibase **/ |
|---|
| | | public void setAcibase(String acibase) { |
|---|
| | | this.acibase = acibase == null ? null : acibase.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 吊装作业重量（单位：t） hoistingweight **/ |
|---|
| | | public Double getHoistingweight() { |
|---|
| | | return hoistingweight; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 吊装作业重量（单位：t） hoistingweight **/ |
|---|
| | | public void setHoistingweight(Double hoistingweight) { |
|---|
| | | this.hoistingweight = hoistingweight; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 动土作业深度（单位：m） soildepth **/ |
|---|
| | | public Double getSoildepth() { |
|---|
| | | return soildepth; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 动土作业深度（单位：m） soildepth **/ |
|---|
| | | public void setSoildepth(Double soildepth) { |
|---|
| | | this.soildepth = soildepth; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 动土作业面积（单位：㎡） soilarea **/ |
|---|
| | | public Double getSoilarea() { |
|---|
| | | return soilarea; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 动土作业面积（单位：㎡） soilarea **/ |
|---|
| | | public void setSoilarea(Double soilarea) { |
|---|
| | | this.soilarea = soilarea; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public List<TaskEnclosure> getSoilfile() { |
|---|
| | | return soilfile; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setSoilfile(List<TaskEnclosure> soilfile) { |
|---|
| | | this.soilfile = soilfile; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 断路原因 breakreason **/ |
|---|
| | | public String getBreakreason() { |
|---|
| | | return breakreason; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 断路原因 breakreason **/ |
|---|
| | | public void setBreakreason(String breakreason) { |
|---|
| | | this.breakreason = breakreason == null ? null : breakreason.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 高处作业作业高度 workheight **/ |
|---|
| | | public Double getWorkheight() { |
|---|
| | | return workheight; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 高处作业作业高度 workheight **/ |
|---|
| | | public void setWorkheight(Double workheight) { |
|---|
| | | this.workheight = workheight; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 电源接入点 electricityarea **/ |
|---|
| | | public String getElectricityarea() { |
|---|
| | | return electricityarea; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 电源接入点 electricityarea **/ |
|---|
| | | public void setElectricityarea(String electricityarea) { |
|---|
| | | this.electricityarea = electricityarea == null ? null : electricityarea.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 工作电压 voltage **/ |
|---|
| | | public String getVoltage() { |
|---|
| | | return voltage; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 工作电压 voltage **/ |
|---|
| | | public void setVoltage(String voltage) { |
|---|
| | | this.voltage = voltage == null ? null : voltage.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 功率 power **/ |
|---|
| | | public String getPower() { |
|---|
| | | return power; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 功率 power **/ |
|---|
| | | public void setPower(String power) { |
|---|
| | | this.power = power == null ? null : power.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 设备管道名称 pipename **/ |
|---|
| | | public String getPipename() { |
|---|
| | | return pipename; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 设备管道名称 pipename **/ |
|---|
| | | public void setPipename(String pipename) { |
|---|
| | | this.pipename = pipename == null ? null : pipename.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 设备管道介质 pipemedium **/ |
|---|
| | | public String getPipemedium() { |
|---|
| | | return pipemedium; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 设备管道介质 pipemedium **/ |
|---|
| | | public void setPipemedium(String pipemedium) { |
|---|
| | | this.pipemedium = pipemedium == null ? null : pipemedium.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 设备管道温度 pipetemperature **/ |
|---|
| | | public String getPipetemperature() { |
|---|
| | | return pipetemperature; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 设备管道温度 pipetemperature **/ |
|---|
| | | public void setPipetemperature(String pipetemperature) { |
|---|
| | | this.pipetemperature = pipetemperature == null ? null : pipetemperature.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 设备管道压力 pipepressure **/ |
|---|
| | | public String getPipepressure() { |
|---|
| | | return pipepressure; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 设备管道压力 pipepressure **/ |
|---|
| | | public void setPipepressure(String pipepressure) { |
|---|
| | | this.pipepressure = pipepressure == null ? null : pipepressure.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 盲板材质 blindboardmaterial **/ |
|---|
| | | public String getBlindboardmaterial() { |
|---|
| | | return blindboardmaterial; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 盲板材质 blindboardmaterial **/ |
|---|
| | | public void setBlindboardmaterial(String blindboardmaterial) { |
|---|
| | | this.blindboardmaterial = blindboardmaterial == null ? null : blindboardmaterial.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 盲板规格 blindboardspecification **/ |
|---|
| | | public String getBlindboardspecification() { |
|---|
| | | return blindboardspecification; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 盲板规格 blindboardspecification **/ |
|---|
| | | public void setBlindboardspecification(String blindboardspecification) { |
|---|
| | | this.blindboardspecification = blindboardspecification == null ? null : blindboardspecification.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 盲板编号 blindboardnumber **/ |
|---|
| | | public String getBlindboardnumber() { |
|---|
| | | return blindboardnumber; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 盲板编号 blindboardnumber **/ |
|---|
| | | public void setBlindboardnumber(String blindboardnumber) { |
|---|
| | | this.blindboardnumber = blindboardnumber == null ? null : blindboardnumber.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 生产单位作业指挥 commander **/ |
|---|
| | | public String getCommander() { |
|---|
| | | return commander; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 生产单位作业指挥 commander **/ |
|---|
| | | public void setCommander(String commander) { |
|---|
| | | this.commander = commander == null ? null : commander.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | public List<TaskEnclosure> getBreakfile() { |
|---|
| | | return breakfile; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setBreakfile(List<TaskEnclosure> breakfile) { |
|---|
| | | this.breakfile = breakfile; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public List<TaskEnclosure> getBlindboardlocation() { |
|---|
| | | return blindboardlocation; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setBlindboardlocation(List<TaskEnclosure> blindboardlocation) { |
|---|
| | | this.blindboardlocation = blindboardlocation; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 动火方式 firetype **/ |
|---|
| | | public String getFiretype() { |
|---|
| | | return firetype; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 动火方式 firetype **/ |
|---|
| | | public void setFiretype(String firetype) { |
|---|
| | | this.firetype = firetype == null ? null : firetype.trim(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getHoistinglevel() { |
|---|
| | | return hoistinglevel; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setHoistinglevel(String hoistinglevel) { |
|---|
| | | this.hoistinglevel = hoistinglevel; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public String getHeightlevel() { |
|---|
| | | return heightlevel; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public void setHeightlevel(String heightlevel) { |
|---|
| | | this.heightlevel = heightlevel; |
|---|
| | | } |
|---|
| | | } |
|---|
| src/main/java/com/gk/hotwork/Domain/TaskAnalysis.java
src/main/java/com/gk/hotwork/Domain/TaskEnclosure.java
src/main/java/com/gk/hotwork/Domain/TaskEquipment.java
src/main/java/com/gk/hotwork/Domain/TaskEquipmentBindInfo.java
src/main/java/com/gk/hotwork/Domain/TaskGasInfo.java
src/main/java/com/gk/hotwork/Domain/TaskInfo.java
src/main/java/com/gk/hotwork/Domain/TaskInvolveDepartment.java
src/main/java/com/gk/hotwork/Domain/TaskLocationInfo.java
src/main/java/com/gk/hotwork/Domain/TaskLog.java
src/main/java/com/gk/hotwork/Domain/TaskReview.java
src/main/java/com/gk/hotwork/Domain/TaskRisk.java
src/main/java/com/gk/hotwork/Domain/TaskSecurity.java
src/main/java/com/gk/hotwork/Domain/TaskWorker.java
src/main/java/com/gk/hotwork/Domain/UserFace.java
src/main/java/com/gk/hotwork/Domain/UserInfo.java
src/main/java/com/gk/hotwork/Domain/UserRolesInfo.java
src/main/java/com/gk/hotwork/Domain/Utils/Base64Encrypt.java
src/main/java/com/gk/hotwork/Domain/Utils/BeanProperty.java
src/main/java/com/gk/hotwork/Domain/Utils/BeanUtils.java
src/main/java/com/gk/hotwork/Domain/Utils/BooleanReason.java
src/main/java/com/gk/hotwork/Domain/Utils/CodeUtils.java
src/main/java/com/gk/hotwork/Domain/Utils/CommonUtil.java
src/main/java/com/gk/hotwork/Domain/Utils/ConfigUtil.java
src/main/java/com/gk/hotwork/Domain/Utils/Constants.java
src/main/java/com/gk/hotwork/Domain/Utils/DateUtils.java
src/main/java/com/gk/hotwork/Domain/Utils/DigestUtils.java
src/main/java/com/gk/hotwork/Domain/Utils/ExcelProperty.java
src/main/java/com/gk/hotwork/Domain/Utils/FileOptUtils.java
src/main/java/com/gk/hotwork/Domain/Utils/FilterObject.java
src/main/java/com/gk/hotwork/Domain/Utils/HexUtil.java
src/main/java/com/gk/hotwork/Domain/Utils/HttpUtils.java
src/main/java/com/gk/hotwork/Domain/Utils/IdCardUtil.java
src/main/java/com/gk/hotwork/Domain/Utils/JacksonObjectMapper.java
src/main/java/com/gk/hotwork/Domain/Utils/JaxbUtils.java
src/main/java/com/gk/hotwork/Domain/Utils/JsonUtils.java
src/main/java/com/gk/hotwork/Domain/Utils/LocationUtils.java
src/main/java/com/gk/hotwork/Domain/Utils/MD5Utils.java
src/main/java/com/gk/hotwork/Domain/Utils/MatrixToImageWriter.java
src/main/java/com/gk/hotwork/Domain/Utils/Message.java
src/main/java/com/gk/hotwork/Domain/Utils/Msg.java
src/main/java/com/gk/hotwork/Domain/Utils/PageInfo.java
src/main/java/com/gk/hotwork/Domain/Utils/PageUtil.java
src/main/java/com/gk/hotwork/Domain/Utils/PageUtils.java
src/main/java/com/gk/hotwork/Domain/Utils/Properties.java
src/main/java/com/gk/hotwork/Domain/Utils/QRCode.java
src/main/java/com/gk/hotwork/Domain/Utils/RPCUtils.java
src/main/java/com/gk/hotwork/Domain/Utils/Result.java
src/main/java/com/gk/hotwork/Domain/Utils/SignUtils.java
src/main/java/com/gk/hotwork/Domain/Utils/SpringBeanUtil.java
src/main/java/com/gk/hotwork/Domain/Utils/StringUtils.java
src/main/java/com/gk/hotwork/Domain/Utils/Tree.java
src/main/java/com/gk/hotwork/Domain/Utils/UploadUtil.java
src/main/java/com/gk/hotwork/Domain/Utils/WebSocketClientManager.java
src/main/java/com/gk/hotwork/Domain/Utils/WebUtils.java
src/main/java/com/gk/hotwork/Domain/Utils/WordTemplate.java
src/main/java/com/gk/hotwork/Domain/VideoInfo.java
src/main/java/com/gk/hotwork/Domain/Vo/AccountUserVo.java
src/main/java/com/gk/hotwork/Domain/Vo/AppFileVo.java
src/main/java/com/gk/hotwork/Domain/Vo/ApprovalVo.java
src/main/java/com/gk/hotwork/Domain/Vo/AssessApplyAppealVo.java
src/main/java/com/gk/hotwork/Domain/Vo/CheckReportVo.java
src/main/java/com/gk/hotwork/Domain/Vo/CityDataVo.java
src/main/java/com/gk/hotwork/Domain/Vo/ContractStatus.java
src/main/java/com/gk/hotwork/Domain/Vo/DailySaleReport.java
src/main/java/com/gk/hotwork/Domain/Vo/DealingRangeVo.java
src/main/java/com/gk/hotwork/Domain/Vo/DepartmentVo.java
src/main/java/com/gk/hotwork/Domain/Vo/DirectionDetail.java
src/main/java/com/gk/hotwork/Domain/Vo/EquipmentVo.java
src/main/java/com/gk/hotwork/Domain/Vo/ExamScoreVo.java
src/main/java/com/gk/hotwork/Domain/Vo/GenerateCode.java
src/main/java/com/gk/hotwork/Domain/Vo/HelpDocVo.java
src/main/java/com/gk/hotwork/Domain/Vo/HiddenDangerAppVo.java
src/main/java/com/gk/hotwork/Domain/Vo/HiddenDangerBySafeCheckVo.java
src/main/java/com/gk/hotwork/Domain/Vo/HiddenDangerVo.java
src/main/java/com/gk/hotwork/Domain/Vo/Menu.java
src/main/java/com/gk/hotwork/Domain/Vo/PageInfoExtension.java
src/main/java/com/gk/hotwork/Domain/Vo/PageQuery.java
src/main/java/com/gk/hotwork/Domain/Vo/RegisterVo.java
src/main/java/com/gk/hotwork/Domain/Vo/ResultVO.java
src/main/java/com/gk/hotwork/Domain/Vo/RiskAnaUintExoprtVo.java
src/main/java/com/gk/hotwork/Domain/Vo/RiskControlMeasureExportVo.java
src/main/java/com/gk/hotwork/Domain/Vo/RiskEventExportVo.java
src/main/java/com/gk/hotwork/Domain/Vo/RiskMapVO.java
src/main/java/com/gk/hotwork/Domain/Vo/RiskSourceSearchVo.java
src/main/java/com/gk/hotwork/Domain/Vo/RiskSourceVo.java
src/main/java/com/gk/hotwork/Domain/Vo/SearchResultVO.java
src/main/java/com/gk/hotwork/Domain/Vo/SelfCheckVo.java
src/main/java/com/gk/hotwork/Domain/Vo/SortData.java
src/main/java/com/gk/hotwork/Domain/Vo/SortTime.java
src/main/java/com/gk/hotwork/Domain/Vo/TaskCheck.java
src/main/java/com/gk/hotwork/Domain/Vo/TaskEnclosureVo.java
src/main/java/com/gk/hotwork/Domain/Vo/TaskStatistics.java
src/main/java/com/gk/hotwork/Domain/Vo/TaskVo.java
src/main/java/com/gk/hotwork/Domain/Vo/TaskWorkerVo.java
src/main/java/com/gk/hotwork/Domain/Vo/UserVo.java
src/main/java/com/gk/hotwork/Domain/Vo/WorkCertVo.java
src/main/java/com/gk/hotwork/Domain/Vo/WorkShowTaskVo.java
src/main/java/com/gk/hotwork/Domain/Vo/specTask/ActiveTaskInfo.java
src/main/java/com/gk/hotwork/Domain/Vo/specTask/ActiveTaskLocationDto.java
src/main/java/com/gk/hotwork/Domain/Vo/specTask/TaskLocation.java
src/main/java/com/gk/hotwork/Domain/WarningInfo.java
src/main/java/com/gk/hotwork/Domain/WorkCertInfo.java
src/main/java/com/gk/hotwork/Domain/co/ContextCacheUser.java
src/main/java/com/gk/hotwork/Domain/dto/DepInfoRPCRespDTO.java
src/main/java/com/gk/hotwork/Domain/dto/DepartmentDTO.java
src/main/java/com/gk/hotwork/Domain/dto/FourColorMapDto.java
src/main/java/com/gk/hotwork/Domain/dto/FourColorPointLocateDto.java
src/main/java/com/gk/hotwork/Domain/dto/RiskSourceDto.java
src/main/java/com/gk/hotwork/Domain/dto/RiskSourceUpdateDto.java
src/main/java/com/gk/hotwork/Domain/dto/UserDTO.java
src/main/java/com/gk/hotwork/Domain/dto/UserDepRPCRespDTO.java
src/main/java/com/gk/hotwork/Domain/dto/UserEnterpriseRPCRespDTO.java
src/main/java/com/gk/hotwork/Domain/dto/UserInfoRPCRespDTO.java
src/main/java/com/gk/hotwork/Domain/dto/UserRPCRespDTO.java
src/main/java/com/gk/hotwork/HotworkApplication.java
src/main/java/com/gk/hotwork/Mapper/AppFileInfoMapper.java
src/main/java/com/gk/hotwork/Mapper/AuthorizationInfoMapper.java
src/main/java/com/gk/hotwork/Mapper/BlackListInfoMapper.java
src/main/java/com/gk/hotwork/Mapper/CompanyInfoMapper.java
src/main/java/com/gk/hotwork/Mapper/DepartmentInfoMapper.java
src/main/java/com/gk/hotwork/Mapper/DeviceLocationMapper.java
src/main/java/com/gk/hotwork/Mapper/DevicePingMapper.java
src/main/java/com/gk/hotwork/Mapper/DevicePresskeyMapper.java
src/main/java/com/gk/hotwork/Mapper/DictionaryItemInfoMapper.java
src/main/java/com/gk/hotwork/Mapper/DictionaryTypeInfoMapper.java
src/main/java/com/gk/hotwork/Mapper/DistrictInfoMapper.java
src/main/java/com/gk/hotwork/Mapper/ElementManagementMapper.java
src/main/java/com/gk/hotwork/Mapper/EmergencyPlanFileMapper.java
src/main/java/com/gk/hotwork/Mapper/EmergencyPlanMapper.java
src/main/java/com/gk/hotwork/Mapper/EquipmentInfoMapper.java
src/main/java/com/gk/hotwork/Mapper/ExamScoreInfoMapper.java
src/main/java/com/gk/hotwork/Mapper/FourColorMap2Mapper.java
src/main/java/com/gk/hotwork/Mapper/FourColorPointCoordMapper.java
src/main/java/com/gk/hotwork/Mapper/FourColorPointMapper.java
src/main/java/com/gk/hotwork/Mapper/GasWarnInfoMapper.java
src/main/java/com/gk/hotwork/Mapper/HelpDocInfoMapper.java
src/main/java/com/gk/hotwork/Mapper/HiddenDangerLogMapper.java
src/main/java/com/gk/hotwork/Mapper/HiddenDangerMapper.java
src/main/java/com/gk/hotwork/Mapper/HiddenDangerResourceMapper.java
src/main/java/com/gk/hotwork/Mapper/InvolveDepInfoMapper.java
src/main/java/com/gk/hotwork/Mapper/MajorEquipmentAlarmMapper.java
src/main/java/com/gk/hotwork/Mapper/MajorEquipmentDataMapper.java
src/main/java/com/gk/hotwork/Mapper/MajorEquipmentMapper.java
src/main/java/com/gk/hotwork/Mapper/PermissionInfoMapper.java
src/main/java/com/gk/hotwork/Mapper/ReserveMapper.java
src/main/java/com/gk/hotwork/Mapper/RiskAnaUintMapper.java
src/main/java/com/gk/hotwork/Mapper/RiskControlClassifyMapper.java
src/main/java/com/gk/hotwork/Mapper/RiskControlMeasureMapper.java
src/main/java/com/gk/hotwork/Mapper/RiskEventMapper.java
src/main/java/com/gk/hotwork/Mapper/RiskMapRepository.java
src/main/java/com/gk/hotwork/Mapper/RiskSourceMapper.java
src/main/java/com/gk/hotwork/Mapper/RoleInfoMapper.java
src/main/java/com/gk/hotwork/Mapper/RolePermissionsInfoMapper.java
src/main/java/com/gk/hotwork/Mapper/SafetyInspectionItemDeductionMapper.java
src/main/java/com/gk/hotwork/Mapper/SafetyInspectionItemMapper.java
src/main/java/com/gk/hotwork/Mapper/SafetySelfInspectionItemDeductionMapper.java
src/main/java/com/gk/hotwork/Mapper/SafetySelfInspectionItemMapper.java
src/main/java/com/gk/hotwork/Mapper/SafetySelfInspectionMapper.java
src/main/java/com/gk/hotwork/Mapper/SelfCheckInfoMapper.java
src/main/java/com/gk/hotwork/Mapper/SmsLogInfoMapper.java
src/main/java/com/gk/hotwork/Mapper/SmsLogMapper.java
src/main/java/com/gk/hotwork/Mapper/SubTaskInfoMapper.java
src/main/java/com/gk/hotwork/Mapper/TaskAnalysisMapper.java
src/main/java/com/gk/hotwork/Mapper/TaskEnclosureMapper.java
src/main/java/com/gk/hotwork/Mapper/TaskEquipmentBindInfoMapper.java
src/main/java/com/gk/hotwork/Mapper/TaskEquipmentMapper.java
src/main/java/com/gk/hotwork/Mapper/TaskGasInfoMapper.java
src/main/java/com/gk/hotwork/Mapper/TaskInfoMapper.java
src/main/java/com/gk/hotwork/Mapper/TaskInvolveDepartmentMapper.java
src/main/java/com/gk/hotwork/Mapper/TaskLocationInfoMapper.java
src/main/java/com/gk/hotwork/Mapper/TaskLogMapper.java
src/main/java/com/gk/hotwork/Mapper/TaskReviewMapper.java
src/main/java/com/gk/hotwork/Mapper/TaskRiskMapper.java
src/main/java/com/gk/hotwork/Mapper/TaskSecurityMapper.java
src/main/java/com/gk/hotwork/Mapper/TaskWorkerMapper.java
src/main/java/com/gk/hotwork/Mapper/UserFaceMapper.java
src/main/java/com/gk/hotwork/Mapper/UserInfoMapper.java
src/main/java/com/gk/hotwork/Mapper/UserRolesInfoMapper.java
src/main/java/com/gk/hotwork/Mapper/VideoInfoMapper.java
src/main/java/com/gk/hotwork/Mapper/WarningInfoMapper.java
src/main/java/com/gk/hotwork/Mapper/WorkCertInfoMapper.java
src/main/java/com/gk/hotwork/Mapper/doublePrevention/PreventDangerCheckContentMapper.xml
src/main/java/com/gk/hotwork/Mapper/doublePrevention/PreventDangerCheckTaskMapper.xml
src/main/java/com/gk/hotwork/Mapper/doublePrevention/PreventDangerCheckTaskUnitMapper.xml
src/main/java/com/gk/hotwork/Mapper/doublePrevention/PreventDangerCheckWorkMapper.xml
src/main/java/com/gk/hotwork/Mapper/doublePrevention/PreventDangerImageMapper.xml
src/main/java/com/gk/hotwork/Mapper/doublePrevention/PreventDangerManageMapper.xml
src/main/java/com/gk/hotwork/Mapper/doublePrevention/PreventDangerManageTimeoutMapper.xml
src/main/java/com/gk/hotwork/Mapper/doublePrevention/PreventDangerRectifyMapper.xml
src/main/java/com/gk/hotwork/Mapper/doublePrevention/PreventProduceDeviceMapper.xml
src/main/java/com/gk/hotwork/Mapper/doublePrevention/PreventReportBatchMapper.xml
src/main/java/com/gk/hotwork/Mapper/doublePrevention/PreventReportCheckRecordFromTaskMapper.xml
src/main/java/com/gk/hotwork/Mapper/doublePrevention/PreventReportCheckTaskFromWorkMapper.xml
src/main/java/com/gk/hotwork/Mapper/doublePrevention/PreventReportConfigLogMapper.xml
src/main/java/com/gk/hotwork/Mapper/doublePrevention/PreventReportConfigMapper.xml
src/main/java/com/gk/hotwork/Mapper/doublePrevention/PreventReportDangerInfoMapper.xml
src/main/java/com/gk/hotwork/Mapper/doublePrevention/PreventReportRiskAnaUnitMapper.xml
src/main/java/com/gk/hotwork/Mapper/doublePrevention/PreventReportRiskControlMeasureMapper.xml
src/main/java/com/gk/hotwork/Mapper/doublePrevention/PreventReportRiskEventMapper.xml
src/main/java/com/gk/hotwork/Mapper/doublePrevention/PreventRiskAnaUnitMapper.xml
src/main/java/com/gk/hotwork/Mapper/doublePrevention/PreventRiskControlMeasureMapper.xml
src/main/java/com/gk/hotwork/Mapper/doublePrevention/PreventRiskControlTemplateMapper.xml
src/main/java/com/gk/hotwork/Mapper/doublePrevention/PreventRiskEventMapper.xml
src/main/java/com/gk/hotwork/Mapper/doublePrevention/PreventRiskMapMapper.xml
src/main/java/com/gk/hotwork/Mapper/doublePrevention/PreventTaskAndMeasureMapper.xml
src/main/java/com/gk/hotwork/Mapper/doublePrevention/PreventTaskUnitAndMeasureMapper.xml
src/main/java/com/gk/hotwork/Mapper/doublePrevention/PreventWorkAndMeasureMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/AppFileInfoMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/AuthorizationInfoMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/BlackListInfoMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/CompanyInfoMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/DepartmentInfoMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/DeviceLoactionMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/DictionaryItemInfoMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/DictionaryTypeInfoMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/DistrictInfoMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/ElementManagementMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/EmergencyPlanFileMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/EmergencyPlanMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/EquipmentInfoMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/ExamSocreInfoMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/FourColorMap2Mapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/FourColorPointCoordMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/FourColorPointMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/GasWarnInfoMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/HelpDocInfoMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/HiddenDangerLogMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/HiddenDangerMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/HiddenDangerResourceMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/InvolveDepInfoMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/MajorEquipmentAlarmMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/MajorEquipmentDataMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/MajorEquipmentMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/PermissionInfoMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/ReserveMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/RiskAnaUintMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/RiskControlClassifyMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/RiskControlMeasureMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/RiskEventMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/RiskMapMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/RiskSourceMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/RoleInfoMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/RolePermissionsInfoMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/SafetyInspectionItemDeductionMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/SafetyInspectionItemMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/SafetySelfInspectionItemDeductionMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/SafetySelfInspectionItemMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/SafetySelfInspectionMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/SelfCheckInfoMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/SmsLogInfoMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/SmsLogMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/SubTaskInfoMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/TaskAnalysisMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/TaskEnclosureMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/TaskEquipmentBindInfoMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/TaskEquipmentMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/TaskGasInfoMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/TaskInfoMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/TaskInvolveDepartmentMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/TaskLocationInfoMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/TaskLogMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/TaskReviewMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/TaskRiskMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/TaskSecurityMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/TaskWorkerMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/UserFaceMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/UserInfoMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/UserRolesInfoMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/VideoInfoMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/WarningInfoMapper.xml
src/main/java/com/gk/hotwork/Mapper/mybatis/WorkCertInfoMapper.xml
src/main/java/com/gk/hotwork/Mapper/specialWork/ApprovalRuleItemMeasureMapper.xml
src/main/java/com/gk/hotwork/Mapper/specialWork/ApprovalRuleItemStandMapper.xml
src/main/java/com/gk/hotwork/Mapper/specialWork/ApprovalRuleMapper.xml
src/main/java/com/gk/hotwork/Mapper/specialWork/ApprovalRuleStepMapper.xml
src/main/java/com/gk/hotwork/Mapper/specialWork/ApprovalRuleUnitItemMapper.xml
src/main/java/com/gk/hotwork/Mapper/specialWork/ApprovalRuleUnitMapper.xml
src/main/java/com/gk/hotwork/Mapper/specialWork/WorkApplyInfoMapper.xml
src/main/java/com/gk/hotwork/Mapper/specialWork/WorkApplyOperatorInfoMapper.xml
src/main/java/com/gk/hotwork/Mapper/specialWork/WorkApprovalFilledItemInfoMapper.xml
src/main/java/com/gk/hotwork/Mapper/specialWork/WorkApprovalItemInfoMapper.xml
src/main/java/com/gk/hotwork/Mapper/specialWork/WorkApprovalItemMeasureInfoMapper.xml
src/main/java/com/gk/hotwork/Mapper/specialWork/WorkApprovalItemStandnfoMapper.xml
src/main/java/com/gk/hotwork/Mapper/specialWork/WorkApprovalStepInfoMapper.xml
src/main/java/com/gk/hotwork/Mapper/specialWork/WorkApprovalUnitInfoMapper.xml
src/main/java/com/gk/hotwork/Mapper/specialWork/WorkAtHeightInfo.xml
src/main/java/com/gk/hotwork/Mapper/specialWork/WorkBlindPlatePluggingInfo.xml
src/main/java/com/gk/hotwork/Mapper/specialWork/WorkBrokenCircuitInfo.xml
src/main/java/com/gk/hotwork/Mapper/specialWork/WorkConfinedSpaceInfo.xml
src/main/java/com/gk/hotwork/Mapper/specialWork/WorkGroundBreakingInfo.xml
src/main/java/com/gk/hotwork/Mapper/specialWork/WorkHoistingInfoMapper.xml
src/main/java/com/gk/hotwork/Mapper/specialWork/WorkHotInfoMapper.xml
src/main/java/com/gk/hotwork/Mapper/specialWork/WorkProcessDetectionInfoMapper.xml
src/main/java/com/gk/hotwork/Mapper/specialWork/WorkProcessWarningInfoMapper.xml
src/main/java/com/gk/hotwork/Mapper/specialWork/WorkTemporaryPowerInfoMapper.xml
src/main/java/com/gk/hotwork/Scheduls/TaskPdf/TaskPdfRobot.java
src/main/java/com/gk/hotwork/Scheduls/location/DeviceDataPersisting.java
src/main/java/com/gk/hotwork/Scheduls/location/LocationReceiver.java
src/main/java/com/gk/hotwork/Scheduls/location/LocationTask.java
src/main/java/com/gk/hotwork/Scheduls/updateToken/updateTokenTask.java
src/main/java/com/gk/hotwork/Scheduls/uploadUser/uploadUserTask.java
src/main/java/com/gk/hotwork/Scheduls/warning/Warning.java
src/main/java/com/gk/hotwork/Service/AppFileService.java
src/main/java/com/gk/hotwork/Service/AuthorizationService.java
src/main/java/com/gk/hotwork/Service/BlackListService.java
src/main/java/com/gk/hotwork/Service/CompanyService.java
src/main/java/com/gk/hotwork/Service/DepartmentService.java
src/main/java/com/gk/hotwork/Service/DeviceLocationService.java
src/main/java/com/gk/hotwork/Service/DevicePingService.java
src/main/java/com/gk/hotwork/Service/DevicePressKeyService.java
src/main/java/com/gk/hotwork/Service/DictionaryItemService.java
src/main/java/com/gk/hotwork/Service/DictionaryTypeService.java
src/main/java/com/gk/hotwork/Service/DistrictService.java
src/main/java/com/gk/hotwork/Service/ElementManagementService.java
src/main/java/com/gk/hotwork/Service/EmergencyPlanService.java
src/main/java/com/gk/hotwork/Service/EquipmentService.java
src/main/java/com/gk/hotwork/Service/ExamScoreService.java
src/main/java/com/gk/hotwork/Service/ExcelExportService.java
src/main/java/com/gk/hotwork/Service/FourColorMap2Service.java
src/main/java/com/gk/hotwork/Service/FourColorMapService.java
src/main/java/com/gk/hotwork/Service/FourColorPointCoordService.java
src/main/java/com/gk/hotwork/Service/FourColorPointService.java
src/main/java/com/gk/hotwork/Service/GasWarnService.java
src/main/java/com/gk/hotwork/Service/HelpDocService.java
src/main/java/com/gk/hotwork/Service/HiddenDangerLogService.java
src/main/java/com/gk/hotwork/Service/HiddenDangerResourceService.java
src/main/java/com/gk/hotwork/Service/HiddenDangerService.java
src/main/java/com/gk/hotwork/Service/InvolveDepService.java
src/main/java/com/gk/hotwork/Service/MajorEquipmentAlarmService.java
src/main/java/com/gk/hotwork/Service/MajorEquipmentDataService.java
src/main/java/com/gk/hotwork/Service/MajorEquipmentService.java
src/main/java/com/gk/hotwork/Service/Middle/AccountAuthService.java
src/main/java/com/gk/hotwork/Service/Middle/AccountDepartmentService.java
src/main/java/com/gk/hotwork/Service/PermissionService.java
src/main/java/com/gk/hotwork/Service/ReserveService.java
src/main/java/com/gk/hotwork/Service/RiskAnaUnitService.java
src/main/java/com/gk/hotwork/Service/RiskControlClassifyService.java
src/main/java/com/gk/hotwork/Service/RiskControlMeasureService.java
src/main/java/com/gk/hotwork/Service/RiskEventService.java
src/main/java/com/gk/hotwork/Service/RiskMapService.java
src/main/java/com/gk/hotwork/Service/RiskSourceService.java
src/main/java/com/gk/hotwork/Service/RolePermissionsService.java
src/main/java/com/gk/hotwork/Service/RoleService.java
src/main/java/com/gk/hotwork/Service/SafetyInspectionItemService.java
src/main/java/com/gk/hotwork/Service/SafetySelfInspectionService.java
src/main/java/com/gk/hotwork/Service/SelfCheckService.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/AccountAuthServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/AccountDepartmentServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/AppFileServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/AuthorizationServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/BlackListServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/CompanyServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/DepartmentServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/DeviceLocationServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/DevicePingServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/DevicePressKeyServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/DictionaryItemServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/DictionaryTypeServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/DistrictServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/ElementManagementImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/EmergencyPlanImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/EquipmentServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/ExamScoreServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/ExcelExportServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/FourColorMap2ServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/FourColorMapServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/FourColorPointCoordServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/FourColorPointServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/GasWarnServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/HelpDocServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/HiddenDangerLogServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/HiddenDangerResourceServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/HiddenDangerServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/InvolveDepServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/MajorEquipmentAlarmImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/MajorEquipmentDataImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/MajorEquipmentImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/PermissionServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/ReserveServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/RiskAnaUnitServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/RiskControlClassifyServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/RiskControlMeasureServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/RiskEventServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/RiskMapServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/RiskSourceServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/RolePermissionsServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/RoleServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/SafeCheckWorkServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/SafetyInspectionItemImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/SafetySelfInspectionImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/SelfCheckServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/SmsLogServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/SmsServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/SubTaskServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/TaskAnalysisServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/TaskEnclosureServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/TaskEquipmentBindServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/TaskEquipmentServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/TaskGasServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/TaskInvolveDepServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/TaskLocationServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/TaskLogServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/TaskReviewServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/TaskRiskServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/TaskSecurityServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/TaskServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/TaskWorkerServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/UserFaceServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/UserRolesServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/UserServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/VideoServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/WarningServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/WordServiceImpl.java
src/main/java/com/gk/hotwork/Service/ServiceImpl/WorkCertServiceImpl.java
src/main/java/com/gk/hotwork/Service/SmsLogService.java
src/main/java/com/gk/hotwork/Service/SmsService.java
src/main/java/com/gk/hotwork/Service/SubTaskService.java
src/main/java/com/gk/hotwork/Service/TaskAnalysisService.java
src/main/java/com/gk/hotwork/Service/TaskEnclosureService.java
src/main/java/com/gk/hotwork/Service/TaskEquipmentBindService.java
src/main/java/com/gk/hotwork/Service/TaskEquipmentService.java
src/main/java/com/gk/hotwork/Service/TaskGasService.java
src/main/java/com/gk/hotwork/Service/TaskInvolveDepService.java
src/main/java/com/gk/hotwork/Service/TaskLocationService.java
src/main/java/com/gk/hotwork/Service/TaskLogService.java
src/main/java/com/gk/hotwork/Service/TaskReviewService.java
src/main/java/com/gk/hotwork/Service/TaskRiskService.java
src/main/java/com/gk/hotwork/Service/TaskSecurityService.java
src/main/java/com/gk/hotwork/Service/TaskService.java
src/main/java/com/gk/hotwork/Service/TaskWorkerService.java
src/main/java/com/gk/hotwork/Service/UserFaceService.java
src/main/java/com/gk/hotwork/Service/UserRolesService.java
src/main/java/com/gk/hotwork/Service/UserService.java
src/main/java/com/gk/hotwork/Service/VideoService.java
src/main/java/com/gk/hotwork/Service/WarningService.java
src/main/java/com/gk/hotwork/Service/WordService.java
src/main/java/com/gk/hotwork/Service/WorkCertService.java
src/main/java/com/gk/hotwork/ServletInitializer.java
src/main/java/com/gk/hotwork/Sms/SmsServiceConfig.java
src/main/java/com/gk/hotwork/Sms/Supplier/Abstract/Supplier.java
src/main/java/com/gk/hotwork/Sms/Supplier/Ali.java
src/main/java/com/gk/hotwork/Sms/Supplier/Jh.java
src/main/java/com/gk/hotwork/doublePrevention/config/MybatisPlusConfig.java
src/main/java/com/gk/hotwork/doublePrevention/controller/PreventDangerCheckContentController.java
src/main/java/com/gk/hotwork/doublePrevention/controller/PreventDangerCheckTaskController.java
src/main/java/com/gk/hotwork/doublePrevention/controller/PreventDangerCheckTaskUnitController.java
src/main/java/com/gk/hotwork/doublePrevention/controller/PreventDangerCheckWorkController.java
src/main/java/com/gk/hotwork/doublePrevention/controller/PreventDangerManageController.java
src/main/java/com/gk/hotwork/doublePrevention/controller/PreventDangerRectifyController.java
src/main/java/com/gk/hotwork/doublePrevention/controller/PreventFileHandlerController.java
src/main/java/com/gk/hotwork/doublePrevention/controller/PreventProduceDeviceController.java
src/main/java/com/gk/hotwork/doublePrevention/controller/PreventProduceMapController.java
src/main/java/com/gk/hotwork/doublePrevention/controller/PreventReportCheckRecordFromTaskController.java
src/main/java/com/gk/hotwork/doublePrevention/controller/PreventReportCheckTaskFromWorkController.java
src/main/java/com/gk/hotwork/doublePrevention/controller/PreventReportConfigController.java
src/main/java/com/gk/hotwork/doublePrevention/controller/PreventReportConfigLogController.java
src/main/java/com/gk/hotwork/doublePrevention/controller/PreventReportControlMeasureController.java
src/main/java/com/gk/hotwork/doublePrevention/controller/PreventReportDangerInfoController.java
src/main/java/com/gk/hotwork/doublePrevention/controller/PreventReportRiskAnaUnitController.java
src/main/java/com/gk/hotwork/doublePrevention/controller/PreventReportRiskEventController.java
src/main/java/com/gk/hotwork/doublePrevention/controller/PreventRiskAnaUnitController.java
src/main/java/com/gk/hotwork/doublePrevention/controller/PreventRiskControlMeasureController.java
src/main/java/com/gk/hotwork/doublePrevention/controller/PreventRiskEventController.java
src/main/java/com/gk/hotwork/doublePrevention/controller/StatisticsController.java
src/main/java/com/gk/hotwork/doublePrevention/controller/TTst.java
src/main/java/com/gk/hotwork/doublePrevention/entity/PreventDangerCheckContent.java
src/main/java/com/gk/hotwork/doublePrevention/entity/PreventDangerCheckTask.java
src/main/java/com/gk/hotwork/doublePrevention/entity/PreventDangerCheckTaskRectifyDO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/PreventDangerCheckTaskUnit.java
src/main/java/com/gk/hotwork/doublePrevention/entity/PreventDangerCheckWork.java
src/main/java/com/gk/hotwork/doublePrevention/entity/PreventDangerCheckWorkSchedule.java
src/main/java/com/gk/hotwork/doublePrevention/entity/PreventDangerImage.java
src/main/java/com/gk/hotwork/doublePrevention/entity/PreventDangerManage.java
src/main/java/com/gk/hotwork/doublePrevention/entity/PreventDangerManageTimeout.java
src/main/java/com/gk/hotwork/doublePrevention/entity/PreventDangerRectify.java
src/main/java/com/gk/hotwork/doublePrevention/entity/PreventProduceDevice.java
src/main/java/com/gk/hotwork/doublePrevention/entity/PreventReportBatch.java
src/main/java/com/gk/hotwork/doublePrevention/entity/PreventReportCheckRecordFromTask.java
src/main/java/com/gk/hotwork/doublePrevention/entity/PreventReportCheckTaskFromWork.java
src/main/java/com/gk/hotwork/doublePrevention/entity/PreventReportConfig.java
src/main/java/com/gk/hotwork/doublePrevention/entity/PreventReportConfigLog.java
src/main/java/com/gk/hotwork/doublePrevention/entity/PreventReportDangerInfo.java
src/main/java/com/gk/hotwork/doublePrevention/entity/PreventReportRiskAnaUnit.java
src/main/java/com/gk/hotwork/doublePrevention/entity/PreventReportRiskControlMeasure.java
src/main/java/com/gk/hotwork/doublePrevention/entity/PreventReportRiskEvent.java
src/main/java/com/gk/hotwork/doublePrevention/entity/PreventRiskAnaUnit.java
src/main/java/com/gk/hotwork/doublePrevention/entity/PreventRiskControlMeasure.java
src/main/java/com/gk/hotwork/doublePrevention/entity/PreventRiskControlTemplate.java
src/main/java/com/gk/hotwork/doublePrevention/entity/PreventRiskEvent.java
src/main/java/com/gk/hotwork/doublePrevention/entity/PreventRiskMap.java
src/main/java/com/gk/hotwork/doublePrevention/entity/PreventTaskAndMeasure.java
src/main/java/com/gk/hotwork/doublePrevention/entity/PreventTaskUnitAndMeasure.java
src/main/java/com/gk/hotwork/doublePrevention/entity/PreventWorkAndMeasure.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/CheckResultReportDO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/MeasureAndContentDO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/PreventRiskAnaUnitDO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/PreventRiskControlMeasureDO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/PreventRiskControlMeasureListDO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/PreventRiskEventDO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/query/OwnRectifyPageQuery.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/query/db/OwnRectifyPageDBQuery.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/report/HandlerDO/ReportCheckRecordFromTaskDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/report/HandlerDO/ReportCheckTaskFromWorkDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/report/HandlerDO/ReportDangerInfoDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/report/HandlerDO/ReportRiskAnaUnitDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/report/HandlerDO/ReportRiskControlMeasureDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/report/HandlerDO/ReportRiskEventDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/report/ReportResultDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/report/ReportResultObjDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/report/req/PreReportRiskEventQueryReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/report/req/PreReportRiskUnitQueryReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/report/req/PreventReportCheckRecordFromTaskReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/report/req/PreventReportCheckTaskFromWorkReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/report/req/PreventReportDangerInfoReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/report/req/PreventReportRiskControlMeasureReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/report/resp/PreReportRiskEventQueryRespDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/report/resp/PreReportRiskUnitQueryRespDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/report/resp/PreventReportCheckRecordFromTaskRespDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/report/resp/PreventReportCheckTaskFromWorkRespDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/report/resp/PreventReportDangerInfoRespDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/report/resp/PreventReportRiskControlMeasureRespDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/report/vo/ReportLogVO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/req/DeleteBatchReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/req/PreventCloseDangerReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/req/PreventDangerCheckContentQueryReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/req/PreventDangerCheckTaskDeleteReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/req/PreventDangerCheckTaskQueryReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/req/PreventDangerCheckTaskSaveReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/req/PreventDangerCheckTaskUnitDeleteReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/req/PreventDangerCheckTaskUnitQueryReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/req/PreventDangerCheckTaskUnitSaveReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/req/PreventDangerCheckTaskUnitUpdateReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/req/PreventDangerCheckTaskUpdateReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/req/PreventDangerCheckWorkContentQueryReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/req/PreventDangerCheckWorkDeleteReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/req/PreventDangerCheckWorkQueryReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/req/PreventDangerCheckWorkSaveReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/req/PreventDangerCheckWorkUpdateReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/req/PreventDangerManageDeleteReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/req/PreventDangerManageQueryReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/req/PreventDangerManageSaveReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/req/PreventDangerManageUpdateReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/req/PreventDangerRectifyDeleteReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/req/PreventDangerRectifyQueryReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/req/PreventDangerRectifySaveReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/req/PreventDangerRectifyUpdateReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/req/PreventDangerReportRectifyReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/req/PreventHandReportConfigReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/req/PreventProduceDeviceDeleteReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/req/PreventProduceDeviceQueryReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/req/PreventProduceDeviceSaveReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/req/PreventProduceDeviceUpdateReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/req/PreventRectifyOverQueryReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/req/PreventReportConfigLogQueryReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/req/PreventReportConfigUpdateReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/req/PreventRiskAnaUnitDeleteReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/req/PreventRiskAnaUnitQueryReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/req/PreventRiskAnaUnitSaveReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/req/PreventRiskAnaUnitUpdateReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/req/PreventRiskControlMeasureDeleteReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/req/PreventRiskControlMeasureListQueryReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/req/PreventRiskControlMeasureQueryReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/req/PreventRiskControlMeasureSaveReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/req/PreventRiskControlMeasureUpdateReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/req/PreventRiskEventDeleteReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/req/PreventRiskEventQueryReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/req/PreventRiskEventSaveReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/req/PreventRiskEventUpdateReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/req/PreventRiskMapDeleteReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/req/PreventRiskMapQueryReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/req/PreventRiskMapSaveReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/req/PreventRiskMapUpdateReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/req/StatisticsInspectionCompletedReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/req/StatisticsInspectionTaskReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/req/StatisticsInspectorReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/req/StatisticsPreventDangerPageReqDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/resp/PreventDangerCheckTaskQueryRespDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/resp/PreventDangerCheckTaskRectifyRespDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/resp/PreventDangerCheckTaskUnitListQueryRespDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/resp/PreventDangerCheckTaskUnitQueryRespDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/resp/PreventDangerCheckWorkListQueryRespDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/resp/PreventDangerCheckWorkQueryRespDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/resp/PreventDangerManageImageRespDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/resp/PreventDangerManageListQueryRespDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/resp/PreventDangerManageQueryRespDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/resp/PreventDangerRectifyQueryRespDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/resp/PreventGetAnaUnitByDeviceIdRespDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/resp/PreventProduceDeviceListsQueryRespDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/resp/PreventProduceDeviceQueryRespDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/resp/PreventProduceDeviceSaveRespDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/resp/PreventReportConfigLogQueryRespDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/resp/PreventReportConfigQueryRespDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/resp/PreventRiskAnaUnitQueryRespDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/resp/PreventRiskControlMeasureDataRespDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/resp/PreventRiskControlMeasureListRespDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/resp/PreventRiskControlMeasureQueryRespDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/resp/PreventRiskEventListRiskUnitsRespDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/resp/PreventRiskEventQueryRespDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/resp/PreventRiskEventsListQueryRespDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/resp/PreventRiskMapQueryRespDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/resp/PreventRiskMeasureTemplatesListQueryRespDTO.java
src/main/java/com/gk/hotwork/doublePrevention/entity/dto/resp/PreventrCheckContentRespDTO.java
src/main/java/com/gk/hotwork/doublePrevention/enums/CheckTaskResultEnum.java
src/main/java/com/gk/hotwork/doublePrevention/enums/CheckTaskStatusEnum.java
src/main/java/com/gk/hotwork/doublePrevention/enums/DataConvertEnum.java
src/main/java/com/gk/hotwork/doublePrevention/enums/DeviceStatusEnum.java
src/main/java/com/gk/hotwork/doublePrevention/enums/ImageTypeEnum.java
src/main/java/com/gk/hotwork/doublePrevention/enums/RiskLevelEnum.java
src/main/java/com/gk/hotwork/doublePrevention/enums/StatusEnum.java
src/main/java/com/gk/hotwork/doublePrevention/enums/SyncEnum.java
src/main/java/com/gk/hotwork/doublePrevention/enums/WorkStatusEnum.java
src/main/java/com/gk/hotwork/doublePrevention/mq/consumer/CreateTaskConsumer.java
src/main/java/com/gk/hotwork/doublePrevention/mq/consumer/NoticeTaskConsumer.java
src/main/java/com/gk/hotwork/doublePrevention/mq/consumer/TimeOutTaskConsumer.java
src/main/java/com/gk/hotwork/doublePrevention/mq/consumer/WaitExecConsumer.java
src/main/java/com/gk/hotwork/doublePrevention/mq/msg/PreventCreateTaskMsg.java
src/main/java/com/gk/hotwork/doublePrevention/mq/msg/PreventExecErrorNoticeMsg.java
src/main/java/com/gk/hotwork/doublePrevention/mq/msg/PreventNoticeExecTaskMsg.java
src/main/java/com/gk/hotwork/doublePrevention/mq/msg/PreventTimeOutTaskMsg.java
src/main/java/com/gk/hotwork/doublePrevention/mq/msg/PreventWaitExecTaskMsg.java
src/main/java/com/gk/hotwork/doublePrevention/repository/PreventDangerCheckContentRepository.java
src/main/java/com/gk/hotwork/doublePrevention/repository/PreventDangerCheckTaskRepository.java
src/main/java/com/gk/hotwork/doublePrevention/repository/PreventDangerCheckTaskUnitRepository.java
src/main/java/com/gk/hotwork/doublePrevention/repository/PreventDangerCheckWorkRepository.java
src/main/java/com/gk/hotwork/doublePrevention/repository/PreventDangerImageRepository.java
src/main/java/com/gk/hotwork/doublePrevention/repository/PreventDangerManageRepository.java
src/main/java/com/gk/hotwork/doublePrevention/repository/PreventDangerManageTimeoutRepository.java
src/main/java/com/gk/hotwork/doublePrevention/repository/PreventDangerRectifyRepository.java
src/main/java/com/gk/hotwork/doublePrevention/repository/PreventProduceDeviceRepository.java
src/main/java/com/gk/hotwork/doublePrevention/repository/PreventReportBatchRepository.java
src/main/java/com/gk/hotwork/doublePrevention/repository/PreventReportCheckRecordFromTaskRepository.java
src/main/java/com/gk/hotwork/doublePrevention/repository/PreventReportCheckTaskFromWorkRepository.java
src/main/java/com/gk/hotwork/doublePrevention/repository/PreventReportConfigLogRepository.java
src/main/java/com/gk/hotwork/doublePrevention/repository/PreventReportConfigRepository.java
src/main/java/com/gk/hotwork/doublePrevention/repository/PreventReportDangerInfoRepository.java
src/main/java/com/gk/hotwork/doublePrevention/repository/PreventReportRiskAnaUnitRepository.java
src/main/java/com/gk/hotwork/doublePrevention/repository/PreventReportRiskControlMeasureRepository.java
src/main/java/com/gk/hotwork/doublePrevention/repository/PreventReportRiskEventRepository.java
src/main/java/com/gk/hotwork/doublePrevention/repository/PreventRiskAnaUnitRepository.java
src/main/java/com/gk/hotwork/doublePrevention/repository/PreventRiskControlMeasureRepository.java
src/main/java/com/gk/hotwork/doublePrevention/repository/PreventRiskControlTemplateRepository.java
src/main/java/com/gk/hotwork/doublePrevention/repository/PreventRiskEventRepository.java
src/main/java/com/gk/hotwork/doublePrevention/repository/PreventRiskMapRepository.java
src/main/java/com/gk/hotwork/doublePrevention/repository/PreventTaskAndMeasureRepository.java
src/main/java/com/gk/hotwork/doublePrevention/repository/PreventTaskUnitAndMeasureRepository.java
src/main/java/com/gk/hotwork/doublePrevention/repository/PreventWorkAndMeasureRepository.java
src/main/java/com/gk/hotwork/doublePrevention/repository/param/CheckWorkAutoUpdateParams.java
src/main/java/com/gk/hotwork/doublePrevention/repository/param/CloseDangerParams.java
src/main/java/com/gk/hotwork/doublePrevention/repository/param/HandlerReportParam.java
src/main/java/com/gk/hotwork/doublePrevention/repository/param/PreventCheckResultParams.java
src/main/java/com/gk/hotwork/doublePrevention/repository/param/PreventDangerCheckTaskUnitDeleteParams.java
src/main/java/com/gk/hotwork/doublePrevention/repository/param/PreventDangerCheckTaskUnitUpdateParams.java
src/main/java/com/gk/hotwork/doublePrevention/repository/param/PreventDangerCheckTaskUpdateParams.java
src/main/java/com/gk/hotwork/doublePrevention/repository/param/PreventDangerCheckWorkDeleteParams.java
src/main/java/com/gk/hotwork/doublePrevention/repository/param/PreventDangerCheckWorkUpdateParams.java
src/main/java/com/gk/hotwork/doublePrevention/repository/param/PreventDangerManageUpdateParams.java
src/main/java/com/gk/hotwork/doublePrevention/repository/param/PreventDangerRectifyUpdateParams.java
src/main/java/com/gk/hotwork/doublePrevention/repository/param/PreventDangerReportRectifyUpdayeParams.java
src/main/java/com/gk/hotwork/doublePrevention/repository/param/PreventDeleteParams.java
src/main/java/com/gk/hotwork/doublePrevention/repository/param/PreventProduceDeviceDeleteParams.java
src/main/java/com/gk/hotwork/doublePrevention/repository/param/PreventProduceDeviceQueryParams.java
src/main/java/com/gk/hotwork/doublePrevention/repository/param/PreventProduceDeviceUpdateParams.java
src/main/java/com/gk/hotwork/doublePrevention/repository/param/PreventReportConfigUpdateParams.java
src/main/java/com/gk/hotwork/doublePrevention/repository/param/PreventRiskAnaUnitDeleteParams.java
src/main/java/com/gk/hotwork/doublePrevention/repository/param/PreventRiskAnaUnitUpdateParams.java
src/main/java/com/gk/hotwork/doublePrevention/repository/param/PreventRiskControlMeasureDeleteParams.java
src/main/java/com/gk/hotwork/doublePrevention/repository/param/PreventRiskControlMeasureQueryParams.java
src/main/java/com/gk/hotwork/doublePrevention/repository/param/PreventRiskControlMeasureUpdateParams.java
src/main/java/com/gk/hotwork/doublePrevention/repository/param/PreventRiskEventQueryParams.java
src/main/java/com/gk/hotwork/doublePrevention/repository/param/PreventRiskEventUpdateParams.java
src/main/java/com/gk/hotwork/doublePrevention/repository/param/PreventRiskMapUpdateParams.java
src/main/java/com/gk/hotwork/doublePrevention/repository/param/PreventTaskToUserParams.java
src/main/java/com/gk/hotwork/doublePrevention/repository/param/PreventTaskUnitAndMeasureParams.java
src/main/java/com/gk/hotwork/doublePrevention/repository/param/SearchReportDateParams.java
src/main/java/com/gk/hotwork/doublePrevention/repository/param/UpdateRectifyResultParams.java
src/main/java/com/gk/hotwork/doublePrevention/scheduls/ExecReportDateSchedule.java
src/main/java/com/gk/hotwork/doublePrevention/scheduls/PreventDangerCheckWorkSchedule.java
src/main/java/com/gk/hotwork/doublePrevention/scheduls/PreventResetTaskSchedule.java
src/main/java/com/gk/hotwork/doublePrevention/scheduls/PreventResetWorkTimeSchedule.java
src/main/java/com/gk/hotwork/doublePrevention/scheduls/PreventSearchWorkStatusSchedule.java
src/main/java/com/gk/hotwork/doublePrevention/scheduls/SearchReportDateSchedule.java
src/main/java/com/gk/hotwork/doublePrevention/service/DangerService.java
src/main/java/com/gk/hotwork/doublePrevention/service/FileHandlerService.java
src/main/java/com/gk/hotwork/doublePrevention/service/RectifyService.java
src/main/java/com/gk/hotwork/doublePrevention/service/ReportService.java
src/main/java/com/gk/hotwork/doublePrevention/service/RiskService.java
src/main/java/com/gk/hotwork/doublePrevention/service/StatisticsService.java
src/main/java/com/gk/hotwork/doublePrevention/service/baseService/PreventDangerCheckContentService.java
src/main/java/com/gk/hotwork/doublePrevention/service/baseService/PreventDangerCheckTaskService.java
src/main/java/com/gk/hotwork/doublePrevention/service/baseService/PreventDangerCheckTaskUnitService.java
src/main/java/com/gk/hotwork/doublePrevention/service/baseService/PreventDangerCheckWorkService.java
src/main/java/com/gk/hotwork/doublePrevention/service/baseService/PreventDangerImageService.java
src/main/java/com/gk/hotwork/doublePrevention/service/baseService/PreventDangerManageService.java
src/main/java/com/gk/hotwork/doublePrevention/service/baseService/PreventDangerManageTimeoutService.java
src/main/java/com/gk/hotwork/doublePrevention/service/baseService/PreventDangerRectifyService.java
src/main/java/com/gk/hotwork/doublePrevention/service/baseService/PreventProduceDeviceService.java
src/main/java/com/gk/hotwork/doublePrevention/service/baseService/PreventReportBatchService.java
src/main/java/com/gk/hotwork/doublePrevention/service/baseService/PreventReportCheckRecordFromTaskService.java
src/main/java/com/gk/hotwork/doublePrevention/service/baseService/PreventReportCheckTaskFromWorkService.java
src/main/java/com/gk/hotwork/doublePrevention/service/baseService/PreventReportConfigLogService.java
src/main/java/com/gk/hotwork/doublePrevention/service/baseService/PreventReportConfigService.java
src/main/java/com/gk/hotwork/doublePrevention/service/baseService/PreventReportDangerInfoService.java
src/main/java/com/gk/hotwork/doublePrevention/service/baseService/PreventReportRiskAnaUnitService.java
src/main/java/com/gk/hotwork/doublePrevention/service/baseService/PreventReportRiskControlMeasureService.java
src/main/java/com/gk/hotwork/doublePrevention/service/baseService/PreventReportRiskEventService.java
src/main/java/com/gk/hotwork/doublePrevention/service/baseService/PreventRiskAnaUnitService.java
src/main/java/com/gk/hotwork/doublePrevention/service/baseService/PreventRiskControlMeasureService.java
src/main/java/com/gk/hotwork/doublePrevention/service/baseService/PreventRiskControlTemplateService.java
src/main/java/com/gk/hotwork/doublePrevention/service/baseService/PreventRiskEventService.java
src/main/java/com/gk/hotwork/doublePrevention/service/baseService/PreventRiskMapService.java
src/main/java/com/gk/hotwork/doublePrevention/service/baseService/PreventTaskAndMeasureService.java
src/main/java/com/gk/hotwork/doublePrevention/service/baseService/PreventTaskUnitAndMeasureService.java
src/main/java/com/gk/hotwork/doublePrevention/service/baseService/PreventWorkAndMeasureService.java
src/main/java/com/gk/hotwork/doublePrevention/service/baseService/impl/PreventDangerCheckContentServiceImpl.java
src/main/java/com/gk/hotwork/doublePrevention/service/baseService/impl/PreventDangerCheckTaskServiceImpl.java
src/main/java/com/gk/hotwork/doublePrevention/service/baseService/impl/PreventDangerCheckTaskUnitServiceImpl.java
src/main/java/com/gk/hotwork/doublePrevention/service/baseService/impl/PreventDangerCheckWorkServiceImpl.java
src/main/java/com/gk/hotwork/doublePrevention/service/baseService/impl/PreventDangerImageServiceImpl.java
src/main/java/com/gk/hotwork/doublePrevention/service/baseService/impl/PreventDangerManageServiceImpl.java
src/main/java/com/gk/hotwork/doublePrevention/service/baseService/impl/PreventDangerManageTimeoutServiceImpl.java
src/main/java/com/gk/hotwork/doublePrevention/service/baseService/impl/PreventDangerRectifyServiceImpl.java
src/main/java/com/gk/hotwork/doublePrevention/service/baseService/impl/PreventProduceDeviceServiceImpl.java
src/main/java/com/gk/hotwork/doublePrevention/service/baseService/impl/PreventReportBatchServiceImpl.java
src/main/java/com/gk/hotwork/doublePrevention/service/baseService/impl/PreventReportCheckRecordFromTaskServiceImpl.java
src/main/java/com/gk/hotwork/doublePrevention/service/baseService/impl/PreventReportCheckTaskFromWorkServiceImpl.java
src/main/java/com/gk/hotwork/doublePrevention/service/baseService/impl/PreventReportConfigLogServiceImpl.java
src/main/java/com/gk/hotwork/doublePrevention/service/baseService/impl/PreventReportConfigServiceImpl.java
src/main/java/com/gk/hotwork/doublePrevention/service/baseService/impl/PreventReportDangerInfoServiceImpl.java
src/main/java/com/gk/hotwork/doublePrevention/service/baseService/impl/PreventReportRiskAnaUnitServiceImpl.java
src/main/java/com/gk/hotwork/doublePrevention/service/baseService/impl/PreventReportRiskControlMeasureServiceImpl.java
src/main/java/com/gk/hotwork/doublePrevention/service/baseService/impl/PreventReportRiskEventServiceImpl.java
src/main/java/com/gk/hotwork/doublePrevention/service/baseService/impl/PreventRiskAnaUnitServiceImpl.java
src/main/java/com/gk/hotwork/doublePrevention/service/baseService/impl/PreventRiskControlMeasureServiceImpl.java
src/main/java/com/gk/hotwork/doublePrevention/service/baseService/impl/PreventRiskControlTemplateServiceImpl.java
src/main/java/com/gk/hotwork/doublePrevention/service/baseService/impl/PreventRiskEventServiceImpl.java
src/main/java/com/gk/hotwork/doublePrevention/service/baseService/impl/PreventRiskMapServiceImpl.java
src/main/java/com/gk/hotwork/doublePrevention/service/baseService/impl/PreventTaskAndMeasureServiceImpl.java
src/main/java/com/gk/hotwork/doublePrevention/service/baseService/impl/PreventTaskUnitAndMeasureServiceImpl.java
src/main/java/com/gk/hotwork/doublePrevention/service/baseService/impl/PreventWorkAndMeasureServiceImpl.java
src/main/java/com/gk/hotwork/doublePrevention/service/impl/DangerServiceImpl.java
src/main/java/com/gk/hotwork/doublePrevention/service/impl/FileHandlerServiceImpl.java
src/main/java/com/gk/hotwork/doublePrevention/service/impl/RectifyServiceImpl.java
src/main/java/com/gk/hotwork/doublePrevention/service/impl/ReportServiceImpl.java
src/main/java/com/gk/hotwork/doublePrevention/service/impl/RiskServiceImpl.java
src/main/java/com/gk/hotwork/doublePrevention/service/impl/StatisticsServiceImpl.java
src/main/java/com/gk/hotwork/doublePrevention/utils/AesGcm256Util.java
src/main/java/com/gk/hotwork/doublePrevention/utils/BeanCopyUtils.java
src/main/java/com/gk/hotwork/doublePrevention/utils/CacheUserTransfer.java
src/main/java/com/gk/hotwork/doublePrevention/utils/CalcuteDelayLevelUtils.java
src/main/java/com/gk/hotwork/doublePrevention/utils/JsonDateDeserializer.java
src/main/java/com/gk/hotwork/doublePrevention/utils/JsonUtils.java
src/main/java/com/gk/hotwork/doublePrevention/utils/SearchParams.java
src/main/java/com/gk/hotwork/doublePrevention/utils/SnowFlow.java
src/main/java/com/gk/hotwork/specialWork/common/RocketMQSpecialWorkTemplateHelper.java
src/main/java/com/gk/hotwork/specialWork/controller/RuleController.java
src/main/java/com/gk/hotwork/specialWork/controller/RuleItemController.java
src/main/java/com/gk/hotwork/specialWork/controller/RuleItemMeasureController.java
src/main/java/com/gk/hotwork/specialWork/controller/RuleItemStandController.java
src/main/java/com/gk/hotwork/specialWork/controller/SpecialWorkMinoController.java
src/main/java/com/gk/hotwork/specialWork/controller/WorkApplyController.java
src/main/java/com/gk/hotwork/specialWork/controller/WorkProcessController.java
src/main/java/com/gk/hotwork/specialWork/controller/WorkStatisticController.java
src/main/java/com/gk/hotwork/specialWork/entity/ApprovalRule.java
src/main/java/com/gk/hotwork/specialWork/entity/ApprovalRuleItemMeasure.java
src/main/java/com/gk/hotwork/specialWork/entity/ApprovalRuleItemMeasureDO.java
src/main/java/com/gk/hotwork/specialWork/entity/ApprovalRuleItemStand.java
src/main/java/com/gk/hotwork/specialWork/entity/ApprovalRuleItemStandDO.java
src/main/java/com/gk/hotwork/specialWork/entity/ApprovalRuleStep.java
src/main/java/com/gk/hotwork/specialWork/entity/ApprovalRuleUnit.java
src/main/java/com/gk/hotwork/specialWork/entity/ApprovalRuleUnitItem.java
src/main/java/com/gk/hotwork/specialWork/entity/ApprovalRuleUnitItemDO.java
src/main/java/com/gk/hotwork/specialWork/entity/WorkApplyCountDO.java
src/main/java/com/gk/hotwork/specialWork/entity/WorkApplyInfo.java
src/main/java/com/gk/hotwork/specialWork/entity/WorkApplyOperatorInfo.java
src/main/java/com/gk/hotwork/specialWork/entity/WorkApplyRecordInfo.java
src/main/java/com/gk/hotwork/specialWork/entity/WorkApplyReportableDO.java
src/main/java/com/gk/hotwork/specialWork/entity/WorkApprovalFilledItemInfo.java
src/main/java/com/gk/hotwork/specialWork/entity/WorkApprovalItemInfo.java
src/main/java/com/gk/hotwork/specialWork/entity/WorkApprovalItemMeasureInfo.java
src/main/java/com/gk/hotwork/specialWork/entity/WorkApprovalItemStandInfo.java
src/main/java/com/gk/hotwork/specialWork/entity/WorkApprovalRecord.java
src/main/java/com/gk/hotwork/specialWork/entity/WorkApprovalRuleInfo.java
src/main/java/com/gk/hotwork/specialWork/entity/WorkApprovalStepInfo.java
src/main/java/com/gk/hotwork/specialWork/entity/WorkApprovalUnitInfo.java
src/main/java/com/gk/hotwork/specialWork/entity/WorkAtHeightInfo.java
src/main/java/com/gk/hotwork/specialWork/entity/WorkBlindPlatePluggingInfo.java
src/main/java/com/gk/hotwork/specialWork/entity/WorkBrokenCircuitInfo.java
src/main/java/com/gk/hotwork/specialWork/entity/WorkConfinedSpaceInfo.java
src/main/java/com/gk/hotwork/specialWork/entity/WorkGroundBreakingInfo.java
src/main/java/com/gk/hotwork/specialWork/entity/WorkHoistingInfo.java
src/main/java/com/gk/hotwork/specialWork/entity/WorkHotInfo.java
src/main/java/com/gk/hotwork/specialWork/entity/WorkProcessDetectionInfo.java
src/main/java/com/gk/hotwork/specialWork/entity/WorkProcessWarningInfo.java
src/main/java/com/gk/hotwork/specialWork/entity/WorkTemporaryPowerInfo.java
src/main/java/com/gk/hotwork/specialWork/enums/ApprovalFilledItemType.java
src/main/java/com/gk/hotwork/specialWork/enums/ApprovalStepTypeEnum.java
src/main/java/com/gk/hotwork/specialWork/enums/AuditTypeEnum.java
src/main/java/com/gk/hotwork/specialWork/enums/MeasureTypeEnum.java
src/main/java/com/gk/hotwork/specialWork/enums/ProcessOperationEnum.java
src/main/java/com/gk/hotwork/specialWork/enums/RuleContinueTimeUnitEnum.java
src/main/java/com/gk/hotwork/specialWork/enums/RuleItemSmTypeEnum.java
src/main/java/com/gk/hotwork/specialWork/enums/RuleItemStandStatusEnum.java
src/main/java/com/gk/hotwork/specialWork/enums/RuleItemStatusEnum.java
src/main/java/com/gk/hotwork/specialWork/enums/RuleItemTypeEnum.java
src/main/java/com/gk/hotwork/specialWork/enums/RuleMeasureOptEnum.java
src/main/java/com/gk/hotwork/specialWork/enums/RuleMeasureStatusEnum.java
src/main/java/com/gk/hotwork/specialWork/enums/RuleStandMatchingTypeEnum.java
src/main/java/com/gk/hotwork/specialWork/enums/RuleStatusEnum.java
src/main/java/com/gk/hotwork/specialWork/enums/RuleStepStatusEnum.java
src/main/java/com/gk/hotwork/specialWork/enums/RuleUnitStatusEnum.java
src/main/java/com/gk/hotwork/specialWork/enums/WorkApprovalStepResultEnum.java
src/main/java/com/gk/hotwork/specialWork/enums/WorkApprovalUnitResultEnum.java
src/main/java/com/gk/hotwork/specialWork/enums/WorkAtHeightStatusEnum.java
src/main/java/com/gk/hotwork/specialWork/enums/WorkBlindPlatePluggingStatusEnum.java
src/main/java/com/gk/hotwork/specialWork/enums/WorkBrokenCircuitStatusEnum.java
src/main/java/com/gk/hotwork/specialWork/enums/WorkConfinedSpaceStatusEnum.java
src/main/java/com/gk/hotwork/specialWork/enums/WorkGroundBreakingStatusEnum.java
src/main/java/com/gk/hotwork/specialWork/enums/WorkHoistingStatusEnum.java
src/main/java/com/gk/hotwork/specialWork/enums/WorkHotStatusEnum.java
src/main/java/com/gk/hotwork/specialWork/enums/WorkLevelEnum.java
src/main/java/com/gk/hotwork/specialWork/enums/WorkModeEnum.java
src/main/java/com/gk/hotwork/specialWork/enums/WorkProcessDetectionResultEnum.java
src/main/java/com/gk/hotwork/specialWork/enums/WorkProcessDetectionStatusEnum.java
src/main/java/com/gk/hotwork/specialWork/enums/WorkProcessWarningStatusEnum.java
src/main/java/com/gk/hotwork/specialWork/enums/WorkProcessWarningTypeEnum.java
src/main/java/com/gk/hotwork/specialWork/enums/WorkReportSourceEnum.java
src/main/java/com/gk/hotwork/specialWork/enums/WorkRuleMeasureOptEnum.java
src/main/java/com/gk/hotwork/specialWork/enums/WorkStandTypeEnum.java
src/main/java/com/gk/hotwork/specialWork/enums/WorkStatusEnum.java
src/main/java/com/gk/hotwork/specialWork/enums/WorkTemporaryPowerStatusEnum.java
src/main/java/com/gk/hotwork/specialWork/enums/WorkTypeEnum.java
src/main/java/com/gk/hotwork/specialWork/model/bo/ApprovalRuleBO.java
src/main/java/com/gk/hotwork/specialWork/model/bo/WorkApplyPendingInfoBO.java
src/main/java/com/gk/hotwork/specialWork/model/bo/WorkApprovalItemInfoBO.java
src/main/java/com/gk/hotwork/specialWork/model/bo/WorkApprovalStepInfoBO.java
src/main/java/com/gk/hotwork/specialWork/model/bo/WorkApprovalUnitInfoBO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/req/ApprovalItemAbordDataReqDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/req/ApprovalItemDataReqDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/req/ApprovalItemReqDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/req/ApprovalRuleAddReqDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/req/ApprovalRuleItemAddReqDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/req/ApprovalRuleItemMeasureAddReqDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/req/ApprovalRuleItemMeasureModReqDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/req/ApprovalRuleItemModReqDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/req/ApprovalRuleModReqDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/req/ApprovalRuleStandAddReqDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/req/ApprovalRuleStandModReqDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/req/ApprovalRuleStandReqDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/req/ApprovalRuleStepAddReqDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/req/ApprovalRuleStepModReqDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/req/ApprovalRuleUnitAddReqDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/req/ApprovalRuleUnitItemAddReqDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/req/ApprovalRuleUnitItemModReqDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/req/ApprovalRuleUnitModReqDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/req/DeleteForm.java
src/main/java/com/gk/hotwork/specialWork/model/dto/req/WorkApplyAtHighReqDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/req/WorkApplyBlindPlatePluggingReqDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/req/WorkApplyBrokenCircuitReqDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/req/WorkApplyConfinedSpaceReqDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/req/WorkApplyEight.java
src/main/java/com/gk/hotwork/specialWork/model/dto/req/WorkApplyGroundBreakingReqDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/req/WorkApplyHoistingReqDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/req/WorkApplyHotReqDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/req/WorkApplyReqDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/req/WorkApplyTemporaryPowerReqDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/req/WorkApprovalItemContentReqDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/req/WorkApprovalReqDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/req/WorkProcessDetectionReqDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/req/WorkReqDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/AllWorkApplyPageRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/ApplicantWorkApprovalItemMeasureRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/ApplicantWorkApprovalItemRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/ApplicantWorkApprovalItemStandRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/ApplicantWorkApprovalStepRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/ApplicantWorkApprovalUnitFilledItemRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/ApplicantWorkApprovalUnitRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/ApplicantWorkApprovedApplyDetailRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/ApplicantWorkApprovedApplyOperatorRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/ApprovalRuleItemStandPageRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/ApprovalRuleMeasurePageRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/ApprovalRuleMeasureRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/ApprovalRuleRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/ApprovalRuleStandListRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/ApprovalRuleStandRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/ApprovalRuleStepRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/ApprovalRuleUnitItemListRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/ApprovalRuleUnitItemPageRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/ApprovalRuleUnitItemRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/ApprovalRuleUnitRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/ApproverWorkApprovalItemMeasureRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/ApproverWorkApprovalItemRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/ApproverWorkApprovalItemStandRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/ApproverWorkApprovalStepRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/ApproverWorkApprovalUnitFilledItemRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/ApproverWorkApprovalUnitRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/ApproverWorkApprovedApplyDetailRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/ApproverWorkApprovedApplyOperatorRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/ApproverWorkPendingApprovalDataRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/ApproverWorkPendingApprovalItemMeasureRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/ApproverWorkPendingApprovalItemRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/ApproverWorkPendingApprovalItemStandRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/DepRPCRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/OthersWorkApprovalItemMeasureRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/OthersWorkApprovalItemRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/OthersWorkApprovalItemStandRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/OthersWorkApprovalStepRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/OthersWorkApprovalUnitFilledItemRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/OthersWorkApprovalUnitRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/OthersWorkApprovedApplyDetailRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/OthersWorkApprovedApplyOperatorRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/WorkApplyAtHeightRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/WorkApplyBlindPlatePluggingRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/WorkApplyBrokenCircuitRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/WorkApplyConfinedSpaceRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/WorkApplyEightRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/WorkApplyGroundBreakingRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/WorkApplyHoistingRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/WorkApplyHotRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/WorkApplyOperatorRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/WorkApplyPageRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/WorkApplyPendingPageRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/WorkApplyRecordRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/WorkApplyReportableRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/WorkApplyTemporaryPowerRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/WorkDepStatisticRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/WorkProcessDetectionInfoRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/WorkProcessWarningInfoRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/dto/resp/WorkTypeStatisticRespDTO.java
src/main/java/com/gk/hotwork/specialWork/model/query/AllWorkApplyPageQuery.java
src/main/java/com/gk/hotwork/specialWork/model/query/ApprovalRuleItemPageQuery.java
src/main/java/com/gk/hotwork/specialWork/model/query/ApprovalRuleItemQuery.java
src/main/java/com/gk/hotwork/specialWork/model/query/ApprovalRuleListQuery.java
src/main/java/com/gk/hotwork/specialWork/model/query/ApprovalRuleStandListQuery.java
src/main/java/com/gk/hotwork/specialWork/model/query/ApprovalRuleStandPageQuery.java
src/main/java/com/gk/hotwork/specialWork/model/query/WorkApplyApplyingPageQuery.java
src/main/java/com/gk/hotwork/specialWork/model/query/WorkApplyPendingPageQuery.java
src/main/java/com/gk/hotwork/specialWork/model/query/WorkApplyRecordListQuery.java
src/main/java/com/gk/hotwork/specialWork/model/query/WorkAtHeightQuery.java
src/main/java/com/gk/hotwork/specialWork/model/query/WorkBlindPlatePluggingQuery.java
src/main/java/com/gk/hotwork/specialWork/model/query/WorkBrokenCircuitQuery.java
src/main/java/com/gk/hotwork/specialWork/model/query/WorkConfinedSpaceQuery.java
src/main/java/com/gk/hotwork/specialWork/model/query/WorkGroundBreakingQuery.java
src/main/java/com/gk/hotwork/specialWork/model/query/WorkHoistingQuery.java
src/main/java/com/gk/hotwork/specialWork/model/query/WorkProcessDetectionPageQuery.java
src/main/java/com/gk/hotwork/specialWork/model/query/WorkProcessWorkApplyQuery.java
src/main/java/com/gk/hotwork/specialWork/model/query/WorkTemporaryPowerQuery.java
src/main/java/com/gk/hotwork/specialWork/model/query/db/AllWorkApplyPageDBQuery.java
src/main/java/com/gk/hotwork/specialWork/model/query/db/ApprovalRuleItemDBQuery.java
src/main/java/com/gk/hotwork/specialWork/model/query/db/ApprovalRuleItemMeasureQuery.java
src/main/java/com/gk/hotwork/specialWork/model/query/db/ApprovalRuleItemPageDBQuery.java
src/main/java/com/gk/hotwork/specialWork/model/query/db/ApprovalRuleListDbQuery.java
src/main/java/com/gk/hotwork/specialWork/model/query/db/ApprovalRuleStandListDBQuery.java
src/main/java/com/gk/hotwork/specialWork/model/query/db/ApprovalRuleStandPageDBQuery.java
src/main/java/com/gk/hotwork/specialWork/model/query/db/ApprovalRuleStepListDbQuery.java
src/main/java/com/gk/hotwork/specialWork/model/query/db/ApprovalRuleUnitDbQuery.java
src/main/java/com/gk/hotwork/specialWork/model/query/db/ApprovalRuleUnitItemListDbQuery.java
src/main/java/com/gk/hotwork/specialWork/model/query/db/WorkApplyApplyingPageDBQuery.java
src/main/java/com/gk/hotwork/specialWork/model/query/db/WorkApplyPendingPageDBQuery.java
src/main/java/com/gk/hotwork/specialWork/model/query/db/WorkApplyRecordListDBQuery.java
src/main/java/com/gk/hotwork/specialWork/model/query/db/WorkApprovalItemListDbQuery.java
src/main/java/com/gk/hotwork/specialWork/model/query/db/WorkApprovalStepListDbQuery.java
src/main/java/com/gk/hotwork/specialWork/model/query/db/WorkApprovalUnitListDbQuery.java
src/main/java/com/gk/hotwork/specialWork/model/query/db/WorkHotQuery.java
src/main/java/com/gk/hotwork/specialWork/model/query/db/WorkListDbQuery.java
src/main/java/com/gk/hotwork/specialWork/model/query/db/WorkProcessDetectionPageDBQuery.java
src/main/java/com/gk/hotwork/specialWork/model/query/db/WorkProcessWarningPageDBQuery.java
src/main/java/com/gk/hotwork/specialWork/model/query/db/WorkProcessWorkApplyDBQuery.java
src/main/java/com/gk/hotwork/specialWork/model/update/EntityStatusBatchUO.java
src/main/java/com/gk/hotwork/specialWork/mq/consumer/ApplySpecialWorkConsumer.java
src/main/java/com/gk/hotwork/specialWork/mq/consumer/ApprovalSpecialWorkConsumer.java
src/main/java/com/gk/hotwork/specialWork/mq/msg/ApplySpecialWorkMsg.java
src/main/java/com/gk/hotwork/specialWork/mq/msg/ApprovalSpecialWorkMsg.java
src/main/java/com/gk/hotwork/specialWork/repository/ApprovalRuleItemMeasureRepository.java
src/main/java/com/gk/hotwork/specialWork/repository/ApprovalRuleItemStandRepository.java
src/main/java/com/gk/hotwork/specialWork/repository/ApprovalRuleRepository.java
src/main/java/com/gk/hotwork/specialWork/repository/ApprovalRuleStepRepository.java
src/main/java/com/gk/hotwork/specialWork/repository/ApprovalRuleUnitItemRepository.java
src/main/java/com/gk/hotwork/specialWork/repository/ApprovalRuleUnitRepository.java
src/main/java/com/gk/hotwork/specialWork/repository/WorkApplyInfoRepository.java
src/main/java/com/gk/hotwork/specialWork/repository/WorkApplyOperatorInfoRepository.java
src/main/java/com/gk/hotwork/specialWork/repository/WorkApplyRecordInfoRepository.java
src/main/java/com/gk/hotwork/specialWork/repository/WorkApprovalFilledItemInfoRepository.java
src/main/java/com/gk/hotwork/specialWork/repository/WorkApprovalItemInfoRepository.java
src/main/java/com/gk/hotwork/specialWork/repository/WorkApprovalItemMeasureInfoRepository.java
src/main/java/com/gk/hotwork/specialWork/repository/WorkApprovalItemStandInfoRepository.java
src/main/java/com/gk/hotwork/specialWork/repository/WorkApprovalRuleInfoRepository.java
src/main/java/com/gk/hotwork/specialWork/repository/WorkApprovalStepInfoRepository.java
src/main/java/com/gk/hotwork/specialWork/repository/WorkApprovalUnitInfoRepository.java
src/main/java/com/gk/hotwork/specialWork/repository/WorkAtHeightInfoRepository.java
src/main/java/com/gk/hotwork/specialWork/repository/WorkBlindPlatePluggingInfoRepository.java
src/main/java/com/gk/hotwork/specialWork/repository/WorkBrokenCircuitInfoRepository.java
src/main/java/com/gk/hotwork/specialWork/repository/WorkConfinedSpaceInfoRepository.java
src/main/java/com/gk/hotwork/specialWork/repository/WorkGroundBreakingInfoRepository.java
src/main/java/com/gk/hotwork/specialWork/repository/WorkHoistingInfoRepository.java
src/main/java/com/gk/hotwork/specialWork/repository/WorkHotInfoRepository.java
src/main/java/com/gk/hotwork/specialWork/repository/WorkProcessDetectionInfoRepository.java
src/main/java/com/gk/hotwork/specialWork/repository/WorkProcessWarningInfoRepository.java
src/main/java/com/gk/hotwork/specialWork/repository/WorkTemporaryPowerInfoRepository.java
src/main/java/com/gk/hotwork/specialWork/schedule/KeepAliveRobot.java
src/main/java/com/gk/hotwork/specialWork/service/ApprovalConfigService.java
src/main/java/com/gk/hotwork/specialWork/service/ApprovalWorkRocketMQService.java
src/main/java/com/gk/hotwork/specialWork/service/RuleItemService.java
src/main/java/com/gk/hotwork/specialWork/service/RuleMeasureService.java
src/main/java/com/gk/hotwork/specialWork/service/RuleService.java
src/main/java/com/gk/hotwork/specialWork/service/RuleStandService.java
src/main/java/com/gk/hotwork/specialWork/service/SpecialWorkMinoService.java
src/main/java/com/gk/hotwork/specialWork/service/WorkApplyRecordService.java
src/main/java/com/gk/hotwork/specialWork/service/WorkApplyRocketMQService.java
src/main/java/com/gk/hotwork/specialWork/service/WorkApplyService.java
src/main/java/com/gk/hotwork/specialWork/service/WorkAtHeightPrintService.java
src/main/java/com/gk/hotwork/specialWork/service/WorkBlindPlatePluggingPrintService.java
src/main/java/com/gk/hotwork/specialWork/service/WorkBrokenCircuitPrintService.java
src/main/java/com/gk/hotwork/specialWork/service/WorkConfinedSpacePrintService.java
src/main/java/com/gk/hotwork/specialWork/service/WorkGroundBreakingPrintService.java
src/main/java/com/gk/hotwork/specialWork/service/WorkHoistingPrintService.java
src/main/java/com/gk/hotwork/specialWork/service/WorkHotPrintService.java
src/main/java/com/gk/hotwork/specialWork/service/WorkPrintService.java
src/main/java/com/gk/hotwork/specialWork/service/WorkProcessService.java
src/main/java/com/gk/hotwork/specialWork/service/WorkStatisticService.java
src/main/java/com/gk/hotwork/specialWork/service/WorkTemporaryPowerPrintService.java
src/main/java/com/gk/hotwork/specialWork/service/baseService/ApprovalRuleItemMeasureService.java
src/main/java/com/gk/hotwork/specialWork/service/baseService/ApprovalRuleService.java
src/main/java/com/gk/hotwork/specialWork/service/baseService/ApprovalRuleStandService.java
src/main/java/com/gk/hotwork/specialWork/service/baseService/ApprovalRuleStepService.java
src/main/java/com/gk/hotwork/specialWork/service/baseService/ApprovalRuleUnitItemService.java
src/main/java/com/gk/hotwork/specialWork/service/baseService/ApprovalRuleUnitService.java
src/main/java/com/gk/hotwork/specialWork/service/baseService/WorkApplyInfoService.java
src/main/java/com/gk/hotwork/specialWork/service/baseService/WorkApplyOperatorInfoService.java
src/main/java/com/gk/hotwork/specialWork/service/baseService/WorkApplyRecordInfoService.java
src/main/java/com/gk/hotwork/specialWork/service/baseService/WorkApprovalFilledItemInfoService.java
src/main/java/com/gk/hotwork/specialWork/service/baseService/WorkApprovalItemInfoService.java
src/main/java/com/gk/hotwork/specialWork/service/baseService/WorkApprovalItemMeasureInfoService.java
src/main/java/com/gk/hotwork/specialWork/service/baseService/WorkApprovalItemStandInfoService.java
src/main/java/com/gk/hotwork/specialWork/service/baseService/WorkApprovalRuleInfoService.java
src/main/java/com/gk/hotwork/specialWork/service/baseService/WorkApprovalStepInfoService.java
src/main/java/com/gk/hotwork/specialWork/service/baseService/WorkApprovalUnitInfoService.java
src/main/java/com/gk/hotwork/specialWork/service/baseService/WorkAtHeightInfoService.java
src/main/java/com/gk/hotwork/specialWork/service/baseService/WorkBlindPlatePluggingInfoService.java
src/main/java/com/gk/hotwork/specialWork/service/baseService/WorkBrokenCircuitInfoService.java
src/main/java/com/gk/hotwork/specialWork/service/baseService/WorkConfinedSpaceInfoService.java
src/main/java/com/gk/hotwork/specialWork/service/baseService/WorkGroundBreakingInfoService.java
src/main/java/com/gk/hotwork/specialWork/service/baseService/WorkHoistingInfoService.java
src/main/java/com/gk/hotwork/specialWork/service/baseService/WorkHotInfoService.java
src/main/java/com/gk/hotwork/specialWork/service/baseService/WorkProcessDetectionInfoService.java
src/main/java/com/gk/hotwork/specialWork/service/baseService/WorkProcessWarningInfoService.java
src/main/java/com/gk/hotwork/specialWork/service/baseService/WorkTemporaryPowerInfoService.java
src/main/java/com/gk/hotwork/specialWork/service/baseService/impl/ApprovalRuleItemMeasureServiceImpl.java
src/main/java/com/gk/hotwork/specialWork/service/baseService/impl/ApprovalRuleServiceImpl.java
src/main/java/com/gk/hotwork/specialWork/service/baseService/impl/ApprovalRuleStandServiceImpl.java
src/main/java/com/gk/hotwork/specialWork/service/baseService/impl/ApprovalRuleStepServiceImpl.java
src/main/java/com/gk/hotwork/specialWork/service/baseService/impl/ApprovalRuleUnitItemServiceImpl.java
src/main/java/com/gk/hotwork/specialWork/service/baseService/impl/ApprovalRuleUnitServiceImpl.java
src/main/java/com/gk/hotwork/specialWork/service/baseService/impl/WorkApplyInfoServiceImpl.java
src/main/java/com/gk/hotwork/specialWork/service/baseService/impl/WorkApplyOperatorInfoServiceImpl.java
src/main/java/com/gk/hotwork/specialWork/service/baseService/impl/WorkApplyRecordInfoServiceImpl.java
src/main/java/com/gk/hotwork/specialWork/service/baseService/impl/WorkApprovalFilledItemInfoServiceImpl.java
src/main/java/com/gk/hotwork/specialWork/service/baseService/impl/WorkApprovalItemInfoServiceImpl.java
src/main/java/com/gk/hotwork/specialWork/service/baseService/impl/WorkApprovalItemMeasureInfoServiceImpl.java
src/main/java/com/gk/hotwork/specialWork/service/baseService/impl/WorkApprovalItemStandInfoServiceImpl.java
src/main/java/com/gk/hotwork/specialWork/service/baseService/impl/WorkApprovalRuleInfoServiceImpl.java
src/main/java/com/gk/hotwork/specialWork/service/baseService/impl/WorkApprovalStepInfoServiceImpl.java
src/main/java/com/gk/hotwork/specialWork/service/baseService/impl/WorkApprovalUnitInfoServiceImpl.java
src/main/java/com/gk/hotwork/specialWork/service/baseService/impl/WorkAtHeightInfoServiceImpl.java
src/main/java/com/gk/hotwork/specialWork/service/baseService/impl/WorkBlindPlatePluggingInfoServiceImpl.java
src/main/java/com/gk/hotwork/specialWork/service/baseService/impl/WorkBrokenCircuitInfoServiceImpl.java
src/main/java/com/gk/hotwork/specialWork/service/baseService/impl/WorkConfinedSpaceInfoServiceImpl.java
src/main/java/com/gk/hotwork/specialWork/service/baseService/impl/WorkGroundBreakingInfoServiceImpl.java
src/main/java/com/gk/hotwork/specialWork/service/baseService/impl/WorkHoistingInfoServiceImpl.java
src/main/java/com/gk/hotwork/specialWork/service/baseService/impl/WorkHotInfoServiceImpl.java
src/main/java/com/gk/hotwork/specialWork/service/baseService/impl/WorkProcessDetectionInfoServiceImpl.java
src/main/java/com/gk/hotwork/specialWork/service/baseService/impl/WorkProcessWarningInfoServiceImpl.java
src/main/java/com/gk/hotwork/specialWork/service/baseService/impl/WorkTemporaryPowerInfoServiceImpl.java
src/main/java/com/gk/hotwork/specialWork/service/impl/ApprovalWorkRocketMQServiceImpl.java
src/main/java/com/gk/hotwork/specialWork/service/impl/RuleItemServiceImpl.java
src/main/java/com/gk/hotwork/specialWork/service/impl/RuleMeasureServiceImpl.java
src/main/java/com/gk/hotwork/specialWork/service/impl/RuleServiceImpl.java
src/main/java/com/gk/hotwork/specialWork/service/impl/RuleStandServiceImpl.java
src/main/java/com/gk/hotwork/specialWork/service/impl/SpecialWorkMinoServiceImpl.java
src/main/java/com/gk/hotwork/specialWork/service/impl/WorkApplyRecordServiceImpl.java
src/main/java/com/gk/hotwork/specialWork/service/impl/WorkApplyRocketMQServiceImpl.java
src/main/java/com/gk/hotwork/specialWork/service/impl/WorkApplyServiceImpl.java
src/main/java/com/gk/hotwork/specialWork/service/impl/WorkAtHeightPrintServiceImpl.java
src/main/java/com/gk/hotwork/specialWork/service/impl/WorkBlindPlatePluggingPrintServiceImpl.java
src/main/java/com/gk/hotwork/specialWork/service/impl/WorkBrokenCircuitPrintServiceImpl.java
src/main/java/com/gk/hotwork/specialWork/service/impl/WorkConfinedSpacePrintServiceImpl.java
src/main/java/com/gk/hotwork/specialWork/service/impl/WorkGroundBreakingPrintServiceImpl.java
src/main/java/com/gk/hotwork/specialWork/service/impl/WorkHoistingPrintServiceImpl.java
src/main/java/com/gk/hotwork/specialWork/service/impl/WorkHotPrintServiceImpl.java
src/main/java/com/gk/hotwork/specialWork/service/impl/WorkPrintServiceImpl.java
src/main/java/com/gk/hotwork/specialWork/service/impl/WorkProcessServiceImpl.java
src/main/java/com/gk/hotwork/specialWork/service/impl/WorkStatisticServiceImpl.java
src/main/java/com/gk/hotwork/specialWork/service/impl/WorkTemporaryPowerPrintServiceImpl.java
src/main/java/com/gk/hotwork/specialWork/util/QrCodeUtil.java
src/main/java/com/gk/hotwork/specialWork/util/WordReporter.java
src/main/java/com/gk/hotwork/specialWork/util/WorkExportUtil.java
src/main/java/com/gk/hotwork/specialWork/util/WorkPrintShiftUtil.java
src/main/java/com/gk/hotwork/specialWork/util/WorkUtil.java
src/main/resources/application-dev.yml
src/main/resources/application-prod.yml
src/main/resources/application-test.yml
src/main/resources/application.yml
src/main/resources/docxTemplate/workAtHeight.docx
src/main/resources/docxTemplate/workBlindPlatePlugging.docx
src/main/resources/docxTemplate/workBrokenCircuit.docx
src/main/resources/docxTemplate/workConfinedSpace.docx
src/main/resources/docxTemplate/workGroundBreaking.docx
src/main/resources/docxTemplate/workHoisting.docx
src/main/resources/docxTemplate/workTemporaryPower.docx
src/main/resources/docxTemplate/workhot.docx
src/main/resources/error.setting
src/main/resources/log4j.properties
src/main/resources/printTemplate/allworkcert.doc
src/main/resources/printTemplate/certificatelicense.docx
src/main/resources/printTemplate/certificatelicenseapply.docx |
