请升级您的浏览器

commit c158e11633fc41207c72b0d2553ce4dc1a17d62f Author: Joshi <3040996759@qq.com> Date: Sat Dec 20 10:13:31 2025 +0800 重新初始化l2项目并推送 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ed8368a --- /dev/null +++ b/.gitignore @@ -0,0 +1,47 @@ +###################################################################### +# Build Tools + +.gradle +/build/ +!gradle/wrapper/gradle-wrapper.jar + +target/ +!.mvn/wrapper/maven-wrapper.jar + +###################################################################### +# IDE + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### JRebel ### +rebel.xml + +### NetBeans ### +nbproject/private/ +build/* +nbbuild/ +dist/ +nbdist/ +.nb-gradle/ + +###################################################################### +# Others +*.log +*.xml.versionsBackup +*.swp + +!*/build/*.java +!*/build/*.html +!*/build/*.xml diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..8564f29 --- /dev/null +++ b/LICENSE @@ -0,0 +1,20 @@ +The MIT License (MIT) + +Copyright (c) 2018 RuoYi + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..4bd1db9 --- /dev/null +++ b/README.md @@ -0,0 +1,6 @@ + + +## 平台简介 + +过程控制平台 + diff --git a/bin/clean.bat b/bin/clean.bat new file mode 100644 index 0000000..24c0974 --- /dev/null +++ b/bin/clean.bat @@ -0,0 +1,12 @@ +@echo off +echo. +echo [��Ϣ] ��target��·�� +echo. + +%~d0 +cd %~dp0 + +cd .. +call mvn clean + +pause \ No newline at end of file diff --git a/bin/package.bat b/bin/package.bat new file mode 100644 index 0000000..c693ec0 --- /dev/null +++ b/bin/package.bat @@ -0,0 +1,12 @@ +@echo off +echo. +echo [��Ϣ] ��Web��̣��war/jar��ļ�� +echo. + +%~d0 +cd %~dp0 + +cd .. +call mvn clean package -Dmaven.test.skip=true + +pause \ No newline at end of file diff --git a/bin/run.bat b/bin/run.bat new file mode 100644 index 0000000..41efbd0 --- /dev/null +++ b/bin/run.bat @@ -0,0 +1,14 @@ +@echo off +echo. +echo [��Ϣ] ʹ��Jar��Web��̡� +echo. + +cd %~dp0 +cd ../ruoyi-admin/target + +set JAVA_OPTS=-Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m + +java -jar %JAVA_OPTS% ruoyi-admin.jar + +cd bin +pause \ No newline at end of file diff --git a/business/pom.xml b/business/pom.xml new file mode 100644 index 0000000..d3d546f --- /dev/null +++ b/business/pom.xml @@ -0,0 +1,127 @@ + + + + ruoyi + com.ruoyi + 3.8.8 + + 4.0.0 + + business + + + 业务模块 + + + + + + + com.ruoyi + ruoyi-common + + + + + + + + + + + + + + + + + + + + + + + com.ruoyi + ruoyi-framework + + + + + + + + + + + org.springframework.boot + spring-boot-starter-test + test + + + + junit + junit + test + + + + org.mapstruct + mapstruct + 1.3.1.Final + + + org.mapstruct + mapstruct-processor + 1.3.1.Final + provided + + + + + org.apache.rocketmq + rocketmq-spring-boot-starter + 2.1.1 + + + + org.springframework.boot + spring-boot-starter-amqp + + + + com.alibaba + easyexcel + 3.1.0 + + + poi-ooxml-schemas + org.apache.poi + + + + + + + org.springframework.boot + spring-boot-starter-websocket + + + + + com.kangaroohy + milo-spring-boot-starter + 3.1.4.0.6.15 + + + + + + + + + + + + \ No newline at end of file diff --git a/business/src/main/java/com/fizz/business/anno/MyLog.java b/business/src/main/java/com/fizz/business/anno/MyLog.java new file mode 100644 index 0000000..6355495 --- /dev/null +++ b/business/src/main/java/com/fizz/business/anno/MyLog.java @@ -0,0 +1,27 @@ +package com.fizz.business.anno; + + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * 自定义注解记录系统操作日志 + */ +//Target注解决定 MyLog 注解可以加在哪些成分上，如加在类身上，或者属性身上，或者方法身上等成分 +@Target({ ElementType.PARAMETER, ElementType.METHOD }) +//Retention注解括号中的"RetentionPolicy.RUNTIME"意思是让 MyLog 这个注解的生命周期一直程序运行时都存在 +@Retention(value = RetentionPolicy.RUNTIME) +public @interface MyLog { + /** + * 模块标题 + */ + String title() default ""; + + /** + * 日志内容 + */ + String content() default ""; +} + diff --git a/business/src/main/java/com/fizz/business/anno/OpcMessageHandlerType.java b/business/src/main/java/com/fizz/business/anno/OpcMessageHandlerType.java new file mode 100644 index 0000000..332c9bb --- /dev/null +++ b/business/src/main/java/com/fizz/business/anno/OpcMessageHandlerType.java @@ -0,0 +1,12 @@ +package com.fizz.business.anno; + +import com.fizz.business.constants.enums.OpcMessageType; + +import java.lang.annotation.*; + +@Target(ElementType.TYPE) +@Retention(RetentionPolicy.RUNTIME) +@Documented +public @interface OpcMessageHandlerType { + OpcMessageType value(); +} \ No newline at end of file diff --git a/business/src/main/java/com/fizz/business/aop/OperLogAspect.java b/business/src/main/java/com/fizz/business/aop/OperLogAspect.java new file mode 100644 index 0000000..5bf09a6 --- /dev/null +++ b/business/src/main/java/com/fizz/business/aop/OperLogAspect.java @@ -0,0 +1,245 @@ +package com.fizz.business.aop; + +import com.alibaba.fastjson2.JSON; +import com.fizz.business.anno.MyLog; +import com.fizz.business.domain.LogData; +import com.fizz.business.service.LogDataService; +import org.aspectj.lang.JoinPoint; +import org.aspectj.lang.annotation.*; +import org.aspectj.lang.reflect.MethodSignature; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import org.springframework.web.context.request.RequestAttributes; +import org.springframework.web.context.request.RequestContextHolder; + +import javax.servlet.http.HttpServletRequest; +import java.lang.reflect.Method; +import java.time.LocalDateTime; +import java.util.HashMap; +import java.util.Map; + +@Aspect +@Component +public class OperLogAspect { + @Autowired + private LogDataService operLogService; + //为了记录方法的执行时间 + ThreadLocal startTime = new ThreadLocal<>(); + /** + * 设置操作日志切入点，这里介绍两种方式： + * 1、基于注解切入（也就是打了自定义注解的方法才会切入） + * @Pointcut("@annotation(org.wujiangbo.annotation.MyLog)") + * 2、基于包扫描切入 + * @Pointcut("execution(public * org.wujiangbo.controller..*.*(..))") + */ + @Pointcut("@annotation(com.fizz.business.anno.MyLog)")//在注解的位置切入代码 + //@Pointcut("execution(public * org.wujiangbo.controller..*.*(..))")//从controller切入 + public void operLogPoinCut() { + } + @Before("operLogPoinCut()") + public void beforMethod(JoinPoint point){ + startTime.set(System.currentTimeMillis()); + } + /** + * 设置操作异常切入点记录异常日志扫描所有controller包下操作 + */ + @Pointcut("execution(* com.fizz.business.controller..*.*(..))") + public void operExceptionLogPoinCut() { + } + /** + * 正常返回通知，拦截用户操作日志，连接点正常执行完成后执行，如果连接点抛出异常，则不会执行 + * + * @param joinPoint 切入点 + * @param result 返回结果 + */ + @AfterReturning(value = "operLogPoinCut()", returning = "result") + public void saveOperLog(JoinPoint joinPoint, Object result) { + // 获取RequestAttributes + RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes(); + // 从获取RequestAttributes中获取HttpServletRequest的信息 + HttpServletRequest request = (HttpServletRequest) requestAttributes.resolveReference(RequestAttributes.REFERENCE_REQUEST); + try { + // 从切面织入点处通过反射机制获取织入点处的方法 + MethodSignature signature = (MethodSignature) joinPoint.getSignature(); + // 获取切入点所在的方法 + Method method = signature.getMethod(); + // 获取操作 + MyLog myLog = method.getAnnotation(MyLog.class); + LogData logData = new LogData(); + if (myLog != null) { + logData.setModule(myLog.title());//设置模块名称 + logData.setLogtext(myLog.content());//设置日志内容 + } + // 将入参转换成json + String params = argsArrayToString(joinPoint.getArgs()); + // 获取请求的类名 + String className = joinPoint.getTarget().getClass().getName(); + // 获取请求的方法名 + String methodName = method.getName(); + methodName = className + "." + methodName + "()"; + + logData.setTimestamp(LocalDateTime.now()); + logData.setLogtype("INFORMATION"); + logData.setStatus(0); + logData.setConfirmTime(LocalDateTime.now()); + +// operlog.setMethod(methodName); //设置请求方法 +// operlog.setRequestMethod(request.getMethod());//设置请求方式 +// operlog.setRequestParam(params); // 请求参数 +// operlog.setResponseResult(JSON.toJSONString(result)); // 返回结果 +// operlog.setOperName("张三"); // 获取用户名（真实环境中，肯定有工具类获取当前登录者的账号或ID的，或者从token中解析而来） +// operlog.setIp(getIp(request)); // IP地址 +// operlog.setIpLocation("湖北武汉"); // IP归属地（真是环境中可以调用第三方API根据IP地址，查询归属地） +// operlog.setRequestUrl(request.getRequestURI()); // 请求URI +// operlog.setOperTime(new Date()); // 时间 +// operlog.setStatus(0);//操作状态（0正常 1异常） +// Long takeTime = System.currentTimeMillis() - startTime.get();//记录方法执行耗时时间（单位：毫秒） +// operlog.setTakeTime(takeTime); + //插入数据库 + operLogService.save(logData); + } catch (Exception e) { + e.printStackTrace(); + } + } + /** + * 异常返回通知，用于拦截异常日志信息连接点抛出异常后执行 + */ + @AfterThrowing(pointcut = "operExceptionLogPoinCut()", throwing = "e") + public void saveExceptionLog(JoinPoint joinPoint, Throwable e) { + // 获取RequestAttributes +// RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes(); +// // 从获取RequestAttributes中获取HttpServletRequest的信息 +// HttpServletRequest request = (HttpServletRequest) requestAttributes.resolveReference(RequestAttributes.REFERENCE_REQUEST); +// LogData logData = new LogData(); +// try { +// // 从切面织入点处通过反射机制获取织入点处的方法 +// MethodSignature signature = (MethodSignature) joinPoint.getSignature(); +// // 获取切入点所在的方法 +// Method method = signature.getMethod(); +// // 获取请求的类名 +// String className = joinPoint.getTarget().getClass().getName(); +// // 获取请求的方法名 +// String methodName = method.getName(); +// methodName = className + "." + methodName + "()"; +// // 获取操作 +// MyLog myLog = method.getAnnotation(MyLog.class); +// if (myLog != null) { +// logData.setModule(myLog.title());//设置模块名称 +// logData.setLogtext(myLog.content());//设置日志内容 +// } +// // 将入参转换成json +// String params = argsArrayToString(joinPoint.getArgs()); +// operlog.setMethod(methodName); //设置请求方法 +// operlog.setRequestMethod(request.getMethod());//设置请求方式 +// operlog.setRequestParam(params); // 请求参数 +// operlog.setOperName("张三"); // 获取用户名（真实环境中，肯定有工具类获取当前登录者的账号或ID的，或者从token中解析而来） +// operlog.setIp(getIp(request)); // IP地址 +// operlog.setIpLocation("湖北武汉"); // IP归属地（真是环境中可以调用第三方API根据IP地址，查询归属地） +// operlog.setRequestUrl(request.getRequestURI()); // 请求URI +// operlog.setOperTime(new Date()); // 时间 +// operlog.setStatus(1);//操作状态（0正常 1异常） +// operlog.setErrorMsg(stackTraceToString(e.getClass().getName(), e.getMessage(), e.getStackTrace()));//记录异常信息 +// //插入数据库 +// operLogService.insert(operlog); +// } catch (Exception e2) { +// e2.printStackTrace(); +// } + } + /** + * 转换异常信息为字符串 + */ + public String stackTraceToString(String exceptionName, String exceptionMessage, StackTraceElement[] elements) { + StringBuffer strbuff = new StringBuffer(); + for (StackTraceElement stet : elements) { + strbuff.append(stet + "\n"); + } + String message = exceptionName + ":" + exceptionMessage + "\n\t" + strbuff.toString(); + message = substring(message,0 ,2000); + return message; + } + /** + * 参数拼装 + */ + private String argsArrayToString(Object[] paramsArray) + { + String params = ""; + if (paramsArray != null && paramsArray.length > 0) + { + for (Object o : paramsArray) + { + if (o != null) + { + try + { + Object jsonObj = JSON.toJSON(o); + params += jsonObj.toString() + " "; + } + catch (Exception e) + { + e.printStackTrace(); + } + } + } + } + return params.trim(); + } + //字符串截取 + public static String substring(String str, int start, int end) { + if (str == null) { + return null; + } else { + if (end < 0) { + end += str.length(); + } + if (start < 0) { + start += str.length(); + } + if (end > str.length()) { + end = str.length(); + } + if (start > end) { + return ""; + } else { + if (start < 0) { + start = 0; + } + if (end < 0) { + end = 0; + } + return str.substring(start, end); + } + } + } + /** + * 转换request 请求参数 + * @param paramMap request获取的参数数组 + */ + public Map converMap(Map paramMap) { + Map returnMap = new HashMap<>(); + for (String key : paramMap.keySet()) { + returnMap.put(key, paramMap.get(key)[0]); + } + return returnMap; + } + + //根据HttpServletRequest获取访问者的IP地址 + public static String getIp(HttpServletRequest request) { + String ip = request.getHeader("x-forwarded-for"); + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { + ip = request.getHeader("Proxy-Client-IP"); + } + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { + ip = request.getHeader("WL-Proxy-Client-IP"); + } + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { + ip = request.getHeader("HTTP_CLIENT_IP"); + } + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { + ip = request.getHeader("HTTP_X_FORWARDED_FOR"); + } + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { + ip = request.getRemoteAddr(); + } + return ip; + } +} diff --git a/business/src/main/java/com/fizz/business/comm/OPC/MessageReceiveSchedule.java b/business/src/main/java/com/fizz/business/comm/OPC/MessageReceiveSchedule.java new file mode 100644 index 0000000..0fddfe1 --- /dev/null +++ b/business/src/main/java/com/fizz/business/comm/OPC/MessageReceiveSchedule.java @@ -0,0 +1,89 @@ +package com.fizz.business.comm.OPC; + +import com.fizz.business.constants.enums.ExitCutTypeEnum; +import com.fizz.business.constants.enums.OpcMessageType; +import com.fizz.business.domain.msg.*; +import com.fizz.business.scheduled.BaseSchedule; +import com.fizz.business.service.hanle.OpcReceiverHandler; +import com.kangaroohy.milo.model.ReadWriteEntity; +import com.kangaroohy.milo.service.MiloService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.beanutils.BeanUtils; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; + +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import static com.fizz.business.service.manager.OpcMessageIdsManager.*; + +@Slf4j +@Component +@AllArgsConstructor +@ConditionalOnProperty(prefix = "kangaroohy.milo", name = "enabled", havingValue = "true") +public class MessageReceiveSchedule extends BaseSchedule { + + @Resource + MiloService miloService; + + @Resource + private OpcReceiverHandler opcReceiverHandler; + @Scheduled(fixedDelay = 1000) + public void L1L2LineMeasure() { + try { + + AppMeasureEntryMessage entry = new AppMeasureEntryMessage(); + writeMessage(entry,entryLineMeasureIds); + + AppMeasureCoatMessage coat = new AppMeasureCoatMessage(); + writeMessage(coat,procLineMeasureIds); + + AppMeasureFurnaceMessage fur = new AppMeasureFurnaceMessage(); + writeMessage(fur,furLineMeasureIds); + + AppMeasureExitMessage exit = new AppMeasureExitMessage(); + writeMessage(exit,exitLineMeasureIds); + + AppMeasureMessage msg = new AppMeasureMessage(); + msg.setAppMeasureEntryMessage(entry); + msg.setAppMeasureCoatMessage(coat); + msg.setAppMeasureFurnaceMessage(fur); + msg.setAppMeasureExitMessage(exit); + opcReceiverHandler.onMessageReceived(OpcMessageType.APP_MEASURE,msg); + + } catch (Exception e) { +// throw new RuntimeException(e); + } + } + + private void writeMessage(OpcMessage msg, Map msgIds) throws Exception { + List ids = new ArrayList<>(msgIds.keySet()); + ids.remove("trigger"); + List nodes = miloService.readFromOpcUa(ids); + nodes.forEach(item->{ + String fieldName = msgIds.get(item.getIdentifier()); + if (fieldName != null) { + try { + Field field = msg.getClass().getDeclaredField(fieldName); + if (field.getType() == ExitCutTypeEnum.class) { + // 使用枚举类的自定义方法 + field.setAccessible(true); + ExitCutTypeEnum enumValue = ExitCutTypeEnum.fromCode((int)item.getValue()); + field.set(msg, enumValue); + } else { + // 其他类型正常处理 + BeanUtils.setProperty(msg, fieldName, item.getValue()); + } + } catch (Exception e) { + log.error("BeanUtils设置属性失败: {}", fieldName, e); + } + } + }); + } +} diff --git a/business/src/main/java/com/fizz/business/comm/OPC/MessageSubscriptionRunner.java b/business/src/main/java/com/fizz/business/comm/OPC/MessageSubscriptionRunner.java new file mode 100644 index 0000000..8571ee0 --- /dev/null +++ b/business/src/main/java/com/fizz/business/comm/OPC/MessageSubscriptionRunner.java @@ -0,0 +1,156 @@ +package com.fizz.business.comm.OPC; + +import com.fizz.business.constants.enums.ExitCutTypeEnum; +import com.fizz.business.constants.enums.OpcMessageType; +import com.fizz.business.domain.msg.*; +import com.fizz.business.service.LogDataService; +import com.fizz.business.service.hanle.OpcReceiverHandler; +import com.kangaroohy.milo.model.ReadWriteEntity; +import com.kangaroohy.milo.service.MiloService; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.beanutils.BeanUtils; +import org.springframework.boot.ApplicationArguments; +import org.springframework.boot.ApplicationRunner; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.lang.reflect.Field; +import java.time.Duration; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.concurrent.atomic.AtomicBoolean; + +import static com.fizz.business.service.manager.OpcMessageIdsManager.*; + +@Component +@Slf4j +@ConditionalOnProperty(prefix = "kangaroohy.milo", name = "enabled", havingValue = "true") +public class MessageSubscriptionRunner implements ApplicationRunner { + + @Resource + private MiloService miloService; + @Resource + private OpcReceiverHandler opcReceiverHandler; + + @Resource + private LogDataService logDataService; + + @Override + public void run(ApplicationArguments args) { + sub(); + } + + private void sub() { + + try { + LocalDateTime localDateTime = LocalDateTime.now(); + AtomicBoolean isFirstRun = new AtomicBoolean(false); + //入口移动，剪切、出口移动、出口称重 + miloService.subscriptionFromOpcUa(msgTriggers, 500,(id, value) -> { + if(!isFirstRun.get()){ + Duration duration = Duration.between(localDateTime, LocalDateTime.now()); + if(duration.getSeconds() > 10){ + isFirstRun.set(true); + }else{ + return; + } + } + String nodeName = id.getNodeId().toString(); + if (nodeName.contains(entryMoveIds.get("trigger"))) { + log.info("接收到Entry Move信号,subscription 点位：{} 订阅到消息：{}", nodeName, value.getValue().toString()); + readEntryMove(); + } else if (nodeName.contains(exitCutIds.get("trigger"))) { + log.info("接收到Exit Cut信号,subscription 点位：{} 订阅到消息：{}", nodeName, value.getValue().toString()); + readExitCut(); + } else if (nodeName.contains(exitMoveIds.get("trigger"))) { + log.info("接收到Exit Move信号,subscription 点位：{} 订阅到消息：{}", nodeName, value.getValue().toString()); + readExitMove(); + } else if (nodeName.contains(exitMeasureIds.get("trigger"))) { + log.info("接收到Weight Measure信号,subscription 点位：{} 订阅到消息：{}", nodeName, value.getValue().toString()); + readExitMeasure(); + } else { + log.info("error ids,subscription 点位：{} 订阅到消息：{}", nodeName, value.getValue().toString()); + } + }); + } catch (Exception e) { + log.error("EntryMove 订阅失败：{0}",e.getMessage()); + } + } + + private void readEntryMove() + { + try { + EntryMovementMessage msg =new EntryMovementMessage(); + writeMessage( msg,entryMoveIds); + log.info("接收入口移动信号：从 {} 移动到 {} ", msg.getMaterialPlaceSource(), msg.getMaterialPlaceDestination()); + logDataService.logInfo("TRACK","接收入口移动信号：从 {} 移动到 {} ", msg.getMaterialPlaceSource(), msg.getMaterialPlaceDestination()); + opcReceiverHandler.onMessageReceived(OpcMessageType.ENTRY_MOVEMENT,msg); + } catch (Exception e) { + } + } + + private void readExitCut() + { + try { + ExitCutMessage msg = new ExitCutMessage(); + writeMessage( msg,exitCutIds); + log.info("接收到出口剪切信号：剪切类型 {}，剪切长度{} ", msg.getCutType().toString(), msg.getCutLength()); + logDataService.logInfo("TRACK","接收到出口剪切信号：剪切类型 {}，剪切长度{} ", msg.getCutType().toString(), msg.getCutLength()); + opcReceiverHandler.onMessageReceived(OpcMessageType.EXIT_CUT,msg); + } catch (Exception e) { + } + } + + private void readExitMove() + { + try { + ExitMovementMessage msg = new ExitMovementMessage(); + writeMessage( msg,exitMoveIds); + log.info("接收出口移动信号：从 {} 移动到 {} ", msg.getExSrc(), msg.getExDesc()); + logDataService.logInfo("TRACK","接收出口移动信号：从 {} 移动到 {} ", msg.getExSrc(), msg.getExDesc()); + opcReceiverHandler.onMessageReceived(OpcMessageType.EXIT_MOVEMENT,msg); + } catch (Exception e) { + } + } + + private void readExitMeasure() + { + try { + ExitMeasureMessage msg = new ExitMeasureMessage(); + writeMessage(msg,exitMeasureIds); + log.info("接收出口称重信号：重量 {} ", msg.getWeight()); + logDataService.logInfo("TRACK","接收出口称重信号：重量 {} ", msg.getWeight()); + opcReceiverHandler.onMessageReceived(OpcMessageType.EXIT_MEASURE,msg); + } catch (Exception e) { + } + } + + private void writeMessage(OpcMessage msg,Map msgIds) throws Exception { + List ids = new ArrayList<>(msgIds.keySet()); + ids.remove("trigger"); + List nodes = miloService.readFromOpcUa(ids); + nodes.forEach(item->{ + String fieldName = msgIds.get(item.getIdentifier()); + if (fieldName != null) { + try { + Field field = msg.getClass().getDeclaredField(fieldName); + if (field.getType() == ExitCutTypeEnum.class) { + // 使用枚举类的自定义方法 + field.setAccessible(true); + ExitCutTypeEnum enumValue = ExitCutTypeEnum.fromCode((int)item.getValue()); + field.set(msg, enumValue); + } else { + // 其他类型正常处理 + BeanUtils.setProperty(msg, fieldName, item.getValue()); + } + } catch (Exception e) { + log.error("BeanUtils设置属性失败: {}", fieldName, e); + } + } + }); + } + +} \ No newline at end of file diff --git a/business/src/main/java/com/fizz/business/comm/OPC/MessageTestSchedule.java b/business/src/main/java/com/fizz/business/comm/OPC/MessageTestSchedule.java new file mode 100644 index 0000000..867ca88 --- /dev/null +++ b/business/src/main/java/com/fizz/business/comm/OPC/MessageTestSchedule.java @@ -0,0 +1,108 @@ +package com.fizz.business.comm.OPC; + +import com.fizz.business.constants.enums.OpcMessageType; +import com.fizz.business.domain.msg.*; +import com.fizz.business.scheduled.BaseSchedule; +import com.fizz.business.service.hanle.OpcReceiverHandler; +import com.kangaroohy.milo.model.ReadWriteEntity; +import com.kangaroohy.milo.service.MiloService; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.util.Random; + +@Slf4j +@Component +@AllArgsConstructor +public class MessageTestSchedule extends BaseSchedule { + + @Resource + private OpcReceiverHandler opcReceiverHandler; + + public static boolean measureStart = false; + public static boolean measureReStart = false; + + public static BigDecimal welderLength1 = BigDecimal.valueOf(0); + public static int payOffReelNumber = 1; + public static BigDecimal celLength = BigDecimal.valueOf(500); + public static BigDecimal maxCelLength = new BigDecimal(5000); + public static BigDecimal welderLength2 = BigDecimal.valueOf(0); + public static BigDecimal welderLength3 = BigDecimal.valueOf(0); + public static BigDecimal welderLength4 = BigDecimal.valueOf(0); + public static BigDecimal cxlLength = BigDecimal.valueOf(1000); + + + @Scheduled(fixedDelay = 1000) + public void L1L2LineMeasure() { + try { + if(measureReStart){ + resetValue(); + measureReStart = false; + measureStart = true; + return; + } + + if(!measureStart) return; + + addValue(); + + Random rand = new Random(); + + AppMeasureMessage appMeasureMessage = new AppMeasureMessage(); + AppMeasureEntryMessage entryMsg = new AppMeasureEntryMessage(); + entryMsg.setStripLocation(welderLength1); + entryMsg.setPayOffReelNumber(payOffReelNumber); + entryMsg.setTensionPorBr1(BigDecimal.valueOf(rand.nextDouble()*100)); + entryMsg.setTensionBr1Br2(BigDecimal.valueOf(rand.nextDouble()*100)); + entryMsg.setTensionBr2Br3(BigDecimal.valueOf(rand.nextDouble()*100)); + entryMsg.setStripSpeed(BigDecimal.valueOf(rand.nextDouble()*300)); + entryMsg.setTensionCel(BigDecimal.valueOf(rand.nextDouble()*100)); + entryMsg.setCelLength(celLength); + entryMsg.setCelCapacity(celLength.divide(maxCelLength)); + + AppMeasureFurnaceMessage furMsg = new AppMeasureFurnaceMessage(); + furMsg.setStripLocation(welderLength2); +// furMsg.setStripSpeed(BigDecimal.valueOf(rand.nextDouble()*100)); + + AppMeasureCoatMessage coatMsg = new AppMeasureCoatMessage(); + coatMsg.setStripLocation(welderLength3); + + AppMeasureExitMessage exitMsg = new AppMeasureExitMessage(); + exitMsg.setStripLocation(welderLength4); + exitMsg.setCxlLength(cxlLength); + exitMsg.setCxlLength(cxlLength.divide(maxCelLength)); + + appMeasureMessage.setAppMeasureEntryMessage(entryMsg); + appMeasureMessage.setAppMeasureFurnaceMessage(furMsg); + appMeasureMessage.setAppMeasureCoatMessage(coatMsg); + appMeasureMessage.setAppMeasureExitMessage(exitMsg); + + log.info("receive"); +// opcReceiverHandler.onMessageReceived(OpcMessageType.APP_MEASURE,appMeasureMessage); + + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + private void resetValue(){ + welderLength1 = BigDecimal.valueOf(0); + payOffReelNumber = 1; + celLength = BigDecimal.valueOf(500); + + welderLength2 = BigDecimal.valueOf(0); + } + + private void addValue(){ + + Random rand = new Random(); + double nextLength = rand.nextDouble()*10; + welderLength1.add(BigDecimal.valueOf(nextLength)); + welderLength2.add(BigDecimal.valueOf(nextLength)); + } +} diff --git a/business/src/main/java/com/fizz/business/comm/OPC/OpcMessageSend.java b/business/src/main/java/com/fizz/business/comm/OPC/OpcMessageSend.java new file mode 100644 index 0000000..c1effdd --- /dev/null +++ b/business/src/main/java/com/fizz/business/comm/OPC/OpcMessageSend.java @@ -0,0 +1,90 @@ +package com.fizz.business.comm.OPC; + +import com.fizz.business.domain.msg.OpcMessage; +import com.fizz.business.domain.msg.PdiSetup; +import com.kangaroohy.milo.model.ReadWriteEntity; +import com.kangaroohy.milo.service.MiloService; +import lombok.extern.log4j.Log4j2; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import static com.fizz.business.service.manager.OpcMessageIdsManager.pdiSetupIds; + +@Service +@Log4j2 +@ConditionalOnProperty(prefix = "kangaroohy.milo", name = "enabled", havingValue = "true") +public class OpcMessageSend { + + @Resource + private MiloService miloService; + + private void sendPdiSetup(PdiSetup pdiSetup) { + try { + List entities = getWriteEntities(pdiSetup, pdiSetupIds); + miloService.writeToOpcUa(entities); + } catch (Exception e) { + log.error("发送设定失败：{0}",e.getMessage()); + } + + } + + /** + * 单独写入当前钢卷号到 OPC + * 使用 pdiSetupIds 中 coilId 对应的节点 + */ + public void sendCoilId(String coilId) { + try { + String coilNode = pdiSetupIds.entrySet().stream() + .filter(e -> "coilId".equals(e.getValue())) + .map(Map.Entry::getKey) + .findFirst() + .orElse(null); + if (coilNode == null) { + log.warn("未找到 coilId 对应的 OPC 节点，写入跳过"); + return; + } + List entities = new ArrayList<>(); + entities.add(ReadWriteEntity.builder() + .identifier(coilNode) + .value(coilId) + .build()); + miloService.writeToOpcUa(entities); + log.info("写入 OPC coilId 成功，node={} value={}", coilNode, coilId); + } catch (Exception e) { + log.error("写入 OPC coilId 失败，coilId={}，原因：{}", coilId, e.getMessage(), e); + } + } + + private List getWriteEntities(OpcMessage msg, Map msgIds) { + List entities = new ArrayList<>(); + for (String key : msgIds.keySet()) { + String fieldName = msgIds.get(key); + Object value = null; + try { + // 获取OpcMessage类中对应字段的Field对象 + Field field = msg.getClass().getDeclaredField(fieldName); + // 设置可访问以处理私有字段 + field.setAccessible(true); + // 获取msg对象中该字段的值 + value = field.get(msg); + } catch (NoSuchFieldException | IllegalAccessException e) { + // 处理字段不存在或访问异常，可记录日志或设置默认值 + e.printStackTrace(); + return new ArrayList<>(); + } + + ReadWriteEntity entity = ReadWriteEntity.builder() + .identifier(key) + .value(value) + .build(); + entities.add(entity); + } + return entities; + } +} diff --git a/business/src/main/java/com/fizz/business/comm/RabbitMQ/RabbitQueueListener.java b/business/src/main/java/com/fizz/business/comm/RabbitMQ/RabbitQueueListener.java new file mode 100644 index 0000000..53a7484 --- /dev/null +++ b/business/src/main/java/com/fizz/business/comm/RabbitMQ/RabbitQueueListener.java @@ -0,0 +1,96 @@ +package com.fizz.business.comm.RabbitMQ; + +import cn.hutool.json.JSONUtil; +import com.fizz.business.constants.CommonConstants; +import com.fizz.business.constants.enums.WsTypeEnum; +import com.fizz.business.service.ModSetupResultService; +import com.fizz.business.service.impl.ModSetupResultServiceImpl; +import com.fizz.business.utils.WebSocketUtil; +import com.fizz.business.vo.ModSetupResultKeyVO; +import com.fizz.business.vo.ModSetupResultVO; +import lombok.extern.log4j.Log4j2; +import org.apache.commons.compress.utils.Lists; +import org.springframework.amqp.rabbit.annotation.RabbitHandler; +import org.springframework.amqp.rabbit.annotation.RabbitListener; +import org.springframework.messaging.handler.annotation.Headers; +import org.springframework.messaging.handler.annotation.Payload; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.util.List; +import java.util.Map; + +@Log4j2 +//@Component +public class RabbitQueueListener { + + public static List measureList = Lists.newArrayList(); + + @Resource + ModSetupResultService modSetupResultService; + + private double LastRolledLength = 0d; + private int LastPassNo = -1; + +// @RabbitListener(queues = CommonConstants.RabbitMQ.RECEIVE_MODEL) +// @RabbitHandler +// public void onHmiMessage(String message) { +// log.info("消费端ProcData: " + message); +// +// //socket +// } + + @RabbitListener(queues = CommonConstants.RabbitMQ.RECEIVE_REAL_TIME) + @RabbitHandler + public void onProcDataMessage(String message) { + log.info("消费端ProcData: " + message); + Double rolledLength = Double.parseDouble( + JSONUtil.parse(message).getByPath("rolledLength").toString() + ); + if(Math.abs(LastRolledLength-rolledLength)<1){ + return; + } + int passNo = Integer.parseInt( + JSONUtil.parse(message).getByPath("passNo").toString() + ); + if(LastPassNo!=passNo) { + measureList = Lists.newArrayList(); + } + measureList.add(message); + LastRolledLength=rolledLength; + LastPassNo = passNo; + //socket + WebSocketUtil.sendMessage(WsTypeEnum.track_measure,message); + } + + + + @RabbitListener(queues = CommonConstants.RabbitMQ.RECEIVE_MODEL) + @RabbitHandler + public void receiveMessage(@Payload String message, @Headers Map headers) { + // 获取 messageId + String messageId = (String) headers.get("amqp_messageId"); + + // 去掉字符串两端的引号 + message = message.replaceAll("^\"|\"$", ""); + // 处理消息逻辑 + if ("TOTAL_PRESET_DONE".equalsIgnoreCase(messageId)) { + + List setup = modSetupResultService.getSetupByCoilid(message); + + ModSetupResultKeyVO modSetupResultKeyVO = new ModSetupResultKeyVO(); + modSetupResultKeyVO.setKey(ModSetupResultServiceImpl.WS_EKY); + modSetupResultKeyVO.setFlag(true); + modSetupResultKeyVO.setLists(setup); + //socket + WebSocketUtil.sendMessage(WsTypeEnum.calc_setup_result,JSONUtil.toJsonStr(modSetupResultKeyVO)); + } else if ("TOTAL_PRESET_FAILED".equalsIgnoreCase(messageId)) { + + ModSetupResultKeyVO modSetupResultKeyVO = new ModSetupResultKeyVO(); + modSetupResultKeyVO.setKey(ModSetupResultServiceImpl.WS_EKY); + modSetupResultKeyVO.setFlag(false); + WebSocketUtil.sendMessage(WsTypeEnum.calc_setup_result,JSONUtil.toJsonStr(modSetupResultKeyVO)); + } + } + +} \ No newline at end of file diff --git a/business/src/main/java/com/fizz/business/config/RabbitConfig.java b/business/src/main/java/com/fizz/business/config/RabbitConfig.java new file mode 100644 index 0000000..04bb97a --- /dev/null +++ b/business/src/main/java/com/fizz/business/config/RabbitConfig.java @@ -0,0 +1,25 @@ +package com.fizz.business.config; + +import com.fizz.business.constants.CommonConstants; +import org.springframework.amqp.core.Queue; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class RabbitConfig { + @Bean + public Queue receiveModelQueue() { + return new Queue(CommonConstants.RabbitMQ.RECEIVE_MODEL, true); + } + + @Bean + public Queue receiveRealTimeQueue() { + return new Queue(CommonConstants.RabbitMQ.RECEIVE_REAL_TIME, true); + } + + @Bean + public Queue sendModelQueue() { + return new Queue(CommonConstants.RabbitMQ.SEND_MODEL, true); + } + +} \ No newline at end of file diff --git a/business/src/main/java/com/fizz/business/config/RedisTemplateConfig.java b/business/src/main/java/com/fizz/business/config/RedisTemplateConfig.java new file mode 100644 index 0000000..62d5854 --- /dev/null +++ b/business/src/main/java/com/fizz/business/config/RedisTemplateConfig.java @@ -0,0 +1,64 @@ +package com.fizz.business.config; + +import cn.hutool.json.JSONObject; + +import com.fizz.business.dto.CoilHeadDTO; +import com.fizz.business.dto.CoilPositionDTO; +import com.fizz.business.dto.MatmapDTO; +import com.fizz.business.dto.SegmentDTO; +import com.ruoyi.framework.config.RedisConfig; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.redis.connection.RedisConnectionFactory; +import org.springframework.data.redis.core.RedisTemplate; + +import java.util.List; + +/** + * 描述: RedisTemplate配置及序列化 + * + * @author daiyue + * @date 2021/3/25 + */ +@Configuration +public class RedisTemplateConfig { + + + @Bean + public RedisTemplate> redisTemplateOfList(RedisConnectionFactory redisConnectionFactory) { + RedisTemplate> redisTemplate = new RedisTemplate<>(); + return RedisConfig.fetchRedisTemplate(redisTemplate, redisConnectionFactory); + } + + + + @Bean + public RedisTemplate redisTemplateOfSegment(RedisConnectionFactory redisConnectionFactory) { + RedisTemplate redisTemplate = new RedisTemplate<>(); + return RedisConfig.fetchRedisTemplate(redisTemplate, redisConnectionFactory); + } + + @Bean + public RedisTemplate redisTemplateOfMatmap(RedisConnectionFactory redisConnectionFactory) { + RedisTemplate redisTemplate = new RedisTemplate<>(); + return RedisConfig.fetchRedisTemplate(redisTemplate, redisConnectionFactory); + } + + @Bean + public RedisTemplate redisTemplateOfHead(RedisConnectionFactory redisConnectionFactory) { + RedisTemplate redisTemplate = new RedisTemplate<>(); + return RedisConfig.fetchRedisTemplate(redisTemplate, redisConnectionFactory); + } + + @Bean + public RedisTemplate redisTemplateOfCoilPos(RedisConnectionFactory redisConnectionFactory) { + RedisTemplate redisTemplate = new RedisTemplate<>(); + return RedisConfig.fetchRedisTemplate(redisTemplate, redisConnectionFactory); + } + + @Bean + public RedisTemplate redisTemplateOfMap(RedisConnectionFactory redisConnectionFactory) { + RedisTemplate redisTemplate = new RedisTemplate<>(); + return RedisConfig.fetchRedisTemplate(redisTemplate, redisConnectionFactory); + } +} \ No newline at end of file diff --git a/business/src/main/java/com/fizz/business/config/WebSocketConfig.java b/business/src/main/java/com/fizz/business/config/WebSocketConfig.java new file mode 100644 index 0000000..87c47c2 --- /dev/null +++ b/business/src/main/java/com/fizz/business/config/WebSocketConfig.java @@ -0,0 +1,26 @@ +package com.fizz.business.config; + +import com.fizz.business.interceptor.TrackWsInterceptor; +import com.fizz.business.service.client.TrackWsHandler; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.socket.config.annotation.EnableWebSocket; +import org.springframework.web.socket.config.annotation.WebSocketConfigurer; +import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry; + +@Configuration +@EnableWebSocket +public class WebSocketConfig implements WebSocketConfigurer { + + @Autowired + TrackWsHandler trackWsHandler; + @Autowired + TrackWsInterceptor trackWsInterceptor; + + @Override + public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) { + registry.addHandler(trackWsHandler, "/websocket") + .addInterceptors(trackWsInterceptor) + .setAllowedOrigins("*"); //允许跨域 + } +} diff --git a/business/src/main/java/com/fizz/business/constants/CommonConstants.java b/business/src/main/java/com/fizz/business/constants/CommonConstants.java new file mode 100644 index 0000000..471da3b --- /dev/null +++ b/business/src/main/java/com/fizz/business/constants/CommonConstants.java @@ -0,0 +1,110 @@ +package com.fizz.business.constants; + +import com.fizz.business.constants.enums.DeviceEnum; + +import static com.fizz.business.constants.enums.DeviceEnum.INS; + +public class CommonConstants { + + public static final double RO = 7.86; //硅钢密度 + public static final int OPERATE_FROM_WEB = 1; + public static final String SYSTEM_MODULE = "CPG"; + + public static class RocketMQ { + + } + + public static class CoilMeasure { + + // ======是否展示track_measure的websocket====== + public static final String SHOW_APP_WEB = "0"; // APP\WEB都展示 + public static final String SHOW_APP = "1"; // APP展示 + public static final String SHOW_WEB = "2"; // WEB展示 + public static final String SHOW_NONE = "3"; // APP\WEB都不展示 + + // 硅钢密度 + public static final double RO = 7.86; + + // 新焊缝判定值 + public static final String NEW_COIL_WD_OFFSET = "NEW_COIL_WD_OFFSET"; + + // 新带头判定值 + public static final String NEW_HEAD_SL_MIN = "NEW_HEAD_SL_MIN"; + // 新带头判定值 + public static final String NEW_HEAD_SL_MAX = "NEW_HEAD_SL_MAX"; + + + //机组运行判定最小速度 + public static final String MIN_PRO_SPEED_LIMIT = "MIN_PRO_SPEED_LIMIT"; + + //卷取机上钢卷号生成最小重量[KG] + public static final String MIN_TR_COIL_WEIGHT = "MIN_TR_COIL_WEIGHT"; + + //最小剪切长度 + public static final String MIN_EXIT_CUT_LENGTH = "MIN_EXIT_CUT_LENGTH"; + + //并卷带头最小距离，机组总长(600)+余量(500) + public static final String MIN_MERGE_POS_LENGTH = "MIN_MERGE_POS_LENGTH"; + + //带钢段 2米为一段 + public static final String SEG_STRIP_LEN = "SEG_STRIP_LEN"; + + //卷取机前一个设备idx + public static final DeviceEnum BEFORE_TR_IDX = INS; + + // 工艺规程点位代码 + public static final String SETUP_POINT_CODE = "SETUP_POINT_CODE"; + // 工艺规程下限代码 + public static final String SETUP_LOWER_CODE = "SETUP_LOWER_CODE"; + // 工艺规程上限代码 + public static final String SETUP_UPPER_CODE = "SETUP_UPPER_CODE"; + + public static final String MAX_UNIT_SPEED = "MAX_UNIT_SPEED"; + } + + public class RabbitMQ { + public static final String RECEIVE_MODEL = "plateform.hmi.queue"; + public static final String RECEIVE_REAL_TIME = "plateform.realtime.queue"; + + public static final String SEND_MODEL = "plateform.modpt.queue"; + + } + + public static class Redis { + public static final String CACHE = SYSTEM_MODULE + ":cache:"; + + + //******************COMMON_CACHE****************** + public static final String COMMON_CACHE = CACHE + "common:"; + public static final String VIRTUAL_PLAN_KEY = COMMON_CACHE + "virtual-plan"; // 虚拟计划 + public static final String ALARM_KEY_PREFIX = COMMON_CACHE + "alarm:"; // 点位报警前缀 + + + //******************COIL_CACHE****************** + public static final String COIL_CACHE = CACHE + "coil:"; + public static final String COIL_POSITION_KEY = COIL_CACHE + "position"; // 带钢当前位置 + public static final String COIL_STRIP_LOCATION_KEY = COIL_CACHE + "strip-location"; // 带钢上一次焊缝位 + public static final String COIL_POR_IDX_KEY = COIL_CACHE + "por-idx"; // 带钢上一次所在开卷机 + public static final String COIL_SEG_NUM_KEY = COIL_CACHE + "seg-num"; // 带钢segment数量 + public static final String COIL_SEG_LIST_KEY = COIL_CACHE + "seg-list"; // segment list + public static final String COIL_HEAD_CUT_LEN_KEY = COIL_CACHE + "head-cut-len:"; // 带钢头部废料剪切长度 + public static final String COIL_MATMAP_LIST_KEY = COIL_CACHE + "matmap-list"; // matmap list + public static final String COIL_HEAD_LIST_KEY = COIL_CACHE + "head-list"; // head list + public static final String COIL_PREV_HEAD_KEY = COIL_CACHE + "prev-head"; // prev head + public static final String COIL_MERGE_HEAD_KEY = COIL_CACHE + "merge-head"; // merge head + public static final String COIL_MERGE_END_POS_KEY = COIL_CACHE + "merge-end-pos"; // 并卷结束位置 + public static final String EXIT_CUT_LAST_END_POS_KEY = COIL_CACHE + "exit-cut-last-end-pos"; // 出口剪切结束位置 + public static final String HEAD_DEFECT_START_POS = COIL_CACHE + "head-defect-start-pos"; // 头部缺陷起始位置 + public static final String TAIL_DEFECT_START_POS = COIL_CACHE + "tail-defect-start-pos"; // 尾部缺陷起始位置 + public static final String COIL_SETUP_KEY = COIL_CACHE + "setup:"; // 带钢工艺规程数据 + + + //******************COUNTER_CACHE****************** + public static final String COUNTER_CACHE = CACHE + "counter:"; + public static final String COUNTER_EXIT_CUT_KEY = COUNTER_CACHE + "exit-cut"; // 出口剪切计数 + public static final String COUNTER_HEAD_CUT_KEY = COUNTER_CACHE + "head-cut"; // 头部剪切计数 + public static final String COUNTER_POR_ONLINE_KEY = COUNTER_CACHE + "por-online"; // 钢卷上线计数 + public static final String COUNTER_POR_PAY_OVER_KEY = COUNTER_CACHE + "por-pay-over"; // 开卷机甩尾计数 + public static final String COUNTER_TR_UNLOAD_KEY = COUNTER_CACHE + "tr-unload"; // 卷取机卸卷计数 + } +} diff --git a/business/src/main/java/com/fizz/business/constants/enums/AlarmStatusEnum.java b/business/src/main/java/com/fizz/business/constants/enums/AlarmStatusEnum.java new file mode 100644 index 0000000..96c3a24 --- /dev/null +++ b/business/src/main/java/com/fizz/business/constants/enums/AlarmStatusEnum.java @@ -0,0 +1,46 @@ +package com.fizz.business.constants.enums; + +import com.baomidou.mybatisplus.annotation.IEnum; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +import lombok.AllArgsConstructor; +import lombok.Getter; + +import java.util.HashMap; +import java.util.Map; + +/** + * 报警状态枚举 + * + * @author chenhao + * @date 2023/04/24 + */ +@Getter +@AllArgsConstructor +public enum AlarmStatusEnum implements IEnum { + INIT("初始化"), + UNCONFIRMED("报警待确认"), + CONFIRM( "报警已确认") + ; + + private final String desc; + + private static final Map MAP = new HashMap<>(16); + + static { + for (AlarmStatusEnum e : AlarmStatusEnum.values()) { + MAP.put(e.getValue(), e); + } + } + + @JsonCreator(mode = JsonCreator.Mode.DELEGATING) + public static AlarmStatusEnum getByValue(String value) { + return MAP.get(value); + } + + @JsonValue + @Override + public String getValue() { + return this.name(); + } +} diff --git a/business/src/main/java/com/fizz/business/constants/enums/CoilMergeStatusEnum.java b/business/src/main/java/com/fizz/business/constants/enums/CoilMergeStatusEnum.java new file mode 100644 index 0000000..24c607a --- /dev/null +++ b/business/src/main/java/com/fizz/business/constants/enums/CoilMergeStatusEnum.java @@ -0,0 +1,45 @@ +package com.fizz.business.constants.enums; + +import com.baomidou.mybatisplus.annotation.IEnum; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +import lombok.AllArgsConstructor; +import lombok.Getter; + +import java.util.HashMap; +import java.util.Map; + +/** + * 并卷状态枚举 + * + * @author chenhao + * @date 2023/04/24 + */ +@Getter +@AllArgsConstructor +public enum CoilMergeStatusEnum implements IEnum { + UNPROCESSED("未处理"), + PROCESSED("已处理"), + ; + + private final String desc; + + private static final Map MAP = new HashMap<>(16); + + static { + for (CoilMergeStatusEnum e : CoilMergeStatusEnum.values()) { + MAP.put(e.getValue(), e); + } + } + + @JsonCreator(mode = JsonCreator.Mode.DELEGATING) + public static CoilMergeStatusEnum getByValue(String value) { + return MAP.get(value); + } + + @JsonValue + @Override + public String getValue() { + return this.name(); + } +} diff --git a/business/src/main/java/com/fizz/business/constants/enums/DeviceEnum.java b/business/src/main/java/com/fizz/business/constants/enums/DeviceEnum.java new file mode 100644 index 0000000..10daef2 --- /dev/null +++ b/business/src/main/java/com/fizz/business/constants/enums/DeviceEnum.java @@ -0,0 +1,102 @@ +package com.fizz.business.constants.enums; + +import lombok.Getter; + +import java.util.*; + +/** + * 细粒度设备枚举 + * - position: 基准位置（单位：m） + * - sectionType: 所属段（入口 / 工艺 / 出口） + * - sourceType: 数据来源（ENTRY/FURNACE/COAT/EXIT） + * - paramFields: 对应AppMeasure*Message中的字段 + */ +@Getter +public enum DeviceEnum { + // === 入口段 === + POR1(0, "1#开卷机", 0.0, SectionType.ENTRY, SourceType.ENTRY, Arrays.asList("tensionPorBr1", "stripSpeed")), + POR2(1, "2#开卷机", 0.0, SectionType.ENTRY, SourceType.ENTRY, Arrays.asList("tensionPorBr2", "stripSpeed")), + WELDER(2, "焊机", 16.433, SectionType.ENTRY, SourceType.ENTRY, Arrays.asList("weldStatus")), + ENL1(3, "入口活套1", 75.42, SectionType.PROCESS, SourceType.ENTRY, Arrays.asList("celLength", "celCapacity", "tensionCel")), + ENL2(4, "入口活套2", 193.94, SectionType.PROCESS, SourceType.ENTRY, Arrays.asList("celLength", "celCapacity", "tensionCel")), + + // === 工艺段 === + CLEAN(5, "清洗段", 291.545, SectionType.PROCESS, SourceType.FURNACE, Arrays.asList("cleaningVoltage", "cleaningCurrent", "alkaliConcentration", "alkaliTemperature")), + FUR1(6, "退火炉-预热段", 354.558, SectionType.PROCESS, SourceType.FURNACE, Arrays.asList("phfExitStripTemp", "potTemperature", "gasConsumption")), + FUR2(7, "退火炉-加热段", 426.568, SectionType.PROCESS, SourceType.FURNACE, Arrays.asList("rtfExitStripTemp", "zincPotPower")), + FUR3(8, "退火炉-冷却段", 457.278, SectionType.PROCESS, SourceType.FURNACE, Arrays.asList("jcsExitStripTemp", "coolingTowerStripTemp")), + FUR4(9, "退火炉-均衡段", 471.885, SectionType.PROCESS, SourceType.FURNACE, Arrays.asList("scsExitStripTemp")), + POT(10, "锌锅", 482.258, SectionType.PROCESS, SourceType.COAT, Arrays.asList("scsExitStripTemp")), + TOWER(11, "冷却塔", 626.67, SectionType.PROCESS, SourceType.COAT, Arrays.asList("scsExitStripTemp")), + TM(12, "光整机", 653.197, SectionType.PROCESS, SourceType.COAT, Arrays.asList("tensionBr5Tm", "stripSpeedTmExit")), + TL(13, "拉矫机", 668.224, SectionType.PROCESS, SourceType.COAT, Arrays.asList("tlElongation", "tensionTlBr7")), + COAT(14, "后处理段", 813.724, SectionType.PROCESS, SourceType.COAT, Arrays.asList( + "avrCoatingWeightTop","stdCoatingWeightTop","maxCoatingWeightTop","minCoatingWeightTop", + "avrCoatingWeightBottom","stdCoatingWeightBottom","maxCoatingWeightBottom","minCoatingWeightBottom", + "airKnifePressure","airKnifeFlow","airKnifeGap","stripSpeedTmExit","tensionBr5Tm", + "tensionTmBr6","tensionBr5Br6","tmMask","tmElongation","rollForceOperator","rollForceDrive", + "motorTorque","bendingForce","antiCrimpingRollMesh","billyRollMesh", + "tensionTlBr7","tensionBr6Br7","tlFlag","tlElongation","levelingUnit1Mesh","levelingUnit2Mesh", + "antiCrossBowUnitMesh","tensionBr7Br8","stripSpeedAfp","stripTempAfp" + )), + + // === 出口段 === + CXL1(15, "出口活套1", 900.561, SectionType.EXIT, SourceType.EXIT, Arrays.asList("cxlLength", "cxlCapacity", "tensionCxl")), + CXL2(16, "出口活套2", 920.561, SectionType.EXIT, SourceType.EXIT, Arrays.asList("cxlLength", "cxlCapacity", "tensionCxl")), + INS(17, "检查站", 940.561, SectionType.EXIT, SourceType.EXIT, Arrays.asList("inspectionStatus")), + TR(18, "卷取机", 962.11, SectionType.EXIT, SourceType.EXIT, Arrays.asList("coilLength", "speedExitSection", "tensionBr9Tr")), + EXC(19, "卸卷小车", 9999999.0, SectionType.EXIT, SourceType.EXIT, Collections.emptyList()), + WEIGHT(20, "称重鞍座", 9999999.0, SectionType.EXIT, SourceType.EXIT, Collections.emptyList()); + + private final int idx; + private final String desc; + private final double basePosition; + private final SectionType sectionType; + private final SourceType sourceType; + private final List paramFields; + + private static final Map NAME_MAP = new HashMap<>(); + + static { + for (DeviceEnum d : values()) NAME_MAP.put(d.name(), d); + } + + DeviceEnum(int idx, String desc, double basePosition, SectionType sectionType, SourceType sourceType, List paramFields) { + this.idx = idx; + this.desc = desc; + this.basePosition = basePosition; + this.sectionType = sectionType; + this.sourceType = sourceType; + this.paramFields = paramFields; + } + + public static DeviceEnum fromName(String name) { + return NAME_MAP.get(name); + } + + public boolean isEntrySection() { + return sectionType == SectionType.ENTRY; + } + + public boolean isProcessSection() { + return sectionType == SectionType.PROCESS; + } + + public boolean isExitSection() { + return sectionType == SectionType.EXIT; + } + + /** + * 段类型：用于区分入口 / 工艺 / 出口 + */ + public enum SectionType { + ENTRY, PROCESS, EXIT + } + + /** + * 来源类型：用于确定从哪个 AppMeasureXXXMessage 中取值 + */ + public enum SourceType { + ENTRY, FURNACE, COAT, EXIT + } +} diff --git a/business/src/main/java/com/fizz/business/constants/enums/ExceptionCodeEnum.java b/business/src/main/java/com/fizz/business/constants/enums/ExceptionCodeEnum.java new file mode 100644 index 0000000..e1401a1 --- /dev/null +++ b/business/src/main/java/com/fizz/business/constants/enums/ExceptionCodeEnum.java @@ -0,0 +1,30 @@ +package com.fizz.business.constants.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * 异常错误码枚举 + */ +@Getter +public enum ExceptionCodeEnum { + // 系统级错误 + SYSTEM_ERROR("SYS_500", "系统错误"), + SERVICE_UNAVAILABLE("SYS_503", "服务不可用"), + + // 业务级错误 + DATA_NOT_FOUND("BIZ_404", "数据不存在"), + DATA_VALIDATION_FAILED("BIZ_400", "数据验证失败"), + UNAUTHORIZED_ACCESS("BIZ_401", "未授权访问"), + + // 默认错误 + ERROR("ERR_500", "未知错误"); + + private final String code; + private final String message; + + ExceptionCodeEnum(String code, String message) { + this.code = code; + this.message = message; + } +} diff --git a/business/src/main/java/com/fizz/business/constants/enums/ExitCutTypeEnum.java b/business/src/main/java/com/fizz/business/constants/enums/ExitCutTypeEnum.java new file mode 100644 index 0000000..8304ea3 --- /dev/null +++ b/business/src/main/java/com/fizz/business/constants/enums/ExitCutTypeEnum.java @@ -0,0 +1,56 @@ +package com.fizz.business.constants.enums; + +import com.baomidou.mybatisplus.annotation.IEnum; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +import lombok.AllArgsConstructor; +import lombok.Getter; + +import java.util.HashMap; +import java.util.Map; + +/** + * + * @author chenhao + * @date 2023/04/24 + */ +@Getter +@AllArgsConstructor +public enum ExitCutTypeEnum implements IEnum{ + WELDER_CUT(0), SPLIT_CUT(1); + + private final Integer code; + + private static final Map MAP = new HashMap<>(5); + + static { + for (ExitCutTypeEnum e : ExitCutTypeEnum.values()) { + MAP.put(e.getValue(), e); + } + } + +// @JsonCreator(mode = JsonCreator.Mode.DELEGATING) +// public static ExitCutTypeEnum getByValue(String value) { +// return MAP.get(value); +// } + +// @JsonValue + @Override + public String getValue() { + return this.name(); + } + + @JsonValue + public Integer getCode() { + return code; + } + @JsonCreator + public static ExitCutTypeEnum fromCode(int code) { + for (ExitCutTypeEnum unit : values()) { + if (unit.getCode() == code) { + return unit; + } + } + return null; + } +} diff --git a/business/src/main/java/com/fizz/business/constants/enums/HalfReturnTypeEnum.java b/business/src/main/java/com/fizz/business/constants/enums/HalfReturnTypeEnum.java new file mode 100644 index 0000000..66ef148 --- /dev/null +++ b/business/src/main/java/com/fizz/business/constants/enums/HalfReturnTypeEnum.java @@ -0,0 +1,45 @@ +package com.fizz.business.constants.enums; + +import com.baomidou.mybatisplus.annotation.IEnum; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +import lombok.AllArgsConstructor; +import lombok.Getter; + +import java.util.HashMap; +import java.util.Map; + +/** + * 回退类型枚举 + * + * @author chenhao + * @date 2023/04/24 + */ +@Getter +@AllArgsConstructor +public enum HalfReturnTypeEnum implements IEnum { + HEAD_COIL("头部卷"), + TAIL_COIL("尾部卷") + ; + + private final String desc; + + private static final Map MAP = new HashMap<>(5); + + static { + for (HalfReturnTypeEnum e : HalfReturnTypeEnum.values()) { + MAP.put(e.getValue(), e); + } + } + + @JsonCreator(mode = JsonCreator.Mode.DELEGATING) + public static HalfReturnTypeEnum getByValue(String value) { + return MAP.get(value); + } + + @JsonValue + @Override + public String getValue() { + return this.name(); + } +} diff --git a/business/src/main/java/com/fizz/business/constants/enums/IOperateMat.java b/business/src/main/java/com/fizz/business/constants/enums/IOperateMat.java new file mode 100644 index 0000000..d335a44 --- /dev/null +++ b/business/src/main/java/com/fizz/business/constants/enums/IOperateMat.java @@ -0,0 +1,15 @@ +package com.fizz.business.constants.enums; + + +import com.fizz.business.form.OperateMatForm; + +/** + * 钢卷操作 + * + * @author chenhao + * @date 2023/8/29 + */ +public interface IOperateMat { + + void operate(T form); +} diff --git a/business/src/main/java/com/fizz/business/constants/enums/L1OperateMatEnum.java b/business/src/main/java/com/fizz/business/constants/enums/L1OperateMatEnum.java new file mode 100644 index 0000000..ab9658a --- /dev/null +++ b/business/src/main/java/com/fizz/business/constants/enums/L1OperateMatEnum.java @@ -0,0 +1,133 @@ +package com.fizz.business.constants.enums; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.annotation.IEnum; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +import com.fizz.business.form.ChangePlanStatusForm; +import com.fizz.business.form.L1OperateMatForm; +import com.fizz.business.service.CrmPdiPlanService; +import com.fizz.business.comm.OPC.OpcMessageSend; +import com.fizz.business.service.client.RedisCacheManager; +import com.fizz.business.service.impl.BeanFactory; +import com.fizz.business.utils.MatmapUtil; +import com.fizz.business.utils.WebSocketUtil; +import com.fizz.business.vo.CrmPdiPlanVO; +import com.google.common.collect.Lists; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.extern.slf4j.Slf4j; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; + + +/** + * 钢卷操作 + * + * @author chenhao + * @date 2023/04/24 + */ +@Slf4j +@Getter +@AllArgsConstructor +public enum L1OperateMatEnum implements IEnum, IOperateMat { + ONLINE("上线") { + @Override + public void operate(L1OperateMatForm form) { + ONLINE.syncPlanStatus(form.getPlanId(),form.getEntryMatId()); + MatmapUtil.setMatmap(form.getPorIdx(), form.getEntryMatId(), form.getPlanId(), form.getPlanNo()); + // 钢卷上线时, 缓存工艺规程 +// BeanFactory.getBean(RedisCacheManager.class).setCoilSetup(form.getPlanId()); + WebSocketUtil.sendSignalMsg(form); + WebSocketUtil.sendMatmapMsg(); + } + }, + UNLOAD("卸卷") { + @Override + public void operate(L1OperateMatForm form) { + // 卷取机卸卷,清除matmap + MatmapUtil.clearMatmap(form.getTrIdx()); + // 移除mergeHead + BeanFactory.getBean(RedisCacheManager.class).removeMergeHead(); + WebSocketUtil.sendSignalMsg(form); + WebSocketUtil.sendMatmapMsg(); + } + }, + + PRODUCING("生产中") { + @Override + public void operate(L1OperateMatForm form) { + + PRODUCING.syncPlanStatus(form.getPlanId(),form.getEntryMatId()); + // L1 指令将计划置为 PRODUCING 时，写入钢卷号到 OPC + if (form.getEntryMatId() != null) { + BeanFactory.getBean(OpcMessageSend.class).sendCoilId(form.getEntryMatId()); + } + + + WebSocketUtil.sendSignalMsg(form); + } + }, + PRODUCT("生产完成") { + @Override + public void operate(L1OperateMatForm form) { + log.error("=================================================================="); + log.error("form.planId={},entryMatId={}", form.getPlanId(), form.getEntryMatId()); + PRODUCT.syncPlanStatus(form.getPlanId(),form.getEntryMatId()); + WebSocketUtil.sendSignalMsg(form); + } + }, + PAY_OVER("甩尾") { + @Override + public void operate(L1OperateMatForm form) { + ArrayList status = Lists.newArrayList(PlanStatusEnum.PRODUCING.name(), PlanStatusEnum.PRODUCT.name()); + CrmPdiPlanService planClient = BeanFactory.getBean(CrmPdiPlanService.class); + CrmPdiPlanVO plan = planClient.getByCoilIdAndOperId(form.getEntryMatId()); + Assert.notNull(plan, "计划[{}]不存在", plan.getId()); + Assert.isTrue(status.contains(plan.getStatus()), "当前状态[{}]不支持甩尾", plan.getStatus()); + MatmapUtil.clearMatmap(form.getPorIdx()); + WebSocketUtil.sendSignalMsg(form); + WebSocketUtil.sendMatmapMsg(); + } + }, + ; + + private final String desc; + + private static final Map MAP = new HashMap<>(16); + + static { + for (L1OperateMatEnum e : L1OperateMatEnum.values()) { + MAP.put(e.getValue(), e); + } + } + + @JsonCreator(mode = JsonCreator.Mode.DELEGATING) + public static L1OperateMatEnum getByValue(String value) { + return MAP.get(value); + } + + @JsonValue + @Override + public String getValue() { + return this.name(); + } + + + /** + * 同步计划状态 + * + * @param planId 计划id + */ + private void syncPlanStatus(String planId, String matId) { + CrmPdiPlanService planClient = BeanFactory.getBean(CrmPdiPlanService.class); + + planClient.changeStatus(ChangePlanStatusForm.builder() + .operation(this.name()) + .id(planId) + .matId(matId) + .build()); + } +} diff --git a/business/src/main/java/com/fizz/business/constants/enums/LimitItemCode.java b/business/src/main/java/com/fizz/business/constants/enums/LimitItemCode.java new file mode 100644 index 0000000..7312104 --- /dev/null +++ b/business/src/main/java/com/fizz/business/constants/enums/LimitItemCode.java @@ -0,0 +1,11 @@ +package com.fizz.business.constants.enums; + +/** + * 参数配置code + * + * @author chenhao + * @date 2023/05/18 + */ +public enum LimitItemCode { + track_ca1_alarm, track_ca_defect, track_ca1_measure, track_ca1_point +} diff --git a/business/src/main/java/com/fizz/business/constants/enums/MqOperateEnum.java b/business/src/main/java/com/fizz/business/constants/enums/MqOperateEnum.java new file mode 100644 index 0000000..0de22f7 --- /dev/null +++ b/business/src/main/java/com/fizz/business/constants/enums/MqOperateEnum.java @@ -0,0 +1,39 @@ +package com.fizz.business.constants.enums; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +import lombok.AllArgsConstructor; +import lombok.Getter; + +import java.util.HashMap; +import java.util.Map; + +/** + * websocket type + * + * @author chenhao + * @date 2023/04/24 + */ +@Getter +@AllArgsConstructor +public enum MqOperateEnum { + ADD, UPDATE, DELETE; + + private static final Map MAP = new HashMap<>(8); + + static { + for (MqOperateEnum e : MqOperateEnum.values()) { + MAP.put(e.getValue(), e); + } + } + + @JsonCreator(mode = JsonCreator.Mode.DELEGATING) + public static MqOperateEnum getByValue(String value) { + return MAP.get(value); + } + + @JsonValue + public String getValue() { + return this.name(); + } +} diff --git a/business/src/main/java/com/fizz/business/constants/enums/NextUnitEnum.java b/business/src/main/java/com/fizz/business/constants/enums/NextUnitEnum.java new file mode 100644 index 0000000..f2541c4 --- /dev/null +++ b/business/src/main/java/com/fizz/business/constants/enums/NextUnitEnum.java @@ -0,0 +1,30 @@ +package com.fizz.business.constants.enums; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum NextUnitEnum { + + + COLD(1,"冷硬卷"), + HOT(2,"退火卷"), + OTHER(3,"其他"); + + + private final int code; + private final String name; + + // 静态方法，通过 code 获取枚举实例 + public static NextUnitEnum fromCode(int code) { + for (NextUnitEnum unit : values()) { + if (unit.getCode() == code) { + return unit; + } + } + return OTHER; + } +} diff --git a/business/src/main/java/com/fizz/business/constants/enums/OpcMessageType.java b/business/src/main/java/com/fizz/business/constants/enums/OpcMessageType.java new file mode 100644 index 0000000..0ee0544 --- /dev/null +++ b/business/src/main/java/com/fizz/business/constants/enums/OpcMessageType.java @@ -0,0 +1,19 @@ +package com.fizz.business.constants.enums; + + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor + +public enum OpcMessageType { + + ENTRY_MOVEMENT("入口移动"), + APP_MEASURE("测量值电文"), + EXIT_CUT("出口剪切"), + EXIT_MOVEMENT("出口移动"), + EXIT_MEASURE("出口测量"); + + private final String type; +} diff --git a/business/src/main/java/com/fizz/business/constants/enums/OperModeEnum.java b/business/src/main/java/com/fizz/business/constants/enums/OperModeEnum.java new file mode 100644 index 0000000..9c40d5e --- /dev/null +++ b/business/src/main/java/com/fizz/business/constants/enums/OperModeEnum.java @@ -0,0 +1,30 @@ +package com.fizz.business.constants.enums; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum OperModeEnum { + + UNKNOWN(0,"未知"), + FORCE(1,"轧制力模式"), + ELONG(2,"延伸率模式"); + + + private final int code; + private final String name; + + // 静态方法，通过 code 获取枚举实例 + public static OperModeEnum fromCode(int code) { + for (OperModeEnum modeEnum : values()) { + if (modeEnum.getCode() == code) { + return modeEnum; + } + } + return UNKNOWN; + } + +} diff --git a/business/src/main/java/com/fizz/business/constants/enums/PlanStatusEnum.java b/business/src/main/java/com/fizz/business/constants/enums/PlanStatusEnum.java new file mode 100644 index 0000000..e59ace9 --- /dev/null +++ b/business/src/main/java/com/fizz/business/constants/enums/PlanStatusEnum.java @@ -0,0 +1,59 @@ +package com.fizz.business.constants.enums; + +import com.baomidou.mybatisplus.annotation.IEnum; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +import lombok.AllArgsConstructor; +import lombok.Getter; + +import java.util.HashMap; +import java.util.Map; + +/** + * 计划状态枚举 + * + * @author chenhao + * @date 2023/04/24 + */ +@Getter +@AllArgsConstructor +public enum PlanStatusEnum implements IEnum { + INVALID("0","无效"), + UNCONFIRMED("1","待确认"), + NEW( "2","新计划"), + READY("3","准备好"), + ONLINE("4","上线"), + PRODUCING("5","生产中"), + PRODUCT("6","生产完成"), + BLOCK("7","封闭"), + REFUSE("8","拒绝"), + DELETED("9","已删除"), + ; + + private final String status; + private final String desc; + + private static final Map STATUS_MAP = new HashMap<>(16); + + static { + for (PlanStatusEnum e : PlanStatusEnum.values()) { + STATUS_MAP.put(e.getValue(), e); + } + } + + // 添加这个方法来解决 fromStatus 调用问题 + public static PlanStatusEnum fromStatus(String status) { + return STATUS_MAP.get(status); + } + + @JsonCreator(mode = JsonCreator.Mode.DELEGATING) + public static PlanStatusEnum getByValue(String value) { + return STATUS_MAP.get(value); + } + + @JsonValue + @Override + public String getValue() { + return this.name(); + } +} diff --git a/business/src/main/java/com/fizz/business/constants/enums/PlanTypeEnum.java b/business/src/main/java/com/fizz/business/constants/enums/PlanTypeEnum.java new file mode 100644 index 0000000..195579a --- /dev/null +++ b/business/src/main/java/com/fizz/business/constants/enums/PlanTypeEnum.java @@ -0,0 +1,46 @@ +package com.fizz.business.constants.enums; + +import com.baomidou.mybatisplus.annotation.IEnum; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +import lombok.AllArgsConstructor; +import lombok.Getter; + +import java.util.HashMap; +import java.util.Map; + +/** + * 计划类型枚举 + * + * @author chenhao + * @date 2023/04/24 + */ +@Getter +@AllArgsConstructor +public enum PlanTypeEnum implements IEnum { + PLAN_MAT("计划卷"), + TEMP_MAT("临时卷"), + BLOCK_MAT("封闭卷") + ; + + private final String desc; + + private static final Map MAP = new HashMap<>(5); + + static { + for (PlanTypeEnum e : PlanTypeEnum.values()) { + MAP.put(e.getValue(), e); + } + } + + @JsonCreator(mode = JsonCreator.Mode.DELEGATING) + public static PlanTypeEnum getByValue(String value) { + return MAP.get(value); + } + + @JsonValue + @Override + public String getValue() { + return this.name(); + } +} diff --git a/business/src/main/java/com/fizz/business/constants/enums/RollerPositionEnum.java b/business/src/main/java/com/fizz/business/constants/enums/RollerPositionEnum.java new file mode 100644 index 0000000..d26561c --- /dev/null +++ b/business/src/main/java/com/fizz/business/constants/enums/RollerPositionEnum.java @@ -0,0 +1,17 @@ +package com.fizz.business.constants.enums; + +import com.baomidou.mybatisplus.annotation.IEnum; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Getter; +@Getter +@AllArgsConstructor +public enum RollerPositionEnum{ + TOP("TOP","上辊"), + BOTTOM("BOTTOM","下辊"); + + + private final String value; + private final String name; + +} diff --git a/business/src/main/java/com/fizz/business/constants/enums/RollerTypeEnum.java b/business/src/main/java/com/fizz/business/constants/enums/RollerTypeEnum.java new file mode 100644 index 0000000..66b1812 --- /dev/null +++ b/business/src/main/java/com/fizz/business/constants/enums/RollerTypeEnum.java @@ -0,0 +1,18 @@ +package com.fizz.business.constants.enums; + +import com.baomidou.mybatisplus.annotation.IEnum; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Getter; +@Getter +@AllArgsConstructor +public enum RollerTypeEnum { + WORK("WORK","工作辊"), + INTERMEDIATE("INTERMEDIATE","中间辊"), + BACKUP("BACKUP","支撑辊"); + + + private final String value; + private final String name; + +} diff --git a/business/src/main/java/com/fizz/business/constants/enums/WebOperateMatEnum.java b/business/src/main/java/com/fizz/business/constants/enums/WebOperateMatEnum.java new file mode 100644 index 0000000..139d270 --- /dev/null +++ b/business/src/main/java/com/fizz/business/constants/enums/WebOperateMatEnum.java @@ -0,0 +1,254 @@ +package com.fizz.business.constants.enums; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.annotation.IEnum; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +import com.fizz.business.domain.HalfReturn; +import com.fizz.business.dto.ExitCoilInfoDTO; +import com.fizz.business.dto.MatmapDTO; +import com.fizz.business.form.ChangePlanStatusForm; +import com.fizz.business.form.WebOperateMatForm; +import com.fizz.business.mapper.HalfReturnMapper; +import com.fizz.business.service.CrmPdiPlanService; +import com.fizz.business.service.PdoExCoilService; +import com.fizz.business.service.TrackService; +import com.fizz.business.service.client.RedisCacheManager; +import com.fizz.business.service.impl.BeanFactory; +import com.fizz.business.utils.ErrorDataException; +import com.fizz.business.utils.MatmapUtil; +import com.fizz.business.utils.WebSocketUtil; +import com.fizz.business.vo.CrmPdiPlanVO; +import com.google.common.collect.Lists; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.extern.slf4j.Slf4j; + +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; + +/** + * 钢卷操作 + * + * @author chenhao + * @date 2023/04/24 + */ +@Getter +@Slf4j +@AllArgsConstructor +public enum WebOperateMatEnum implements IEnum, IOperateMat { + ONLINE("上线") { + @Override + public void operate(WebOperateMatForm form) { + Assert.notNull(form.getPorIdx(), "开卷机编号不能为空"); + // 页面手动上卷时，如果开卷机有卷 + // 需要判断：正常卷不允许上卷；虚拟卷则需要手动更新matmap，segment + MatmapDTO porCoil = MatmapUtil.getMatmap(form.getPorIdx()); + if (MatmapUtil.already(porCoil)) { + + ONLINE.syncPlanStatus(form.getPlanId(), form.getEntryMatId()); + WebSocketUtil.sendSignalMsg(form, true); + // 如果开卷机和焊机的钢卷相同，则将计划状态变更为生产中 + MatmapDTO welderCoil = MatmapUtil.getMatmap(DeviceEnum.WELDER.getIdx()); + if (MatmapUtil.already(welderCoil) && Objects.equals(form.getEntryMatId(), welderCoil.getMatId())) { + form.setOperation(PRODUCING); + BeanFactory.getBean(TrackService.class).webOperateMat(form); + } + } else { + ONLINE.syncPlanStatus(form.getPlanId(), form.getEntryMatId()); + ; + MatmapUtil.setMatmap(form.getPorIdx(), form.getEntryMatId(), form.getPlanId(), form.getPlanNo()); + WebSocketUtil.sendSignalMsg(form); + } + // 钢卷上线时, 缓存工艺规程 +// BeanFactory.getBean(RedisCacheManager.class).setCoilSetup(form.getPlanId()); + WebSocketUtil.sendMatmapMsg(); + } + }, + UNLOAD("卸卷") { + @Override + public void operate(WebOperateMatForm form) { + // 开卷机卸卷,变更计划状态为READY,清除matmap + if (Objects.nonNull(form.getPorIdx())) { + UNLOAD.syncPlanStatus(form.getPlanId(), form.getEntryMatId()); + ; + MatmapUtil.clearMatmap(form.getPorIdx()); + // 删除工艺规程 + BeanFactory.getBean(RedisCacheManager.class).delCoilSetup(form.getEntryMatId()); + WebSocketUtil.sendSignalMsg(form); + WebSocketUtil.sendMatmapMsg(); + } + // 卷取机卸卷,清除matmap + else if (Objects.nonNull(form.getTrIdx())) { + MatmapUtil.clearMatmap(form.getTrIdx()); + // 移除mergeHead + BeanFactory.getBean(RedisCacheManager.class).removeMergeHead(); + WebSocketUtil.sendSignalMsg(form); + WebSocketUtil.sendMatmapMsg(); + } else { + throw new ErrorDataException(ExceptionCodeEnum.DATA_NOT_FOUND, "卸卷开卷机或卷取机编号不能为空"); + } + } + }, + + ALL_RETURN("整卷回退") { + @Override + public void operate(WebOperateMatForm form) { + ALL_RETURN.doReturn(form); + } + }, + HALF_RETURN("半卷回退") { + @Override + public void operate(WebOperateMatForm form) { + HALF_RETURN.doReturn(form); + } + }, + PRODUCING("生产中") { + @Override + public void operate(WebOperateMatForm form) { + PRODUCING.syncPlanStatus(form.getPlanId(), form.getEntryMatId()); + WebSocketUtil.sendSignalMsg(form); + } + }, + PRODUCT("生产完成") { + @Override + public void operate(WebOperateMatForm form) { + PRODUCT.syncPlanStatus(form.getPlanId(), form.getEntryMatId()); + ; + if (Objects.isNull(form.getCoilLength()) || form.getCoilLength() <= 0) { + form.setCoilLength(9999d); + } + PdoExCoilService pdoExCoilService = BeanFactory.getBean(PdoExCoilService.class); + MatmapDTO matmapDTO = new MatmapDTO(); + matmapDTO.setMatId(form.getEntryMatId()); + matmapDTO.setPlanId(form.getPlanId()); + ExitCoilInfoDTO exitCoil = pdoExCoilService.genExitCoilInfo(matmapDTO, ExitCutTypeEnum.WELDER_CUT); + pdoExCoilService.saveExCoil(exitCoil); + // 2023.9.26 手动完成的计划产出不上报给L3，由操作工手动登记产出 +// SendMqUtil.sendCoilOutputMsg(pdoExCoilDTO); + + // 删除工艺规程 + BeanFactory.getBean(RedisCacheManager.class).delCoilSetup(form.getEntryMatId()); + WebSocketUtil.sendSignalMsg(form); + } + }, + BLOCK("卸卷并封闭") { + @Override + public void operate(WebOperateMatForm form) { + BLOCK.syncPlanStatus(form.getPlanId(), form.getEntryMatId()); + ; + MatmapUtil.clearMatmap(form.getPorIdx()); + // 删除工艺规程 + BeanFactory.getBean(RedisCacheManager.class).delCoilSetup(form.getEntryMatId()); + WebSocketUtil.sendSignalMsg(form); + WebSocketUtil.sendMatmapMsg(); + } + }, + PAY_OVER("甩尾") { + @Override + public void operate(WebOperateMatForm form) { + ArrayList status = Lists.newArrayList(PlanStatusEnum.ONLINE.name()); + CrmPdiPlanService planClient = BeanFactory.getBean(CrmPdiPlanService.class); + CrmPdiPlanVO plan = planClient.getByCoilIdAndOperId(form.getEntryMatId()); + if (Objects.nonNull(plan)) { + Assert.isTrue(!status.contains(plan.getStatus()), "当前状态[{}]不支持甩尾", plan.getStatus()); + } + MatmapUtil.clearMatmap(form.getPorIdx()); + WebSocketUtil.sendSignalMsg(form); + WebSocketUtil.sendMatmapMsg(); + } + }, + ; + + private final String desc; + + private static final Map MAP = new HashMap<>(16); + + static { + for (WebOperateMatEnum e : WebOperateMatEnum.values()) { + MAP.put(e.getValue(), e); + } + } + + @JsonCreator(mode = JsonCreator.Mode.DELEGATING) + public static WebOperateMatEnum getByValue(String value) { + return MAP.get(value); + } + + @JsonValue + @Override + public String getValue() { + return this.name(); + } + + /** + * 同步计划状态 + * + * @param planId 计划id + */ + private void syncPlanStatus(String planId, String matId) { + CrmPdiPlanService planClient = BeanFactory.getBean(CrmPdiPlanService.class); + + planClient.changeStatus(ChangePlanStatusForm.builder() + .operation(this.name()) + .id(planId) + .matId(matId) + .build()); + } + + /** + * 通过计划的halfReturnType字段判断当前卷是回退的头部卷还是尾部卷 + * 1. 头部卷: entryMatId=A01 + * 2. 尾部卷: entryMatId=A01-2, returnMatId=A01。（由于计划号+钢卷号唯一，所以回退的尾部卷生成新计划时，将entryMatId设置为A01-2，真实的原料卷号保存在returnMatId中） + * 半卷回退上报产出 + * 1. 头部卷产出时，原料卷号：A01, 产出卷号: A01-1, 分卷标识: true, 尾卷标识: false + * 2. 尾部卷产出时：原料卷号：A01，产出卷号: A01-2, 分卷标识: false, 尾卷标识: true + * + * @param form + */ + private void doReturn(WebOperateMatForm form) { + if (!Lists.newArrayList(HALF_RETURN, ALL_RETURN).contains(form.getOperation())) + return; + + CrmPdiPlanService planClient = BeanFactory.getBean(CrmPdiPlanService.class); + CrmPdiPlanVO plan = planClient.getByCoilIdAndOperId(form.getEntryMatId()); + + String entryMatId = form.getEntryMatId(); + String returnMatId = form.getReturnMatId(); + + if (Objects.equals(form.getOperation(), HALF_RETURN)) { + HalfReturnMapper returnMapper = BeanFactory.getBean(HalfReturnMapper.class); + + // 记录回退尾卷信息 + HalfReturn tailCoil = new HalfReturn(); + tailCoil.setEntryMatId(entryMatId); + tailCoil.setExitMatId(returnMatId); + tailCoil.setPlanNo(plan.getPlanid()); + tailCoil.setExitMatWeight(0d); + tailCoil.setReturnMatWeight(form.getReturnWeight()); + tailCoil.setReturnType(HALF_RETURN.name()); + tailCoil.setReturnRemark(form.getReturnRemark()); + tailCoil.setReturnMatTime(LocalDateTime.now()); + + returnMapper.insert(tailCoil); + } else { + // 整卷回退删除已有产出 + BeanFactory.getBean(PdoExCoilService.class).deleteExistPdo(form.getEntryMatId(), form.getPlanId()); + } + + planClient.changeStatus(ChangePlanStatusForm.builder() + .operation(this.name()) + .id(form.getPlanId()) + .returnMatId(returnMatId) + .returnWeight(form.getReturnWeight()) + .build()); + // 更新matmap，matId置空 + MatmapUtil.clearMatmap(form.getPorIdx()); + WebSocketUtil.sendSignalMsg(form); + WebSocketUtil.sendMatmapMsg(); + } + +} diff --git a/business/src/main/java/com/fizz/business/constants/enums/WsTypeEnum.java b/business/src/main/java/com/fizz/business/constants/enums/WsTypeEnum.java new file mode 100644 index 0000000..51b264a --- /dev/null +++ b/business/src/main/java/com/fizz/business/constants/enums/WsTypeEnum.java @@ -0,0 +1,39 @@ +package com.fizz.business.constants.enums; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +import lombok.AllArgsConstructor; +import lombok.Getter; + +import java.util.HashMap; +import java.util.Map; + +/** + * websocket type + * + * @author chenhao + * @date 2023/04/24 + */ +@Getter +@AllArgsConstructor +public enum WsTypeEnum { + alarm, track_position, track_measure, track_signal, track_matmap,calc_setup_result; + + private static final Map MAP = new HashMap<>(8); + + static { + for (WsTypeEnum e : WsTypeEnum.values()) { + MAP.put(e.getValue(), e); + } + } + + @JsonCreator(mode = JsonCreator.Mode.DELEGATING) + public static WsTypeEnum getByValue(String value) { + return MAP.get(value); + } + + @JsonValue + public String getValue() { + return this.name(); + } +} diff --git a/business/src/main/java/com/fizz/business/controller/CrmPdiPlanController.java b/business/src/main/java/com/fizz/business/controller/CrmPdiPlanController.java new file mode 100644 index 0000000..beb6d60 --- /dev/null +++ b/business/src/main/java/com/fizz/business/controller/CrmPdiPlanController.java @@ -0,0 +1,58 @@ +package com.fizz.business.controller; + +import com.fizz.business.domain.CrmPdiPlan; +import com.fizz.business.form.CalcPdiPlanForm; +import com.fizz.business.form.CrmPdiPlanForm; +import com.fizz.business.form.PlanQueryForm; +import com.fizz.business.service.CrmPdiPlanService; +import com.fizz.business.vo.CrmPdiPlanVO; +import com.fizz.business.vo.PdiPlanSetupInfoVO; +import com.ruoyi.common.annotation.Anonymous; +import com.ruoyi.common.core.domain.R; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +@RestController +@RequestMapping("/api/pdi") +@Tag(name="计划管理") +@Anonymous +public class CrmPdiPlanController { + + @Resource + private CrmPdiPlanService crmPdiPlanService; + + @PostMapping("/add") + @Operation(summary ="新增计划") + public R add(@RequestBody CrmPdiPlan crmPdiPlan) { + return R.ok(crmPdiPlanService.addCrmPdiPlan(crmPdiPlan)); + } + + @GetMapping("/getByCoilId") + @Operation(summary ="新增计划") + public R add(@RequestParam String coilId) { + return R.ok(crmPdiPlanService.getByCoilIdAndOperId(coilId)); + } + + @PutMapping("/update") + @Operation(summary ="修改计划") + public R update(@RequestBody CrmPdiPlan crmPdiPlan) { + return R.ok(crmPdiPlanService.updateCrmPdiPlan(crmPdiPlan)); + } + + @PostMapping("/delete") + @Operation(summary ="计划删除") + public R delete(@RequestBody List coilid) { + return R.ok(crmPdiPlanService.deleteCrmPdiPlan(coilid)); + } + + @PostMapping("/list") + @Operation(summary ="查询计划列表") + public R> list(@RequestBody PlanQueryForm form) { + return R.ok(crmPdiPlanService.listAll(form)); + } + +} diff --git a/business/src/main/java/com/fizz/business/controller/CrmPdoExcoilController.java b/business/src/main/java/com/fizz/business/controller/CrmPdoExcoilController.java new file mode 100644 index 0000000..37ce936 --- /dev/null +++ b/business/src/main/java/com/fizz/business/controller/CrmPdoExcoilController.java @@ -0,0 +1,54 @@ +package com.fizz.business.controller; + +import com.fizz.business.domain.CrmPdoExcoil; +import com.fizz.business.form.CrmPdoExcoilForm; +import com.fizz.business.service.CrmPdoExcoilService; +import com.ruoyi.common.annotation.Anonymous; +import com.ruoyi.common.core.domain.R; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +@RestController +@RequestMapping("/api/pdo") +@Tag(name ="实绩管理") +@Anonymous +public class CrmPdoExcoilController { + + @Resource + private CrmPdoExcoilService crmPdoExcoilService; + + @GetMapping("/get/{excoilid}") + @Operation(summary ="查询实绩") + public R getByExcoilId(@PathVariable String excoilid) { + return R.ok(crmPdoExcoilService.getByExcoilId(excoilid)); + } + + @PostMapping("/add") + @Operation(summary ="新增实绩") + public R add(@RequestBody CrmPdoExcoil crmPdoExcoil) { + return R.ok(crmPdoExcoilService.addCrmPdoExcoil(crmPdoExcoil)); + } + + @PutMapping("/update") + @Operation(summary ="修改") + public R update(@RequestBody CrmPdoExcoil crmPdoExcoil) { + return R.ok(crmPdoExcoilService.updateCrmPdoExcoil(crmPdoExcoil)); + } + + @DeleteMapping("/delete/{excoilid}/{planId}") + @Operation(summary ="删除实绩") + + public R delete(@PathVariable String excoilid, @PathVariable String planId) { + return R.ok(crmPdoExcoilService.deleteCrmPdoExcoil(excoilid, planId)); + } + + @PostMapping("/list") + @Operation(summary ="查询实绩列表") + public R> list(@RequestBody CrmPdoExcoilForm form) { + return R.ok(crmPdoExcoilService.listAll(form)); + } +} diff --git a/business/src/main/java/com/fizz/business/controller/LogDataController.java b/business/src/main/java/com/fizz/business/controller/LogDataController.java new file mode 100644 index 0000000..ac666a0 --- /dev/null +++ b/business/src/main/java/com/fizz/business/controller/LogDataController.java @@ -0,0 +1,38 @@ +package com.fizz.business.controller; + +import com.fizz.business.domain.LogData; +import com.fizz.business.form.LogDataForm; +import com.fizz.business.service.LogDataService; +import com.github.pagehelper.PageInfo; +import com.ruoyi.common.annotation.Anonymous; +import com.ruoyi.common.core.domain.R; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/api/logdata" ) +@Tag(name="日志管理") +@Anonymous +public class LogDataController { + + private final LogDataService logDataService; + + @Operation(summary = "历史记录") + @PostMapping ("/list" ) + public R> getLogDataPage(@RequestBody LogDataForm logDataForm) { + return R.ok(logDataService.pageList(logDataForm)); + } + + @Operation(summary = "报警确认", description = "报警确认") + @PatchMapping("/confirm/{seqid}" ) + //@PreAuthorize("@pms.hasPermission('business_log_data_edit')" ) + public R alarmAck(@PathVariable Integer seqid) { + logDataService.alarmAck(seqid); + return R.ok(); + } +} diff --git a/business/src/main/java/com/fizz/business/controller/MessageTestController.java b/business/src/main/java/com/fizz/business/controller/MessageTestController.java new file mode 100644 index 0000000..4b03c55 --- /dev/null +++ b/business/src/main/java/com/fizz/business/controller/MessageTestController.java @@ -0,0 +1,74 @@ +package com.fizz.business.controller; + +import com.fizz.business.constants.enums.ExitCutTypeEnum; +import com.fizz.business.constants.enums.OpcMessageType; +import com.fizz.business.domain.msg.EntryMovementMessage; +import com.fizz.business.domain.msg.ExitCutMessage; +import com.fizz.business.domain.msg.ExitMeasureMessage; +import com.fizz.business.domain.msg.ExitMovementMessage; +import com.fizz.business.form.ModSetupResultForm; +import com.fizz.business.service.hanle.OpcReceiverHandler; +import com.fizz.business.vo.ModSetupResultVO; +import com.ruoyi.common.annotation.Anonymous; +import com.ruoyi.common.core.domain.R; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +import static com.fizz.business.comm.OPC.MessageTestSchedule.measureReStart; +import static com.fizz.business.comm.OPC.MessageTestSchedule.measureStart; + +@RestController +@RequestMapping("/api/msgtest") +@Tag(name ="通讯测试") +@Anonymous +public class MessageTestController { + + @Resource + private OpcReceiverHandler opcReceiverHandler; + + @PostMapping("/entryMove") + @Operation(summary = "入口移动信号") + public void entryMove(@RequestBody EntryMovementMessage msg) { + opcReceiverHandler.onMessageReceived(OpcMessageType.ENTRY_MOVEMENT,msg); + } + + @PostMapping("/exitCut") + @Operation(summary = "出口剪切信号") + public void exitCut(@RequestBody ExitCutMessage msg) { + opcReceiverHandler.onMessageReceived(OpcMessageType.EXIT_CUT,msg); + } + + @PostMapping("/exitMove") + @Operation(summary = "出口移动信号") + public void exitMove(@RequestBody ExitMovementMessage msg) { + opcReceiverHandler.onMessageReceived(OpcMessageType.EXIT_MOVEMENT,msg); + } + + @PostMapping("/exitMeasure") + @Operation(summary = "出口称重信号") + public void exitMeasure(@RequestBody ExitMeasureMessage msg) { + opcReceiverHandler.onMessageReceived(OpcMessageType.EXIT_MEASURE,msg); + } + + @PostMapping("/lineMeasure/start") + @Operation(summary = "测量信号-开始") + public void lineMeasureStart() { + measureStart = true; + } + + @PostMapping("/lineMeasure/stop") + @Operation(summary = "测量信号-停止") + public void lineMeasureStop() { + measureStart = false; + } + + @PostMapping("/lineMeasure/restart") + @Operation(summary = "测量信号-重置") + public void lineMeasureRestart() { + measureReStart = true; + } +} diff --git a/business/src/main/java/com/fizz/business/controller/ModSetupResultController.java b/business/src/main/java/com/fizz/business/controller/ModSetupResultController.java new file mode 100644 index 0000000..358991b --- /dev/null +++ b/business/src/main/java/com/fizz/business/controller/ModSetupResultController.java @@ -0,0 +1,45 @@ +package com.fizz.business.controller; + +import com.fizz.business.form.CalcPdiPlanForm; +import com.fizz.business.form.ModSetupResultForm; +import com.fizz.business.service.ModSetupResultService; +import com.fizz.business.vo.ModSetupResultVO; +import com.ruoyi.common.annotation.Anonymous; +import com.ruoyi.common.core.domain.R; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +@RestController +@RequestMapping("/api/setup") +@Tag(name ="设定值管理") +@Anonymous +public class ModSetupResultController { + + @Resource + private ModSetupResultService modSetupResultService; + + // 查询所有记录 + @PostMapping("/list") + @Operation(summary = "查询设定值列表") + public R> list(@RequestBody ModSetupResultForm form) { + return R.ok(modSetupResultService.list(form)); + } + + + @PostMapping("/calc") + @Operation(summary ="计算设定值") + public R calcSetup(@RequestBody CalcPdiPlanForm form) { + return R.ok(modSetupResultService.calcSetup(form)); + } + + @GetMapping("/retry") + @Operation(summary ="手动下发设定值") + public R retrySetup(@RequestParam String coilid) { + return R.ok(modSetupResultService.retrySetup(coilid)); + } + +} \ No newline at end of file diff --git a/business/src/main/java/com/fizz/business/controller/PdiSetupController.java b/business/src/main/java/com/fizz/business/controller/PdiSetupController.java new file mode 100644 index 0000000..cf1a008 --- /dev/null +++ b/business/src/main/java/com/fizz/business/controller/PdiSetupController.java @@ -0,0 +1,93 @@ +package com.fizz.business.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.fizz.business.service.IPdiSetupService; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.fizz.business.domain.PdiSetups; +import com.fizz.business.service.IPdiSetupService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 生产计划的参数详情Controller + * + * @author Joshi + * @date 2025-09-25 + */ +@RestController +@RequestMapping("/business/setup") +public class PdiSetupController extends BaseController +{ + @Autowired + private IPdiSetupService pdiSetupService; + + /** + * 查询生产计划的参数详情列表 + */ + @PostMapping("/list") + public TableDataInfo list(@RequestBody PdiSetups pdiSetup) + { + startPage(); + List list = pdiSetupService.selectPdiSetupList(pdiSetup); + return getDataTable(list); + } + + /** + * 导出生产计划的参数详情列表 + */ + @Log(title = "生产计划的参数详情", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, PdiSetups pdiSetup) + { + List list = pdiSetupService.selectPdiSetupList(pdiSetup); + ExcelUtil util = new ExcelUtil(PdiSetups.class); + util.exportExcel(response, list, "生产计划的参数详情数据"); + } + + /** + * 获取生产计划的参数详情详细信息 + */ + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(pdiSetupService.selectPdiSetupByid(id)); + } + + /** + * 新增生产计划的参数详情 + */ + @Log(title = "生产计划的参数详情", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody PdiSetups pdiSetup) + { + return toAjax(pdiSetupService.insertPdiSetup(pdiSetup)); + } + + /** + * 修改生产计划的参数详情 + */ + @Log(title = "生产计划的参数详情", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody PdiSetups pdiSetup) + { + return toAjax(pdiSetupService.updatePdiSetup(pdiSetup)); + } + + /** + * 删除生产计划的参数详情 + */ + @Log(title = "生产计划的参数详情", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(pdiSetupService.deletePdiSetupByids(ids)); + } +} diff --git a/business/src/main/java/com/fizz/business/controller/ProStoppageController.java b/business/src/main/java/com/fizz/business/controller/ProStoppageController.java new file mode 100644 index 0000000..a7b031b --- /dev/null +++ b/business/src/main/java/com/fizz/business/controller/ProStoppageController.java @@ -0,0 +1,54 @@ +package com.fizz.business.controller; + +import com.fizz.business.domain.ProStoppage; +import com.fizz.business.form.ProStoppageForm; +import com.fizz.business.service.ProStoppageService; +import com.ruoyi.common.annotation.Anonymous; +import com.ruoyi.common.core.domain.R; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +@RestController +@RequestMapping("/api/stoppage") +@Tag(name= "停机管理",description = "停机管理") +@Anonymous +public class ProStoppageController { + + @Resource + private ProStoppageService proStoppageService; + +// @PostMapping("/add") +// @ApiOperation("新增停机记录") +// public R add(@RequestBody ProStoppage proStoppage) { +// return R.ok(proStoppageService.addProStoppage(proStoppage)); +// } + + @PutMapping("/update") + @Operation(summary = "修改停机记录") + public R update(@RequestBody ProStoppage proStoppage) { + return R.ok(proStoppageService.updateProStoppage(proStoppage)); + } + + @DeleteMapping("/delete/{stopid}") + @Operation(summary ="删除实绩记录") + public R delete(@PathVariable @Parameter(description="停机记录的唯一标识ID") Long stopid) { + return R.ok(proStoppageService.deleteProStoppage(stopid)); + } + + @PostMapping("/list") + @Operation(summary ="查询实绩记录") + public R> list(@RequestBody ProStoppageForm form) { + return R.ok(proStoppageService.listAll(form)); + } + //计算停机次数停机时长作业率 + @PostMapping("/calc") + @Operation(summary ="计算停机次数停机时长作业率") + public R> calc(@RequestBody ProStoppageForm form) { + return R.ok(proStoppageService.calc(form)); + } +} diff --git a/business/src/main/java/com/fizz/business/controller/ReportController.java b/business/src/main/java/com/fizz/business/controller/ReportController.java new file mode 100644 index 0000000..6747185 --- /dev/null +++ b/business/src/main/java/com/fizz/business/controller/ReportController.java @@ -0,0 +1,52 @@ +package com.fizz.business.controller; + + +import com.fizz.business.service.CrmPdoExcoilService; +import com.fizz.business.vo.ReportDetailVO; +import com.fizz.business.vo.ReportSummaryVO; +import com.ruoyi.common.annotation.Anonymous; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.format.annotation.DateTimeFormat; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.time.LocalDateTime; +import java.util.List; + +@RestController +@RequestMapping("/api/report") +@Tag(name= "报表接口",description = "报表接口") +@Anonymous +public class ReportController { + + @Resource + private CrmPdoExcoilService crmPdoExcoilService; + + @GetMapping("/summary") + @Operation(summary = "生产实绩报表-汇总信息查询") + public ReportSummaryVO getReportSummary( + @RequestParam(required = false) String groupNo, + @RequestParam(required = false) String shiftNo, + @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime startTime, + @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime endTime + ) { + return crmPdoExcoilService.getReportSummary(groupNo, shiftNo, startTime, endTime); + } + + @GetMapping("/details") + @Operation(summary = "生产实绩报表-产出明细查询") + public List getReportDetails( + @RequestParam(required = false) String groupNo, + @RequestParam(required = false) String shiftNo, + @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime startTime, + @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime endTime + ) { + return crmPdoExcoilService.getReportDetails(groupNo, shiftNo, startTime, endTime); + } + + +} diff --git a/business/src/main/java/com/fizz/business/controller/RollerController.java b/business/src/main/java/com/fizz/business/controller/RollerController.java new file mode 100644 index 0000000..2db33f1 --- /dev/null +++ b/business/src/main/java/com/fizz/business/controller/RollerController.java @@ -0,0 +1,87 @@ +package com.fizz.business.controller; + +import cn.hutool.core.util.ObjectUtil; +import com.fizz.business.domain.CrmPdiPlan; +import com.fizz.business.domain.RollData; +import com.fizz.business.domain.RollHistory; +import com.fizz.business.form.RollHistoryForm; +import com.fizz.business.service.RollDataService; +import com.fizz.business.service.RollHistoryService; +import com.fizz.business.vo.OnlineRollDataVO; +import com.fizz.business.vo.ReadyRollDataVO; +import com.github.pagehelper.PageInfo; +import com.ruoyi.common.annotation.Anonymous; +import com.ruoyi.common.core.domain.R; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; +import java.util.Map; + +@RestController +@RequestMapping("/api/roller") +@Tag(name="轧辊管理") +@Anonymous +public class RollerController { + @Resource + RollHistoryService rollHistoryService; + + @Resource + RollDataService rollDataService; + + @GetMapping("/data/standby") + @Operation(summary = "轧辊数据-获取当前备辊信息") + public R> getReadyRollList() { + return R.ok(rollDataService.getAllReadyRollList()); + } + + @GetMapping("/data/ready/{position}/{type}") + @Operation(summary = "轧辊数据-获取离线辊信息") + public R > getOfflineRollList(@PathVariable String position, @PathVariable String type) { + return R.ok(rollDataService.getReadyRollList(position,type,"OFFLINE")); + } + + @GetMapping("/data/online") + @Operation(summary = "轧辊数据-获取在线辊信息") + public R> getOnlineRollList() { + return R.ok(rollDataService.getOnlineRollList()); + } + + @PostMapping("/change/standby") + @Operation(summary = "轧辊操作-备辊") + public R backupRoll(@RequestBody List rollList) { + String msg = rollDataService.BackupRoll(rollList); + if(ObjectUtil.isEmpty(msg)){ + return R.ok("处理成功"); + } + else{ + return R.fail(msg); + } + } + + @PostMapping("/change/online") + @Operation(summary = "轧辊操作-上线") + public R> onlineRoll() { + return R.ok(rollDataService.onlineRoll()); + } + + @GetMapping("/history/changeid") + @Operation(summary = "轧辊历史-获取所有换辊号") + public R> getChangeIdList() { + return R.ok(rollHistoryService.getChangeIdList()); + } + + @GetMapping("/history/rollid") + @Operation(summary = "轧辊历史-获取所有轧辊号") + public R> getRollIdList() { + return R.ok(rollHistoryService.getRollIdList()); + } + + @PostMapping("/history/list") + @Operation(summary = "轧辊历史-获取换辊记录") + public R> getRollHistorytList(@RequestBody RollHistoryForm rollHistoryForm) { + return R.ok(rollHistoryService.getRollHistory(rollHistoryForm)); + } +} diff --git a/business/src/main/java/com/fizz/business/controller/SegmentController.java b/business/src/main/java/com/fizz/business/controller/SegmentController.java new file mode 100644 index 0000000..e56f2f5 --- /dev/null +++ b/business/src/main/java/com/fizz/business/controller/SegmentController.java @@ -0,0 +1,36 @@ +package com.fizz.business.controller; + + +import com.fizz.business.service.impl.SegmentService; +import com.fizz.business.vo.SegmentParamVO; +import com.ruoyi.common.annotation.Anonymous; +import com.ruoyi.common.core.domain.R; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +@Tag(name ="历史曲线查询接口") +@RestController +@RequestMapping("/api/segment") +@Anonymous +public class SegmentController { + + + @Resource + SegmentService segmentService; + + @GetMapping("/getSegmentHistory") + @Operation(summary ="根据钢卷号和参数查询历史曲线") + public R> queryParamByEnCoilId(String enCoilID, String paramField) { + if (enCoilID == null || paramField == null) { + return R.fail("参数不能为空"); + } + return R.ok(segmentService.queryParamByEnCoilId(enCoilID, paramField),"查询历史曲线成功"); + } + +} diff --git a/business/src/main/java/com/fizz/business/controller/SetupFurTempController.java b/business/src/main/java/com/fizz/business/controller/SetupFurTempController.java new file mode 100644 index 0000000..77910a9 --- /dev/null +++ b/business/src/main/java/com/fizz/business/controller/SetupFurTempController.java @@ -0,0 +1,104 @@ +package com.fizz.business.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.fizz.business.domain.SetupFurTemp; +import com.fizz.business.service.ISetupFurTempService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 炉火段工艺参数Controller + * + * @author ruoyi + * @date 2025-09-29 + */ +@RestController +@RequestMapping("/business/fur") +public class SetupFurTempController extends BaseController +{ + @Autowired + private ISetupFurTempService setupFurTempService; + + /** + * 查询炉火段工艺参数列表 + */ + @PreAuthorize("@ss.hasPermi('business:fur:list')") + @GetMapping("/list") + public TableDataInfo list(SetupFurTemp setupFurTemp) + { + startPage(); + List list = setupFurTempService.selectSetupFurTempList(setupFurTemp); + return getDataTable(list); + } + + /** + * 导出炉火段工艺参数列表 + */ + @PreAuthorize("@ss.hasPermi('business:fur:export')") + @Log(title = "炉火段工艺参数", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, SetupFurTemp setupFurTemp) + { + List list = setupFurTempService.selectSetupFurTempList(setupFurTemp); + ExcelUtil util = new ExcelUtil(SetupFurTemp.class); + util.exportExcel(response, list, "炉火段工艺参数数据"); + } + + /** + * 获取炉火段工艺参数详细信息 + */ + @PreAuthorize("@ss.hasPermi('business:fur:query')") + @GetMapping(value = "/{steelGrade}") + public AjaxResult getInfo(@PathVariable("steelGrade") String steelGrade) + { + return success(setupFurTempService.selectSetupFurTempBySteelGrade(steelGrade)); + } + + /** + * 新增炉火段工艺参数 + */ + @PreAuthorize("@ss.hasPermi('business:fur:add')") + @Log(title = "炉火段工艺参数", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody SetupFurTemp setupFurTemp) + { + return toAjax(setupFurTempService.insertSetupFurTemp(setupFurTemp)); + } + + /** + * 修改炉火段工艺参数 + */ + @PreAuthorize("@ss.hasPermi('business:fur:edit')") + @Log(title = "炉火段工艺参数", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody SetupFurTemp setupFurTemp) + { + return toAjax(setupFurTempService.updateSetupFurTemp(setupFurTemp)); + } + + /** + * 删除炉火段工艺参数 + */ + @PreAuthorize("@ss.hasPermi('business:fur:remove')") + @Log(title = "炉火段工艺参数", businessType = BusinessType.DELETE) + @DeleteMapping("/{steelGrades}") + public AjaxResult remove(@PathVariable String[] steelGrades) + { + return toAjax(setupFurTempService.deleteSetupFurTempBySteelGrades(steelGrades)); + } +} diff --git a/business/src/main/java/com/fizz/business/controller/SetupTensionController.java b/business/src/main/java/com/fizz/business/controller/SetupTensionController.java new file mode 100644 index 0000000..f7f1f6a --- /dev/null +++ b/business/src/main/java/com/fizz/business/controller/SetupTensionController.java @@ -0,0 +1,95 @@ +package com.fizz.business.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.fizz.business.form.TensionDeleteForm; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.fizz.business.domain.SetupTension; +import com.fizz.business.service.ISetupTensionService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 全线张力Controller + * + * @author ruoyi + * @date 2025-09-26 + */ +@RestController +@RequestMapping("/business/tension") +public class SetupTensionController extends BaseController +{ + @Autowired + private ISetupTensionService setupTensionService; + + /** + * 查询全线张力列表 + */ + @GetMapping("/list") + public TableDataInfo list(SetupTension setupTension) + { + startPage(); + List list = setupTensionService.selectSetupTensionList(setupTension); + return getDataTable(list); + } + + /** + * 导出全线张力列表 + */ + @Log(title = "全线张力", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, SetupTension setupTension) + { + List list = setupTensionService.selectSetupTensionList(setupTension); + ExcelUtil util = new ExcelUtil(SetupTension.class); + util.exportExcel(response, list, "全线张力数据"); + } + + /** + * 获取全线张力详细信息 + */ + @GetMapping() + public AjaxResult getInfo(@RequestParam(required = false) Long thick ,@RequestParam(required = false) Long yieldStren) + { + return success(setupTensionService.selectSetupTensionByThick(thick, yieldStren)); + } + + /** + * 新增全线张力 + */ + @Log(title = "全线张力", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody SetupTension setupTension) + { + return toAjax(setupTensionService.insertSetupTension(setupTension)); + } + + /** + * 修改全线张力 + */ + @Log(title = "全线张力", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody SetupTension setupTension) + { + return toAjax(setupTensionService.updateSetupTension(setupTension)); + } + + /** + * 删除全线张力 + */ + @Log(title = "全线张力", businessType = BusinessType.DELETE) + @DeleteMapping("/tension") // 建议添加路径区分不同删除接口 + public AjaxResult removeTension(@RequestBody TensionDeleteForm form) { + return toAjax(setupTensionService.deleteSetupTensionByThicks( + form.getThicks(), + form.getYieldStrens() + )); + } +} diff --git a/business/src/main/java/com/fizz/business/controller/SetupTlController.java b/business/src/main/java/com/fizz/business/controller/SetupTlController.java new file mode 100644 index 0000000..711ea5f --- /dev/null +++ b/business/src/main/java/com/fizz/business/controller/SetupTlController.java @@ -0,0 +1,96 @@ +package com.fizz.business.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.fizz.business.form.TlDeleteForm; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.fizz.business.domain.SetupTl; +import com.fizz.business.service.ISetupTlService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 拉矫机参数Controller + * + * @author ruoyi + * @date 2025-09-26 + */ +@RestController +@RequestMapping("/business/tl") +public class SetupTlController extends BaseController +{ + @Autowired + private ISetupTlService setupTlService; + + /** + * 查询拉矫机参数列表 + */ + @GetMapping("/list") + public TableDataInfo list(SetupTl setupTl) + { + startPage(); + List list = setupTlService.selectSetupTlList(setupTl); + return getDataTable(list); + } + + /** + * 导出拉矫机参数列表 + */ + @Log(title = "拉矫机参数", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, SetupTl setupTl) + { + List list = setupTlService.selectSetupTlList(setupTl); + ExcelUtil util = new ExcelUtil(SetupTl.class); + util.exportExcel(response, list, "拉矫机参数数据"); + } + + /** + * 获取拉矫机参数详细信息 + */ + @GetMapping() + public AjaxResult getInfo(@RequestParam String steelGrade, + @RequestParam Long yieldStren, + @RequestParam Long thick) + { + return success(setupTlService.selectSetupTlBySteelGrade(steelGrade, yieldStren, thick)); + } + + /** + * 新增拉矫机参数 + */ + @Log(title = "拉矫机参数", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody SetupTl setupTl) + { + return toAjax(setupTlService.insertSetupTl(setupTl)); + } + + /** + * 修改拉矫机参数 + */ + @Log(title = "拉矫机参数", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody SetupTl setupTl) + { + return toAjax(setupTlService.updateSetupTl(setupTl)); + } + + // 拉矫机参数删除接口 + @Log(title = "拉矫机参数", businessType = BusinessType.DELETE) + @DeleteMapping("/tl") // 不同路径区分 + public AjaxResult removeTl(@RequestBody TlDeleteForm form) { + return toAjax(setupTlService.deleteSetupTlBySteelGrades( + form.getSteelGrades(), + form.getYieldStrens(), + form.getThicks() + )); + } +} diff --git a/business/src/main/java/com/fizz/business/controller/SetupTmBendforceController.java b/business/src/main/java/com/fizz/business/controller/SetupTmBendforceController.java new file mode 100644 index 0000000..d3b4905 --- /dev/null +++ b/business/src/main/java/com/fizz/business/controller/SetupTmBendforceController.java @@ -0,0 +1,96 @@ +package com.fizz.business.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.fizz.business.form.TmBendforceDeleteForm; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.fizz.business.domain.SetupTmBendforce; +import com.fizz.business.service.ISetupTmBendforceService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 光整机弯辊力Controller + * + * @author Joshi + * @date 2025-09-26 + */ +@RestController +@RequestMapping("/business/bendforce") +public class SetupTmBendforceController extends BaseController +{ + @Autowired + private ISetupTmBendforceService setupTmBendforceService; + + /** + * 查询光整机弯辊力列表 + */ + @GetMapping("/list") + public TableDataInfo list(SetupTmBendforce setupTmBendforce) + { + startPage(); + List list = setupTmBendforceService.selectSetupTmBendforceList(setupTmBendforce); + return getDataTable(list); + } + + /** + * 导出光整机弯辊力列表 + */ + @Log(title = "光整机弯辊力", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, SetupTmBendforce setupTmBendforce) + { + List list = setupTmBendforceService.selectSetupTmBendforceList(setupTmBendforce); + ExcelUtil util = new ExcelUtil(SetupTmBendforce.class); + util.exportExcel(response, list, "光整机弯辊力数据"); + } + + /** + * 获取光整机弯辊力详细信息 + */ + @GetMapping() + public AjaxResult getInfo(@RequestParam Long width, + @RequestParam Long rollForce) + { + return success(setupTmBendforceService.selectSetupTmBendforceByWidth(width,rollForce)); + } + + /** + * 新增光整机弯辊力 + */ + @Log(title = "光整机弯辊力", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody SetupTmBendforce setupTmBendforce) + { + return toAjax(setupTmBendforceService.insertSetupTmBendforce(setupTmBendforce)); + } + + /** + * 修改光整机弯辊力 + */ + @Log(title = "光整机弯辊力", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody SetupTmBendforce setupTmBendforce) + { + return toAjax(setupTmBendforceService.updateSetupTmBendforce(setupTmBendforce)); + } + + /** + * 删除光整机弯辊力 + */ + @Log(title = "光整机弯辊力", businessType = BusinessType.DELETE) + @DeleteMapping("/tm/bendforce") + public AjaxResult removeTmBendforce(@RequestBody TmBendforceDeleteForm form) { + return toAjax(setupTmBendforceService.deleteSetupTmBendforceByWidths( + form.getWidths(), + form.getRollForces() + )); + } +} diff --git a/business/src/main/java/com/fizz/business/controller/SetupTmMeshController.java b/business/src/main/java/com/fizz/business/controller/SetupTmMeshController.java new file mode 100644 index 0000000..c9c942e --- /dev/null +++ b/business/src/main/java/com/fizz/business/controller/SetupTmMeshController.java @@ -0,0 +1,98 @@ +package com.fizz.business.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.fizz.business.form.TmMeshDeleteForm; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.fizz.business.domain.SetupTmMesh; +import com.fizz.business.service.ISetupTmMeshService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 光整机插入量Controller + * + * @author Joshi + * @date 2025-09-26 + */ +@RestController +@RequestMapping("/business/mesh") +public class SetupTmMeshController extends BaseController +{ + @Autowired + private ISetupTmMeshService setupTmMeshService; + + /** + * 查询光整机插入量列表 + */ + @GetMapping("/list") + public TableDataInfo list(SetupTmMesh setupTmMesh) + { + startPage(); + List list = setupTmMeshService.selectSetupTmMeshList(setupTmMesh); + return getDataTable(list); + } + + /** + * 导出光整机插入量列表 + */ + @Log(title = "光整机插入量", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, SetupTmMesh setupTmMesh) + { + List list = setupTmMeshService.selectSetupTmMeshList(setupTmMesh); + ExcelUtil util = new ExcelUtil(SetupTmMesh.class); + util.exportExcel(response, list, "光整机插入量数据"); + } + + /** + * 获取光整机插入量详细信息 + */ + @GetMapping() + public AjaxResult getInfo(@RequestParam String steelGrade, + @RequestParam Long yieldStren, + @RequestParam Long thick) + { + return success(setupTmMeshService.selectSetupTmMeshBySteelGrade(steelGrade, yieldStren, thick)); + } + + /** + * 新增光整机插入量 + */ + @Log(title = "光整机插入量", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody SetupTmMesh setupTmMesh) + { + return toAjax(setupTmMeshService.insertSetupTmMesh(setupTmMesh)); + } + + /** + * 修改光整机插入量 + */ + @Log(title = "光整机插入量", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody SetupTmMesh setupTmMesh) + { + return toAjax(setupTmMeshService.updateSetupTmMesh(setupTmMesh)); + } + + /** + * 删除光整机插入量 + */ + @Log(title = "光整机插入量", businessType = BusinessType.DELETE) + @DeleteMapping("/tm/mesh") + public AjaxResult removeTmMesh(@RequestBody TmMeshDeleteForm form) { + return toAjax(setupTmMeshService.deleteSetupTmMeshBySteelGrades( + form.getSteelGrades(), + form.getYieldStrens(), + form.getThicks() + )); + } +} diff --git a/business/src/main/java/com/fizz/business/controller/SetupTmRollforceController.java b/business/src/main/java/com/fizz/business/controller/SetupTmRollforceController.java new file mode 100644 index 0000000..5ea5c48 --- /dev/null +++ b/business/src/main/java/com/fizz/business/controller/SetupTmRollforceController.java @@ -0,0 +1,100 @@ +package com.fizz.business.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.fizz.business.form.TmRollforceDeleteForm; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.fizz.business.domain.SetupTmRollforce; +import com.fizz.business.service.ISetupTmRollforceService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 光整机轧制力Controller + * + * @author Joshi + * @date 2025-09-26 + */ +@RestController +@RequestMapping("/business/rollforce") +public class SetupTmRollforceController extends BaseController +{ + @Autowired + private ISetupTmRollforceService setupTmRollforceService; + + /** + * 查询光整机轧制力列表 + */ + @GetMapping("/list") + public TableDataInfo list(SetupTmRollforce setupTmRollforce) + { + startPage(); + List list = setupTmRollforceService.selectSetupTmRollforceList(setupTmRollforce); + return getDataTable(list); + } + + /** + * 导出光整机轧制力列表 + */ + @Log(title = "光整机轧制力", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, SetupTmRollforce setupTmRollforce) + { + List list = setupTmRollforceService.selectSetupTmRollforceList(setupTmRollforce); + ExcelUtil util = new ExcelUtil(SetupTmRollforce.class); + util.exportExcel(response, list, "光整机轧制力数据"); + } + + /** + * 获取光整机轧制力详细信息 + */ + @GetMapping() + public AjaxResult getInfo(@RequestParam String steelGrade, + @RequestParam Long yieldStren, + @RequestParam Long thick, + @RequestParam Long elong) + { + return success(setupTmRollforceService.selectSetupTmRollforceBySteelGrade(steelGrade, yieldStren, thick, elong)); + } + + /** + * 新增光整机轧制力 + */ + @Log(title = "光整机轧制力", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody SetupTmRollforce setupTmRollforce) + { + return toAjax(setupTmRollforceService.insertSetupTmRollforce(setupTmRollforce)); + } + + /** + * 修改光整机轧制力 + */ + @Log(title = "光整机轧制力", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody SetupTmRollforce setupTmRollforce) + { + return toAjax(setupTmRollforceService.updateSetupTmRollforce(setupTmRollforce)); + } + + /** + * 删除光整机轧制力 + */ + @Log(title = "光整机轧制力", businessType = BusinessType.DELETE) + @DeleteMapping("/tm/rollforce") + public AjaxResult removeTmRollforce(@RequestBody TmRollforceDeleteForm form) { + return toAjax(setupTmRollforceService.deleteSetupTmRollforceBySteelGrades( + form.getSteelGrades(), + form.getThicks(), + form.getYieldStrens(), + form.getElongs() + )); + } +} diff --git a/business/src/main/java/com/fizz/business/controller/SteelGradeInfoController.java b/business/src/main/java/com/fizz/business/controller/SteelGradeInfoController.java new file mode 100644 index 0000000..4544562 --- /dev/null +++ b/business/src/main/java/com/fizz/business/controller/SteelGradeInfoController.java @@ -0,0 +1,85 @@ +package com.fizz.business.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.fizz.business.domain.StdAlloy; +import com.fizz.business.service.SteelGradeInfoService; +import com.fizz.business.vo.StdAlloyVO; +import com.ruoyi.common.annotation.Anonymous; +import com.ruoyi.common.core.domain.R; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.ArrayList; +import java.util.List; + + +@Tag(name ="钢种管理") +@RestController +@RequestMapping("/api/steelGrade") +@Anonymous +public class SteelGradeInfoController { + + @Autowired + private SteelGradeInfoService steelGradeInfoService; + + @GetMapping("/list") + @Operation(summary = "查询钢种列表") + public R> list() { + + // 使用 LambdaQueryWrapper 查询 StdAlloy 表中的数据 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.select(StdAlloy::getGradeid, StdAlloy::getName) // 只查询 gradeId 和 name 字段 + .orderByAsc(StdAlloy::getName); // 按 name 排序 + + // 查询 StdAlloy 数据 + List stdAlloyList = steelGradeInfoService.list(queryWrapper); + + // 使用 BeanUtils 将 StdAlloy 对象的字段映射到 StdAlloyVO + List stdAlloyVOList = new ArrayList<>(); + for (StdAlloy stdAlloy : stdAlloyList) { + StdAlloyVO stdAlloyVO = new StdAlloyVO(); + BeanUtils.copyProperties(stdAlloy, stdAlloyVO); // 将 StdAlloy 属性复制到 StdAlloyVO + stdAlloyVOList.add(stdAlloyVO); + } + + // 返回结果 + return R.ok(stdAlloyVOList); + } + + @GetMapping("/info") + @Operation(summary ="询单个钢种详情") + public R getSteelGradeInfo(@RequestParam Integer gradeid) { + + // 使用 LambdaQueryWrapper 查询 StdAlloy 表中的数据 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(StdAlloy::getGradeid, gradeid); // 只查询 gradeId 和 name 字段 + + // 查询 StdAlloy 数据 + StdAlloy stdAlloyList = steelGradeInfoService.getById(gradeid); + + // 返回结果 + return R.ok(stdAlloyList); + } + + + @PostMapping("/add") + @Operation(summary ="新增") + public R add(@RequestBody StdAlloy steelGradeInfo) { + return R.ok(steelGradeInfoService.save(steelGradeInfo)); + } + + @PutMapping("/update") + @Operation(summary ="更新") + public R update(@RequestBody StdAlloy steelGradeInfo) { + return R.ok(steelGradeInfoService.updateById(steelGradeInfo)); + } + + @Operation(summary ="删除") + @DeleteMapping("/delete/{id}") + public R delete(@PathVariable Integer id) { + return R.ok(steelGradeInfoService.removeById(id)); + } +} \ No newline at end of file diff --git a/business/src/main/java/com/fizz/business/controller/TrackController.java b/business/src/main/java/com/fizz/business/controller/TrackController.java new file mode 100644 index 0000000..9b5d3df --- /dev/null +++ b/business/src/main/java/com/fizz/business/controller/TrackController.java @@ -0,0 +1,62 @@ +package com.fizz.business.controller; + + +import com.fizz.business.constants.enums.DeviceEnum; +import com.fizz.business.dto.CoilPositionDTO; +import com.fizz.business.form.AdjustPosForm; +import com.fizz.business.form.WebOperateMatForm; +import com.fizz.business.service.TrackService; +import com.fizz.business.vo.CoilMeasureVO; +import com.fizz.business.vo.HalfReturnInfoVO; +import com.fizz.business.vo.ReturnInfoVO; +import com.ruoyi.common.annotation.Anonymous; +import com.ruoyi.common.core.domain.R; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; + +/** + * @author baomidou + * @since 2023-05-17 + */ +@RestController +@RequestMapping("/api/track") +@Tag(name = "过程跟踪") +@Anonymous +public class TrackController { + @Autowired + TrackService trackService; + + @PutMapping("/manual/operate/mat") + @Operation(description = "页面手动操作钢卷") + public R manualOperateMat(@RequestBody @Valid WebOperateMatForm form) { + trackService.webOperateMat(form); + return R.ok(); + } + + @PutMapping("/position") + @Operation(description = "页面手动调整钢卷位置") + public R adjustPosition(@RequestBody @Valid AdjustPosForm form) { + + trackService.adjustPosition(form); + return R.ok(); + } + + @GetMapping("/return/info") + @Operation(description = "获取回退数据") + public R getReturnInfo(@RequestParam("posIdx") int posIdx) { + + return R.ok(trackService.getReturnInfo(posIdx)); + } + + @GetMapping("/coil/position") + @Operation(description = "获取跟踪带钢位置") + public R getCoilPosition() { + + return R.ok(trackService.getCoilPosition()); + } + +} diff --git a/business/src/main/java/com/fizz/business/domain/CrmPdiPlan.java b/business/src/main/java/com/fizz/business/domain/CrmPdiPlan.java new file mode 100644 index 0000000..ded6278 --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/CrmPdiPlan.java @@ -0,0 +1,316 @@ +package com.fizz.business.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +@Data +@TableName("crm_pdi_plan") +@Schema(description = "钢卷计划信息表") +public class CrmPdiPlan implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId + @Schema(description = "主键ID") + private Long id; + + @Schema(description = "顺序号") + private Integer seqid; + + @Schema(description = "钢卷号") + private String coilid; + + @Schema(description = "机组号") + private String unitCode; + + @Schema(description = "虚卷标识") + private Integer dummyCoilFlag; + + @Schema(description = "状态") + private String status; + + @Schema(description = "计划ID") + private String planid; + + @Schema(description = "计划类型") + private String planType; + + @Schema(description = "屈服点") + private BigDecimal yieldPoint; + + @Schema(description = "入口重量(t)") + private BigDecimal entryWeight; + + @Schema(description = "入口厚度(mm)") + private BigDecimal entryThick; + + @Schema(description = "入口宽度(mm)") + private BigDecimal entryWidth; + + @Schema(description = "入口长度(mm)") + private BigDecimal entryLength; + + @Schema(description = "入口外径(mm)") + private BigDecimal entryOuterDiameter; + + @Schema(description = "入口内径(mm)") + private BigDecimal entryInnerDiameter; + + @Schema(description = "出口内径(mm)") + private BigDecimal exitInnerDiameter; + + @Schema(description = "钢种") + private String steelGrade; + + @Schema(description = "出口卷号") + private String exitCoilid; + + @Schema(description = "张力平整标识") + private Integer tlvFlag; + + @Schema(description = "订单号") + private String orderNo; + + @Schema(description = "客户代码") + private String custommerCode; + + @Schema(description = "订单厚度(mm)") + private BigDecimal orderThick; + + @Schema(description = "订单宽度(mm)") + private BigDecimal orderWidth; + + @Schema(description = "订单长度下限(mm)") + private BigDecimal orderLenLow; + + @Schema(description = "订单长度上限(mm)") + private BigDecimal orderLenUp; + + @Schema(description = "订单重量(t)") + private BigDecimal orderWt; + + @Schema(description = "订单重量下限(t)") + private BigDecimal orderWtLow; + + @Schema(description = "订单重量上限(t)") + private BigDecimal orderWtUp; + + @Schema(description = "订单镀层上") + private BigDecimal orderMetCoatTop; + + @Schema(description = "订单镀层下") + private BigDecimal orderMetCoatBot; + + @Schema(description = "最终用途") + private String finalUse; + + @Schema(description = "热卷代码") + private String hotCoilCode; + + @Schema(description = "出口目标长度(mm)") + private BigDecimal exitLengthTar; + + @Schema(description = "出口长度公差最大值(mm)") + private BigDecimal exitLengthTolMax; + + @Schema(description = "出口长度公差最小值(mm)") + private BigDecimal exitLengthTolMin; + + @Schema(description = "出口目标厚度(mm)") + private BigDecimal exitThickTar; + + @Schema(description = "出口厚度公差最大值(mm)") + private BigDecimal exitThickTolMax; + + @Schema(description = "出口厚度公差最小值(mm)") + private BigDecimal exitThickTolMin; + + @Schema(description = "出口目标宽度(mm)") + private BigDecimal exitWidthTar; + + @Schema(description = "出口宽度公差最大值(mm)") + private BigDecimal exitWidthTolMax; + + @Schema(description = "出口宽度公差最小值(mm)") + private BigDecimal exitWidthTolMin; + + @Schema(description = "下道全流程积压代码") + private String nextWholeBacklogCode; + + @Schema(description = "上道全流程积压代码") + private String prevWholeBacklogCode; + + @Schema(description = "出口重量模式") + private String exitWtMode; + + @Schema(description = "分卷数量") + private Integer splitNum; + + @Schema(description = "出口重量1") + private BigDecimal exitWeight1; + + @Schema(description = "出口重量2") + private BigDecimal exitWeight2; + + @Schema(description = "出口重量3") + private BigDecimal exitWeight3; + + @Schema(description = "出口重量4") + private BigDecimal exitWeight4; + + @Schema(description = "出口重量5") + private BigDecimal exitWeight5; + + @Schema(description = "出口重量6") + private BigDecimal exitWeight6; + + @Schema(description = "头部取样模式") + private String headSampleMode; + + @Schema(description = "头部取样位置") + private String headSamplePosition; + + @Schema(description = "头部取样长度(mm)") + private BigDecimal headSampleLength; + + @Schema(description = "头部取样地点") + private String headSamplePlace; + + @Schema(description = "头部取样数量") + private Integer headSampleNum; + + @Schema(description = "尾部取样模式") + private String tailSampleMode; + + @Schema(description = "尾部取样位置") + private String tailSamplePosition; + + @Schema(description = "尾部取样长度(mm)") + private BigDecimal tailSampleLength; + + @Schema(description = "尾部取样地点") + private String tailSamplePlace; + + @Schema(description = "尾部取样数量") + private Integer tailSampleNum; + + @Schema(description = "时间戳") + private LocalDateTime timestamp; + + @Schema(description = "上线时间") + private LocalDateTime onlineDate; + + @Schema(description = "开始时间") + private LocalDateTime startDate; + + @Schema(description = "结束时间") + private LocalDateTime endDate; + + @Schema(description = "进炉时间") + private LocalDateTime furInDate; + + @Schema(description = "出炉时间") + private LocalDateTime furOutDate; + + @Schema(description = "创建时间") + private LocalDateTime createTime; + + @Schema(description = "更新时间") + private LocalDateTime updateTime; + + @Schema(description = "副面") + private String surfaceVice; + + @Schema(description = "焊缝代码") + private String weldCode; + + @Schema(description = "SPM标识") + private Integer spmFlag; + + @Schema(description = "SPM延伸率(%)") + private BigDecimal spmElongation; + + @Schema(description = "SPM轧制力") + private BigDecimal spmRollforce; + + @Schema(description = "SPM工艺类型") + private String spmProcessType; + + @Schema(description = "SPM控制模式") + private String spmControlMode; + + @Schema(description = "SPM弯曲力") + private BigDecimal spmBendingForce; + + @Schema(description = "SPM咬入辊目") + private BigDecimal spmCrimpingRollMesh; + + @Schema(description = "SPM精轧辊目") + private BigDecimal spmBillyRollMesh; + + @Schema(description = "切边标识") + private Integer trimFlag; + + @Schema(description = "张力平整模式") + private String tlvMode; + + @Schema(description = "张力平整延伸率(%)") + private BigDecimal tlvElongation; + + @Schema(description = "钝化标识") + private Integer chromating; + + @Schema(description = "镀层代码") + private String coatingCode; + + @Schema(description = "涂油标识") + private Integer oilingFlag; + + @Schema(description = "涂油类型") + private String oilingType; + + @Schema(description = "涂油上") + private BigDecimal oilingTop; + + @Schema(description = "涂油下") + private BigDecimal oilingBottom; + + @Schema(description = "热循环") + private String heatCycle; + + @Schema(description = "镀层选择") + private String coatingSelection; + + @Schema(description = "镀层类型") + private String coatingType; + + @Schema(description = "化学处理模式") + private String chemTreatMode; + + @Schema(description = "目标重量上") + private BigDecimal aimWeightTop; + + @Schema(description = "目标重量下") + private BigDecimal aimWeightBottom; + + @Schema(description = "最大公差重量上") + private BigDecimal maxTolWeightTop; + + @Schema(description = "最大公差重量下") + private BigDecimal maxTolWeightBottom; + + @Schema(description = "头端测厚长度(mm)") + private BigDecimal headendGaugeLength; + + @Schema(description = "尾端测厚长度(mm)") + private BigDecimal tailendGaugeLength; + + @Schema(description = "原卷号") + private String originCoilid; +} diff --git a/business/src/main/java/com/fizz/business/domain/CrmPdoExcoil.java b/business/src/main/java/com/fizz/business/domain/CrmPdoExcoil.java new file mode 100644 index 0000000..1ea33b3 --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/CrmPdoExcoil.java @@ -0,0 +1,133 @@ +package com.fizz.business.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.io.Serializable; +import java.sql.Timestamp; +import java.time.LocalDateTime; + +@Data +@Schema(description = "钢卷生产数据表") +public class CrmPdoExcoil implements Serializable { + + private static final long serialVersionUID = 1L; + + @Schema(description = "主键id") + private Long id; + + @Schema(description = "成品卷") + private String exitMatId; + + @Schema(description = "来料卷") + private String entryMatId; + + @Schema(description = "分切数") + private Integer subId; + + @Schema(description = "开始位置") + private Double startPosition; + + @Schema(description = "结束位置") + private Double endPosition; + + @Schema(description = "计划id") + private Long planId; + + @Schema(description = "计划号") + private String planNo; + + @Schema(description = "产品类型") + private String prodCode; + + @Schema(description = "班号") + private String groupNo; + + @Schema(description = "组号") + private String shiftNo; + + @Schema(description = "状态") + private String status; + + @Schema(description = "钢种") + private String steelGrade; + + @Schema(description = "来料厚度") + private Double entryThick; + + @Schema(description = "来料宽带") + private Double entryWidth; + + @Schema(description = "来料长度") + private Double entryLength; + + @Schema(description = "来料重量") + private Double entryWeight; + + @Schema(description = "上表面镀锌") + private Double weightTop; + + @Schema(description = "下表面镀锌") + private Double weightBottom; + + @Schema(description = "成品长度") + private Double exitLength; + + @Schema(description = "成品带涂料重量") + private Double exitNetWeight; + + @Schema(description = "理论重量") + private Double theoryWeight; + + @Schema(description = "实际重量") + private Double actualWeight; + + @Schema(description = "成品外径") + private Double exitOuterDiameter; + + @Schema(description = "成品厚度") + private Double exitThickness; + + @Schema(description = "成品宽度") + private Double exitWidth; + + @Schema(description = "客户") + private String customer; + + @Schema(description = "上线时间") + private LocalDateTime onlineTime; + + @Schema(description = "开始时间") + private LocalDateTime startTime; + + @Schema(description = "结束时间") + private LocalDateTime endTime; + + @Schema(description = "0-未删除时间戳:已删除") + private Long delFlag; + + @Schema(description = "创建时间") + private LocalDateTime createTime; + + @Schema(description = "修改时间") + private LocalDateTime updateTime; + + @Schema(description = "机组号") + private String unitCode; + + @Schema(description = "工序号") + private String processCode; + + @Schema(description = "是否尾卷") + private Boolean lastFlag; + + @Schema(description = "是否分卷") + private Boolean separateFlag; + + @Schema(description = "计划来源：L3-L3计划，MANUAL-人工") + private String planOrigin; +} \ No newline at end of file diff --git a/business/src/main/java/com/fizz/business/domain/DeviceDefine.java b/business/src/main/java/com/fizz/business/domain/DeviceDefine.java new file mode 100644 index 0000000..f3d247f --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/DeviceDefine.java @@ -0,0 +1,55 @@ +package com.fizz.business.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Getter; +import lombok.Setter; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *

+ * 机组定义表 + *

+ * + * @author baomidou + * @since 2023-05-17 + */ +@Getter +@Setter +@TableName("cpg_device_define") +@Schema(title = "CpgDeviceDefine对象", description = "机组定义表") +public class DeviceDefine implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + @Schema(description = "位置编号") + private Integer posIdx; + + @Schema(description = "区域代码") + private String positionArea; + + @Schema(description = "位置代码英文") + private String positionNameEn; + + @Schema(description = "位置代码中文") + private String positionNameCn; + + @Schema(description = "设备开始位置") + private Double positionLengthStart; + + @Schema(description = "设备结束位置") + private Double positionLengthEnd; + + @Schema(description = "创建时间") + private LocalDateTime createTime; + + @Schema(description = "修改时间") + private LocalDateTime updateTime; +} diff --git a/business/src/main/java/com/fizz/business/domain/HalfReturn.java b/business/src/main/java/com/fizz/business/domain/HalfReturn.java new file mode 100644 index 0000000..abe4140 --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/HalfReturn.java @@ -0,0 +1,80 @@ +package com.fizz.business.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Getter; +import lombok.Setter; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *

+ * 半卷整卷回退表 + *

+ * + * @author baomidou + * @since 2023-05-17 + */ +@Getter +@Setter +@TableName("cpg_half_return") +@Schema(title = "CpgHalfReturn对象", description = "半卷整卷回退表") +public class HalfReturn implements Serializable { + + private static final long serialVersionUID = 1L; + + @Schema(description = "主键id") + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + @Schema(description = "来料卷号") + private String entryMatId; + + @Schema(description = "工艺规程") + private String setupVersion; + + @Schema(description = "钢种") + private String steelGrade; + + @Schema(description = "计划号") + private String planNo; + + @Schema(description = "钢卷产品代码") + private String prodCode; + + @Schema(description = "成品钢卷号") + private String exitMatId; + + @Schema(description = "成品卷重") + private Double exitMatWeight; + + @Schema(description = "回退卷重") + private Double returnMatWeight; + + @Schema(description = "回退时间") + private LocalDateTime returnMatTime; + + @Schema(description = "回退类型:ALL_RETURN-整卷回退, HALF_RETURN-半卷回退") + private String returnType; + + @Schema(description = "回退备注") + private String returnRemark; + + @Schema(description = "0-未删除时间戳:已删除") + private Long delFlag; + + @Schema(description = "操作人") + private String operator; + + @Schema(description = "操作人id") + private String operatorId; + + @Schema(description = "创建时间") + private LocalDateTime createTime; + + @Schema(description = "修改时间") + private LocalDateTime updateTime; +} diff --git a/business/src/main/java/com/fizz/business/domain/LogData.java b/business/src/main/java/com/fizz/business/domain/LogData.java new file mode 100644 index 0000000..d864999 --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/LogData.java @@ -0,0 +1,67 @@ +package com.fizz.business.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; +import java.util.Date; + +@Data +@TableName("log_data") +@Schema(description = "") +public class LogData { + + /** + * seqid + */ + @TableId(type = IdType.ASSIGN_ID) + @Schema(description ="seqid") + private Integer seqid; + + /** + * timestamp + */ + @Schema(description ="timestamp") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") + private LocalDateTime timestamp; + + /** + * module + */ + @Schema(description ="警报源") + private String module; + + /** + * logtype + */ + @Schema(description ="警报类型，组") + private String logtype; + + /** + * logtext + */ + @Schema(description ="警报内容") + private String logtext; + + /** + * status + */ + @Schema(description ="状态") + private Integer status; + + /** + * confirmTime + */ + @Schema(description ="confirmTime") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") + private LocalDateTime confirmTime; + + +} \ No newline at end of file diff --git a/business/src/main/java/com/fizz/business/domain/ModCoilMap.java b/business/src/main/java/com/fizz/business/domain/ModCoilMap.java new file mode 100644 index 0000000..8fa85a0 --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/ModCoilMap.java @@ -0,0 +1,97 @@ +package com.fizz.business.domain; + + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; + +import java.time.LocalDateTime; + +@Data +public class ModCoilMap { + + @TableField("id") + @TableId(type = IdType.AUTO) + private Integer id; + + @TableField("POSID") + private Integer posid; + + @TableField("COILID") + private String coilid; + + @TableField("GRADE") + private String grade; + + @TableField("CLASSID") + private Integer classid; + + @TableField("ENTRY_CROWN") + private Float entryCrown; + + @TableField("ENTRY_THICK") + private Float entryThick; + + @TableField("ENTRY_LENGTH") + private Float entryLength; + + @TableField("ENTRY_DIAMETER") + private Float entryDiameter; + + @TableField("ENTRY_STRESS") + private Float entryStress; + + @TableField("TEMP") + private Float temp; + + @TableField("WIDTH") + private Float width; + + @TableField("ENTRY_WEIGHT") + private Float entryWeight; + + @TableField("EXIT_THICK") + private Float exitThick; + + @TableField("REDUCTION") + private Float reduction; + + @TableField("EXIT_STRESS") + private Float exitStress; + + @TableField("NEXT_UNIT") + private Integer nextUnit; + + @TableField("STRAT_MODE") + private Integer stratMode; + + @TableField("STRAT_MODE_DSC") + private String stratModeDsc; + + @TableField("ROLL_MODE") + private Integer rollMode; + + @TableField("ROLL_MODE_DSC") + private String rollModeDsc; + + @TableField("SETUP_MODE") + private Integer setupMode; + + @TableField("SETUP_MODE_DSC") + private String setupModeDsc; + + @TableField("STATUS_MODE_DSC") + private String statusModeDsc; + + @TableField("SHIFT") + private String shift; + + @TableField("CREW") + private Integer crew; + + @TableField("INSDATE") + private LocalDateTime insdate; + + +} diff --git a/business/src/main/java/com/fizz/business/domain/ModSetupResult.java b/business/src/main/java/com/fizz/business/domain/ModSetupResult.java new file mode 100644 index 0000000..4c86e27 --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/ModSetupResult.java @@ -0,0 +1,188 @@ +package com.fizz.business.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; + +@Data +@TableName("mod_setup_result") +@Schema( description= "轧机设置结果实体类") +public class ModSetupResult { + + @Schema(description = "自增主键") + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @Schema(description = "logid") + private Long logId; + + @Schema(description = "钢卷ID") + private String coilId; + + @Schema(description = "道次号") + private Integer passno; + + @Schema(description = "机架号") + private Integer standId; + + @Schema(description = "断面ID") + private Integer fractId; + + @Schema(description = "速度限制") + private Integer speedLimit; + + @Schema(description = "力限制") + private Integer forceLimit; + + @Schema(description = "功率限制") + private Integer powerLimit; + + @Schema(description = "入口厚度") + private Float entryThick; + + @Schema(description = "出口厚度") + private Float exitThick; + + @Schema(description = "最小厚度") + private Float minThick; + + @Schema(description = "压下率") + private Float reduction; + + @Schema(description = "摩擦系数") + private Float friction; + + @Schema(description = "入口凸度") + private Float entryCrown; + + @Schema(description = "出口凸度") + private Float exitCrown; + + @Schema(description = "入口张力") + private Float entryTension; + + @Schema(description = "出口张力") + private Float exitTension; + + @Schema(description = "入口应力") + private Float entryTenstress; + + @Schema(description = "出口应力") + private Float exitTenstress; + + @Schema(description = "速度比") + private Float speedFract; + + @Schema(description = "入口速度") + private Float entrySpeed; + + @Schema(description = "出口速度") + private Float exitSpeed; + + @Schema(description = "轧制速度") + private Float rollSpeed; + + @Schema(description = "入口应变") + private Float sigmae; + + @Schema(description = "出口应变") + private Float sigmas; + + @Schema(description = "平均应变") + private Float sigmaave; + + @Schema(description = "轧制力") + private Float rollForce; + + @Schema(description = "轧辊间隙") + private Float rollgap; + + @Schema(description = "超出间隙") + private Float overgap; + + @Schema(description = "轧机刚度") + private Float millModulus; + + @Schema(description = "滑移") + private Float slip; + + @Schema(description = "变形半径") + private Float rdef; + + @Schema(description = "轧制角度") + private Float angle; + + @Schema(description = "中心流量") + private Float centerFlow; + + @Schema(description = "边缘流量") + private Float edgeFlow; + + @Schema(description = "中心压力") + private Float centerPress; + + @Schema(description = "边缘压力") + private Float edgePress; + + @Schema(description = "入口温度") + private Float entryTemp; + + @Schema(description = "出口温度") + private Float exitTemp; + + @Schema(description = "工作辊弯曲") + private Float wrbend; + + @Schema(description = "支撑辊弯曲") + private Float irbend; + + @Schema(description = "支撑辊位移") + private Float irshift; + + @Schema(description = "电机电流") + private Float motorCurrent; + + @Schema(description = "电机电压") + private Float motorVoltage; + + @Schema(description = "轧制扭矩") + private Float rollTorque; + + @Schema(description = "总轧制扭矩") + private Float totalRollTorque; + + @Schema(description = "电机扭矩") + private Float motorTorque; + + @Schema(description = "扭矩比") + private Float torqueRatio; + + @Schema(description = "比扭矩") + private Float specTorque; + + @Schema(description = "功率") + private Float power; + + @Schema(description = "负载比") + private Float loadRatio; + + @Schema(description = "计算ID 实际用的这个值") + private String calcId; + + @Schema(description = "记录插入时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime insdate; + + @Schema(description = "创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; + + @Schema(description = "更新时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime updateTime; +} diff --git a/business/src/main/java/com/fizz/business/domain/PdiSetups.java b/business/src/main/java/com/fizz/business/domain/PdiSetups.java new file mode 100644 index 0000000..7a28873 --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/PdiSetups.java @@ -0,0 +1,166 @@ +package com.fizz.business.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +import java.io.Serializable; + +/** + * 生产计划的参数详情对象 pdi_setup + * + * @author Joshi + * @date 2025-09-25 + */ +@Data +@TableName("pdi_setup") +public class PdiSetups implements Serializable +{ + private static final long serialVersionUID = 1L; + + /** 主键ID */ + @TableId(value = "ID", type = IdType.AUTO) + private Long id; + + /** 钢卷号 */ + @Excel(name = "钢卷号") + @TableField("COILID") + private String coilid; + + /** 计划号 */ + @Excel(name = "计划号") + @TableField("PLANID") + private String planid; + + /** 开卷机张力 */ + @Excel(name = "开卷机张力") + @TableField("POR_TENSION") + private Long porTension; + + /** 入口活套张力 */ + @Excel(name = "入口活套张力") + @TableField("CEL_TENSION") + private Long celTension; + + /** 清洗段张力 */ + @Excel(name = "清洗段张力") + @TableField("CLEAN_TENSION") + private Long cleanTension; + + /** 炉区张力 */ + @Excel(name = "炉区张力") + @TableField("FUR_TENSION") + private Long furTension; + + /** 冷却塔张力 */ + @Excel(name = "冷却塔张力") + @TableField("TOWER_TENSION") + private Long towerTension; + + /** 光整机不投张力 */ + @Excel(name = "光整机不投张力") + @TableField("TM_NONE_TENSION") + private Long tmNoneTension; + + /** 光整机入口张力 */ + @Excel(name = "光整机入口张力") + @TableField("TM_ENTRY_TENSION") + private Long tmEntryTension; + + /** 光整机出口张力 */ + @Excel(name = "光整机出口张力") + @TableField("TM_EXIT_TENSION") + private Long tmExitTension; + + /** 光整机轧制力 */ + @Excel(name = "光整机轧制力") + @TableField("TM_ROLLFORCE") + private Long tmRollforce; + + /** 光整机弯辊力 */ + @Excel(name = "光整机弯辊力") + @TableField("TM_BENDFORCE") + private Long tmBendforce; + + /** 光整机防皱辊插入量 */ + @Excel(name = "光整机防皱辊插入量") + @TableField("TM_ACR_MESH") + private Long tmAcrMesh; + + /** 光整机防颤辊插入量 */ + @Excel(name = "光整机防颤辊插入量") + @TableField("TM_BR_MESH") + private Long tmBrMesh; + + /** 拉矫机不投张力 */ + @Excel(name = "拉矫机不投张力") + @TableField("TL_NONE_TENSION") + private Long tlNoneTension; + + /** 拉矫机出口张力 */ + @Excel(name = "拉矫机出口张力") + @TableField("TL_EXIT_TENSION") + private Long tlExitTension; + + /** 拉矫机延伸率 */ + @Excel(name = "拉矫机延伸率") + @TableField("TL_ELONG") + private Long tlElong; + + /** 拉矫机矫直辊插入量1 */ + @Excel(name = "拉矫机矫直辊插入量1") + @TableField("TL_LVL_MESH1") + private Long tlLvlMesh1; + + /** 拉矫机矫直辊插入量2 */ + @Excel(name = "拉矫机矫直辊插入量2") + @TableField("TL_LVL_MESH2") + private Long tlLvlMesh2; + + /** 拉矫机防横弓插入量 */ + @Excel(name = "拉矫机防横弓插入量") + @TableField("TL_ACB_MESH") + private Long tlAcbMesh; + + /** 后处理张力 */ + @Excel(name = "后处理张力") + @TableField("COAT_TENSION") + private Long coatTension; + + /** 出口活套张力 */ + @Excel(name = "出口活套张力") + @TableField("CXL_TENSION") + private Long cxlTension; + + /** 卷取机张力 */ + @Excel(name = "卷取机张力") + @TableField("TR_TENSION") + private Long trTension; + + /** 类型，或可用于记录更改次数 */ + @Excel(name = "类型，或可用于记录更改次数") + @TableField("TYPE") + private Long type; + + /** 预热段出口板温 */ + @Excel(name = "预热段出口板温") + @TableField("PREHEATING_SECTION") + private Float preheatingSection; + + /** 加热段出口板温 */ + @Excel(name = "加热段出口板温") + @TableField("HEATING_SECTION") + private Float heatingSection; + + /** 冷却段出口板温 */ + @Excel(name = "冷却段出口板温") + @TableField("COOLING_SECTION") + private Float coolingSection; + +} diff --git a/business/src/main/java/com/fizz/business/domain/PdoExcoil.java b/business/src/main/java/com/fizz/business/domain/PdoExcoil.java new file mode 100644 index 0000000..ea1bc0f --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/PdoExcoil.java @@ -0,0 +1,127 @@ +package com.fizz.business.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Getter; +import lombok.Setter; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *

+ * cs机组产出实绩表 + *

+ * + * @author baomidou + * @since 2023-05-17 + */ +@Getter +@Setter +@TableName("cpg_pdo_excoil") +@Schema(title = "cpgPdoExcoil对象", description = "镀锌机组产出实绩表") +public class PdoExcoil implements Serializable { + + private static final long serialVersionUID = 1L; + + @Schema(description = "主键id") + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + @Schema(description = "成品卷") + private String exitMatId; + + @Schema(description = "来料卷") + private String entryMatId; + + @Schema(description = "分切数") + private Integer subId; + + @Schema(description = "开始位置") + private Double startPosition; + + @Schema(description = "结束位置") + private Double endPosition; + + @Schema(description = "计划id") + private Long planId; + + @Schema(description = "计划号") + private String planNo; + + @Schema(description = "产品类型") + private String prodCode; + + @Schema(description = "班号") + private String groupNo; + + @Schema(description = "组号") + private String shiftNo; + + @Schema(description = "状态") + private String status; + + @Schema(description = "钢种") + private String steelGrade; + + @Schema(description = "来料厚度") + private Double entryThick; + + @Schema(description = "来料宽带") + private Double entryWidth; + + @Schema(description = "来料长度") + private Double entryLength; + + @Schema(description = "来料重量") + private Double entryWeight; + + @Schema(description = "上表面镀锌") + private Double weightTop; + + @Schema(description = "下表面镀锌") + private Double weightBottom; + + @Schema(description = "成品长度") + private Double exitLength; + + @Schema(description = "成品带涂料重量") + private Double exitNetWeight; + + @Schema(description = "理论重量") + private Double theoryWeight; + + @Schema(description = "实际重量") + private Double actualWeight; + + @Schema(description = "成品外径") + private Double exitOuterDiameter; + + @Schema(description = "成品厚度") + private Double exitThickness; + + @Schema(description = "成品宽度") + private Double exitWidth; + + private String customer; + + @Schema(description = "上线时间") + private LocalDateTime onlineTime; + + @Schema(description = "开始时间") + private LocalDateTime startTime; + + @Schema(description = "结束时间") + private LocalDateTime endTime; + + @Schema(description = "0-未删除时间戳:已删除") + private Long delFlag; + + @Schema(description = "创建时间") + private LocalDateTime createTime; + + @Schema(description = "修改时间") + private LocalDateTime updateTime; +} diff --git a/business/src/main/java/com/fizz/business/domain/PdoStripvalue.java b/business/src/main/java/com/fizz/business/domain/PdoStripvalue.java new file mode 100644 index 0000000..acb630a --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/PdoStripvalue.java @@ -0,0 +1,559 @@ +package com.fizz.business.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Getter; +import lombok.Setter; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *

+ * 剪切带钢段平均值 + *

+ * + * @author baomidou + * @since 2023-05-17 + */ +@Getter +@Setter +@TableName("cpg_pdo_stripvalue") +@Schema(title = "cpgPdoStripvalue对象", description = "剪切带钢段平均值") +public class PdoStripvalue implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + private String exitMatId; + + private Integer val1num; + + private Integer val2num; + + private Integer val3num; + + private Integer val4num; + + private Integer val5num; + + private Integer val6num; + + private Integer val7num; + + private Integer val8num; + + private Integer val9num; + + private Integer val10num; + + private Double val1max; + + private Double val1min; + + private Double val1avg; + + private Integer val1cnt; + + private Integer val1std; + + private Double val2max; + + private Double val2min; + + private Double val2avg; + + private Integer val2cnt; + + private Integer val2std; + + private Double val3max; + + private Double val3min; + + private Double val3avg; + + private Integer val3cnt; + + private Integer val3std; + + private Double val4max; + + private Double val4min; + + private Double val4avg; + + private Integer val4cnt; + + private Integer val4std; + + private Double val5max; + + private Double val5min; + + private Double val5avg; + + private Integer val5cnt; + + private Integer val5std; + + private Double val6max; + + private Double val6min; + + private Double val6avg; + + private Integer val6cnt; + + private Integer val6std; + + private Double val7max; + + private Double val7min; + + private Double val7avg; + + private Integer val7cnt; + + private Integer val7std; + + private Double val8max; + + private Double val8min; + + private Double val8avg; + + private Integer val8cnt; + + private Integer val8std; + + private Double val9max; + + private Double val9min; + + private Double val9avg; + + private Integer val9cnt; + + private Integer val9std; + + private Double val10max; + + private Double val10min; + + private Double val10avg; + + private Integer val10cnt; + + private Integer val10std; + + private Double val11max; + + private Double val11min; + + private Double val11avg; + + private Integer val11cnt; + + private Integer val11std; + + private Double val12max; + + private Double val12min; + + private Double val12avg; + + private Integer val12cnt; + + private Integer val12std; + + private Double val13max; + + private Double val13min; + + private Double val13avg; + + private Integer val13cnt; + + private Integer val13std; + + private Double val14max; + + private Double val14min; + + private Double val14avg; + + private Integer val14cnt; + + private Integer val14std; + + private Double val15max; + + private Double val15min; + + private Double val15avg; + + private Integer val15cnt; + + private Integer val15std; + + private Double val16max; + + private Double val16min; + + private Double val16avg; + + private Integer val16cnt; + + private Integer val16std; + + private Double val17max; + + private Double val17min; + + private Double val17avg; + + private Integer val17cnt; + + private Integer val17std; + + private Double val18max; + + private Double val18min; + + private Double val18avg; + + private Integer val18cnt; + + private Integer val18std; + + private Double val19max; + + private Double val19min; + + private Double val19avg; + + private Integer val19cnt; + + private Integer val19std; + + private Double val20max; + + private Double val20min; + + private Double val20avg; + + private Integer val20cnt; + + private Integer val20std; + + private Double val21max; + + private Double val21min; + + private Double val21avg; + + private Integer val21cnt; + + private Integer val21std; + + private Double val22max; + + private Double val22min; + + private Double val22avg; + + private Integer val22cnt; + + private Integer val22std; + + private Double val23max; + + private Double val23min; + + private Double val23avg; + + private Integer val23cnt; + + private Integer val23std; + + private Double val24max; + + private Double val24min; + + private Double val24avg; + + private Integer val24cnt; + + private Integer val24std; + + private Double val25max; + + private Double val25min; + + private Double val25avg; + + private Integer val25cnt; + + private Integer val25std; + + private Double val26max; + + private Double val26min; + + private Double val26avg; + + private Integer val26cnt; + + private Integer val26std; + + private Double val27max; + + private Double val27min; + + private Double val27avg; + + private Integer val27cnt; + + private Integer val27std; + + private Double val28max; + + private Double val28min; + + private Double val28avg; + + private Integer val28cnt; + + private Integer val28std; + + private Double val29max; + + private Double val29min; + + private Double val29avg; + + private Integer val29cnt; + + private Integer val29std; + + private Double val30max; + + private Double val30min; + + private Double val30avg; + + private Integer val30cnt; + + private Integer val30std; + + private Double val31max; + + private Double val31min; + + private Double val31avg; + + private Integer val31cnt; + + private Integer val31std; + + private Double val32max; + + private Double val32min; + + private Double val32avg; + + private Integer val32cnt; + + private Integer val32std; + + private Double val33max; + + private Double val33min; + + private Double val33avg; + + private Integer val33cnt; + + private Integer val33std; + + private Double val34max; + + private Double val34min; + + private Double val34avg; + + private Integer val34cnt; + + private Integer val34std; + + private Double val35max; + + private Double val35min; + + private Double val35avg; + + private Integer val35cnt; + + private Integer val35std; + + private Double val36max; + + private Double val36min; + + private Double val36avg; + + private Integer val36cnt; + + private Integer val36std; + + private Double val37max; + + private Double val37min; + + private Double val37avg; + + private Integer val37cnt; + + private Integer val37std; + + private Double val38max; + + private Double val38min; + + private Double val38avg; + + private Integer val38cnt; + + private Integer val38std; + + private Double val39max; + + private Double val39min; + + private Double val39avg; + + private Integer val39cnt; + + private Integer val39std; + + private Double val40max; + + private Double val40min; + + private Double val40avg; + + private Integer val40cnt; + + private Integer val40std; + + private Double val41max; + + private Double val41min; + + private Double val41avg; + + private Integer val41cnt; + + private Integer val41std; + + private Double val42max; + + private Double val42min; + + private Double val42avg; + + private Integer val42cnt; + + private Integer val42std; + + private Double val43max; + + private Double val43min; + + private Double val43avg; + + private Integer val43cnt; + + private Integer val43std; + + private Double val44max; + + private Double val44min; + + private Double val44avg; + + private Integer val44cnt; + + private Integer val44std; + + private Double val45max; + + private Double val45min; + + private Double val45avg; + + private Integer val45cnt; + + private Integer val45std; + + private Double val46max; + + private Double val46min; + + private Double val46avg; + + private Integer val46cnt; + + private Integer val46std; + + private Double val47max; + + private Double val47min; + + private Double val47avg; + + private Integer val47cnt; + + private Integer val47std; + + private Double val48max; + + private Double val48min; + + private Double val48avg; + + private Integer val48cnt; + + private Integer val48std; + + private Double val49max; + + private Double val49min; + + private Double val49avg; + + private Integer val49cnt; + + private Integer val49std; + + private Double val50max; + + private Double val50min; + + private Double val50avg; + + private Integer val50cnt; + + private Integer val50std; + + @Schema(description = "创建时间") + private LocalDateTime createTime; + + @Schema(description = "修改时间") + private LocalDateTime updateTime; +} diff --git a/business/src/main/java/com/fizz/business/domain/PlantConfig.java b/business/src/main/java/com/fizz/business/domain/PlantConfig.java new file mode 100644 index 0000000..095453f --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/PlantConfig.java @@ -0,0 +1,35 @@ +package com.fizz.business.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; + +@Data +@TableName("plant_config") +@Schema(name = "PlantConfig对象", description = "配置数据") +public class PlantConfig implements Serializable { + private static final long serialVersionUID = 1L; + + @Schema(description = "名称") + private String varname; + + @Schema(description = "arrayindex") + private Integer arrayindex; + + @Schema(description = "描述") + private String description; + + @Schema(description = "值") + private String value; + + @Schema(description = "单位") + private String unit; + + @Schema(description = "时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime timestamp; +} diff --git a/business/src/main/java/com/fizz/business/domain/ProMatmap.java b/business/src/main/java/com/fizz/business/domain/ProMatmap.java new file mode 100644 index 0000000..c28f602 --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/ProMatmap.java @@ -0,0 +1,40 @@ +package com.fizz.business.domain; + + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; + +@Data +public class ProMatmap implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "pos_idx", type = IdType.NONE) + private Integer posIdx; + + private String matId; + + @Schema(description = "设备英文名") + private String positionNameEn; + + @Schema(description = "设备中文名") + private String positionNameCn; + + @Schema(description = "计划id") + private String planId; + + @Schema(description = "计划号") + private String planNo; + + @Schema(description = "创建时间") + private LocalDateTime createTime; + + @Schema(description = "修改时间") + private LocalDateTime updateTime; + +} diff --git a/business/src/main/java/com/fizz/business/domain/ProStoppage.java b/business/src/main/java/com/fizz/business/domain/ProStoppage.java new file mode 100644 index 0000000..bf34ada --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/ProStoppage.java @@ -0,0 +1,64 @@ +package com.fizz.business.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + + +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +@Data +@TableName("pro_stoppage") +@Schema(description = "ProStoppage对象") +public class ProStoppage implements Serializable { + + private static final long serialVersionUID = 1L; + + @Schema(description = "停机ID") + @TableId(value = "stopid", type = IdType.AUTO) + private Long stopid; + + @Schema(description = "钢卷号") + private String coilid; + + @Schema(description = "班") + private String shift; + @Schema(description = "组") + private String crew; + + @Schema(description = "区域") + private String area; + + @Schema(description = "机组") + private String unit; + + @Schema(description = "设备") + private String seton; + + @Schema(description = "开始时间", format = "date", pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime startDate; + + @Schema(description = "结束时间", format = "date", pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime endDate; + + @Schema(description = "停机时长") + private BigDecimal duration; + + @Schema(description = "更新时间", format = "date", pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private String insdate; + + @Schema(description = "停机类型") + private String stopType; + + @Schema(description = "停机原因") + private String remark; + +} diff --git a/business/src/main/java/com/fizz/business/domain/RollChangeCycle.java b/business/src/main/java/com/fizz/business/domain/RollChangeCycle.java new file mode 100644 index 0000000..e8afa30 --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/RollChangeCycle.java @@ -0,0 +1,38 @@ +package com.fizz.business.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; + +@Data +@TableName("roll_change_cycle") +@Schema(description = "换辊") +public class RollChangeCycle implements Serializable { + private static final long serialVersionUID = 1L; + + @Schema(description = "类型") + private String type; + + @Schema(description = "位置") + private String position; + + @Schema(description = "机架号") + private Integer standid; + + @Schema(description = "轧制长度") + private Double rolledLength; + + @Schema(description = "轧制重量") + private Double rolledWeight; + + @Schema(description = "轧制数量") + private Integer rolledCount; + + @Schema(description = "insdate") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime insdate; +} diff --git a/business/src/main/java/com/fizz/business/domain/RollData.java b/business/src/main/java/com/fizz/business/domain/RollData.java new file mode 100644 index 0000000..cba6cbf --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/RollData.java @@ -0,0 +1,87 @@ +package com.fizz.business.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Builder; +import lombok.Data; +import lombok.Getter; +import lombok.Setter; + +import java.io.Serializable; +import java.time.LocalDateTime; + +@TableName("roll_data") +@Schema(description = "轧辊数据") +@Getter +@Setter +@Builder +public class RollData implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId(value = "rollid",type = IdType.INPUT) + @Schema(description = "轧辊号") + private String rollid; + + @Schema(description = "工序") + private String seton; + + @Schema(description = "类型") + private String type; + + @Schema(description = "位置") + private String position; + + @Schema(description = "机架号") + private Integer standid; + + @Schema(description = "消耗") + private Integer composition; + + @Schema(description = "直径") + private Double diameter; + + @Schema(description = "粗糙度") + private Double rough; + + @Schema(description = "凸度") + private Double crown; + + @Schema(description = "轧制长度") + private Double rolledLength; + + @Schema(description = "轧制重量") + private Double rolledWeight; + + @Schema(description = "轧制数量") + private Integer rolledCount; + + @Schema(description = "总轧制重量") + private Double totalRolledWeight; + + @Schema(description = "总轧制长度") + private Double totalRolledLength; + + @Schema(description = "总轧制数量") + private Integer totalRolledCount; + + @Schema(description = "修理次数") + private Integer grindCount; + + @Schema(description = "状态") + private String status; + + @Schema(description = "Installation Time") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime instalTime; + + @Schema(description = "Deinstallation Time") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime deinstalTime; + + @Schema(description = "Update Time") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime updtime; +} diff --git a/business/src/main/java/com/fizz/business/domain/RollHistory.java b/business/src/main/java/com/fizz/business/domain/RollHistory.java new file mode 100644 index 0000000..aed5e9c --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/RollHistory.java @@ -0,0 +1,93 @@ +package com.fizz.business.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Builder; +import lombok.Data; +import lombok.Getter; +import lombok.Setter; + +import java.io.Serializable; +import java.time.LocalDateTime; + +@Getter +@Setter +@Builder +@TableName("roll_history") +@Schema( description = "轧辊历史") +public class RollHistory implements Serializable { + private static final long serialVersionUID = 1L; + + @Schema(description = "轧辊号") + private String rollid; + + @Schema(description = "换辊id") + private String changeid; + + @Schema(description = "班") + private String shift; + + @Schema(description = "组") + private String crew; + + @Schema(description = "工序") + private String seton; + + @Schema(description = "类型") + private String type; + + @Schema(description = "位置") + private String position; + + @Schema(description = "机架号") + private Integer standid; + + @Schema(description = "消化") + private Integer composition; + + @Schema(description = "直径") + private Double diameter; + + @Schema(description = "粗糙度") + private Double rough; + + @Schema(description = "凸度") + private Double crown; + + @Schema(description = "轧制长度") + private Double rolledLength; + + @Schema(description = "轧制重量") + private Double rolledWeight; + + @Schema(description = "轧制数量") + private Integer rolledCount; + + @Schema(description = "总轧制重量") + private Double totalRolledWeight; + + @Schema(description = "总轧制长度") + private Double totalRolledLength; + + @Schema(description = "总轧制数量") + private Integer totalRolledCount; + + @Schema(description = "修理次数") + private Integer grindCount; + + @Schema(description = "换辊类型") + private String changeType; + + @Schema(description = "Installation Time") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime instalTime; + + @Schema(description = "Deinstallation Time") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime deinstalTime; + + @Schema(description = "changeTime") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime changeTime; +} diff --git a/business/src/main/java/com/fizz/business/domain/Segment.java b/business/src/main/java/com/fizz/business/domain/Segment.java new file mode 100644 index 0000000..8472511 --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/Segment.java @@ -0,0 +1,477 @@ +package com.fizz.business.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Getter; +import lombok.Setter; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *

+ * 各机张力，电流等架跟踪表 + *

+ * + * @author baomidou + * @since 2023-05-17 + */ +@Getter +@Setter +@TableName("cpg_segment") +@Schema(title = "CpgSegment对象", description = "各机张力，电流等架跟踪表") +public class Segment implements Serializable { + + private static final long serialVersionUID = 1L; + + @Schema(description = "主键") + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + @Schema(description = "卷号") + private String entryMatId; + + @Schema(description = "分段id") + private Integer segNo; + + @Schema(description = "计划id") + private Long planId; + + @Schema(description = "计划号") + private String planNo; + + @Schema(description = "开始位置") + private Double startPosition; + + @Schema(description = "结束位置") + private Double endPosition; + + @Schema(description = "长度") + private Double segLength; + + private Integer val1num; + + private Integer val2num; + + private Integer val3num; + + private Integer val4num; + + private Integer val5num; + + private Integer val6num; + + private Integer val7num; + + private Integer val8num; + + private Integer val9num; + + private Integer val10num; + + private Double val1max; + + private Double val1min; + + private Double val1avg; + + private Integer val1cnt; + + private Double val2max; + + private Double val2min; + + private Double val2avg; + + private Integer val2cnt; + + private Double val3max; + + private Double val3min; + + private Double val3avg; + + private Integer val3cnt; + + private Double val4max; + + private Double val4min; + + private Double val4avg; + + private Integer val4cnt; + + private Double val5max; + + private Double val5min; + + private Double val5avg; + + private Integer val5cnt; + + private Double val6max; + + private Double val6min; + + private Double val6avg; + + private Integer val6cnt; + + private Double val7max; + + private Double val7min; + + private Double val7avg; + + private Integer val7cnt; + + private Double val8max; + + private Double val8min; + + private Double val8avg; + + private Integer val8cnt; + + private Double val9max; + + private Double val9min; + + private Double val9avg; + + private Integer val9cnt; + + private Double val10max; + + private Double val10min; + + private Double val10avg; + + private Integer val10cnt; + + private Double val11max; + + private Double val11min; + + private Double val11avg; + + private Integer val11cnt; + + private Double val12max; + + private Double val12min; + + private Double val12avg; + + private Integer val12cnt; + + private Double val13max; + + private Double val13min; + + private Double val13avg; + + private Integer val13cnt; + + private Double val14max; + + private Double val14min; + + private Double val14avg; + + private Integer val14cnt; + + private Double val15max; + + private Double val15min; + + private Double val15avg; + + private Integer val15cnt; + + private Double val16max; + + private Double val16min; + + private Double val16avg; + + private Integer val16cnt; + + private Double val17max; + + private Double val17min; + + private Double val17avg; + + private Integer val17cnt; + + private Double val18max; + + private Double val18min; + + private Double val18avg; + + private Integer val18cnt; + + private Double val19max; + + private Double val19min; + + private Double val19avg; + + private Integer val19cnt; + + private Double val20max; + + private Double val20min; + + private Double val20avg; + + private Integer val20cnt; + + private Double val21max; + + private Double val21min; + + private Double val21avg; + + private Integer val21cnt; + + private Double val22max; + + private Double val22min; + + private Double val22avg; + + private Integer val22cnt; + + private Double val23max; + + private Double val23min; + + private Double val23avg; + + private Integer val23cnt; + + private Double val24max; + + private Double val24min; + + private Double val24avg; + + private Integer val24cnt; + + private Double val25max; + + private Double val25min; + + private Double val25avg; + + private Integer val25cnt; + + private Double val26max; + + private Double val26min; + + private Double val26avg; + + private Integer val26cnt; + + private Double val27max; + + private Double val27min; + + private Double val27avg; + + private Integer val27cnt; + + private Double val28max; + + private Double val28min; + + private Double val28avg; + + private Integer val28cnt; + + private Double val29max; + + private Double val29min; + + private Double val29avg; + + private Integer val29cnt; + + private Double val30max; + + private Double val30min; + + private Double val30avg; + + private Integer val30cnt; + + private Double val31max; + + private Double val31min; + + private Double val31avg; + + private Integer val31cnt; + + private Double val32max; + + private Double val32min; + + private Double val32avg; + + private Integer val32cnt; + + private Double val33max; + + private Double val33min; + + private Double val33avg; + + private Integer val33cnt; + + private Double val34max; + + private Double val34min; + + private Double val34avg; + + private Integer val34cnt; + + private Double val35max; + + private Double val35min; + + private Double val35avg; + + private Integer val35cnt; + + private Double val36max; + + private Double val36min; + + private Double val36avg; + + private Integer val36cnt; + + private Double val37max; + + private Double val37min; + + private Double val37avg; + + private Integer val37cnt; + + private Double val38max; + + private Double val38min; + + private Double val38avg; + + private Integer val38cnt; + + private Double val39max; + + private Double val39min; + + private Double val39avg; + + private Integer val39cnt; + + private Double val40max; + + private Double val40min; + + private Double val40avg; + + private Integer val40cnt; + + private Double val41max; + + private Double val41min; + + private Double val41avg; + + private Integer val41cnt; + + private Double val42max; + + private Double val42min; + + private Double val42avg; + + private Integer val42cnt; + + private Double val43max; + + private Double val43min; + + private Double val43avg; + + private Integer val43cnt; + + private Double val44max; + + private Double val44min; + + private Double val44avg; + + private Integer val44cnt; + + private Double val45max; + + private Double val45min; + + private Double val45avg; + + private Integer val45cnt; + + private Double val46max; + + private Double val46min; + + private Double val46avg; + + private Integer val46cnt; + + private Double val47max; + + private Double val47min; + + private Double val47avg; + + private Integer val47cnt; + + private Double val48max; + + private Double val48min; + + private Double val48avg; + + private Integer val48cnt; + + private Double val49max; + + private Double val49min; + + private Double val49avg; + + private Integer val49cnt; + + private Double val50max; + + private Double val50min; + + private Double val50avg; + + private Integer val50cnt; + + private LocalDateTime createTime; + + private LocalDateTime updateTime; +} diff --git a/business/src/main/java/com/fizz/business/domain/SegmentTotal.java b/business/src/main/java/com/fizz/business/domain/SegmentTotal.java new file mode 100644 index 0000000..87ac806 --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/SegmentTotal.java @@ -0,0 +1,357 @@ +package com.fizz.business.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Getter; +import lombok.Setter; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *

+ * 各机张力，电流等架跟踪表 + *

+ * + * @author baomidou + * @since 2023-10-26 + */ +@Getter +@Setter +@TableName("cpg_segment_total") +@Schema(title = "CpgSegmentTotal对象", description = "各机张力，电流等架跟踪表") +public class SegmentTotal implements Serializable { + + private static final long serialVersionUID = 1L; + + @Schema(description = "主键") + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + @Schema(description = "卷号") + private String entryMatId; + + @Schema(description = "分段id") + private Integer segNo; + + @Schema(description = "计划id") + private Long planId; + + @Schema(description = "计划号") + private String planNo; + + @Schema(description = "开始位置") + private Double startPosition; + + @Schema(description = "结束位置") + private Double endPosition; + + @Schema(description = "长度") + private Double segLength; + + private Double tval1avg; + + private Double tval2avg; + + private Double tval3avg; + + private Double tval4avg; + + private Double tval5avg; + + private Double tval6avg; + + private Double tval7avg; + + private Double tval8avg; + + private Double tval9avg; + + private Double tval10avg; + + private Double tval11avg; + + private Double tval12avg; + + private Double tval13avg; + + private Double tval14avg; + + private Double tval15avg; + + private Double tval16avg; + + private Double tval17avg; + + private Double tval18avg; + + private Double tval19avg; + + private Double tval20avg; + + private Double tval21avg; + + private Double tval22avg; + + private Double tval23avg; + + private Double tval24avg; + + private Double tval25avg; + + private Double tval26avg; + + private Double tval27avg; + + private Double tval28avg; + + private Double tval29avg; + + private Double tval30avg; + + private Double tval31avg; + + private Double tval32avg; + + private Double tval33avg; + + private Double tval34avg; + + private Double tval35avg; + + private Double tval36avg; + + private Double tval37avg; + + private Double tval38avg; + + private Double tval39avg; + + private Double tval40avg; + + private Double tval41avg; + + private Double tval42avg; + + private Double tval43avg; + + private Double tval44avg; + + private Double tval45avg; + + private Double tval46avg; + + private Double tval47avg; + + private Double tval48avg; + + private Double tval49avg; + + private Double tval50avg; + + private Double tval51avg; + + private Double tval52avg; + + private Double tval53avg; + + private Double tval54avg; + + private Double tval55avg; + + private Double tval56avg; + + private Double tval57avg; + + private Double tval58avg; + + private Double tval59avg; + + private Double tval60avg; + + private Double tval61avg; + + private Double tval62avg; + + private Double tval63avg; + + private Double tval64avg; + + private Double tval65avg; + + private Double tval66avg; + + private Double tval67avg; + + private Double tval68avg; + + private Double tval69avg; + + private Double tval70avg; + + private Double tval71avg; + + private Double tval72avg; + + private Double tval73avg; + + private Double tval74avg; + + private Double tval75avg; + + private Double tval76avg; + + private Double tval77avg; + + private Double tval78avg; + + private Double tval79avg; + + private Double tval80avg; + + private Double tval81avg; + + private Double tval82avg; + + private Double tval83avg; + + private Double tval84avg; + + private Double tval85avg; + + private Double tval86avg; + + private Double tval87avg; + + private Double tval88avg; + + private Double tval89avg; + + private Double tval90avg; + + private Double tval91avg; + + private Double tval92avg; + + private Double tval93avg; + + private Double tval94avg; + + private Double tval95avg; + + private Double tval96avg; + + private Double tval97avg; + + private Double tval98avg; + + private Double tval99avg; + + private Double tval100avg; + + private Double tval101avg; + + private Double tval102avg; + + private Double tval103avg; + + private Double tval104avg; + + private Double tval105avg; + + private Double tval106avg; + + private Double tval107avg; + + private Double tval108avg; + + private Double tval109avg; + + private Double tval110avg; + + private Double tval111avg; + + private Double tval112avg; + + private Double tval113avg; + + private Double tval114avg; + + private Double tval115avg; + + private Double tval116avg; + + private Double tval117avg; + + private Double tval118avg; + + private Double tval119avg; + + private Double tval120avg; + + private Double tval121avg; + + private Double tval122avg; + + private Double tval123avg; + + private Double tval124avg; + + private Double tval125avg; + + private Double tval126avg; + + private Double tval127avg; + + private Double tval128avg; + + private Double tval129avg; + + private Double tval130avg; + + private Double tval131avg; + + private Double tval132avg; + + private Double tval133avg; + + private Double tval134avg; + + private Double tval135avg; + + private Double tval136avg; + + private Double tval137avg; + + private Double tval138avg; + + private Double tval139avg; + + private Double tval140avg; + + private Double tval141avg; + + private Double tval142avg; + + private Double tval143avg; + + private Double tval144avg; + + private Double tval145avg; + + private Double tval146avg; + + private Double tval147avg; + + private Double tval148avg; + + private Double tval149avg; + + private Double tval150avg; + + private LocalDateTime createTime; + + private LocalDateTime updateTime; +} diff --git a/business/src/main/java/com/fizz/business/domain/SetupFurTemp.java b/business/src/main/java/com/fizz/business/domain/SetupFurTemp.java new file mode 100644 index 0000000..c4d9dcd --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/SetupFurTemp.java @@ -0,0 +1,172 @@ +package com.fizz.business.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 炉火段工艺参数对象 setup_fur_temp + * + * @author ruoyi + * @date 2025-09-29 + */ +public class SetupFurTemp extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private String steelGrade; + + /** 预热段出口板温 */ + @Excel(name = "预热段出口板温") + private Long value1; + + /** 加热段出口板温 */ + @Excel(name = "加热段出口板温") + private Long value2; + + /** 冷却段出口板温 */ + @Excel(name = "冷却段出口板温") + private Long value3; + + /** $column.columnComment */ + private Long value4; + + /** $column.columnComment */ + private Long value5; + + /** $column.columnComment */ + private Long value6; + + /** $column.columnComment */ + private Long value7; + + /** $column.columnComment */ + private Long value8; + + /** $column.columnComment */ + private Long value9; + + /** $column.columnComment */ + private Long value10; + + public void setSteelGrade(String steelGrade) + { + this.steelGrade = steelGrade; + } + + public String getSteelGrade() + { + return steelGrade; + } + public void setValue1(Long value1) + { + this.value1 = value1; + } + + public Long getValue1() + { + return value1; + } + public void setValue2(Long value2) + { + this.value2 = value2; + } + + public Long getValue2() + { + return value2; + } + public void setValue3(Long value3) + { + this.value3 = value3; + } + + public Long getValue3() + { + return value3; + } + public void setValue4(Long value4) + { + this.value4 = value4; + } + + public Long getValue4() + { + return value4; + } + public void setValue5(Long value5) + { + this.value5 = value5; + } + + public Long getValue5() + { + return value5; + } + public void setValue6(Long value6) + { + this.value6 = value6; + } + + public Long getValue6() + { + return value6; + } + public void setValue7(Long value7) + { + this.value7 = value7; + } + + public Long getValue7() + { + return value7; + } + public void setValue8(Long value8) + { + this.value8 = value8; + } + + public Long getValue8() + { + return value8; + } + public void setValue9(Long value9) + { + this.value9 = value9; + } + + public Long getValue9() + { + return value9; + } + public void setValue10(Long value10) + { + this.value10 = value10; + } + + public Long getValue10() + { + return value10; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("steelGrade", getSteelGrade()) + .append("value1", getValue1()) + .append("value2", getValue2()) + .append("value3", getValue3()) + .append("value4", getValue4()) + .append("value5", getValue5()) + .append("value6", getValue6()) + .append("value7", getValue7()) + .append("value8", getValue8()) + .append("value9", getValue9()) + .append("value10", getValue10()) + .append("updateTime", getUpdateTime()) + .append("createTime", getCreateTime()) + .toString(); + } +} diff --git a/business/src/main/java/com/fizz/business/domain/SetupTension.java b/business/src/main/java/com/fizz/business/domain/SetupTension.java new file mode 100644 index 0000000..c440d5d --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/SetupTension.java @@ -0,0 +1,262 @@ +package com.fizz.business.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 全线张力对象 setup_tension + * + * @author ruoyi + * @date 2025-09-26 + */ +public class SetupTension extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private Long thick; + + /** 强度 */ + private Long yieldStren; + + /** 开卷机张力 */ + @Excel(name = "开卷机张力") + private Long value1; + + /** 入口活套 */ + @Excel(name = "入口活套") + private Long value2; + + /** 清洗段 */ + @Excel(name = "清洗段") + private Long value3; + + /** 炉区张力 */ + @Excel(name = "炉区张力") + private Long value4; + + /** 冷却塔 */ + @Excel(name = "冷却塔") + private Long value5; + + /** 光整机-不投 */ + @Excel(name = "光整机-不投") + private Long value6; + + /** 光整机入口 */ + @Excel(name = "光整机入口") + private Long value7; + + /** 光整机出口 */ + @Excel(name = "光整机出口") + private Long value8; + + /** 拉矫机-不投 */ + @Excel(name = "拉矫机-不投") + private Long value9; + + /** 拉矫机出口 */ + @Excel(name = "拉矫机出口") + private Long value10; + + /** 后处理 */ + @Excel(name = "后处理") + private Long value11; + + /** 出口活套 */ + @Excel(name = "出口活套") + private Long value12; + + /** 卷取机 */ + @Excel(name = "卷取机") + private Long value13; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value14; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value15; + + public void setThick(Long thick) + { + this.thick = thick; + } + + public Long getThick() + { + return thick; + } + public void setYieldStren(Long yieldStren) + { + this.yieldStren = yieldStren; + } + + public Long getYieldStren() + { + return yieldStren; + } + public void setValue1(Long value1) + { + this.value1 = value1; + } + + public Long getValue1() + { + return value1; + } + public void setValue2(Long value2) + { + this.value2 = value2; + } + + public Long getValue2() + { + return value2; + } + public void setValue3(Long value3) + { + this.value3 = value3; + } + + public Long getValue3() + { + return value3; + } + public void setValue4(Long value4) + { + this.value4 = value4; + } + + public Long getValue4() + { + return value4; + } + public void setValue5(Long value5) + { + this.value5 = value5; + } + + public Long getValue5() + { + return value5; + } + public void setValue6(Long value6) + { + this.value6 = value6; + } + + public Long getValue6() + { + return value6; + } + public void setValue7(Long value7) + { + this.value7 = value7; + } + + public Long getValue7() + { + return value7; + } + public void setValue8(Long value8) + { + this.value8 = value8; + } + + public Long getValue8() + { + return value8; + } + public void setValue9(Long value9) + { + this.value9 = value9; + } + + public Long getValue9() + { + return value9; + } + public void setValue10(Long value10) + { + this.value10 = value10; + } + + public Long getValue10() + { + return value10; + } + public void setValue11(Long value11) + { + this.value11 = value11; + } + + public Long getValue11() + { + return value11; + } + public void setValue12(Long value12) + { + this.value12 = value12; + } + + public Long getValue12() + { + return value12; + } + public void setValue13(Long value13) + { + this.value13 = value13; + } + + public Long getValue13() + { + return value13; + } + public void setValue14(Long value14) + { + this.value14 = value14; + } + + public Long getValue14() + { + return value14; + } + public void setValue15(Long value15) + { + this.value15 = value15; + } + + public Long getValue15() + { + return value15; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("thick", getThick()) + .append("yieldStren", getYieldStren()) + .append("value1", getValue1()) + .append("value2", getValue2()) + .append("value3", getValue3()) + .append("value4", getValue4()) + .append("value5", getValue5()) + .append("value6", getValue6()) + .append("value7", getValue7()) + .append("value8", getValue8()) + .append("value9", getValue9()) + .append("value10", getValue10()) + .append("value11", getValue11()) + .append("value12", getValue12()) + .append("value13", getValue13()) + .append("value14", getValue14()) + .append("value15", getValue15()) + .append("createTime", getCreateTime()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/business/src/main/java/com/fizz/business/domain/SetupTl.java b/business/src/main/java/com/fizz/business/domain/SetupTl.java new file mode 100644 index 0000000..a9d9e68 --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/SetupTl.java @@ -0,0 +1,205 @@ +package com.fizz.business.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 拉矫机参数对象 setup_tl + * + * @author ruoyi + * @date 2025-09-26 + */ +public class SetupTl extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private String steelGrade; + + /** $column.columnComment */ + private Long yieldStren; + + /** $column.columnComment */ + private Long thick; + + /** 延伸率 */ + @Excel(name = "延伸率") + private Long value1; + + /** 矫直辊插入量1 */ + @Excel(name = "矫直辊插入量1") + private Long value2; + + /** 矫直辊插入量2 */ + @Excel(name = "矫直辊插入量2") + private Long value3; + + /** 防横弓插入量 */ + @Excel(name = "防横弓插入量") + private Long value4; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value5; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value6; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value7; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value8; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value9; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value10; + + public void setSteelGrade(String steelGrade) + { + this.steelGrade = steelGrade; + } + + public String getSteelGrade() + { + return steelGrade; + } + public void setYieldStren(Long yieldStren) + { + this.yieldStren = yieldStren; + } + + public Long getYieldStren() + { + return yieldStren; + } + public void setThick(Long thick) + { + this.thick = thick; + } + + public Long getThick() + { + return thick; + } + public void setValue1(Long value1) + { + this.value1 = value1; + } + + public Long getValue1() + { + return value1; + } + public void setValue2(Long value2) + { + this.value2 = value2; + } + + public Long getValue2() + { + return value2; + } + public void setValue3(Long value3) + { + this.value3 = value3; + } + + public Long getValue3() + { + return value3; + } + public void setValue4(Long value4) + { + this.value4 = value4; + } + + public Long getValue4() + { + return value4; + } + public void setValue5(Long value5) + { + this.value5 = value5; + } + + public Long getValue5() + { + return value5; + } + public void setValue6(Long value6) + { + this.value6 = value6; + } + + public Long getValue6() + { + return value6; + } + public void setValue7(Long value7) + { + this.value7 = value7; + } + + public Long getValue7() + { + return value7; + } + public void setValue8(Long value8) + { + this.value8 = value8; + } + + public Long getValue8() + { + return value8; + } + public void setValue9(Long value9) + { + this.value9 = value9; + } + + public Long getValue9() + { + return value9; + } + public void setValue10(Long value10) + { + this.value10 = value10; + } + + public Long getValue10() + { + return value10; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("steelGrade", getSteelGrade()) + .append("yieldStren", getYieldStren()) + .append("thick", getThick()) + .append("value1", getValue1()) + .append("value2", getValue2()) + .append("value3", getValue3()) + .append("value4", getValue4()) + .append("value5", getValue5()) + .append("value6", getValue6()) + .append("value7", getValue7()) + .append("value8", getValue8()) + .append("value9", getValue9()) + .append("value10", getValue10()) + .append("updateTime", getUpdateTime()) + .append("createTime", getCreateTime()) + .toString(); + } +} diff --git a/business/src/main/java/com/fizz/business/domain/SetupTmBendforce.java b/business/src/main/java/com/fizz/business/domain/SetupTmBendforce.java new file mode 100644 index 0000000..2446848 --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/SetupTmBendforce.java @@ -0,0 +1,108 @@ +package com.fizz.business.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 光整机弯辊力对象 setup_tm_bendforce + * + * @author Joshi + * @date 2025-09-26 + */ +public class SetupTmBendforce extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 宽度 */ + private Long width; + + /** 轧制力 */ + private Long rollForce; + + /** 弯辊力 */ + @Excel(name = "弯辊力") + private Long value1; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value2; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value3; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value4; + + public void setWidth(Long width) + { + this.width = width; + } + + public Long getWidth() + { + return width; + } + public void setRollForce(Long rollForce) + { + this.rollForce = rollForce; + } + + public Long getRollForce() + { + return rollForce; + } + public void setValue1(Long value1) + { + this.value1 = value1; + } + + public Long getValue1() + { + return value1; + } + public void setValue2(Long value2) + { + this.value2 = value2; + } + + public Long getValue2() + { + return value2; + } + public void setValue3(Long value3) + { + this.value3 = value3; + } + + public Long getValue3() + { + return value3; + } + public void setValue4(Long value4) + { + this.value4 = value4; + } + + public Long getValue4() + { + return value4; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("width", getWidth()) + .append("rollForce", getRollForce()) + .append("value1", getValue1()) + .append("value2", getValue2()) + .append("value3", getValue3()) + .append("value4", getValue4()) + .append("updateTime", getUpdateTime()) + .append("createTime", getCreateTime()) + .toString(); + } +} diff --git a/business/src/main/java/com/fizz/business/domain/SetupTmMesh.java b/business/src/main/java/com/fizz/business/domain/SetupTmMesh.java new file mode 100644 index 0000000..b50bf91 --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/SetupTmMesh.java @@ -0,0 +1,205 @@ +package com.fizz.business.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 光整机插入量对象 setup_tm_mesh + * + * @author Joshi + * @date 2025-09-26 + */ +public class SetupTmMesh extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private String steelGrade; + + /** $column.columnComment */ + private Long yieldStren; + + /** $column.columnComment */ + private Long thick; + + /** 防皱辊插入量 */ + @Excel(name = "防皱辊插入量") + private Long value1; + + /** 防颤辊插入量 */ + @Excel(name = "防颤辊插入量") + private Long value2; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value3; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value4; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value5; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value6; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value7; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value8; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value9; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value10; + + public void setSteelGrade(String steelGrade) + { + this.steelGrade = steelGrade; + } + + public String getSteelGrade() + { + return steelGrade; + } + public void setYieldStren(Long yieldStren) + { + this.yieldStren = yieldStren; + } + + public Long getYieldStren() + { + return yieldStren; + } + public void setThick(Long thick) + { + this.thick = thick; + } + + public Long getThick() + { + return thick; + } + public void setValue1(Long value1) + { + this.value1 = value1; + } + + public Long getValue1() + { + return value1; + } + public void setValue2(Long value2) + { + this.value2 = value2; + } + + public Long getValue2() + { + return value2; + } + public void setValue3(Long value3) + { + this.value3 = value3; + } + + public Long getValue3() + { + return value3; + } + public void setValue4(Long value4) + { + this.value4 = value4; + } + + public Long getValue4() + { + return value4; + } + public void setValue5(Long value5) + { + this.value5 = value5; + } + + public Long getValue5() + { + return value5; + } + public void setValue6(Long value6) + { + this.value6 = value6; + } + + public Long getValue6() + { + return value6; + } + public void setValue7(Long value7) + { + this.value7 = value7; + } + + public Long getValue7() + { + return value7; + } + public void setValue8(Long value8) + { + this.value8 = value8; + } + + public Long getValue8() + { + return value8; + } + public void setValue9(Long value9) + { + this.value9 = value9; + } + + public Long getValue9() + { + return value9; + } + public void setValue10(Long value10) + { + this.value10 = value10; + } + + public Long getValue10() + { + return value10; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("steelGrade", getSteelGrade()) + .append("yieldStren", getYieldStren()) + .append("thick", getThick()) + .append("value1", getValue1()) + .append("value2", getValue2()) + .append("value3", getValue3()) + .append("value4", getValue4()) + .append("value5", getValue5()) + .append("value6", getValue6()) + .append("value7", getValue7()) + .append("value8", getValue8()) + .append("value9", getValue9()) + .append("value10", getValue10()) + .append("updateTime", getUpdateTime()) + .append("createTime", getCreateTime()) + .toString(); + } +} diff --git a/business/src/main/java/com/fizz/business/domain/SetupTmRollforce.java b/business/src/main/java/com/fizz/business/domain/SetupTmRollforce.java new file mode 100644 index 0000000..5ba1a86 --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/SetupTmRollforce.java @@ -0,0 +1,218 @@ +package com.fizz.business.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 光整机轧制力对象 setup_tm_rollforce + * + * @author Joshi + * @date 2025-09-26 + */ +public class SetupTmRollforce extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private String steelGrade; + + /** $column.columnComment */ + private Long thick; + + /** $column.columnComment */ + private Long yieldStren; + + /** 延伸率 */ + private Long elong; + + /** 轧制力 */ + @Excel(name = "轧制力") + private Long value1; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value2; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value3; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value4; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value5; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value6; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value7; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value8; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value9; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value10; + + public void setSteelGrade(String steelGrade) + { + this.steelGrade = steelGrade; + } + + public String getSteelGrade() + { + return steelGrade; + } + public void setThick(Long thick) + { + this.thick = thick; + } + + public Long getThick() + { + return thick; + } + public void setYieldStren(Long yieldStren) + { + this.yieldStren = yieldStren; + } + + public Long getYieldStren() + { + return yieldStren; + } + public void setElong(Long elong) + { + this.elong = elong; + } + + public Long getElong() + { + return elong; + } + public void setValue1(Long value1) + { + this.value1 = value1; + } + + public Long getValue1() + { + return value1; + } + public void setValue2(Long value2) + { + this.value2 = value2; + } + + public Long getValue2() + { + return value2; + } + public void setValue3(Long value3) + { + this.value3 = value3; + } + + public Long getValue3() + { + return value3; + } + public void setValue4(Long value4) + { + this.value4 = value4; + } + + public Long getValue4() + { + return value4; + } + public void setValue5(Long value5) + { + this.value5 = value5; + } + + public Long getValue5() + { + return value5; + } + public void setValue6(Long value6) + { + this.value6 = value6; + } + + public Long getValue6() + { + return value6; + } + public void setValue7(Long value7) + { + this.value7 = value7; + } + + public Long getValue7() + { + return value7; + } + public void setValue8(Long value8) + { + this.value8 = value8; + } + + public Long getValue8() + { + return value8; + } + public void setValue9(Long value9) + { + this.value9 = value9; + } + + public Long getValue9() + { + return value9; + } + public void setValue10(Long value10) + { + this.value10 = value10; + } + + public Long getValue10() + { + return value10; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("steelGrade", getSteelGrade()) + .append("thick", getThick()) + .append("yieldStren", getYieldStren()) + .append("elong", getElong()) + .append("value1", getValue1()) + .append("value2", getValue2()) + .append("value3", getValue3()) + .append("value4", getValue4()) + .append("value5", getValue5()) + .append("value6", getValue6()) + .append("value7", getValue7()) + .append("value8", getValue8()) + .append("value9", getValue9()) + .append("value10", getValue10()) + .append("updateTime", getUpdateTime()) + .append("createTime", getCreateTime()) + .toString(); + } +} diff --git a/business/src/main/java/com/fizz/business/domain/ShiftHistory.java b/business/src/main/java/com/fizz/business/domain/ShiftHistory.java new file mode 100644 index 0000000..7d7dbf2 --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/ShiftHistory.java @@ -0,0 +1,27 @@ +package com.fizz.business.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +@TableName("shift_history") +@Data +@Schema( description = "轧辊数据") +public class ShiftHistory implements Serializable { + private static final long serialVersionUID = 1L; + + @Schema(description = "班次") + private String shift; + + @Schema(description = "组次") + private String crew; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Schema(description = "时间") + private LocalDateTime insdate; +} diff --git a/business/src/main/java/com/fizz/business/domain/StdAlloy.java b/business/src/main/java/com/fizz/business/domain/StdAlloy.java new file mode 100644 index 0000000..a8c259b --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/StdAlloy.java @@ -0,0 +1,83 @@ +package com.fizz.business.domain; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; +import java.time.LocalDateTime; + +@Data +public class StdAlloy { + + @TableId("GRADEID") + private Integer gradeid; // 对应数据库字段 GRADEID + + @TableField("NAME") + private String name; // 对应数据库字段 NAME + + @TableField("ORIGIN") + private Integer origin; // 对应数据库字段 ORIGIN + + @TableField("SIGMA0") + private Float sigma0; // 对应数据库字段 SIGMA0 + + @TableField("FIRST_SIGMA0") + private Float firstSigma0; // 对应数据库字段 FIRST_SIGMA0 + + @TableField("INIT_SIGMA") + private Float initSigma; // 对应数据库字段 INIT_SIGMA + + @TableField("RO") + private Float ro; // 对应数据库字段 RO + + @TableField("CLASSID") + private Integer classId; // 对应数据库字段 CLASSID + + @TableField("A") + private Float a; // 对应数据库字段 A + + @TableField("B") + private Float b; // 对应数据库字段 B + + @TableField("C") + private Float c; // 对应数据库字段 C + + @TableField("D") + private Float d; // 对应数据库字段 D + + @TableField("KC0") + private Float kc0; // 对应数据库字段 KC0 + + @TableField("KC1") + private Float kc1; // 对应数据库字段 KC1 + + @TableField("KC2") + private Float kc2; // 对应数据库字段 KC2 + + @TableField("KC3") + private Float kc3; // 对应数据库字段 KC3 + + @TableField("KC4") + private Float kc4; // 对应数据库字段 KC4 + + @TableField("NU") + private Float nu; // 对应数据库字段 NU + + @TableField("E") + private Float e; // 对应数据库字段 E + + @TableField("CHAL") + private Float chal; // 对应数据库字段 CHAL + + @TableField("TEMP0") + private Float temp0; // 对应数据库字段 TEMP0 + + @TableField("STRENGTH") + private Float strength; // 对应数据库字段 STRENGTH + + @TableField("WELD_CODE") + private Integer weldCode; // 对应数据库字段 WELD_CODE + + @TableField("INSDATE") + private LocalDateTime insDate; // 对应数据库字段 INSDATE + +} diff --git a/business/src/main/java/com/fizz/business/domain/SteelGradeInfo.java b/business/src/main/java/com/fizz/business/domain/SteelGradeInfo.java new file mode 100644 index 0000000..05be8f2 --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/SteelGradeInfo.java @@ -0,0 +1,39 @@ +package com.fizz.business.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; + + +@Data +@TableName("steel_grade_info") +public class SteelGradeInfo implements Serializable { + + @TableId(value = "steel_grade_id", type = IdType.AUTO) + @Schema(description = "钢种ID") + private Integer steelGradeId; + + @TableField("steel_grade_name") + @Schema(description = "钢种名称") + private String steelGradeName; + + @TableField("steel_grade_des") + @Schema(description = "钢种描述") + private String steelGradeDes; + + @TableField(value = "create_time", fill = FieldFill.INSERT) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Schema(description = "创建时间") + private LocalDateTime createTime; + + @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Schema(description = "更新时间") + private LocalDateTime updateTime; + + // Getters and Setters +} \ No newline at end of file diff --git a/business/src/main/java/com/fizz/business/domain/msg/AppMeasureCoatMessage.java b/business/src/main/java/com/fizz/business/domain/msg/AppMeasureCoatMessage.java new file mode 100644 index 0000000..452af2b --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/msg/AppMeasureCoatMessage.java @@ -0,0 +1,145 @@ +package com.fizz.business.domain.msg; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.math.BigDecimal; + +@Data +@EqualsAndHashCode(callSuper = true) +@Schema(description = "后处理段测量电文") +public class AppMeasureCoatMessage extends OpcMessage { + + @Schema(description = "系统计数器 (ms)") + private Integer systemCounter; + + @Schema(description = "钢带位置 (m)，0 表示头部在参考点 (weld detector 2)") + private BigDecimal stripLocation; + + @Schema(description = "测量次数 / 宽度") + private Integer measurementCount; + + @Schema(description = "上层平均涂层重量 (g/m²)") + private BigDecimal avrCoatingWeightTop; + + @Schema(description = "上层标准涂层重量 (g/m²)") + private BigDecimal stdCoatingWeightTop; + + @Schema(description = "上层最大涂层重量 (g/m²)") + private BigDecimal maxCoatingWeightTop; + + @Schema(description = "上层最小涂层重量 (g/m²)") + private BigDecimal minCoatingWeightTop; + + @Schema(description = "下层平均涂层重量 (g/m²)") + private BigDecimal avrCoatingWeightBottom; + + @Schema(description = "下层标准涂层重量 (g/m²)") + private BigDecimal stdCoatingWeightBottom; + + @Schema(description = "下层最大涂层重量 (g/m²)") + private BigDecimal maxCoatingWeightBottom; + + @Schema(description = "下层最小涂层重量 (g/m²)") + private BigDecimal minCoatingWeightBottom; + + @Schema(description = "气刀压力") + private BigDecimal airKnifePressure; + + @Schema(description = "气刀流量") + private BigDecimal airKnifeFlow; + + @Schema(description = "气刀间隙") + private BigDecimal airKnifeGap; + + @Schema(description = "TM出口钢带速度 (m/min)") + private BigDecimal stripSpeedTmExit; + + @Schema(description = "钢带张力 BR5 – TM (daN)") + private BigDecimal tensionBr5Tm; + + @Schema(description = "钢带张力 TM – BR6 (daN)") + private BigDecimal tensionTmBr6; + + @Schema(description = "钢带张力 BR5 – BR6 (daN)") + private BigDecimal tensionBr5Br6; + + @Schema(description = "TM mask (0x0001 tempering, 0x0002 type, 0x0004 pure water, 0x0008 water+detergent, 0x0010 control mode)") + private Integer tmMask; + + @Schema(description = "TM延伸率 (%)") + private BigDecimal tmElongation; + + @Schema(description = "操作侧辊压力 (kN)") + private BigDecimal rollForceOperator; + + @Schema(description = "驱动侧辊压力 (kN)") + private BigDecimal rollForceDrive; + + @Schema(description = "电机扭矩 (kNm)") + private BigDecimal motorTorque; + + @Schema(description = "总弯曲力 (kN)") + private BigDecimal bendingForce; + + @Schema(description = "防卷翘辊 - 网距 (mm)") + private BigDecimal antiCrimpingRollMesh; + + @Schema(description = "Billy Roll - 网距 (mm)") + private BigDecimal billyRollMesh; + + @Schema(description = "备用字段 1") + private BigDecimal spare1; + + @Schema(description = "备用字段 2") + private BigDecimal spare2; + + @Schema(description = "备用字段 3") + private BigDecimal spare3; + + @Schema(description = "钢带张力 TL – BR7 (calc., daN)") + private BigDecimal tensionTlBr7; + + @Schema(description = "钢带张力 BR6 – BR7 (calc., daN)") + private BigDecimal tensionBr6Br7; + + @Schema(description = "拉矫机投用") + private Integer tlFlag; + + @Schema(description = "TL延伸率 (%)") + private BigDecimal tlElongation; + + @Schema(description = "Leveling Unit N°1 - 网距 (mm)") + private BigDecimal levelingUnit1Mesh; + + @Schema(description = "Leveling Unit N°2 - 网距 (mm)") + private BigDecimal levelingUnit2Mesh; + + @Schema(description = "Anti Cross Bow Unit - 网距 (mm)") + private BigDecimal antiCrossBowUnitMesh; + + @Schema(description = "AFP段钢带张力 BR7 – BR8 (N/mm²)") + private BigDecimal tensionBr7Br8; + + @Schema(description = "AFP段钢带速度 (m/min)") + private BigDecimal stripSpeedAfp; + + @Schema(description = "钝化标记 1开启，2耐指纹，3干膜润滑剂") + private Integer coatingFlag; + + @Schema(description = "AFP段钢带温度 (℃)") + private Integer stripTempAfp; + + @Schema(description = "BR4BR5张力") + private BigDecimal tensionBr4Br5; + + @Schema(description = "锌锅温度") + private BigDecimal potTemperature; + + @Schema(description = "冷却塔温度") + private BigDecimal coolingTowerTemperature; + + @Schema(description = "锌锅功率") + private BigDecimal potPower; +} diff --git a/business/src/main/java/com/fizz/business/domain/msg/AppMeasureEntryMessage.java b/business/src/main/java/com/fizz/business/domain/msg/AppMeasureEntryMessage.java new file mode 100644 index 0000000..1f5b8c3 --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/msg/AppMeasureEntryMessage.java @@ -0,0 +1,74 @@ +package com.fizz.business.domain.msg; + + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.math.BigDecimal; + +@Data +@EqualsAndHashCode(callSuper = true) +@Schema(description = "入口段测量电文") +public class AppMeasureEntryMessage extends OpcMessage { + + @Schema(description = "系统计数器") + private Integer systemCounter; + + @Schema(description = "入口钢卷标识") + private String entryCoilId; + + @Schema(description = "钢带位置 (m)，0 表示头部在参考点 (Welder)") + private BigDecimal stripLocation; + + @Schema(description = "开卷机号，1 或 2") + private Integer payOffReelNumber; + + @Schema(description = "钢带张力 POR – BR1 (daN)") + private BigDecimal tensionPorBr1; + + @Schema(description = "钢带张力 BR1 – BR2 (daN)") + private BigDecimal tensionBr1Br2; + + @Schema(description = "钢带张力 BR2 – BR3 (daN)") + private BigDecimal tensionBr2Br3; + + @Schema(description = "钢带速度 (m/min)") + private BigDecimal stripSpeed; + + @Schema(description = "入口活套位置(m)") + private BigDecimal celLength; + + @Schema(description = "入口活套百分比(m)") + private BigDecimal celCapacity; + + @Schema(description = "入口活套张力(m)") + private BigDecimal tensionCel ; + + @Schema(description = "清洗电压 (V)") + private BigDecimal cleaningVoltage; + + @Schema(description = "清洗电流 (A)") + private BigDecimal cleaningCurrent; + + @Schema(description = "碱液浓度") + private BigDecimal alkaliConcentration; + + @Schema(description = "碱液温度 (℃)") + private BigDecimal alkaliTemperature; + + @Schema(description = "漂洗电导率") + private BigDecimal rinseConductivity; + + @Schema(description = "漂洗温度 (℃)") + private BigDecimal rinseTemperature; + + @Schema(description = "烘干温度 (℃)") + private BigDecimal dryingTemperature; + + @Schema(description = "热风流量 (m3/h)") + private BigDecimal hotAirFlow; + + @Schema(description = "热风压力 (Pa)") + private BigDecimal hotAirPressure; +} diff --git a/business/src/main/java/com/fizz/business/domain/msg/AppMeasureExitMessage.java b/business/src/main/java/com/fizz/business/domain/msg/AppMeasureExitMessage.java new file mode 100644 index 0000000..202d9de --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/msg/AppMeasureExitMessage.java @@ -0,0 +1,51 @@ +package com.fizz.business.domain.msg; + + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.math.BigDecimal; + +@Data +@EqualsAndHashCode(callSuper = true) +@Schema(description = "出口段/工艺段测量电文") +public class AppMeasureExitMessage extends OpcMessage { + + @Schema(description = "系统计数器 (ms)") + private Integer systemCounter; + + @Schema(description = "钢带位置 (m)，0 表示头部在参考点 (weld detector 3)") + private BigDecimal stripLocation; + + @Schema(description = "钢带张力 BR8 – BR9 (daN)") + private BigDecimal tensionBr8Br9; + + @Schema(description = "出口活套位置(m)") + private BigDecimal cxlLength; + + @Schema(description = "出口活套百分比(m)") + private BigDecimal cxlCapacity; + + @Schema(description = "出口活套张力(m)") + private BigDecimal tensionCxl ; + + @Schema(description = "涂油标志 (0=no, 1=yes)") + private Integer oilingFlag; + + @Schema(description = "上层涂油量 (g/m²)") + private BigDecimal oilingAmountTop; + + @Schema(description = "下层涂油量 (g/m²)") + private BigDecimal oilingAmountBottom; + + @Schema(description = "钢带张力 BR9 – TR (daN)") + private BigDecimal tensionBr9Tr; + + @Schema(description = "出口段钢带速度 (m/min)") + private BigDecimal speedExitSection; + + @Schema(description = "钢卷长度 (m)") + private BigDecimal coilLength; +} + diff --git a/business/src/main/java/com/fizz/business/domain/msg/AppMeasureFurnaceMessage.java b/business/src/main/java/com/fizz/business/domain/msg/AppMeasureFurnaceMessage.java new file mode 100644 index 0000000..c0630c3 --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/msg/AppMeasureFurnaceMessage.java @@ -0,0 +1,537 @@ +package com.fizz.business.domain.msg; + + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.math.BigDecimal; + +@Data +@EqualsAndHashCode(callSuper = true) +@Schema(description = "退火炉段测量电文") +public class AppMeasureFurnaceMessage extends OpcMessage { + + @Schema(description = "系统计数器 (ms)") + private BigDecimal systemCounter; + + @Schema(description = "Entry coil identification") + private String entryCoilId; + + @Schema(description = "Strip location (0 for strip head at reference point (weld detector 1))") + private BigDecimal stripLocation; + + @Schema(description = "PH炉温实际值") + private BigDecimal phFurnaceTemperatureActual; + + @Schema(description = "NOF1炉温实际值") + private BigDecimal nof1FurnaceTemperatureActual; + + @Schema(description = "NOF1炉温设定值") + private BigDecimal nof1FurnaceTemperatureSet; + + @Schema(description = "NOF1炉温控制输出值") + private BigDecimal nof1FurnaceTemperatureControlOutput; + + @Schema(description = "NOF1燃气流量实际值") + private BigDecimal nof1GasFlowActual; + + @Schema(description = "NOF1燃气流量设定值") + private BigDecimal nof1GasFlowSet; + + @Schema(description = "NOF1燃气流量控制输出值") + private BigDecimal nof1GasFlowControlOutput; + + @Schema(description = "NOF1空气流量实际值") + private BigDecimal nof1AirFlowActual; + + @Schema(description = "NOF1空气流量设定值") + private BigDecimal nof1AirFlowSet; + + @Schema(description = "NOF1空气流量控制输出值") + private BigDecimal nof1AirFlowControlOutput; + + @Schema(description = "NOF1空燃比实际值") + private BigDecimal nof1AirFuelRatioActual; + + @Schema(description = "NOF1空燃比设定值") + private BigDecimal nof1AirFuelRatioSet; + + @Schema(description = "NOF2炉温实际值") + private BigDecimal nof2FurnaceTemperatureActual; + + @Schema(description = "NOF2炉温设定值") + private BigDecimal nof2FurnaceTemperatureSet; + + @Schema(description = "NOF2炉温控制输出值") + private BigDecimal nof2FurnaceTemperatureControlOutput; + + @Schema(description = "NOF2燃气流量实际值") + private BigDecimal nof2GasFlowActual; + + @Schema(description = "NOF2燃气流量设定值") + private BigDecimal nof2GasFlowSet; + + @Schema(description = "NOF2燃气流量控制输出值") + private BigDecimal nof2GasFlowControlOutput; + + @Schema(description = "NOF2空气流量实际值") + private BigDecimal nof2AirFlowActual; + + @Schema(description = "NOF2空气流量设定值") + private BigDecimal nof2AirFlowSet; + + @Schema(description = "NOF2空气流量控制输出值") + private BigDecimal nof2AirFlowControlOutput; + + @Schema(description = "NOF2空燃比实际值") + private BigDecimal nof2AirFuelRatioActual; + + @Schema(description = "NOF2空燃比设定值") + private BigDecimal nof2AirFuelRatioSet; + + @Schema(description = "NOF3炉温实际值") + private BigDecimal nof3FurnaceTemperatureActual; + + @Schema(description = "NOF3炉温设定值") + private BigDecimal nof3FurnaceTemperatureSet; + + @Schema(description = "NOF3炉温控制输出值") + private BigDecimal nof3FurnaceTemperatureControlOutput; + + @Schema(description = "NOF3燃气流量实际值") + private BigDecimal nof3GasFlowActual; + + @Schema(description = "NOF3燃气流量设定值") + private BigDecimal nof3GasFlowSet; + + @Schema(description = "NOF3燃气流量控制输出值") + private BigDecimal nof3GasFlowControlOutput; + + @Schema(description = "NOF3空气流量实际值") + private BigDecimal nof3AirFlowActual; + + @Schema(description = "NOF3空气流量设定值") + private BigDecimal nof3AirFlowSet; + + @Schema(description = "NOF3空气流量控制输出值") + private BigDecimal nof3AirFlowControlOutput; + + @Schema(description = "NOF3空燃比实际值") + private BigDecimal nof3AirFuelRatioActual; + + @Schema(description = "NOF3空燃比设定值") + private BigDecimal nof3AirFuelRatioSet; + + @Schema(description = "NOF4炉温实际值") + private BigDecimal nof4FurnaceTemperatureActual; + + @Schema(description = "NOF4炉温设定值") + private BigDecimal nof4FurnaceTemperatureSet; + + @Schema(description = "NOF4炉温控制输出值") + private BigDecimal nof4FurnaceTemperatureControlOutput; + + @Schema(description = "NOF4燃气流量实际值") + private BigDecimal nof4GasFlowActual; + + @Schema(description = "NOF4燃气流量设定值") + private BigDecimal nof4GasFlowSet; + + @Schema(description = "NOF4燃气流量控制输出值") + private BigDecimal nof4GasFlowControlOutput; + + @Schema(description = "NOF4空气流量实际值") + private BigDecimal nof4AirFlowActual; + + @Schema(description = "NOF4空气流量设定值") + private BigDecimal nof4AirFlowSet; + + @Schema(description = "NOF4空气流量控制输出值") + private BigDecimal nof4AirFlowControlOutput; + + @Schema(description = "NOF4空燃比实际值") + private BigDecimal nof4AirFuelRatioActual; + + @Schema(description = "NOF4空燃比设定值") + private BigDecimal nof4AirFuelRatioSet; + + @Schema(description = "NOF5炉温实际值") + private BigDecimal nof5FurnaceTemperatureActual; + + @Schema(description = "NOF5炉温设定值") + private BigDecimal nof5FurnaceTemperatureSet; + + @Schema(description = "NOF5炉温控制输出值") + private BigDecimal nof5FurnaceTemperatureControlOutput; + + @Schema(description = "NOF5燃气流量实际值") + private BigDecimal nof5GasFlowActual; + + @Schema(description = "NOF5燃气流量设定值") + private BigDecimal nof5GasFlowSet; + + @Schema(description = "NOF5燃气流量控制输出值") + private BigDecimal nof5GasFlowControlOutput; + + @Schema(description = "NOF5空气流量实际值") + private BigDecimal nof5AirFlowActual; + + @Schema(description = "NOF5空气流量设定值") + private BigDecimal nof5AirFlowSet; + + @Schema(description = "NOF5空气流量控制输出值") + private BigDecimal nof5AirFlowControlOutput; + + @Schema(description = "NOF5空燃比实际值") + private BigDecimal nof5AirFuelRatioActual; + + @Schema(description = "NOF5空燃比设定值") + private BigDecimal nof5AirFuelRatioSet; + + @Schema(description = "RTF1炉温实际值") + private BigDecimal rtf1FurnaceTemperatureActual; + + @Schema(description = "RTF1炉温设定值") + private BigDecimal rtf1FurnaceTemperatureSet; + + @Schema(description = "RTF1炉温控制输出值") + private BigDecimal rtf1FurnaceTemperatureControlOutput; + + @Schema(description = "RTF1燃气流量实际值") + private BigDecimal rtf1GasFlowActual; + + @Schema(description = "RTF1燃气流量设定值") + private BigDecimal rtf1GasFlowSet; + + @Schema(description = "RTF1燃气流量控制输出值") + private BigDecimal rtf1GasFlowControlOutput; + + @Schema(description = "RTF1空气流量实际值") + private BigDecimal rtf1AirFlowActual; + + @Schema(description = "RTF1空气流量设定值") + private BigDecimal rtf1AirFlowSet; + + @Schema(description = "RTF1空气流量控制输出值") + private BigDecimal rtf1AirFlowControlOutput; + + @Schema(description = "RTF1空燃比实际值") + private BigDecimal rtf1AirFuelRatioActual; + + @Schema(description = "RTF1空燃比设定值") + private BigDecimal rtf1AirFuelRatioSet; + + @Schema(description = "RTF2炉温实际值") + private BigDecimal rtf2FurnaceTemperatureActual; + + @Schema(description = "RTF2炉温设定值") + private BigDecimal rtf2FurnaceTemperatureSet; + + @Schema(description = "RTF2炉温控制输出值") + private BigDecimal rtf2FurnaceTemperatureControlOutput; + + @Schema(description = "RTF2燃气流量实际值") + private BigDecimal rtf2GasFlowActual; + + @Schema(description = "RTF2燃气流量设定值") + private BigDecimal rtf2GasFlowSet; + + @Schema(description = "RTF2燃气流量控制输出值") + private BigDecimal rtf2GasFlowControlOutput; + + @Schema(description = "RTF2空气流量实际值") + private BigDecimal rtf2AirFlowActual; + + @Schema(description = "RTF2空气流量设定值") + private BigDecimal rtf2AirFlowSet; + + @Schema(description = "RTF2空气流量控制输出值") + private BigDecimal rtf2AirFlowControlOutput; + + @Schema(description = "RTF2空燃比实际值") + private BigDecimal rtf2AirFuelRatioActual; + + @Schema(description = "RTF2空燃比设定值") + private BigDecimal rtf2AirFuelRatioSet; + + @Schema(description = "SF炉温实际值") + private BigDecimal sfFurnaceTemperatureActual; + + @Schema(description = "SF炉温设定值") + private BigDecimal sfFurnaceTemperatureSet; + + @Schema(description = "SF炉温控制输出值") + private BigDecimal sfFurnaceTemperatureControlOutput; + + @Schema(description = "SF燃气流量实际值") + private BigDecimal sfGasFlowActual; + + @Schema(description = "SF燃气流量设定值") + private BigDecimal sfGasFlowSet; + + @Schema(description = "SF燃气流量控制输出值") + private BigDecimal sfGasFlowControlOutput; + + @Schema(description = "SF空气流量实际值") + private BigDecimal sfAirFlowActual; + + @Schema(description = "SF空气流量设定值") + private BigDecimal sfAirFlowSet; + + @Schema(description = "SF空气流量控制输出值") + private BigDecimal sfAirFlowControlOutput; + + @Schema(description = "SF空燃比实际值") + private BigDecimal sfAirFuelRatioActual; + + @Schema(description = "SF空燃比设定值") + private BigDecimal sfAirFuelRatioSet; + + @Schema(description = "NOF板温实际值") + private BigDecimal nofPlateTemperatureActual; + + @Schema(description = "RTF板温实际值") + private BigDecimal rtfPlateTemperatureActual; + + @Schema(description = "SF板温实际值") + private BigDecimal sfPlateTemperatureActual; + + @Schema(description = "TDS板温实际值") + private BigDecimal tdsPlateTemperatureActual; + + @Schema(description = "PH炉压实际值") + private BigDecimal phFurnacePressureActual; + + @Schema(description = "PH炉压设定值") + private BigDecimal phFurnacePressureSet; + + @Schema(description = "PH炉压控制输出值") + private BigDecimal phFurnacePressureControlOutput; + + @Schema(description = "NOF炉压实际值") + private BigDecimal nofFurnacePressureActual; + + @Schema(description = "RTF炉压实际值") + private BigDecimal rtfFurnacePressureActual; + + @Schema(description = "TDS炉压实际值") + private BigDecimal tdsFurnacePressureActual; + + @Schema(description = "JCF1炉温实际值") + private BigDecimal jcf1FurnaceTemperatureActual; + + @Schema(description = "JCF1炉温设定值") + private BigDecimal jcf1FurnaceTemperatureSet; + + @Schema(description = "JCF1炉温控制输出值") + private BigDecimal jcf1FurnaceTemperatureControlOutput; + + @Schema(description = "JCF1 A相电流") + private BigDecimal jcf1PhaseACurrent; + + @Schema(description = "JCF1 B相电流") + private BigDecimal jcf1PhaseBCurrent; + + @Schema(description = "JCF1 C相电流") + private BigDecimal jcf1PhaseCCurrent; + + @Schema(description = "JCF2炉温实际值") + private BigDecimal jcf2FurnaceTemperatureActual; + + @Schema(description = "JCF2炉温设定值") + private BigDecimal jcf2FurnaceTemperatureSet; + + @Schema(description = "JCF2炉温控制输出值") + private BigDecimal jcf2FurnaceTemperatureControlOutput; + + @Schema(description = "JCF2 A相电流") + private BigDecimal jcf2PhaseACurrent; + + @Schema(description = "JCF2 B相电流") + private BigDecimal jcf2PhaseBCurrent; + + @Schema(description = "JCF2 C相电流") + private BigDecimal jcf2PhaseCCurrent; + + @Schema(description = "LTH炉温实际值") + private BigDecimal lthFurnaceTemperatureActual; + + @Schema(description = "LTH炉温设定值") + private BigDecimal lthFurnaceTemperatureSet; + + @Schema(description = "LTH炉温控制输出值") + private BigDecimal lthFurnaceTemperatureControlOutput; + + @Schema(description = "LTH A相电流") + private BigDecimal lthPhaseACurrent; + + @Schema(description = "LTH B相电流") + private BigDecimal lthPhaseBCurrent; + + @Schema(description = "LTH C相电流") + private BigDecimal lthPhaseCCurrent; + + @Schema(description = "TDS炉温实际值") + private BigDecimal tdsFurnaceTemperatureActual; + + @Schema(description = "TDS炉温设定值") + private BigDecimal tdsFurnaceTemperatureSet; + + @Schema(description = "TDS炉温控制输出值") + private BigDecimal tdsFurnaceTemperatureControlOutput; + + @Schema(description = "TDS A相电流") + private BigDecimal tdsPhaseACurrent; + + @Schema(description = "TDS B相电流") + private BigDecimal tdsPhaseBCurrent; + + @Schema(description = "TDS C相电流") + private BigDecimal tdsPhaseCCurrent; + + @Schema(description = "LBZ炉温实际值") + private BigDecimal lbzFurnaceTemperatureActual; + + @Schema(description = "LBZ炉温设定值") + private BigDecimal lbzFurnaceTemperatureSet; + + @Schema(description = "LBZ炉温控制输出值") + private BigDecimal lbzFurnaceTemperatureControlOutput; + + @Schema(description = "LBZ A相电流") + private BigDecimal lbzPhaseACurrent; + + @Schema(description = "LBZ B相电流") + private BigDecimal lbzPhaseBCurrent; + + @Schema(description = "LBZ C相电流") + private BigDecimal lbzPhaseCCurrent; + + @Schema(description = "JCF风机1实际速度") + private BigDecimal jcfFan1ActualSpeed; + + @Schema(description = "JCF风机1设定速度") + private BigDecimal jcfFan1SetSpeed; + + @Schema(description = "JCF风机2实际速度") + private BigDecimal jcfFan2ActualSpeed; + + @Schema(description = "JCF风机2设定速度") + private BigDecimal jcfFan2SetSpeed; + + @Schema(description = "JCF风机3实际速度") + private BigDecimal jcfFan3ActualSpeed; + + @Schema(description = "JCF风机3设定速度") + private BigDecimal jcfFan3SetSpeed; + + @Schema(description = "JCF风机4实际速度") + private BigDecimal jcfFan4ActualSpeed; + + @Schema(description = "JCF风机4设定速度") + private BigDecimal jcfFan4SetSpeed; + + @Schema(description = "JCF风机5实际速度") + private BigDecimal jcfFan5ActualSpeed; + + @Schema(description = "JCF风机5设定速度") + private BigDecimal jcfFan5SetSpeed; + + @Schema(description = "JCF风机6实际速度") + private BigDecimal jcfFan6ActualSpeed; + + @Schema(description = "JCF风机6设定速度") + private BigDecimal jcfFan6SetSpeed; + + @Schema(description = "JCF风机7实际速度") + private BigDecimal jcfFan7ActualSpeed; + + @Schema(description = "JCF风机7设定速度") + private BigDecimal jcfFan7SetSpeed; + + @Schema(description = "NOF空气换热前烟气温度") + private BigDecimal nofAirPreheatFlueGasTemperature; + + @Schema(description = "NOF空气换热后烟气温度") + private BigDecimal nofAirPostheatFlueGasTemperature; + + @Schema(description = "NOF水换热后烟气温度") + private BigDecimal nofWaterPostheatFlueGasTemperature; + + @Schema(description = "NOF排烟风机前烟气温度") + private BigDecimal nofExhaustFanInletFlueGasTemperature; + + @Schema(description = "NOF助燃空气温度") + private BigDecimal nofCombustionAirTemperature; + + @Schema(description = "RTF热风换热前烟气温度") + private BigDecimal rtfAirPreheatFlueGasTemperature; + + @Schema(description = "RTF排烟风机前烟气温度") + private BigDecimal rtfExhaustFanInletFlueGasTemperature; + + @Schema(description = "NOF燃气压力") + private BigDecimal nofGasPressure; + + @Schema(description = "点火燃气压力") + private BigDecimal ignitionGasPressure; + + @Schema(description = "点火空气压力") + private BigDecimal ignitionAirPressure; + + @Schema(description = "RTF燃气压力") + private BigDecimal rtfGasPressure; + + @Schema(description = "NOF空气压力实际值") + private BigDecimal nofAirPressureActual; + + @Schema(description = "NOF空气压力设定值") + private BigDecimal nofAirPressureSet; + + @Schema(description = "NOF空气压力控制输出值") + private BigDecimal nofAirPressureControlOutput; + + @Schema(description = "NOF烟气压力实际值") + private BigDecimal nofFlueGasPressureActual; + + @Schema(description = "NOF烟气压力设定值") + private BigDecimal nofFlueGasPressureSet; + + @Schema(description = "NOF烟气压力控制输出值") + private BigDecimal nofFlueGasPressureControlOutput; + + @Schema(description = "RTF空气压力实际值") + private BigDecimal rtfAirPressureActual; + + @Schema(description = "RTF空气压力设定值") + private BigDecimal rtfAirPressureSet; + + @Schema(description = "RTF空气压力控制输出值") + private BigDecimal rtfAirPressureControlOutput; + + @Schema(description = "RTF烟气压力实际值") + private BigDecimal rtfFlueGasPressureActual; + + @Schema(description = "RTF烟气压力设定值") + private BigDecimal rtfFlueGasPressureSet; + + @Schema(description = "RTF烟气压力控制输出值") + private BigDecimal rtfFlueGasPressureControlOutput; + + @Schema(description = "炉气氛微氧含量") + private BigDecimal furnaceAtmosphereOxygenContent; + + @Schema(description = "炉气氛氢含量") + private BigDecimal furnaceAtmosphereHydrogenContent; + + @Schema(description = "炉气氛露点温度") + private BigDecimal furnaceAtmosphereDewPoint; + + @Schema(description = "燃气瞬时流量") + private BigDecimal gasInstantaneousFlow; + + @Schema(description = "燃气瞬时耗量") + private BigDecimal gasInstantaneousConsumption; + +} \ No newline at end of file diff --git a/business/src/main/java/com/fizz/business/domain/msg/AppMeasureMessage.java b/business/src/main/java/com/fizz/business/domain/msg/AppMeasureMessage.java new file mode 100644 index 0000000..e1b0320 --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/msg/AppMeasureMessage.java @@ -0,0 +1,16 @@ +package com.fizz.business.domain.msg; + + +import lombok.Data; +import lombok.EqualsAndHashCode; + +@EqualsAndHashCode(callSuper = true) +@Data +public class AppMeasureMessage extends OpcMessage { + + AppMeasureEntryMessage appMeasureEntryMessage; + AppMeasureFurnaceMessage appMeasureFurnaceMessage; + AppMeasureCoatMessage appMeasureCoatMessage; + AppMeasureExitMessage appMeasureExitMessage; + +} diff --git a/business/src/main/java/com/fizz/business/domain/msg/EntryMovementMessage.java b/business/src/main/java/com/fizz/business/domain/msg/EntryMovementMessage.java new file mode 100644 index 0000000..67c7cfc --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/msg/EntryMovementMessage.java @@ -0,0 +1,13 @@ +package com.fizz.business.domain.msg; + +import lombok.*; + +@Getter +@Setter +@EqualsAndHashCode(callSuper = true) +public class EntryMovementMessage extends OpcMessage { + private Integer counter; + private Integer materialPlaceSource; + private Integer materialPlaceDestination; + +} \ No newline at end of file diff --git a/business/src/main/java/com/fizz/business/domain/msg/ExitCutMessage.java b/business/src/main/java/com/fizz/business/domain/msg/ExitCutMessage.java new file mode 100644 index 0000000..4f24a25 --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/msg/ExitCutMessage.java @@ -0,0 +1,33 @@ +package com.fizz.business.domain.msg; + + +import com.fizz.business.constants.enums.ExitCutTypeEnum; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.math.BigDecimal; + +@Data +@EqualsAndHashCode(callSuper = true) +@Schema(description = "出口剪切电文") +public class ExitCutMessage extends OpcMessage { + + @Schema(description = "计数器") + private Integer counter; + + @Schema(description = "剪切类型：0=split, 1=weldSeam, 2=stripBreak") + private ExitCutTypeEnum cutType; + + @Schema(description = "剪切时卷取长度 (m)") + private BigDecimal cutLength; + + @Schema(description = "计算卷取外径 (mm)") + private BigDecimal outerDiameter; + + @Schema(description = "下一个焊缝到飞剪的距离 (m)") + private BigDecimal leftLength; + + @Schema(description = "breakPosition，含义待定") + private BigDecimal breakPosition; +} diff --git a/business/src/main/java/com/fizz/business/domain/msg/ExitMeasureMessage.java b/business/src/main/java/com/fizz/business/domain/msg/ExitMeasureMessage.java new file mode 100644 index 0000000..ac31d01 --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/msg/ExitMeasureMessage.java @@ -0,0 +1,20 @@ +package com.fizz.business.domain.msg; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.math.BigDecimal; + +@Data +@EqualsAndHashCode(callSuper = true) +@Schema(description = "出口称重电文") +public class ExitMeasureMessage extends OpcMessage { + + @Schema(description = "计数器") + private Integer counter; + + @Schema(description = "重量 (kg)") + private BigDecimal weight; +} + diff --git a/business/src/main/java/com/fizz/business/domain/msg/ExitMovementMessage.java b/business/src/main/java/com/fizz/business/domain/msg/ExitMovementMessage.java new file mode 100644 index 0000000..828afae --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/msg/ExitMovementMessage.java @@ -0,0 +1,21 @@ +package com.fizz.business.domain.msg; + + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@Data +@EqualsAndHashCode(callSuper = true) +@Schema(description = "出口移动电文") +public class ExitMovementMessage extends OpcMessage { + + @Schema(description = "计数器") + private Integer counter; + + @Schema(description = "Material Place Source") + private Integer exSrc; + + @Schema(description = "Material Place Destination") + private Integer exDesc; +} diff --git a/business/src/main/java/com/fizz/business/domain/msg/OpcMessage.java b/business/src/main/java/com/fizz/business/domain/msg/OpcMessage.java new file mode 100644 index 0000000..2526281 --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/msg/OpcMessage.java @@ -0,0 +1,10 @@ +package com.fizz.business.domain.msg; + +import com.fizz.business.constants.enums.OpcMessageType; +import lombok.Data; + +@Data +public abstract class OpcMessage { + private Integer messageId; // 电文ID + private Integer length; // 电文长度 +} \ No newline at end of file diff --git a/business/src/main/java/com/fizz/business/domain/msg/PdiSetup.java b/business/src/main/java/com/fizz/business/domain/msg/PdiSetup.java new file mode 100644 index 0000000..ea1baa2 --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/msg/PdiSetup.java @@ -0,0 +1,129 @@ +package com.fizz.business.domain.msg; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.math.BigDecimal; + +@Data +@Schema(description = "设定电文") +public class PdiSetup extends OpcMessage{ + @Schema(description = "钢卷号") + private String coilId; + + @Schema(description = "开卷机号") + private Integer PORFlag; + + @Schema(description = "数据有效修改") + private Integer counter; + + @Schema(description = "入口钢卷厚度") + private BigDecimal entryCoilWeight; + + @Schema(description = "入口钢卷长度") + private BigDecimal entryCoilLength; + @Schema(description = "入口钢卷宽度") + private BigDecimal entryCoilWidth; + @Schema(description = "入口钢卷厚度") + private BigDecimal entryCoilThick; + @Schema(description = "入口钢卷内径") + private BigDecimal entryCoilInnerDia; + @Schema(description = "入口钢卷外径") + private BigDecimal entryCoilOuterDia; + @Schema(description = "合金代码") + private String alloyCode; + @Schema(description = "钢种") + private String steelGrade; + + @Schema(description = "分切数") + private Integer splitNum; + @Schema(description = "出口长度1") + private BigDecimal exitLength1; + @Schema(description = "出口长度2") + private BigDecimal exitLength2; + @Schema(description = "出口长度3") + private BigDecimal exitLength3; + @Schema(description = "出口长度4") + private BigDecimal exitLength4; + @Schema(description = "出口长度5") + private BigDecimal exitLength5; + @Schema(description = "出口长度6") + private BigDecimal exitLength6; + + @Schema(description = "开卷机张力") + private BigDecimal tensionPorBR1; + @Schema(description = "BR1- BR2 张力") + private BigDecimal tensionBR1BR2; + @Schema(description = "BR2- BR3 张力") + private BigDecimal tensionBR2BR3; + @Schema(description = "BR3 张力") + private BigDecimal tensionBR3; + @Schema(description = "炉区张力1") + private BigDecimal tensionFur1; + @Schema(description = "炉区张力2") + private BigDecimal tensionFur2; + @Schema(description = "BR4- BR5 张力") + private BigDecimal tensionBR4BR5; + @Schema(description = "目标锌层重量-上表面") + private BigDecimal aimCoatingWeightTop; + @Schema(description = "目标锌层重量-下表面") + private BigDecimal aimCoatingWeightBottom; + + @Schema(description = "光整投入") + private Integer TMFlag; + @Schema(description = "光整类型") + private Integer TMType; + @Schema(description = "轧制模式") + private Integer TMMode; + @Schema(description = "BR5- BR6 张力") + private BigDecimal tensionBR5BR6; + @Schema(description = "BR5- TM 张力") + private BigDecimal tensionBR5TM; + @Schema(description = "TM-BR6 张力") + private BigDecimal tensionTMBR6; + @Schema(description = "延伸率") + private BigDecimal TMElongation; + @Schema(description = "轧制力") + private BigDecimal TMRollforce; + @Schema(description = "弯辊力") + private BigDecimal TMBendforce; + @Schema(description = "防邹辊插入量") + private BigDecimal ACRMesh; + @Schema(description = "张力辊插入量") + private BigDecimal BRMesh; + + @Schema(description = "拉矫投入") + private Integer TLFlag; + @Schema(description = "拉矫延伸率") + private Integer TLElongation; + @Schema(description = "BR6- BR7 张力") + private BigDecimal tensionBR6BR7; + @Schema(description = "TL- BR7 张力") + private BigDecimal tensionTLBR7; + @Schema(description = "拉矫插入量1") + private BigDecimal LevelingMesh1; + @Schema(description = "拉矫插入量2") + private BigDecimal LevelingMesh2; + @Schema(description = "弯曲辊插入量") + private BigDecimal AntiCrossBowUnitMesh; + + @Schema(description = "BR7- BR8 张力") + private BigDecimal tensionBR7BR8; + @Schema(description = "铬化投入") + private Integer chromatingFlag; + @Schema(description = "铬化代码") + private Integer chromatingCode; + + @Schema(description = "BR8- BR9 张力") + private BigDecimal tensionBR8BR9; + @Schema(description = "BR9-TR 张力") + private BigDecimal tensionBR9TR; + + @Schema(description = "涂油投入") + private Integer oilingFlag; + @Schema(description = "上表面涂油量") + private BigDecimal oilingAmountTop; + @Schema(description = "下表面涂油量") + private BigDecimal oilingAmountBottom; +} diff --git a/business/src/main/java/com/fizz/business/dto/CoilHeadDTO.java b/business/src/main/java/com/fizz/business/dto/CoilHeadDTO.java new file mode 100644 index 0000000..603ecc7 --- /dev/null +++ b/business/src/main/java/com/fizz/business/dto/CoilHeadDTO.java @@ -0,0 +1,19 @@ +package com.fizz.business.dto; + +import lombok.Getter; +import lombok.Setter; + +import java.io.Serializable; + +@Getter +@Setter +public class CoilHeadDTO implements Serializable { + + private boolean first; + private String matId; + private String planNo; + private String planId; + private double pos; + private int posIdx; + private int porIdx; +} diff --git a/business/src/main/java/com/fizz/business/dto/CoilMeasureVO.java b/business/src/main/java/com/fizz/business/dto/CoilMeasureVO.java new file mode 100644 index 0000000..0ae1603 --- /dev/null +++ b/business/src/main/java/com/fizz/business/dto/CoilMeasureVO.java @@ -0,0 +1,32 @@ +package com.fizz.business.dto; + +import cn.hutool.core.lang.Pair; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +import java.io.Serializable; +import java.util.List; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class CoilMeasureVO implements Serializable { + + @Schema(description = "参数名") + private String valueName; + + @Schema(description = "设定值") + private String definedValue; + + @Schema(description = "最大值") + private String maxValue; + + @Schema(description = "最小值") + private String minValue; + + private List> data; +} diff --git a/business/src/main/java/com/fizz/business/dto/CoilMergeEvent.java b/business/src/main/java/com/fizz/business/dto/CoilMergeEvent.java new file mode 100644 index 0000000..de335d0 --- /dev/null +++ b/business/src/main/java/com/fizz/business/dto/CoilMergeEvent.java @@ -0,0 +1,22 @@ +package com.fizz.business.dto; + +import lombok.Builder; +import lombok.Getter; +import lombok.Setter; + +/** + * @author chenhao + * @date 2023/7/26 + */ +@Getter +@Setter +@Builder +public class CoilMergeEvent { + private String mainMatId; + private String mainPlanNo; + private Long mainPlanId; + private String matId; + private String planNo; + private Long planId; + private double coilLength; +} diff --git a/business/src/main/java/com/fizz/business/dto/CoilPositionDTO.java b/business/src/main/java/com/fizz/business/dto/CoilPositionDTO.java new file mode 100644 index 0000000..7dc4371 --- /dev/null +++ b/business/src/main/java/com/fizz/business/dto/CoilPositionDTO.java @@ -0,0 +1,39 @@ +package com.fizz.business.dto; + +import lombok.*; + +import java.io.Serializable; +import java.util.List; + +@Getter +@Setter +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class CoilPositionDTO implements Serializable { + + private List coilStripLocationList; + private double entryLoopLen; + private double exitLoopLen; + private double entryLoopPer; // 入口活套套量百分比 + private double exitLoopLPer; // 出口活套套量百分比 + private Integer porId; + private Integer trId; + private Double entrySpeed; // 入口段速度 + private Double technologySpeed; // 工艺段速度 + private Double exitSpeed; // 出口段速度 + private List matMapList; + + @Getter + @Setter + @Builder + @NoArgsConstructor + @AllArgsConstructor + public static class CoilStripLocation { + private String matId; + private String planNo; + private String planId; + private double stripLocation; + private Integer porId; + } +} diff --git a/business/src/main/java/com/fizz/business/dto/EventVO.java b/business/src/main/java/com/fizz/business/dto/EventVO.java new file mode 100644 index 0000000..4b12a7c --- /dev/null +++ b/business/src/main/java/com/fizz/business/dto/EventVO.java @@ -0,0 +1,18 @@ +package com.fizz.business.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class EventVO implements Serializable { + + @Schema(description = "时间") + private String time; + @Schema(description = "事件描述") + private String eventDesc; + + @Schema(description = "错误信息") + private String errorMsg; +} diff --git a/business/src/main/java/com/fizz/business/dto/ExitCoilInfoDTO.java b/business/src/main/java/com/fizz/business/dto/ExitCoilInfoDTO.java new file mode 100644 index 0000000..9480e7b --- /dev/null +++ b/business/src/main/java/com/fizz/business/dto/ExitCoilInfoDTO.java @@ -0,0 +1,24 @@ +package com.fizz.business.dto; + +import lombok.Builder; +import lombok.Getter; +import lombok.Setter; + +import java.io.Serializable; + +@Getter +@Setter +@Builder +public class ExitCoilInfoDTO implements Serializable { + + private String planId; + private double startPos; + private double endPos; + private double exitCutLength; + private double outerDiameter; + private String entryMatId; + private String exitMatId; + private boolean separateFlag; + private boolean lastFlag; + private int subNum; +} diff --git a/business/src/main/java/com/fizz/business/dto/GroupVO.java b/business/src/main/java/com/fizz/business/dto/GroupVO.java new file mode 100644 index 0000000..7d78ce6 --- /dev/null +++ b/business/src/main/java/com/fizz/business/dto/GroupVO.java @@ -0,0 +1,17 @@ +package com.fizz.business.dto; + + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +public class GroupVO { + @Schema(description = "时间") + private String time; + @Schema(description = "班组") + private String groupNo; + @Schema(description = "当班电单耗") + private String electricityUnit; + @Schema(description = "当班产量") + private String yield; +} diff --git a/business/src/main/java/com/fizz/business/dto/L1CoilExitCutDTO.java b/business/src/main/java/com/fizz/business/dto/L1CoilExitCutDTO.java new file mode 100644 index 0000000..868e4d1 --- /dev/null +++ b/business/src/main/java/com/fizz/business/dto/L1CoilExitCutDTO.java @@ -0,0 +1,26 @@ +package com.fizz.business.dto; + +import lombok.*; + +import java.io.Serializable; + +@Getter +@Setter +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class L1CoilExitCutDTO implements Serializable { + + // 出口剪切位置(卷取机编号) + private Integer exitCutPosition; + + // 出口剪切计数 + private Integer exitCutCounter; + // 出口剪切类型 + private Integer exitCutType; + + // 卷取直径 + private double coilDiameter; + // 剪切时，在线卷取实际长度 + private double exitCutLength; +} diff --git a/business/src/main/java/com/fizz/business/dto/L1CoilHeadCutDTO.java b/business/src/main/java/com/fizz/business/dto/L1CoilHeadCutDTO.java new file mode 100644 index 0000000..6881f27 --- /dev/null +++ b/business/src/main/java/com/fizz/business/dto/L1CoilHeadCutDTO.java @@ -0,0 +1,22 @@ +package com.fizz.business.dto; + +import lombok.Getter; +import lombok.Setter; + +import java.io.Serializable; + +@Getter +@Setter +public class L1CoilHeadCutDTO implements Serializable { + + // 剪切位置(开卷机编号) + private Integer headCutPosition; + + // 剪切信号 + private Integer headCutCounter; + // 剪切类型 + private Integer headCutType; + + // 剪切总长 + private double headCutLength; +} diff --git a/business/src/main/java/com/fizz/business/dto/L1CoilLineMeasureDTO.java b/business/src/main/java/com/fizz/business/dto/L1CoilLineMeasureDTO.java new file mode 100644 index 0000000..a209e46 --- /dev/null +++ b/business/src/main/java/com/fizz/business/dto/L1CoilLineMeasureDTO.java @@ -0,0 +1,239 @@ +package com.fizz.business.dto; + +import lombok.Getter; +import lombok.Setter; + +import java.io.Serializable; + +@Getter +@Setter +public class L1CoilLineMeasureDTO implements Serializable { + + // 工作开卷机 + private Integer workPor; + // 工作卷取机 + private Integer workTr; + + // 最近一次过焊缝长度 + private double stripLocation; + // 入口活套百分比 + private double entryLoopPercent; + // 入口活套长度 + private double entryLoopLength; + // 出口活套百分比 + private double exitLoopPercent; + // 出口活套长度 + private double exitLoopLength; + // 卷取长度 + private double coilLength; + // 入口段速度 + private double inSpeed; + // 工艺段速度 + private double unitSpeed; + // 出口段速度 + private double outSpeed; + // 带钢在线卷重[KG] + private double onlineWt; + + private double val1; + private double val2; + private double val3; + private double val4; + private double val5; + private double val6; + private double val7; + private double val8; + private double val9; + private double val10; + private double val11; + private double val12; + private double val13; + private double val14; + private double val15; + private double val16; + private double val17; + private double val18; + private double val19; + private double val20; + private double val21; + private double val22; + private double val23; + private double val24; + private double val25; + private double val26; + private double val27; + private double val28; + private double val29; + private double val30; + private double val31; + private double val32; + private double val33; + private double val34; + private double val35; + private double val36; + private double val37; + private double val38; + private double val39; + private double val40; + private double val41; + private double val42; + private double val43; + private double val44; + private double val45; + private double val46; + private double val47; + private double val48; + private double val49; + private double val50; + + private double tval1; + private double tval2; + private double tval3; + private double tval4; + private double tval5; + private double tval6; + private double tval7; + private double tval8; + private double tval9; + private double tval10; + private double tval11; + private double tval12; + private double tval13; + private double tval14; + private double tval15; + private double tval16; + private double tval17; + private double tval18; + private double tval19; + private double tval20; + private double tval21; + private double tval22; + private double tval23; + private double tval24; + private double tval25; + private double tval26; + private double tval27; + private double tval28; + private double tval29; + private double tval30; + private double tval31; + private double tval32; + private double tval33; + private double tval34; + private double tval35; + private double tval36; + private double tval37; + private double tval38; + private double tval39; + private double tval40; + private double tval41; + private double tval42; + private double tval43; + private double tval44; + private double tval45; + private double tval46; + private double tval47; + private double tval48; + private double tval49; + private double tval50; + private double tval51; + private double tval52; + private double tval53; + private double tval54; + private double tval55; + private double tval56; + private double tval57; + private double tval58; + private double tval59; + private double tval60; + private double tval61; + private double tval62; + private double tval63; + private double tval64; + private double tval65; + private double tval66; + private double tval67; + private double tval68; + private double tval69; + private double tval70; + private double tval71; + private double tval72; + private double tval73; + private double tval74; + private double tval75; + private double tval76; + private double tval77; + private double tval78; + private double tval79; + private double tval80; + private double tval81; + private double tval82; + private double tval83; + private double tval84; + private double tval85; + private double tval86; + private double tval87; + private double tval88; + private double tval89; + private double tval90; + private double tval91; + private double tval92; + private double tval93; + private double tval94; + private double tval95; + private double tval96; + private double tval97; + private double tval98; + private double tval99; + private double tval100; + private double tval101; + private double tval102; + private double tval103; + private double tval104; + private double tval105; + private double tval106; + private double tval107; + private double tval108; + private double tval109; + private double tval110; + private double tval111; + private double tval112; + private double tval113; + private double tval114; + private double tval115; + private double tval116; + private double tval117; + private double tval118; + private double tval119; + private double tval120; + private double tval121; + private double tval122; + private double tval123; + private double tval124; + private double tval125; + private double tval126; + private double tval127; + private double tval128; + private double tval129; + private double tval130; + private double tval131; + private double tval132; + private double tval133; + private double tval134; + private double tval135; + private double tval136; + private double tval137; + private double tval138; + private double tval139; + private double tval140; + private double tval141; + private double tval142; + private double tval143; + private double tval144; + private double tval145; + private double tval146; + private double tval147; + private double tval148; + private double tval149; + private double tval150; +} diff --git a/business/src/main/java/com/fizz/business/dto/L1CoilOperateDTO.java b/business/src/main/java/com/fizz/business/dto/L1CoilOperateDTO.java new file mode 100644 index 0000000..87ed76e --- /dev/null +++ b/business/src/main/java/com/fizz/business/dto/L1CoilOperateDTO.java @@ -0,0 +1,26 @@ +package com.fizz.business.dto; + + +import lombok.*; + +@Getter +@Setter +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class L1CoilOperateDTO { + + // 开卷机上卷位置 + private Integer porOnlinePosition; + // 开卷机甩尾位置 + private Integer porPayOverPosition; + // 卷取机卸卷位置 + private Integer trUnloadPosition; + + // 开卷机上卷计数器 + private Integer porOnlineCounter; + // 开卷机甩尾计数器 + private Integer porPayOverCounter; + // 卷取机卸卷计数器 + private Integer trUnloadCounter; +} \ No newline at end of file diff --git a/business/src/main/java/com/fizz/business/dto/L1CoilPointDataDTO.java b/business/src/main/java/com/fizz/business/dto/L1CoilPointDataDTO.java new file mode 100644 index 0000000..14240bd --- /dev/null +++ b/business/src/main/java/com/fizz/business/dto/L1CoilPointDataDTO.java @@ -0,0 +1,266 @@ +package com.fizz.business.dto; + +import lombok.Getter; +import lombok.Setter; + +import java.io.Serializable; + +@Getter +@Setter +public class L1CoilPointDataDTO implements Serializable { + + //============================出口剪切============================ + // 出口剪切位置(卷取机编号) + private Integer exitCutPosition; + // 出口剪切计数 + private Integer exitCutCounter; + // 出口剪切类型 + private Integer exitCutType; + // 卷取直径 + private double coilDiameter; + // 剪切时，在线卷取实际长度 + private double exitCutLength; + + //============================上卷、甩尾、卸卷============================ + // 开卷机上卷位置 + private Integer porOnlinePosition; + // 开卷机甩尾位置 + private Integer porPayOverPosition; + // 卷取机卸卷位置 + private Integer trUnloadPosition; + // 开卷机上卷计数器 + private Integer porOnlineCounter; + // 开卷机甩尾计数器 + private Integer porPayOverCounter; + // 卷取机卸卷计数器 + private Integer trUnloadCounter; + + //============================焊缝跟踪============================ + // 工作开卷机 + private Integer workPor; + // 工作卷取机 + private Integer workTr; + + // 最近一次过焊缝长度 + private double stripLocation; + // 入口活套百分比 + private double entryLoopPercent; + // 入口活套长度 + private double entryLoopLength; + // 出口活套百分比 + private double exitLoopPercent; + // 出口活套长度 + private double exitLoopLength; + // 卷取长度 + private double coilLength; + // 入口段速度 + private double inSpeed; + // 工艺段速度 + private double unitSpeed; + // 出口段速度 + private double outSpeed; + // 带钢在线卷重[KG] + private double onlineWt; + + private double val1; + private double val2; + private double val3; + private double val4; + private double val5; + private double val6; + private double val7; + private double val8; + private double val9; + private double val10; + private double val11; + private double val12; + private double val13; + private double val14; + private double val15; + private double val16; + private double val17; + private double val18; + private double val19; + private double val20; + private double val21; + private double val22; + private double val23; + private double val24; + private double val25; + private double val26; + private double val27; + private double val28; + private double val29; + private double val30; + private double val31; + private double val32; + private double val33; + private double val34; + private double val35; + private double val36; + private double val37; + private double val38; + private double val39; + private double val40; + private double val41; + private double val42; + private double val43; + private double val44; + private double val45; + private double val46; + private double val47; + private double val48; + private double val49; + private double val50; + + private double tval1; + private double tval2; + private double tval3; + private double tval4; + private double tval5; + private double tval6; + private double tval7; + private double tval8; + private double tval9; + private double tval10; + private double tval11; + private double tval12; + private double tval13; + private double tval14; + private double tval15; + private double tval16; + private double tval17; + private double tval18; + private double tval19; + private double tval20; + private double tval21; + private double tval22; + private double tval23; + private double tval24; + private double tval25; + private double tval26; + private double tval27; + private double tval28; + private double tval29; + private double tval30; + private double tval31; + private double tval32; + private double tval33; + private double tval34; + private double tval35; + private double tval36; + private double tval37; + private double tval38; + private double tval39; + private double tval40; + private double tval41; + private double tval42; + private double tval43; + private double tval44; + private double tval45; + private double tval46; + private double tval47; + private double tval48; + private double tval49; + private double tval50; + private double tval51; + private double tval52; + private double tval53; + private double tval54; + private double tval55; + private double tval56; + private double tval57; + private double tval58; + private double tval59; + private double tval60; + private double tval61; + private double tval62; + private double tval63; + private double tval64; + private double tval65; + private double tval66; + private double tval67; + private double tval68; + private double tval69; + private double tval70; + private double tval71; + private double tval72; + private double tval73; + private double tval74; + private double tval75; + private double tval76; + private double tval77; + private double tval78; + private double tval79; + private double tval80; + private double tval81; + private double tval82; + private double tval83; + private double tval84; + private double tval85; + private double tval86; + private double tval87; + private double tval88; + private double tval89; + private double tval90; + private double tval91; + private double tval92; + private double tval93; + private double tval94; + private double tval95; + private double tval96; + private double tval97; + private double tval98; + private double tval99; + private double tval100; + private double tval101; + private double tval102; + private double tval103; + private double tval104; + private double tval105; + private double tval106; + private double tval107; + private double tval108; + private double tval109; + private double tval110; + private double tval111; + private double tval112; + private double tval113; + private double tval114; + private double tval115; + private double tval116; + private double tval117; + private double tval118; + private double tval119; + private double tval120; + private double tval121; + private double tval122; + private double tval123; + private double tval124; + private double tval125; + private double tval126; + private double tval127; + private double tval128; + private double tval129; + private double tval130; + private double tval131; + private double tval132; + private double tval133; + private double tval134; + private double tval135; + private double tval136; + private double tval137; + private double tval138; + private double tval139; + private double tval140; + private double tval141; + private double tval142; + private double tval143; + private double tval144; + private double tval145; + private double tval146; + private double tval147; + private double tval148; + private double tval149; + private double tval150; +} diff --git a/business/src/main/java/com/fizz/business/dto/L3CoilDefectDTO.java b/business/src/main/java/com/fizz/business/dto/L3CoilDefectDTO.java new file mode 100644 index 0000000..59bdd90 --- /dev/null +++ b/business/src/main/java/com/fizz/business/dto/L3CoilDefectDTO.java @@ -0,0 +1,27 @@ +package com.fizz.business.dto; + +import lombok.*; + +import java.io.Serializable; +import java.time.LocalDateTime; + +@Getter +@Setter +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class L3CoilDefectDTO implements Serializable { + + private Long defectId; + private String defectCode; + private String defectName; + private String defectDesc; + private String planNo; + private String matNo; + private String matSubNo; + private String workUnitCode; + private String workProcessCode; + private String operate; + private LocalDateTime doTime; + private String doUser; +} diff --git a/business/src/main/java/com/fizz/business/dto/LimitData.java b/business/src/main/java/com/fizz/business/dto/LimitData.java new file mode 100644 index 0000000..95810d1 --- /dev/null +++ b/business/src/main/java/com/fizz/business/dto/LimitData.java @@ -0,0 +1,17 @@ +package com.fizz.business.dto; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +import java.io.Serializable; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class LimitData implements Serializable { + private Double upper; + private Double lower; +} diff --git a/business/src/main/java/com/fizz/business/dto/MatmapDTO.java b/business/src/main/java/com/fizz/business/dto/MatmapDTO.java new file mode 100644 index 0000000..2eb193d --- /dev/null +++ b/business/src/main/java/com/fizz/business/dto/MatmapDTO.java @@ -0,0 +1,17 @@ +package com.fizz.business.dto; + +import lombok.Getter; +import lombok.Setter; + +import java.io.Serializable; + +@Getter +@Setter +public class MatmapDTO implements Serializable { + private String matId; + private String planNo; + private String planId; + private String positionNameCn; + private String positionNameEn; + private int posIdx; +} diff --git a/business/src/main/java/com/fizz/business/dto/PdiPlanSubDTO.java b/business/src/main/java/com/fizz/business/dto/PdiPlanSubDTO.java new file mode 100644 index 0000000..ed72cc9 --- /dev/null +++ b/business/src/main/java/com/fizz/business/dto/PdiPlanSubDTO.java @@ -0,0 +1,60 @@ +package com.fizz.business.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Getter; +import lombok.Setter; + +import java.io.Serializable; + +/** + * 子计划数据 + * + * @author chenhao + * @date 2023/7/26 + */ +@Getter +@Setter +public class PdiPlanSubDTO implements Serializable { + + @Schema(description = "成品卷") + private String exitMatId; + + @Schema(description = "来料卷") + private String entryMatId; + + @Schema(description = "原料卷号") + private String originMatId; + + @Schema(description = "开始位置") + private Double startPosition; + + @Schema(description = "结束位置") + private Double endPosition; + + @Schema(description = "产品类型") + private String prodCode; + + @Schema(description = "钢种") + private String steelGrade; + + @Schema(description = "来料厚度") + private Double entryThick; + + @Schema(description = "来料宽度") + private Double entryWidth; + + @Schema(description = "来料长度") + private Double entryLength; + + @Schema(description = "来料重量") + private Double entryWeight; + + @Schema(description = "成品长度") + private Double exitLength; + + @Schema(description = "理论重量") + private Double theoryWeight; + + @Schema(description = "实际重量") + private Double actualWeight; +} diff --git a/business/src/main/java/com/fizz/business/dto/PdoExCoilDTO.java b/business/src/main/java/com/fizz/business/dto/PdoExCoilDTO.java new file mode 100644 index 0000000..8a5d5cd --- /dev/null +++ b/business/src/main/java/com/fizz/business/dto/PdoExCoilDTO.java @@ -0,0 +1,24 @@ +package com.fizz.business.dto; + +import com.fizz.business.domain.CrmPdoExcoil; +import com.fizz.business.domain.PdoExcoil; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Getter; +import lombok.Setter; + +import java.io.Serializable; +import java.util.List; + +/** + * 产出数据 + * + * @author chenhao + * @date 2023/7/26 + */ +@Getter +@Setter +public class PdoExCoilDTO extends CrmPdoExcoil implements Serializable { + + + +} diff --git a/business/src/main/java/com/fizz/business/dto/PdoExCoilSubDTO.java b/business/src/main/java/com/fizz/business/dto/PdoExCoilSubDTO.java new file mode 100644 index 0000000..41f661b --- /dev/null +++ b/business/src/main/java/com/fizz/business/dto/PdoExCoilSubDTO.java @@ -0,0 +1,74 @@ +package com.fizz.business.dto; + + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Getter; +import lombok.Setter; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + * 并卷数据 + * + * @author chenhao + * @date 2023/7/26 + */ +@Getter +@Setter +public class PdoExCoilSubDTO implements Serializable { + + @Schema(description = "成品卷") + private String exitMatId; + + @Schema(description = "来料卷") + private String entryMatId; + + @Schema(description = "开始位置") + private Double startPosition; + + @Schema(description = "结束位置") + private Double endPosition; + + @Schema(description = "计划id") + private Long planId; + + @Schema(description = "计划号") + private String planNo; + + @Schema(description = "产品类型") + private String prodCode; + + @Schema(description = "钢种") + private String steelGrade; + + @Schema(description = "来料厚度") + private Double entryThick; + + @Schema(description = "来料宽带") + private Double entryWidth; + + @Schema(description = "来料长度") + private Double entryLength; + + @Schema(description = "来料重量") + private Double entryWeight; + + @Schema(description = "成品长度") + private Double exitLength; + + @Schema(description = "理论重量") + private Double theoryWeight; + + @Schema(description = "实际重量") + private Double actualWeight; + + @Schema(description = "上线时间") + private LocalDateTime onlineTime; + + @Schema(description = "开始时间") + private LocalDateTime startTime; + + @Schema(description = "结束时间") + private LocalDateTime endTime; +} diff --git a/business/src/main/java/com/fizz/business/dto/PointConfigDTO.java b/business/src/main/java/com/fizz/business/dto/PointConfigDTO.java new file mode 100644 index 0000000..0f08dbd --- /dev/null +++ b/business/src/main/java/com/fizz/business/dto/PointConfigDTO.java @@ -0,0 +1,30 @@ +package com.fizz.business.dto; + +import com.alibaba.fastjson.annotation.JSONField; +import lombok.Getter; +import lombok.Setter; + +import java.io.Serializable; + +/** + * 点位参数配置 + * + * @author chenhao + * @date 2023/05/18 + */ +@Getter +@Setter +public class PointConfigDTO implements Serializable { + + private String point; + + private String param; + + private String desc; + + @JSONField(name = "device_name") + private String deviceName; + + @JSONField(name = "show_type") + private String showType; +} diff --git a/business/src/main/java/com/fizz/business/dto/PointEvent.java b/business/src/main/java/com/fizz/business/dto/PointEvent.java new file mode 100644 index 0000000..7876fbf --- /dev/null +++ b/business/src/main/java/com/fizz/business/dto/PointEvent.java @@ -0,0 +1,19 @@ +package com.fizz.business.dto; + +import lombok.Data; + +import java.util.Map; + +@Data +public class PointEvent { + + private Map data; + + private Long gatewayTime; + + private String pushId; + + private Long sourceMsgTime; + + private String deviceId; +} diff --git a/business/src/main/java/com/fizz/business/dto/RequestInfo.java b/business/src/main/java/com/fizz/business/dto/RequestInfo.java new file mode 100644 index 0000000..6a25c8b --- /dev/null +++ b/business/src/main/java/com/fizz/business/dto/RequestInfo.java @@ -0,0 +1,20 @@ +package com.fizz.business.dto; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 请求信息 + * @author chenhao + * @date 2023/04/19 + */ +@Data +public class RequestInfo implements Serializable { + private String ip; + private String url; + private String httpMethod; + private String classMethod; + private Object requestParams; +} + diff --git a/business/src/main/java/com/fizz/business/dto/SegValue.java b/business/src/main/java/com/fizz/business/dto/SegValue.java new file mode 100644 index 0000000..eb33fb4 --- /dev/null +++ b/business/src/main/java/com/fizz/business/dto/SegValue.java @@ -0,0 +1,34 @@ +package com.fizz.business.dto; + +import lombok.Data; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +import java.io.Serializable; +import java.math.BigDecimal; + +@Data +public class SegValue implements Serializable { + private BigDecimal max; + private BigDecimal min; + private BigDecimal avg; + private BigDecimal std; + private int cnt; + private BigDecimal sum = BigDecimal.ZERO; + + public void add(BigDecimal value) { + if (value == null) { + return; + } + this.sum = this.sum.add(value); + this.cnt++; + } + + public BigDecimal getAverage() { + if (cnt == 0) { + return BigDecimal.ZERO; + } + return sum.divide(new BigDecimal(cnt), 2, BigDecimal.ROUND_HALF_UP); + } +} diff --git a/business/src/main/java/com/fizz/business/dto/SegmentDTO.java b/business/src/main/java/com/fizz/business/dto/SegmentDTO.java new file mode 100644 index 0000000..0cc71c1 --- /dev/null +++ b/business/src/main/java/com/fizz/business/dto/SegmentDTO.java @@ -0,0 +1,57 @@ +package com.fizz.business.dto; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +@Data +@TableName("cpl_segment_total") +public class SegmentDTO implements Serializable { + + @TableId(type = IdType.AUTO) + private Long id; + + @TableField("en_coil_id") + private String enCoilID; + + @TableField("pickling_count") + private Integer picklingCount; + + @TableField("seg_no") + private Integer segNo; + + // 以下字段用于业务逻辑，不存入数据库 + @TableField(exist = false) + private BigDecimal headPos; + @TableField(exist = false) + private BigDecimal tailPos; + + // 以下字段存入数据库 + @TableField("start_pos") + private BigDecimal startPos; + @TableField("end_pos") + private BigDecimal endPos; + @TableField("seg_len") + private BigDecimal segLen; + @TableField("total_values_json") + private String totalValuesJson; + + // 以下 Map 用于业务逻辑，不存入数据库 + @TableField(exist = false) + private Map totalValues = new ConcurrentHashMap<>(); + @TableField(exist = false) + private Map L3values = new ConcurrentHashMap<>(); + + // 两个未使用的字段，可以根据需要保留或移除 + @TableField(exist = false) + private int headPosNum; + @TableField(exist = false) + private int tailPosNum; +} \ No newline at end of file diff --git a/business/src/main/java/com/fizz/business/dto/WsCoilMeasureDTO.java b/business/src/main/java/com/fizz/business/dto/WsCoilMeasureDTO.java new file mode 100644 index 0000000..53f059d --- /dev/null +++ b/business/src/main/java/com/fizz/business/dto/WsCoilMeasureDTO.java @@ -0,0 +1,33 @@ +package com.fizz.business.dto; + +import lombok.*; + +import java.io.Serializable; +import java.util.List; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class WsCoilMeasureDTO implements Serializable { + + private String partName; + private String matId; + private String devName; + private String devDesc; + private List data; + + @Getter + @Setter + @Builder + @NoArgsConstructor + @AllArgsConstructor + public static class ValueDTO { + private String point; + private String valueName; + private String value; + // 0-APP\WEB都显示；1-WEB显示；2-APP显示 + private String showType; + private boolean needAlarm; + } +} diff --git a/business/src/main/java/com/fizz/business/dto/WsSignalMsgDTO.java b/business/src/main/java/com/fizz/business/dto/WsSignalMsgDTO.java new file mode 100644 index 0000000..65000ed --- /dev/null +++ b/business/src/main/java/com/fizz/business/dto/WsSignalMsgDTO.java @@ -0,0 +1,23 @@ +package com.fizz.business.dto; + +import com.fizz.business.form.OperateMatForm; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Getter; +import lombok.Setter; + +/** + * @author chenhao + * @date 2023/8/29 + */ +@Getter +@Setter +public class WsSignalMsgDTO extends OperateMatForm { + + @Schema(description = "ONLINE-钢卷上线，UNLOAD-手动卸卷，ALL_RETURN-整卷回退，HALF_RETURN-半卷回退，BLOCK-卸卷并封闭，THROW_TAIL-甩尾") + private String operation; + + @Schema(description = "1-页面手动操作") + private int autoFlag; + @Schema(description = "虚拟卷标识") + private boolean virtualPlanFlag; +} diff --git a/business/src/main/java/com/fizz/business/form/AddDefectForm.java b/business/src/main/java/com/fizz/business/form/AddDefectForm.java new file mode 100644 index 0000000..0314be5 --- /dev/null +++ b/business/src/main/java/com/fizz/business/form/AddDefectForm.java @@ -0,0 +1,42 @@ +package com.fizz.business.form; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Getter; +import lombok.Setter; + +import javax.validation.Valid; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +@Getter +@Setter +public class AddDefectForm implements Serializable { + @NotNull(message = "计划id不能为空") + @Schema(description = "计划id") + private Long planId; + @NotBlank(message = "计划号不能为空") + @Schema(description = "计划号") + private String planNo; + @NotBlank(message = "钢卷号不能为空") + @Schema(description = "钢卷号") + private String entryMatId; + + @Valid + @Schema(description = "缺陷列表") + private List defectList; + + @Getter + @Setter + public static class DefectInfo { + @NotBlank(message = "缺陷代码不能为空") + @Schema(description = "缺陷代码") + private String defectCode; + @NotBlank(message = "缺陷名称不能为空") + @Schema(description = "缺陷名称") + private String defectName; + @Schema(description = "缺陷描述") + private String defectDesc; + } +} diff --git a/business/src/main/java/com/fizz/business/form/AdjustPosForm.java b/business/src/main/java/com/fizz/business/form/AdjustPosForm.java new file mode 100644 index 0000000..3a55754 --- /dev/null +++ b/business/src/main/java/com/fizz/business/form/AdjustPosForm.java @@ -0,0 +1,26 @@ +package com.fizz.business.form; + +import com.fizz.business.constants.enums.DeviceEnum; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Getter; +import lombok.Setter; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * 位置调整form + * + * @author chenhao + * @date 2023/04/27 + */ +@Getter +@Setter +public class AdjustPosForm implements Serializable { + @NotNull(message = "目标位置不存在") + @Schema(description = "目标位置") + private DeviceEnum targetPos; + @NotNull(message = "当前位置不存在") + @Schema(description = "当前位置") + private DeviceEnum currentPos; +} diff --git a/business/src/main/java/com/fizz/business/form/CalcPdiPlanForm.java b/business/src/main/java/com/fizz/business/form/CalcPdiPlanForm.java new file mode 100644 index 0000000..0163bb7 --- /dev/null +++ b/business/src/main/java/com/fizz/business/form/CalcPdiPlanForm.java @@ -0,0 +1,116 @@ +package com.fizz.business.form; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.List; + +@Data +public class CalcPdiPlanForm { + + private Long id; // 主键ID + + private Integer seqid; // 主键ID + private String coilid; // 钢卷号 + private Integer picklingCount; // 酸洗次数 + private Integer dummyCoilFlag; // 虚卷标识 + private Integer seqno; // 顺序号 + private Integer status; // 状态 + private String planid; // 计划ID + private String planType; // 计划类型 + private BigDecimal yieldPoint; // 屈服点 + private BigDecimal entryWeight; // 入口重量(t) + private BigDecimal entryThick; // 入口厚度(mm) + private BigDecimal entryWidth; // 入口宽度(mm) + private BigDecimal entryLength; // 入口长度(mm) + private BigDecimal entryOuterDiameter; // 入口外径(mm) + private BigDecimal entryInnerDiameter; // 入口内径(mm) + private BigDecimal exitInnerDiameter; // 出口内径(mm) + private String steelGrade; // 钢种 + private String exitCoilid; // 出口卷号 + private Integer tlvFlag; // 张力平整标识 + private String orderNo; // 订单号 + private String custommerCode; // 客户代码 + private BigDecimal orderThick; // 订单厚度(mm) + private BigDecimal orderWidth; // 订单宽度(mm) + private BigDecimal orderLenLow; // 订单长度下限(mm) + private BigDecimal orderLenUp; // 订单长度上限(mm) + private BigDecimal orderWt; // 订单重量(t) + private BigDecimal orderWtLow; // 订单重量下限(t) + private BigDecimal orderWtUp; // 订单重量上限(t) + private BigDecimal orderMetCoatTop; // 订单镀层上 + private BigDecimal orderMetCoatBot; // 订单镀层下 + private String finalUse; // 最终用途 + private String hotCoilCode; // 热卷代码 + private BigDecimal exitLengthTar; // 出口目标长度(mm) + private BigDecimal exitLengthTolMax; // 出口长度公差最大值(mm) + private BigDecimal exitLengthTolMin; // 出口长度公差最小值(mm) + private BigDecimal exitThickTar; // 出口目标厚度(mm) + private BigDecimal exitThickTolMax; // 出口厚度公差最大值(mm) + private BigDecimal exitThickTolMin; // 出口厚度公差最小值(mm) + private BigDecimal exitWidthTar; // 出口目标宽度(mm) + private BigDecimal exitWidthTolMax; // 出口宽度公差最大值(mm) + private BigDecimal exitWidthTolMin; // 出口宽度公差最小值(mm) + private String nextWholeBacklogCode; // 下道全流程积压代码 + private String prevWholeBacklogCode; // 上道全流程积压代码 + private String exitWtMode; // 出口重量模式 + private Integer splitNum; // 分卷数量 + private BigDecimal exitWeight1; // 出口重量1 + private BigDecimal exitWeight2; // 出口重量2 + private BigDecimal exitWeight3; // 出口重量3 + private BigDecimal exitWeight4; // 出口重量4 + private BigDecimal exitWeight5; // 出口重量5 + private BigDecimal exitWeight6; // 出口重量6 + private String headSampleMode; // 头部取样模式 + private String headSamplePosition; // 头部取样位置 + private BigDecimal headSampleLength; // 头部取样长度(mm) + private String headSamplePlace; // 头部取样地点 + private Integer headSampleNum; // 头部取样数量 + private String tailSampleMode; // 尾部取样模式 + private String tailSamplePosition; // 尾部取样位置 + private BigDecimal tailSampleLength; // 尾部取样长度(mm) + private String tailSamplePlace; // 尾部取样地点 + private Integer tailSampleNum; // 尾部取样数量 + private LocalDateTime timestamp; // 时间戳 + private LocalDateTime onlineDate; // 上线时间 + private LocalDateTime startDate; // 开始时间 + private LocalDateTime endDate; // 结束时间 + private LocalDateTime furInDate; // 进炉时间 + private LocalDateTime furOutDate; // 出炉时间 + private LocalDateTime createTime; // 创建时间 + private LocalDateTime updateTime; // 更新时间 + private String surfaceVice; // 副面 + private String weldCode; // 焊缝代码 + private Integer spmFlag; // SPM标识 + private BigDecimal spmElongation; // SPM延伸率(%) + private BigDecimal spmRollforce; // SPM轧制力 + private String spmProcessType; // SPM工艺类型 + private String spmControlMode; // SPM控制模式 + private BigDecimal spmBendingForce; // SPM弯曲力 + private BigDecimal spmCrimpingRollMesh; // SPM咬入辊目 + private BigDecimal spmBillyRollMesh; // SPM精轧辊目 + private Integer trimFlag; // 切边标识 + private String tlvMode; // 张力平整模式 + private BigDecimal tlvElongation; // 张力平整延伸率(%) + private Integer chromating; // 钝化标识 + private String coatingCode; // 镀层代码 + private Integer oilingFlag; // 涂油标识 + private String oilingType; // 涂油类型 + private BigDecimal oilingTop; // 涂油上 + private BigDecimal oilingBottom; // 涂油下 + private String heatCycle; // 热循环 + private String coatingSelection; // 镀层选择 + private String coatingType; // 镀层类型 + private String chemTreatMode; // 化学处理模式 + private BigDecimal aimWeightTop; // 目标重量上 + private BigDecimal aimWeightBottom; // 目标重量下 + private BigDecimal maxTolWeightTop; // 最大公差重量上 + private BigDecimal maxTolWeightBottom; // 最大公差重量下 + private BigDecimal headendGaugeLength; // 头端测厚长度(mm) + private BigDecimal tailendGaugeLength; // 尾端测厚长度(mm) + private String origin; // 产地 + private String originCoilid; // 原卷号 + +} diff --git a/business/src/main/java/com/fizz/business/form/ChangePlanStatusForm.java b/business/src/main/java/com/fizz/business/form/ChangePlanStatusForm.java new file mode 100644 index 0000000..905b023 --- /dev/null +++ b/business/src/main/java/com/fizz/business/form/ChangePlanStatusForm.java @@ -0,0 +1,36 @@ +package com.fizz.business.form; + + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * 状态变更form + * + * @author chenhao + * @date 2023/04/27 + */ +@Getter +@Setter +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class ChangePlanStatusForm implements Serializable { + + @NotNull(message = "状态变更类型不能为空") + @Schema(description = "ONLINE-钢卷上线，UNLOAD-手动卸卷，ALL_RETURN-整卷回退，PRODUCING-生产中，HALF_RETURN-半卷回退，PRODUCT-生产完成，BLOCK-卸卷并封闭") + private String operation; + @NotNull(message = "计划id不能为空") + @Schema(description = "计划id集合") + private String id; + @Schema(description = "计划id集合") + private String matId; + + @Schema(description = "半卷回退新卷号") + private String returnMatId; + @Schema(description = "回退重量") + private Double returnWeight; +} diff --git a/business/src/main/java/com/fizz/business/form/ConfirmAlarmForm.java b/business/src/main/java/com/fizz/business/form/ConfirmAlarmForm.java new file mode 100644 index 0000000..84d3b3d --- /dev/null +++ b/business/src/main/java/com/fizz/business/form/ConfirmAlarmForm.java @@ -0,0 +1,24 @@ +package com.fizz.business.form; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Getter; +import lombok.Setter; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +@Getter +@Setter +public class ConfirmAlarmForm implements Serializable { + + @NotNull(message = "报警id不能为空") + @Schema(description = "报警id") + private Long id; + + @NotNull(message = "状态不能为空") + @Schema(description = "状态") + private String status; + + @Schema(description = "备注") + private String alarmRemark; +} diff --git a/business/src/main/java/com/fizz/business/form/CrmPdiPlanForm.java b/business/src/main/java/com/fizz/business/form/CrmPdiPlanForm.java new file mode 100644 index 0000000..e696c1e --- /dev/null +++ b/business/src/main/java/com/fizz/business/form/CrmPdiPlanForm.java @@ -0,0 +1,119 @@ +package com.fizz.business.form; + +import com.fizz.business.vo.ModSetupResultVO; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.List; + + +@Data +public class CrmPdiPlanForm { + + private Long id; // 主键ID + + private Integer seqid; // 主键ID + private String coilid; // 钢卷号 + private String unitCode; // 钢卷号 + private Integer picklingCount; // 酸洗次数 + private Integer dummyCoilFlag; // 虚卷标识 + private Integer seqno; // 顺序号 + private Integer status; // 状态 + private String planid; // 计划ID + private String planType; // 计划类型 + private BigDecimal yieldPoint; // 屈服点 + private BigDecimal entryWeight; // 入口重量(t) + private BigDecimal entryThick; // 入口厚度(mm) + private BigDecimal entryWidth; // 入口宽度(mm) + private BigDecimal entryLength; // 入口长度(mm) + private BigDecimal entryOuterDiameter; // 入口外径(mm) + private BigDecimal entryInnerDiameter; // 入口内径(mm) + private BigDecimal exitInnerDiameter; // 出口内径(mm) + private String steelGrade; // 钢种 + private String exitCoilid; // 出口卷号 + private Integer tlvFlag; // 张力平整标识 + private String orderNo; // 订单号 + private String custommerCode; // 客户代码 + private BigDecimal orderThick; // 订单厚度(mm) + private BigDecimal orderWidth; // 订单宽度(mm) + private BigDecimal orderLenLow; // 订单长度下限(mm) + private BigDecimal orderLenUp; // 订单长度上限(mm) + private BigDecimal orderWt; // 订单重量(t) + private BigDecimal orderWtLow; // 订单重量下限(t) + private BigDecimal orderWtUp; // 订单重量上限(t) + private BigDecimal orderMetCoatTop; // 订单镀层上 + private BigDecimal orderMetCoatBot; // 订单镀层下 + private String finalUse; // 最终用途 + private String hotCoilCode; // 热卷代码 + private BigDecimal exitLengthTar; // 出口目标长度(mm) + private BigDecimal exitLengthTolMax; // 出口长度公差最大值(mm) + private BigDecimal exitLengthTolMin; // 出口长度公差最小值(mm) + private BigDecimal exitThickTar; // 出口目标厚度(mm) + private BigDecimal exitThickTolMax; // 出口厚度公差最大值(mm) + private BigDecimal exitThickTolMin; // 出口厚度公差最小值(mm) + private BigDecimal exitWidthTar; // 出口目标宽度(mm) + private BigDecimal exitWidthTolMax; // 出口宽度公差最大值(mm) + private BigDecimal exitWidthTolMin; // 出口宽度公差最小值(mm) + private String nextWholeBacklogCode; // 下道全流程积压代码 + private String prevWholeBacklogCode; // 上道全流程积压代码 + private String exitWtMode; // 出口重量模式 + private Integer splitNum; // 分卷数量 + private BigDecimal exitWeight1; // 出口重量1 + private BigDecimal exitWeight2; // 出口重量2 + private BigDecimal exitWeight3; // 出口重量3 + private BigDecimal exitWeight4; // 出口重量4 + private BigDecimal exitWeight5; // 出口重量5 + private BigDecimal exitWeight6; // 出口重量6 + private String headSampleMode; // 头部取样模式 + private String headSamplePosition; // 头部取样位置 + private BigDecimal headSampleLength; // 头部取样长度(mm) + private String headSamplePlace; // 头部取样地点 + private Integer headSampleNum; // 头部取样数量 + private String tailSampleMode; // 尾部取样模式 + private String tailSamplePosition; // 尾部取样位置 + private BigDecimal tailSampleLength; // 尾部取样长度(mm) + private String tailSamplePlace; // 尾部取样地点 + private Integer tailSampleNum; // 尾部取样数量 + private LocalDateTime timestamp; // 时间戳 + private LocalDateTime onlineDate; // 上线时间 + private LocalDateTime startDate; // 开始时间 + private LocalDateTime endDate; // 结束时间 + private LocalDateTime furInDate; // 进炉时间 + private LocalDateTime furOutDate; // 出炉时间 + private LocalDateTime createTime; // 创建时间 + private LocalDateTime updateTime; // 更新时间 + private String surfaceVice; // 副面 + private String weldCode; // 焊缝代码 + private Integer spmFlag; // SPM标识 + private BigDecimal spmElongation; // SPM延伸率(%) + private BigDecimal spmRollforce; // SPM轧制力 + private String spmProcessType; // SPM工艺类型 + private String spmControlMode; // SPM控制模式 + private BigDecimal spmBendingForce; // SPM弯曲力 + private BigDecimal spmCrimpingRollMesh; // SPM咬入辊目 + private BigDecimal spmBillyRollMesh; // SPM精轧辊目 + private Integer trimFlag; // 切边标识 + private String tlvMode; // 张力平整模式 + private BigDecimal tlvElongation; // 张力平整延伸率(%) + private Integer chromating; // 钝化标识 + private String coatingCode; // 镀层代码 + private Integer oilingFlag; // 涂油标识 + private String oilingType; // 涂油类型 + private BigDecimal oilingTop; // 涂油上 + private BigDecimal oilingBottom; // 涂油下 + private String heatCycle; // 热循环 + private String coatingSelection; // 镀层选择 + private String coatingType; // 镀层类型 + private String chemTreatMode; // 化学处理模式 + private BigDecimal aimWeightTop; // 目标重量上 + private BigDecimal aimWeightBottom; // 目标重量下 + private BigDecimal maxTolWeightTop; // 最大公差重量上 + private BigDecimal maxTolWeightBottom; // 最大公差重量下 + private BigDecimal headendGaugeLength; // 头端测厚长度(mm) + private BigDecimal tailendGaugeLength; // 尾端测厚长度(mm) + private String origin; // 产地 + private String originCoilid; // 原卷号 + +} diff --git a/business/src/main/java/com/fizz/business/form/CrmPdoExcoilForm.java b/business/src/main/java/com/fizz/business/form/CrmPdoExcoilForm.java new file mode 100644 index 0000000..2326d15 --- /dev/null +++ b/business/src/main/java/com/fizz/business/form/CrmPdoExcoilForm.java @@ -0,0 +1,21 @@ +package com.fizz.business.form; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; + +@Data +public class CrmPdoExcoilForm { + + + @Schema(description = "钢卷号") + private String coilid; + + @Schema(description = "开始日期") + private String startDate; + + @Schema(description = "结束日期") + private String endDate; + +} diff --git a/business/src/main/java/com/fizz/business/form/L1OperateMatForm.java b/business/src/main/java/com/fizz/business/form/L1OperateMatForm.java new file mode 100644 index 0000000..cf4f135 --- /dev/null +++ b/business/src/main/java/com/fizz/business/form/L1OperateMatForm.java @@ -0,0 +1,32 @@ +package com.fizz.business.form; + + +import com.fizz.business.constants.enums.L1OperateMatEnum; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * 状态变更form + * + * @author chenhao + * @date 2023/04/27 + */ +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class L1OperateMatForm extends OperateMatForm implements Serializable { + + @NotNull(message = "操作不存在") + @Schema(description = "ONLINE-钢卷上线，UNLOAD-手动卸卷，ALL_RETURN-整卷回退，HALF_RETURN-半卷回退，BLOCK-卸卷并封闭，THROW_TAIL-甩尾") + private L1OperateMatEnum operation; + + @Builder + public L1OperateMatForm(Integer porIdx, Integer trIdx, String planId, String entryMatId, String planNo, L1OperateMatEnum operation) { + super(porIdx, trIdx, planId, entryMatId, planNo); + this.operation = operation; + } +} diff --git a/business/src/main/java/com/fizz/business/form/LogDataForm.java b/business/src/main/java/com/fizz/business/form/LogDataForm.java new file mode 100644 index 0000000..b3a2157 --- /dev/null +++ b/business/src/main/java/com/fizz/business/form/LogDataForm.java @@ -0,0 +1,50 @@ +package com.fizz.business.form; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; + +@Data +public class LogDataForm implements Serializable { + private static final long serialVersionUID = 1126261593345506267L; + + /** + * 开始时间 + */ + @Schema(description = "开始时间", format = "date", pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime startTime; + + @Schema(description = "结束时间", format = "date", pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime endTime; + + @Schema(description = "报警类型") + private String logtype; + + /** + * 报警模块 + */ + @Schema(description = "报警模块") + private String module; + + /** + * 警报内容 + */ + @Schema(description = "警报内容") + private String logtext; + + /** + * 报警状态 + */ + @Schema(description = "报警状态") + private Integer status; + + private int pageNum; + + private int pageSize; + +} diff --git a/business/src/main/java/com/fizz/business/form/ModSetupResultCalcForm.java b/business/src/main/java/com/fizz/business/form/ModSetupResultCalcForm.java new file mode 100644 index 0000000..d79826d --- /dev/null +++ b/business/src/main/java/com/fizz/business/form/ModSetupResultCalcForm.java @@ -0,0 +1,25 @@ +package com.fizz.business.form; + + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +public class ModSetupResultCalcForm { + + @Schema(description = "入口厚度") + private Float entryThick; + + @Schema(description = "出口厚度") + private Float exitThick; + + @Schema(description = "入口张力") + private Float entryTension; + + @Schema(description = "出口张力") + private Float exitTension; + + + + +} diff --git a/business/src/main/java/com/fizz/business/form/ModSetupResultForm.java b/business/src/main/java/com/fizz/business/form/ModSetupResultForm.java new file mode 100644 index 0000000..1d918c5 --- /dev/null +++ b/business/src/main/java/com/fizz/business/form/ModSetupResultForm.java @@ -0,0 +1,27 @@ +package com.fizz.business.form; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +public class ModSetupResultForm { + + @Schema(description = "钢卷ID") + private String coilId; + + @Schema(description = "钢种") + private String grade; + + @Schema(description = "道次号") + private Integer passno; + + @Schema(description = "退火厚度") + private Integer annealThick; + + @Schema(description = "入口厚度") + private Double entryThick; + + @Schema(description = "出口厚度") + private Double exitThick; + +} diff --git a/business/src/main/java/com/fizz/business/form/OperateMatForm.java b/business/src/main/java/com/fizz/business/form/OperateMatForm.java new file mode 100644 index 0000000..0f541a8 --- /dev/null +++ b/business/src/main/java/com/fizz/business/form/OperateMatForm.java @@ -0,0 +1,42 @@ +package com.fizz.business.form; + + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * 状态变更form + * + * @author chenhao + * @date 2023/04/27 + */ +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class OperateMatForm implements Serializable { + + @Schema(description = "开卷机编号") + private Integer porIdx; + + @Schema(description = "卷取机编号") + private Integer trIdx; + + @NotNull(message = "计划id不能为空") + @Schema(description = "计划id") + private String planId; + + @NotBlank(message = "钢卷号不能为空") + @Schema(description = "钢卷号") + private String entryMatId; + + @Schema(description = "计划号") + private String planNo; +} diff --git a/business/src/main/java/com/fizz/business/form/PageForm.java b/business/src/main/java/com/fizz/business/form/PageForm.java new file mode 100644 index 0000000..1460813 --- /dev/null +++ b/business/src/main/java/com/fizz/business/form/PageForm.java @@ -0,0 +1,12 @@ +package com.fizz.business.form; + + +import lombok.Data; + +@Data +public class PageForm { + + private long size = 10L; + private long current = 1L; + +} diff --git a/business/src/main/java/com/fizz/business/form/PlanQueryForm.java b/business/src/main/java/com/fizz/business/form/PlanQueryForm.java new file mode 100644 index 0000000..4bb7004 --- /dev/null +++ b/business/src/main/java/com/fizz/business/form/PlanQueryForm.java @@ -0,0 +1,31 @@ +package com.fizz.business.form; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + + +@Data +public class PlanQueryForm { + + @Schema(description = "卷ID") + private String coilid; + + @Schema(description = "入口厚度") + private BigDecimal entryThick; + + @Schema(description = "入口宽度") + private BigDecimal entryWidth; + + @Schema(description = "状态") + private String status; + + @Schema(description = "开始日期") + private LocalDateTime startDate; + + @Schema(description = "结束日期") + private LocalDateTime endDate; + +} diff --git a/business/src/main/java/com/fizz/business/form/ProStoppageForm.java b/business/src/main/java/com/fizz/business/form/ProStoppageForm.java new file mode 100644 index 0000000..f7e9c53 --- /dev/null +++ b/business/src/main/java/com/fizz/business/form/ProStoppageForm.java @@ -0,0 +1,13 @@ +package com.fizz.business.form; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +public class ProStoppageForm { + @Schema(description = "开始时间", example = "2023-08-12", format = "date", pattern = "yyyy-MM-dd") + private String startDate; + + @Schema(description = "结束时间", example = "2025-08-13", format = "date", pattern = "yyyy-MM-dd") + private String endDate; +} diff --git a/business/src/main/java/com/fizz/business/form/QueryAlarmForm.java b/business/src/main/java/com/fizz/business/form/QueryAlarmForm.java new file mode 100644 index 0000000..6f77bc9 --- /dev/null +++ b/business/src/main/java/com/fizz/business/form/QueryAlarmForm.java @@ -0,0 +1,38 @@ +package com.fizz.business.form; + + +import com.fizz.business.constants.enums.AlarmStatusEnum; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Getter; +import lombok.Setter; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.time.LocalDate; +import java.util.List; + +/** + * @author chenhao + * @date 2023/04/26 + */ +@Getter +@Setter +public class QueryAlarmForm extends PageForm implements Serializable { + + @Schema(description = "钢卷号") + private String matId; + + @Schema(description = "状态，INIT-初始化，UNCONFIRMED-报警未确认，CONFIRM-报警已确认") + private List statuses; + + @Schema(description = "报警类型 1:持续5min的报警 2：立即报警") + private String alarmType; + + @Schema(description = "开始日期,yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate startDate; + + @Schema(description = "结束日期,yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate endDate; +} diff --git a/business/src/main/java/com/fizz/business/form/QueryEventForm.java b/business/src/main/java/com/fizz/business/form/QueryEventForm.java new file mode 100644 index 0000000..0297b56 --- /dev/null +++ b/business/src/main/java/com/fizz/business/form/QueryEventForm.java @@ -0,0 +1,30 @@ +package com.fizz.business.form; + + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Getter; +import lombok.Setter; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.time.LocalDate; + +/** + * @author chenhao + * @date 2023/04/26 + */ +@Getter +@Setter +public class QueryEventForm extends PageForm implements Serializable { + + @Schema(description = "开始日期,yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate startDate; + + @Schema(description = "结束日期,yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate endDate; + + @Schema(description = "入口卷号") + private String entryMatId; +} diff --git a/business/src/main/java/com/fizz/business/form/QueryTargetForm.java b/business/src/main/java/com/fizz/business/form/QueryTargetForm.java new file mode 100644 index 0000000..0b73861 --- /dev/null +++ b/business/src/main/java/com/fizz/business/form/QueryTargetForm.java @@ -0,0 +1,34 @@ +package com.fizz.business.form; + + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Builder; +import lombok.Getter; +import lombok.Setter; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.time.LocalDate; + +/** + * @author chenhao + * @date 2023/04/26 + */ +@Getter +@Setter +@Builder +public class QueryTargetForm implements Serializable { + + @Schema(description = "开始日期,yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate start; + + @Schema(description = "结束日期,yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate end; + + private String unitCode; + private String groupNo; + private String shiftNo; + private String type; +} diff --git a/business/src/main/java/com/fizz/business/form/RollHistoryForm.java b/business/src/main/java/com/fizz/business/form/RollHistoryForm.java new file mode 100644 index 0000000..6de0bd1 --- /dev/null +++ b/business/src/main/java/com/fizz/business/form/RollHistoryForm.java @@ -0,0 +1,28 @@ +package com.fizz.business.form; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; + +@Data +public class RollHistoryForm { + @Schema(description = "开始时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime startTime; + + @Schema(description = "结束时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime endTime; + + @Schema(description = "换辊号") + private String changeId; + + @Schema(description = "轧辊号") + private String rollid; + + private int pageNum; + + private int pageSize; +} diff --git a/business/src/main/java/com/fizz/business/form/TensionDeleteForm.java b/business/src/main/java/com/fizz/business/form/TensionDeleteForm.java new file mode 100644 index 0000000..cf45605 --- /dev/null +++ b/business/src/main/java/com/fizz/business/form/TensionDeleteForm.java @@ -0,0 +1,12 @@ +package com.fizz.business.form; + +import lombok.Data; + +/** + * 全线张力删除参数封装类 + */ +@Data +public class TensionDeleteForm { + private Long[] thicks; + private Long[] yieldStrens; +} \ No newline at end of file diff --git a/business/src/main/java/com/fizz/business/form/TlDeleteForm.java b/business/src/main/java/com/fizz/business/form/TlDeleteForm.java new file mode 100644 index 0000000..bdf1ebc --- /dev/null +++ b/business/src/main/java/com/fizz/business/form/TlDeleteForm.java @@ -0,0 +1,13 @@ +package com.fizz.business.form; + +import lombok.Data; + +/** + * 拉矫机参数删除参数封装类 + */ +@Data +public class TlDeleteForm { + private String[] steelGrades; + private Long[] yieldStrens; + private Long[] thicks; +} diff --git a/business/src/main/java/com/fizz/business/form/TmBendforceDeleteForm.java b/business/src/main/java/com/fizz/business/form/TmBendforceDeleteForm.java new file mode 100644 index 0000000..b4d579d --- /dev/null +++ b/business/src/main/java/com/fizz/business/form/TmBendforceDeleteForm.java @@ -0,0 +1,12 @@ +package com.fizz.business.form; + +import lombok.Data; + +/** + * 光整机弯辊力删除参数封装类 + */ +@Data +public class TmBendforceDeleteForm { + private Long[] widths; + private Long[] rollForces; +} \ No newline at end of file diff --git a/business/src/main/java/com/fizz/business/form/TmMeshDeleteForm.java b/business/src/main/java/com/fizz/business/form/TmMeshDeleteForm.java new file mode 100644 index 0000000..9a5c0dd --- /dev/null +++ b/business/src/main/java/com/fizz/business/form/TmMeshDeleteForm.java @@ -0,0 +1,13 @@ +package com.fizz.business.form; + +import lombok.Data; + +/** + * 光整机插入量删除参数封装类 + */ +@Data +public class TmMeshDeleteForm { + private String[] steelGrades; + private Long[] yieldStrens; + private Long[] thicks; +} diff --git a/business/src/main/java/com/fizz/business/form/TmRollforceDeleteForm.java b/business/src/main/java/com/fizz/business/form/TmRollforceDeleteForm.java new file mode 100644 index 0000000..b028131 --- /dev/null +++ b/business/src/main/java/com/fizz/business/form/TmRollforceDeleteForm.java @@ -0,0 +1,14 @@ +package com.fizz.business.form; + +import lombok.Data; + +/** + * 光整机轧制力删除参数封装类 + */ +@Data +public class TmRollforceDeleteForm { + private String[] steelGrades; + private Long[] thicks; + private Long[] yieldStrens; + private Long[] elongs; +} \ No newline at end of file diff --git a/business/src/main/java/com/fizz/business/form/UpdateDefectForm.java b/business/src/main/java/com/fizz/business/form/UpdateDefectForm.java new file mode 100644 index 0000000..7bc6bd6 --- /dev/null +++ b/business/src/main/java/com/fizz/business/form/UpdateDefectForm.java @@ -0,0 +1,23 @@ +package com.fizz.business.form; + + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Getter; +import lombok.Setter; + +import java.io.Serializable; + +@Getter +@Setter +public class UpdateDefectForm implements Serializable { + @Schema(description = "缺陷起点") + private Double defectStartPos; + @Schema(description = "持续长度") + private Double defectLength; + @Schema(description = "缺陷code") + private String defectCode; + @Schema(description = "缺陷名称") + private String defectName; + @Schema(description = "缺陷描述") + private String defectDesc; +} diff --git a/business/src/main/java/com/fizz/business/form/WebOperateMatForm.java b/business/src/main/java/com/fizz/business/form/WebOperateMatForm.java new file mode 100644 index 0000000..c65fe39 --- /dev/null +++ b/business/src/main/java/com/fizz/business/form/WebOperateMatForm.java @@ -0,0 +1,46 @@ +package com.fizz.business.form; + + +import com.fizz.business.constants.enums.WebOperateMatEnum; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * 状态变更form + * + * @author chenhao + * @date 2023/04/27 + */ +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class WebOperateMatForm extends OperateMatForm implements Serializable { + + @NotNull(message = "操作不存在") + @Schema(description = "ONLINE-钢卷上线，UNLOAD-手动卸卷，ALL_RETURN-整卷回退，HALF_RETURN-半卷回退，BLOCK-卸卷并封闭，THROW_TAIL-甩尾") + private WebOperateMatEnum operation; + + @Schema(description = "回退卷号") + private String returnMatId; + + @Schema(description = "回退重量") + private Double returnWeight; + + @Schema(description = "回退备注") + private String returnRemark; + + @Schema(description = "产出钢卷长度") + private Double coilLength; + + @Builder + public WebOperateMatForm(Integer porIdx, Integer trIdx, String planId, String entryMatId, String planNo, WebOperateMatEnum operation, Double returnWeight, String returnRemark) { + super(porIdx, trIdx, planId, entryMatId, planNo); + this.operation = operation; + this.returnWeight = returnWeight; + this.returnRemark = returnRemark; + } +} diff --git a/business/src/main/java/com/fizz/business/interceptor/NextUnitEnumTypeHandler.java b/business/src/main/java/com/fizz/business/interceptor/NextUnitEnumTypeHandler.java new file mode 100644 index 0000000..6f293fb --- /dev/null +++ b/business/src/main/java/com/fizz/business/interceptor/NextUnitEnumTypeHandler.java @@ -0,0 +1,39 @@ +package com.fizz.business.interceptor; + +import com.fizz.business.constants.enums.NextUnitEnum; +import org.apache.ibatis.type.BaseTypeHandler; +import org.apache.ibatis.type.JdbcType; +import org.springframework.context.annotation.Configuration; + +import java.sql.CallableStatement; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; + + +@Configuration +public class NextUnitEnumTypeHandler extends BaseTypeHandler { + + @Override + public void setNonNullParameter(PreparedStatement ps, int i, NextUnitEnum parameter, JdbcType jdbcType) throws SQLException { + ps.setInt(i, parameter.getCode()); // 存入数据库时存储code值 + } + + @Override + public NextUnitEnum getNullableResult(ResultSet rs, String columnName) throws SQLException { + int code = rs.getInt(columnName); + return NextUnitEnum.fromCode(code); // 从数据库读取时，根据code值获取枚举 + } + + @Override + public NextUnitEnum getNullableResult(ResultSet rs, int columnIndex) throws SQLException { + int code = rs.getInt(columnIndex); + return NextUnitEnum.fromCode(code); + } + + @Override + public NextUnitEnum getNullableResult(CallableStatement cs, int columnIndex) throws SQLException { + int code = cs.getInt(columnIndex); + return NextUnitEnum.fromCode(code); + } +} diff --git a/business/src/main/java/com/fizz/business/interceptor/OperModeEnumTypeHandler.java b/business/src/main/java/com/fizz/business/interceptor/OperModeEnumTypeHandler.java new file mode 100644 index 0000000..17dc557 --- /dev/null +++ b/business/src/main/java/com/fizz/business/interceptor/OperModeEnumTypeHandler.java @@ -0,0 +1,39 @@ +package com.fizz.business.interceptor; + +import com.fizz.business.constants.enums.OperModeEnum; +import org.apache.ibatis.type.BaseTypeHandler; +import org.apache.ibatis.type.JdbcType; +import org.springframework.context.annotation.Configuration; + +import java.sql.CallableStatement; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; + + +@Configuration +public class OperModeEnumTypeHandler extends BaseTypeHandler { + + @Override + public void setNonNullParameter(PreparedStatement ps, int i, OperModeEnum parameter, JdbcType jdbcType) throws SQLException { + ps.setInt(i, parameter.getCode()); // 将枚举值的 code 存储到数据库中 + } + + @Override + public OperModeEnum getNullableResult(ResultSet rs, String columnName) throws SQLException { + int code = rs.getInt(columnName); + return OperModeEnum.fromCode(code); // 从数据库中读取 code 并返回对应的枚举 + } + + @Override + public OperModeEnum getNullableResult(ResultSet rs, int columnIndex) throws SQLException { + int code = rs.getInt(columnIndex); + return OperModeEnum.fromCode(code); + } + + @Override + public OperModeEnum getNullableResult(CallableStatement cs, int columnIndex) throws SQLException { + int code = cs.getInt(columnIndex); + return OperModeEnum.fromCode(code); + } +} diff --git a/business/src/main/java/com/fizz/business/interceptor/PlanStatusEnumTypeHandler.java b/business/src/main/java/com/fizz/business/interceptor/PlanStatusEnumTypeHandler.java new file mode 100644 index 0000000..9cba97f --- /dev/null +++ b/business/src/main/java/com/fizz/business/interceptor/PlanStatusEnumTypeHandler.java @@ -0,0 +1,39 @@ +package com.fizz.business.interceptor; + + +import com.fizz.business.constants.enums.PlanStatusEnum; +import org.apache.ibatis.type.BaseTypeHandler; +import org.apache.ibatis.type.JdbcType; +import org.springframework.context.annotation.Configuration; + +import java.sql.CallableStatement; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; + +@Configuration +public class PlanStatusEnumTypeHandler extends BaseTypeHandler { + + @Override + public void setNonNullParameter(PreparedStatement ps, int i, PlanStatusEnum parameter, JdbcType jdbcType) throws SQLException { + ps.setString(i, parameter.getStatus()); // 将枚举的status字段存储到数据库 + } + + @Override + public PlanStatusEnum getNullableResult(ResultSet rs, String columnName) throws SQLException { + String status = rs.getString(columnName); + return PlanStatusEnum.fromStatus(status); // 根据数据库中的status字段值，返回对应的枚举 + } + + @Override + public PlanStatusEnum getNullableResult(ResultSet rs, int columnIndex) throws SQLException { + String status = rs.getString(columnIndex); + return PlanStatusEnum.fromStatus(status); + } + + @Override + public PlanStatusEnum getNullableResult(CallableStatement cs, int columnIndex) throws SQLException { + String status = cs.getString(columnIndex); + return PlanStatusEnum.fromStatus(status); + } +} diff --git a/business/src/main/java/com/fizz/business/interceptor/TrackWsInterceptor.java b/business/src/main/java/com/fizz/business/interceptor/TrackWsInterceptor.java new file mode 100644 index 0000000..95ad92b --- /dev/null +++ b/business/src/main/java/com/fizz/business/interceptor/TrackWsInterceptor.java @@ -0,0 +1,40 @@ +package com.fizz.business.interceptor; + +import com.fizz.business.constants.enums.WsTypeEnum; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.server.ServerHttpRequest; +import org.springframework.http.server.ServerHttpResponse; +import org.springframework.http.server.ServletServerHttpRequest; +import org.springframework.stereotype.Component; +import org.springframework.web.socket.WebSocketHandler; +import org.springframework.web.socket.server.HandshakeInterceptor; + +import java.util.Map; +import java.util.Objects; + +@Slf4j +@Component +public class TrackWsInterceptor implements HandshakeInterceptor { + + @Override + public boolean beforeHandshake(ServerHttpRequest request, ServerHttpResponse response, WebSocketHandler wsHandler, Map attributes) throws Exception { + try { + String type = ((ServletServerHttpRequest) request).getServletRequest().getParameter("type"); + if (Objects.isNull(WsTypeEnum.getByValue(type))) { + log.error("[websocket]beforeHandshake error: type={}", type); + return false; + } + attributes.put("type", type); + return true; + } catch (Exception e) { + log.error("[websocket]beforeHandshake error", e); + return false; + } + + } + + @Override + public void afterHandshake(ServerHttpRequest request, ServerHttpResponse response, WebSocketHandler wsHandler, Exception exception) { + + } +} \ No newline at end of file diff --git a/business/src/main/java/com/fizz/business/mapper/CrmPdiPlanMapper.java b/business/src/main/java/com/fizz/business/mapper/CrmPdiPlanMapper.java new file mode 100644 index 0000000..12e4ff1 --- /dev/null +++ b/business/src/main/java/com/fizz/business/mapper/CrmPdiPlanMapper.java @@ -0,0 +1,9 @@ +package com.fizz.business.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fizz.business.domain.CrmPdiPlan; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CrmPdiPlanMapper extends BaseMapper { +} \ No newline at end of file diff --git a/business/src/main/java/com/fizz/business/mapper/CrmPdoExcoilMapper.java b/business/src/main/java/com/fizz/business/mapper/CrmPdoExcoilMapper.java new file mode 100644 index 0000000..423a598 --- /dev/null +++ b/business/src/main/java/com/fizz/business/mapper/CrmPdoExcoilMapper.java @@ -0,0 +1,31 @@ +package com.fizz.business.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fizz.business.domain.CrmPdoExcoil; +import com.fizz.business.vo.ReportDetailVO; +import com.fizz.business.vo.ReportSummaryVO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.time.LocalDateTime; +import java.util.List; + +@Mapper +public interface CrmPdoExcoilMapper extends BaseMapper { + + + ReportSummaryVO getReportSummary( + @Param("groupNo") String groupNo, + @Param("shiftNo") String shiftNo, + @Param("startTime") LocalDateTime startTime, + @Param("endTime") LocalDateTime endTime + ); + + List getReportDetails( + @Param("groupNo") String groupNo, + @Param("shiftNo") String shiftNo, + @Param("startTime") LocalDateTime startTime, + @Param("endTime") LocalDateTime endTime + ); + +} diff --git a/business/src/main/java/com/fizz/business/mapper/DeviceDefineMapper.java b/business/src/main/java/com/fizz/business/mapper/DeviceDefineMapper.java new file mode 100644 index 0000000..2325304 --- /dev/null +++ b/business/src/main/java/com/fizz/business/mapper/DeviceDefineMapper.java @@ -0,0 +1,16 @@ +package com.fizz.business.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fizz.business.domain.DeviceDefine; + +/** + *

+ * 机组定义表 Mapper 接口 + *

+ * + * @author baomidou + * @since 2023-05-17 + */ +public interface DeviceDefineMapper extends BaseMapper { + +} diff --git a/business/src/main/java/com/fizz/business/mapper/HalfReturnMapper.java b/business/src/main/java/com/fizz/business/mapper/HalfReturnMapper.java new file mode 100644 index 0000000..28a3f05 --- /dev/null +++ b/business/src/main/java/com/fizz/business/mapper/HalfReturnMapper.java @@ -0,0 +1,16 @@ +package com.fizz.business.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fizz.business.domain.HalfReturn; + +/** + *

+ * 半卷整卷回退表 Mapper 接口 + *

+ * + * @author baomidou + * @since 2023-05-17 + */ +public interface HalfReturnMapper extends BaseMapper { + +} diff --git a/business/src/main/java/com/fizz/business/mapper/LogDataMapper.java b/business/src/main/java/com/fizz/business/mapper/LogDataMapper.java new file mode 100644 index 0000000..d0679f2 --- /dev/null +++ b/business/src/main/java/com/fizz/business/mapper/LogDataMapper.java @@ -0,0 +1,10 @@ +package com.fizz.business.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fizz.business.domain.LogData; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface LogDataMapper extends BaseMapper { + +} diff --git a/business/src/main/java/com/fizz/business/mapper/ModCoilMapMapper.java b/business/src/main/java/com/fizz/business/mapper/ModCoilMapMapper.java new file mode 100644 index 0000000..2f53238 --- /dev/null +++ b/business/src/main/java/com/fizz/business/mapper/ModCoilMapMapper.java @@ -0,0 +1,11 @@ +package com.fizz.business.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fizz.business.domain.ModCoilMap; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface ModCoilMapMapper extends BaseMapper { + // 你可以在这里添加自定义查询方法 +} \ No newline at end of file diff --git a/business/src/main/java/com/fizz/business/mapper/ModSetupResultMapper.java b/business/src/main/java/com/fizz/business/mapper/ModSetupResultMapper.java new file mode 100644 index 0000000..ebbb428 --- /dev/null +++ b/business/src/main/java/com/fizz/business/mapper/ModSetupResultMapper.java @@ -0,0 +1,10 @@ +package com.fizz.business.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fizz.business.domain.ModSetupResult; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface ModSetupResultMapper extends BaseMapper { + // 如果需要自定义查询或操作，可在此处添加相应的接口方法 +} diff --git a/business/src/main/java/com/fizz/business/mapper/PdiSetupMapper.java b/business/src/main/java/com/fizz/business/mapper/PdiSetupMapper.java new file mode 100644 index 0000000..b0418d6 --- /dev/null +++ b/business/src/main/java/com/fizz/business/mapper/PdiSetupMapper.java @@ -0,0 +1,63 @@ +package com.fizz.business.mapper; + +import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fizz.business.domain.PdiSetups; + +/** + * 生产计划的参数详情Mapper接口 + * + * @author Joshi + * @date 2025-09-25 + */ +public interface PdiSetupMapper extends BaseMapper +{ + /** + * 查询生产计划的参数详情 + * + * @param id 生产计划的参数详情主键 + * @return 生产计划的参数详情 + */ + public PdiSetups selectPdiSetupById(Long id); + + /** + * 查询生产计划的参数详情列表 + * + * @param pdiSetup 生产计划的参数详情 + * @return 生产计划的参数详情集合 + */ + public List selectPdiSetupList(PdiSetups pdiSetup); + + /** + * 新增生产计划的参数详情 + * + * @param pdiSetup 生产计划的参数详情 + * @return 结果 + */ + public int insertPdiSetup(PdiSetups pdiSetup); + + /** + * 修改生产计划的参数详情 + * + * @param pdiSetup 生产计划的参数详情 + * @return 结果 + */ + public int updatePdiSetup(PdiSetups pdiSetup); + + /** + * 删除生产计划的参数详情 + * + * @param id 生产计划的参数详情主键 + * @return 结果 + */ + public int deletePdiSetupById(Long id); + + /** + * 批量删除生产计划的参数详情 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deletePdiSetupByIds(Long[] ids); +} diff --git a/business/src/main/java/com/fizz/business/mapper/PdoExcoilMapper.java b/business/src/main/java/com/fizz/business/mapper/PdoExcoilMapper.java new file mode 100644 index 0000000..79623d3 --- /dev/null +++ b/business/src/main/java/com/fizz/business/mapper/PdoExcoilMapper.java @@ -0,0 +1,18 @@ +package com.fizz.business.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fizz.business.domain.PdoExcoil; +import org.apache.ibatis.annotations.Mapper; + +/** + *

+ * cs机组产出实绩表 Mapper 接口 + *

+ * + * @author baomidou + * @since 2023-05-17 + */ +@Mapper +public interface PdoExcoilMapper extends BaseMapper { + +} diff --git a/business/src/main/java/com/fizz/business/mapper/PdoStripvalueMapper.java b/business/src/main/java/com/fizz/business/mapper/PdoStripvalueMapper.java new file mode 100644 index 0000000..d3ca1c9 --- /dev/null +++ b/business/src/main/java/com/fizz/business/mapper/PdoStripvalueMapper.java @@ -0,0 +1,18 @@ +package com.fizz.business.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fizz.business.domain.PdoStripvalue; +import org.apache.ibatis.annotations.Mapper; + +/** + *

+ * 剪切带钢段平均值 Mapper 接口 + *

+ * + * @author baomidou + * @since 2023-05-17 + */ +@Mapper +public interface PdoStripvalueMapper extends BaseMapper { + +} diff --git a/business/src/main/java/com/fizz/business/mapper/PlantConfigMapper.java b/business/src/main/java/com/fizz/business/mapper/PlantConfigMapper.java new file mode 100644 index 0000000..a99e0da --- /dev/null +++ b/business/src/main/java/com/fizz/business/mapper/PlantConfigMapper.java @@ -0,0 +1,11 @@ +package com.fizz.business.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fizz.business.domain.PlantConfig; +import org.apache.ibatis.annotations.Mapper; + +import java.util.Map; + +@Mapper +public interface PlantConfigMapper extends BaseMapper { +} diff --git a/business/src/main/java/com/fizz/business/mapper/ProMatmapMapper.java b/business/src/main/java/com/fizz/business/mapper/ProMatmapMapper.java new file mode 100644 index 0000000..831da09 --- /dev/null +++ b/business/src/main/java/com/fizz/business/mapper/ProMatmapMapper.java @@ -0,0 +1,20 @@ +package com.fizz.business.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fizz.business.domain.ProMatmap; +import com.fizz.business.dto.MatmapDTO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface ProMatmapMapper extends BaseMapper { + + int updateMatidByDisplayName(String matid); + + void flushMatmap(@Param("list") List list); + + +} \ No newline at end of file diff --git a/business/src/main/java/com/fizz/business/mapper/ProStoppageMapper.java b/business/src/main/java/com/fizz/business/mapper/ProStoppageMapper.java new file mode 100644 index 0000000..212a79e --- /dev/null +++ b/business/src/main/java/com/fizz/business/mapper/ProStoppageMapper.java @@ -0,0 +1,8 @@ +package com.fizz.business.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fizz.business.domain.ProStoppage; + +public interface ProStoppageMapper extends BaseMapper { +} + diff --git a/business/src/main/java/com/fizz/business/mapper/RollChangeCycleMapper.java b/business/src/main/java/com/fizz/business/mapper/RollChangeCycleMapper.java new file mode 100644 index 0000000..e0e43e6 --- /dev/null +++ b/business/src/main/java/com/fizz/business/mapper/RollChangeCycleMapper.java @@ -0,0 +1,9 @@ +package com.fizz.business.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fizz.business.domain.RollChangeCycle; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface RollChangeCycleMapper extends BaseMapper { +} diff --git a/business/src/main/java/com/fizz/business/mapper/RollDataMapper.java b/business/src/main/java/com/fizz/business/mapper/RollDataMapper.java new file mode 100644 index 0000000..97fed3f --- /dev/null +++ b/business/src/main/java/com/fizz/business/mapper/RollDataMapper.java @@ -0,0 +1,9 @@ +package com.fizz.business.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fizz.business.domain.RollData; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface RollDataMapper extends BaseMapper { +} diff --git a/business/src/main/java/com/fizz/business/mapper/RollHistoryMapper.java b/business/src/main/java/com/fizz/business/mapper/RollHistoryMapper.java new file mode 100644 index 0000000..e86ce15 --- /dev/null +++ b/business/src/main/java/com/fizz/business/mapper/RollHistoryMapper.java @@ -0,0 +1,15 @@ +package com.fizz.business.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fizz.business.domain.RollHistory; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface RollHistoryMapper extends BaseMapper { + List getChangeIdList(); + + List getRollIdList(); + +} diff --git a/business/src/main/java/com/fizz/business/mapper/SegmentMapper.java b/business/src/main/java/com/fizz/business/mapper/SegmentMapper.java new file mode 100644 index 0000000..f18f225 --- /dev/null +++ b/business/src/main/java/com/fizz/business/mapper/SegmentMapper.java @@ -0,0 +1,31 @@ +package com.fizz.business.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fizz.business.domain.PdoStripvalue; +import com.fizz.business.domain.Segment; +import com.fizz.business.dto.SegmentDTO; +import com.fizz.business.vo.SegmentParamVO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 各机张力，电流等架跟踪表 Mapper 接口 + *

+ * + * @author baomidou + * @since 2023-05-17 + */ +@Mapper +public interface SegmentMapper extends BaseMapper { + + PdoStripvalue getStripValue(@Param("entryMatId") String entryMatId, @Param("startPos") double startPos, @Param("endPos") double endPos); + + Segment getLatestRecord(); + + List queryParamByEnCoilId(@Param("enCoilID") String enCoilID, + @Param("paramField") String paramField); + +} diff --git a/business/src/main/java/com/fizz/business/mapper/SegmentTotalMapper.java b/business/src/main/java/com/fizz/business/mapper/SegmentTotalMapper.java new file mode 100644 index 0000000..cc74d2c --- /dev/null +++ b/business/src/main/java/com/fizz/business/mapper/SegmentTotalMapper.java @@ -0,0 +1,18 @@ +package com.fizz.business.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fizz.business.domain.SegmentTotal; +import org.apache.ibatis.annotations.Mapper; + +/** + *

+ * 各机张力，电流等架跟踪表 Mapper 接口 + *

+ * + * @author baomidou + * @since 2023-10-26 + */ +@Mapper +public interface SegmentTotalMapper extends BaseMapper { + SegmentTotal getLatestRecord(); +} diff --git a/business/src/main/java/com/fizz/business/mapper/SetupFurTempMapper.java b/business/src/main/java/com/fizz/business/mapper/SetupFurTempMapper.java new file mode 100644 index 0000000..6fd7301 --- /dev/null +++ b/business/src/main/java/com/fizz/business/mapper/SetupFurTempMapper.java @@ -0,0 +1,61 @@ +package com.fizz.business.mapper; + +import java.util.List; +import com.fizz.business.domain.SetupFurTemp; + +/** + * 炉火段工艺参数Mapper接口 + * + * @author ruoyi + * @date 2025-09-29 + */ +public interface SetupFurTempMapper +{ + /** + * 查询炉火段工艺参数 + * + * @param steelGrade 炉火段工艺参数主键 + * @return 炉火段工艺参数 + */ + public SetupFurTemp selectSetupFurTempBySteelGrade(String steelGrade); + + /** + * 查询炉火段工艺参数列表 + * + * @param setupFurTemp 炉火段工艺参数 + * @return 炉火段工艺参数集合 + */ + public List selectSetupFurTempList(SetupFurTemp setupFurTemp); + + /** + * 新增炉火段工艺参数 + * + * @param setupFurTemp 炉火段工艺参数 + * @return 结果 + */ + public int insertSetupFurTemp(SetupFurTemp setupFurTemp); + + /** + * 修改炉火段工艺参数 + * + * @param setupFurTemp 炉火段工艺参数 + * @return 结果 + */ + public int updateSetupFurTemp(SetupFurTemp setupFurTemp); + + /** + * 删除炉火段工艺参数 + * + * @param steelGrade 炉火段工艺参数主键 + * @return 结果 + */ + public int deleteSetupFurTempBySteelGrade(String steelGrade); + + /** + * 批量删除炉火段工艺参数 + * + * @param steelGrades 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteSetupFurTempBySteelGrades(String[] steelGrades); +} diff --git a/business/src/main/java/com/fizz/business/mapper/SetupTensionMapper.java b/business/src/main/java/com/fizz/business/mapper/SetupTensionMapper.java new file mode 100644 index 0000000..e288c12 --- /dev/null +++ b/business/src/main/java/com/fizz/business/mapper/SetupTensionMapper.java @@ -0,0 +1,62 @@ +package com.fizz.business.mapper; + +import java.util.List; +import com.fizz.business.domain.SetupTension; +import org.apache.ibatis.annotations.Param; + +/** + * 全线张力Mapper接口 + * + * @author ruoyi + * @date 2025-09-26 + */ +public interface SetupTensionMapper +{ + /** + * 查询全线张力 + * + * @param thick 全线张力主键 + * @return 全线张力 + */ + public SetupTension selectSetupTensionByThick(@Param("thick") Long thick,@Param("yieldStren") Long yieldStren); + + /** + * 查询全线张力列表 + * + * @param setupTension 全线张力 + * @return 全线张力集合 + */ + public List selectSetupTensionList(SetupTension setupTension); + + /** + * 新增全线张力 + * + * @param setupTension 全线张力 + * @return 结果 + */ + public int insertSetupTension(SetupTension setupTension); + + /** + * 修改全线张力 + * + * @param setupTension 全线张力 + * @return 结果 + */ + public int updateSetupTension(SetupTension setupTension); + + /** + * 删除全线张力 + * + * @param thick 全线张力主键 + * @return 结果 + */ + public int deleteSetupTensionByThick(Long thick); + + /** + * 批量删除全线张力 + * + * @param thicks 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteSetupTensionByThicks(@Param("thicks") Long[] thicks,@Param("yieldStrens") Long[] yieldStrens); +} diff --git a/business/src/main/java/com/fizz/business/mapper/SetupTlMapper.java b/business/src/main/java/com/fizz/business/mapper/SetupTlMapper.java new file mode 100644 index 0000000..c251d50 --- /dev/null +++ b/business/src/main/java/com/fizz/business/mapper/SetupTlMapper.java @@ -0,0 +1,62 @@ +package com.fizz.business.mapper; + +import java.util.List; +import com.fizz.business.domain.SetupTl; +import org.apache.ibatis.annotations.Param; + +/** + * 拉矫机参数Mapper接口 + * + * @author ruoyi + * @date 2025-09-26 + */ +public interface SetupTlMapper +{ + /** + * 查询拉矫机参数 + * + * @param steelGrade 拉矫机参数主键 + * @return 拉矫机参数 + */ + public SetupTl selectSetupTlBySteelGrade(@Param("steelGrade") String steelGrade,@Param("yieldStren") Long yieldStren,@Param("thick") Long thick); + + /** + * 查询拉矫机参数列表 + * + * @param setupTl 拉矫机参数 + * @return 拉矫机参数集合 + */ + public List selectSetupTlList(SetupTl setupTl); + + /** + * 新增拉矫机参数 + * + * @param setupTl 拉矫机参数 + * @return 结果 + */ + public int insertSetupTl(SetupTl setupTl); + + /** + * 修改拉矫机参数 + * + * @param setupTl 拉矫机参数 + * @return 结果 + */ + public int updateSetupTl(SetupTl setupTl); + + /** + * 删除拉矫机参数 + * + * @param steelGrade 拉矫机参数主键 + * @return 结果 + */ + public int deleteSetupTlBySteelGrade(String steelGrade); + + /** + * 批量删除拉矫机参数 + * + * @param steelGrades 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteSetupTlBySteelGrades(@Param("steelGrades") String[] steelGrades,@Param("yieldStrens") Long[] yieldStrens,@Param("thicks") Long[] thicks); +} diff --git a/business/src/main/java/com/fizz/business/mapper/SetupTmBendforceMapper.java b/business/src/main/java/com/fizz/business/mapper/SetupTmBendforceMapper.java new file mode 100644 index 0000000..f4c4074 --- /dev/null +++ b/business/src/main/java/com/fizz/business/mapper/SetupTmBendforceMapper.java @@ -0,0 +1,62 @@ +package com.fizz.business.mapper; + +import java.util.List; +import com.fizz.business.domain.SetupTmBendforce; +import org.apache.ibatis.annotations.Param; + +/** + * 光整机弯辊力Mapper接口 + * + * @author Joshi + * @date 2025-09-26 + */ +public interface SetupTmBendforceMapper +{ + /** + * 查询光整机弯辊力 + * + * @param width 光整机弯辊力主键 + * @return 光整机弯辊力 + */ + public SetupTmBendforce selectSetupTmBendforceByWidth(@Param("width") Long width,@Param("rollForce") Long rollForce); + + /** + * 查询光整机弯辊力列表 + * + * @param setupTmBendforce 光整机弯辊力 + * @return 光整机弯辊力集合 + */ + public List selectSetupTmBendforceList(SetupTmBendforce setupTmBendforce); + + /** + * 新增光整机弯辊力 + * + * @param setupTmBendforce 光整机弯辊力 + * @return 结果 + */ + public int insertSetupTmBendforce(SetupTmBendforce setupTmBendforce); + + /** + * 修改光整机弯辊力 + * + * @param setupTmBendforce 光整机弯辊力 + * @return 结果 + */ + public int updateSetupTmBendforce(SetupTmBendforce setupTmBendforce); + + /** + * 删除光整机弯辊力 + * + * @param width 光整机弯辊力主键 + * @return 结果 + */ + public int deleteSetupTmBendforceByWidth(Long width); + + /** + * 批量删除光整机弯辊力 + * + * @param widths 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteSetupTmBendforceByWidths(@Param("widths") Long[] widths,@Param("rollForces") Long[] rollForces); +} diff --git a/business/src/main/java/com/fizz/business/mapper/SetupTmMeshMapper.java b/business/src/main/java/com/fizz/business/mapper/SetupTmMeshMapper.java new file mode 100644 index 0000000..f9a5f2a --- /dev/null +++ b/business/src/main/java/com/fizz/business/mapper/SetupTmMeshMapper.java @@ -0,0 +1,64 @@ +package com.fizz.business.mapper; + +import java.util.List; +import com.fizz.business.domain.SetupTmMesh; +import org.apache.ibatis.annotations.Param; + +/** + * 光整机插入量Mapper接口 + * + * @author Joshi + * @date 2025-09-26 + */ +public interface SetupTmMeshMapper +{ + /** + * 查询光整机插入量 + * + * @param steelGrade 光整机插入量主键 + * @return 光整机插入量 + */ + public SetupTmMesh selectSetupTmMeshBySteelGrade(@Param("steelGrade") String steelGrade,@Param("yieldStren") Long yieldStren,@Param("thick") Long thick); + + /** + * 查询光整机插入量列表 + * + * @param setupTmMesh 光整机插入量 + * @return 光整机插入量集合 + */ + public List selectSetupTmMeshList(SetupTmMesh setupTmMesh); + + /** + * 新增光整机插入量 + * + * @param setupTmMesh 光整机插入量 + * @return 结果 + */ + public int insertSetupTmMesh(SetupTmMesh setupTmMesh); + + /** + * 修改光整机插入量 + * + * @param setupTmMesh 光整机插入量 + * @return 结果 + */ + public int updateSetupTmMesh(SetupTmMesh setupTmMesh); + + /** + * 删除光整机插入量 + * + * @param steelGrade 光整机插入量主键 + * @return 结果 + */ + public int deleteSetupTmMeshBySteelGrade(String steelGrade); + + /** + * 批量删除光整机插入量 + * + * @param steelGrades 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteSetupTmMeshBySteelGrades(@Param("steelGrades") String[] steelGrades, + @Param("yieldStrens") Long[] yieldStrens, + @Param("thicks") Long[] thicks); +} diff --git a/business/src/main/java/com/fizz/business/mapper/SetupTmRollforceMapper.java b/business/src/main/java/com/fizz/business/mapper/SetupTmRollforceMapper.java new file mode 100644 index 0000000..f6947d7 --- /dev/null +++ b/business/src/main/java/com/fizz/business/mapper/SetupTmRollforceMapper.java @@ -0,0 +1,65 @@ +package com.fizz.business.mapper; + +import java.util.List; +import com.fizz.business.domain.SetupTmRollforce; +import org.apache.ibatis.annotations.Param; + +/** + * 光整机轧制力Mapper接口 + * + * @author Joshi + * @date 2025-09-26 + */ +public interface SetupTmRollforceMapper +{ + /** + * 查询光整机轧制力 + * + * @param steelGrade 光整机轧制力主键 + * @return 光整机轧制力 + */ + public SetupTmRollforce selectSetupTmRollforceBySteelGrade(@Param("steelGrade") String steelGrade,@Param("yieldStren") Long yieldStren,@Param("thick") Long thick,@Param("elong") Long elong); + + /** + * 查询光整机轧制力列表 + * + * @param setupTmRollforce 光整机轧制力 + * @return 光整机轧制力集合 + */ + public List selectSetupTmRollforceList(SetupTmRollforce setupTmRollforce); + + /** + * 新增光整机轧制力 + * + * @param setupTmRollforce 光整机轧制力 + * @return 结果 + */ + public int insertSetupTmRollforce(SetupTmRollforce setupTmRollforce); + + /** + * 修改光整机轧制力 + * + * @param setupTmRollforce 光整机轧制力 + * @return 结果 + */ + public int updateSetupTmRollforce(SetupTmRollforce setupTmRollforce); + + /** + * 删除光整机轧制力 + * + * @param steelGrade 光整机轧制力主键 + * @return 结果 + */ + public int deleteSetupTmRollforceBySteelGrade(String steelGrade); + + /** + * 批量删除光整机轧制力 + * + * @param steelGrades 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteSetupTmRollforceBySteelGrades(@Param("steelGrades") String[] steelGrades, + @Param("thicks") Long[] thicks, + @Param("yieldStrens") Long[] yieldStrens, + @Param("elongs") Long[] elongs); +} diff --git a/business/src/main/java/com/fizz/business/mapper/ShiftHistoryMapper.java b/business/src/main/java/com/fizz/business/mapper/ShiftHistoryMapper.java new file mode 100644 index 0000000..5f7d6fb --- /dev/null +++ b/business/src/main/java/com/fizz/business/mapper/ShiftHistoryMapper.java @@ -0,0 +1,9 @@ +package com.fizz.business.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fizz.business.domain.ShiftHistory; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface ShiftHistoryMapper extends BaseMapper { +} diff --git a/business/src/main/java/com/fizz/business/mapper/SteelGradeInfoMapper.java b/business/src/main/java/com/fizz/business/mapper/SteelGradeInfoMapper.java new file mode 100644 index 0000000..1bf6504 --- /dev/null +++ b/business/src/main/java/com/fizz/business/mapper/SteelGradeInfoMapper.java @@ -0,0 +1,11 @@ +package com.fizz.business.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fizz.business.domain.StdAlloy; +import com.fizz.business.domain.SteelGradeInfo; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface SteelGradeInfoMapper extends BaseMapper { +} \ No newline at end of file diff --git a/business/src/main/java/com/fizz/business/scheduled/BaseSchedule.java b/business/src/main/java/com/fizz/business/scheduled/BaseSchedule.java new file mode 100644 index 0000000..171ef04 --- /dev/null +++ b/business/src/main/java/com/fizz/business/scheduled/BaseSchedule.java @@ -0,0 +1,74 @@ +package com.fizz.business.scheduled; + +import com.fizz.business.utils.RedisLockUtil; +import lombok.extern.slf4j.Slf4j; +import org.springframework.scheduling.annotation.Async; +import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.stereotype.Component; + +import java.util.function.Consumer; + +@Slf4j +@Async("threadPoolTaskExecutor") +@Component +@EnableScheduling +public abstract class BaseSchedule { + + /** + * 默认key过期时间 1800秒 + */ + private static final int DEFAULT_EXPIRE_SECONDS = 1800; + + protected void execute(String taskName, int cacheSeconds, String cacheKey, Runnable func) { + // 执行完2分钟删除键值 + int delayedSeconds = Math.min(120, cacheSeconds / 10); + execute(taskName, cacheSeconds, delayedSeconds, cacheKey, k -> func.run()); + } + + /** + * 定时任务执行多服务防止同时执行 + * + * @param taskName: 任务名称 + * @param cacheSeconds: <= 0时默认时间 + * @param delayedSeconds: 任务执行完延时删除key; <0时默认 cacheSeconds/10 + * @param cacheKey: + * @param func: 执行的任务 key: 处理后的cacheKey + */ + protected void execute(String taskName, int cacheSeconds, int delayedSeconds, String cacheKey, Consumer func) { + String threadName = Thread.currentThread().getName(); + cacheKey = "scheduling:" + cacheKey; + if (cacheSeconds <= 0) { + cacheSeconds = DEFAULT_EXPIRE_SECONDS; + } + if (delayedSeconds < 0) { + delayedSeconds = cacheSeconds / 10; + } + // 不存在键值时执行 + String value = "1"; + boolean success = RedisLockUtil.setIfAbsent(cacheKey, value, cacheSeconds); + if (!success) { + log.debug("定时任务: {}, 取消执行. {}", taskName, threadName); + return; + } + log.debug("定时任务: {}, 开始执行. {}", taskName, threadName); + func.accept(cacheKey); + // 执行完后延时时间内不可重复执行 + if (delayedSeconds == 0) { + RedisLockUtil.delLock(cacheKey, value); + } else { + RedisLockUtil.setIfPresent(cacheKey, value, delayedSeconds); + } + log.debug("定时任务: {}, 执行结束. {}", taskName, threadName); + } + + public void actionCatchException(Runnable func) { + String threadName = Thread.currentThread().getName(); + try { + func.run(); + } catch (Exception e) { + log.error("定时任务执行出错 " + threadName, e); + } + } + + +} diff --git a/business/src/main/java/com/fizz/business/scheduled/LogDataCleanSchedule.java b/business/src/main/java/com/fizz/business/scheduled/LogDataCleanSchedule.java new file mode 100644 index 0000000..669b250 --- /dev/null +++ b/business/src/main/java/com/fizz/business/scheduled/LogDataCleanSchedule.java @@ -0,0 +1,55 @@ +package com.fizz.business.scheduled; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.fizz.business.domain.LogData; +import com.fizz.business.service.LogDataService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import java.time.LocalDateTime; + +/** + * 日志数据清理定时任务 + * 每天凌晨2点执行，删除六个月前的日志数据 + */ +@Slf4j +@Component +public class LogDataCleanSchedule extends BaseSchedule { + + @Autowired + private LogDataService logDataService; + + /** + * 每天凌晨2点执行日志清理任务 + * cron表达式: 秒分时日月周 + */ + @Scheduled(cron = "0 0 2 * * ?") + public void cleanOldLogData() { + String taskName = "日志数据清理任务"; + String cacheKey = "log_data_clean_task"; + + execute(taskName, 3600, cacheKey, () -> { + actionCatchException(() -> { + // 计算六个月前的时间 + LocalDateTime sixMonthsAgo = LocalDateTime.now().minusMonths(6); + + log.info("开始清理六个月前的日志数据，截止时间: {}", sixMonthsAgo); + + // 删除六个月前的日志数据 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.lt(LogData::getTimestamp, sixMonthsAgo); + + Long deletedCount = logDataService.count(queryWrapper); + boolean result = logDataService.remove(queryWrapper); + + if (result) { + log.info("日志数据清理完成，共删除 {} 条记录", deletedCount); + } else { + log.warn("日志数据清理失败"); + } + }); + }); + } +} diff --git a/business/src/main/java/com/fizz/business/service/CrmPdiPlanService.java b/business/src/main/java/com/fizz/business/service/CrmPdiPlanService.java new file mode 100644 index 0000000..a929d9f --- /dev/null +++ b/business/src/main/java/com/fizz/business/service/CrmPdiPlanService.java @@ -0,0 +1,32 @@ +package com.fizz.business.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.fizz.business.domain.CrmPdiPlan; +import com.fizz.business.form.CalcPdiPlanForm; +import com.fizz.business.form.ChangePlanStatusForm; +import com.fizz.business.form.CrmPdiPlanForm; +import com.fizz.business.form.PlanQueryForm; +import com.fizz.business.vo.CrmPdiPlanVO; +import com.fizz.business.vo.PdiPlanSetupInfoVO; + +import java.util.List; + +public interface CrmPdiPlanService extends IService { + + CrmPdiPlanVO getByCoilIdAndOperId(String coilid); + + boolean addCrmPdiPlan(CrmPdiPlan crmPdiPlan); + + boolean updateCrmPdiPlan(CrmPdiPlan crmPdiPlan); + + boolean deleteCrmPdiPlan(List coilid); + + List listAll(PlanQueryForm form); + + /** + * 获取未生产的第一个钢卷（按顺序号或创建时间最早） + */ + CrmPdiPlan getFirstUnProducedCoil(); + + void changeStatus(ChangePlanStatusForm build); +} diff --git a/business/src/main/java/com/fizz/business/service/CrmPdoExcoilService.java b/business/src/main/java/com/fizz/business/service/CrmPdoExcoilService.java new file mode 100644 index 0000000..12797b5 --- /dev/null +++ b/business/src/main/java/com/fizz/business/service/CrmPdoExcoilService.java @@ -0,0 +1,34 @@ +package com.fizz.business.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.IService; +import com.fizz.business.domain.CrmPdoExcoil; +import com.fizz.business.domain.PdoExcoil; +import com.fizz.business.form.CrmPdoExcoilForm; +import com.fizz.business.vo.ReportDetailVO; +import com.fizz.business.vo.ReportSummaryVO; + +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.List; + +public interface CrmPdoExcoilService extends IService { + CrmPdoExcoil getByExcoilId(String excoilid); + + boolean addCrmPdoExcoil(CrmPdoExcoil crmPdoExcoil); + + boolean updateCrmPdoExcoil(CrmPdoExcoil crmPdoExcoil); + + boolean deleteCrmPdoExcoil(String excoilid, String planId); + + List listAll(CrmPdoExcoilForm form); + + Long getNumber(String matId,String planId,Integer subNumber); + + ReportSummaryVO getReportSummary(String groupNo, String shiftNo, LocalDateTime startTime, LocalDateTime endTime); + + List getReportDetails(String groupNo, String shiftNo, LocalDateTime startTime, LocalDateTime endTime); + + void updateExitCoilActualWeight(String exitMatId, BigDecimal weight); +} + diff --git a/business/src/main/java/com/fizz/business/service/IPdiSetupService.java b/business/src/main/java/com/fizz/business/service/IPdiSetupService.java new file mode 100644 index 0000000..e575a77 --- /dev/null +++ b/business/src/main/java/com/fizz/business/service/IPdiSetupService.java @@ -0,0 +1,65 @@ +package com.fizz.business.service; + +import java.util.List; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.fizz.business.domain.PdiSetups; +import com.fizz.business.domain.ProStoppage; +import com.fizz.business.domain.msg.PdiSetup; + +/** + * 生产计划的参数详情Service接口 + * + * @author Joshi + * @date 2025-09-25 + */ +public interface IPdiSetupService extends IService +{ + /** + * 查询生产计划的参数详情 + * + * @param id 生产计划的参数详情主键 + * @return 生产计划的参数详情 + */ + public PdiSetups selectPdiSetupByid(Long id); + + /** + * 查询生产计划的参数详情列表 + * + * @param pdiSetup 生产计划的参数详情 + * @return 生产计划的参数详情集合 + */ + public List selectPdiSetupList(PdiSetups pdiSetup); + + /** + * 新增生产计划的参数详情 + * + * @param pdiSetup 生产计划的参数详情 + * @return 结果 + */ + public Boolean insertPdiSetup(PdiSetups pdiSetup); + + /** + * 修改生产计划的参数详情 + * + * @param pdiSetup 生产计划的参数详情 + * @return 结果 + */ + public Boolean updatePdiSetup(PdiSetups pdiSetup); + + /** + * 批量删除生产计划的参数详情 + * + * @param ids 需要删除的生产计划的参数详情主键集合 + * @return 结果 + */ + public Boolean deletePdiSetupByids(Long[] ids); + + /** + * 删除生产计划的参数详情信息 + * + * @param id 生产计划的参数详情主键 + * @return 结果 + */ + public Boolean deletePdiSetupByid(Long id); +} diff --git a/business/src/main/java/com/fizz/business/service/ISetupFurTempService.java b/business/src/main/java/com/fizz/business/service/ISetupFurTempService.java new file mode 100644 index 0000000..56b43a6 --- /dev/null +++ b/business/src/main/java/com/fizz/business/service/ISetupFurTempService.java @@ -0,0 +1,61 @@ +package com.fizz.business.service; + +import java.util.List; +import com.fizz.business.domain.SetupFurTemp; + +/** + * 炉火段工艺参数Service接口 + * + * @author ruoyi + * @date 2025-09-29 + */ +public interface ISetupFurTempService +{ + /** + * 查询炉火段工艺参数 + * + * @param steelGrade 炉火段工艺参数主键 + * @return 炉火段工艺参数 + */ + public SetupFurTemp selectSetupFurTempBySteelGrade(String steelGrade); + + /** + * 查询炉火段工艺参数列表 + * + * @param setupFurTemp 炉火段工艺参数 + * @return 炉火段工艺参数集合 + */ + public List selectSetupFurTempList(SetupFurTemp setupFurTemp); + + /** + * 新增炉火段工艺参数 + * + * @param setupFurTemp 炉火段工艺参数 + * @return 结果 + */ + public int insertSetupFurTemp(SetupFurTemp setupFurTemp); + + /** + * 修改炉火段工艺参数 + * + * @param setupFurTemp 炉火段工艺参数 + * @return 结果 + */ + public int updateSetupFurTemp(SetupFurTemp setupFurTemp); + + /** + * 批量删除炉火段工艺参数 + * + * @param steelGrades 需要删除的炉火段工艺参数主键集合 + * @return 结果 + */ + public int deleteSetupFurTempBySteelGrades(String[] steelGrades); + + /** + * 删除炉火段工艺参数信息 + * + * @param steelGrade 炉火段工艺参数主键 + * @return 结果 + */ + public int deleteSetupFurTempBySteelGrade(String steelGrade); +} diff --git a/business/src/main/java/com/fizz/business/service/ISetupTensionService.java b/business/src/main/java/com/fizz/business/service/ISetupTensionService.java new file mode 100644 index 0000000..7dad000 --- /dev/null +++ b/business/src/main/java/com/fizz/business/service/ISetupTensionService.java @@ -0,0 +1,61 @@ +package com.fizz.business.service; + +import java.util.List; +import com.fizz.business.domain.SetupTension; + +/** + * 全线张力Service接口 + * + * @author ruoyi + * @date 2025-09-26 + */ +public interface ISetupTensionService +{ + /** + * 查询全线张力 + * + * @param thick 全线张力主键 + * @return 全线张力 + */ + public SetupTension selectSetupTensionByThick(Long thick,Long yieldStren); + + /** + * 查询全线张力列表 + * + * @param setupTension 全线张力 + * @return 全线张力集合 + */ + public List selectSetupTensionList(SetupTension setupTension); + + /** + * 新增全线张力 + * + * @param setupTension 全线张力 + * @return 结果 + */ + public int insertSetupTension(SetupTension setupTension); + + /** + * 修改全线张力 + * + * @param setupTension 全线张力 + * @return 结果 + */ + public int updateSetupTension(SetupTension setupTension); + + /** + * 批量删除全线张力 + * + * @param thicks 需要删除的全线张力主键集合 + * @return 结果 + */ + public int deleteSetupTensionByThicks(Long[] thicks,Long[] yieldStrens ); + + /** + * 删除全线张力信息 + * + * @param thick 全线张力主键 + * @return 结果 + */ + public int deleteSetupTensionByThick(Long thick); +} diff --git a/business/src/main/java/com/fizz/business/service/ISetupTlService.java b/business/src/main/java/com/fizz/business/service/ISetupTlService.java new file mode 100644 index 0000000..301a4a3 --- /dev/null +++ b/business/src/main/java/com/fizz/business/service/ISetupTlService.java @@ -0,0 +1,61 @@ +package com.fizz.business.service; + +import java.util.List; +import com.fizz.business.domain.SetupTl; + +/** + * 拉矫机参数Service接口 + * + * @author ruoyi + * @date 2025-09-26 + */ +public interface ISetupTlService +{ + /** + * 查询拉矫机参数 + * + * @param steelGrade 拉矫机参数主键 + * @return 拉矫机参数 + */ + public SetupTl selectSetupTlBySteelGrade(String steelGrade,Long yieldStren,Long thick); + + /** + * 查询拉矫机参数列表 + * + * @param setupTl 拉矫机参数 + * @return 拉矫机参数集合 + */ + public List selectSetupTlList(SetupTl setupTl); + + /** + * 新增拉矫机参数 + * + * @param setupTl 拉矫机参数 + * @return 结果 + */ + public int insertSetupTl(SetupTl setupTl); + + /** + * 修改拉矫机参数 + * + * @param setupTl 拉矫机参数 + * @return 结果 + */ + public int updateSetupTl(SetupTl setupTl); + + /** + * 批量删除拉矫机参数 + * + * @param steelGrades 需要删除的拉矫机参数主键集合 + * @return 结果 + */ + public int deleteSetupTlBySteelGrades(String[] steelGrades,Long[] yieldStrens,Long[] thicks); + + /** + * 删除拉矫机参数信息 + * + * @param steelGrade 拉矫机参数主键 + * @return 结果 + */ + public int deleteSetupTlBySteelGrade(String steelGrade); +} diff --git a/business/src/main/java/com/fizz/business/service/ISetupTmBendforceService.java b/business/src/main/java/com/fizz/business/service/ISetupTmBendforceService.java new file mode 100644 index 0000000..adad3ae --- /dev/null +++ b/business/src/main/java/com/fizz/business/service/ISetupTmBendforceService.java @@ -0,0 +1,61 @@ +package com.fizz.business.service; + +import java.util.List; +import com.fizz.business.domain.SetupTmBendforce; + +/** + * 光整机弯辊力Service接口 + * + * @author Joshi + * @date 2025-09-26 + */ +public interface ISetupTmBendforceService +{ + /** + * 查询光整机弯辊力 + * + * @param width 光整机弯辊力主键 + * @return 光整机弯辊力 + */ + public SetupTmBendforce selectSetupTmBendforceByWidth(Long width,Long rollForce); + + /** + * 查询光整机弯辊力列表 + * + * @param setupTmBendforce 光整机弯辊力 + * @return 光整机弯辊力集合 + */ + public List selectSetupTmBendforceList(SetupTmBendforce setupTmBendforce); + + /** + * 新增光整机弯辊力 + * + * @param setupTmBendforce 光整机弯辊力 + * @return 结果 + */ + public int insertSetupTmBendforce(SetupTmBendforce setupTmBendforce); + + /** + * 修改光整机弯辊力 + * + * @param setupTmBendforce 光整机弯辊力 + * @return 结果 + */ + public int updateSetupTmBendforce(SetupTmBendforce setupTmBendforce); + + /** + * 批量删除光整机弯辊力 + * + * @param widths 需要删除的光整机弯辊力主键集合 + * @return 结果 + */ + public int deleteSetupTmBendforceByWidths(Long[] widths,Long[] rollForces); + + /** + * 删除光整机弯辊力信息 + * + * @param width 光整机弯辊力主键 + * @return 结果 + */ + public int deleteSetupTmBendforceByWidth(Long width); +} diff --git a/business/src/main/java/com/fizz/business/service/ISetupTmMeshService.java b/business/src/main/java/com/fizz/business/service/ISetupTmMeshService.java new file mode 100644 index 0000000..f289ef6 --- /dev/null +++ b/business/src/main/java/com/fizz/business/service/ISetupTmMeshService.java @@ -0,0 +1,61 @@ +package com.fizz.business.service; + +import java.util.List; +import com.fizz.business.domain.SetupTmMesh; + +/** + * 光整机插入量Service接口 + * + * @author Joshi + * @date 2025-09-26 + */ +public interface ISetupTmMeshService +{ + /** + * 查询光整机插入量 + * + * @param steelGrade 光整机插入量主键 + * @return 光整机插入量 + */ + public SetupTmMesh selectSetupTmMeshBySteelGrade(String steelGrade,Long yildStren,Long thick); + + /** + * 查询光整机插入量列表 + * + * @param setupTmMesh 光整机插入量 + * @return 光整机插入量集合 + */ + public List selectSetupTmMeshList(SetupTmMesh setupTmMesh); + + /** + * 新增光整机插入量 + * + * @param setupTmMesh 光整机插入量 + * @return 结果 + */ + public int insertSetupTmMesh(SetupTmMesh setupTmMesh); + + /** + * 修改光整机插入量 + * + * @param setupTmMesh 光整机插入量 + * @return 结果 + */ + public int updateSetupTmMesh(SetupTmMesh setupTmMesh); + + /** + * 批量删除光整机插入量 + * + * @param steelGrades 需要删除的光整机插入量主键集合 + * @return 结果 + */ + public int deleteSetupTmMeshBySteelGrades(String[] steelGrades,Long[] yildStrens,Long[] thicks); + + /** + * 删除光整机插入量信息 + * + * @param steelGrade 光整机插入量主键 + * @return 结果 + */ + public int deleteSetupTmMeshBySteelGrade(String steelGrade); +} diff --git a/business/src/main/java/com/fizz/business/service/ISetupTmRollforceService.java b/business/src/main/java/com/fizz/business/service/ISetupTmRollforceService.java new file mode 100644 index 0000000..2f27ed4 --- /dev/null +++ b/business/src/main/java/com/fizz/business/service/ISetupTmRollforceService.java @@ -0,0 +1,61 @@ +package com.fizz.business.service; + +import java.util.List; +import com.fizz.business.domain.SetupTmRollforce; + +/** + * 光整机轧制力Service接口 + * + * @author Joshi + * @date 2025-09-26 + */ +public interface ISetupTmRollforceService +{ + /** + * 查询光整机轧制力 + * + * @param steelGrade 光整机轧制力主键 + * @return 光整机轧制力 + */ + public SetupTmRollforce selectSetupTmRollforceBySteelGrade(String steelGrade,Long yieldStren,Long thick,Long elong); + + /** + * 查询光整机轧制力列表 + * + * @param setupTmRollforce 光整机轧制力 + * @return 光整机轧制力集合 + */ + public List selectSetupTmRollforceList(SetupTmRollforce setupTmRollforce); + + /** + * 新增光整机轧制力 + * + * @param setupTmRollforce 光整机轧制力 + * @return 结果 + */ + public int insertSetupTmRollforce(SetupTmRollforce setupTmRollforce); + + /** + * 修改光整机轧制力 + * + * @param setupTmRollforce 光整机轧制力 + * @return 结果 + */ + public int updateSetupTmRollforce(SetupTmRollforce setupTmRollforce); + + /** + * 批量删除光整机轧制力 + * + * @param steelGrades 需要删除的光整机轧制力主键集合 + * @return 结果 + */ + public int deleteSetupTmRollforceBySteelGrades(String[] steelGrades,Long[] yieldStrens,Long[] thicks,Long[] elongs); + + /** + * 删除光整机轧制力信息 + * + * @param steelGrade 光整机轧制力主键 + * @return 结果 + */ + public int deleteSetupTmRollforceBySteelGrade(String steelGrade); +} diff --git a/business/src/main/java/com/fizz/business/service/LogDataService.java b/business/src/main/java/com/fizz/business/service/LogDataService.java new file mode 100644 index 0000000..65e89b0 --- /dev/null +++ b/business/src/main/java/com/fizz/business/service/LogDataService.java @@ -0,0 +1,40 @@ +package com.fizz.business.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; +import com.baomidou.mybatisplus.extension.service.IService; +import com.fizz.business.domain.LogData; +import com.fizz.business.form.LogDataForm; +import com.github.pagehelper.PageInfo; + +import java.util.List; + +public interface LogDataService extends IService { + + /** + * 分页查询 + */ + PageInfo pageList(LogDataForm logDataForm); + + + + /** + * 报警确认 + * @param seqid + */ + void alarmAck(Integer seqid); + + /** + * 记录日志 + * @param module + * @param content + */ + void logInfo(String module,String content, Object... args); + + /** + * 记录日志 + * @param module + * @param content + */ + void logWarn(String module,String content, Object... args); +} diff --git a/business/src/main/java/com/fizz/business/service/ModCoilMapService.java b/business/src/main/java/com/fizz/business/service/ModCoilMapService.java new file mode 100644 index 0000000..9405690 --- /dev/null +++ b/business/src/main/java/com/fizz/business/service/ModCoilMapService.java @@ -0,0 +1,12 @@ +package com.fizz.business.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.fizz.business.domain.ModCoilMap; + +public interface ModCoilMapService extends IService { + void saveModCoilInfo(ModCoilMap modCoilMap); + + void updateModCoil(String coilId); + + // 你可以添加自定义的业务方法 +} diff --git a/business/src/main/java/com/fizz/business/service/ModSetupResultService.java b/business/src/main/java/com/fizz/business/service/ModSetupResultService.java new file mode 100644 index 0000000..286a1ce --- /dev/null +++ b/business/src/main/java/com/fizz/business/service/ModSetupResultService.java @@ -0,0 +1,21 @@ +package com.fizz.business.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.fizz.business.domain.ModSetupResult; +import com.fizz.business.form.CalcPdiPlanForm; +import com.fizz.business.form.CrmPdiPlanForm; +import com.fizz.business.form.ModSetupResultForm; +import com.fizz.business.vo.ModSetupResultVO; + +import java.util.List; + +public interface ModSetupResultService extends IService { + List list(ModSetupResultForm form); + + String calcSetup(CalcPdiPlanForm form); + + String retrySetup(String coilid); + + List getSetupByCoilid(String coilid); + // 可在此处添加自定义业务方法 +} diff --git a/business/src/main/java/com/fizz/business/service/OpcMessageHandler.java b/business/src/main/java/com/fizz/business/service/OpcMessageHandler.java new file mode 100644 index 0000000..fe78a59 --- /dev/null +++ b/business/src/main/java/com/fizz/business/service/OpcMessageHandler.java @@ -0,0 +1,7 @@ +package com.fizz.business.service; + +import com.fizz.business.domain.msg.OpcMessage; + +public interface OpcMessageHandler { + void handle(T message); +} \ No newline at end of file diff --git a/business/src/main/java/com/fizz/business/service/PdoExCoilService.java b/business/src/main/java/com/fizz/business/service/PdoExCoilService.java new file mode 100644 index 0000000..4826a39 --- /dev/null +++ b/business/src/main/java/com/fizz/business/service/PdoExCoilService.java @@ -0,0 +1,20 @@ +package com.fizz.business.service; + + +import com.fizz.business.constants.enums.ExitCutTypeEnum; +import com.fizz.business.dto.PdoExCoilDTO; +import com.fizz.business.dto.ExitCoilInfoDTO; +import com.fizz.business.dto.MatmapDTO; + +/** + * @author chenhao + * @date 2023/05/30 + */ +public interface PdoExCoilService { + + PdoExCoilDTO saveExCoil(ExitCoilInfoDTO exitCoil); + + ExitCoilInfoDTO genExitCoilInfo(MatmapDTO trMatmap, ExitCutTypeEnum cutType); + + void deleteExistPdo(String coilId, String planId); +} diff --git a/business/src/main/java/com/fizz/business/service/PdoStripValueService.java b/business/src/main/java/com/fizz/business/service/PdoStripValueService.java new file mode 100644 index 0000000..483b720 --- /dev/null +++ b/business/src/main/java/com/fizz/business/service/PdoStripValueService.java @@ -0,0 +1,13 @@ +package com.fizz.business.service; + + +import com.fizz.business.dto.ExitCoilInfoDTO; + +/** + * @author chenhao + * @date 2023/05/30 + */ +public interface PdoStripValueService { + + void treatStripValues(ExitCoilInfoDTO pdoExCoil); +} diff --git a/business/src/main/java/com/fizz/business/service/PlantConfigService.java b/business/src/main/java/com/fizz/business/service/PlantConfigService.java new file mode 100644 index 0000000..80f9fcc --- /dev/null +++ b/business/src/main/java/com/fizz/business/service/PlantConfigService.java @@ -0,0 +1,10 @@ +package com.fizz.business.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.fizz.business.domain.PlantConfig; + +import java.util.Map; + +public interface PlantConfigService extends IService { + Map getAllConfig(); +} diff --git a/business/src/main/java/com/fizz/business/service/ProMatmapService.java b/business/src/main/java/com/fizz/business/service/ProMatmapService.java new file mode 100644 index 0000000..3370045 --- /dev/null +++ b/business/src/main/java/com/fizz/business/service/ProMatmapService.java @@ -0,0 +1,12 @@ +package com.fizz.business.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.fizz.business.domain.ProMatmap; + +public interface ProMatmapService extends IService { + void updateMatid(String matid); + + void flushMatmap(); + + // 你可以添加自定义的业务方法 +} \ No newline at end of file diff --git a/business/src/main/java/com/fizz/business/service/ProStoppageService.java b/business/src/main/java/com/fizz/business/service/ProStoppageService.java new file mode 100644 index 0000000..5b5f19f --- /dev/null +++ b/business/src/main/java/com/fizz/business/service/ProStoppageService.java @@ -0,0 +1,20 @@ +package com.fizz.business.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.fizz.business.domain.ProStoppage; +import com.fizz.business.form.ProStoppageForm; + +import java.util.List; + +public interface ProStoppageService extends IService { + + List listAll(ProStoppageForm form); + + boolean updateProStoppage(ProStoppage proStoppage); + + boolean addProStoppage(ProStoppage proStoppage); + + boolean deleteProStoppage(Long stopid); + + List

Redis版本	{{ cache.info.redis_version }}	运行模式	{{ cache.info.redis_mode == "standalone" ? "单机" : "集群" }}	端口	{{ cache.info.tcp_port }}	客户端数	{{ cache.info.connected_clients }}
运行时间(天)	{{ cache.info.uptime_in_days }}	使用内存	{{ cache.info.used_memory_human }}	使用CPU	{{ parseFloat(cache.info.used_cpu_user_children).toFixed(2) }}	内存配置	{{ cache.info.maxmemory_human }}
AOF是否开启	{{ cache.info.aof_enabled == "0" ? "否" : "是" }}	RDB是否成功	{{ cache.info.rdb_last_bgsave_status }}	Key数量	{{ cache.dbSize }}	网络入口/出口	{{ cache.info.instantaneous_input_kbps }}kps/{{cache.info.instantaneous_output_kbps}}kps

属性	值
核心数	{{ server.cpu.cpuNum }}
用户使用率	{{ server.cpu.used }}%
系统使用率	{{ server.cpu.sys }}%
当前空闲率	{{ server.cpu.free }}%

属性	内存	JVM
总内存	{{ server.mem.total }}G	{{ server.jvm.total }}M
已用内存	{{ server.mem.used}}G	{{ server.jvm.used}}M
剩余内存	{{ server.mem.free }}G	{{ server.jvm.free }}M
使用率	{{ server.mem.usage }}%	{{ server.jvm.usage }}%

服务器名称	{{ server.sys.computerName }}	操作系统	{{ server.sys.osName }}
服务器IP	{{ server.sys.computerIp }}	系统架构	{{ server.sys.osArch }}

Java名称	{{ server.jvm.name }}	Java版本	{{ server.jvm.version }}
启动时间	{{ server.jvm.startTime }}	运行时长	{{ server.jvm.runTime }}
安装路径	{{ server.jvm.home }}
项目路径	{{ server.sys.userDir }}
运行参数	{{ server.jvm.inputArgs }}

请升级您的浏览器，以便我们更好的为您提供服务！

请注意：微软公司对Windows XP 及 Internet Explorer 早期版本的支持已经结束

您可以选择更先进的浏览器

主题风格设置

系统布局配置

{{ title }}

{{ title }}

+ 401错误! +

您没有访问权限！

对不起，您没有访问权限，请不要进行非法操作！您可以返回主页面

+ 云产品通用红包，可叠加官网常规优惠使用。(仅限新用户) +

若依后台管理框架

技术选型

后端技术

前端技术

若依后台管理系统

基本信息

角色信息

其他信息

关联信息