diff --git a/byd-structuredplugins-serve/laws-base/laws-base-tools/src/main/java/com/jero/common/modules/redis/config/RedisConfig.java b/byd-structuredplugins-serve/laws-base/laws-base-tools/src/main/java/com/jero/common/modules/redis/config/RedisConfig.java index 378e361..d26fbb1 100644 --- a/byd-structuredplugins-serve/laws-base/laws-base-tools/src/main/java/com/jero/common/modules/redis/config/RedisConfig.java +++ b/byd-structuredplugins-serve/laws-base/laws-base-tools/src/main/java/com/jero/common/modules/redis/config/RedisConfig.java @@ -98,10 +98,11 @@ public class RedisConfig extends CachingConfigurerSupport { */ @Bean public RedisMessageListenerContainer redisContainer(RedisConnectionFactory redisConnectionFactory, RedisReceiver redisReceiver, MessageListenerAdapter commonListenerAdapter) { - RedisMessageListenerContainer container = new RedisMessageListenerContainer(); - container.setConnectionFactory(redisConnectionFactory); - container.addMessageListener(commonListenerAdapter, new ChannelTopic(GlobalConstants.REDIS_TOPIC_NAME)); - return container; +// RedisMessageListenerContainer container = new RedisMessageListenerContainer(); +// container.setConnectionFactory(redisConnectionFactory); +// container.addMessageListener(commonListenerAdapter, new ChannelTopic(GlobalConstants.REDIS_TOPIC_NAME)); +// return container; + return null; } diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/controller/SarItemsStandCompareHisEOController.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/controller/SarItemsStandCompareHisEOController.java index a0b4a25..312e187 100644 --- a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/controller/SarItemsStandCompareHisEOController.java +++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/controller/SarItemsStandCompareHisEOController.java @@ -16,10 +16,8 @@ import io.swagger.annotations.ApiParam; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; @@ -55,5 +53,12 @@ public class SarItemsStandCompareHisEOController extends JeroController edit(@Validated @RequestBody SarItemsCompareHisEO sarFileCompareItem) { + sarItemsCompareHisEOService.editById(sarFileCompareItem); + return Result.OK("编辑成功!"); + } } diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/service/ISarItemsCompareHisEOService.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/service/ISarItemsCompareHisEOService.java index 753c909..d23ea67 100644 --- a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/service/ISarItemsCompareHisEOService.java +++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/service/ISarItemsCompareHisEOService.java @@ -10,4 +10,6 @@ public interface ISarItemsCompareHisEOService extends IService implements ISarItemsCompareHisEOService { @@ -29,4 +31,10 @@ public class SarItemsCompareHisEOServiceImpl extends ServiceImpl - - com.jero.boot - laws-modules-docking - 2.5.1 - + + + + + p6spy p6spy @@ -112,4 +112,4 @@ - \ No newline at end of file + diff --git a/byd-structuredplugins-serve/laws-single-startup/src/main/resources/application-dev.yml b/byd-structuredplugins-serve/laws-single-startup/src/main/resources/application-dev.yml index 0311b4f..fa470a9 100644 --- a/byd-structuredplugins-serve/laws-single-startup/src/main/resources/application-dev.yml +++ b/byd-structuredplugins-serve/laws-single-startup/src/main/resources/application-dev.yml @@ -39,31 +39,31 @@ spring: enable: true required: true ## quartz定时任务,采用数据库方式 - quartz: - job-store-type: jdbc - initialize-schema: embedded - #定时任务启动开关,true-开 false-关 - auto-startup: true - #启动时更新己存在的Job - overwrite-existing-jobs: true - properties: - org: - quartz: - scheduler: - instanceName: MyScheduler - instanceId: AUTO - jobStore: - class: org.quartz.impl.jdbcjobstore.JobStoreTX - driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate - tablePrefix: QRTZ_ - isClustered: true - misfireThreshold: 60000 - clusterCheckinInterval: 10000 - threadPool: - class: org.quartz.simpl.SimpleThreadPool - threadCount: 10 - threadPriority: 5 - threadsInheritContextClassLoaderOfInitializingThread: true +# quartz: +# job-store-type: jdbc +# initialize-schema: embedded +# #定时任务启动开关,true-开 false-关 +# auto-startup: true +# #启动时更新己存在的Job +# overwrite-existing-jobs: true +# properties: +# org: +# quartz: +# scheduler: +# instanceName: MyScheduler +# instanceId: AUTO +# jobStore: +# class: org.quartz.impl.jdbcjobstore.JobStoreTX +# driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate +# tablePrefix: QRTZ_ +# isClustered: true +# misfireThreshold: 60000 +# clusterCheckinInterval: 10000 +# threadPool: +# class: org.quartz.simpl.SimpleThreadPool +# threadCount: 10 +# threadPriority: 5 +# threadsInheritContextClassLoaderOfInitializingThread: true #json 时间戳统一转换 jackson: date-format: yyyy-MM-dd HH:mm:ss @@ -178,40 +178,40 @@ spring: # max-wait: -1ms #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。 # min-idle: 0 #最小等待连接中的数量,设 0 为没有限制 # shutdown-timeout: 100ms - redis: - database: 11 - host: 121.36.69.172 - #host: localhost - lettuce: - pool: - max-active: 8 #最大连接数据库连接数,设 0 为没有限制 - max-idle: 8 #最大等待连接中的数量,设 0 为没有限制 - max-wait: -1ms #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。 - min-idle: 0 #最小等待连接中的数量,设 0 为没有限制 - shutdown-timeout: 100ms - password: hzwlsoft.com - port: 4780 +# redis: +# database: 11 +# host: 121.36.69.172 +# #host: localhost +# lettuce: +# pool: +# max-active: 8 #最大连接数据库连接数,设 0 为没有限制 +# max-idle: 8 #最大等待连接中的数量,设 0 为没有限制 +# max-wait: -1ms #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。 +# min-idle: 0 #最小等待连接中的数量,设 0 为没有限制 +# shutdown-timeout: 100ms +# password: hzwlsoft.com +# port: 4780 # port: 6379 #rabbitmq 配置 - rabbitmq: - host: 121.36.69.172 - username: admin - password: hzwlsoft.com - port: 5672 - publisher-confirm-type: correlated - publisher-returns: true - virtual-host: / - listener: - simple: - acknowledge-mode: manual - #消费者的最小数量 - concurrency: 1 - #消费者的最大数量 - max-concurrency: 1 - #是否支持重试 - retry: - enabled: true +# rabbitmq: +# host: 121.36.69.172 +# username: admin +# password: hzwlsoft.com +# port: 5672 +# publisher-confirm-type: correlated +# publisher-returns: true +# virtual-host: / +# listener: +# simple: +# acknowledge-mode: manual +# #消费者的最小数量 +# concurrency: 1 +# #消费者的最大数量 +# max-concurrency: 1 +# #是否支持重试 +# retry: +# enabled: true #mybatis plus 设置 mybatis-plus: mapper-locations: classpath*:com/jero/**/xml/*Mapper.xml