对比-条款对比结果-编辑
This commit is contained in:
wangzhijiang
+5
-4
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
|
||||
+9
-4
@@ -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<SarItems
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
@AutoLog(value = "条款对比结果-编辑")
|
||||
@ApiOperation(value="条款对比结果-编辑", notes="条款对比结果-编辑")
|
||||
@PostMapping(value = "/edit")
|
||||
public Result<?> edit(@Validated @RequestBody SarItemsCompareHisEO sarFileCompareItem) {
|
||||
sarItemsCompareHisEOService.editById(sarFileCompareItem);
|
||||
return Result.OK("编辑成功!");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
+2
@@ -10,4 +10,6 @@ public interface ISarItemsCompareHisEOService extends IService<SarItemsCompareHi
|
||||
void insertSelective(SarItemsCompareHisEO sarItemsCompareHisEO);
|
||||
|
||||
void deleteByStandHisId(String id);
|
||||
|
||||
void editById(SarItemsCompareHisEO sarFileCompareItem);
|
||||
}
|
||||
|
||||
+8
@@ -11,6 +11,8 @@ import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Propagation;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
@Service
|
||||
@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
|
||||
public class SarItemsCompareHisEOServiceImpl extends ServiceImpl<SarItemsCompareHisEOMapper, SarItemsCompareHisEO> implements ISarItemsCompareHisEOService {
|
||||
@@ -29,4 +31,10 @@ public class SarItemsCompareHisEOServiceImpl extends ServiceImpl<SarItemsCompare
|
||||
public void deleteByStandHisId(String id) {
|
||||
this.sarItemsCompareHisEOMapper.deleteByStandHisId(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void editById(SarItemsCompareHisEO sarFileCompareItem) {
|
||||
sarFileCompareItem.setModifyTime(new Date());
|
||||
this.saveOrUpdate(sarFileCompareItem);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -58,11 +58,11 @@
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.jero.boot</groupId>
|
||||
<artifactId>laws-modules-docking</artifactId>
|
||||
<version>2.5.1</version>
|
||||
</dependency>
|
||||
<!-- <dependency>-->
|
||||
<!-- <groupId>com.jero.boot</groupId>-->
|
||||
<!-- <artifactId>laws-modules-docking</artifactId>-->
|
||||
<!-- <version>2.5.1</version>-->
|
||||
<!-- </dependency>-->
|
||||
<dependency>
|
||||
<groupId>p6spy</groupId>
|
||||
<artifactId>p6spy</artifactId>
|
||||
@@ -112,4 +112,4 @@
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
</project>
|
||||
</project>
|
||||
|
||||
+56
-56
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user