DeXun/l2
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复常数对齐

Browse Source
This commit is contained in:
wangyu
2026-02-06 23:58:48 +08:00
parent a718557762
commit bcea5255e6
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
business/src/main/java/com/fizz/business/domain/s7/DB35501Data.java
View File

@@ -1,6 +1,6 @@
package com.fizz.business.domain.s7; package com.fizz.business.domain.s7;
import com.github.xingshuangs.iot.protocol.s7.enums.EDataType; import com.github.xingshuangs.iot.common.enums.EDataType;
import com.github.xingshuangs.iot.protocol.s7.serializer.S7Variable; import com.github.xingshuangs.iot.protocol.s7.serializer.S7Variable;
import lombok.Data; import lombok.Data;
@@ -9,22 +9,22 @@ public class DB35501Data {
@S7Variable(address = "DB35501.0", type = EDataType.STRING, count = 20) @S7Variable(address = "DB35501.0", type = EDataType.STRING, count = 20)
private String coilId; private String coilId;
@S7Variable(address = "DB35501.30", type = EDataType.REAL) @S7Variable(address = "DB35501.30", type = EDataType.FLOAT32)
private float entryCoilWeight; private float entryCoilWeight;
@S7Variable(address = "DB35501.34", type = EDataType.REAL) @S7Variable(address = "DB35501.34", type = EDataType.FLOAT32)
private float entryCoilLength; private float entryCoilLength;
@S7Variable(address = "DB35501.38", type = EDataType.REAL) @S7Variable(address = "DB35501.38", type = EDataType.FLOAT32)
private float entryCoilWidth; private float entryCoilWidth;
@S7Variable(address = "DB35501.42", type = EDataType.REAL) @S7Variable(address = "DB35501.42", type = EDataType.FLOAT32)
private float entryCoilThick; private float entryCoilThick;
@S7Variable(address = "DB35501.46", type = EDataType.REAL) @S7Variable(address = "DB35501.46", type = EDataType.FLOAT32)
private float entryCoilInnerDia; private float entryCoilInnerDia;
@S7Variable(address = "DB35501.50", type = EDataType.REAL) @S7Variable(address = "DB35501.50", type = EDataType.FLOAT32)
private float entryCoilOuterDia; private float entryCoilOuterDia;
@S7Variable(address = "DB35501.54", type = EDataType.BYTE) @S7Variable(address = "DB35501.54", type = EDataType.BYTE)

22
business/src/main/java/com/fizz/business/domain/s7/DB35502Data.java
View File

@@ -1,39 +1,39 @@
package com.fizz.business.domain.s7; package com.fizz.business.domain.s7;
import com.github.xingshuangs.iot.protocol.s7.enums.EDataType; import com.github.xingshuangs.iot.common.enums.EDataType;
import com.github.xingshuangs.iot.protocol.s7.serializer.S7Variable; import com.github.xingshuangs.iot.protocol.s7.serializer.S7Variable;
import lombok.Data; import lombok.Data;
@Data @Data
public class DB35502Data { public class DB35502Data {
@S7Variable(address = "DB35502.114", type = EDataType.REAL) @S7Variable(address = "DB35502.114", type = EDataType.FLOAT32)
private float tensionPor1Next; private float tensionPor1Next;
@S7Variable(address = "DB35502.122", type = EDataType.REAL) @S7Variable(address = "DB35502.122", type = EDataType.FLOAT32)
private float tensionPor2Next; private float tensionPor2Next;
@S7Variable(address = "DB35502.130", type = EDataType.REAL) @S7Variable(address = "DB35502.130", type = EDataType.FLOAT32)
private float tensionEnLpNext; private float tensionEnLpNext;
@S7Variable(address = "DB35502.138", type = EDataType.REAL) @S7Variable(address = "DB35502.138", type = EDataType.FLOAT32)
private float tensionCleaningNext; private float tensionCleaningNext;
@S7Variable(address = "DB35502.162", type = EDataType.REAL) @S7Variable(address = "DB35502.162", type = EDataType.FLOAT32)
private float tensionGalvanizingCoolNext; private float tensionGalvanizingCoolNext;
@S7Variable(address = "DB35502.266", type = EDataType.REAL) @S7Variable(address = "DB35502.266", type = EDataType.FLOAT32)
private float tensionExLpNext; private float tensionExLpNext;
@S7Variable(address = "DB35502.232", type = EDataType.REAL) @S7Variable(address = "DB35502.232", type = EDataType.FLOAT32)
private float tensionTlNext; private float tensionTlNext;
@S7Variable(address = "DB35502.198", type = EDataType.REAL) @S7Variable(address = "DB35502.198", type = EDataType.FLOAT32)
private float tensionTmExitNext; private float tensionTmExitNext;
@S7Variable(address = "DB35502.146", type = EDataType.REAL) @S7Variable(address = "DB35502.146", type = EDataType.FLOAT32)
private float tensionFuranceNext; private float tensionFuranceNext;
@S7Variable(address = "DB35502.274", type = EDataType.REAL) @S7Variable(address = "DB35502.274", type = EDataType.FLOAT32)
private float tensionTrNext; private float tensionTrNext;
} }

2
business/src/main/java/com/fizz/business/service/strip/SegmentTrackerService.java
View File

@@ -545,7 +545,7 @@ public class SegmentTrackerService {
} catch (Exception e) { } catch (Exception e) {
log.error("S7下发异常: {}", e.getMessage(), e); log.error("S7下发异常: {}", e.getMessage(), e);
logDataService.logError("MATMAP-TRACK", "ONLINE S7下发失败, coilId=" + coilId + ", err=" + e.getMessage()); logDataService.logInfo("MATMAP-TRACK", "ONLINE S7下发失败, coilId=" + coilId + ", err=" + e.getMessage());
} }
} }