From fb346dde6587dfd3361e376f492763178cca1e51 Mon Sep 17 00:00:00 2001
From: xjs <1294405880@qq.com>
Date: Tue, 1 Mar 2022 16:07:39 +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=E6=9A=82=E6=97=B6?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=9B=BD=E9=99=85=E5=8C=96=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=203=E3=80=81=E5=9D=91=EF=BC=9Aspring?=
 =?UTF-8?q?=E6=89=AB=E6=8F=8F=E5=A4=9A=E4=B8=AA=E5=AE=9D=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=EF=BC=9A@ComponentScans(=20{@ComponentScan("com.ruoyi"),@Compo?=
 =?UTF-8?q?nentScan("com.xjs")}=20)=204=E3=80=81META-INF/spring.factories?=
 =?UTF-8?q?=E4=BD=9C=E7=94=A8=E8=87=AA=E5=8A=A8=E6=B3=A8=E5=85=A5bean?=
 =?UTF-8?q?=E7=84=B6=E5=90=8Espringboot=E8=87=AA=E5=8A=A8=E6=89=AB?=
 =?UTF-8?q?=E6=8F=8F=E5=88=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../annotation/EnableCustomConfig.java        |  3 +-
 ruoyi-ui/src/api/srb/core/integral.js         | 36 ++++++++
 ruoyi-ui/src/views/srb/integral/add.vue       | 13 ---
 ruoyi-ui/src/views/srb/integral/form.vue      | 88 +++++++++++++++++++
 ruoyi-ui/src/views/srb/integral/index.vue     | 77 +++++++++++++++-
 .../com/xjs/config/LocaleResolverConfig.java  | 49 -----------
 .../main/resources/META-INF/spring.factories  |  7 ++
 .../admin/IntegralGradeController.java        |  2 +-
 8 files changed, 210 insertions(+), 65 deletions(-)
 create mode 100644 ruoyi-ui/src/api/srb/core/integral.js
 delete mode 100644 ruoyi-ui/src/views/srb/integral/add.vue
 create mode 100644 ruoyi-ui/src/views/srb/integral/form.vue
 delete mode 100644 xjs-business/xjs-business-common/src/main/java/com/xjs/config/LocaleResolverConfig.java
 create mode 100644 xjs-business/xjs-business-common/src/main/resources/META-INF/spring.factories

diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableCustomConfig.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableCustomConfig.java
index b58b099c..326f8e8c 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableCustomConfig.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableCustomConfig.java
@@ -4,6 +4,7 @@ import com.ruoyi.common.security.config.ApplicationConfig;
 import com.ruoyi.common.security.feign.FeignAutoConfiguration;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.ComponentScans;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.context.annotation.Import;
 import org.springframework.scheduling.annotation.EnableAsync;
@@ -24,7 +25,7 @@ import java.lang.annotation.*;
 // 自动加载类
 @Import({ ApplicationConfig.class, FeignAutoConfiguration.class })
 //自定义bean扫描，添加xjs路径下的bean
