From cf4aa5c642b111975e4ce5f221eec8197d7a2dd9 Mon Sep 17 00:00:00 2001 From: yxt_njy <119782786@qq.com> Date: Thu, 9 Feb 2023 22:44:57 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A3=8E=E9=99=A9=E7=AE=A1=E7=90=86=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E6=A8=A1=E5=9D=97=E9=87=8C=E9=A3=8E=E9=99=A9=E6=8C=87?= =?UTF-8?q?=E6=A0=87=E3=80=81=E9=A3=8E=E9=99=A9=E7=AD=89=E7=BA=A7=E3=80=81?= =?UTF-8?q?=E9=A3=8E=E9=99=A9=E7=A8=8B=E5=BA=A6=E6=B7=BB=E5=8A=A0=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=8A=9F=E8=83=BD=E5=8F=8A=E7=BD=91=E5=85=B3=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=99=BD=E5=90=8D=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 12 ++++- .../com/supervise/rms/api/risk/RiskFeign.java | 5 ++ .../rms/api/riskdegree/RiskDegree.java | 17 +++++++ .../rms/api/riskdegree/RiskDegreeDto.java | 14 ++++++ .../rms/api/riskdegree/RiskDegreeFeign.java | 21 ++++++++ .../riskdegree/RiskDegreeFeignFallback.java | 10 ++++ .../rms/api/riskdegree/RiskDegreeVo.java | 14 ++++++ .../rms/api/riskindicator/RiskIndicator.java | 21 ++++++++ .../api/riskindicator/RiskIndicatorDto.java | 18 +++++++ .../api/riskindicator/RiskIndicatorFeign.java | 19 +++++++ .../RiskIndicatorFeignFallback.java | 10 ++++ .../api/riskindicator/RiskIndicatorVo.java | 18 +++++++ .../api/riskindicators/RiskIndicators.java | 17 ------- .../api/riskindicators/RiskIndicatorsDto.java | 14 ------ .../riskindicators/RiskIndicatorsFeign.java | 13 ----- .../RiskIndicatorsFeignFallback.java | 7 --- .../api/riskindicators/RiskIndicatorsVo.java | 14 ------ .../RiskIndicatorsLevel.java | 17 ------- .../RiskIndicatorsLevelDto.java | 14 ------ .../RiskIndicatorsLevelFeign.java | 13 ----- .../RiskIndicatorsLevelFeignFallback.java | 7 --- .../RiskIndicatorsLevelVo.java | 14 ------ .../RiskIndicatorsType.java | 21 -------- .../RiskIndicatorsTypeDto.java | 18 ------- .../RiskIndicatorsTypeFeign.java | 13 ----- .../RiskIndicatorsTypeFeignFallback.java | 7 --- .../RiskIndicatorsTypeVo.java | 18 ------- .../rms/api/risklevel/RiskLevel.java | 19 +++++++ .../rms/api/risklevel/RiskLevelDto.java | 16 ++++++ .../rms/api/risklevel/RiskLevelFeign.java | 19 +++++++ .../api/risklevel/RiskLevelFeignFallback.java | 11 ++++ .../rms/api/risklevel/RiskLevelVo.java | 16 ++++++ .../RiskDegreeMapper.java} | 6 +-- .../RiskDegreeMapper.xml} | 2 +- .../rms/biz/riskdegree/RiskDegreeRest.java | 27 ++++++++++ .../rms/biz/riskdegree/RiskDegreeService.java | 40 +++++++++++++++ .../RiskIndicatorMapper.java} | 6 +-- .../RiskIndicatorMapper.xml} | 2 +- .../biz/riskindicator/RiskIndicatorRest.java | 28 +++++++++++ .../riskindicator/RiskIndicatorService.java | 40 +++++++++++++++ .../riskindicators/RiskIndicatorsRest.java | 13 ----- .../riskindicators/RiskIndicatorsService.java | 11 ---- .../RiskIndicatorsLevelRest.java | 13 ----- .../RiskIndicatorsLevelService.java | 11 ---- .../RiskIndicatorsTypeRest.java | 13 ----- .../RiskIndicatorsTypeService.java | 11 ---- .../RiskLevelMapper.java} | 6 +-- .../RiskLevelMapper.xml} | 2 +- .../rms/biz/risklevel/RiskLevelRest.java | 29 +++++++++++ .../rms/biz/risklevel/RiskLevelService.java | 41 +++++++++++++++ .../src/main/resources/application-devv.yml | 31 ++++++++++++ .../src/main/resources/application-pro.yml | 28 +++++++++++ .../src/main/resources/application-test.yml | 31 ++++++++++++ .../src/main/resources/application.yml | 47 +++++++++++++++++ .../src/main/resources/logback-spring.xml | 50 +++++++++++++++++++ 55 files changed, 663 insertions(+), 292 deletions(-) create mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskdegree/RiskDegree.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskdegree/RiskDegreeDto.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskdegree/RiskDegreeFeign.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskdegree/RiskDegreeFeignFallback.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskdegree/RiskDegreeVo.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicator/RiskIndicator.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicator/RiskIndicatorDto.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicator/RiskIndicatorFeign.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicator/RiskIndicatorFeignFallback.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicator/RiskIndicatorVo.java delete mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicators/RiskIndicators.java delete mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicators/RiskIndicatorsDto.java delete mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicators/RiskIndicatorsFeign.java delete mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicators/RiskIndicatorsFeignFallback.java delete mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicators/RiskIndicatorsVo.java delete mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicatorslevel/RiskIndicatorsLevel.java delete mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicatorslevel/RiskIndicatorsLevelDto.java delete mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicatorslevel/RiskIndicatorsLevelFeign.java delete mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicatorslevel/RiskIndicatorsLevelFeignFallback.java delete mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicatorslevel/RiskIndicatorsLevelVo.java delete mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicatorstype/RiskIndicatorsType.java delete mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicatorstype/RiskIndicatorsTypeDto.java delete mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicatorstype/RiskIndicatorsTypeFeign.java delete mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicatorstype/RiskIndicatorsTypeFeignFallback.java delete mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicatorstype/RiskIndicatorsTypeVo.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklevel/RiskLevel.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklevel/RiskLevelDto.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklevel/RiskLevelFeign.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklevel/RiskLevelFeignFallback.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklevel/RiskLevelVo.java rename yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/{riskindicators/RiskIndicatorsMapper.java => riskdegree/RiskDegreeMapper.java} (89%) rename yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/{riskindicators/RiskIndicatorsMapper.xml => riskdegree/RiskDegreeMapper.xml} (62%) create mode 100644 yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskdegree/RiskDegreeRest.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskdegree/RiskDegreeService.java rename yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/{riskindicatorstype/RiskIndicatorsTypeMapper.java => riskindicator/RiskIndicatorMapper.java} (88%) rename yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/{riskindicatorstype/RiskIndicatorsTypeMapper.xml => riskindicator/RiskIndicatorMapper.xml} (60%) create mode 100644 yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicator/RiskIndicatorRest.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicator/RiskIndicatorService.java delete mode 100644 yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicators/RiskIndicatorsRest.java delete mode 100644 yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicators/RiskIndicatorsService.java delete mode 100644 yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicatorslevel/RiskIndicatorsLevelRest.java delete mode 100644 yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicatorslevel/RiskIndicatorsLevelService.java delete mode 100644 yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicatorstype/RiskIndicatorsTypeRest.java delete mode 100644 yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicatorstype/RiskIndicatorsTypeService.java rename yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/{riskindicatorslevel/RiskIndicatorsLevelMapper.java => risklevel/RiskLevelMapper.java} (88%) rename yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/{riskindicatorslevel/RiskIndicatorsLevelMapper.xml => risklevel/RiskLevelMapper.xml} (60%) create mode 100644 yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risklevel/RiskLevelRest.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risklevel/RiskLevelService.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-biz/src/main/resources/application-devv.yml create mode 100644 yxt_supervise/supervise-rms/supervise-rms-biz/src/main/resources/application-pro.yml create mode 100644 yxt_supervise/supervise-rms/supervise-rms-biz/src/main/resources/application-test.yml create mode 100644 yxt_supervise/supervise-rms/supervise-rms-biz/src/main/resources/application.yml create mode 100644 yxt_supervise/supervise-rms/supervise-rms-biz/src/main/resources/logback-spring.xml diff --git a/yxt_supervise/gateway/src/main/resources/application.yml b/yxt_supervise/gateway/src/main/resources/application.yml index 7701248b..a03ec05c 100644 --- a/yxt_supervise/gateway/src/main/resources/application.yml +++ b/yxt_supervise/gateway/src/main/resources/application.yml @@ -37,6 +37,13 @@ spring: uri: lb://supervise-crm filters: - StripPrefix=1 + #风险管理系统 + - id: supervise-rms + predicates: + - Path= /rms/** + uri: lb://supervise-rms + filters: + - StripPrefix=1 ignore: whites: - /portal/v1/regions/treeList @@ -89,7 +96,10 @@ ignore: - /portal/v1/regions/getCounty - /portal/v1/wxuser/test - /portal/v1/appuser/updateAppId #解绑用户的appId - + # 风险管理系统 + - /rms/v1/riskIndicator/saveRiskIndicator + - /rms/v1/riskDegree/saveRiskDegree + - /rms/v1/riskLevel/saveRiskLevel whitesTwo: #包含所有 ###swagger相关开始 diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risk/RiskFeign.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risk/RiskFeign.java index c399817c..07197881 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risk/RiskFeign.java +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risk/RiskFeign.java @@ -1,7 +1,11 @@ package com.supervise.rms.api.risk; +import com.supervise.rms.api.riskdegree.RiskDegreeDto; +import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; @Api(tags = "风险表") @FeignClient( @@ -10,4 +14,5 @@ import org.springframework.cloud.openfeign.FeignClient; path = "v1/risk", fallback = RiskFeignFallback.class) public interface RiskFeign { + } diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskdegree/RiskDegree.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskdegree/RiskDegree.java new file mode 100644 index 00000000..0ec8b281 --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskdegree/RiskDegree.java @@ -0,0 +1,17 @@ +package com.supervise.rms.api.riskdegree; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(value = "风险程度表", description = "风险名单表") +@TableName("risk_degree") +public class RiskDegree extends BaseEntity { + @ApiModelProperty("风险程度名称") + private String riskDegreeName; + @ApiModelProperty("风险程度代码") + private String riskDegreeCode; +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskdegree/RiskDegreeDto.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskdegree/RiskDegreeDto.java new file mode 100644 index 00000000..7cd61dfd --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskdegree/RiskDegreeDto.java @@ -0,0 +1,14 @@ +package com.supervise.rms.api.riskdegree; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class RiskDegreeDto implements Dto { + private String sid; + @ApiModelProperty("风险程度名称") + private String riskDegreeName; + @ApiModelProperty("风险程度代码") + private String riskDegreeCode; +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskdegree/RiskDegreeFeign.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskdegree/RiskDegreeFeign.java new file mode 100644 index 00000000..59519e23 --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskdegree/RiskDegreeFeign.java @@ -0,0 +1,21 @@ +package com.supervise.rms.api.riskdegree; + +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +@Api(tags = "风险指标等级表") +@FeignClient( + contextId = "yxt-supervise-RiskDegree", + name = "yxt-supervise", + path = "v1/riskDegree", + fallback = RiskDegreeFeignFallback.class) +public interface RiskDegreeFeign { + + @ApiOperation("保存风险程度") + @PostMapping("/saveRiskDegree") + ResultBean saveRiskDegree(RiskDegreeDto riskDegreeDto); +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskdegree/RiskDegreeFeignFallback.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskdegree/RiskDegreeFeignFallback.java new file mode 100644 index 00000000..f93c3dc8 --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskdegree/RiskDegreeFeignFallback.java @@ -0,0 +1,10 @@ +package com.supervise.rms.api.riskdegree; + +import com.yxt.common.core.result.ResultBean; +import org.springframework.stereotype.Component; + +@Component +public class RiskDegreeFeignFallback implements RiskDegreeFeign { + @Override + public ResultBean saveRiskDegree(RiskDegreeDto riskDegreeDto){return null;}; +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskdegree/RiskDegreeVo.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskdegree/RiskDegreeVo.java new file mode 100644 index 00000000..322d2064 --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskdegree/RiskDegreeVo.java @@ -0,0 +1,14 @@ +package com.supervise.rms.api.riskdegree; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class RiskDegreeVo implements Vo { + private String sid; + @ApiModelProperty("风险程度名称") + private String riskDegreeName; + @ApiModelProperty("风险程度代码") + private String riskDegreeCode; +} \ No newline at end of file diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicator/RiskIndicator.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicator/RiskIndicator.java new file mode 100644 index 00000000..af2b706c --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicator/RiskIndicator.java @@ -0,0 +1,21 @@ +package com.supervise.rms.api.riskindicator; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(value = "风险指标表", description = "风险名单表") +@TableName("risk_list") +public class RiskIndicator extends BaseEntity { + @ApiModelProperty("风险指标名称") + private String riskIndicatorsName; + @ApiModelProperty("风险指标代码") + private String riskIndicatorsCode; + @ApiModelProperty("风险指标等级Sid") + private String riskIndicatorsLevelSid; + @ApiModelProperty("风险指标类别SId") + private String riskIndicatorsTypeSid; +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicator/RiskIndicatorDto.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicator/RiskIndicatorDto.java new file mode 100644 index 00000000..c14e19aa --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicator/RiskIndicatorDto.java @@ -0,0 +1,18 @@ +package com.supervise.rms.api.riskindicator; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class RiskIndicatorDto implements Dto { + private String sid; + @ApiModelProperty("风险指标名称") + private String riskIndicatorsName; + @ApiModelProperty("风险指标代码") + private String riskIndicatorsCode; + @ApiModelProperty("风险指标等级Sid") + private String riskIndicatorsLevelSid; + @ApiModelProperty("风险指标类别SId") + private String riskIndicatorsTypeSid; +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicator/RiskIndicatorFeign.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicator/RiskIndicatorFeign.java new file mode 100644 index 00000000..dabab133 --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicator/RiskIndicatorFeign.java @@ -0,0 +1,19 @@ +package com.supervise.rms.api.riskindicator; + +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; + +@Api(tags = "风险指标表") +@FeignClient( + contextId = "yxt-supervise-RiskIndicator", + name = "yxt-supervise", + path = "v1/superviseRiskIndicators", + fallback = RiskIndicatorFeignFallback.class) +public interface RiskIndicatorFeign { + @ApiOperation("保存风险指标") + @PostMapping("/saveRiskIndicator") + ResultBean saveRiskIndicator(RiskIndicatorDto riskIndicatorDto); +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicator/RiskIndicatorFeignFallback.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicator/RiskIndicatorFeignFallback.java new file mode 100644 index 00000000..760975b9 --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicator/RiskIndicatorFeignFallback.java @@ -0,0 +1,10 @@ +package com.supervise.rms.api.riskindicator; + +import com.yxt.common.core.result.ResultBean; +import org.springframework.stereotype.Component; + +@Component +public class RiskIndicatorFeignFallback implements RiskIndicatorFeign { + @Override + public ResultBean saveRiskIndicator(RiskIndicatorDto riskIndicatorDto){return null;}; +} \ No newline at end of file diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicator/RiskIndicatorVo.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicator/RiskIndicatorVo.java new file mode 100644 index 00000000..22def394 --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicator/RiskIndicatorVo.java @@ -0,0 +1,18 @@ +package com.supervise.rms.api.riskindicator; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class RiskIndicatorVo implements Vo { + private String sid; + @ApiModelProperty("风险指标名称") + private String riskIndicatorsName; + @ApiModelProperty("风险指标代码") + private String riskIndicatorsCode; + @ApiModelProperty("风险指标等级Sid") + private String riskIndicatorsLevelSid; + @ApiModelProperty("风险指标类别SId") + private String riskIndicatorsTypeSid; +} \ No newline at end of file diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicators/RiskIndicators.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicators/RiskIndicators.java deleted file mode 100644 index 50f0e903..00000000 --- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicators/RiskIndicators.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.supervise.rms.api.riskindicators; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.yxt.common.core.domain.BaseEntity; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -@ApiModel(value = "风险名单表", description = "风险名单表") -@TableName("risk_list") -public class RiskIndicators extends BaseEntity { - @ApiModelProperty("风险对象Sid") - private String riskObjectSid; - @ApiModelProperty("风险对象类型1.供应商2.仓库3.门店") - private Integer riskObjectType; -} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicators/RiskIndicatorsDto.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicators/RiskIndicatorsDto.java deleted file mode 100644 index c21a7569..00000000 --- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicators/RiskIndicatorsDto.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.supervise.rms.api.riskindicators; - -import com.yxt.common.core.dto.Dto; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class RiskIndicatorsDto implements Dto { - private String sid; - @ApiModelProperty("风险对象Sid") - private String riskObjectSid; - @ApiModelProperty("风险对象类型1.供应商2.仓库3.门店") - private Integer riskObjectType; -} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicators/RiskIndicatorsFeign.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicators/RiskIndicatorsFeign.java deleted file mode 100644 index fa645415..00000000 --- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicators/RiskIndicatorsFeign.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.supervise.rms.api.riskindicators; - -import io.swagger.annotations.Api; -import org.springframework.cloud.openfeign.FeignClient; - -@Api(tags = "风险指标表") -@FeignClient( - contextId = "yxt-supervise-RiskIndicators", - name = "yxt-supervise", - path = "v1/superviseRiskIndicators", - fallback = RiskIndicatorsFeignFallback.class) -public interface RiskIndicatorsFeign { -} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicators/RiskIndicatorsFeignFallback.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicators/RiskIndicatorsFeignFallback.java deleted file mode 100644 index d54560a6..00000000 --- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicators/RiskIndicatorsFeignFallback.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.supervise.rms.api.riskindicators; - -import org.springframework.stereotype.Component; - -@Component -public class RiskIndicatorsFeignFallback implements RiskIndicatorsFeign { -} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicators/RiskIndicatorsVo.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicators/RiskIndicatorsVo.java deleted file mode 100644 index 8a9cbbbf..00000000 --- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicators/RiskIndicatorsVo.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.supervise.rms.api.riskindicators; - -import com.yxt.common.core.vo.Vo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class RiskIndicatorsVo implements Vo { - private String sid; - @ApiModelProperty("风险对象Sid") - private String riskObjectSid; - @ApiModelProperty("风险对象类型1.供应商2.仓库3.门店") - private Integer riskObjectType; -} \ No newline at end of file diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicatorslevel/RiskIndicatorsLevel.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicatorslevel/RiskIndicatorsLevel.java deleted file mode 100644 index 3d4f4417..00000000 --- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicatorslevel/RiskIndicatorsLevel.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.supervise.rms.api.riskindicatorslevel; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.yxt.common.core.domain.BaseEntity; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -@ApiModel(value = "风险名单表", description = "风险名单表") -@TableName("risk_list") -public class RiskIndicatorsLevel extends BaseEntity { - @ApiModelProperty("风险对象Sid") - private String riskObjectSid; - @ApiModelProperty("风险对象类型1.供应商2.仓库3.门店") - private Integer riskObjectType; -} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicatorslevel/RiskIndicatorsLevelDto.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicatorslevel/RiskIndicatorsLevelDto.java deleted file mode 100644 index 25fad5d1..00000000 --- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicatorslevel/RiskIndicatorsLevelDto.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.supervise.rms.api.riskindicatorslevel; - -import com.yxt.common.core.dto.Dto; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class RiskIndicatorsLevelDto implements Dto { - private String sid; - @ApiModelProperty("风险对象Sid") - private String riskObjectSid; - @ApiModelProperty("风险对象类型1.供应商2.仓库3.门店") - private Integer riskObjectType; -} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicatorslevel/RiskIndicatorsLevelFeign.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicatorslevel/RiskIndicatorsLevelFeign.java deleted file mode 100644 index 68dd4daa..00000000 --- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicatorslevel/RiskIndicatorsLevelFeign.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.supervise.rms.api.riskindicatorslevel; - -import io.swagger.annotations.Api; -import org.springframework.cloud.openfeign.FeignClient; - -@Api(tags = "风险指标等级表") -@FeignClient( - contextId = "yxt-supervise-RiskIndicatorsLevel", - name = "yxt-supervise", - path = "v1/riskIndicatorsLevel", - fallback = RiskIndicatorsLevelFeignFallback.class) -public interface RiskIndicatorsLevelFeign { -} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicatorslevel/RiskIndicatorsLevelFeignFallback.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicatorslevel/RiskIndicatorsLevelFeignFallback.java deleted file mode 100644 index 807a2000..00000000 --- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicatorslevel/RiskIndicatorsLevelFeignFallback.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.supervise.rms.api.riskindicatorslevel; - -import org.springframework.stereotype.Component; - -@Component -public class RiskIndicatorsLevelFeignFallback implements RiskIndicatorsLevelFeign { -} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicatorslevel/RiskIndicatorsLevelVo.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicatorslevel/RiskIndicatorsLevelVo.java deleted file mode 100644 index c0d379d9..00000000 --- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicatorslevel/RiskIndicatorsLevelVo.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.supervise.rms.api.riskindicatorslevel; - -import com.yxt.common.core.vo.Vo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class RiskIndicatorsLevelVo implements Vo { - private String sid; - @ApiModelProperty("风险对象Sid") - private String riskObjectSid; - @ApiModelProperty("风险对象类型1.供应商2.仓库3.门店") - private Integer riskObjectType; -} \ No newline at end of file diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicatorstype/RiskIndicatorsType.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicatorstype/RiskIndicatorsType.java deleted file mode 100644 index 1e8a7e5b..00000000 --- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicatorstype/RiskIndicatorsType.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.supervise.rms.api.riskindicatorstype; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.yxt.common.core.domain.BaseEntity; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -@ApiModel(value = "风险名单表", description = "风险名单表") -@TableName("risk_list") -public class RiskIndicatorsType extends BaseEntity { - @ApiModelProperty("风险指标类别名称") - private String riskIndicatorsTypeName; - @ApiModelProperty("风险指标类别代码") - private String riskIndicatorsTypeCode; - @ApiModelProperty("层级") - private Integer Hierarchy; - @ApiModelProperty("父类Sid") - private String PSid; -} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicatorstype/RiskIndicatorsTypeDto.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicatorstype/RiskIndicatorsTypeDto.java deleted file mode 100644 index 9e98588c..00000000 --- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicatorstype/RiskIndicatorsTypeDto.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.supervise.rms.api.riskindicatorstype; - -import com.yxt.common.core.dto.Dto; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class RiskIndicatorsTypeDto implements Dto { - private String sid; - @ApiModelProperty("风险指标类别名称") - private String riskIndicatorsTypeName; - @ApiModelProperty("风险指标类别代码") - private String riskIndicatorsTypeCode; - @ApiModelProperty("层级") - private Integer Hierarchy; - @ApiModelProperty("父类Sid") - private String PSid; -} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicatorstype/RiskIndicatorsTypeFeign.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicatorstype/RiskIndicatorsTypeFeign.java deleted file mode 100644 index a362ce15..00000000 --- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicatorstype/RiskIndicatorsTypeFeign.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.supervise.rms.api.riskindicatorstype; - -import io.swagger.annotations.Api; -import org.springframework.cloud.openfeign.FeignClient; - -@Api(tags = "风险指标类别表") -@FeignClient( - contextId = "yxt-supervise-RiskIndicatorsType", - name = "yxt-supervise", - path = "v1/riskIndicatorsType", - fallback = RiskIndicatorsTypeFeignFallback.class) -public interface RiskIndicatorsTypeFeign { -} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicatorstype/RiskIndicatorsTypeFeignFallback.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicatorstype/RiskIndicatorsTypeFeignFallback.java deleted file mode 100644 index a11abd18..00000000 --- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicatorstype/RiskIndicatorsTypeFeignFallback.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.supervise.rms.api.riskindicatorstype; - -import org.springframework.stereotype.Component; - -@Component -public class RiskIndicatorsTypeFeignFallback implements RiskIndicatorsTypeFeign { -} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicatorstype/RiskIndicatorsTypeVo.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicatorstype/RiskIndicatorsTypeVo.java deleted file mode 100644 index e67a450f..00000000 --- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicatorstype/RiskIndicatorsTypeVo.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.supervise.rms.api.riskindicatorstype; - -import com.yxt.common.core.vo.Vo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class RiskIndicatorsTypeVo implements Vo { - private String sid; - @ApiModelProperty("风险指标类别名称") - private String riskIndicatorsTypeName; - @ApiModelProperty("风险指标类别代码") - private String riskIndicatorsTypeCode; - @ApiModelProperty("层级") - private Integer Hierarchy; - @ApiModelProperty("父类Sid") - private String PSid; -} \ No newline at end of file diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklevel/RiskLevel.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklevel/RiskLevel.java new file mode 100644 index 00000000..cf732804 --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklevel/RiskLevel.java @@ -0,0 +1,19 @@ +package com.supervise.rms.api.risklevel; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(value = "风险等级表", description = "风险名单表") +@TableName("risk_level") +public class RiskLevel extends BaseEntity { + @ApiModelProperty("风险等级名称") + private String riskLevelName; + @ApiModelProperty("风险等级代码") + private String riskLevelCode; + @ApiModelProperty("风险程度Sid") + private String riskDegreeSid; +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklevel/RiskLevelDto.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklevel/RiskLevelDto.java new file mode 100644 index 00000000..4a83f886 --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklevel/RiskLevelDto.java @@ -0,0 +1,16 @@ +package com.supervise.rms.api.risklevel; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class RiskLevelDto implements Dto { + private String sid; + @ApiModelProperty("风险等级名称") + private String riskLevelName; + @ApiModelProperty("风险等级代码") + private String riskLevelCode; + @ApiModelProperty("风险程度Sid") + private String riskDegreeSid; +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklevel/RiskLevelFeign.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklevel/RiskLevelFeign.java new file mode 100644 index 00000000..46e1deda --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklevel/RiskLevelFeign.java @@ -0,0 +1,19 @@ +package com.supervise.rms.api.risklevel; + +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; + +@Api(tags = "风险指标类别表") +@FeignClient( + contextId = "yxt-supervise-RiskLevel", + name = "yxt-supervise", + path = "v1/riskLevel", + fallback = RiskLevelFeignFallback.class) +public interface RiskLevelFeign { + @ApiOperation("保存风险等级") + @PostMapping("/saveRiskLevel") + ResultBean saveRiskLevel(RiskLevelDto riskLevelDto); +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklevel/RiskLevelFeignFallback.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklevel/RiskLevelFeignFallback.java new file mode 100644 index 00000000..847507ec --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklevel/RiskLevelFeignFallback.java @@ -0,0 +1,11 @@ +package com.supervise.rms.api.risklevel; + +import com.supervise.rms.api.riskdegree.RiskDegreeDto; +import com.yxt.common.core.result.ResultBean; +import org.springframework.stereotype.Component; + +@Component +public class RiskLevelFeignFallback implements RiskLevelFeign { + @Override + public ResultBean saveRiskLevel(RiskLevelDto riskLevelDto){return null;}; +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklevel/RiskLevelVo.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklevel/RiskLevelVo.java new file mode 100644 index 00000000..6a10d8a0 --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklevel/RiskLevelVo.java @@ -0,0 +1,16 @@ +package com.supervise.rms.api.risklevel; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class RiskLevelVo implements Vo { + private String sid; + @ApiModelProperty("风险等级名称") + private String riskLevelName; + @ApiModelProperty("风险等级代码") + private String riskLevelCode; + @ApiModelProperty("风险程度Sid") + private String riskDegreeSid; +} \ No newline at end of file diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicators/RiskIndicatorsMapper.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskdegree/RiskDegreeMapper.java similarity index 89% rename from yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicators/RiskIndicatorsMapper.java rename to yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskdegree/RiskDegreeMapper.java index 29b94e3e..90ffb0fd 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicators/RiskIndicatorsMapper.java +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskdegree/RiskDegreeMapper.java @@ -23,13 +23,13 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.supervise.rms.biz.riskindicators; +package com.supervise.rms.biz.riskdegree; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.supervise.rms.api.riskindicators.RiskIndicators; +import com.supervise.rms.api.riskdegree.RiskDegree; import org.apache.ibatis.annotations.Mapper; @Mapper -public interface RiskIndicatorsMapper extends BaseMapper { +public interface RiskDegreeMapper extends BaseMapper { } \ No newline at end of file diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicators/RiskIndicatorsMapper.xml b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskdegree/RiskDegreeMapper.xml similarity index 62% rename from yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicators/RiskIndicatorsMapper.xml rename to yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskdegree/RiskDegreeMapper.xml index 9885ebde..a60a65a3 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicators/RiskIndicatorsMapper.xml +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskdegree/RiskDegreeMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskdegree/RiskDegreeRest.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskdegree/RiskDegreeRest.java new file mode 100644 index 00000000..aa8fbf54 --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskdegree/RiskDegreeRest.java @@ -0,0 +1,27 @@ +package com.supervise.rms.biz.riskdegree; + +import com.supervise.rms.api.risk.RiskFeign; +import com.supervise.rms.api.riskdegree.RiskDegreeDto; +import com.supervise.rms.api.riskdegree.RiskDegreeFeign; +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@Api(tags = "风险名单表") +@RestController("com.supervise.rmc.biz.riskdegree.RiskDegreeRest") +@RequestMapping("v1/riskDegree") +public class RiskDegreeRest implements RiskDegreeFeign { + @Autowired + private RiskDegreeService riskDegreeService; + + @Override + @ApiOperation("保存风险程度") + @PostMapping("/saveRiskDegree") + public ResultBean saveRiskDegree(RiskDegreeDto riskDegreeDto) { + return riskDegreeService.saveRiskDegree(riskDegreeDto); + } +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskdegree/RiskDegreeService.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskdegree/RiskDegreeService.java new file mode 100644 index 00000000..ca399945 --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskdegree/RiskDegreeService.java @@ -0,0 +1,40 @@ +package com.supervise.rms.biz.riskdegree; + +import com.supervise.rms.api.riskdegree.RiskDegree; +import com.supervise.rms.api.riskdegree.RiskDegreeDto; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.core.result.ResultBean; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +@Service +public class RiskDegreeService extends MybatisBaseService { + + public ResultBean saveRiskDegree(RiskDegreeDto riskDegreeDto) { + ResultBean rb = ResultBean.fireFail(); + String sid = riskDegreeDto.getSid(); + if(StringUtils.isBlank(sid)){ + //新增 + RiskDegree riskDegree = new RiskDegree(); + BeanUtils.copyProperties(riskDegreeDto, riskDegree,"sid"); + boolean isSave = save(riskDegree); + if(!isSave){ + return rb.setMsg("保存失败"); + } + sid = riskDegree.getSid(); + }else{ + //更新 + RiskDegree riskDegree = fetchBySid(riskDegreeDto.getSid()); + if(riskDegree == null){ + return rb.setMsg("该条记录不存在"); + } + BeanUtils.copyProperties(riskDegreeDto, riskDegree); + boolean isUpdate = updateById(riskDegree); + if(!isUpdate){ + return rb.setMsg("更新失败"); + } + } + return rb.success().setData(sid).setMsg("保存成功"); + } +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicatorstype/RiskIndicatorsTypeMapper.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicator/RiskIndicatorMapper.java similarity index 88% rename from yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicatorstype/RiskIndicatorsTypeMapper.java rename to yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicator/RiskIndicatorMapper.java index 3ad2bead..af3394b5 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicatorstype/RiskIndicatorsTypeMapper.java +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicator/RiskIndicatorMapper.java @@ -23,13 +23,13 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.supervise.rms.biz.riskindicatorstype; +package com.supervise.rms.biz.riskindicator; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.supervise.rms.api.riskindicatorstype.RiskIndicatorsType; +import com.supervise.rms.api.riskindicator.RiskIndicator; import org.apache.ibatis.annotations.Mapper; @Mapper -public interface RiskIndicatorsTypeMapper extends BaseMapper { +public interface RiskIndicatorMapper extends BaseMapper { } \ No newline at end of file diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicatorstype/RiskIndicatorsTypeMapper.xml b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicator/RiskIndicatorMapper.xml similarity index 60% rename from yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicatorstype/RiskIndicatorsTypeMapper.xml rename to yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicator/RiskIndicatorMapper.xml index 733f3a93..0a84ae9d 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicatorstype/RiskIndicatorsTypeMapper.xml +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicator/RiskIndicatorMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicator/RiskIndicatorRest.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicator/RiskIndicatorRest.java new file mode 100644 index 00000000..d3f76014 --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicator/RiskIndicatorRest.java @@ -0,0 +1,28 @@ +package com.supervise.rms.biz.riskindicator; + +import com.supervise.rms.api.riskdegree.RiskDegreeDto; +import com.supervise.rms.api.riskindicator.RiskIndicatorDto; +import com.supervise.rms.api.riskindicator.RiskIndicatorFeign; +import com.supervise.rms.biz.riskdegree.RiskDegreeService; +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@Api(tags = "风险指标表") +@RestController("com.supervise.rmc.biz.riskindicator.RiskIndicatorRest") +@RequestMapping("v1/riskIndicator") +public class RiskIndicatorRest implements RiskIndicatorFeign { + @Autowired + private RiskIndicatorService riskIndicatorService; + + @Override + @ApiOperation("保存风险指标") + @PostMapping("/saveRiskIndicator") + public ResultBean saveRiskIndicator(RiskIndicatorDto riskIndicatorDto) { + return riskIndicatorService.saveRiskIndicator(riskIndicatorDto); + } +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicator/RiskIndicatorService.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicator/RiskIndicatorService.java new file mode 100644 index 00000000..9fdaf1e6 --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicator/RiskIndicatorService.java @@ -0,0 +1,40 @@ +package com.supervise.rms.biz.riskindicator; + +import com.supervise.rms.api.riskindicator.RiskIndicatorDto; +import com.yxt.common.base.service.MybatisBaseService; +import com.supervise.rms.api.riskindicator.RiskIndicator; +import com.yxt.common.core.result.ResultBean; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +@Service +public class RiskIndicatorService extends MybatisBaseService { + + public ResultBean saveRiskIndicator(RiskIndicatorDto riskIndicatorDto) { + ResultBean rb = ResultBean.fireFail(); + String sid = riskIndicatorDto.getSid(); + if(StringUtils.isBlank(sid)){ + //新增 + RiskIndicator riskIndicator = new RiskIndicator(); + BeanUtils.copyProperties(riskIndicatorDto, riskIndicator,"sid"); + boolean isSave = save(riskIndicator); + if(!isSave){ + return rb.setMsg("保存失败"); + } + sid = riskIndicator.getSid(); + }else{ + //更新 + RiskIndicator riskIndicator = fetchBySid(riskIndicatorDto.getSid()); + if(riskIndicator == null){ + return rb.setMsg("该条记录不存在"); + } + BeanUtils.copyProperties(riskIndicatorDto, riskIndicator); + boolean isUpdate = updateById(riskIndicator); + if(!isUpdate){ + return rb.setMsg("更新失败"); + } + } + return rb.success().setData(sid).setMsg("保存成功"); + } +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicators/RiskIndicatorsRest.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicators/RiskIndicatorsRest.java deleted file mode 100644 index 772b7c9d..00000000 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicators/RiskIndicatorsRest.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.supervise.rms.biz.riskindicators; - -import com.supervise.rms.api.riskindicators.RiskIndicatorsFeign; -import io.swagger.annotations.Api; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@Api(tags = "风险指标表") -@RestController("com.supervise.rmc.biz.riskindicators.RiskIndicatorsRest") -@RequestMapping("v1/riskIndicators") -public class RiskIndicatorsRest implements RiskIndicatorsFeign { - -} diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicators/RiskIndicatorsService.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicators/RiskIndicatorsService.java deleted file mode 100644 index fdafb95d..00000000 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicators/RiskIndicatorsService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.supervise.rms.biz.riskindicators; - -import com.yxt.common.base.service.MybatisBaseService; -import com.supervise.rms.api.riskindicators.RiskIndicators; -import org.springframework.stereotype.Service; - -@Service -public class RiskIndicatorsService extends MybatisBaseService { - - -} diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicatorslevel/RiskIndicatorsLevelRest.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicatorslevel/RiskIndicatorsLevelRest.java deleted file mode 100644 index 60316839..00000000 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicatorslevel/RiskIndicatorsLevelRest.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.supervise.rms.biz.riskindicatorslevel; - -import com.supervise.rms.api.risk.RiskFeign; -import io.swagger.annotations.Api; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@Api(tags = "风险名单表") -@RestController("com.supervise.rmc.biz.riskindicatorslevel.RiskIndicatorsLevelRest") -@RequestMapping("v1/risk") -public class RiskIndicatorsLevelRest implements RiskFeign { - -} diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicatorslevel/RiskIndicatorsLevelService.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicatorslevel/RiskIndicatorsLevelService.java deleted file mode 100644 index 1c7512f6..00000000 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicatorslevel/RiskIndicatorsLevelService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.supervise.rms.biz.riskindicatorslevel; - -import com.yxt.common.base.service.MybatisBaseService; -import com.supervise.rms.api.riskindicatorslevel.RiskIndicatorsLevel; -import org.springframework.stereotype.Service; - -@Service -public class RiskIndicatorsLevelService extends MybatisBaseService { - - -} diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicatorstype/RiskIndicatorsTypeRest.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicatorstype/RiskIndicatorsTypeRest.java deleted file mode 100644 index b779a9ce..00000000 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicatorstype/RiskIndicatorsTypeRest.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.supervise.rms.biz.riskindicatorstype; - -import com.supervise.rms.api.risk.RiskFeign; -import io.swagger.annotations.Api; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@Api(tags = "风险名单表") -@RestController("com.supervise.rmc.biz.riskindicatorstype.RiskIndicatorsTypeRest") -@RequestMapping("v1/risk") -public class RiskIndicatorsTypeRest implements RiskFeign { - -} diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicatorstype/RiskIndicatorsTypeService.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicatorstype/RiskIndicatorsTypeService.java deleted file mode 100644 index de2b81ab..00000000 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicatorstype/RiskIndicatorsTypeService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.supervise.rms.biz.riskindicatorstype; - -import com.yxt.common.base.service.MybatisBaseService; -import com.supervise.rms.api.riskindicatorstype.RiskIndicatorsType; -import org.springframework.stereotype.Service; - -@Service -public class RiskIndicatorsTypeService extends MybatisBaseService { - - -} diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicatorslevel/RiskIndicatorsLevelMapper.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risklevel/RiskLevelMapper.java similarity index 88% rename from yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicatorslevel/RiskIndicatorsLevelMapper.java rename to yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risklevel/RiskLevelMapper.java index e7547638..2c1dffea 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicatorslevel/RiskIndicatorsLevelMapper.java +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risklevel/RiskLevelMapper.java @@ -23,13 +23,13 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.supervise.rms.biz.riskindicatorslevel; +package com.supervise.rms.biz.risklevel; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.supervise.rms.api.riskindicatorslevel.RiskIndicatorsLevel; +import com.supervise.rms.api.risklevel.RiskLevel; import org.apache.ibatis.annotations.Mapper; @Mapper -public interface RiskIndicatorsLevelMapper extends BaseMapper { +public interface RiskLevelMapper extends BaseMapper { } \ No newline at end of file diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicatorslevel/RiskIndicatorsLevelMapper.xml b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risklevel/RiskLevelMapper.xml similarity index 60% rename from yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicatorslevel/RiskIndicatorsLevelMapper.xml rename to yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risklevel/RiskLevelMapper.xml index 0be99962..5c11194c 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicatorslevel/RiskIndicatorsLevelMapper.xml +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risklevel/RiskLevelMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risklevel/RiskLevelRest.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risklevel/RiskLevelRest.java new file mode 100644 index 00000000..174e655f --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risklevel/RiskLevelRest.java @@ -0,0 +1,29 @@ +package com.supervise.rms.biz.risklevel; + +import com.supervise.rms.api.risk.RiskFeign; +import com.supervise.rms.api.riskdegree.RiskDegreeDto; +import com.supervise.rms.api.risklevel.RiskLevelDto; +import com.supervise.rms.api.risklevel.RiskLevelFeign; +import com.supervise.rms.biz.riskdegree.RiskDegreeService; +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@Api(tags = "风险名单表") +@RestController("com.supervise.rmc.biz.risklevel.RiskLevelRest") +@RequestMapping("v1/riskLevel") +public class RiskLevelRest implements RiskLevelFeign { + @Autowired + private RiskLevelService riskLevelService; + + @Override + @ApiOperation("保存风险等级") + @PostMapping("/saveRiskLevel") + public ResultBean saveRiskLevel(RiskLevelDto riskLevelDto) { + return riskLevelService.saveRiskLevel(riskLevelDto); + } +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risklevel/RiskLevelService.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risklevel/RiskLevelService.java new file mode 100644 index 00000000..8da0e3a1 --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risklevel/RiskLevelService.java @@ -0,0 +1,41 @@ +package com.supervise.rms.biz.risklevel; + +import com.supervise.rms.api.risklevel.RiskLevel; +import com.supervise.rms.api.risklevel.RiskLevelDto; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.core.result.ResultBean; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +@Service +public class RiskLevelService extends MybatisBaseService { + + public ResultBean saveRiskLevel(RiskLevelDto riskLevelDto) { + ResultBean rb = ResultBean.fireFail(); + String sid = riskLevelDto.getSid(); + if(StringUtils.isBlank(sid)){ + //新增 + RiskLevel riskLevel = new RiskLevel(); + BeanUtils.copyProperties(riskLevelDto, riskLevel,"sid"); + boolean isSave = save(riskLevel); + if(!isSave){ + return rb.setMsg("保存失败"); + } + sid = riskLevel.getSid(); + }else{ + //更新 + RiskLevel riskLevel = fetchBySid(riskLevelDto.getSid()); + if(riskLevel == null){ + return rb.setMsg("该条记录不存在"); + } + BeanUtils.copyProperties(riskLevelDto, riskLevel); + boolean isUpdate = updateById(riskLevel); + if(!isUpdate){ + return rb.setMsg("更新失败"); + } + } + return rb.success().setData(sid).setMsg("保存成功"); + } + +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/resources/application-devv.yml b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/resources/application-devv.yml new file mode 100644 index 00000000..653c6547 --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/resources/application-devv.yml @@ -0,0 +1,31 @@ +spring: + datasource: + hikari: + max-lifetime: 500000 + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://127.0.0.1:3306/supervise_rms?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true + username: root + password: root + cloud: + nacos: + discovery: + server-addr: 127.0.0.1:8848 + redis: + database: 3 # Redis数据库索引(默认为0) + host: 127.0.0.1 + jedis: + pool: + max-active: -1 #连接池最大连接数(使用负值表示没有限制) + max-idle: 8 #连接池中的最大空闲连接 + max-wait: -1 # 连接池最大阻塞等待时间(使用负值表示没有限制) + min-idle: 0 # 连接池中的最小空闲连接 + password: + port: 6379 + timeout: 0 # 连接超时时间(毫秒) + +image: + upload: + path: D:\supervise\upload\ + url: + prefix: http://127.0.0.1:8112/upload/ + diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/resources/application-pro.yml b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/resources/application-pro.yml new file mode 100644 index 00000000..db7f8648 --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/resources/application-pro.yml @@ -0,0 +1,28 @@ +spring: + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://127.0.0.1:3306/supervise_rms?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8 + username: root + password: root + cloud: + nacos: + discovery: + server-addr: 127.0.0.1:8848 + redis: + database: 3 # Redis数据库索引(默认为0) + host: 127.0.0.1 + jedis: + pool: + max-active: -1 #连接池最大连接数(使用负值表示没有限制) + max-idle: 8 #连接池中的最大空闲连接 + max-wait: -1 # 连接池最大阻塞等待时间(使用负值表示没有限制) + min-idle: 0 # 连接池中的最小空闲连接 + password: 123456 + port: 6379 + timeout: 0 # 连接超时时间(毫秒) +image: + upload: + path: D:\supervise\upload\ + url: + prefix: http://127.0.0.1/api/upload/ + diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/resources/application-test.yml b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/resources/application-test.yml new file mode 100644 index 00000000..f71a2175 --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/resources/application-test.yml @@ -0,0 +1,31 @@ +spring: + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver +# url: jdbc:mysql://122.14.222.186:3306/supervise_rms?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true + url: jdbc:mysql://127.0.0.1:3306/supervise_crm?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true + username: root + password: 1LAiGz$t1*Iw + cloud: + nacos: + discovery: + server-addr: 127.0.0.1:8848 + redis: + database: 3 # Redis数据库索引(默认为0) + host: 127.0.0.1 + jedis: + pool: + max-active: -1 #连接池最大连接数(使用负值表示没有限制) + max-idle: 8 #连接池中的最大空闲连接 + max-wait: -1 # 连接池最大阻塞等待时间(使用负值表示没有限制) + min-idle: 0 # 连接池中的最小空闲连接 + password: 123456 + port: 6379 + timeout: 0 # 连接超时时间(毫秒) + + +image: + upload: + path: D:/webapps/supervise/static/upload/ + url: + prefix: http://122.14.222.186:7003/upload/ + diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/resources/application.yml b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/resources/application.yml new file mode 100644 index 00000000..3000be33 --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/resources/application.yml @@ -0,0 +1,47 @@ +spring: + application: + name: supervise-rms + profiles: +# active: devv + active: test + messages: + # 国际化资源文件路径 + basename: i18n/messages + servlet: + #上传文件 + multipart: + max-file-size: 50MB + max-request-size: 100MB + devtools: + restart: + # 热部署开关 + enabled: true + + + +server: + port: 8001 + max-http-header-size: 102400 + undertow: + max-http-post-size: -1 + +#mybatis +mybatis-plus: + # 配置mapper的扫描,找到所有的mapper.xml映射文件 + mapper-locations: classpath*:**Mapper.xml + global-config: + refresh: true + db-config: + #定义生成ID的类型 + id-type: Auto + db-type: mysql + configuration: + map-underscore-to-camel-case: false + cache-enabled: true + call-setters-on-nulls: true + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + + + + + diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/resources/logback-spring.xml b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/resources/logback-spring.xml new file mode 100644 index 00000000..db0ea011 --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/resources/logback-spring.xml @@ -0,0 +1,50 @@ + + + + + + + + + + %yellow(%date{yyyy-MM-dd HH:mm:ss}) |%highlight(%-5level) |%green(%logger:%line) |%blue(%msg%n) + + + + + + + + + + + + + + + ${log.base}.log + + ${log.base}.%d{yyyyMMdd}.%i.log.zip + + + + 1MB + + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} + -%msg%n + + + + + + + + + + \ No newline at end of file