From b0cd8e56e79637407ff32bd559eab896101d887c Mon Sep 17 00:00:00 2001
From: wang <3597712270@qq.com>
Date: 星期三, 03 四月 2024 16:44:28 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
CacheGlassModule/src/main/java/com/mes/service/pp/SelectdppService.java | 20 +++++++-------------
1 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/CacheGlassModule/src/main/java/com/mes/service/pp/SelectdppService.java b/CacheGlassModule/src/main/java/com/mes/service/pp/SelectdppService.java
index c139c0d..2eecb75 100644
--- a/CacheGlassModule/src/main/java/com/mes/service/pp/SelectdppService.java
+++ b/CacheGlassModule/src/main/java/com/mes/service/pp/SelectdppService.java
@@ -1,24 +1,14 @@
package com.mes.service.pp;
-import cn.hutool.core.util.StrUtil;
import com.baomidou.dynamic.datasource.annotation.DS;
-import com.mes.common.CacheUtil;
-import com.mes.common.Result;
import com.mes.entity.GlassInfo;
import com.mes.entity.Tempered;
-import com.mes.entity.userInfo.User;
import com.mes.mapper.SelectInfo;
-import com.mes.mapper.userInfo.UserMapper;
-import com.mes.controller.dto.UserDTO;
-import com.mes.tools.TokenTools;
-import org.apache.ibatis.jdbc.Null;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
import java.util.List;
+import java.util.Map;
@Service
@DS("pp")
@@ -31,8 +21,12 @@
return SelectInfo.SelectGlassId(process_id);
}
- public List<Tempered> getSelectTempered(String process_id){
- return SelectInfo.SelectTempered(process_id);
+ public List<Tempered> SelectTemperedTerritory(String process_id){
+ return SelectInfo.SelectTemperedTerritory(process_id);
+ }
+ //鍒囧壊鐗堝浘
+ public List<Map> SelectCutTerritory(String process_id){
+ return SelectInfo.SelectCutTerritory(process_id);
}
--
Gitblit v1.8.0