hangzhoumesParent/common/pom.xml
@@ -6,6 +6,7 @@ <artifactId>hangzhoumesParent</artifactId> <groupId>com.mes</groupId> <version>1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion>
@@ -6,6 +6,7 @@ <artifactId>common</artifactId> <groupId>com.mes</groupId> <version>1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion>
@@ -6,6 +6,7 @@ <artifactId>common</artifactId> <groupId>com.mes</groupId> <version>1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion>
@@ -6,6 +6,7 @@ <artifactId>hangzhoumesParent</artifactId> <groupId>com.mes</groupId> <version>1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion>
@@ -6,6 +6,7 @@ <artifactId>moduleService</artifactId> <groupId>com.mes</groupId> <version>1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -24,6 +25,7 @@ <!-- <dependency>--> <!-- <groupId>com.github.yulichang</groupId>--> <!-- <artifactId>mybatis-plus-join-boot-starter</artifactId>--> <!-- <version>1.4.12</version>--> <!-- </dependency>--> </dependencies>
@@ -2,16 +2,11 @@ import com.mes.edgstoragecage.entity.EdgStorageCage; import com.mes.edgstoragecage.service.EdgStorageCageService; import com.mes.edgstoragecage.service.impl.EdgStorageCageServiceImpl; import com.mes.taskcache.entity.TaskCache; import com.mes.taskcache.service.impl.TaskCacheServiceImpl; import com.mes.utils.Result; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.awt.image.ImageProducer; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -28,36 +23,35 @@ 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("添加磨边缓存理片笼信息 功能：笼内绑定玻璃") @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); }
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.yulichang.base.MPJBaseMapper; import com.github.yulichang.interfaces.MPJBaseJoin; import com.mes.edgstoragecage.entity.EdgStorageCage; /** hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java
@@ -1,10 +1,8 @@ package com.mes.edgstoragecage.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.yulichang.query.MPJQueryWrapper; import com.mes.edgstoragecage.entity.EdgStorageCage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.mes.edgstoragecage.entity.EdgStorageCageDetails; import com.mes.edgstoragecage.mapper.EdgStorageCageMapper; import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper; import com.mes.edgstoragecage.service.EdgStorageCageService; @@ -14,7 +12,6 @@ import org.springframework.stereotype.Service; import java.util.Map; import java.util.*; import java.util.stream.Collectors; /** * <p> @@ -43,6 +40,11 @@ .leftJoin("edg_storage_cage_details escd on t.device_id=escd.device_id and t.slot=escd.slot") .isNull("escd.slot") ); // List<Map> map=baseMapper.selectJoinList(Map.class,JoinWrappers.lambda(EdgStorageCage.class) // .selectAll(EdgStorageCage.class) // .select(EdgStorageCageDetails::getGlassId,EdgStorageCageDetails::getFlowCardId,EdgStorageCageDetails::getWidth,EdgStorageCageDetails::getHeight)//查询user_address tel 字段 // .leftJoin(EdgStorageCageDetails.class,EdgStorageCageDetails::getSlot,EdgStorageCage::getSlot) // .isNull(EdgStorageCageDetails::getSlot)); return map; }
@@ -28,21 +28,21 @@ @Autowired private GlassInfoServiceImpl GlassInfoServiceImpl; @PostMapping("/selectId") // 查询切割版图信息-根据 工程号 @PostMapping("/selectId") // @ResponseBody public Result selectId(String ProcessId) { List<GlassInfo> list = GlassInfoServiceImpl.selectId(ProcessId); return Result.build(200,"成功",list); } @PostMapping("/selectAll") // 查询切割版图信息-根据 工程号 @PostMapping("/selectAll") // @ResponseBody public Result selectAll() { List<GlassInfo> list = GlassInfoServiceImpl.selectAll(); return Result.build(200,"成功",list); } @PostMapping("/selectFlowCardId") // 查询切割版图信息-根据 工程号 @PostMapping("/selectFlowCardId") // @ResponseBody public Result selectFlowCardId(String flowCardId) { List<GlassInfo> list = GlassInfoServiceImpl.selectFlowCardId(flowCardId); hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java
File was renamed from hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/uppattenusage/controller/uppattenusageController.java @@ -1,5 +1,7 @@ package com.mes.uppattenusage.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; @@ -19,14 +21,14 @@ * @since 2024-04-07 */ @RestController @RequestMapping("/taskCache") public class uppattenusageController { @RequestMapping("/upPattenUsage") public class UpPattenUsageController { @Autowired private EdgStorageCageServiceImpl edgStorageCageServiceImpl; private EdgStorageCageService edgStorageCageService; @Autowired private EdgStorageCageDetailsServiceImpl edgStorageCageDetailsServiceImpl; private EdgStorageCageDetailsService edgStorageCageDetailsService; @Autowired private HangzhoumesService hangzhoumesService; hangzhoumesParent/moduleService/CacheVerticalGlassModule/pom.xml
@@ -6,6 +6,7 @@ <artifactId>moduleService</artifactId> <groupId>com.mes</groupId> <version>1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion>
@@ -6,6 +6,7 @@ <artifactId>moduleService</artifactId> <groupId>com.mes</groupId> <version>1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion>
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiOperation; import lombok.Data; import lombok.EqualsAndHashCode;
@@ -6,6 +6,7 @@ <artifactId>moduleService</artifactId> <groupId>com.mes</groupId> <version>1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion>
@@ -6,6 +6,7 @@ <artifactId>moduleService</artifactId> <groupId>com.mes</groupId> <version>1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion>
@@ -23,5 +23,5 @@ DownGlassTask selectLastOutCacheInfo(String endCell); Integer insertCacheTask(int id, String start, String end, String type, double width, double height, String filmsId, double thickness, String flowCardId); Integer insertCacheTask(Long id, String start, String end, String type, double width, double height, String filmsId, double thickness, String flowCardId); } hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassTaskServiceImpl.java
@@ -58,7 +58,7 @@ } @Override public Integer insertCacheTask(int id, String start, String end, String type, double width, double height, String filmsId, double thickness, String flowCardId) { public Integer insertCacheTask(Long id, String start, String end, String type, double width, double height, String filmsId, double thickness, String flowCardId) { DownGlassTask glassInfo = new DownGlassTask(); glassInfo.setId(id); glassInfo.setStartCell(start); hangzhoumesParent/moduleService/pom.xml
@@ -6,6 +6,7 @@ <artifactId>hangzhoumesParent</artifactId> <groupId>com.mes</groupId> <version>1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion>
@@ -18,6 +18,7 @@ <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-parent</artifactId> <version>2.1.8.RELEASE</version> <relativePath/> </parent> <properties>
