From 04b841aa1661693e68f5dea1a80e7c97a209cbeb Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期五, 19 四月 2024 13:31:48 +0800
Subject: [PATCH] 命名以及 注解修改
---
hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java | 12 +
hangzhoumesParent/moduleService/CacheGlassModule/pom.xml | 14 +-
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java | 18 +--
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java | 8 -
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java | 57 +++++-----
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java | 49 ++++-----
hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/mapper/UpPattenUsageMapper.java | 3
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java | 41 ++++----
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/controller/GlassInfoController.java | 20 ++-
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/controller/EdgStorageCageController.java | 20 +--
10 files changed, 119 insertions(+), 123 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/mapper/UpPattenUsageMapper.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/mapper/UpPattenUsageMapper.java
index a53a12b..154e50d 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/mapper/UpPattenUsageMapper.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/mapper/UpPattenUsageMapper.java
@@ -1,5 +1,6 @@
package com.mes.uppattenusage.mapper;
+import com.github.yulichang.base.MPJBaseMapper;
import com.mes.uppattenusage.entity.UpPattenUsage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -11,6 +12,6 @@
* @author zhoush
* @since 2024-04-18
*/
-public interface UpPattenUsageMapper extends BaseMapper<UpPattenUsage> {
+public interface UpPattenUsageMapper extends MPJBaseMapper<UpPattenUsage> {
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/pom.xml b/hangzhoumesParent/moduleService/CacheGlassModule/pom.xml
index 3c9daa9..192058e 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/pom.xml
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/pom.xml
@@ -17,16 +17,16 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
-<!-- <dependency>-->
-<!-- <groupId>com.github.yulichang</groupId>-->
-<!-- <artifactId>mybatis-plus-join</artifactId>-->
-<!-- <version>1.1.6</version>-->
-<!-- </dependency>-->
<dependency>
<groupId>com.github.yulichang</groupId>
- <artifactId>mybatis-plus-join-boot-starter</artifactId>
- <version>1.4.12</version>
+ <artifactId>mybatis-plus-join</artifactId>
+ <version>1.1.6</version>
</dependency>
+<!-- <dependency>-->
+<!-- <groupId>com.github.yulichang</groupId>-->
+<!-- <artifactId>mybatis-plus-join-boot-starter</artifactId>-->
+<!-- <version>1.4.12</version>-->
+<!-- </dependency>-->
</dependencies>
<properties>
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/controller/EdgStorageCageController.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/controller/EdgStorageCageController.java
index 5e3bed7..2631a1a 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/controller/EdgStorageCageController.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/controller/EdgStorageCageController.java
@@ -28,36 +28,34 @@
public class EdgStorageCageController {
@Autowired
- private EdgStorageCageServiceImpl edgStorageCageServiceImpl;
+ private EdgStorageCageService edgStorageCageService;
-
- //鏌ヨ纾ㄨ竟缂撳瓨鐞嗙墖绗煎唴璇︽儏
+ @ApiOperation("鏌ヨ纾ㄨ竟缂撳瓨鐞嗙墖绗煎唴璇︽儏 鍙傛暟()")
@PostMapping("/selectEdgStorageCage")
@ResponseBody
public Result selectEdgStorageCage () {
- List<Map> list=edgStorageCageServiceImpl.selectEdgStorageCages();
+ List<Map> list=edgStorageCageService.selectEdgStorageCages();
return Result.build(200,"鎴愬姛",list);
}
- //娣诲姞纾ㄨ竟缂撳瓨鐞嗙墖绗间俊鎭� 鍔熻兘锛氱鍐呯粦瀹氱幓鐠�
+ @ApiOperation("娣诲姞纾ㄨ竟缂撳瓨鐞嗙墖绗间俊鎭� 鍔熻兘锛氱鍐呯粦瀹氱幓鐠� 鍙傛暟(EdgStorageCage edgStorageCage)")
@PostMapping("/insertEdgStorageCage")
@ResponseBody
public Result insertEdgStorageCage(@RequestBody EdgStorageCage edgStorageCage) {
- boolean isSucess=edgStorageCageServiceImpl.updateEdgStorageCage(edgStorageCage);
+ boolean isSucess=edgStorageCageService.updateEdgStorageCage(edgStorageCage);
return Result.build(200,"娣诲姞鎴愬姛",1);
}
- //淇敼纾ㄨ竟缂撳瓨鐞嗙墖绗间俊鎭� 鍔熻兘锛氬绗煎唴鏍呮牸杩涜銆愬惎鐢�/绂佺敤銆�/ 銆愭洿鎹€�戠鍐呮爡鏍肩幓鐠冧俊鎭�
+ @ApiOperation("淇敼纾ㄨ竟缂撳瓨鐞嗙墖绗间俊鎭� 鍔熻兘锛氬绗煎唴鏍呮牸杩涜銆愬惎鐢�/绂佺敤銆�/ 銆愭洿鎹€�戠鍐呮爡鏍肩幓鐠冧俊鎭�")
@PostMapping("/updateEdgStorageCage")
@ResponseBody
public Result updateEdgStorageCage(@RequestBody EdgStorageCage edgStorageCage) {
- boolean isSucess=edgStorageCageServiceImpl.updateEdgStorageCage(edgStorageCage);
+ boolean isSucess=edgStorageCageService.updateEdgStorageCage(edgStorageCage);
return Result.build(200,"鏇存崲鎴愬姛",1);
}
-
- //鍒犻櫎纾ㄨ竟缂撳瓨鐞嗙墖绗间俊鎭� 鍔熻兘锛氬绗煎唴鏍呮牸鐜荤拑杩涜銆愭竻闄ゃ��
+ @ApiOperation("鍒犻櫎纾ㄨ竟缂撳瓨鐞嗙墖绗间俊鎭� 鍔熻兘锛氬绗煎唴鏍呮牸鐜荤拑杩涜銆愭竻闄ゃ��")
@PostMapping("/deleteEdgStorageCage")
@ResponseBody
public Result deleteEdgStorageCage(@RequestBody EdgStorageCage edgStorageCage) {
- boolean isSucess=edgStorageCageServiceImpl.updateEdgStorageCage(edgStorageCage);
+ boolean isSucess=edgStorageCageService.updateEdgStorageCage(edgStorageCage);
return Result.build(200,"鍒犻櫎鎴愬姛",1);
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
index 45cf60f..52623b7 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
@@ -4,10 +4,14 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.yulichang.base.MPJBaseServiceImpl;
import com.github.yulichang.query.MPJQueryWrapper;
+import com.github.yulichang.wrapper.interfaces.LambdaJoin;
+import com.mes.edgstoragecage.entity.EdgStorageCage;
import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper;
import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;
import com.mes.taskcache.mapper.HangzhouMesMapper;
+import com.mes.uppattenusage.entity.UpPattenUsage;
+import com.mes.uppattenusage.mapper.UpPattenUsageMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -24,49 +28,46 @@
*/
@Service
public class EdgStorageCageDetailsServiceImpl extends MPJBaseServiceImpl<EdgStorageCageDetailsMapper, EdgStorageCageDetails> implements EdgStorageCageDetailsService {
- //鑾峰彇鍏ㄩ儴鏁版嵁
+
@Autowired
- private EdgStorageCageDetailsMapper edgStorageCageDetailsMapper;
+ UpPattenUsageMapper upPattenUsageMapper;
//璇嗗埆 鐮存崯/鎷胯蛋
public boolean identWorn(String glassid, int ControlsId) {
-// List<EdgStorageCageDetails> edgStorageCageDetails = edgStorageCageDetailsMapper.selectList(new QueryWrapper<EdgStorageCageDetails>().eq("glassid", glassid));
-// if (edgStorageCageDetails.size() == 1) {
-// edgStorageCageDetailsMapper.update(edgStorageCageDetails.get(0), new QueryWrapper<EdgStorageCageDetails>().eq("glassid", glassid));
-// return true;
-// }
+ List<EdgStorageCageDetails> edgStorageCageDetails = baseMapper.selectList(new QueryWrapper<EdgStorageCageDetails>().eq("glassid", glassid));
+ if (edgStorageCageDetails.size() == 1) {
+ baseMapper.update(edgStorageCageDetails.get(0), new QueryWrapper<EdgStorageCageDetails>().eq("glassid", glassid));
+ return true;
+ }
return false;
}
//鑾峰彇 鍒囧壊褰撳墠鐗堝浘
@Override
public List<Map> selectCutTerritory() {
-// List<Map> list = edgStorageCageDetailsMapper.selectJoinList(
-// Map.class, new MPJQueryWrapper<EdgStorageCageDetails>().selectAll(EdgStorageCageDetails.class)
-// .select("escd.glass_id", "escd.flow_card_id", "escd.width", "escd.height")
-// .leftJoin("glass_info gi on t.layout_sequence=gi.pattern_sequence and t.engineering_id=gi.engineer_id")
-// .leftJoin("edg_storage_cage_details escd on gi.id=escd.glass_id")
-// .eq("state", 1)
-// .orderByAsc("t.layout_sequence")
-// );
-// return list;
-
- return null;
+ List<Map> list = upPattenUsageMapper.selectJoinList(
+ Map.class, new MPJQueryWrapper<UpPattenUsage>().selectAll(UpPattenUsage.class)
+ .select("escd.glass_id", "escd.flow_card_id", "escd.width", "escd.height")
+ .leftJoin("glass_info gi on t.layout_sequence=gi.pattern_sequence and t.engineering_id=gi.engineer_id")
+ .leftJoin("edg_storage_cage_details escd on gi.id=escd.glass_id")
+ .eq("t.state", 1)
+ .orderByAsc("t.layout_sequence")
+ );
+ return list;
}
//鑾峰彇 宸ョ▼涓嬬殑褰撳墠鐗堝浘
@Override
public List<Map> selectCurrentCutTerritory(String current) {
-// List<Map> list = edgStorageCageDetailsMapper.selectJoinList(
-// Map.class, new MPJQueryWrapper<EdgStorageCageDetails>().selectAll(EdgStorageCageDetails.class)
-// .select("escd.glass_id", "escd.flow_card_id", "escd.width", "escd.height")
-// .leftJoin("glass_info gi on t.layout_sequence=gi.pattern_sequence and t.engineering_id=gi.engineer_id")
-// .leftJoin("edg_storage_cage_details escd on gi.id=escd.glass_id")
-// .eq("t.engineering_id", current)
-// .orderByAsc("t.layout_sequence")
-// );
-// return list;
- return null;
+ List<Map> list = baseMapper.selectJoinList(
+ Map.class, new MPJQueryWrapper<EdgStorageCageDetails>().selectAll(EdgStorageCageDetails.class)
+ .select("escd.glass_id", "escd.flow_card_id", "escd.width", "escd.height")
+ .leftJoin("glass_info gi on t.layout_sequence=gi.pattern_sequence and t.engineering_id=gi.engineer_id")
+ .leftJoin("edg_storage_cage_details escd on gi.id=escd.glass_id")
+ .eq("t.engineering_id", current)
+ .orderByAsc("t.layout_sequence")
+ );
+ return list;
}
;
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java
index e956e06..e863425 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java
@@ -29,8 +29,6 @@
public class EdgStorageCageServiceImpl extends MPJBaseServiceImpl<EdgStorageCageMapper, EdgStorageCage> implements EdgStorageCageService {
@Autowired
- EdgStorageCageMapper edgStorageCageMapper;
- @Autowired
EdgStorageCageDetailsMapper edgStorageCageDetailsMapper;
@Autowired
UpPattenUsageMapper upPattenUsageMapper;
@@ -38,46 +36,43 @@
@Override
//鏌ヨ绗煎唴绌烘牸
public List<Map> selectCacheEmpty(){
-// List<Map> map=edgStorageCageMapper.selectJoinList(
-// Map.class,new MPJQueryWrapper<EdgStorageCage>().selectAll(EdgStorageCage.class)
-// .select("escd.glass_id","escd.flow_card_id","escd.width","escd.height")
-// .leftJoin("edg_storage_cage_details escd on t.device_id=escd.device_id and t.slot=escd.slot")
-// .isNull("escd.slot")
-// );
-// return map;
- return null;
+ List<Map> map=baseMapper.selectJoinList(
+ Map.class,new MPJQueryWrapper<EdgStorageCage>().selectAll(EdgStorageCage.class)
+ .select("escd.glass_id","escd.flow_card_id","escd.width","escd.height")
+ .leftJoin("edg_storage_cage_details escd on t.device_id=escd.device_id and t.slot=escd.slot")
+ .isNull("escd.slot")
+ );
+ return map;
}
@Override
//鏌ヨ绗煎唴鍑虹墖浠诲姟 鎸夐挗鍖栫増鍥惧彿+鐗堝浘鍐呭簭鍙�
public List<Map> selectCacheOut(){
-// List<Map> list= upPattenUsageMapper.selectJoinList(
-// Map.class,new MPJQueryWrapper<UpPattenUsage>().selectAll(UpPattenUsage.class)
-// .select("escd.glass_id","escd.flow_card_id","escd.width","escd.height")
-// .leftJoin("edg_storage_cage_details escd on t.device_id=escd.device_id and t.slot=escd.slot")
-// .isNotNull("escd.slot")
-// .orderByAsc("escd.tempering_layout_id","escd.tempering_feed_sequence")
-// );
-// return list;
- return null;
+ List<Map> list= upPattenUsageMapper.selectJoinList(
+ Map.class,new MPJQueryWrapper<UpPattenUsage>().selectAll(UpPattenUsage.class)
+ .select("escd.glass_id","escd.flow_card_id","escd.width","escd.height")
+ .leftJoin("edg_storage_cage_details escd on t.device_id=escd.device_id and t.slot=escd.slot")
+ .isNotNull("escd.slot")
+ .orderByAsc("escd.tempering_layout_id","escd.tempering_feed_sequence")
+ );
+ return list;
}
@Override
//鐞嗙墖缂撳瓨璇︽儏
public List<Map> selectEdgStorageCages(){
-// List<Map> map=edgStorageCageMapper.selectJoinList(
-// Map.class,new MPJQueryWrapper<EdgStorageCage>().selectAll(EdgStorageCage.class)
-// .select("escd.glass_id","escd.flow_card_id","escd.width","escd.height")
-// .leftJoin("edg_storage_cage_details escd on t.device_id=escd.device_id and t.slot=escd.slot")
-// );
-// return map;
- return null;
+ List<Map> map=baseMapper.selectJoinList(
+ Map.class,new MPJQueryWrapper<EdgStorageCage>().selectAll(EdgStorageCage.class)
+ .select("escd.glass_id","escd.flow_card_id","escd.width","escd.height")
+ .leftJoin("edg_storage_cage_details escd on t.device_id=escd.device_id and t.slot=escd.slot")
+ );
+ return map;
}
@Override
//淇敼鐞嗙墖绗煎唴淇℃伅 鍔熻兘锛氬绗煎唴鏍呮牸鐜荤拑 銆愭坊鍔�/鍒犻櫎/鏇存崲銆�
public boolean updateEdgStorageCage(EdgStorageCage edgStorageCage){
- edgStorageCageMapper.updateById(edgStorageCage);
+ baseMapper.updateById(edgStorageCage);
return true;
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/controller/GlassInfoController.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/controller/GlassInfoController.java
index 9eab183..5a78021 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/controller/GlassInfoController.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/controller/GlassInfoController.java
@@ -3,6 +3,7 @@
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.service.GlassInfoService;
import com.mes.utils.Result;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -26,26 +27,27 @@
public class GlassInfoController {
@Autowired
- private GlassInfoServiceImpl GlassInfoServiceImpl;
+ private GlassInfoService glassInfoService;
- @PostMapping("/selectId") //
+ @ApiOperation("鏍规嵁鐜荤拑灏忕墖ID鏌ヨ 鐜荤拑鏁版嵁锛氬弬鏁�(鐜荤拑ID)")
+ @PostMapping("/selectId")
@ResponseBody
public Result selectId(String ProcessId) {
- List<GlassInfo> list = GlassInfoServiceImpl.selectId(ProcessId);
+ List<GlassInfo> list = glassInfoService.selectId(ProcessId);
return Result.build(200,"鎴愬姛",list);
}
-
- @PostMapping("/selectAll") //
+ @ApiOperation("鏌ヨ鎵�鏈夌幓鐠冨皬鐗囦俊鎭� 鐜荤拑鏁版嵁 鍙傛暟()")
+ @PostMapping("/selectAll")
@ResponseBody
public Result selectAll() {
- List<GlassInfo> list = GlassInfoServiceImpl.selectAll();
+ List<GlassInfo> list = glassInfoService.selectAll();
return Result.build(200,"鎴愬姛",list);
}
-
- @PostMapping("/selectFlowCardId") //
+ @ApiOperation("鏌ヨ宸ョ▼涓嬬殑鐜荤拑灏忕墖淇℃伅 鐜荤拑鏁版嵁 鍙傛暟(宸ョ▼鍙�)")
+ @PostMapping("/selectFlowCardId")
@ResponseBody
public Result selectFlowCardId(String flowCardId) {
- List<GlassInfo> list = GlassInfoServiceImpl.selectFlowCardId(flowCardId);
+ List<GlassInfo> list = glassInfoService.selectFlowCardId(flowCardId);
return Result.build(200,"鎴愬姛",list);
}
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java
index cae494e..a874049 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java
@@ -22,24 +22,22 @@
@Service
public class GlassInfoServiceImpl extends ServiceImpl<GlassInfoMapper, GlassInfo> implements GlassInfoService {
- @Autowired
- GlassInfoMapper glassInfoMapper;
//鏍规嵁ID 鑾峰彇灏忕墖鏁版嵁
@Override
public List<GlassInfo> selectId(String glassId){
- return glassInfoMapper.selectList(new QueryWrapper<GlassInfo>().eq("id",glassId));
+ return baseMapper.selectList(new QueryWrapper<GlassInfo>().eq("id",glassId));
};
//鑾峰彇鍏ㄩ儴灏忕墖鏁版嵁
@Override
public List<GlassInfo> selectAll(){
- return glassInfoMapper.selectList(null);
+ return baseMapper.selectList(null);
};
//鏍规嵁宸ョ▼ 鑾峰彇灏忕墖鏁版嵁
@Override
public List<GlassInfo> selectFlowCardId(String flowCardId){
- return glassInfoMapper.selectList(new QueryWrapper<GlassInfo>().eq("flowCardId",flowCardId));
+ return baseMapper.selectList(new QueryWrapper<GlassInfo>().eq("flowCardId",flowCardId));
};
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java
index cb8fb57..9634f19 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java
@@ -1,10 +1,13 @@
package com.mes.taskcache.controller;
+import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;
+import com.mes.edgstoragecage.service.EdgStorageCageService;
import com.mes.edgstoragecage.service.impl.EdgStorageCageDetailsServiceImpl;
import com.mes.edgstoragecage.service.impl.EdgStorageCageServiceImpl;
import com.mes.taskcache.service.HangzhoumesService;
import com.mes.taskcache.service.PpService;
import com.mes.utils.Result;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -24,51 +27,49 @@
public class TaskCacheController {
@Autowired
- private EdgStorageCageServiceImpl edgStorageCageServiceImpl;
-
- @Autowired
- private EdgStorageCageDetailsServiceImpl edgStorageCageDetailsServiceImpl;
+ private EdgStorageCageDetailsService edgStorageCageDetailsService;
@Autowired
private HangzhoumesService hangzhoumesService;
- @PostMapping("/cutTerritory") // 鏌ヨ鍒囧壊鐗堝浘淇℃伅-鏍规嵁 宸ョ▼鍙�
+ @ApiOperation("鏌ヨ鍒囧壊鐗堝浘淇℃伅-鏍规嵁 宸ョ▼鍙� 鍙傛暟(宸ョ▼鍙�)")
+ @PostMapping("/cutTerritory")
@ResponseBody
public Result cutTerritory(String current) {
- List<Map> h = edgStorageCageDetailsServiceImpl.selectCurrentCutTerritory(current);
+ List<Map> h = edgStorageCageDetailsService.selectCurrentCutTerritory(current);
return Result.build(200,"鎴愬姛",h);
}
-
- @PostMapping("/currentCutTerritory") // 璇嗗埆鏄剧ず 褰撳墠鐗堝浘
+ @ApiOperation("璇嗗埆鏄剧ず 褰撳墠鐗堝浘 鍙傛暟()")
+ @PostMapping("/currentCutTerritory")
@ResponseBody
public Result currentCutTerritory() {
- List<Map> h = edgStorageCageDetailsServiceImpl.selectCutTerritory();
+ List<Map> h = edgStorageCageDetailsService.selectCutTerritory();
return Result.build(200,"鎴愬姛",h);
}
-
- @PostMapping("/selectCutTerritory") // 璇嗗埆鏄剧ず 鐗瑰畾鐗堝浘
+ @ApiOperation("璇嗗埆鏄剧ず 鐗瑰畾鐗堝浘 鍙傛暟(鐗堝浘缂栧彿)")
+ @PostMapping("/selectCutTerritory")
@ResponseBody
public Result selectCutTerritory(String TerritoryId) {
- List<Map> h = edgStorageCageDetailsServiceImpl.selectCutTerritory();
+ List<Map> h = edgStorageCageDetailsService.selectCutTerritory();
return Result.build(200,"鎴愬姛",h);
}
-
- @PostMapping("/identControls") // 璇嗗埆鎿嶄綔锛� 鐮存崯/鎷胯蛋 鍙傛暟锛圛D锛屽姛鑳絒0:鐮存崯锛�1锛氭嬁璧癩锛�
+ @ApiOperation("璇嗗埆鎿嶄綔锛� 鐮存崯/鎷胯蛋 鍙傛暟锛圛D,鍔熻兘[0:鐮存崯锛�1锛氭嬁璧癩锛�")
+ @PostMapping("/identControls")
@ResponseBody
public Result identControls(@RequestParam(name = "identId", required = false) String identId,@RequestParam(name = "controlsId", required = false) int controlsId) {
- boolean issucess = edgStorageCageDetailsServiceImpl.identWorn(identId,controlsId);
+ boolean issucess = edgStorageCageDetailsService.identWorn(identId,controlsId);
return Result.build(200,"鎴愬姛",issucess);
}
-
- @PostMapping("/selectCageInfo") // 鏌ヨ绗煎唴淇℃伅
+ @ApiOperation("鏌ヨ绗煎唴淇℃伅 鍙傛暟()")
+ @PostMapping("/selectCageInfo")
@ResponseBody
- public Result selectCageInfo(String ProcessId) {
+ public Result selectCageInfo() {
List<Map> h = hangzhoumesService.SelectCageInfo();
return Result.build(200,"鎴愬姛",h);
}
-
- @PostMapping("/selectEdgTask") //纾ㄨ竟浠诲姟
+ @ApiOperation("纾ㄨ竟浠诲姟 鍙傛暟()")
+ @PostMapping("/selectEdgTask")
@ResponseBody
public Result selectEdgTask(String ProcessId) {
List<Map> EdgTasks = hangzhoumesService.SelectEdgInfo("1");
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java
index 73efed6..74d2904 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java
@@ -23,46 +23,42 @@
@Service
public class TaskCacheServiceImpl extends ServiceImpl<TaskCacheMapper, TaskCache> implements TaskCacheService {
- @Autowired
- GlassInfoMapper glassInfoMapper;
- @Autowired
- TaskCacheMapper taskCacheMapper;
//娣诲姞鐞嗙墖绗间换鍔�
@Override
public boolean insertTaskCache(TaskCache taskCache){
- taskCacheMapper.insert(taskCache);
+ baseMapper.insert(taskCache);
return true;
}
//鏌ヨ纾ㄨ竟浠诲姟
@Override
public List<TaskCache> selectEdgInfo(String line) {
- return taskCacheMapper.selectList(new QueryWrapper<TaskCache>().eq("endcell",line));
+ return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("endcell",line));
}
//鏌ヨ寰呯悊鐗囧伐浣滅殑浠诲姟
@Override
public List<TaskCache> selectCacheInfo(){
- return taskCacheMapper.selectList(new QueryWrapper<TaskCache>().eq("taskstauts",0));
+ return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("taskstauts",0));
}
//鏌ヨ鍏ㄩ儴浠诲姟
@Override
public List<TaskCache> selectAll() {
- return taskCacheMapper.selectList(null);
+ return baseMapper.selectList(null);
}
//鏌ヨ寰呰繘鐗囦换鍔�
@Override
public List<TaskCache> selectInputTaskCache(){
- return taskCacheMapper.selectList(new QueryWrapper<TaskCache>().eq("taskstauts",0).eq("tasktype",1));
+ return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("taskstauts",0).eq("tasktype",1));
}
//鏌ヨ寰呭嚭鐗囦换鍔�
@Override
public List<TaskCache> selectOutTaskCache(){
- return taskCacheMapper.selectList(new QueryWrapper<TaskCache>().eq("taskstauts",0).eq("tasktype",2));
+ return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("taskstauts",0).eq("tasktype",2));
}
//鏌ヨ A09 鎴� A10 鏈�鏂扮殑涓�鐗� 鍑虹墖浠诲姟
@Override
public List<TaskCache> selectLastOutCacheInfo(String line){
- return taskCacheMapper.selectList(new QueryWrapper<TaskCache>().eq("endcell",line).eq("taskstauts",1).orderByDesc("ID"));
+ return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("endcell",line).eq("taskstauts",1).orderByDesc("ID"));
}
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java
index bfda445..2cb20e5 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java
@@ -1,5 +1,7 @@
package com.mes;
+import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;
+import com.mes.edgstoragecage.service.EdgStorageCageService;
import com.mes.edgstoragecage.service.impl.EdgStorageCageServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
@@ -23,7 +25,9 @@
public class CacheGlassModuleApplicationTest {
@Autowired
- EdgStorageCageServiceImpl edgStorageCageServiceImpl;
+ EdgStorageCageService edgStorageCageService;
+ @Autowired
+ EdgStorageCageDetailsService edgStorageCageDetailsService;
@Test
public void testFindPath() {
@@ -32,17 +36,17 @@
@Test
public void testCacheGlass() {
- List<Map> map= edgStorageCageServiceImpl.selectEdgStorageCages();
+ List<Map> map= edgStorageCageService.selectEdgStorageCages();
log.info("绗煎唴淇℃伅锛歿}", Arrays.asList(map));
}
@Test
public void testselectCacheEmpty() {
- List<Map> map= edgStorageCageServiceImpl.selectCacheEmpty();
+ List<Map> map= edgStorageCageService.selectCacheEmpty();
log.info("绗煎唴绌烘牸锛歿}", Arrays.asList(map));
}
@Test
public void testScan() {
- List<Map> map= edgStorageCageServiceImpl.selectEdgStorageCages();
+ List<Map> map= edgStorageCageDetailsService.selectCutTerritory();
log.info("鍒囧壊褰撳墠鐗堝浘淇℃伅锛歿}", Arrays.asList(map));
}
}
--
Gitblit v1.8.0