diff --git a/jeecg-module-event/src/main/java/org/jeecg/runProcess/controller/RunProcessController.java b/jeecg-module-event/src/main/java/org/jeecg/runProcess/controller/RunProcessController.java index 50024ed..4875e17 100644 --- a/jeecg-module-event/src/main/java/org/jeecg/runProcess/controller/RunProcessController.java +++ b/jeecg-module-event/src/main/java/org/jeecg/runProcess/controller/RunProcessController.java @@ -3,23 +3,16 @@ package org.jeecg.runProcess.controller; import io.swagger.v3.oas.annotations.Operation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.jeecg.cmaq.service.CmaqService; +import org.jeecg.sync.service.CmaqService; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.engineering.service.EngineeringService; -import org.jeecg.modules.base.entity.DoseFactor; import org.jeecg.modules.base.entity.Engineering; import org.jeecg.runProcess.VO.RunProcessParamVO; import org.jeecg.runProcess.service.RunProcessService; import org.jeecg.wrf.service.WrfService; import org.springframework.web.bind.annotation.*; -import java.io.BufferedWriter; -import java.io.FileWriter; -import java.io.IOException; -import java.util.List; -import java.util.Map; - /** * @Description: 运行过程 * @Author: jeecg-boot diff --git a/jeecg-module-event/src/main/java/org/jeecg/runProcess/service/impl/RunProcessServiceImpl.java b/jeecg-module-event/src/main/java/org/jeecg/runProcess/service/impl/RunProcessServiceImpl.java index 2cb5efd..c294b7e 100644 --- a/jeecg-module-event/src/main/java/org/jeecg/runProcess/service/impl/RunProcessServiceImpl.java +++ b/jeecg-module-event/src/main/java/org/jeecg/runProcess/service/impl/RunProcessServiceImpl.java @@ -3,7 +3,7 @@ package org.jeecg.runProcess.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.RequiredArgsConstructor; import org.jeecg.baseAPI.service.BaseAPIService; -import org.jeecg.cmaq.service.CmaqService; +import org.jeecg.sync.service.CmaqService; import org.jeecg.common.api.vo.Result; import org.jeecg.common.constant.EventConstants; import org.jeecg.common.properties.EventServerProperties; diff --git a/jeecg-module-event/src/main/java/org/jeecg/cmaq/controller/CmaqController.java b/jeecg-module-event/src/main/java/org/jeecg/sync/controller/CmaqController.java similarity index 85% rename from jeecg-module-event/src/main/java/org/jeecg/cmaq/controller/CmaqController.java rename to jeecg-module-event/src/main/java/org/jeecg/sync/controller/CmaqController.java index 5789985..a96c89f 100644 --- a/jeecg-module-event/src/main/java/org/jeecg/cmaq/controller/CmaqController.java +++ b/jeecg-module-event/src/main/java/org/jeecg/sync/controller/CmaqController.java @@ -1,19 +1,15 @@ -package org.jeecg.cmaq.controller; +package org.jeecg.sync.controller; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import io.swagger.v3.oas.annotations.Operation; import lombok.extern.slf4j.Slf4j; -import org.jeecg.cmaq.service.CmaqService; +import org.jeecg.sync.service.CmaqService; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.modules.base.entity.Cmaq; -import org.jeecg.wrf.service.WrfService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.List; - /** * @Description: CMAQ * @Author: jeecg-boot diff --git a/jeecg-module-event/src/main/java/org/jeecg/cmaq/service/CmaqService.java b/jeecg-module-event/src/main/java/org/jeecg/sync/service/CmaqService.java similarity index 90% rename from jeecg-module-event/src/main/java/org/jeecg/cmaq/service/CmaqService.java rename to jeecg-module-event/src/main/java/org/jeecg/sync/service/CmaqService.java index aea656f..40c96a7 100644 --- a/jeecg-module-event/src/main/java/org/jeecg/cmaq/service/CmaqService.java +++ b/jeecg-module-event/src/main/java/org/jeecg/sync/service/CmaqService.java @@ -1,4 +1,4 @@ -package org.jeecg.cmaq.service; +package org.jeecg.sync.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.modules.base.entity.Cmaq; diff --git a/jeecg-module-event/src/main/java/org/jeecg/cmaq/service/impl/CmaqServiceImpl.java b/jeecg-module-event/src/main/java/org/jeecg/sync/service/impl/CmaqServiceImpl.java similarity index 92% rename from jeecg-module-event/src/main/java/org/jeecg/cmaq/service/impl/CmaqServiceImpl.java rename to jeecg-module-event/src/main/java/org/jeecg/sync/service/impl/CmaqServiceImpl.java index a175299..2b3b2d5 100644 --- a/jeecg-module-event/src/main/java/org/jeecg/cmaq/service/impl/CmaqServiceImpl.java +++ b/jeecg-module-event/src/main/java/org/jeecg/sync/service/impl/CmaqServiceImpl.java @@ -1,8 +1,8 @@ -package org.jeecg.cmaq.service.impl; +package org.jeecg.sync.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.jeecg.cmaq.service.CmaqService; +import org.jeecg.sync.service.CmaqService; import org.jeecg.common.exception.JeecgBootException; import org.jeecg.modules.base.entity.Cmaq; import org.jeecg.modules.base.mapper.CmaqMapper; diff --git a/jeecg-module-large-screen/pom.xml b/jeecg-module-large-screen/pom.xml new file mode 100644 index 0000000..235bd74 --- /dev/null +++ b/jeecg-module-large-screen/pom.xml @@ -0,0 +1,31 @@ + + + 4.0.0 + + org.jeecgframework.boot + jeecg-boot-parent + 3.8.1 + + + jeecg-module-large-screen + + + 17 + 17 + UTF-8 + + + + + org.jeecgframework.boot + jeecg-boot-base-core + ${jeecgboot.version} + + + org.springframework.cloud + spring-cloud-openfeign-core + + + \ No newline at end of file diff --git a/jeecg-module-large-screen/src/main/java/org/jeecg/sync/controller/SyncFeignController.java b/jeecg-module-large-screen/src/main/java/org/jeecg/sync/controller/SyncFeignController.java new file mode 100644 index 0000000..32e4308 --- /dev/null +++ b/jeecg-module-large-screen/src/main/java/org/jeecg/sync/controller/SyncFeignController.java @@ -0,0 +1,30 @@ +package org.jeecg.sync.controller; + +import io.swagger.v3.oas.annotations.Operation; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.sync.feign.SyncFeignClient; +import org.springframework.web.bind.annotation.*; + +/** + * @Description: 大屏 + * @Author: jeecg-boot + * @Date: 2022-12-19 + * @Version: V1.0 + */ +@RestController +@RequestMapping("/syncFeign") +@Slf4j +@RequiredArgsConstructor +public class SyncFeignController { + + private final SyncFeignClient syncFeignClient; + + @Operation(summary = "大屏-同步记录") + @GetMapping(value = "/syncList") + public Result queryPageList(){ + return syncFeignClient.list(); + } + +} diff --git a/jeecg-module-large-screen/src/main/java/org/jeecg/sync/feign/SyncFeignClient.java b/jeecg-module-large-screen/src/main/java/org/jeecg/sync/feign/SyncFeignClient.java new file mode 100644 index 0000000..af9dc6b --- /dev/null +++ b/jeecg-module-large-screen/src/main/java/org/jeecg/sync/feign/SyncFeignClient.java @@ -0,0 +1,12 @@ +package org.jeecg.sync.feign; + +import org.jeecg.common.api.vo.Result; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; + +@FeignClient(value = "jeecg-sync") +public interface SyncFeignClient { + + @GetMapping(value = "/stasSyncRecord/list") + Result list(); +} diff --git a/jeecg-server-cloud/jeecg-large-screen-start/pom.xml b/jeecg-server-cloud/jeecg-large-screen-start/pom.xml new file mode 100644 index 0000000..0b43733 --- /dev/null +++ b/jeecg-server-cloud/jeecg-large-screen-start/pom.xml @@ -0,0 +1,45 @@ + + + 4.0.0 + + org.jeecgframework.boot + jeecg-server-cloud + 3.8.1 + + + jeecg-large-screen-start + + + 17 + 17 + UTF-8 + + + + + org.jeecgframework.boot + jeecg-boot-starter3-cloud + + + org.jeecgframework.boot + jeecg-system-cloud-api + ${jeecgboot.version} + + + org.jeecgframework.boot + jeecg-module-large-screen + ${jeecgboot.version} + + + + stas-cloud-data-large-screen + + + org.springframework.boot + spring-boot-maven-plugin + + + + \ No newline at end of file diff --git a/jeecg-server-cloud/jeecg-large-screen-start/src/main/java/org/jeecg/JeecgLargeScreenCloudApplication.java b/jeecg-server-cloud/jeecg-large-screen-start/src/main/java/org/jeecg/JeecgLargeScreenCloudApplication.java new file mode 100644 index 0000000..d2b274b --- /dev/null +++ b/jeecg-server-cloud/jeecg-large-screen-start/src/main/java/org/jeecg/JeecgLargeScreenCloudApplication.java @@ -0,0 +1,55 @@ +package org.jeecg; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.base.BaseMap; +import org.jeecg.common.constant.GlobalConstants; +import org.jeecg.common.util.oConvertUtils; +import org.springframework.boot.CommandLineRunner; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; +import org.springframework.cloud.openfeign.EnableFeignClients; +import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.core.env.Environment; +import org.springframework.data.redis.core.RedisTemplate; +import java.net.InetAddress; +import java.net.UnknownHostException; + +@Slf4j +@SpringBootApplication +@RequiredArgsConstructor +@EnableFeignClients +public class JeecgLargeScreenCloudApplication extends SpringBootServletInitializer implements CommandLineRunner { + + private final RedisTemplate redisTemplate; + + @Override + protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { + return application.sources(JeecgLargeScreenCloudApplication.class); + } + + public static void main(String[] args) throws UnknownHostException { + ConfigurableApplicationContext application = SpringApplication.run(JeecgLargeScreenCloudApplication.class, args); + Environment env = application.getEnvironment(); + String ip = InetAddress.getLocalHost().getHostAddress(); + String port = env.getProperty("server.port"); + String path = oConvertUtils.getString(env.getProperty("server.servlet.context-path")); + log.info("\n----------------------------------------------------------\n\t" + + "Application STAS-LargeScreen is running! Access URLs:\n\t" + + "Local: \t\thttp://localhost:" + port + path + "/doc.html\n" + + "External: \thttp://" + ip + ":" + port + path + "/doc.html\n" + + "Swagger文档: \thttp://" + ip + ":" + port + path + "/doc.html\n" + + "----------------------------------------------------------"); + + } + + @Override + public void run(String... args) { + BaseMap params = new BaseMap(); + params.put(GlobalConstants.HANDLER_NAME, GlobalConstants.LODER_ROUDER_HANDLER); + //刷新网关 + redisTemplate.convertAndSend(GlobalConstants.REDIS_TOPIC_NAME, params); + } +} \ No newline at end of file diff --git a/jeecg-server-cloud/jeecg-large-screen-start/src/main/resources/application.yml b/jeecg-server-cloud/jeecg-large-screen-start/src/main/resources/application.yml new file mode 100644 index 0000000..820a867 --- /dev/null +++ b/jeecg-server-cloud/jeecg-large-screen-start/src/main/resources/application.yml @@ -0,0 +1,24 @@ +server: + port: 8008 + +spring: + application: + name: jeecg-large-screen + cloud: + nacos: + config: + server-addr: @config.server-addr@ + group: @config.group@ + namespace: @config.namespace@ + username: @config.username@ + password: @config.password@ + discovery: + server-addr: ${spring.cloud.nacos.config.server-addr} + group: @config.group@ + namespace: @config.namespace@ + username: @config.username@ + password: @config.password@ + config: + import: + - optional:nacos:jeecg.yaml + - optional:nacos:jeecg-@profile.name@.yaml \ No newline at end of file diff --git a/jeecg-server-cloud/jeecg-large-screen-start/src/main/resources/logback-spring.xml b/jeecg-server-cloud/jeecg-large-screen-start/src/main/resources/logback-spring.xml new file mode 100644 index 0000000..8ea33ba --- /dev/null +++ b/jeecg-server-cloud/jeecg-large-screen-start/src/main/resources/logback-spring.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %highlight(%-5level) %cyan(%logger{50}:%L) - %msg%n + + + + + + + + ${LOG_HOME}/stas-large-screen-%d{yyyy-MM-dd}.%i.log + + 30 + 10MB + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}:%L - %msg%n + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jeecg-server-cloud/pom.xml b/jeecg-server-cloud/pom.xml index b0e9bf6..0ceb0d8 100644 --- a/jeecg-server-cloud/pom.xml +++ b/jeecg-server-cloud/pom.xml @@ -19,6 +19,7 @@ jeecg-system-cloud-start + jeecg-large-screen-start jeecg-visual jeecg-weather-start jeecg-event-start diff --git a/pom.xml b/pom.xml index 22c74cb..6df4864 100644 --- a/pom.xml +++ b/pom.xml @@ -83,6 +83,7 @@ jeecg-boot-base-core + jeecg-module-large-screen jeecg-module-system jeecg-module-weather jeecg-module-event