From 9bc5106810d7c0e6f27e904b584c9bbfb3725a19 Mon Sep 17 00:00:00 2001
From: wujian <14790700720@163.com>
Date: 星期日, 28 四月 2024 17:42:09 +0800
Subject: [PATCH] change model11

---
 jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/controller/DaPassingStationCollectionController.java |   67 +++++++++++++++++++++++----------
 1 files changed, 47 insertions(+), 20 deletions(-)

diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/controller/DaPassingStationCollectionController.java b/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/controller/DaPassingStationCollectionController.java
index 19831e2..0e23230 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/controller/DaPassingStationCollectionController.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/controller/DaPassingStationCollectionController.java
@@ -1,29 +1,24 @@
 package com.jcdm.main.da.passingStationCollection.controller;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
-import com.jcdm.common.core.domain.R;
-import com.jcdm.common.utils.DateUtils;
-import com.jcdm.main.bs.orderScheduling.domain.BsOrderScheduling;
-import com.jcdm.main.da.passingStationCollection.domain.DaPassingStationCollection;
-import com.jcdm.main.da.passingStationCollection.service.IDaPassingStationCollectionService;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.jcdm.common.annotation.Log;
 import com.jcdm.common.core.controller.BaseController;
 import com.jcdm.common.core.domain.AjaxResult;
-import com.jcdm.common.enums.BusinessType;
-import com.jcdm.common.utils.poi.ExcelUtil;
+import com.jcdm.common.core.domain.R;
 import com.jcdm.common.core.page.TableDataInfo;
+import com.jcdm.common.enums.BusinessType;
+import com.jcdm.common.utils.DateUtils;
+import com.jcdm.common.utils.poi.ExcelUtil;
+import com.jcdm.main.da.passingStationCollection.domain.DaPassingStationCollection;
+import com.jcdm.main.da.passingStationCollection.service.IDaPassingStationCollectionService;
+import com.jcdm.main.da.passingStationCollection.service.impl.DaPassingStationCollectionServiceImpl;
+import com.jcdm.main.da.passingStationCollection.vo.DaPassingStationVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 浜у搧杩囩珯閲囬泦Controller
@@ -38,6 +33,9 @@
     @Autowired
     private IDaPassingStationCollectionService daPassingStationCollectionService;
 
+    @Resource
+    private DaPassingStationCollectionServiceImpl passingStationCollectionServiceImpl;
+
     /**
      * 鏌ヨ浜у搧杩囩珯閲囬泦鍒楄〃
      */
@@ -46,6 +44,25 @@
     public TableDataInfo list(DaPassingStationCollection daPassingStationCollection)
     {
         startPage();
+        List<DaPassingStationCollection> list = daPassingStationCollectionService.selectDaPassingStationCollectionList(daPassingStationCollection);
+        return getDataTable(list);
+    }
+
+    @PreAuthorize("@ss.hasPermi('da:passingStationCollection:list')")
+    @GetMapping("/getTopProcess")
+    public TableDataInfo getTopProcess()
+    {
+        DaPassingStationCollection daPassingStationCollection = new DaPassingStationCollection();
+        List<DaPassingStationVO> list = daPassingStationCollectionService.getTopProcess(daPassingStationCollection);
+        return getDataTable(list);
+    }
+    /**
+     * 鏌ヨ浜у搧杩囩珯閲囬泦鍒楄〃
+     */
+    @PreAuthorize("@ss.hasPermi('da:passingStationCollection:list')")
+    @GetMapping("/noPageList")
+    public TableDataInfo noPageList(DaPassingStationCollection daPassingStationCollection)
+    {
         List<DaPassingStationCollection> list = daPassingStationCollectionService.selectDaPassingStationCollectionList(daPassingStationCollection);
         return getDataTable(list);
     }
@@ -127,4 +144,14 @@
     {
         return toAjax(daPassingStationCollectionService.deleteDaPassingStationCollectionByIds(ids));
     }
+
+    //璁剧疆瀹氭椂鍗佺涓�娆�
+//    @Scheduled(cron = "0/10 * * * * ?")
+//    @PostMapping("/send")
+//    public String sendMessage(String message) throws Exception {
+//        if (StringUtils.isEmpty(message)){
+//            message = "TESTMESSAGE";
+//        }
+//        return passingStationCollectionServiceImpl.sendMessage(message);
+//    }
 }

--
Gitblit v1.9.3