liutongsz/fibo-rule
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update some small bug

Browse Source
This commit is contained in:
“FiboAI”
2021-12-24 12:09:00 +08:00
parent 05f95613b0
commit 8815264f20
9 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jar-enginex-manager/src/main/java/com/risk/riskmanage/common/basefactory/ServiceFactory.java
View File

@@ -18,8 +18,6 @@ import javax.annotation.Resource;
public class ServiceFactory { public class ServiceFactory {
/** /**
* 后台用户管理Service. * 后台用户管理Service.
*/ */

2
jar-enginex-manager/src/main/java/com/risk/riskmanage/datamanage/controller/v2/FieldController.java
View File

@@ -858,7 +858,7 @@ public class FieldController extends BaseController {
} }
@PostMapping(value = "/updateFieldFolder") @PostMapping(value = "/updateFieldFolder")
@ArchivesLog(operationType = OpTypeConst.UPDATE_FIELD_FOLDER) // @ArchivesLog(operationType = OpTypeConst.UPDATE_FIELD_FOLDER)
public ResponseEntityDto<Object> updateFieldFolder(@RequestBody UpdateFolderParam param){ public ResponseEntityDto<Object> updateFieldFolder(@RequestBody UpdateFolderParam param){
UpdateFolderParam.checkNotNull(param); UpdateFolderParam.checkNotNull(param);
int result = s.fieldService.updateFieldFolder(param); int result = s.fieldService.updateFieldFolder(param);

4
jar-enginex-manager/src/main/java/com/risk/riskmanage/datamanage/service/imp/FieldTypeServiceImp.java
View File

@@ -1,7 +1,6 @@
package com.risk.riskmanage.datamanage.service.imp; package com.risk.riskmanage.datamanage.service.imp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@@ -17,8 +16,7 @@ import com.risk.riskmanage.datamanage.service.FieldTypeService;
import javax.annotation.Resource; import javax.annotation.Resource;
@Service @Service
public class FieldTypeServiceImp extends BaseService implements public class FieldTypeServiceImp extends BaseService implements FieldTypeService {
FieldTypeService {
@Resource @Resource
@Override @Override

6
jar-enginex-manager/src/main/java/com/risk/riskmanage/datasource/controller/DataSourceController.java
View File

@@ -24,14 +24,14 @@ public class DataSourceController {
DataSourceService dataSourceService; DataSourceService dataSourceService;
@RequestMapping(value = "save", method = RequestMethod.POST) @RequestMapping(value = "save", method = RequestMethod.POST)
@ArchivesLog(operationType = OpTypeConst.DATA_SOURCE_SAVE) // @ArchivesLog(operationType = OpTypeConst.DATA_SOURCE_SAVE)
public ResponseEntityDto<Object> save(@RequestBody DataSourceVo dataSourceVo) { public ResponseEntityDto<Object> save(@RequestBody DataSourceVo dataSourceVo) {
Integer result = dataSourceService.saveDataSource(dataSourceVo); Integer result = dataSourceService.saveDataSource(dataSourceVo);
return ResponseEntityBuilder.buildNormalResponse(result); return ResponseEntityBuilder.buildNormalResponse(result);
} }
@RequestMapping(value = "update", method = RequestMethod.POST) @RequestMapping(value = "update", method = RequestMethod.POST)
@ArchivesLog(operationType = OpTypeConst.DATA_SOURCE_MODIFY) // @ArchivesLog(operationType = OpTypeConst.DATA_SOURCE_MODIFY)
public ResponseEntityDto<Object> update(@RequestBody DataSourceVo dataSourceVo) { public ResponseEntityDto<Object> update(@RequestBody DataSourceVo dataSourceVo) {
Integer result = dataSourceService.updateDataSource(dataSourceVo); Integer result = dataSourceService.updateDataSource(dataSourceVo);
return ResponseEntityBuilder.buildNormalResponse(result); return ResponseEntityBuilder.buildNormalResponse(result);
@@ -50,7 +50,7 @@ public class DataSourceController {
} }
@RequestMapping(value = "/{id}", method = RequestMethod.DELETE) @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
@ArchivesLog(operationType = OpTypeConst.DATA_SOURCE_DELETE) // @ArchivesLog(operationType = OpTypeConst.DATA_SOURCE_DELETE)
public ResponseEntityDto<Object> deleteDataSourceById(@PathVariable Integer id) { public ResponseEntityDto<Object> deleteDataSourceById(@PathVariable Integer id) {
Integer result = dataSourceService.deleteDataSourceById(id); Integer result = dataSourceService.deleteDataSourceById(id);
return ResponseEntityBuilder.buildNormalResponse(result); return ResponseEntityBuilder.buildNormalResponse(result);

8
jar-enginex-manager/src/main/java/com/risk/riskmanage/interfacemanage/controller/InterfaceController.java
View File

@@ -91,7 +91,7 @@ public class InterfaceController {
//添加接口 //添加接口
@PostMapping("addInterface") @PostMapping("addInterface")
@ArchivesLog(operationType = OpTypeConst.ADD_INTERFACE) // @ArchivesLog(operationType = OpTypeConst.ADD_INTERFACE)
public ResponseEntityDto<InterfaceVo> addInterface(@RequestBody InterfaceVo interfaceVo ) { public ResponseEntityDto<InterfaceVo> addInterface(@RequestBody InterfaceVo interfaceVo ) {
InterfaceVo insert = interfaceService.inserInterfaceInfo(interfaceVo); InterfaceVo insert = interfaceService.inserInterfaceInfo(interfaceVo);
ResponseEntityDto<InterfaceVo> ruleResponseEntityDto = ResponseEntityBuilder.buildNormalResponse(insert); ResponseEntityDto<InterfaceVo> ruleResponseEntityDto = ResponseEntityBuilder.buildNormalResponse(insert);
@@ -100,7 +100,7 @@ public class InterfaceController {
//删除接口 //删除接口
@PostMapping("deleteInterface") @PostMapping("deleteInterface")
@ArchivesLog(operationType = OpTypeConst.DELETE_INTERFACE) // @ArchivesLog(operationType = OpTypeConst.DELETE_INTERFACE)
public ResponseEntityDto<Boolean> deleteInterface(@RequestBody InterfaceVo interfaceVo ) { public ResponseEntityDto<Boolean> deleteInterface(@RequestBody InterfaceVo interfaceVo ) {
Boolean bool = interfaceService.deleteInterfaceInfo(interfaceVo); Boolean bool = interfaceService.deleteInterfaceInfo(interfaceVo);
ResponseEntityDto<Boolean> ruleResponseEntityDto = ResponseEntityBuilder.buildNormalResponse(bool); ResponseEntityDto<Boolean> ruleResponseEntityDto = ResponseEntityBuilder.buildNormalResponse(bool);
@@ -109,7 +109,7 @@ public class InterfaceController {
//编辑接口 //编辑接口
@PostMapping("updateInterface") @PostMapping("updateInterface")
@ArchivesLog(operationType = OpTypeConst.UPDATE_INTERFACE) // @ArchivesLog(operationType = OpTypeConst.UPDATE_INTERFACE)
public ResponseEntityDto<InterfaceVo> updateInterface(@RequestBody InterfaceVo interfaceVo ) { public ResponseEntityDto<InterfaceVo> updateInterface(@RequestBody InterfaceVo interfaceVo ) {
InterfaceVo insert = interfaceService.updateInterfaceInfo(interfaceVo); InterfaceVo insert = interfaceService.updateInterfaceInfo(interfaceVo);
ResponseEntityDto<InterfaceVo> ruleResponseEntityDto = ResponseEntityBuilder.buildNormalResponse(insert); ResponseEntityDto<InterfaceVo> ruleResponseEntityDto = ResponseEntityBuilder.buildNormalResponse(insert);
@@ -118,7 +118,7 @@ public class InterfaceController {
//批量更新接口状态 //批量更新接口状态
@PostMapping("updateInterfaceStatus") @PostMapping("updateInterfaceStatus")
@ArchivesLog(operationType = OpTypeConst.UPDATE_INTERFACE_STATUS) // @ArchivesLog(operationType = OpTypeConst.UPDATE_INTERFACE_STATUS)
public ResponseEntityDto updateStatus(@RequestBody InterfaceUpdateStatusParam param) { public ResponseEntityDto updateStatus(@RequestBody InterfaceUpdateStatusParam param) {
Long[] ids = param.getIds(); Long[] ids = param.getIds();
Integer status = param.getStatus(); Integer status = param.getStatus();

2
jar-enginex-manager/src/main/java/com/risk/riskmanage/rule/controller/RuleInfoController.java
View File

@@ -233,7 +233,7 @@ public class RuleInfoController {
// 查询简单规则 // 查询简单规则
@ResponseBody @ResponseBody
@RequestMapping(value = "getSimpleRule/{id}", method = RequestMethod.POST) @RequestMapping(value = "getSimpleRule/{id}", method = RequestMethod.POST)
@ArchivesLog(operationType = OpTypeConst.SELECT_SAMPLE_RULE) // @ArchivesLog(operationType = OpTypeConst.SELECT_SAMPLE_RULE)
public ResponseEntityDto<RuleVo> getSimpleRule(@PathVariable Long id) { public ResponseEntityDto<RuleVo> getSimpleRule(@PathVariable Long id) {
if (id == null) { if (id == null) {
throw new ApiException(ErrorCodeEnum.PARAMS_EXCEPTION.getCode(), ErrorCodeEnum.PARAMS_EXCEPTION.getMessage()); throw new ApiException(ErrorCodeEnum.PARAMS_EXCEPTION.getCode(), ErrorCodeEnum.PARAMS_EXCEPTION.getMessage());

8
jar-enginex-manager/src/main/java/com/risk/riskmanage/rule/controller/RuleVersionController.java
View File

@@ -38,7 +38,7 @@ public class RuleVersionController {
* @return * @return
*/ */
@PostMapping("/addRuleVersion") @PostMapping("/addRuleVersion")
@ArchivesLog(operationType = OpTypeConst.SAVE_RULE_VERSION) // @ArchivesLog(operationType = OpTypeConst.SAVE_RULE_VERSION)
public ResponseEntityDto addRuleVersion(@RequestBody RuleVersionVo version){ public ResponseEntityDto addRuleVersion(@RequestBody RuleVersionVo version){
boolean b = versionService.addVersion(version); boolean b = versionService.addVersion(version);
if (!b){ if (!b){
@@ -54,7 +54,7 @@ public class RuleVersionController {
* @return * @return
*/ */
@PostMapping("/copyRuleVersion") @PostMapping("/copyRuleVersion")
@ArchivesLog(operationType = OpTypeConst.COPY_RULE_VERSION) // @ArchivesLog(operationType = OpTypeConst.COPY_RULE_VERSION)
public ResponseEntityDto copyRuleVersion(@RequestBody RuleVersionVo version){ public ResponseEntityDto copyRuleVersion(@RequestBody RuleVersionVo version){
boolean b = versionService.copyVersion(version); boolean b = versionService.copyVersion(version);
List< RuleVersionVo> ruleVersionList = versionService.queryVersionListByRuleId(version.getRuleId()); List< RuleVersionVo> ruleVersionList = versionService.queryVersionListByRuleId(version.getRuleId());
@@ -67,7 +67,7 @@ public class RuleVersionController {
* @return * @return
*/ */
@PostMapping("/updateRuleVersion") @PostMapping("/updateRuleVersion")
@ArchivesLog(operationType = OpTypeConst.UPDATE_RULE_VERSION) // @ArchivesLog(operationType = OpTypeConst.UPDATE_RULE_VERSION)
public ResponseEntityDto updateRuleVersion(@RequestBody RuleVersionVo version){ public ResponseEntityDto updateRuleVersion(@RequestBody RuleVersionVo version){
boolean b = versionService.updateVersion(version); boolean b = versionService.updateVersion(version);
List<RuleVersionVo> ruleVersionList = versionService.queryVersionListByRuleId(version.getRuleId()); List<RuleVersionVo> ruleVersionList = versionService.queryVersionListByRuleId(version.getRuleId());
@@ -80,7 +80,7 @@ public class RuleVersionController {
* @return * @return
*/ */
@RequestMapping(value = "/updateRuleVersionStatus", method = RequestMethod.POST) @RequestMapping(value = "/updateRuleVersionStatus", method = RequestMethod.POST)
@ArchivesLog(operationType = OpTypeConst.UPDATE_RULE_VERSION_STATUS) // @ArchivesLog(operationType = OpTypeConst.UPDATE_RULE_VERSION_STATUS)
public ResponseEntityDto<Object> updateStatus(@RequestBody StatusParam statusParam) { public ResponseEntityDto<Object> updateStatus(@RequestBody StatusParam statusParam) {
versionService.updateStatus(statusParam); versionService.updateStatus(statusParam);
List<RuleVersionVo> ruleVersionList = versionService.queryVersionListByRuleId(statusParam.getTacticsId()); List<RuleVersionVo> ruleVersionList = versionService.queryVersionListByRuleId(statusParam.getTacticsId());

2
jar-enginex-manager/src/main/java/com/risk/riskmanage/system/controller/v2/SysMenuController.java
View File

@@ -161,7 +161,7 @@ public class SysMenuController extends CcpBaseController {
* {"status":"1","error":"00000000","msg":null,"data":1} * {"status":"1","error":"00000000","msg":null,"data":1}
*/ */
@RequestMapping(value = "updateStatus", method = RequestMethod.POST) @RequestMapping(value = "updateStatus", method = RequestMethod.POST)
@ArchivesLog(operationType = OpTypeConst.UPDATE_SYS_MENU_STATUS) // @ArchivesLog(operationType = OpTypeConst.UPDATE_SYS_MENU_STATUS)
public ResponseEntityDto updateStatus(@RequestBody Map<String, Object> param) { public ResponseEntityDto updateStatus(@RequestBody Map<String, Object> param) {
int status = (Integer) param.get("status"); int status = (Integer) param.get("status");
String ids = (String)param.get("ids"); String ids = (String)param.get("ids");

8
jar-enginex-manager/src/main/resources/application-dev.properties
View File

@@ -4,16 +4,16 @@ server.servlet.context-path=/Riskmanage
logging.config=classpath:logging-config.xml logging.config=classpath:logging-config.xml
# mysql # mysql
spring.datasource.default.url = jdbc:mysql://localhost:3306/zsxntest?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true spring.datasource.default.url = jdbc:mysql://47.102.125.25:3306/zsxntest?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
spring.datasource.default.username = root spring.datasource.default.username = root
spring.datasource.default.password = localhost spring.datasource.default.password = enginex513
spring.datasource.default.driver-class-name = com.mysql.cj.jdbc.Driver spring.datasource.default.driver-class-name = com.mysql.cj.jdbc.Driver
# redis # redis
redis.host=localhost redis.host=47.102.125.25
redis.port=6379 redis.port=6379
redis.db=0 redis.db=0
redis.password=localhost redis.password=enginex123
redis.pool.maxTotal=3000 redis.pool.maxTotal=3000
redis.pool.maxIdle=100 redis.pool.maxIdle=100
redis.pool.maxWait=1000 redis.pool.maxWait=1000