补充

2024-03-22 13:16:08 +08:00 · 2024-03-22 13:16:08 +08:00 · 73f7ce8db1
commit 73f7ce8db1
parent 9b1e3ee557
8 changed files with 112 additions and 23 deletions
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
@ -97,7 +97,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                // 过滤请求
                .authorizeRequests()
                // 对于登录login 注册register 验证码captchaImage 允许匿名访问
-                .antMatchers("/login", "/register", "/captchaImage").anonymous()
+                .antMatchers("/login", "/register", "/captchaImage","/intelligentForm/selectDynamicDataById","/intelligentForm/collectData").anonymous()
                .antMatchers(
                        HttpMethod.GET,
                        "/",
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/TenantInterceptor.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/TenantInterceptor.java
@ -44,12 +44,15 @@ public class TenantInterceptor implements HandlerInterceptor {
    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {

        String url = request.getServletPath();
+//        System.out.println("-----------"+url);
        String tenant= request.getHeader("tenant");
        log.info("&&&&&&&&&&&&&&&& 租户拦截 &&&&&&&&&&&&&&&&");
        Pattern pattern = Pattern.compile("^/profile.*");
+        Pattern patterns = Pattern.compile("^/intelligentForm.*");
        Matcher matcher = pattern.matcher(url);
-        if (matcher.find()){
-            //使用正则表达式过滤以"/profile"开头的请求路径，直接放行
+        Matcher matchers = patterns.matcher(url);
+        if (matcher.find() || matchers.find()){
+            //使用正则表达式过滤以"/profile","/intelligentForm"开头的请求路径，直接放行
            return true;
        }
        if (StringUtils.isNotBlank(tenant)) {
--- a/ruoyi-mongodb/src/main/java/com/ruoyi/mongodb/conreoller/DynamicDataController.java
+++ b/ruoyi-mongodb/src/main/java/com/ruoyi/mongodb/conreoller/DynamicDataController.java
@ -1,13 +1,17 @@
 package com.ruoyi.mongodb.conreoller;

+import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.mongodb.domain.DynamicData;
 import com.ruoyi.mongodb.domain.DynamicForm;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.web.bind.annotation.*;

+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.*;

 /**
@ -16,7 +20,7 @@ import java.util.*;

@RestController
@RequestMapping("/intelligentForm")
-public class DynamicDataController {
+public class DynamicDataController extends BaseController {
    @Autowired
    private MongoTemplate mongoTemplate;

@ -26,8 +30,14 @@ public class DynamicDataController {
        DynamicData dynamicData = new DynamicData();
 //        System.out.println(requestData.toString());
        String title = (String)requestData.get("title");
+        String pageView = (String)requestData.get("pageView");
+        String collectionQuantity = (String)requestData.get("collectionQuantity");
        dynamicData.setTitle(title);
        requestData.remove("title");
+        dynamicData.setPageView(pageView);
+        requestData.remove("pageView");
+        dynamicData.setCollectionQuantity(collectionQuantity);
+        requestData.remove("collectionQuantity");
        ArrayList<String> inputarr = (ArrayList)requestData.get("inputarr");
 //        System.out.println(inputarr.toString());
        for (String s : inputarr) {
@ -35,6 +45,11 @@ public class DynamicDataController {
        }
        requestData.remove("inputarr");
 //        System.out.println(requestData.toString());
+        dynamicData.setCreatePeople(getUsername());
+        LocalDate currentDate = LocalDate.now();
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        String formattedDate = currentDate.format(formatter);
+        dynamicData.setCreateTime(formattedDate);
        dynamicData.setData(requestData);
        mongoTemplate.save(dynamicData);
        return AjaxResult.success("保存成功");
@ -44,25 +59,26 @@ public class DynamicDataController {
    @GetMapping("/selectDynamicData")
    public AjaxResult selectDynamicData() {
        List<DynamicData> dynamicData = mongoTemplate.find(new Query(), DynamicData.class);
-        for (DynamicData dynamicDatum : dynamicData) {
-            Map<String, Object> data = dynamicDatum.getData();
-            data.forEach((k,v) -> {
-                data.put(k,k);
-            });
-        }
+//        for (DynamicData dynamicDatum : dynamicData) {
+//            Map<String, Object> data = dynamicDatum.getData();
+//            data.forEach((k,v) -> {
+//                data.put(k,k);
+//            });
+//        }
        return AjaxResult.success(dynamicData);
    }
    //根据id查询数据
    @GetMapping("/selectDynamicDataById")
    public AjaxResult selectDynamicDataById(String id){
        DynamicData dynamicData = mongoTemplate.findById(id, DynamicData.class);
-        Map<String, Object> data = dynamicData.getData();
-        data.forEach((k,v) -> {
-            data.put(k,k);
-        });
+//        Map<String, Object> data = dynamicData.getData();
+//        data.forEach((k,v) -> {
+//            data.put(k,k);
+//        });
        return AjaxResult.success(dynamicData);
    }

+    @PostMapping("/collectData")
    //采集数据
    public AjaxResult collectData(DynamicForm dynamicForm){
        mongoTemplate.save(dynamicForm);
--- a/ruoyi-mongodb/src/main/java/com/ruoyi/mongodb/domain/DynamicData.java
+++ b/ruoyi-mongodb/src/main/java/com/ruoyi/mongodb/domain/DynamicData.java
@ -10,14 +10,27 @@ public class DynamicData {
    @Id
    private String id;
    private String title;
+    //总浏览量
+    private String pageView;
+    //采集数量
+    private String collectionQuantity;
+    //创建者
+    private String createPeople;
+    //创建时间
+    private String createTime;
+    //用户字段数据
    private Map<String, Object> data;

    public DynamicData() {
    }

-    public DynamicData(String id, String title, Map<String, Object> data) {
+    public DynamicData(String id, String title, String pageView, String collectionQuantity, String createPeople, String createTime, Map<String, Object> data) {
        this.id = id;
        this.title = title;
+        this.pageView = pageView;
+        this.collectionQuantity = collectionQuantity;
+        this.createPeople = createPeople;
+        this.createTime = createTime;
        this.data = data;
    }

@ -45,11 +58,47 @@ public class DynamicData {
        this.data = data;
    }

+    public String getPageView() {
+        return pageView;
+    }
+
+    public void setPageView(String pageView) {
+        this.pageView = pageView;
+    }
+
+    public String getCollectionQuantity() {
+        return collectionQuantity;
+    }
+
+    public void setCollectionQuantity(String collectionQuantity) {
+        this.collectionQuantity = collectionQuantity;
+    }
+
+    public String getCreatePeople() {
+        return createPeople;
+    }
+
+    public void setCreatePeople(String createPeople) {
+        this.createPeople = createPeople;
+    }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
    @Override
    public String toString() {
        return "DynamicData{" +
                "id='" + id + '\'' +
                ", title='" + title + '\'' +
+                ", pageView='" + pageView + '\'' +
+                ", collectionQuantity='" + collectionQuantity + '\'' +
+                ", createPeople='" + createPeople + '\'' +
+                ", createTime=" + createTime +
                ", data=" + data +
                '}';
    }
--- a/ruoyi-mongodb/src/main/java/com/ruoyi/mongodb/domain/DynamicForm.java
+++ b/ruoyi-mongodb/src/main/java/com/ruoyi/mongodb/domain/DynamicForm.java
@ -45,6 +45,7 @@ public class DynamicForm {
        this.map = map;
    }

+
    @Override
    public String toString() {
        return "DynamicForm{" +
--- a/ruoyi-ui/src/api/crm/intelligent.js
+++ b/ruoyi-ui/src/api/crm/intelligent.js
@ -2,11 +2,10 @@ import request from '@/utils/request'


 // 查询表单列表
-export function selectDynamicData(query) {
+export function selectDynamicData() {
  return request({
    url: '/intelligentForm/selectDynamicData',
-    method: 'get',
-    params: query
+    method: 'get'
  })
 }

--- a/ruoyi-ui/src/views/crm/intelligent/index.vue
+++ b/ruoyi-ui/src/views/crm/intelligent/index.vue
@ -17,11 +17,29 @@
        <span>{{o.title}}</span>
        <el-button style="float: right; padding: 3px 0" type="text" @click="handelExtend(o.id)">推广</el-button>
      </div>
-        <div v-for="i in o.data">
-          {{i}}
+    <div style="display: flex;justify-content: space-between">
+<!--      <div style="width: 30%">-->
+<!--        <div>采购员</div>-->
+<!--        <p style="font-size: 25px">1</p>-->
+<!--      </div>-->
+      <div style="width: 30%">
+        <div>总浏览量</div>
+        <p style="font-size: 25px">{{o.pageView}}</p>
+      </div>
+      <div style="width: 30%">
+        <div>采集数量</div>
+        <p style="font-size: 25px">{{o.collectionQuantity}}</p>
+      </div>
+    </div>
+      <div style="display: flex;justify-content: space-between">
+        <div>
+          <span>创建人：{{o.createPeople}}</span>
        </div>
+        <div>创建时间：{{o.createTime}}</div>
+      </div>
    </el-card>

+
 <!--    </el-col>-->

    <!-- 添加表单对话框 -->
@ -84,13 +102,15 @@ export default {
      // 是否显示推广弹出层
      extendOpen: false,
      //推广链接数据
-      extendLink: 'sbdijasbdhjasgbd',
+      extendLink: '',
      //下拉框客户列表
      customerList: [],
      //卡片列表
      cardList: [],
      addParams: {
        title:'',
+        pageView:'',
+        collectionQuantity:'',
        inputarr: []
      }
    };
@ -120,7 +140,8 @@ export default {
    //提交按钮
    submitForm(){
      this.addParams.inputarr = this.inputarr
-      console.log(this.addParams,'add')
+      this.addParams.pageView = '22'
+      this.addParams.collectionQuantity = '33'
      saveDynamicData(this.addParams).then(response => {
        // this.cardList = response.data;
        // this.total = response.total;
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@ -35,7 +35,7 @@ module.exports = {
    proxy: {
      // detail: https://cli.vuejs.org/config/#devserver-proxy
      [process.env.VUE_APP_BASE_API]: {
-        target: `http://localhost:8080/api`,
+        target: `http://127.0.0.1:8080/api`,
        changeOrigin: true,
        pathRewrite: {
          ['^' + process.env.VUE_APP_BASE_API]: ''