-@ComponentScan(basePackages = {"com.ruoyi","com.xjs"})
+@ComponentScans( {@ComponentScan("com.ruoyi"),@ComponentScan("com.xjs")} )
 @EnableTransactionManagement
 public @interface EnableCustomConfig
 {
diff --git a/ruoyi-ui/src/api/srb/core/integral.js b/ruoyi-ui/src/api/srb/core/integral.js
new file mode 100644
index 00000000..e9fc3af1
--- /dev/null
+++ b/ruoyi-ui/src/api/srb/core/integral.js
@@ -0,0 +1,36 @@
+import request from '@/utils/request'
+
+// 获取积分列表
+export function getList() {
+  return request({
+    url: '/srb_core//admin/core/integralGrade/list',
+    method: 'get',
+  })
+}
+
+// 删除积分列表
+export function removeById(id) {
+  return request({
+    url: '/srb_core//admin/core/integralGrade/remove/'+id,
+    method: 'delete',
+  })
+}
+
+// 新增积分列表
+export function save(integral) {
+  return request({
+    url: '/srb_core//admin/core/integralGrade/save',
+    method: 'post',
+    data:integral
+  })
+}
+
+
+// 修改积分列表
+export function update(integral) {
+  return request({
+    url: '/srb_core//admin/core/integralGrade/update',
+    method: 'put',
+    data:integral
+  })
+}
diff --git a/ruoyi-ui/src/views/srb/integral/add.vue b/ruoyi-ui/src/views/srb/integral/add.vue
deleted file mode 100644
index 65ea51ec..00000000
--- a/ruoyi-ui/src/views/srb/integral/add.vue
+++ /dev/null
@@ -1,13 +0,0 @@
-<template>
-
-</template>
-
-<script>
-export default {
-  name: "IntegralAdd"
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/ruoyi-ui/src/views/srb/integral/form.vue b/ruoyi-ui/src/views/srb/integral/form.vue
new file mode 100644
index 00000000..93fe94d3
--- /dev/null
+++ b/ruoyi-ui/src/views/srb/integral/form.vue
@@ -0,0 +1,88 @@
+<template>
+  <div class="app-container">
+    <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="100px">
+      <el-form-item label-width="120px" label="借款额度" prop="borrowAmount">
+        <el-input-number v-model="formData.borrowAmount" placeholder="借款额度" :min="0"></el-input-number>
+      </el-form-item>
+      <el-form-item label-width="120px" label="积分区间开始" prop="integralStart">
+        <el-input-number v-model="formData.integralStart" placeholder="积分区间开始" :min="0"></el-input-number>
+      </el-form-item>
+      <el-form-item label-width="120px" label="积分区间结束" prop="integralEnd">
+        <el-input-number v-model="formData.integralEnd" placeholder="积分区间结束" :min="0"></el-input-number>
+      </el-form-item>
+      <el-form-item size="large">
+        <el-button type="primary" @click="submitForm">提交</el-button>
+        <el-button @click="resetForm">重置</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+<script>
+
+import {save,update} from "@/api/srb/core/integral";
+
+export default {
+  name: 'IntegralForm',
+  components: {},
+  props: [],
+  data() {
+    return {
+      formData: {
+        borrowAmount: undefined,
+        integralStart: undefined,
+        integralEnd: undefined,
+      },
+      rules: {
+        borrowAmount: [{
+          required: true,
+          message: '借款额度',
+          trigger: 'blur'
+        }],
+        integralStart: [{
+          required: true,
+          message: '积分区间开始',
+          trigger: 'blur'
+        }],
+        integralEnd: [{
+          required: true,
+          message: '积分区间结束',
+          trigger: 'blur'
+        }],
+      },
+    }
+  },
+  computed: {},
+  watch: {},
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    submitForm() {
+      this.$refs['elForm'].validate(valid => {
+        if (!valid) return
+
+        this.saveData()
+
+
+      })
+    },
+
+    //新增
+    saveData() {
+      save(this.formData).then(res=>{
+        this.$modal.notifySuccess("保存成功");
+      })
+    },
+
+
+
+    resetForm() {
+      this.$refs['elForm'].resetFields()
+    },
+  }
+}
+
+</script>
+<style>
+</style>
diff --git a/ruoyi-ui/src/views/srb/integral/index.vue b/ruoyi-ui/src/views/srb/integral/index.vue
index 7acd9e58..fcae8184 100644
--- a/ruoyi-ui/src/views/srb/integral/index.vue
+++ b/ruoyi-ui/src/views/srb/integral/index.vue
@@ -1,10 +1,85 @@
 <template>
 
+  <div class="app-container">
+    <el-table :data="list" border stripe>
+
+      <el-table-column label="借款额度(￥)" align="center" prop="borrowAmount" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <span>{{ scope.row.borrowAmount }}￥</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="积分区间开始" align="center" prop="integralStart" :show-overflow-tooltip="true"/>
+      <el-table-column label="积分区间结束" align="center" prop="integralEnd" :show-overflow-tooltip="true"/>
+
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+
+          <el-popconfirm
+            confirm-button-text='好的'
+            cancel-button-text='不用了'
+            icon="el-icon-info"
+            icon-color="red"
+            title="确定删除吗？"
+            @confirm="removeById(scope.row.id)"
+          >
+            <el-button
+              type="info"
+              size="small"
+              slot="reference"
+              icon="el-icon-delete"
+              v-hasPermi="['srb:integralGrade:remove']"
+            >
+            </el-button>
+          </el-popconfirm>
+
+
+        </template>
+      </el-table-column>
+    </el-table>
+
+
+  </div>
+
 </template>
 
 <script>
+
+import {getList, removeById} from "@/api/srb/core/integral";
+
 export default {
-  name: "IntegralIndex"
+  name: "IntegralIndex",
+
+  data() {
+    return {
+
+      list: [],
+
+    }
+  },
+
+  created() {
+    this.fetchData()
+  },
+
+  methods: {
+    //获取数据
+    fetchData() {
+      getList().then(res => {
+        this.list = res.data
+      })
+    },
+
+    //删除
+    removeById(id) {
+      removeById(id).then(() => {
+        this.$modal.notifySuccess("删除成功");
+        this.fetchData()
+      }).catch(() => {
+      });
+    },
+  },
+
+
 }
 </script>
 
diff --git a/xjs-business/xjs-business-common/src/main/java/com/xjs/config/LocaleResolverConfig.java b/xjs-business/xjs-business-common/src/main/java/com/xjs/config/LocaleResolverConfig.java
deleted file mode 100644
index ae439a00..00000000
--- a/xjs-business/xjs-business-common/src/main/java/com/xjs/config/LocaleResolverConfig.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.xjs.config;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.LocaleResolver;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.Locale;
-
-/**
- * 自定义国际化解析器
- * todo 暂时未配置国际化
- * @author xiejs
- * @since 2022-02-09
- */
-@Configuration
-public class LocaleResolverConfig implements LocaleResolver {
-    @Override
-    public Locale resolveLocale(HttpServletRequest httpServletRequest) {
-        // 获取页面手动切换传递的语言参数l
-        String l = httpServletRequest.getParameter("l");
-        // 获取请求头自动传递的语言参数Accept-Language
-        String header = httpServletRequest.getHeader("Accept-Language");
-        Locale locale = null;
-        // 如果手动切换参数不为空，就根据手动参数进行语言切换，否则默认根据请求头信息切换
-        if (!StringUtils.isEmpty(l)) {
-            String[] split = l.split("_");
-            locale = new Locale(split[0], split[1]);
-        } else {
-        // Accept-Language: en-US,en;q=0.9
-            String[] splits = header.split(",");
-            String[] split = splits[0].split("-");
-            locale = new Locale(split[0], split[1]);
-        }
-        return locale;
-    }
-
-    @Override
-    public void setLocale(HttpServletRequest request, HttpServletResponse response, Locale locale) {
-
-    }
-
-    @Bean
-    public LocaleResolver localeResolver(){
-        return new LocaleResolverConfig();
-    }
-}
diff --git a/xjs-business/xjs-business-common/src/main/resources/META-INF/spring.factories b/xjs-business/xjs-business-common/src/main/resources/META-INF/spring.factories
new file mode 100644
index 00000000..61822cd7
--- /dev/null
+++ b/xjs-business/xjs-business-common/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,7 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+  com.xjs.config.FeignConfig,\
+  com.xjs.config.JsonConfig,\
+  com.xjs.config.MybatisPlusConfig,\
+  com.xjs.config.WebMvcConfig
+
+
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 826542fb..e7d1831e 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
@@ -63,7 +63,7 @@ public class IntegralGradeController extends MyBaseController<IntegralGrade> {
     @ApiOperation("保存积分等级")
     @RequiresPermissions("srb:integralGrade:save")
     @Log(title = "融-积分管理", businessType = BusinessType.INSERT)
-    public AjaxResult save(IntegralGrade integralGrade) {
+    public AjaxResult save(@RequestBody IntegralGrade integralGrade) {
         return toAjax(integralGradeService.save(integralGrade));
     }