first commit
This commit is contained in:
@@ -29,9 +29,9 @@ public class DecisionTablesResult implements Serializable {
|
||||
|
||||
private Long versionId;//决策表版本id
|
||||
|
||||
private Integer rows;//行数
|
||||
private Integer ro;//行数
|
||||
|
||||
private Integer columns;//列数
|
||||
private Integer colum;//列数
|
||||
|
||||
private String resultValue;//结果集二维数组
|
||||
|
||||
|
||||
@@ -116,9 +116,9 @@ public class DecisionTablesResultServiceImpl extends ServiceImpl<DecisionTablesR
|
||||
DecisionTablesResult resultInfo = new DecisionTablesResult();
|
||||
BeanUtils.copyProperties(vo,resultInfo);
|
||||
JSONArray resultList = vo.getResultList();
|
||||
resultInfo.setRows(resultList.size());
|
||||
resultInfo.setRo(resultList.size());
|
||||
JSONArray childList = JSON.parseArray(JSON.toJSONString(resultList.get(0)));
|
||||
resultInfo.setColumns(childList.size());
|
||||
resultInfo.setColum(childList.size());
|
||||
String resultValue = JSON.toJSONString(resultList);
|
||||
resultInfo.setResultValue(resultValue);
|
||||
return resultInfo;
|
||||
|
||||
@@ -304,10 +304,10 @@ public class ScorecardVersionServiceImpl extends ServiceImpl<ScorecardVersionMap
|
||||
}
|
||||
scorecardDetailVo.setChildren(children);
|
||||
|
||||
Long userId = SessionManager.getLoginAccount().getUserId();
|
||||
//Long userId = SessionManager.getLoginAccount().getUserId();
|
||||
HashMap<String, Object> param = new HashMap<>();
|
||||
param.put("userId", scorecardDetail.getFieldId());
|
||||
param.put("userId", userId);
|
||||
//param.put("userId", userId);
|
||||
param.put("engineId", null);
|
||||
Field field = fieldService.findByFieldId(param);
|
||||
if (field != null) {
|
||||
|
||||
@@ -24,7 +24,7 @@ import java.util.Optional;
|
||||
* Canal数据同步
|
||||
* 实现ApplicationRunner接口,springboot启动成功后会执行run方法
|
||||
*/
|
||||
@Component
|
||||
|
||||
public class CanalClient implements ApplicationRunner {
|
||||
|
||||
private final Logger logger = LoggerFactory.getLogger(this.getClass());
|
||||
|
||||
@@ -210,7 +210,7 @@ public class DecisionTablesNode implements EngineRunnerNode {
|
||||
if (row >= 0 && column >= 0) {
|
||||
//根据行列去结果集中找结果返回
|
||||
DecisionTablesResultVo resultSet = versionVo.getResultSet();
|
||||
if (row < resultSet.getRows() && column < resultSet.getColumns()) {
|
||||
if (row < resultSet.getRo() && column < resultSet.getColum()) {
|
||||
String resultValue = resultSet.getResultValue();
|
||||
JSONArray array = JSON.parseArray(resultValue);
|
||||
JSONArray rowArray = JSON.parseArray(JSON.toJSONString(array.get(row)));
|
||||
|
||||
@@ -13,9 +13,9 @@ public class ConfigHolder {
|
||||
private String redisHost;
|
||||
@Value("${redis.port}")
|
||||
private int redisPort;
|
||||
@Value("${redis.db}")
|
||||
|
||||
private int redisDb;
|
||||
@Value("${redis.password}")
|
||||
|
||||
private String redisPwd;
|
||||
@Value("${redis.pool.maxTotal}")
|
||||
private int redisMaxTotal;
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
server.port=8080
|
||||
server.port=8082
|
||||
server.servlet.context-path=/Riskmanage
|
||||
|
||||
logging.config=classpath:logging-config.xml
|
||||
|
||||
# mysql
|
||||
spring.datasource.druid.url=jdbc:mysql://ip:3306/riskmanage?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
|
||||
spring.datasource.druid.username=<EFBFBD>˺<EFBFBD>
|
||||
spring.datasource.druid.password=<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
spring.datasource.druid.url=jdbc:mysql://127.0.0.1:3306/riskmanage?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
|
||||
spring.datasource.druid.username=root
|
||||
spring.datasource.druid.password=root123123
|
||||
spring.datasource.druid.driver-class-name=com.mysql.cj.jdbc.Driver
|
||||
spring.datasource.druid.initialSize=20
|
||||
spring.datasource.druid.minIdle=20
|
||||
@@ -24,10 +24,10 @@ spring.datasource.druid.validation-query-timeout=500
|
||||
spring.datasource.druid.filters=stat
|
||||
|
||||
# redis
|
||||
redis.host=ip
|
||||
redis.port=<EFBFBD>˿<EFBFBD>
|
||||
redis.db=<EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD>
|
||||
redis.password=<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
redis.host=127.0.0.1
|
||||
redis.port=6379
|
||||
redis.db=
|
||||
redis.password=
|
||||
redis.pool.maxTotal=3000
|
||||
redis.pool.maxIdle=100
|
||||
redis.pool.maxWait=1000
|
||||
@@ -35,8 +35,8 @@ redis.pool.timeout=100000
|
||||
|
||||
# mail <20><>ѡ
|
||||
spring.mail.host=smtp.exmail.qq.com
|
||||
spring.mail.username=xxx
|
||||
spring.mail.password=xxx
|
||||
spring.mail.username=1404823045@qq.com
|
||||
spring.mail.password=lt520111111
|
||||
spring.mail.port=465
|
||||
spring.mail.properties.mail.smtp.auth=true
|
||||
spring.mail.properties.mail.smtp.timeout=50000
|
||||
|
||||
@@ -13,9 +13,9 @@ public class ConfigHolder {
|
||||
private String redisHost;
|
||||
@Value("${redis.port}")
|
||||
private int redisPort;
|
||||
@Value("${redis.db}")
|
||||
|
||||
private int redisDb;
|
||||
@Value("${redis.password}")
|
||||
|
||||
private String redisPwd;
|
||||
@Value("${redis.pool.maxTotal}")
|
||||
private int redisMaxTotal;
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
server.port=8081
|
||||
server.port=8083
|
||||
|
||||
logging.config=classpath:logging-config.xml
|
||||
|
||||
# mysql
|
||||
spring.datasource.druid.url=jdbc:mysql://ip:3306/riskmanage?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
|
||||
spring.datasource.druid.username=<EFBFBD>˺<EFBFBD>
|
||||
spring.datasource.druid.password=<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
spring.datasource.druid.url=jdbc:mysql://127.0.0.1:3306/riskmanage?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
|
||||
spring.datasource.druid.username=root
|
||||
spring.datasource.druid.password=root123123
|
||||
spring.datasource.druid.driver-class-name=com.mysql.cj.jdbc.Driver
|
||||
spring.datasource.druid.initialSize=20
|
||||
spring.datasource.druid.minIdle=20
|
||||
@@ -23,10 +23,10 @@ spring.datasource.druid.validation-query-timeout=500
|
||||
spring.datasource.druid.filters=stat
|
||||
|
||||
# redis
|
||||
redis.host=ip
|
||||
redis.port=<EFBFBD>˿<EFBFBD>
|
||||
redis.db=1
|
||||
redis.password=<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
redis.host=127.0.0.1
|
||||
redis.port=6379
|
||||
redis.db=
|
||||
redis.password=
|
||||
redis.pool.maxTotal=3000
|
||||
redis.pool.maxIdle=100
|
||||
redis.pool.maxWait=1000
|
||||
@@ -34,8 +34,8 @@ redis.pool.timeout=100000
|
||||
|
||||
# mail
|
||||
spring.mail.host=smtp.exmail.qq.com
|
||||
spring.mail.username=xxx
|
||||
spring.mail.password=xxx
|
||||
spring.mail.username=1404823045@qq.com
|
||||
spring.mail.password=lt520111111
|
||||
spring.mail.port=465
|
||||
spring.mail.properties.mail.smtp.auth=true
|
||||
spring.mail.properties.mail.smtp.timeout=50000
|
||||
|
||||
Reference in New Issue
Block a user