From 2f0370645ddd5cabfecd77238f6e38c05cd6a466 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 19 九月 2024 08:06:29 +0800
Subject: [PATCH] liquibase使用说明：1、changeset zsh:20240904003 设置创建者及序号id（唯一不能重复） preconditions onFail:CONTINUE onError:CONTINUE 设置异常错误规则 precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM sys_dict_type 设置sql执行的前置条件，符合执行，不符合直接结束 2、建表sql判断表是否存在需要在表名的基础上加库限制：SELECT count(1) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'raw_glass_storage_station' and table_schema = 'hangzhoumes'; 防止因为同一连接其他库已有该表造成无法创建表或者重复建表的情况发生。
---
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java
index 73cc34b..0efdd00 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java
@@ -33,13 +33,7 @@
log.info("绛夊緟涓殑鐜荤拑淇℃伅{}",glass);
return Result.build(200, "", glass);
}
-// @ApiOperation("鏌ヨ杩涚倝涓殑閽㈠寲绛夌墖涓殑鐗堝浘淇℃伅,鐘舵�佸叏涓�1鐨勪负宸插埌銆�")
-// @GetMapping("/selectIntoGlass") // 鏌ヨ杩涚倝涓殑閽㈠寲绛夌墖涓殑鐗堝浘淇℃伅,鐘舵�佸叏涓�1鐨勪负宸插埌銆�
-// public Result <List<TemperingGlassInfo>> selectIntoGlass() {
-// List<TemperingGlassInfo> glass = temperingAgoService.selectIntoGlass();
-// log.info("杩涚倝涓殑鐜荤拑鐗堝浘淇℃伅{}",glass);
-// return Result.build(200, "", glass);
-// }
+
@ApiOperation("//閽㈠寲鍚庢樉绀哄嚭鐐夌殑鐗堝浘淇℃伅銆�")
@GetMapping("/selectOutGlass") //閽㈠寲鍚庢樉绀哄嚭鐐夌殑鐗堝浘淇℃伅
public Result <List<TemperingGlassInfo>> selectOutGlass() {
@@ -48,15 +42,16 @@
return Result.build(200, "", glass);
}
- @ApiOperation("//閽㈠寲鐮存崯")
+ @ApiOperation("//閽㈠寲鐮存崯鎷胯蛋鏀惧洖")
@PostMapping("/updateTemperingState") //閽㈠寲鍚庢樉绀哄嚭鐐夌殑鐗堝浘淇℃伅
public Result <Integer> updateTemperingState(@RequestBody Damage damage) {
- damageService.insertDamage(damage);
- TemperingGlassInfo temperingGlassInfo=new TemperingGlassInfo();
- if(damage.getStatus()==2){
- temperingGlassInfo.setState(5);
-
+ if(damage.getStatus()>5) {
+ damage.setType(damage.getStatus());
+ damage.setStatus(1);
+ damageService.insertDamage(damage);
}
+ TemperingGlassInfo temperingGlassInfo=new TemperingGlassInfo();
+ temperingGlassInfo.setState(damage.getType());
temperingGlassInfo.setGlassId(damage.getGlassId());
int result=temperingGlassInfoService.updateTemperingState(temperingGlassInfo);
return Result.build(200, "鐮存崯鎴愬姛", result);
--
Gitblit v1.8.0