From 721c07f06d6a8c23889e0ee8d96460b9bf1792dc Mon Sep 17 00:00:00 2001
From: xjs <1294405880@qq.com>
Date: Tue, 1 Mar 2022 22:29:29 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=89=8D=E7=AB=AF=E7=A7=AF=E5=88=86?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BB=A5=E5=8F=8A=E6=B7=BB=E5=8A=A0=E7=A7=AF?=
 =?UTF-8?q?=E5=88=86=E5=AE=9E=E7=8E=B0=202=E3=80=81=E7=A7=AF=E5=88=86?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=90=8E=E7=AB=AF=E6=A0=A1=E9=AA=8C=E5=AE=8C?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/api/srb/core/integral.js         |  8 ++++
 ruoyi-ui/src/views/srb/integral/form.vue      | 41 ++++++++++++++++---
 ruoyi-ui/src/views/srb/integral/index.vue     | 27 ++++++++++++
 .../admin/IntegralGradeController.java        | 19 ++++++++-
 .../xjs/srb/core/entity/IntegralGrade.java    | 10 +++++
 5 files changed, 98 insertions(+), 7 deletions(-)

diff --git a/ruoyi-ui/src/api/srb/core/integral.js b/ruoyi-ui/src/api/srb/core/integral.js
index e9fc3af1..47fd45b4 100644
--- a/ruoyi-ui/src/api/srb/core/integral.js
+++ b/ruoyi-ui/src/api/srb/core/integral.js
@@ -34,3 +34,11 @@ export function update(integral) {
     data:integral
   })
 }
+
+// 获取积分列表
+export function getById(id) {
+  return request({
+    url: '/srb_core//admin/core/integralGrade/get/'+id,
+    method: 'get',
+  })
+}
diff --git a/ruoyi-ui/src/views/srb/integral/form.vue b/ruoyi-ui/src/views/srb/integral/form.vue
index 93fe94d3..e138b6f6 100644
--- a/ruoyi-ui/src/views/srb/integral/form.vue
+++ b/ruoyi-ui/src/views/srb/integral/form.vue
@@ -19,7 +19,7 @@
 </template>
 <script>
 
