hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/controller/RawGlassStorageDetailsController.java
@@ -1,18 +1,18 @@ package com.mes.rawglassdetails.controller; import com.mes.rawglassdetails.entity.request.RawGlassRequest; import com.mes.rawglassdetails.service.RawGlassStorageDetailsService; import com.mes.utils.Result; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; /** * <p> * 前端控制器 * </p> * * @author wf * @since 2024-09-10 @@ -21,27 +21,13 @@ @RequestMapping("/rawGlassStorageDetails") public class RawGlassStorageDetailsController { @Autowired private RawGlassStorageDetailsService rawGlassStorageDetailsService; @ApiOperation("工位状态") @PostMapping("/updateEnableState") @ResponseBody public Result<Boolean> updateStatus(@RequestBody Integer enableState) { boolean result = rawGlassStorageDetailsService.updateRawGlassStorageDetails(String.valueOf(enableState)); if (enableState == 1) { return Result.build(1, "启用", result); } else { return Result.build(0, "禁用", result); } } @Autowired private RawGlassStorageDetailsService rawGlassStorageDetailsService; @ApiOperation("原片入库") @PostMapping("/patternWarehousing") public Result<String> patternWarehousing(@Validated @RequestBody RawGlassRequest request) { @ApiOperation("原片入库") @PostMapping("/patternWarehousing") public Result<String> patternWarehousing(@Validated @RequestBody RawGlassRequest request) { return Result.build(200, "入库已完成，等待任务执行", rawGlassStorageDetailsService.patternWarehousing(request)); } return Result.build( 200, "入库已完成，等待任务执行", rawGlassStorageDetailsService.patternWarehousing(request)); } }
@@ -14,13 +14,6 @@ List<RawGlassStorageDetails> selectDetails(); /** * 要大写这个 * * @param films_id * @return */ boolean updateRawGlassStorageDetails(String films_id); /** * 删除表 先在这里创 然后点那个相关问题 @@ -44,4 +37,5 @@ * @return */ String patternWarehousing(RawGlassRequest request); } hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/service/impl/RawGlassStorageDetailsServiceImpl.java
@@ -1,7 +1,6 @@ package com.mes.rawglassdetails.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.mes.common.config.Const; import com.mes.rawglassdetails.entity.RawGlassStorageDetails; @@ -21,18 +20,8 @@ @Service @Slf4j public class RawGlassStorageDetailsServiceImpl extends ServiceImpl<RawGlassStorageDetailsMapper, RawGlassStorageDetails> implements RawGlassStorageDetailsService { @Override public boolean updateRawGlassStorageDetails(String films_id) { UpdateWrapper<RawGlassStorageDetails> wrapper = new UpdateWrapper<>(); //这个类型定义错了，不应该是tasking wrapper.set("films_id", "1005") .eq("films_id", films_id); return update(wrapper);//这个方法默认返回的就是bool类型 所有可以直接return这个方法，ok了，你正常创建方法去上一层创 } @Override public boolean deleteRawGlassStorageDetails(String device_id) { @Override public boolean deleteRawGlassStorageDetails(String device_id) { QueryWrapper<RawGlassStorageDetails> queryWrapper = new QueryWrapper<>(); queryWrapper.eq("device_id", device_id); return remove(queryWrapper);//remove才是删除，delete得用另外的依赖，默认方法是remove返回bool hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/controller/RawGlassStorageStationController.java
@@ -1,21 +1,34 @@ package com.mes.rawglassstation.controller; import com.mes.rawglassstation.service.RawGlassStorageStationService; import com.mes.utils.Result; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; /** * <p> * 前端控制器 * </p> * 前端控制器 * * @author wf * @since 2024-09-10 */ @RestController @RequestMapping("/raw-glass-storage-station") @RequestMapping("/rawGlassStorageStation") public class RawGlassStorageStationController { @Resource RawGlassStorageStationService rawGlassStorageStationService; @ApiOperation("工位状态") @PostMapping("/updateSlotState") @ResponseBody public Result<Boolean> updateSlotState(@RequestBody Integer enableState, Integer slot) { boolean result = rawGlassStorageStationService.updateSlotState(slot, enableState); if (enableState == 1) { return Result.build(1, "启用", result); } else { return Result.build(0, "禁用", result); } } }
@@ -2,15 +2,12 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import java.io.Serializable; import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serializable; /** * <p> * * </p> * * @author wf * @since 2024-09-10 */ @@ -20,8 +17,8 @@ private static final long serialVersionUID = 1L; @TableId(value = "id", type = IdType.AUTO) private Long id; @TableId(value = "id", type = IdType.AUTO) private Long id; /** * 设备id hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/mapper/RawGlassStorageStationMapper.java
@@ -1,8 +1,8 @@ package com.mes.rawglassstation.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.mes.rawglassdetails.entity.RawGlassStorageDetails; import com.mes.rawglassstation.entity.RawGlassStorageStation; import com.mes.rawglasstask.entity.RawGlassStorageTask; import java.util.List; @@ -16,5 +16,5 @@ */ public interface RawGlassStorageStationMapper extends BaseMapper<RawGlassStorageStation> { List<RawGlassStorageTask> listRawGlassDetails(); List<RawGlassStorageDetails> listRawGlassDetails(); } hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/service/RawGlassStorageStationService.java
@@ -1,8 +1,8 @@ package com.mes.rawglassstation.service; import com.baomidou.mybatisplus.extension.service.IService; import com.mes.rawglassdetails.entity.RawGlassStorageDetails; import com.mes.rawglassstation.entity.RawGlassStorageStation; import com.mes.rawglasstask.entity.RawGlassStorageTask; import java.util.List; @@ -19,5 +19,12 @@ boolean insertRawGlassStorageStation(RawGlassStorageStation rw); List<RawGlassStorageTask> listRawGlassDetails(); /** * 获取工位及对应的原片信息 * * @return */ List<RawGlassStorageDetails> listRawGlassDetails(); boolean updateSlotState(Integer slot, Integer enableState); } hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/service/impl/RawGlassStorageStationServiceImpl.java
@@ -1,12 +1,13 @@ package com.mes.rawglassstation.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.mes.rawglassdetails.entity.RawGlassStorageDetails; import com.mes.rawglassstation.entity.RawGlassStorageStation; import com.mes.rawglassstation.mapper.RawGlassStorageStationMapper; import com.mes.rawglassstation.service.RawGlassStorageStationService; import com.mes.rawglasstask.entity.RawGlassStorageTask; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -43,10 +44,16 @@ return this.save(rw); } @Override public List<RawGlassStorageTask> listRawGlassDetails() { @Override public List<RawGlassStorageDetails> listRawGlassDetails() { return baseMapper.listRawGlassDetails(); } @Override public boolean updateSlotState(Integer slot, Integer enableState) { return update( new LambdaUpdateWrapper<RawGlassStorageStation>() .set(RawGlassStorageStation::getEnableState, enableState) .eq(RawGlassStorageStation::getSlot, slot)); } }
