From ea073afc6b4bc758990ac60f5e33254d1143272c Mon Sep 17 00:00:00 2001
From: wang <3597712270@qq.com>
Date: 星期二, 26 三月 2024 13:58:03 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

---
 CacheGlassModule/src/main/java/com/mes/controller/OrderTestController.java |   29 +++++++++++++++++++++--------
 1 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/CacheGlassModule/src/main/java/com/mes/controller/OrderTestController.java b/CacheGlassModule/src/main/java/com/mes/controller/OrderTestController.java
index aecbd7f..2d24de4 100644
--- a/CacheGlassModule/src/main/java/com/mes/controller/OrderTestController.java
+++ b/CacheGlassModule/src/main/java/com/mes/controller/OrderTestController.java
@@ -1,22 +1,35 @@
 package com.mes.controller;
 
-import com.mes.mapper.OrderTestMapper;
+import com.mes.mapper.SelectInfo;
+
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import com.mes.common.Result;
+import com.mes.entity.Tempered;
+import com.mes.service.pp.SelectdppService;
 
 //@CrossOrigin  //瑙e喅鍗曚釜controller 璺ㄥ煙闂
 @RestController
-@RequestMapping("/order11111111")
+@RequestMapping("/Temper")
 
 public class OrderTestController {
     @Autowired
-    private OrderTestMapper orderMapper;
+    private SelectInfo SelectInfo;
 
-//    @GetMapping //鏌ヨorder琛ㄧ粨鏋滈泦
-//    public Result index(){
-//        return Result.seccess(orderMapper.findAll());
-//
-//    }
+    @Autowired
+    private SelectdppService SelectppService;
+
+   @GetMapping("/Tindex") //鏌ヨorder琛ㄧ粨鏋滈泦
+   @ResponseBody
+   public Result index(){
+       System.out.println(1);
+       List<Tempered> h=SelectppService.getSelectTempered("P24030707");
+       System.out.println(h.size());
+       return Result.seccess(h);
+    
+   }
 //
 //    @PostMapping  //鎻掑叆
 //    public Integer save(@RequestBody Order order) {

--
Gitblit v1.8.0