-import {save,update} from "@/api/srb/core/integral";
+import {save, update, getById} from "@/api/srb/core/integral";
 
 export default {
   name: 'IntegralForm',
@@ -54,6 +54,12 @@ export default {
   computed: {},
   watch: {},
   created() {
+    //当路由存在id属性的时候回显表单，需要调用回显接口
+    let id = this.$route.query.id;
+    if (id) {
+      this.getById(id);
+    }
+
   },
   mounted() {
   },
@@ -61,20 +67,45 @@ export default {
     submitForm() {
       this.$refs['elForm'].validate(valid => {
         if (!valid) return
+        let id = this.$route.query.id;
+        if (id) {
+          this.updateData();
+        } else {
+          this.saveData();
+        }
 
-        this.saveData()
-
+      })
+    },
 
+    //根据id获取
+    getById(id) {
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: "#666666"
+      });
+      getById(id).then(res => {
+        loading.close();
+        this.formData = res.data
       })
     },
 
     //新增
     saveData() {
-      save(this.formData).then(res=>{
-        this.$modal.notifySuccess("保存成功");
+      save(this.formData).then(res => {
+        this.$modal.notifySuccess("新增成功");
+        this.$router.push({path: '/srb/integral/list'})
       })
     },
 
+    //修改
+    updateData() {
+      update(this.formData).then(res => {
+        this.$modal.notifySuccess("修改成功");
+        this.$router.push({path: '/srb/integral/list'})
+      })
+    },
 
 
     resetForm() {
diff --git a/ruoyi-ui/src/views/srb/integral/index.vue b/ruoyi-ui/src/views/srb/integral/index.vue
index fcae8184..5b3255f5 100644
--- a/ruoyi-ui/src/views/srb/integral/index.vue
+++ b/ruoyi-ui/src/views/srb/integral/index.vue
@@ -14,6 +14,23 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
 
+          <router-link
+            :to="{
+                path: '/srb/integral/form/',
+                query: { id: scope.row.id },
+              }"
+
+            v-hasPermi="['srb:integralGrade:update']"
+            style="margin-right: 5px"
+          >
+            <el-button
+              size="small"
+              type="primary"
+              icon="el-icon-edit"
+            ></el-button>
+          </router-link>
+
+
           <el-popconfirm
             confirm-button-text='好的'
             cancel-button-text='不用了'
@@ -64,9 +81,19 @@ export default {
   methods: {
     //获取数据
     fetchData() {
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: "#666666"
+      });
+
       getList().then(res => {
+        loading.close();
         this.list = res.data
+      }).catch(err => {
       })
+      loading.close();
     },
 
     //删除
diff --git a/xjs-business/xjs-business-srb/srb-service-core/src/main/java/com/xjs/srb/core/controller/admin/IntegralGradeController.java b/xjs-business/xjs-business-srb/srb-service-core/src/main/java/com/xjs/srb/core/controller/admin/IntegralGradeController.java
index e7d1831e..e3556e27 100644
--- a/xjs-business/xjs-business-srb/srb-service-core/src/main/java/com/xjs/srb/core/controller/admin/IntegralGradeController.java
+++ b/xjs-business/xjs-business-srb/srb-service-core/src/main/java/com/xjs/srb/core/controller/admin/IntegralGradeController.java
@@ -5,12 +5,16 @@ import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.xjs.exception.BusinessException;
 import com.xjs.srb.core.entity.IntegralGrade;
 import com.xjs.srb.core.service.IIntegralGradeService;
+import com.xjs.validation.group.AddGroup;
+import com.xjs.validation.group.UpdateGroup;
 import com.xjs.web.MyBaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -55,7 +59,8 @@ public class IntegralGradeController extends MyBaseController<IntegralGrade> {
     @ApiOperation("根据id更新积分等级")
     @RequiresPermissions("srb:integralGrade:update")
     @Log(title = "融-积分管理", businessType = BusinessType.UPDATE)
-    public AjaxResult updateById(IntegralGrade integralGrade) {
+    public AjaxResult updateById(@Validated(UpdateGroup.class) @RequestBody IntegralGrade integralGrade) {
+        this.compareSize(integralGrade);
         return toAjax(integralGradeService.updateById(integralGrade));
     }
 
@@ -63,11 +68,21 @@ public class IntegralGradeController extends MyBaseController<IntegralGrade> {
     @ApiOperation("保存积分等级")
     @RequiresPermissions("srb:integralGrade:save")
     @Log(title = "融-积分管理", businessType = BusinessType.INSERT)
-    public AjaxResult save(@RequestBody IntegralGrade integralGrade) {
+    public AjaxResult save(@Validated(AddGroup.class) @RequestBody IntegralGrade integralGrade) {
+        this.compareSize(integralGrade);
         return toAjax(integralGradeService.save(integralGrade));
     }
 
 
+    /**
+     * 比较大小
+     * @param integralGrade 积分实体
+     */
+    private void compareSize(IntegralGrade integralGrade) {
+        if (integralGrade.getIntegralStart() > integralGrade.getIntegralEnd()) {
+            throw new BusinessException("开始区间大于结束区间！！！");
+        }
+    }
 
 }
 
diff --git a/xjs-business/xjs-business-srb/srb-service-core/src/main/java/com/xjs/srb/core/entity/IntegralGrade.java b/xjs-business/xjs-business-srb/srb-service-core/src/main/java/com/xjs/srb/core/entity/IntegralGrade.java
index ee3af0c8..402b33f7 100644
--- a/xjs-business/xjs-business-srb/srb-service-core/src/main/java/com/xjs/srb/core/entity/IntegralGrade.java
+++ b/xjs-business/xjs-business-srb/srb-service-core/src/main/java/com/xjs/srb/core/entity/IntegralGrade.java
@@ -3,11 +3,15 @@ package com.xjs.srb.core.entity;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.xjs.validation.group.AddGroup;
+import com.xjs.validation.group.UpdateGroup;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -33,12 +37,18 @@ public class IntegralGrade implements Serializable {
     private Long id;
 
     @ApiModelProperty("积分区间开始")
+    @NotNull(message = "积分区间开始不能为空",groups = {UpdateGroup.class, AddGroup.class})
+    @Min(message = "积分区间不能小于0",value = 0,groups = {UpdateGroup.class, AddGroup.class})
     private Integer integralStart;
 
     @ApiModelProperty("积分区间结束")
+    @NotNull(message = "积分区间结束不能为空",groups = {UpdateGroup.class, AddGroup.class})
+    @Min(message = "积分区间不能小于0",value = 0,groups = {UpdateGroup.class, AddGroup.class})
     private Integer integralEnd;
 
     @ApiModelProperty("借款额度")
+    @NotNull(message = "借款额度不能为空",groups = {UpdateGroup.class, AddGroup.class})
+    @Min(message = "借款额度不能小于0",value = 0,groups = {UpdateGroup.class, AddGroup.class})
     private BigDecimal borrowAmount;
 
     @ApiModelProperty("创建时间")