From 5b2c156d6d29d946b3b1bf0d7a55847f108d5e03 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 26 七月 2023 11:11:06 +0800
Subject: [PATCH] 后台代码
---
/dev/null | 11 -
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java | 59 +++++----
cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/CompetitionClient.java | 21 +++
cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition.html | 59 +++++----
cloud-server-management/pom.xml | 5
cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/ListQuery.java | 2
cloud-server-management/src/main/java/com/dsh/course/mapper/StoreMapper.java | 3
cloud-server-management/mb-cloud-management.iml | 144 +----------------------
cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/Competition.java | 7 +
cloud-server-management/src/main/resources/mapper/TStoreMapper.xml | 2
cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/StoreServiceImpl.java | 2
11 files changed, 103 insertions(+), 212 deletions(-)
diff --git a/cloud-server-management/mb-cloud-management.iml b/cloud-server-management/mb-cloud-management.iml
index 2e53206..50ddf3f 100644
--- a/cloud-server-management/mb-cloud-management.iml
+++ b/cloud-server-management/mb-cloud-management.iml
@@ -29,6 +29,7 @@
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.13.3" level="project" />
+ <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
<orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
<orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.26" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.11.RELEASE" level="project" />
@@ -216,138 +217,6 @@
<orderEntry type="library" name="Maven: cn.hutool:hutool-all:4.5.6" level="project" />
<orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
<orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
- <orderEntry type="module" module-name="mb-cloud-competition" />
- <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.13" level="project" />
- <orderEntry type="library" name="Maven: org.gavaghan:geodesy:1.1.3" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-jdbc-core:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-transaction-core:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-transaction-api:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-infra-executor:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: io.vertx:vertx-mysql-client:4.2.3" level="project" />
- <orderEntry type="library" name="Maven: io.vertx:vertx-core:4.2.3" level="project" />
- <orderEntry type="library" name="Maven: io.netty:netty-handler-proxy:4.1.54.Final" level="project" />
- <orderEntry type="library" name="Maven: io.netty:netty-codec-socks:4.1.54.Final" level="project" />
- <orderEntry type="library" name="Maven: io.netty:netty-codec-http:4.1.54.Final" level="project" />
- <orderEntry type="library" name="Maven: io.netty:netty-codec-http2:4.1.54.Final" level="project" />
- <orderEntry type="library" name="Maven: io.netty:netty-resolver-dns:4.1.54.Final" level="project" />
- <orderEntry type="library" name="Maven: io.netty:netty-codec-dns:4.1.54.Final" level="project" />
- <orderEntry type="library" name="Maven: io.vertx:vertx-sql-client:4.2.3" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-sql-parser-sql92:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-sql-parser-engine:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-sql-parser-spi:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-sql-parser-statement:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: com.github.ben-manes.caffeine:caffeine:2.8.6" level="project" />
- <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:3.7.0" level="project" />
- <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.4.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-sql-parser-mysql:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-sql-parser-postgresql:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-sql-parser-oracle:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-sql-parser-sqlserver:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-sql-parser-opengauss:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-authority-core:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-authority-api:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-single-table-core:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-single-table-api:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-infra-route:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-traffic-core:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-infra-common:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-infra-util:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.groovy:groovy:4.0.3" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-infra-binder:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-dialect-exception-core:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-traffic-api:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-infra-context:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-distsql-parser:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-distsql-statement:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-sql-translator-core:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-sql-translator-api:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-standalone-mode-core:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-mode-core:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-schedule-core:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere.elasticjob:elasticjob-lite-core:3.0.1" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere.elasticjob:elasticjob-api:3.0.1" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere.elasticjob:elasticjob-infra-common:3.0.1" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere.elasticjob:elasticjob-registry-center:3.0.1" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere.elasticjob:elasticjob-simple-executor:3.0.1" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere.elasticjob:elasticjob-executor-kernel:3.0.1" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere.elasticjob:elasticjob-error-handler-general:3.0.1" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere.elasticjob:elasticjob-error-handler-spi:3.0.1" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere.elasticjob:elasticjob-dataflow-executor:3.0.1" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere.elasticjob:elasticjob-script-executor:3.0.1" level="project" />
- <orderEntry type="library" name="Maven: org.apache.commons:commons-exec:1.3" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere.elasticjob:elasticjob-http-executor:3.0.1" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere.elasticjob:elasticjob-tracing-rdb:3.0.1" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere.elasticjob:elasticjob-tracing-api:3.0.1" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere.elasticjob:elasticjob-lite-lifecycle:3.0.1" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-standalone-mode-repository-api:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-standalone-mode-repository-jdbc-h2:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-standalone-mode-repository-jdbc-core:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-cluster-mode-core:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-cluster-mode-repository-api:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-sharding-core:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-sharding-api:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-data-pipeline-core:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-data-pipeline-api:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-cluster-mode-repository-zookeeper-curator:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.curator:curator-framework:4.0.1" level="project" />
- <orderEntry type="library" name="Maven: org.apache.curator:curator-client:5.1.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.6.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper-jute:3.6.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.yetus:audience-annotations:0.5.0" level="project" />
- <orderEntry type="library" name="Maven: io.netty:netty-transport-native-epoll:4.1.54.Final" level="project" />
- <orderEntry type="library" name="Maven: io.netty:netty-transport-native-unix-common:4.1.54.Final" level="project" />
- <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
- <orderEntry type="library" name="Maven: org.apache.curator:curator-recipes:2.12.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-infra-rewrite:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-sql-translator-native-provider:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-infra-merge:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.calcite:calcite-linq4j:1.31.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.calcite.avatica:avatica-core:1.22.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.calcite.avatica:avatica-metrics:1.22.0" level="project" />
- <orderEntry type="library" name="Maven: com.google.protobuf:protobuf-java:3.5.1" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.httpcomponents.client5:httpclient5:5.1.3" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.httpcomponents.core5:httpcore5-h2:5.1.3" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.httpcomponents.core5:httpcore5:5.1.3" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-system-datetime:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-infra-datetime-spi:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-sharding-cosid:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: me.ahoo.cosid:cosid-core:1.14.4" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-sharding-nanoid:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: com.aventrix.jnanoid:jnanoid:2.0.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-readwrite-splitting-core:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-readwrite-splitting-api:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-db-discovery-core:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-db-discovery-api:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-db-discovery-mysql:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-db-discovery-opengauss:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-encrypt-core:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-encrypt-api:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-encrypt-sm:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-shadow-core:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-shadow-api:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-infra-federation-executor:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-infra-federation-optimizer:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.calcite:calcite-core:1.31.0" level="project" />
- <orderEntry type="library" name="Maven: com.esri.geometry:esri-geometry-api:2.2.0" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.11.3" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: com.google.uzaygezen:uzaygezen-core:0.2" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: com.yahoo.datasketches:sketches-core:0.9.0" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: com.yahoo.datasketches:memory:0.9.0" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: net.hydromatic:aggdesigner-algorithm:6.0" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.commons:commons-dbcp2:2.7.0" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: org.codehaus.janino:commons-compiler:3.1.2" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: org.codehaus.janino:janino:3.1.2" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-parser-core:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-parser-api:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shardingsphere:shardingsphere-infra-parser:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: com.h2database:h2:1.4.200" 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: dom4j:dom4j:1.6.1" level="project" />
- <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
- <orderEntry type="library" name="Maven: com.alipay.sdk:alipay-sdk-java:4.8.10.ALL" level="project" />
- <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.62" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery:2.2.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-client:1.2.1" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-common:1.2.1" level="project" />
@@ -362,6 +231,7 @@
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:2.2.6.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.59" level="project" />
+ <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.59" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.2.6.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-archaius:2.2.6.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-archaius:2.2.6.RELEASE" level="project" />
@@ -402,10 +272,10 @@
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.3.6.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.3.6.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.3.6.RELEASE" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: net.minidev:json-smart:2.3" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: org.ow2.asm:asm:5.0.4" 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" />
@@ -417,7 +287,7 @@
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-params:5.6.3" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.6.3" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.vintage:junit-vintage-engine:5.6.3" level="project" />
- <orderEntry type="library" name="Maven: org.apiguardian:apiguardian-api:1.1.0" 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.junit.platform:junit-platform-engine:1.6.3" 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.18" level="project" />
diff --git a/cloud-server-management/pom.xml b/cloud-server-management/pom.xml
index d41a8a8..3ee8da5 100644
--- a/cloud-server-management/pom.xml
+++ b/cloud-server-management/pom.xml
@@ -210,11 +210,6 @@
<version>2.3.1</version>
</dependency>
- <dependency>
- <groupId>cn.mb.cloud</groupId>
- <artifactId>mb-cloud-competition</artifactId>
- <version>1.1.3</version>
- </dependency>
</dependencies>
<build>
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/CompetitionClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/CompetitionClient.java
new file mode 100644
index 0000000..ac09c0d
--- /dev/null
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/CompetitionClient.java
@@ -0,0 +1,21 @@
+package com.dsh.course.feignClient.competition;
+
+import com.dsh.course.feignClient.competition.model.Competition;
+import com.dsh.course.feignClient.competition.model.ListQuery;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+@FeignClient("mb-cloud-competition")
+public interface CompetitionClient {
+
+ @PostMapping("/base/competition/queryById")
+ Competition queryById(Integer id);
+
+ @PostMapping("/base/competition/list")
+ List<Competition> list(ListQuery listQuery);
+}
+
+
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/Competition.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/Competition.java
new file mode 100644
index 0000000..0a6fa17
--- /dev/null
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/Competition.java
@@ -0,0 +1,7 @@
+package com.dsh.course.feignClient.competition.model;
+
+public class Competition {
+
+
+
+}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/client/competition/model/ListQuery.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/ListQuery.java
similarity index 86%
rename from cloud-server-management/src/main/java/com/dsh/guns/modular/system/client/competition/model/ListQuery.java
rename to cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/ListQuery.java
index 1604123..4b380af 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/client/competition/model/ListQuery.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/ListQuery.java
@@ -1,4 +1,4 @@
-package com.dsh.guns.modular.system.client.competition.model;
+package com.dsh.course.feignClient.competition.model;
import lombok.AllArgsConstructor;
import lombok.Data;
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/mapper/StoreMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/StoreMapper.java
similarity index 70%
rename from cloud-server-management/src/main/java/com/dsh/guns/modular/system/mapper/StoreMapper.java
rename to cloud-server-management/src/main/java/com/dsh/course/mapper/StoreMapper.java
index 96d1de1..d2de6af 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/mapper/StoreMapper.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/mapper/StoreMapper.java
@@ -1,7 +1,6 @@
-package com.dsh.guns.modular.system.mapper;
+package com.dsh.course.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dsh.competition.entity.Participant;
import com.dsh.guns.modular.system.model.TStore;
/**
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/client/competition/CompetitionClient.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/client/competition/CompetitionClient.java
deleted file mode 100644
index 25111cf..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/client/competition/CompetitionClient.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.dsh.guns.modular.system.client.competition;
-
-import com.dsh.competition.entity.Competition;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-
-@FeignClient("mb-cloud-competition")
-public interface CompetitionClient {
- @PostMapping("/base/competition/queryById")
- Competition queryById(Integer id);
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java
index 337e62d..bc7bd58 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java
@@ -1,39 +1,46 @@
package com.dsh.guns.modular.system.controller.code;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.dsh.competition.entity.Competition;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dsh.course.feignClient.competition.CompetitionClient;
+import com.dsh.course.feignClient.competition.model.Competition;
+import com.dsh.course.feignClient.competition.model.ListQuery;
+import com.dsh.course.feignClient.course.CourseClient;
+import com.dsh.guns.config.UserExt;
import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.common.annotion.Permission;
+import com.dsh.guns.core.common.constant.factory.PageFactory;
+import com.dsh.guns.core.util.SinataUtil;
import com.dsh.guns.core.util.ToolUtil;
-import com.dsh.guns.modular.system.client.competition.CompetitionClient;
-import com.dsh.guns.modular.system.client.competition.model.ListQuery;
import com.dsh.guns.modular.system.model.TStore;
import com.dsh.guns.modular.system.service.IStoreService;
+import com.dsh.guns.modular.system.util.DateUtil;
+import com.dsh.guns.modular.system.util.ExcelExportUtil;
+import com.dsh.guns.modular.system.util.ResultUtil;
import com.dsh.guns.modular.system.warpper.RoleWarpper;
+import org.apache.commons.lang.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.*;
import java.util.stream.Collectors;
/**
- * 菜单控制器
+ * 车辆管理控制器
*
* @author fengshuonan
- * @Date 2017年2月12日21:59:14
+ * @Date 2020-06-05 17:25:12
*/
@Controller
-@RequestMapping("/tCompetition")
+@RequestMapping("/TCompetition")
public class TCompetitionController extends BaseController {
- private static String PREFIX = "/system/tCompetition/";
+ private String PREFIX = "/system/TCompetition/";
@Autowired
private CompetitionClient competitionClient;
@@ -43,27 +50,28 @@
/**
- * 跳转到菜单列表列表页面
+ * 跳转到车辆管理首页
*/
@RequestMapping("")
public String index(Model model) {
- return PREFIX + "tCompetition.html";
+ return PREFIX + "TCompetition.html";
}
/**
- * 跳转到菜单列表列表页面
+ * 跳转到添加车辆管理
*/
- @RequestMapping(value = "/tCompetition_add")
+ @RequestMapping("/tCompetition_add")
public String tCompetitionAdd(Model model) {
return PREFIX + "tCompetition_add.html";
}
+
/**
- * 跳转到菜单详情列表页面
+ * 跳转到修改车辆管理
*/
- @RequestMapping(value = "/tCompetition_edit/{id}")
- public String tCompetitionEdit(@PathVariable Integer id, Model model) {
- Competition competition = competitionClient.queryById(id);
+ @RequestMapping("/tCompetition_update/{id}")
+ public String tCarUpdate(@PathVariable Integer id, Model model) {
+ Competition competition = competitionClient.queryById(id);
model.addAttribute("item",competition);
return PREFIX + "tCompetition_edit.html";
}
@@ -83,11 +91,10 @@
if(ids.size()==0){
ids.add(-1);
}
- ListQuery listQuery = new ListQuery();
-// List<Competition> competitions = competitionClient.list();
+ ListQuery listQuery = new ListQuery(provinceCode,cityCode,eventName,time,state,registerCondition,ids);
+ List<Competition> competitions = competitionClient.list(listQuery);
return super.warpObject(null);
}
-
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/StoreServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/StoreServiceImpl.java
index 79de3dc..0d4bebc 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/StoreServiceImpl.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/StoreServiceImpl.java
@@ -1,7 +1,7 @@
package com.dsh.guns.modular.system.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.guns.modular.system.mapper.StoreMapper;
+import com.dsh.course.mapper.StoreMapper;
import com.dsh.guns.modular.system.model.TStore;
import com.dsh.guns.modular.system.service.IStoreService;
import org.springframework.stereotype.Service;
diff --git a/cloud-server-management/src/main/resources/mapper/TStoreMapper.xml b/cloud-server-management/src/main/resources/mapper/TStoreMapper.xml
index 15c1b1f..972c608 100644
--- a/cloud-server-management/src/main/resources/mapper/TStoreMapper.xml
+++ b/cloud-server-management/src/main/resources/mapper/TStoreMapper.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dsh.guns.modular.system.mapper.StoreMapper">
+<mapper namespace="com.dsh.course.mapper.StoreMapper">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition.html
index 5cc53ab..d2cf885 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition.html
@@ -26,41 +26,44 @@
</div>
<div class="col-sm-3">
<#SelectCon id="state" name="状态" >
- <option value="">全部</option>
- <option value="1">未开始</option>
- <option value="2">已开始</option>
- <option value="3">已结束</option>
- <option value="4">已取消</option>
- </#SelectCon>
- </div>
- <div class="col-sm-3">
- <#SelectCon id="registerCondition" name="报名条件" >
- <option value="">全部</option>
- <option value="1">全部用户</option>
- <option value="2">仅限年度会员参与</option>
- <option value="3">仅限学员参与</option>
- </#SelectCon>
- </div>
- <div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="TCar.search()"/>
- <#button name="重置" icon="fa-trash" clickFun="TCar.resetSearch()" space="true"/>
- </div>
+ <option value="">全部</option>
+ <option value="1">未开始</option>
+ <option value="2">已开始</option>
+ <option value="3">已结束</option>
+ <option value="4">已取消</option>
+ </#SelectCon>
</div>
- <div class="hidden-xs" id="TCarTableToolbar" role="group">
- <#button name="添加" icon="fa-plus" clickFun="TCar.openAddTCar()"/>
- <#button name="编辑" icon="fa-edit" clickFun="TCar.openTCarDetail()" space="true"/>
- <#button name="取消" icon="fa-remove" clickFun="TCar.delete()" space="true"/>
- <#button name="查看详情" icon="fa-remove" clickFun="TCar.delete()" space="true"/>
- <#button name="已报名人员" icon="fa-remove" clickFun="TCar.delete()" space="true"/>
-
- </div>
- <#table id="TCarTable"/>
+ <div class="col-sm-3">
+ <#SelectCon id="registerCondition" name="报名条件" >
+ <option value="">全部</option>
+ <option value="1">全部用户</option>
+ <option value="2">仅限年度会员参与</option>
+ <option value="3">仅限学员参与</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TCar.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TCar.resetSearch()" space="true"/>
+ </div>
+ <div class="col-sm-3">
+ <input type="file" name="file" style="width:0px;height:0px;" id="uploadEventFile" onchange="TCar.exportCar()">
</div>
</div>
+ <div class="hidden-xs" id="TCarTableToolbar" role="group">
+ <#button name="添加" icon="fa-plus" clickFun="TCar.openAddTCar()"/>
+ <#button name="编辑" icon="fa-edit" clickFun="TCar.openTCarDetail()" space="true"/>
+ <#button name="取消" icon="fa-remove" clickFun="TCar.delete()" space="true"/>
+ <#button name="查看详情" icon="fa-remove" clickFun="TCar.delete()" space="true"/>
+ <#button name="已报名人员" icon="fa-remove" clickFun="TCar.delete()" space="true"/>
+
+ </div>
+ <#table id="TCarTable"/>
</div>
</div>
</div>
</div>
+</div>
+</div>
<script src="${ctxPath}/modular/system/tCompetition/tCompetition.js"></script>
<script>
laydate.render({
--
Gitblit v1.7.1