From 008a6e07313741487c4c599c9d3d7f9d4e30220f Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Thu, 18 Sep 2025 13:09:14 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9yml=E7=A1=AE=E4=BF=9D?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=83=BD=E5=90=AF=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/.gitignore | 8 + .idea/ApifoxUploaderProjectSetting.xml | 6 + .idea/compiler.xml | 20 + .idea/dbnavigator.xml | 446 +++++++++++++ .idea/encodings.xml | 21 + .idea/jarRepositories.xml | 25 + .idea/misc.xml | 12 + .idea/vcs.xml | 6 + .../classes/mapper/CrmPdiPlanMapper.xml | 6 + .../classes/mapper/CrmPdoExcoilMapper.xml | 141 ++++ .../classes/mapper/DeviceDefineMapper.xml | 5 + .../classes/mapper/HalfReturnMapper.xml | 5 + .../target/classes/mapper/LogDataMapper.xml | 6 + .../target/classes/mapper/PdoExcoilMapper.xml | 5 + .../classes/mapper/PdoExcoilSubMapper.xml | 5 + .../classes/mapper/PdoStripvalueMapper.xml | 5 + .../classes/mapper/PlantConfigMapper.xml | 6 + .../target/classes/mapper/ProMatmapMapper.xml | 20 + .../classes/mapper/ProStoppageMapper.xml | 5 + .../classes/mapper/RollChangeCycleMapper.xml | 6 + .../target/classes/mapper/SegmentMapper.xml | 64 ++ .../classes/mapper/SegmentTotalMapper.xml | 7 + .../classes/mapper/ShiftHistoryMapper.xml | 6 + .../classes/mapper/SteelGradeInfoMapper.xml | 6 + business/target/classes/rabbitmq.http | 0 .../src/main/resources/application.yml | 2 +- .../META-INF/spring-devtools.properties | 1 + .../target/classes/application-druid.yml | 69 ++ ruoyi-admin/target/classes/application.yml | 198 ++++++ ruoyi-admin/target/classes/banner.txt | 9 + .../target/classes/i18n/messages.properties | 38 ++ ruoyi-admin/target/classes/logback.xml | 93 +++ .../target/classes/mybatis/mybatis-config.xml | 20 + ruoyi-generator/target/classes/generator.yml | 10 + .../mapper/generator/GenTableColumnMapper.xml | 127 ++++ .../mapper/generator/GenTableMapper.xml | 210 ++++++ .../target/classes/vm/java/controller.java.vm | 115 ++++ .../target/classes/vm/java/domain.java.vm | 105 +++ .../target/classes/vm/java/mapper.java.vm | 91 +++ .../target/classes/vm/java/service.java.vm | 61 ++ .../classes/vm/java/serviceImpl.java.vm | 169 +++++ .../target/classes/vm/java/sub-domain.java.vm | 76 +++ .../target/classes/vm/js/api.js.vm | 44 ++ ruoyi-generator/target/classes/vm/sql/sql.vm | 22 + .../target/classes/vm/vue/index-tree.vue.vm | 505 +++++++++++++++ .../target/classes/vm/vue/index.vue.vm | 602 ++++++++++++++++++ .../classes/vm/vue/v3/index-tree.vue.vm | 474 ++++++++++++++ .../target/classes/vm/vue/v3/index.vue.vm | 590 +++++++++++++++++ .../target/classes/vm/xml/mapper.xml.vm | 140 ++++ .../classes/mapper/quartz/SysJobLogMapper.xml | 94 +++ .../classes/mapper/quartz/SysJobMapper.xml | 111 ++++ .../classes/mapper/system/SysConfigMapper.xml | 117 ++++ .../classes/mapper/system/SysDeptMapper.xml | 159 +++++ .../mapper/system/SysDictDataMapper.xml | 124 ++++ .../mapper/system/SysDictTypeMapper.xml | 105 +++ .../mapper/system/SysLogininforMapper.xml | 57 ++ .../classes/mapper/system/SysMenuMapper.xml | 206 ++++++ .../classes/mapper/system/SysNoticeMapper.xml | 89 +++ .../mapper/system/SysOperLogMapper.xml | 87 +++ .../classes/mapper/system/SysPostMapper.xml | 122 ++++ .../mapper/system/SysRoleDeptMapper.xml | 34 + .../classes/mapper/system/SysRoleMapper.xml | 152 +++++ .../mapper/system/SysRoleMenuMapper.xml | 34 + .../classes/mapper/system/SysUserMapper.xml | 221 +++++++ .../mapper/system/SysUserPostMapper.xml | 34 + .../mapper/system/SysUserRoleMapper.xml | 44 ++ 66 files changed, 6402 insertions(+), 1 deletion(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/ApifoxUploaderProjectSetting.xml create mode 100644 .idea/compiler.xml create mode 100644 .idea/dbnavigator.xml create mode 100644 .idea/encodings.xml create mode 100644 .idea/jarRepositories.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/vcs.xml create mode 100644 business/target/classes/mapper/CrmPdiPlanMapper.xml create mode 100644 business/target/classes/mapper/CrmPdoExcoilMapper.xml create mode 100644 business/target/classes/mapper/DeviceDefineMapper.xml create mode 100644 business/target/classes/mapper/HalfReturnMapper.xml create mode 100644 business/target/classes/mapper/LogDataMapper.xml create mode 100644 business/target/classes/mapper/PdoExcoilMapper.xml create mode 100644 business/target/classes/mapper/PdoExcoilSubMapper.xml create mode 100644 business/target/classes/mapper/PdoStripvalueMapper.xml create mode 100644 business/target/classes/mapper/PlantConfigMapper.xml create mode 100644 business/target/classes/mapper/ProMatmapMapper.xml create mode 100644 business/target/classes/mapper/ProStoppageMapper.xml create mode 100644 business/target/classes/mapper/RollChangeCycleMapper.xml create mode 100644 business/target/classes/mapper/SegmentMapper.xml create mode 100644 business/target/classes/mapper/SegmentTotalMapper.xml create mode 100644 business/target/classes/mapper/ShiftHistoryMapper.xml create mode 100644 business/target/classes/mapper/SteelGradeInfoMapper.xml create mode 100644 business/target/classes/rabbitmq.http create mode 100644 ruoyi-admin/target/classes/META-INF/spring-devtools.properties create mode 100644 ruoyi-admin/target/classes/application-druid.yml create mode 100644 ruoyi-admin/target/classes/application.yml create mode 100644 ruoyi-admin/target/classes/banner.txt create mode 100644 ruoyi-admin/target/classes/i18n/messages.properties create mode 100644 ruoyi-admin/target/classes/logback.xml create mode 100644 ruoyi-admin/target/classes/mybatis/mybatis-config.xml create mode 100644 ruoyi-generator/target/classes/generator.yml create mode 100644 ruoyi-generator/target/classes/mapper/generator/GenTableColumnMapper.xml create mode 100644 ruoyi-generator/target/classes/mapper/generator/GenTableMapper.xml create mode 100644 ruoyi-generator/target/classes/vm/java/controller.java.vm create mode 100644 ruoyi-generator/target/classes/vm/java/domain.java.vm create mode 100644 ruoyi-generator/target/classes/vm/java/mapper.java.vm create mode 100644 ruoyi-generator/target/classes/vm/java/service.java.vm create mode 100644 ruoyi-generator/target/classes/vm/java/serviceImpl.java.vm create mode 100644 ruoyi-generator/target/classes/vm/java/sub-domain.java.vm create mode 100644 ruoyi-generator/target/classes/vm/js/api.js.vm create mode 100644 ruoyi-generator/target/classes/vm/sql/sql.vm create mode 100644 ruoyi-generator/target/classes/vm/vue/index-tree.vue.vm create mode 100644 ruoyi-generator/target/classes/vm/vue/index.vue.vm create mode 100644 ruoyi-generator/target/classes/vm/vue/v3/index-tree.vue.vm create mode 100644 ruoyi-generator/target/classes/vm/vue/v3/index.vue.vm create mode 100644 ruoyi-generator/target/classes/vm/xml/mapper.xml.vm create mode 100644 ruoyi-quartz/target/classes/mapper/quartz/SysJobLogMapper.xml create mode 100644 ruoyi-quartz/target/classes/mapper/quartz/SysJobMapper.xml create mode 100644 ruoyi-system/target/classes/mapper/system/SysConfigMapper.xml create mode 100644 ruoyi-system/target/classes/mapper/system/SysDeptMapper.xml create mode 100644 ruoyi-system/target/classes/mapper/system/SysDictDataMapper.xml create mode 100644 ruoyi-system/target/classes/mapper/system/SysDictTypeMapper.xml create mode 100644 ruoyi-system/target/classes/mapper/system/SysLogininforMapper.xml create mode 100644 ruoyi-system/target/classes/mapper/system/SysMenuMapper.xml create mode 100644 ruoyi-system/target/classes/mapper/system/SysNoticeMapper.xml create mode 100644 ruoyi-system/target/classes/mapper/system/SysOperLogMapper.xml create mode 100644 ruoyi-system/target/classes/mapper/system/SysPostMapper.xml create mode 100644 ruoyi-system/target/classes/mapper/system/SysRoleDeptMapper.xml create mode 100644 ruoyi-system/target/classes/mapper/system/SysRoleMapper.xml create mode 100644 ruoyi-system/target/classes/mapper/system/SysRoleMenuMapper.xml create mode 100644 ruoyi-system/target/classes/mapper/system/SysUserMapper.xml create mode 100644 ruoyi-system/target/classes/mapper/system/SysUserPostMapper.xml create mode 100644 ruoyi-system/target/classes/mapper/system/SysUserRoleMapper.xml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..35410ca --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# 默认忽略的文件 +/shelf/ +/workspace.xml +# 基于编辑器的 HTTP 客户端请求 +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/ApifoxUploaderProjectSetting.xml b/.idea/ApifoxUploaderProjectSetting.xml new file mode 100644 index 0000000..cde3cbe --- /dev/null +++ b/.idea/ApifoxUploaderProjectSetting.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..b081600 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/dbnavigator.xml b/.idea/dbnavigator.xml new file mode 100644 index 0000000..ba84fb8 --- /dev/null +++ b/.idea/dbnavigator.xml @@ -0,0 +1,446 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..f6651fd --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..c48ef6b --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..36638b4 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/business/target/classes/mapper/CrmPdiPlanMapper.xml b/business/target/classes/mapper/CrmPdiPlanMapper.xml new file mode 100644 index 0000000..a5e815b --- /dev/null +++ b/business/target/classes/mapper/CrmPdiPlanMapper.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/business/target/classes/mapper/CrmPdoExcoilMapper.xml b/business/target/classes/mapper/CrmPdoExcoilMapper.xml new file mode 100644 index 0000000..f82ee39 --- /dev/null +++ b/business/target/classes/mapper/CrmPdoExcoilMapper.xml @@ -0,0 +1,141 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/business/target/classes/mapper/DeviceDefineMapper.xml b/business/target/classes/mapper/DeviceDefineMapper.xml new file mode 100644 index 0000000..a5ca5bb --- /dev/null +++ b/business/target/classes/mapper/DeviceDefineMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/business/target/classes/mapper/HalfReturnMapper.xml b/business/target/classes/mapper/HalfReturnMapper.xml new file mode 100644 index 0000000..349c3b2 --- /dev/null +++ b/business/target/classes/mapper/HalfReturnMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/business/target/classes/mapper/LogDataMapper.xml b/business/target/classes/mapper/LogDataMapper.xml new file mode 100644 index 0000000..ae6f5cc --- /dev/null +++ b/business/target/classes/mapper/LogDataMapper.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/business/target/classes/mapper/PdoExcoilMapper.xml b/business/target/classes/mapper/PdoExcoilMapper.xml new file mode 100644 index 0000000..c898848 --- /dev/null +++ b/business/target/classes/mapper/PdoExcoilMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/business/target/classes/mapper/PdoExcoilSubMapper.xml b/business/target/classes/mapper/PdoExcoilSubMapper.xml new file mode 100644 index 0000000..f1edd13 --- /dev/null +++ b/business/target/classes/mapper/PdoExcoilSubMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/business/target/classes/mapper/PdoStripvalueMapper.xml b/business/target/classes/mapper/PdoStripvalueMapper.xml new file mode 100644 index 0000000..fde7887 --- /dev/null +++ b/business/target/classes/mapper/PdoStripvalueMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/business/target/classes/mapper/PlantConfigMapper.xml b/business/target/classes/mapper/PlantConfigMapper.xml new file mode 100644 index 0000000..4962deb --- /dev/null +++ b/business/target/classes/mapper/PlantConfigMapper.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/business/target/classes/mapper/ProMatmapMapper.xml b/business/target/classes/mapper/ProMatmapMapper.xml new file mode 100644 index 0000000..1237932 --- /dev/null +++ b/business/target/classes/mapper/ProMatmapMapper.xml @@ -0,0 +1,20 @@ + + + + + + + + + insert into track_ca1_romtb_matmap ( + pos_idx, mat_id, plan_no, plan_id + ) + values + + (#{item.posIdx}, #{item.matId}, #{item.planNo}, #{item.planId}) + + on duplicate key update + mat_id = VALUES(mat_id),plan_no = VALUES(plan_no),plan_id = VALUES(plan_id) + + + \ No newline at end of file diff --git a/business/target/classes/mapper/ProStoppageMapper.xml b/business/target/classes/mapper/ProStoppageMapper.xml new file mode 100644 index 0000000..314e7ed --- /dev/null +++ b/business/target/classes/mapper/ProStoppageMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/business/target/classes/mapper/RollChangeCycleMapper.xml b/business/target/classes/mapper/RollChangeCycleMapper.xml new file mode 100644 index 0000000..15ea6ad --- /dev/null +++ b/business/target/classes/mapper/RollChangeCycleMapper.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/business/target/classes/mapper/SegmentMapper.xml b/business/target/classes/mapper/SegmentMapper.xml new file mode 100644 index 0000000..ced5338 --- /dev/null +++ b/business/target/classes/mapper/SegmentMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + diff --git a/business/target/classes/mapper/SegmentTotalMapper.xml b/business/target/classes/mapper/SegmentTotalMapper.xml new file mode 100644 index 0000000..3c92be4 --- /dev/null +++ b/business/target/classes/mapper/SegmentTotalMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/business/target/classes/mapper/ShiftHistoryMapper.xml b/business/target/classes/mapper/ShiftHistoryMapper.xml new file mode 100644 index 0000000..80fa335 --- /dev/null +++ b/business/target/classes/mapper/ShiftHistoryMapper.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/business/target/classes/mapper/SteelGradeInfoMapper.xml b/business/target/classes/mapper/SteelGradeInfoMapper.xml new file mode 100644 index 0000000..6148baf --- /dev/null +++ b/business/target/classes/mapper/SteelGradeInfoMapper.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/business/target/classes/rabbitmq.http b/business/target/classes/rabbitmq.http new file mode 100644 index 0000000..e69de29 diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 2aec294..fed26e9 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -76,7 +76,7 @@ spring: database: 0 # 密码 abcd1234 fe2b3cef78b74d3692909bdcbdf46331 KeLunPu123! # password: KeLunPu123! - password: abcd1234 + password: # 连接超时时间 timeout: 10s lettuce: diff --git a/ruoyi-admin/target/classes/META-INF/spring-devtools.properties b/ruoyi-admin/target/classes/META-INF/spring-devtools.properties new file mode 100644 index 0000000..37e7b58 --- /dev/null +++ b/ruoyi-admin/target/classes/META-INF/spring-devtools.properties @@ -0,0 +1 @@ +restart.include.json=/com.alibaba.fastjson2.*.jar \ No newline at end of file diff --git a/ruoyi-admin/target/classes/application-druid.yml b/ruoyi-admin/target/classes/application-druid.yml new file mode 100644 index 0000000..e41404a --- /dev/null +++ b/ruoyi-admin/target/classes/application-druid.yml @@ -0,0 +1,69 @@ +# 数据源配置 +spring: + # 数据源配置 + datasource: + type: com.alibaba.druid.pool.DruidDataSource + driverClassName: com.mysql.cj.jdbc.Driver + druid: + # 主库数据源 + master: + url: jdbc:mysql://140.143.206.120:3306/cgldb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: klp + password: KeLunPu123@ +# url: jdbc:mysql://47.109.139.82:3306/cgldb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 +# username: cgldb +# password: cgldb@123456 +# url: jdbc:mysql://127.0.0.1:3306/ngcrm?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 +# username: root +# password: root + # 从库数据源 + slave: + # 从数据源开关/默认关闭 + enabled: false + url: + username: + password: + + # 初始连接数 + initialSize: 5 + # 最小连接池数量 + minIdle: 10 + # 最大连接池数量 + maxActive: 20 + # 配置获取连接等待超时的时间 + maxWait: 60000 + # 配置连接超时时间 + connectTimeout: 30000 + # 配置网络超时时间 + socketTimeout: 60000 + # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 + timeBetweenEvictionRunsMillis: 60000 + # 配置一个连接在池中最小生存的时间，单位是毫秒 + minEvictableIdleTimeMillis: 300000 + # 配置一个连接在池中最大生存的时间，单位是毫秒 + maxEvictableIdleTimeMillis: 900000 + # 配置检测连接是否有效 + validationQuery: SELECT 1 FROM DUAL + testWhileIdle: true + testOnBorrow: false + testOnReturn: false + webStatFilter: + enabled: true + statViewServlet: + enabled: true + # 设置白名单，不填则允许所有访问 + allow: + url-pattern: /druid/* + # 控制台管理用户名和密码 + login-username: admin + login-password: 123456 + filter: + stat: + enabled: true + # 慢SQL记录 + log-slow-sql: true + slow-sql-millis: 1000 + merge-sql: true + wall: + config: + multi-statement-allow: true \ No newline at end of file diff --git a/ruoyi-admin/target/classes/application.yml b/ruoyi-admin/target/classes/application.yml new file mode 100644 index 0000000..fed26e9 --- /dev/null +++ b/ruoyi-admin/target/classes/application.yml @@ -0,0 +1,198 @@ +# 项目相关配置 +ruoyi: + # 名称 + name: Fizz + # 版本 3.8.8 + version: 1.0.0 + # 版权年份 + copyrightYear: 2024 + # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） + profile: D:/ruoyi/uploadPath + # 获取ip地址开关 + addressEnabled: false + # 验证码类型 math 数字计算 char 字符验证 + captchaType: math + +# 开发环境配置 +server: + # 服务器的HTTP端口，默认为8080 + port: 8089 + forward-headers-strategy: framework + servlet: + # 应用的访问路径 + context-path: / + tomcat: + # tomcat的URI编码 + uri-encoding: UTF-8 + # 连接数满后的排队数，默认为100 + accept-count: 1000 + threads: + # tomcat最大线程数，默认为200 + max: 800 + # Tomcat启动初始化的线程数，默认值10 + min-spare: 100 + +# 日志配置 +logging: + level: + com.ruoyi: debug + org.springframework: warn + +# 用户配置 +user: + password: + # 密码最大错误次数 + maxRetryCount: 5 + # 密码锁定时间（默认10分钟） + lockTime: 10 + +# Spring配置 +spring: + # 资源信息 + messages: + # 国际化资源文件路径 + basename: i18n/messages + profiles: + active: druid + # 文件上传 + servlet: + multipart: + # 单个文件大小 + max-file-size: 10MB + # 设置总上传的文件大小 + max-request-size: 20MB + # 服务模块 + devtools: + restart: + # 热部署开关 + enabled: true + # redis 配置 + redis: + # 地址 + host: localhost + # 端口，默认为6379 + port: 6379 + # 数据库索引 + database: 0 +# 密码 abcd1234 fe2b3cef78b74d3692909bdcbdf46331 KeLunPu123! +# password: KeLunPu123! + password: + # 连接超时时间 + timeout: 10s + lettuce: + pool: + # 连接池中的最小空闲连接 + min-idle: 0 + # 连接池中的最大空闲连接 + max-idle: 8 + # 连接池的最大数据库连接数 + max-active: 8 + # #连接池最大阻塞等待时间（使用负值表示没有限制） + max-wait: -1ms + + rabbitmq: + username: admin + password: admin + virtual-host: / + host: 127.0.0.1 + port: 5672 + listener: + simple: + retry: + enabled: true + max-attempts: 1 + max-interval: 200 + task: + scheduling: + pool: + size: 8 #配置Scheduled定时任务为多线程 + +# token配置 +token: + # 令牌自定义标识 + header: Authorization + # 令牌密钥 + secret: abcdefghijklmnopqrstuvwxyz + # 令牌有效期（默认30分钟） + expireTime: 30 + +# MyBatis +mybatis-plus: + # 搜索指定包别名 + typeAliasesPackage: com.ruoyi.**.domain,com.fizz.**.domain + # 配置mapper的扫描，找到所有的mapper.xml映射文件 + mapperLocations: classpath*:mapper/**/*Mapper.xml + # 加载全局的配置文件 + configLocation: classpath:mybatis/mybatis-config.xml + +# PageHelper分页插件 +pagehelper: + helperDialect: mysql + supportMethodsArguments: true + params: count=countSql + +# 防止XSS攻击 +xss: + # 过滤开关 + enabled: true + # 排除链接（多个用逗号分隔） + excludes: /system/notice + # 匹配链接 + urlPatterns: /system/*,/monitor/*,/tool/* + + #rocketmq: + #name-server: 127.0.0.1:9876 + #producer: + #group: test + +springdoc: + api-docs: + path: /v3/api-docs + swagger-ui: + enabled: true + path: /swagger-ui.html + tags-sorter: alpha + group-configs: + - group: 'default' + display-name: 'default' + paths-to-match: '/api/**' + packages-to-scan: com.fizz.business.controller + + +knife4j: + enable: true # 启用 Knife4j + setting: + language: zh-CN # 中文界面 + enable-swagger-model: true # 显示模型 + enable-document-manage: true # 启用文档管理 + cors: true # 允许跨域 + +kangaroohy: + milo: + enabled: false + primary: default + config: + default: + endpoint: opc.tcp://127.0.0.1:49320 + security-policy: none + pool: + max-idle: 5 + max-total: 20 + min-idle: 2 + initial-size: 3 + + +#kangaroohy: +# milo: +# primary: default +# config: +# default: +# endpoint: opc.tcp://127.0.0.1:49320 +# security-policy: basic256sha256 +# username: OPCUA +# password: 123456 +# test: +# endpoint: opc.tcp://127.0.0.1:49321 +# security-policy: basic256sha256 +# username: OPCUA +# password: 123456 \ No newline at end of file diff --git a/ruoyi-admin/target/classes/banner.txt b/ruoyi-admin/target/classes/banner.txt new file mode 100644 index 0000000..95f8b48 --- /dev/null +++ b/ruoyi-admin/target/classes/banner.txt @@ -0,0 +1,9 @@ +Application Version: ${ruoyi.version} +Spring Boot Version: ${spring-boot.version} + ________ ___ ________ ________ +|\ _____\|\ \ |\_____ \ |\_____ \ +\ \ \__/ \ \ \ \|___/ /| \|___/ /| + \ \ __\ \ \ \ / / / / / / + \ \ \_| \ \ \ / /_/__ / /_/__ + \ \__\ \ \__\|\________\|\________\ + \|__| \|__| \|_______| \|_______| \ No newline at end of file diff --git a/ruoyi-admin/target/classes/i18n/messages.properties b/ruoyi-admin/target/classes/i18n/messages.properties new file mode 100644 index 0000000..93de005 --- /dev/null +++ b/ruoyi-admin/target/classes/i18n/messages.properties @@ -0,0 +1,38 @@ +#错误消息 +not.null=* 必须填写 +user.jcaptcha.error=验证码错误 +user.jcaptcha.expire=验证码已失效 +user.not.exists=用户不存在/密码错误 +user.password.not.match=用户不存在/密码错误 +user.password.retry.limit.count=密码输入错误{0}次 +user.password.retry.limit.exceed=密码输入错误{0}次，帐户锁定{1}分钟 +user.password.delete=对不起，您的账号已被删除 +user.blocked=用户已封禁，请联系管理员 +role.blocked=角色已封禁，请联系管理员 +login.blocked=很遗憾，访问IP已被列入系统黑名单 +user.logout.success=退出成功 + +length.not.valid=长度必须在{min}到{max}个字符之间 + +user.username.not.valid=* 2到20个汉字、字母、数字或下划线组成，且必须以非数字开头 +user.password.not.valid=* 5-50个字符 + +user.email.not.valid=邮箱格式错误 +user.mobile.phone.number.not.valid=手机号格式错误 +user.login.success=登录成功 +user.register.success=注册成功 +user.notfound=请重新登录 +user.forcelogout=管理员强制退出，请重新登录 +user.unknown.error=未知错误，请重新登录 + +##文件上传消息 +upload.exceed.maxSize=上传的文件大小超出限制的文件大小！
允许的文件最大大小是：{0}MB！ +upload.filename.exceed.length=上传的文件名最长{0}个字符 + +##权限 +no.permission=您没有数据的权限，请联系管理员添加权限 [{0}] +no.create.permission=您没有创建数据的权限，请联系管理员添加权限 [{0}] +no.update.permission=您没有修改数据的权限，请联系管理员添加权限 [{0}] +no.delete.permission=您没有删除数据的权限，请联系管理员添加权限 [{0}] +no.export.permission=您没有导出数据的权限，请联系管理员添加权限 [{0}] +no.view.permission=您没有查看数据的权限，请联系管理员添加权限 [{0}] diff --git a/ruoyi-admin/target/classes/logback.xml b/ruoyi-admin/target/classes/logback.xml new file mode 100644 index 0000000..281dc14 --- /dev/null +++ b/ruoyi-admin/target/classes/logback.xml @@ -0,0 +1,93 @@ + + + + + + + + + + + ${log.pattern} + + + + + + ${log.path}/sys-info.log + + + + ${log.path}/sys-info.%d{yyyy-MM-dd}.log + + 7 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/sys-error.log + + + + ${log.path}/sys-error.%d{yyyy-MM-dd}.log + + 7 + + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + + + + + + ${log.path}/sys-user.log + + + ${log.path}/sys-user.%d{yyyy-MM-dd}.log + + 7 + + + ${log.pattern} + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ruoyi-admin/target/classes/mybatis/mybatis-config.xml b/ruoyi-admin/target/classes/mybatis/mybatis-config.xml new file mode 100644 index 0000000..4da6e21 --- /dev/null +++ b/ruoyi-admin/target/classes/mybatis/mybatis-config.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-generator/target/classes/generator.yml b/ruoyi-generator/target/classes/generator.yml new file mode 100644 index 0000000..7eae68e --- /dev/null +++ b/ruoyi-generator/target/classes/generator.yml @@ -0,0 +1,10 @@ +# 代码生成 +gen: + # 作者 + author: ruoyi + # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool + packageName: com.ruoyi.system + # 自动去除表前缀，默认是false + autoRemovePre: false + # 表前缀（生成类名不会包含表前缀，多个用逗号分隔） + tablePrefix: sys_ \ No newline at end of file diff --git a/ruoyi-generator/target/classes/mapper/generator/GenTableColumnMapper.xml b/ruoyi-generator/target/classes/mapper/generator/GenTableColumnMapper.xml new file mode 100644 index 0000000..52857e8 --- /dev/null +++ b/ruoyi-generator/target/classes/mapper/generator/GenTableColumnMapper.xml @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select column_id, table_id, column_name, column_comment, column_type, java_type, java_field, is_pk, is_increment, is_required, is_insert, is_edit, is_list, is_query, query_type, html_type, dict_type, sort, create_by, create_time, update_by, update_time from gen_table_column + + + + + + + + insert into gen_table_column ( + table_id, + column_name, + column_comment, + column_type, + java_type, + java_field, + is_pk, + is_increment, + is_required, + is_insert, + is_edit, + is_list, + is_query, + query_type, + html_type, + dict_type, + sort, + create_by, + create_time + )values( + #{tableId}, + #{columnName}, + #{columnComment}, + #{columnType}, + #{javaType}, + #{javaField}, + #{isPk}, + #{isIncrement}, + #{isRequired}, + #{isInsert}, + #{isEdit}, + #{isList}, + #{isQuery}, + #{queryType}, + #{htmlType}, + #{dictType}, + #{sort}, + #{createBy}, + sysdate() + ) + + + + update gen_table_column + + column_comment = #{columnComment}, + java_type = #{javaType}, + java_field = #{javaField}, + is_insert = #{isInsert}, + is_edit = #{isEdit}, + is_list = #{isList}, + is_query = #{isQuery}, + is_required = #{isRequired}, + query_type = #{queryType}, + html_type = #{htmlType}, + dict_type = #{dictType}, + sort = #{sort}, + update_by = #{updateBy}, + update_time = sysdate() + + where column_id = #{columnId} + + + + delete from gen_table_column where table_id in + + #{tableId} + + + + + delete from gen_table_column where column_id in + + #{item.columnId} + + + + \ No newline at end of file diff --git a/ruoyi-generator/target/classes/mapper/generator/GenTableMapper.xml b/ruoyi-generator/target/classes/mapper/generator/GenTableMapper.xml new file mode 100644 index 0000000..d1110f7 --- /dev/null +++ b/ruoyi-generator/target/classes/mapper/generator/GenTableMapper.xml @@ -0,0 +1,210 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, tpl_web_type, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options, create_by, create_time, update_by, update_time, remark from gen_table + + + + + + + + + + + + + + + + + + insert into gen_table ( + table_name, + table_comment, + class_name, + tpl_category, + tpl_web_type, + package_name, + module_name, + business_name, + function_name, + function_author, + gen_type, + gen_path, + remark, + create_by, + create_time + )values( + #{tableName}, + #{tableComment}, + #{className}, + #{tplCategory}, + #{tplWebType}, + #{packageName}, + #{moduleName}, + #{businessName}, + #{functionName}, + #{functionAuthor}, + #{genType}, + #{genPath}, + #{remark}, + #{createBy}, + sysdate() + ) + + + + ${sql} + + + + update gen_table + + table_name = #{tableName}, + table_comment = #{tableComment}, + sub_table_name = #{subTableName}, + sub_table_fk_name = #{subTableFkName}, + class_name = #{className}, + function_author = #{functionAuthor}, + gen_type = #{genType}, + gen_path = #{genPath}, + tpl_category = #{tplCategory}, + tpl_web_type = #{tplWebType}, + package_name = #{packageName}, + module_name = #{moduleName}, + business_name = #{businessName}, + function_name = #{functionName}, + options = #{options}, + update_by = #{updateBy}, + remark = #{remark}, + update_time = sysdate() + + where table_id = #{tableId} + + + + delete from gen_table where table_id in + + #{tableId} + + + + \ No newline at end of file diff --git a/ruoyi-generator/target/classes/vm/java/controller.java.vm b/ruoyi-generator/target/classes/vm/java/controller.java.vm new file mode 100644 index 0000000..bf88988 --- /dev/null +++ b/ruoyi-generator/target/classes/vm/java/controller.java.vm @@ -0,0 +1,115 @@ +package ${packageName}.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 ${packageName}.domain.${ClassName}; +import ${packageName}.service.I${ClassName}Service; +import com.ruoyi.common.utils.poi.ExcelUtil; +#if($table.crud || $table.sub) +import com.ruoyi.common.core.page.TableDataInfo; +#elseif($table.tree) +#end + +/** + * ${functionName}Controller + * + * @author ${author} + * @date ${datetime} + */ +@RestController +@RequestMapping("/${moduleName}/${businessName}") +public class ${ClassName}Controller extends BaseController +{ + @Autowired + private I${ClassName}Service ${className}Service; + + /** + * 查询${functionName}列表 + */ + @PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')") + @GetMapping("/list") +#if($table.crud || $table.sub) + public TableDataInfo list(${ClassName} ${className}) + { + startPage(); + List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); + return getDataTable(list); + } +#elseif($table.tree) + public AjaxResult list(${ClassName} ${className}) + { + List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); + return success(list); + } +#end + + /** + * 导出${functionName}列表 + */ + @PreAuthorize("@ss.hasPermi('${permissionPrefix}:export')") + @Log(title = "${functionName}", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, ${ClassName} ${className}) + { + List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); + ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}.class); + util.exportExcel(response, list, "${functionName}数据"); + } + + /** + * 获取${functionName}详细信息 + */ + @PreAuthorize("@ss.hasPermi('${permissionPrefix}:query')") + @GetMapping(value = "/{${pkColumn.javaField}}") + public AjaxResult getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField}) + { + return success(${className}Service.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField})); + } + + /** + * 新增${functionName} + */ + @PreAuthorize("@ss.hasPermi('${permissionPrefix}:add')") + @Log(title = "${functionName}", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody ${ClassName} ${className}) + { + return toAjax(${className}Service.insert${ClassName}(${className})); + } + + /** + * 修改${functionName} + */ + @PreAuthorize("@ss.hasPermi('${permissionPrefix}:edit')") + @Log(title = "${functionName}", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody ${ClassName} ${className}) + { + return toAjax(${className}Service.update${ClassName}(${className})); + } + + /** + * 删除${functionName} + */ + @PreAuthorize("@ss.hasPermi('${permissionPrefix}:remove')") + @Log(title = "${functionName}", businessType = BusinessType.DELETE) + @DeleteMapping("/{${pkColumn.javaField}s}") + public AjaxResult remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s) + { + return toAjax(${className}Service.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s)); + } +} diff --git a/ruoyi-generator/target/classes/vm/java/domain.java.vm b/ruoyi-generator/target/classes/vm/java/domain.java.vm new file mode 100644 index 0000000..bd51c17 --- /dev/null +++ b/ruoyi-generator/target/classes/vm/java/domain.java.vm @@ -0,0 +1,105 @@ +package ${packageName}.domain; + +#foreach ($import in $importList) +import ${import}; +#end +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +#if($table.crud || $table.sub) +import com.ruoyi.common.core.domain.BaseEntity; +#elseif($table.tree) +import com.ruoyi.common.core.domain.TreeEntity; +#end + +/** + * ${functionName}对象 ${tableName} + * + * @author ${author} + * @date ${datetime} + */ +#if($table.crud || $table.sub) +#set($Entity="BaseEntity") +#elseif($table.tree) +#set($Entity="TreeEntity") +#end +public class ${ClassName} extends ${Entity} +{ + private static final long serialVersionUID = 1L; + +#foreach ($column in $columns) +#if(!$table.isSuperColumn($column.javaField)) + /** $column.columnComment */ +#if($column.list) +#set($parentheseIndex=$column.columnComment.indexOf("（")) +#if($parentheseIndex != -1) +#set($comment=$column.columnComment.substring(0, $parentheseIndex)) +#else +#set($comment=$column.columnComment) +#end +#if($parentheseIndex != -1) + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") +#elseif($column.javaType == 'Date') + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd") +#else + @Excel(name = "${comment}") +#end +#end + private $column.javaType $column.javaField; + +#end +#end +#if($table.sub) + /** $table.subTable.functionName信息 */ + private List<${subClassName}> ${subclassName}List; + +#end +#foreach ($column in $columns) +#if(!$table.isSuperColumn($column.javaField)) +#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) +#set($AttrName=$column.javaField) +#else +#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) +#end + public void set${AttrName}($column.javaType $column.javaField) + { + this.$column.javaField = $column.javaField; + } + + public $column.javaType get${AttrName}() + { + return $column.javaField; + } +#end +#end + +#if($table.sub) + public List<${subClassName}> get${subClassName}List() + { + return ${subclassName}List; + } + + public void set${subClassName}List(List<${subClassName}> ${subclassName}List) + { + this.${subclassName}List = ${subclassName}List; + } + +#end + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) +#foreach ($column in $columns) +#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) +#set($AttrName=$column.javaField) +#else +#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) +#end + .append("${column.javaField}", get${AttrName}()) +#end +#if($table.sub) + .append("${subclassName}List", get${subClassName}List()) +#end + .toString(); + } +} diff --git a/ruoyi-generator/target/classes/vm/java/mapper.java.vm b/ruoyi-generator/target/classes/vm/java/mapper.java.vm new file mode 100644 index 0000000..7e7d7c2 --- /dev/null +++ b/ruoyi-generator/target/classes/vm/java/mapper.java.vm @@ -0,0 +1,91 @@ +package ${packageName}.mapper; + +import java.util.List; +import ${packageName}.domain.${ClassName}; +#if($table.sub) +import ${packageName}.domain.${subClassName}; +#end + +/** + * ${functionName}Mapper接口 + * + * @author ${author} + * @date ${datetime} + */ +public interface ${ClassName}Mapper +{ + /** + * 查询${functionName} + * + * @param ${pkColumn.javaField} ${functionName}主键 + * @return ${functionName} + */ + public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}); + + /** + * 查询${functionName}列表 + * + * @param ${className} ${functionName} + * @return ${functionName}集合 + */ + public List<${ClassName}> select${ClassName}List(${ClassName} ${className}); + + /** + * 新增${functionName} + * + * @param ${className} ${functionName} + * @return 结果 + */ + public int insert${ClassName}(${ClassName} ${className}); + + /** + * 修改${functionName} + * + * @param ${className} ${functionName} + * @return 结果 + */ + public int update${ClassName}(${ClassName} ${className}); + + /** + * 删除${functionName} + * + * @param ${pkColumn.javaField} ${functionName}主键 + * @return 结果 + */ + public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}); + + /** + * 批量删除${functionName} + * + * @param ${pkColumn.javaField}s 需要删除的数据主键集合 + * @return 结果 + */ + public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s); +#if($table.sub) + + /** + * 批量删除${subTable.functionName} + * + * @param ${pkColumn.javaField}s 需要删除的数据主键集合 + * @return 结果 + */ + public int delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaType}[] ${pkColumn.javaField}s); + + /** + * 批量新增${subTable.functionName} + * + * @param ${subclassName}List ${subTable.functionName}列表 + * @return 结果 + */ + public int batch${subClassName}(List<${subClassName}> ${subclassName}List); + + + /** + * 通过${functionName}主键删除${subTable.functionName}信息 + * + * @param ${pkColumn.javaField} ${functionName}ID + * @return 结果 + */ + public int delete${subClassName}By${subTableFkClassName}(${pkColumn.javaType} ${pkColumn.javaField}); +#end +} diff --git a/ruoyi-generator/target/classes/vm/java/service.java.vm b/ruoyi-generator/target/classes/vm/java/service.java.vm new file mode 100644 index 0000000..264882b --- /dev/null +++ b/ruoyi-generator/target/classes/vm/java/service.java.vm @@ -0,0 +1,61 @@ +package ${packageName}.service; + +import java.util.List; +import ${packageName}.domain.${ClassName}; + +/** + * ${functionName}Service接口 + * + * @author ${author} + * @date ${datetime} + */ +public interface I${ClassName}Service +{ + /** + * 查询${functionName} + * + * @param ${pkColumn.javaField} ${functionName}主键 + * @return ${functionName} + */ + public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}); + + /** + * 查询${functionName}列表 + * + * @param ${className} ${functionName} + * @return ${functionName}集合 + */ + public List<${ClassName}> select${ClassName}List(${ClassName} ${className}); + + /** + * 新增${functionName} + * + * @param ${className} ${functionName} + * @return 结果 + */ + public int insert${ClassName}(${ClassName} ${className}); + + /** + * 修改${functionName} + * + * @param ${className} ${functionName} + * @return 结果 + */ + public int update${ClassName}(${ClassName} ${className}); + + /** + * 批量删除${functionName} + * + * @param ${pkColumn.javaField}s 需要删除的${functionName}主键集合 + * @return 结果 + */ + public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s); + + /** + * 删除${functionName}信息 + * + * @param ${pkColumn.javaField} ${functionName}主键 + * @return 结果 + */ + public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}); +} diff --git a/ruoyi-generator/target/classes/vm/java/serviceImpl.java.vm b/ruoyi-generator/target/classes/vm/java/serviceImpl.java.vm new file mode 100644 index 0000000..14746e1 --- /dev/null +++ b/ruoyi-generator/target/classes/vm/java/serviceImpl.java.vm @@ -0,0 +1,169 @@ +package ${packageName}.service.impl; + +import java.util.List; +#foreach ($column in $columns) +#if($column.javaField == 'createTime' || $column.javaField == 'updateTime') +import com.ruoyi.common.utils.DateUtils; +#break +#end +#end +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +#if($table.sub) +import java.util.ArrayList; +import com.ruoyi.common.utils.StringUtils; +import org.springframework.transaction.annotation.Transactional; +import ${packageName}.domain.${subClassName}; +#end +import ${packageName}.mapper.${ClassName}Mapper; +import ${packageName}.domain.${ClassName}; +import ${packageName}.service.I${ClassName}Service; + +/** + * ${functionName}Service业务层处理 + * + * @author ${author} + * @date ${datetime} + */ +@Service +public class ${ClassName}ServiceImpl implements I${ClassName}Service +{ + @Autowired + private ${ClassName}Mapper ${className}Mapper; + + /** + * 查询${functionName} + * + * @param ${pkColumn.javaField} ${functionName}主键 + * @return ${functionName} + */ + @Override + public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}) + { + return ${className}Mapper.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}); + } + + /** + * 查询${functionName}列表 + * + * @param ${className} ${functionName} + * @return ${functionName} + */ + @Override + public List<${ClassName}> select${ClassName}List(${ClassName} ${className}) + { + return ${className}Mapper.select${ClassName}List(${className}); + } + + /** + * 新增${functionName} + * + * @param ${className} ${functionName} + * @return 结果 + */ +#if($table.sub) + @Transactional +#end + @Override + public int insert${ClassName}(${ClassName} ${className}) + { +#foreach ($column in $columns) +#if($column.javaField == 'createTime') + ${className}.setCreateTime(DateUtils.getNowDate()); +#end +#end +#if($table.sub) + int rows = ${className}Mapper.insert${ClassName}(${className}); + insert${subClassName}(${className}); + return rows; +#else + return ${className}Mapper.insert${ClassName}(${className}); +#end + } + + /** + * 修改${functionName} + * + * @param ${className} ${functionName} + * @return 结果 + */ +#if($table.sub) + @Transactional +#end + @Override + public int update${ClassName}(${ClassName} ${className}) + { +#foreach ($column in $columns) +#if($column.javaField == 'updateTime') + ${className}.setUpdateTime(DateUtils.getNowDate()); +#end +#end +#if($table.sub) + ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${className}.get${pkColumn.capJavaField}()); + insert${subClassName}(${className}); +#end + return ${className}Mapper.update${ClassName}(${className}); + } + + /** + * 批量删除${functionName} + * + * @param ${pkColumn.javaField}s 需要删除的${functionName}主键 + * @return 结果 + */ +#if($table.sub) + @Transactional +#end + @Override + public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s) + { +#if($table.sub) + ${className}Mapper.delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaField}s); +#end + return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s); + } + + /** + * 删除${functionName}信息 + * + * @param ${pkColumn.javaField} ${functionName}主键 + * @return 结果 + */ +#if($table.sub) + @Transactional +#end + @Override + public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}) + { +#if($table.sub) + ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${pkColumn.javaField}); +#end + return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}); + } +#if($table.sub) + + /** + * 新增${subTable.functionName}信息 + * + * @param ${className} ${functionName}对象 + */ + public void insert${subClassName}(${ClassName} ${className}) + { + List<${subClassName}> ${subclassName}List = ${className}.get${subClassName}List(); + ${pkColumn.javaType} ${pkColumn.javaField} = ${className}.get${pkColumn.capJavaField}(); + if (StringUtils.isNotNull(${subclassName}List)) + { + List<${subClassName}> list = new ArrayList<${subClassName}>(); + for (${subClassName} ${subclassName} : ${subclassName}List) + { + ${subclassName}.set${subTableFkClassName}(${pkColumn.javaField}); + list.add(${subclassName}); + } + if (list.size() > 0) + { + ${className}Mapper.batch${subClassName}(list); + } + } + } +#end +} diff --git a/ruoyi-generator/target/classes/vm/java/sub-domain.java.vm b/ruoyi-generator/target/classes/vm/java/sub-domain.java.vm new file mode 100644 index 0000000..a3f53eb --- /dev/null +++ b/ruoyi-generator/target/classes/vm/java/sub-domain.java.vm @@ -0,0 +1,76 @@ +package ${packageName}.domain; + +#foreach ($import in $subImportList) +import ${import}; +#end +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; + +/** + * ${subTable.functionName}对象 ${subTableName} + * + * @author ${author} + * @date ${datetime} + */ +public class ${subClassName} extends BaseEntity +{ + private static final long serialVersionUID = 1L; + +#foreach ($column in $subTable.columns) +#if(!$table.isSuperColumn($column.javaField)) + /** $column.columnComment */ +#if($column.list) +#set($parentheseIndex=$column.columnComment.indexOf("（")) +#if($parentheseIndex != -1) +#set($comment=$column.columnComment.substring(0, $parentheseIndex)) +#else +#set($comment=$column.columnComment) +#end +#if($parentheseIndex != -1) + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") +#elseif($column.javaType == 'Date') + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd") +#else + @Excel(name = "${comment}") +#end +#end + private $column.javaType $column.javaField; + +#end +#end +#foreach ($column in $subTable.columns) +#if(!$table.isSuperColumn($column.javaField)) +#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) +#set($AttrName=$column.javaField) +#else +#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) +#end + public void set${AttrName}($column.javaType $column.javaField) + { + this.$column.javaField = $column.javaField; + } + + public $column.javaType get${AttrName}() + { + return $column.javaField; + } +#end +#end + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) +#foreach ($column in $subTable.columns) +#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) +#set($AttrName=$column.javaField) +#else +#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) +#end + .append("${column.javaField}", get${AttrName}()) +#end + .toString(); + } +} diff --git a/ruoyi-generator/target/classes/vm/js/api.js.vm b/ruoyi-generator/target/classes/vm/js/api.js.vm new file mode 100644 index 0000000..9295524 --- /dev/null +++ b/ruoyi-generator/target/classes/vm/js/api.js.vm @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询${functionName}列表 +export function list${BusinessName}(query) { + return request({ + url: '/${moduleName}/${businessName}/list', + method: 'get', + params: query + }) +} + +// 查询${functionName}详细 +export function get${BusinessName}(${pkColumn.javaField}) { + return request({ + url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField}, + method: 'get' + }) +} + +// 新增${functionName} +export function add${BusinessName}(data) { + return request({ + url: '/${moduleName}/${businessName}', + method: 'post', + data: data + }) +} + +// 修改${functionName} +export function update${BusinessName}(data) { + return request({ + url: '/${moduleName}/${businessName}', + method: 'put', + data: data + }) +} + +// 删除${functionName} +export function del${BusinessName}(${pkColumn.javaField}) { + return request({ + url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField}, + method: 'delete' + }) +} diff --git a/ruoyi-generator/target/classes/vm/sql/sql.vm b/ruoyi-generator/target/classes/vm/sql/sql.vm new file mode 100644 index 0000000..0575583 --- /dev/null +++ b/ruoyi-generator/target/classes/vm/sql/sql.vm @@ -0,0 +1,22 @@ +-- 菜单 SQL +insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) +values('${functionName}', '${parentMenuId}', '1', '${businessName}', '${moduleName}/${businessName}/index', 1, 0, 'C', '0', '0', '${permissionPrefix}:list', '#', 'admin', sysdate(), '', null, '${functionName}菜单'); + +-- 按钮父菜单ID +SELECT @parentId := LAST_INSERT_ID(); + +-- 按钮 SQL +insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) +values('${functionName}查询', @parentId, '1', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:query', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) +values('${functionName}新增', @parentId, '2', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:add', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) +values('${functionName}修改', @parentId, '3', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:edit', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) +values('${functionName}删除', @parentId, '4', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:remove', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) +values('${functionName}导出', @parentId, '5', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:export', '#', 'admin', sysdate(), '', null, ''); \ No newline at end of file diff --git a/ruoyi-generator/target/classes/vm/vue/index-tree.vue.vm b/ruoyi-generator/target/classes/vm/vue/index-tree.vue.vm new file mode 100644 index 0000000..4819c2a --- /dev/null +++ b/ruoyi-generator/target/classes/vm/vue/index-tree.vue.vm @@ -0,0 +1,505 @@ + + + diff --git a/ruoyi-generator/target/classes/vm/vue/index.vue.vm b/ruoyi-generator/target/classes/vm/vue/index.vue.vm new file mode 100644 index 0000000..6296014 --- /dev/null +++ b/ruoyi-generator/target/classes/vm/vue/index.vue.vm @@ -0,0 +1,602 @@ + + + diff --git a/ruoyi-generator/target/classes/vm/vue/v3/index-tree.vue.vm b/ruoyi-generator/target/classes/vm/vue/v3/index-tree.vue.vm new file mode 100644 index 0000000..c54d62b --- /dev/null +++ b/ruoyi-generator/target/classes/vm/vue/v3/index-tree.vue.vm @@ -0,0 +1,474 @@ + + + diff --git a/ruoyi-generator/target/classes/vm/vue/v3/index.vue.vm b/ruoyi-generator/target/classes/vm/vue/v3/index.vue.vm new file mode 100644 index 0000000..8b25665 --- /dev/null +++ b/ruoyi-generator/target/classes/vm/vue/v3/index.vue.vm @@ -0,0 +1,590 @@ + + + diff --git a/ruoyi-generator/target/classes/vm/xml/mapper.xml.vm b/ruoyi-generator/target/classes/vm/xml/mapper.xml.vm new file mode 100644 index 0000000..456755b --- /dev/null +++ b/ruoyi-generator/target/classes/vm/xml/mapper.xml.vm @@ -0,0 +1,140 @@ + + + + + +#foreach ($column in $columns) + +#end + +#if($table.sub) + + + + + + +#foreach ($column in $subTable.columns) + +#end + +#end + + + select#foreach($column in $columns) $column.columnName#if($foreach.count != $columns.size()),#end#end from ${tableName} + + + + + +#if($table.sub) + + +#end + + + insert into ${tableName} + +#foreach($column in $columns) +#if($column.columnName != $pkColumn.columnName || !$pkColumn.increment) + $column.columnName, +#end +#end + + +#foreach($column in $columns) +#if($column.columnName != $pkColumn.columnName || !$pkColumn.increment) + #{$column.javaField}, +#end +#end + + + + + update ${tableName} + +#foreach($column in $columns) +#if($column.columnName != $pkColumn.columnName) + $column.columnName = #{$column.javaField}, +#end +#end + + where ${pkColumn.columnName} = #{${pkColumn.javaField}} + + + + delete from ${tableName} where ${pkColumn.columnName} = #{${pkColumn.javaField}} + + + + delete from ${tableName} where ${pkColumn.columnName} in + + #{${pkColumn.javaField}} + + +#if($table.sub) + + + delete from ${subTableName} where ${subTableFkName} in + + #{${subTableFkclassName}} + + + + + delete from ${subTableName} where ${subTableFkName} = #{${subTableFkclassName}} + + + + insert into ${subTableName}(#foreach($column in $subTable.columns) $column.columnName#if($foreach.count != $subTable.columns.size()),#end#end) values + + (#foreach($column in $subTable.columns) #{item.$column.javaField}#if($foreach.count != $subTable.columns.size()),#end#end) + + +#end + \ No newline at end of file diff --git a/ruoyi-quartz/target/classes/mapper/quartz/SysJobLogMapper.xml b/ruoyi-quartz/target/classes/mapper/quartz/SysJobLogMapper.xml new file mode 100644 index 0000000..ba1b683 --- /dev/null +++ b/ruoyi-quartz/target/classes/mapper/quartz/SysJobLogMapper.xml @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + + + + select job_log_id, job_name, job_group, invoke_target, job_message, status, exception_info, create_time + from sys_job_log + + + + + + + + + + delete from sys_job_log where job_log_id = #{jobLogId} + + + + delete from sys_job_log where job_log_id in + + #{jobLogId} + + + + + truncate table sys_job_log + + + + insert into sys_job_log( + job_log_id, + job_name, + job_group, + invoke_target, + job_message, + status, + exception_info, + create_time + )values( + #{jobLogId}, + #{jobName}, + #{jobGroup}, + #{invokeTarget}, + #{jobMessage}, + #{status}, + #{exceptionInfo}, + sysdate() + ) + + + \ No newline at end of file diff --git a/ruoyi-quartz/target/classes/mapper/quartz/SysJobMapper.xml b/ruoyi-quartz/target/classes/mapper/quartz/SysJobMapper.xml new file mode 100644 index 0000000..5605c44 --- /dev/null +++ b/ruoyi-quartz/target/classes/mapper/quartz/SysJobMapper.xml @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + + + + + + + + select job_id, job_name, job_group, invoke_target, cron_expression, misfire_policy, concurrent, status, create_by, create_time, remark + from sys_job + + + + + + + + + + delete from sys_job where job_id = #{jobId} + + + + delete from sys_job where job_id in + + #{jobId} + + + + + update sys_job + + job_name = #{jobName}, + job_group = #{jobGroup}, + invoke_target = #{invokeTarget}, + cron_expression = #{cronExpression}, + misfire_policy = #{misfirePolicy}, + concurrent = #{concurrent}, + status = #{status}, + remark = #{remark}, + update_by = #{updateBy}, + update_time = sysdate() + + where job_id = #{jobId} + + + + insert into sys_job( + job_id, + job_name, + job_group, + invoke_target, + cron_expression, + misfire_policy, + concurrent, + status, + remark, + create_by, + create_time + )values( + #{jobId}, + #{jobName}, + #{jobGroup}, + #{invokeTarget}, + #{cronExpression}, + #{misfirePolicy}, + #{concurrent}, + #{status}, + #{remark}, + #{createBy}, + sysdate() + ) + + + \ No newline at end of file diff --git a/ruoyi-system/target/classes/mapper/system/SysConfigMapper.xml b/ruoyi-system/target/classes/mapper/system/SysConfigMapper.xml new file mode 100644 index 0000000..a5ff114 --- /dev/null +++ b/ruoyi-system/target/classes/mapper/system/SysConfigMapper.xml @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + select config_id, config_name, config_key, config_value, config_type, create_by, create_time, update_by, update_time, remark + from sys_config + + + + + + + and config_id = #{configId} + + + and config_key = #{configKey} + + + + + + + + + + + + + + insert into sys_config ( + config_name, + config_key, + config_value, + config_type, + create_by, + remark, + create_time + )values( + #{configName}, + #{configKey}, + #{configValue}, + #{configType}, + #{createBy}, + #{remark}, + sysdate() + ) + + + + update sys_config + + config_name = #{configName}, + config_key = #{configKey}, + config_value = #{configValue}, + config_type = #{configType}, + update_by = #{updateBy}, + remark = #{remark}, + update_time = sysdate() + + where config_id = #{configId} + + + + delete from sys_config where config_id = #{configId} + + + + delete from sys_config where config_id in + + #{configId} + + + + \ No newline at end of file diff --git a/ruoyi-system/target/classes/mapper/system/SysDeptMapper.xml b/ruoyi-system/target/classes/mapper/system/SysDeptMapper.xml new file mode 100644 index 0000000..cf439f6 --- /dev/null +++ b/ruoyi-system/target/classes/mapper/system/SysDeptMapper.xml @@ -0,0 +1,159 @@ + + + + + + + + + + + + + + + + + + + + + + + + select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time + from sys_dept d + + + + + + + + + + + + + + + + + + + + insert into sys_dept( + dept_id, + parent_id, + dept_name, + ancestors, + order_num, + leader, + phone, + email, + status, + create_by, + create_time + )values( + #{deptId}, + #{parentId}, + #{deptName}, + #{ancestors}, + #{orderNum}, + #{leader}, + #{phone}, + #{email}, + #{status}, + #{createBy}, + sysdate() + ) + + + + update sys_dept + + parent_id = #{parentId}, + dept_name = #{deptName}, + ancestors = #{ancestors}, + order_num = #{orderNum}, + leader = #{leader}, + phone = #{phone}, + email = #{email}, + status = #{status}, + update_by = #{updateBy}, + update_time = sysdate() + + where dept_id = #{deptId} + + + + update sys_dept set ancestors = + + when #{item.deptId} then #{item.ancestors} + + where dept_id in + + #{item.deptId} + + + + + update sys_dept set status = '0' where dept_id in + + #{deptId} + + + + + update sys_dept set del_flag = '2' where dept_id = #{deptId} + + + \ No newline at end of file diff --git a/ruoyi-system/target/classes/mapper/system/SysDictDataMapper.xml b/ruoyi-system/target/classes/mapper/system/SysDictDataMapper.xml new file mode 100644 index 0000000..3b94b7f --- /dev/null +++ b/ruoyi-system/target/classes/mapper/system/SysDictDataMapper.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + select dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, remark + from sys_dict_data + + + + + + + + + + + + + + delete from sys_dict_data where dict_code = #{dictCode} + + + + delete from sys_dict_data where dict_code in + + #{dictCode} + + + + + update sys_dict_data + + dict_sort = #{dictSort}, + dict_label = #{dictLabel}, + dict_value = #{dictValue}, + dict_type = #{dictType}, + css_class = #{cssClass}, + list_class = #{listClass}, + is_default = #{isDefault}, + status = #{status}, + remark = #{remark}, + update_by = #{updateBy}, + update_time = sysdate() + + where dict_code = #{dictCode} + + + + update sys_dict_data set dict_type = #{newDictType} where dict_type = #{oldDictType} + + + + insert into sys_dict_data( + dict_sort, + dict_label, + dict_value, + dict_type, + css_class, + list_class, + is_default, + status, + remark, + create_by, + create_time + )values( + #{dictSort}, + #{dictLabel}, + #{dictValue}, + #{dictType}, + #{cssClass}, + #{listClass}, + #{isDefault}, + #{status}, + #{remark}, + #{createBy}, + sysdate() + ) + + + \ No newline at end of file diff --git a/ruoyi-system/target/classes/mapper/system/SysDictTypeMapper.xml b/ruoyi-system/target/classes/mapper/system/SysDictTypeMapper.xml new file mode 100644 index 0000000..438d484 --- /dev/null +++ b/ruoyi-system/target/classes/mapper/system/SysDictTypeMapper.xml @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + + select dict_id, dict_name, dict_type, status, create_by, create_time, remark + from sys_dict_type + + + + + + + + + + + + + + delete from sys_dict_type where dict_id = #{dictId} + + + + delete from sys_dict_type where dict_id in + + #{dictId} + + + + + update sys_dict_type + + dict_name = #{dictName}, + dict_type = #{dictType}, + status = #{status}, + remark = #{remark}, + update_by = #{updateBy}, + update_time = sysdate() + + where dict_id = #{dictId} + + + + insert into sys_dict_type( + dict_name, + dict_type, + status, + remark, + create_by, + create_time + )values( + #{dictName}, + #{dictType}, + #{status}, + #{remark}, + #{createBy}, + sysdate() + ) + + + \ No newline at end of file diff --git a/ruoyi-system/target/classes/mapper/system/SysLogininforMapper.xml b/ruoyi-system/target/classes/mapper/system/SysLogininforMapper.xml new file mode 100644 index 0000000..822d665 --- /dev/null +++ b/ruoyi-system/target/classes/mapper/system/SysLogininforMapper.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + insert into sys_logininfor (user_name, status, ipaddr, login_location, browser, os, msg, login_time) + values (#{userName}, #{status}, #{ipaddr}, #{loginLocation}, #{browser}, #{os}, #{msg}, sysdate()) + + + + + + delete from sys_logininfor where info_id in + + #{infoId} + + + + + truncate table sys_logininfor + + + \ No newline at end of file diff --git a/ruoyi-system/target/classes/mapper/system/SysMenuMapper.xml b/ruoyi-system/target/classes/mapper/system/SysMenuMapper.xml new file mode 100644 index 0000000..84e87c9 --- /dev/null +++ b/ruoyi-system/target/classes/mapper/system/SysMenuMapper.xml @@ -0,0 +1,206 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select menu_id, menu_name, parent_id, order_num, path, component, `query`, route_name, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time + from sys_menu + + + + + + + + + + + + + + + + + + + + + + + + + + update sys_menu + + menu_name = #{menuName}, + parent_id = #{parentId}, + order_num = #{orderNum}, + path = #{path}, + component = #{component}, + `query` = #{query}, + route_name = #{routeName}, + is_frame = #{isFrame}, + is_cache = #{isCache}, + menu_type = #{menuType}, + visible = #{visible}, + status = #{status}, + perms = #{perms}, + icon = #{icon}, + remark = #{remark}, + update_by = #{updateBy}, + update_time = sysdate() + + where menu_id = #{menuId} + + + + insert into sys_menu( + menu_id, + parent_id, + menu_name, + order_num, + path, + component, + `query`, + route_name, + is_frame, + is_cache, + menu_type, + visible, + status, + perms, + icon, + remark, + create_by, + create_time + )values( + #{menuId}, + #{parentId}, + #{menuName}, + #{orderNum}, + #{path}, + #{component}, + #{query}, + #{routeName}, + #{isFrame}, + #{isCache}, + #{menuType}, + #{visible}, + #{status}, + #{perms}, + #{icon}, + #{remark}, + #{createBy}, + sysdate() + ) + + + + delete from sys_menu where menu_id = #{menuId} + + + \ No newline at end of file diff --git a/ruoyi-system/target/classes/mapper/system/SysNoticeMapper.xml b/ruoyi-system/target/classes/mapper/system/SysNoticeMapper.xml new file mode 100644 index 0000000..65d3079 --- /dev/null +++ b/ruoyi-system/target/classes/mapper/system/SysNoticeMapper.xml @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + select notice_id, notice_title, notice_type, cast(notice_content as char) as notice_content, status, create_by, create_time, update_by, update_time, remark + from sys_notice + + + + + + + + insert into sys_notice ( + notice_title, + notice_type, + notice_content, + status, + remark, + create_by, + create_time + )values( + #{noticeTitle}, + #{noticeType}, + #{noticeContent}, + #{status}, + #{remark}, + #{createBy}, + sysdate() + ) + + + + update sys_notice + + notice_title = #{noticeTitle}, + notice_type = #{noticeType}, + notice_content = #{noticeContent}, + status = #{status}, + update_by = #{updateBy}, + update_time = sysdate() + + where notice_id = #{noticeId} + + + + delete from sys_notice where notice_id = #{noticeId} + + + + delete from sys_notice where notice_id in + + #{noticeId} + + + + \ No newline at end of file diff --git a/ruoyi-system/target/classes/mapper/system/SysOperLogMapper.xml b/ruoyi-system/target/classes/mapper/system/SysOperLogMapper.xml new file mode 100644 index 0000000..201db07 --- /dev/null +++ b/ruoyi-system/target/classes/mapper/system/SysOperLogMapper.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + select oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time, cost_time + from sys_oper_log + + + + insert into sys_oper_log(title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, cost_time, oper_time) + values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, #{costTime}, sysdate()) + + + + + + delete from sys_oper_log where oper_id in + + #{operId} + + + + + + + truncate table sys_oper_log + + + \ No newline at end of file diff --git a/ruoyi-system/target/classes/mapper/system/SysPostMapper.xml b/ruoyi-system/target/classes/mapper/system/SysPostMapper.xml new file mode 100644 index 0000000..227c459 --- /dev/null +++ b/ruoyi-system/target/classes/mapper/system/SysPostMapper.xml @@ -0,0 +1,122 @@ + + + + + + + + + + + + + + + + + + + select post_id, post_code, post_name, post_sort, status, create_by, create_time, remark + from sys_post + + + + + + + + + + + + + + + + + + update sys_post + + post_code = #{postCode}, + post_name = #{postName}, + post_sort = #{postSort}, + status = #{status}, + remark = #{remark}, + update_by = #{updateBy}, + update_time = sysdate() + + where post_id = #{postId} + + + + insert into sys_post( + post_id, + post_code, + post_name, + post_sort, + status, + remark, + create_by, + create_time + )values( + #{postId}, + #{postCode}, + #{postName}, + #{postSort}, + #{status}, + #{remark}, + #{createBy}, + sysdate() + ) + + + + delete from sys_post where post_id = #{postId} + + + + delete from sys_post where post_id in + + #{postId} + + + + \ No newline at end of file diff --git a/ruoyi-system/target/classes/mapper/system/SysRoleDeptMapper.xml b/ruoyi-system/target/classes/mapper/system/SysRoleDeptMapper.xml new file mode 100644 index 0000000..7c4139b --- /dev/null +++ b/ruoyi-system/target/classes/mapper/system/SysRoleDeptMapper.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + delete from sys_role_dept where role_id=#{roleId} + + + + + + delete from sys_role_dept where role_id in + + #{roleId} + + + + + insert into sys_role_dept(role_id, dept_id) values + + (#{item.roleId},#{item.deptId}) + + + + \ No newline at end of file diff --git a/ruoyi-system/target/classes/mapper/system/SysRoleMapper.xml b/ruoyi-system/target/classes/mapper/system/SysRoleMapper.xml new file mode 100644 index 0000000..955d4ee --- /dev/null +++ b/ruoyi-system/target/classes/mapper/system/SysRoleMapper.xml @@ -0,0 +1,152 @@ + + + + + + + + + + + + + + + + + + + + + + + select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly, + r.status, r.del_flag, r.create_time, r.remark + from sys_role r + left join sys_user_role ur on ur.role_id = r.role_id + left join sys_user u on u.user_id = ur.user_id + left join sys_dept d on u.dept_id = d.dept_id + + + + + + + + + + + + + + + + + + + + insert into sys_role( + role_id, + role_name, + role_key, + role_sort, + data_scope, + menu_check_strictly, + dept_check_strictly, + status, + remark, + create_by, + create_time + )values( + #{roleId}, + #{roleName}, + #{roleKey}, + #{roleSort}, + #{dataScope}, + #{menuCheckStrictly}, + #{deptCheckStrictly}, + #{status}, + #{remark}, + #{createBy}, + sysdate() + ) + + + + update sys_role + + role_name = #{roleName}, + role_key = #{roleKey}, + role_sort = #{roleSort}, + data_scope = #{dataScope}, + menu_check_strictly = #{menuCheckStrictly}, + dept_check_strictly = #{deptCheckStrictly}, + status = #{status}, + remark = #{remark}, + update_by = #{updateBy}, + update_time = sysdate() + + where role_id = #{roleId} + + + + update sys_role set del_flag = '2' where role_id = #{roleId} + + + + update sys_role set del_flag = '2' where role_id in + + #{roleId} + + + + \ No newline at end of file diff --git a/ruoyi-system/target/classes/mapper/system/SysRoleMenuMapper.xml b/ruoyi-system/target/classes/mapper/system/SysRoleMenuMapper.xml new file mode 100644 index 0000000..cb60a85 --- /dev/null +++ b/ruoyi-system/target/classes/mapper/system/SysRoleMenuMapper.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + delete from sys_role_menu where role_id=#{roleId} + + + + delete from sys_role_menu where role_id in + + #{roleId} + + + + + insert into sys_role_menu(role_id, menu_id) values + + (#{item.roleId},#{item.menuId}) + + + + \ No newline at end of file diff --git a/ruoyi-system/target/classes/mapper/system/SysUserMapper.xml b/ruoyi-system/target/classes/mapper/system/SysUserMapper.xml new file mode 100644 index 0000000..0856cb2 --- /dev/null +++ b/ruoyi-system/target/classes/mapper/system/SysUserMapper.xml @@ -0,0 +1,221 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, + d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status, + r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status + from sys_user u + left join sys_dept d on u.dept_id = d.dept_id + left join sys_user_role ur on u.user_id = ur.user_id + left join sys_role r on r.role_id = ur.role_id + + + + + + + + + + + + + + + + + + + + insert into sys_user( + user_id, + dept_id, + user_name, + nick_name, + email, + avatar, + phonenumber, + sex, + password, + status, + create_by, + remark, + create_time + )values( + #{userId}, + #{deptId}, + #{userName}, + #{nickName}, + #{email}, + #{avatar}, + #{phonenumber}, + #{sex}, + #{password}, + #{status}, + #{createBy}, + #{remark}, + sysdate() + ) + + + + update sys_user + + dept_id = #{deptId}, + user_name = #{userName}, + nick_name = #{nickName}, + email = #{email}, + phonenumber = #{phonenumber}, + sex = #{sex}, + avatar = #{avatar}, + password = #{password}, + status = #{status}, + login_ip = #{loginIp}, + login_date = #{loginDate}, + update_by = #{updateBy}, + remark = #{remark}, + update_time = sysdate() + + where user_id = #{userId} + + + + update sys_user set status = #{status} where user_id = #{userId} + + + + update sys_user set avatar = #{avatar} where user_name = #{userName} + + + + update sys_user set password = #{password} where user_name = #{userName} + + + + update sys_user set del_flag = '2' where user_id = #{userId} + + + + update sys_user set del_flag = '2' where user_id in + + #{userId} + + + + \ No newline at end of file diff --git a/ruoyi-system/target/classes/mapper/system/SysUserPostMapper.xml b/ruoyi-system/target/classes/mapper/system/SysUserPostMapper.xml new file mode 100644 index 0000000..2b90bc4 --- /dev/null +++ b/ruoyi-system/target/classes/mapper/system/SysUserPostMapper.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + delete from sys_user_post where user_id=#{userId} + + + + + + delete from sys_user_post where user_id in + + #{userId} + + + + + insert into sys_user_post(user_id, post_id) values + + (#{item.userId},#{item.postId}) + + + + \ No newline at end of file diff --git a/ruoyi-system/target/classes/mapper/system/SysUserRoleMapper.xml b/ruoyi-system/target/classes/mapper/system/SysUserRoleMapper.xml new file mode 100644 index 0000000..dd72689 --- /dev/null +++ b/ruoyi-system/target/classes/mapper/system/SysUserRoleMapper.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + delete from sys_user_role where user_id=#{userId} + + + + + + delete from sys_user_role where user_id in + + #{userId} + + + + + insert into sys_user_role(user_id, role_id) values + + (#{item.userId},#{item.roleId}) + + + + + delete from sys_user_role where user_id=#{userId} and role_id=#{roleId} + + + + delete from sys_user_role where role_id=#{roleId} and user_id in + + #{userId} + + + \ No newline at end of file From 66f8c800a3d31d97ebafa6239566371e2a286bad Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Thu, 18 Sep 2025 16:35:33 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 26 +++ .../controller/SteelGradeInfoController.java | 2 +- .../com/fizz/business/domain/StdAlloy.java | 99 ++++++--- .../service/client/RedisCacheManager.java | 61 +++++- .../service/impl/CrmPdiPlanServiceImpl.java | 10 +- .../service/impl/TrackServiceImpl.java | 50 ++++- .../src/main/resources/application.yml | 8 +- ruoyi-admin/target/classes/application.yml | 198 ------------------ .../com/ruoyi/common/constant/Constants.java | 2 +- 9 files changed, 219 insertions(+), 237 deletions(-) delete mode 100644 ruoyi-admin/target/classes/application.yml diff --git a/.gitignore b/.gitignore index a1c2a23..b8b33f6 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,29 @@ # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* +# 编译生成的文件 +target/ +*.class +*.jar +*.war +*.ear + +# IDE 相关文件 +.idea/ +*.iml +*.ipr +*.iws + +# 构建工具相关 +*.log +*.tmp +*.bak +*.swp + +# 具体的 target/classes 下的文件 +ruoyi-admin/target/classes/ +ruoyi-generator/target/classes/ +business/target/classes/ + +# Velocity 模板文件 +*.vm \ No newline at end of file diff --git a/business/src/main/java/com/fizz/business/controller/SteelGradeInfoController.java b/business/src/main/java/com/fizz/business/controller/SteelGradeInfoController.java index 371b5e1..60adb4b 100644 --- a/business/src/main/java/com/fizz/business/controller/SteelGradeInfoController.java +++ b/business/src/main/java/com/fizz/business/controller/SteelGradeInfoController.java @@ -58,7 +58,7 @@ public class SteelGradeInfoController { queryWrapper.eq(StdAlloy::getGradeid, gradeid); // 只查询 gradeId 和 name 字段 // 查询 StdAlloy 数据 - StdAlloy stdAlloyList = steelGradeInfoService.getById(queryWrapper); + StdAlloy stdAlloyList = steelGradeInfoService.getById(gradeid); // 返回结果 return R.ok(stdAlloyList); diff --git a/business/src/main/java/com/fizz/business/domain/StdAlloy.java b/business/src/main/java/com/fizz/business/domain/StdAlloy.java index 51f083d..a8c259b 100644 --- a/business/src/main/java/com/fizz/business/domain/StdAlloy.java +++ b/business/src/main/java/com/fizz/business/domain/StdAlloy.java @@ -1,36 +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 { - private Integer gradeid; // GRADEID - private String name; // NAME - private Integer origin; // ORIGIN - private Float sigma0; // SIGMA0 - private Float firstSigma0; // FIRST_SIGMA0 - private Float initSigma; // INIT_SIGMA - private Float ro; // RO - private Integer classId; // CLASSID - private Float a; // A - private Float b; // B - private Float c; // C - private Float d; // D - private Float kc0; // KC0 - private Float kc1; // KC1 - private Float kc2; // KC2 - private Float kc3; // KC3 - private Float kc4; // KC4 - private Float nu; // NU - private Float e; // E - private Float chal; // CHAL - private Float temp0; // TEMP0 - private Float strength; // STRENGTH - private Integer weldCode; // WELD_CODE - private LocalDateTime insDate; // INSDATE + @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/service/client/RedisCacheManager.java b/business/src/main/java/com/fizz/business/service/client/RedisCacheManager.java index 7fdc0c6..6467804 100644 --- a/business/src/main/java/com/fizz/business/service/client/RedisCacheManager.java +++ b/business/src/main/java/com/fizz/business/service/client/RedisCacheManager.java @@ -18,6 +18,7 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Component; @@ -40,12 +41,15 @@ public class RedisCacheManager { RedisTemplate segmentRedisTemplate; @Autowired + @Qualifier("redisTemplateOfMatmap") RedisTemplate matmapRedisTemplate; @Autowired + @Qualifier("redisTemplateOfHead") RedisTemplate headRedisTemplate; @Autowired + @Qualifier("redisTemplateOfCoilPos") RedisTemplate coilPosRedisTemplate; @Autowired @@ -144,7 +148,39 @@ public class RedisCacheManager { } public List getMatmapList() { - return matmapRedisTemplate.opsForList().range(COIL_MATMAP_LIST_KEY, 0, -1); + List rawList = matmapRedisTemplate.opsForList().range(COIL_MATMAP_LIST_KEY, 0, -1); + if (rawList == null) { + return null; + } + + List result = new ArrayList<>(); + for (Object item : rawList) { + if (item == null) { + result.add(null); + continue; + } + + // 如果是LinkedHashMap，转换为MatmapDTO + if (item instanceof java.util.LinkedHashMap) { + try { + MatmapDTO dto = BeanUtil.toBean((java.util.LinkedHashMap) item, MatmapDTO.class); + result.add(dto); + } catch (Exception e) { + log.error("Failed to convert LinkedHashMap to MatmapDTO: {}", e.getMessage()); + result.add(null); + } + } + // 如果已经是MatmapDTO，直接添加 + else if (item instanceof MatmapDTO) { + result.add((MatmapDTO) item); + } + else { + log.warn("Unexpected type in Redis list: {}", item.getClass().getName()); + result.add(null); + } + } + + return result; } public void setMatmap(int index, MatmapDTO matmap) { @@ -152,7 +188,28 @@ public class RedisCacheManager { } public MatmapDTO getMatmap(int index) { - return matmapRedisTemplate.opsForList().index(COIL_MATMAP_LIST_KEY, index); + Object result = matmapRedisTemplate.opsForList().index(COIL_MATMAP_LIST_KEY, index); + if (result == null) { + return null; + } + + // 如果是LinkedHashMap，转换为MatmapDTO + if (result instanceof java.util.LinkedHashMap) { + try { + return BeanUtil.toBean((java.util.LinkedHashMap) result, MatmapDTO.class); + } catch (Exception e) { + log.error("Failed to convert LinkedHashMap to MatmapDTO: {}", e.getMessage()); + return null; + } + } + + // 如果已经是MatmapDTO，直接返回 + if (result instanceof MatmapDTO) { + return (MatmapDTO) result; + } + + log.warn("Unexpected type in Redis: {}", result.getClass().getName()); + return null; } public List getHeadList() { diff --git a/business/src/main/java/com/fizz/business/service/impl/CrmPdiPlanServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/CrmPdiPlanServiceImpl.java index 94940fc..b629c93 100644 --- a/business/src/main/java/com/fizz/business/service/impl/CrmPdiPlanServiceImpl.java +++ b/business/src/main/java/com/fizz/business/service/impl/CrmPdiPlanServiceImpl.java @@ -153,10 +153,16 @@ public class CrmPdiPlanServiceImpl extends ServiceImpl 0) { + returnWt = planVO.getEntryWeight().divide(BigDecimal.valueOf(calcCoilWeight)).setScale(2, RoundingMode.HALF_UP).doubleValue(); + } else { + log.warn("Invalid entry weight or calc coil weight: entryWeight={}, calcCoilWeight={}", planVO.getEntryWeight(), calcCoilWeight); + returnWt = 0.0; + } returnType = HALF_RETURN.name(); } else if (Objects.equals(planVO.getStatus(), PlanStatusEnum.ONLINE.name())) { - returnWt = planVO.getEntryWeight().doubleValue(); + if (planVO.getEntryWeight() != null) { + returnWt = planVO.getEntryWeight().doubleValue(); + } else { + log.warn("Entry weight is null for planId: {}", planVO.getId()); + returnWt = 0.0; + } returnType = ALL_RETURN.name(); } else { log.error("invalid plan status[{}], planId={}", planVO.getStatus(), planVO.getId()); @@ -133,6 +161,13 @@ public class TrackServiceImpl implements TrackService { Integer currPosIdx = currDevice.getIdx(); MatmapDTO target = MatmapUtil.getMatmap(targetPosIdx); MatmapDTO curr = MatmapUtil.getMatmap(currPosIdx); + + if (curr == null || target == null) { + log.warn("Matmap is null - curr: {}, target: {}, currPosIdx: {}, targetPosIdx: {}", + curr, target, currPosIdx, targetPosIdx); + return; + } + if (Objects.equals(curr.getMatId(), target.getMatId())) { return; } @@ -208,9 +243,18 @@ public class TrackServiceImpl implements TrackService { @Override public CoilPositionDTO getCoilPosition() { CoilPositionDTO position = redisCacheManager.getCoilPosition(); + if (position == null) { + log.warn("CoilPosition not found in Redis, creating empty position"); + position = new CoilPositionDTO(); + } + List matmapList = redisCacheManager.getMatmapList(); + if (matmapList == null) { + log.warn("MatmapList not found in Redis, using empty list"); + matmapList = new ArrayList<>(); + } + position.setMatMapList(matmapList); - return position; } diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index fed26e9..109963f 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -78,15 +78,15 @@ spring: # password: KeLunPu123! password: # 连接超时时间 - timeout: 10s + timeout: 20s lettuce: pool: # 连接池中的最小空闲连接 - min-idle: 0 + min-idle: 2 # 连接池中的最大空闲连接 - max-idle: 8 + max-idle: 10 # 连接池的最大数据库连接数 - max-active: 8 + max-active: 20 # #连接池最大阻塞等待时间（使用负值表示没有限制） max-wait: -1ms diff --git a/ruoyi-admin/target/classes/application.yml b/ruoyi-admin/target/classes/application.yml deleted file mode 100644 index fed26e9..0000000 --- a/ruoyi-admin/target/classes/application.yml +++ /dev/null @@ -1,198 +0,0 @@ -# 项目相关配置 -ruoyi: - # 名称 - name: Fizz - # 版本 3.8.8 - version: 1.0.0 - # 版权年份 - copyrightYear: 2024 - # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） - profile: D:/ruoyi/uploadPath - # 获取ip地址开关 - addressEnabled: false - # 验证码类型 math 数字计算 char 字符验证 - captchaType: math - -# 开发环境配置 -server: - # 服务器的HTTP端口，默认为8080 - port: 8089 - forward-headers-strategy: framework - servlet: - # 应用的访问路径 - context-path: / - tomcat: - # tomcat的URI编码 - uri-encoding: UTF-8 - # 连接数满后的排队数，默认为100 - accept-count: 1000 - threads: - # tomcat最大线程数，默认为200 - max: 800 - # Tomcat启动初始化的线程数，默认值10 - min-spare: 100 - -# 日志配置 -logging: - level: - com.ruoyi: debug - org.springframework: warn - -# 用户配置 -user: - password: - # 密码最大错误次数 - maxRetryCount: 5 - # 密码锁定时间（默认10分钟） - lockTime: 10 - -# Spring配置 -spring: - # 资源信息 - messages: - # 国际化资源文件路径 - basename: i18n/messages - profiles: - active: druid - # 文件上传 - servlet: - multipart: - # 单个文件大小 - max-file-size: 10MB - # 设置总上传的文件大小 - max-request-size: 20MB - # 服务模块 - devtools: - restart: - # 热部署开关 - enabled: true - # redis 配置 - redis: - # 地址 - host: localhost - # 端口，默认为6379 - port: 6379 - # 数据库索引 - database: 0 -# 密码 abcd1234 fe2b3cef78b74d3692909bdcbdf46331 KeLunPu123! -# password: KeLunPu123! - password: - # 连接超时时间 - timeout: 10s - lettuce: - pool: - # 连接池中的最小空闲连接 - min-idle: 0 - # 连接池中的最大空闲连接 - max-idle: 8 - # 连接池的最大数据库连接数 - max-active: 8 - # #连接池最大阻塞等待时间（使用负值表示没有限制） - max-wait: -1ms - - rabbitmq: - username: admin - password: admin - virtual-host: / - host: 127.0.0.1 - port: 5672 - listener: - simple: - retry: - enabled: true - max-attempts: 1 - max-interval: 200 - task: - scheduling: - pool: - size: 8 #配置Scheduled定时任务为多线程 - -# token配置 -token: - # 令牌自定义标识 - header: Authorization - # 令牌密钥 - secret: abcdefghijklmnopqrstuvwxyz - # 令牌有效期（默认30分钟） - expireTime: 30 - -# MyBatis -mybatis-plus: - # 搜索指定包别名 - typeAliasesPackage: com.ruoyi.**.domain,com.fizz.**.domain - # 配置mapper的扫描，找到所有的mapper.xml映射文件 - mapperLocations: classpath*:mapper/**/*Mapper.xml - # 加载全局的配置文件 - configLocation: classpath:mybatis/mybatis-config.xml - -# PageHelper分页插件 -pagehelper: - helperDialect: mysql - supportMethodsArguments: true - params: count=countSql - -# 防止XSS攻击 -xss: - # 过滤开关 - enabled: true - # 排除链接（多个用逗号分隔） - excludes: /system/notice - # 匹配链接 - urlPatterns: /system/*,/monitor/*,/tool/* - - #rocketmq: - #name-server: 127.0.0.1:9876 - #producer: - #group: test - -springdoc: - api-docs: - path: /v3/api-docs - swagger-ui: - enabled: true - path: /swagger-ui.html - tags-sorter: alpha - group-configs: - - group: 'default' - display-name: 'default' - paths-to-match: '/api/**' - packages-to-scan: com.fizz.business.controller - - -knife4j: - enable: true # 启用 Knife4j - setting: - language: zh-CN # 中文界面 - enable-swagger-model: true # 显示模型 - enable-document-manage: true # 启用文档管理 - cors: true # 允许跨域 - -kangaroohy: - milo: - enabled: false - primary: default - config: - default: - endpoint: opc.tcp://127.0.0.1:49320 - security-policy: none - pool: - max-idle: 5 - max-total: 20 - min-idle: 2 - initial-size: 3 - - -#kangaroohy: -# milo: -# primary: default -# config: -# default: -# endpoint: opc.tcp://127.0.0.1:49320 -# security-policy: basic256sha256 -# username: OPCUA -# password: 123456 -# test: -# endpoint: opc.tcp://127.0.0.1:49321 -# security-policy: basic256sha256 -# username: OPCUA -# password: 123456 \ No newline at end of file diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java index 0c384c6..4b7012e 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java @@ -158,7 +158,7 @@ public class Constants /** * 自动识别json对象白名单配置（仅允许解析的包名，范围越小越安全） */ - public static final String[] JSON_WHITELIST_STR = { "org.springframework", "com.ruoyi" }; + public static final String[] JSON_WHITELIST_STR = { "org.springframework", "com.ruoyi", "com.fizz" }; /** * 定时任务白名单配置（仅允许访问的包名，如其他需要可以自行添加） From b5d2061833b2c431e3d9b61758cd01d6dea82db5 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Thu, 18 Sep 2025 17:12:25 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E4=B8=8D=E5=BF=85?= =?UTF-8?q?=E8=A6=81=E7=9A=84=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fizz/business/service/impl/CrmPdiPlanServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/business/src/main/java/com/fizz/business/service/impl/CrmPdiPlanServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/CrmPdiPlanServiceImpl.java index b629c93..7d37326 100644 --- a/business/src/main/java/com/fizz/business/service/impl/CrmPdiPlanServiceImpl.java +++ b/business/src/main/java/com/fizz/business/service/impl/CrmPdiPlanServiceImpl.java @@ -160,7 +160,6 @@ public class CrmPdiPlanServiceImpl extends ServiceImpl Date: Tue, 23 Sep 2025 17:04:20 +0800 Subject: [PATCH 04/12] =?UTF-8?q?feat(business):=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=81=9C=E6=9C=BA=E7=BB=9F=E8=AE=A1=E8=AE=A1=E7=AE=97=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 新增 `/calc` 接口用于计算指定时间范围内的停机次数、停机时长及设备作业率。该接口通过查询 ProStoppage 表中符合条件的停机记录，统计相关指标并返回结果。主要变更： - 在 ProStoppageController 中添加 `calc` 方法，提供 POST 接口 /calc - 在 ProStoppageService 中声明 `calc` 方法签名 - 在 ProStoppageServiceImpl 中实现 `calc` 逻辑，包括： - 查询时间范围内的停机记录 - 统计停机次数和总时长（转换为小时） - 计算时间范围总时长与作业率（百分比形式） - 返回包含三项数据的结果列表 --- .../controller/ProStoppageController.java | 6 +++ .../business/service/ProStoppageService.java | 1 + .../service/impl/ProStoppageServiceImpl.java | 40 ++++++++++++++++++- 3 files changed, 46 insertions(+), 1 deletion(-) diff --git a/business/src/main/java/com/fizz/business/controller/ProStoppageController.java b/business/src/main/java/com/fizz/business/controller/ProStoppageController.java index e4f0e6c..a7b031b 100644 --- a/business/src/main/java/com/fizz/business/controller/ProStoppageController.java +++ b/business/src/main/java/com/fizz/business/controller/ProStoppageController.java @@ -45,4 +45,10 @@ public class ProStoppageController { 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/service/ProStoppageService.java b/business/src/main/java/com/fizz/business/service/ProStoppageService.java index 06267a3..5b5f19f 100644 --- a/business/src/main/java/com/fizz/business/service/ProStoppageService.java +++ b/business/src/main/java/com/fizz/business/service/ProStoppageService.java @@ -16,4 +16,5 @@ public interface ProStoppageService extends IService { boolean deleteProStoppage(Long stopid); + List calc(ProStoppageForm form); } diff --git a/business/src/main/java/com/fizz/business/service/impl/ProStoppageServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/ProStoppageServiceImpl.java index 814ca69..a0fe601 100644 --- a/business/src/main/java/com/fizz/business/service/impl/ProStoppageServiceImpl.java +++ b/business/src/main/java/com/fizz/business/service/impl/ProStoppageServiceImpl.java @@ -1,5 +1,6 @@ package com.fizz.business.service.impl; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fizz.business.domain.ProStoppage; @@ -10,6 +11,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; @@ -23,7 +25,7 @@ public class ProStoppageServiceImpl extends ServiceImpl list = baseMapper.selectList(queryWrapper); @@ -45,4 +47,40 @@ public class ProStoppageServiceImpl extends ServiceImpl calc(ProStoppageForm form) { + // 构建查询条件，筛选指定时间范围内的停机记录 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.ge("start_date", form.getStartDate() + " 00:00:00") + .le("end_date", form.getEndDate() + " 23:59:59"); + + // 查询符合条件的停机记录列表 + List stoppageList = baseMapper.selectList(queryWrapper); + + // 计算停机次数 + int stopCount = stoppageList.size(); + + // 计算停机总时长（单位：小时，保留两位小数） + BigDecimal totalStopDuration = BigDecimal.ZERO; + for (ProStoppage stoppage : stoppageList) { + totalStopDuration = totalStopDuration.add(stoppage.getDuration().divide(BigDecimal.valueOf(3600), 2, BigDecimal.ROUND_HALF_UP)); + } + + // 计算总时长（查询时间范围的时长，单位：小时） + long totalTimeMillis = DateUtil.parse(form.getEndDate() + " 23:59:59").getTime() - DateUtil.parse(form.getStartDate() + " 00:00:00").getTime(); + BigDecimal totalDuration = BigDecimal.valueOf(totalTimeMillis).divide(BigDecimal.valueOf(3600 * 1000), 2, BigDecimal.ROUND_HALF_UP); + + // 计算作业率（保留两位小数，百分比形式） + BigDecimal operationRate = BigDecimal.ONE.subtract(totalStopDuration.divide(totalDuration, 4, BigDecimal.ROUND_HALF_UP)) + .multiply(BigDecimal.valueOf(100)).setScale(2, BigDecimal.ROUND_HALF_UP); + + // 创建List来承载结果 + List resultList = new ArrayList<>(); + resultList.add(stopCount); + resultList.add(totalStopDuration); + resultList.add(operationRate); + + return resultList; + } } From ea51d22b478a5aa0d5e41c7d9411806f33ef05c9 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Thu, 25 Sep 2025 15:24:41 +0800 Subject: [PATCH 05/12] =?UTF-8?q?feat(business):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92=E5=8F=82=E6=95=B0=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E5=8F=8A=E7=9B=B8=E5=85=B3=E6=9C=8D=E5=8A=A1=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增 PdiSetup 实体类，定义字段生产计划参数详情 - 创建 IPdiSetupService 接口，包含增删改查方法- 添加 PdiSetupController 控制器，实现 RESTful API - 配置 PdiSetupMapper 及其 XML 映射文件- 注释 MessageSubscriptionRunner 类中的 @Component 注解 - 新增多个设备参数相关的 Service 接口（SetupTension、SetupTl 等） --- .../comm/OPC/MessageSubscriptionRunner.java | 2 +- .../controller/PdiSetupController.java | 104 +++++ .../controller/SetupTensionController.java | 98 +++++ .../controller/SetupTlController.java | 98 +++++ .../SetupTmBendforceController.java | 98 +++++ .../controller/SetupTmMeshController.java | 98 +++++ .../SetupTmRollforceController.java | 98 +++++ .../com/fizz/business/domain/PdiSetup.java | 375 ++++++++++++++++++ .../fizz/business/domain/SetupTension.java | 86 ++++ .../com/fizz/business/domain/SetupTl.java | 69 ++++ .../business/domain/SetupTmBendforce.java | 42 ++ .../com/fizz/business/domain/SetupTmMesh.java | 69 ++++ .../business/domain/SetupTmRollforce.java | 72 ++++ .../fizz/business/mapper/PdiSetupMapper.java | 61 +++ .../business/mapper/SetupTensionMapper.java | 61 +++ .../fizz/business/mapper/SetupTlMapper.java | 61 +++ .../mapper/SetupTmBendforceMapper.java | 61 +++ .../business/mapper/SetupTmMeshMapper.java | 61 +++ .../mapper/SetupTmRollforceMapper.java | 61 +++ .../business/service/IPdiSetupService.java | 61 +++ .../service/ISetupTensionService.java | 61 +++ .../business/service/ISetupTlService.java | 61 +++ .../service/ISetupTmBendforceService.java | 61 +++ .../business/service/ISetupTmMeshService.java | 61 +++ .../service/ISetupTmRollforceService.java | 61 +++ .../service/impl/PdiSetupServiceImpl.java | 96 +++++ .../service/impl/SetupTensionServiceImpl.java | 96 +++++ .../service/impl/SetupTlServiceImpl.java | 96 +++++ .../impl/SetupTmBendforceServiceImpl.java | 96 +++++ .../service/impl/SetupTmMeshServiceImpl.java | 96 +++++ .../impl/SetupTmRollforceServiceImpl.java | 96 +++++ .../main/resources/mapper/PdiSetupMapper.xml | 181 +++++++++ .../resources/mapper/SetupTensionMapper.xml | 142 +++++++ .../main/resources/mapper/SetupTlMapper.xml | 121 ++++++ .../mapper/SetupTmBendforceMapper.xml | 87 ++++ .../resources/mapper/SetupTmMeshMapper.xml | 121 ++++++ .../mapper/SetupTmRollforceMapper.xml | 125 ++++++ 37 files changed, 3393 insertions(+), 1 deletion(-) create mode 100644 business/src/main/java/com/fizz/business/controller/PdiSetupController.java create mode 100644 business/src/main/java/com/fizz/business/controller/SetupTensionController.java create mode 100644 business/src/main/java/com/fizz/business/controller/SetupTlController.java create mode 100644 business/src/main/java/com/fizz/business/controller/SetupTmBendforceController.java create mode 100644 business/src/main/java/com/fizz/business/controller/SetupTmMeshController.java create mode 100644 business/src/main/java/com/fizz/business/controller/SetupTmRollforceController.java create mode 100644 business/src/main/java/com/fizz/business/domain/PdiSetup.java create mode 100644 business/src/main/java/com/fizz/business/domain/SetupTension.java create mode 100644 business/src/main/java/com/fizz/business/domain/SetupTl.java create mode 100644 business/src/main/java/com/fizz/business/domain/SetupTmBendforce.java create mode 100644 business/src/main/java/com/fizz/business/domain/SetupTmMesh.java create mode 100644 business/src/main/java/com/fizz/business/domain/SetupTmRollforce.java create mode 100644 business/src/main/java/com/fizz/business/mapper/PdiSetupMapper.java create mode 100644 business/src/main/java/com/fizz/business/mapper/SetupTensionMapper.java create mode 100644 business/src/main/java/com/fizz/business/mapper/SetupTlMapper.java create mode 100644 business/src/main/java/com/fizz/business/mapper/SetupTmBendforceMapper.java create mode 100644 business/src/main/java/com/fizz/business/mapper/SetupTmMeshMapper.java create mode 100644 business/src/main/java/com/fizz/business/mapper/SetupTmRollforceMapper.java create mode 100644 business/src/main/java/com/fizz/business/service/IPdiSetupService.java create mode 100644 business/src/main/java/com/fizz/business/service/ISetupTensionService.java create mode 100644 business/src/main/java/com/fizz/business/service/ISetupTlService.java create mode 100644 business/src/main/java/com/fizz/business/service/ISetupTmBendforceService.java create mode 100644 business/src/main/java/com/fizz/business/service/ISetupTmMeshService.java create mode 100644 business/src/main/java/com/fizz/business/service/ISetupTmRollforceService.java create mode 100644 business/src/main/java/com/fizz/business/service/impl/PdiSetupServiceImpl.java create mode 100644 business/src/main/java/com/fizz/business/service/impl/SetupTensionServiceImpl.java create mode 100644 business/src/main/java/com/fizz/business/service/impl/SetupTlServiceImpl.java create mode 100644 business/src/main/java/com/fizz/business/service/impl/SetupTmBendforceServiceImpl.java create mode 100644 business/src/main/java/com/fizz/business/service/impl/SetupTmMeshServiceImpl.java create mode 100644 business/src/main/java/com/fizz/business/service/impl/SetupTmRollforceServiceImpl.java create mode 100644 business/src/main/resources/mapper/PdiSetupMapper.xml create mode 100644 business/src/main/resources/mapper/SetupTensionMapper.xml create mode 100644 business/src/main/resources/mapper/SetupTlMapper.xml create mode 100644 business/src/main/resources/mapper/SetupTmBendforceMapper.xml create mode 100644 business/src/main/resources/mapper/SetupTmMeshMapper.xml create mode 100644 business/src/main/resources/mapper/SetupTmRollforceMapper.xml 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 index 6c4b86d..989ea27 100644 --- a/business/src/main/java/com/fizz/business/comm/OPC/MessageSubscriptionRunner.java +++ b/business/src/main/java/com/fizz/business/comm/OPC/MessageSubscriptionRunner.java @@ -26,7 +26,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import static com.fizz.business.service.manager.OpcMessageIdsManager.*; -@Component +//@Component @Slf4j public class MessageSubscriptionRunner implements ApplicationRunner { 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..2eff580 --- /dev/null +++ b/business/src/main/java/com/fizz/business/controller/PdiSetupController.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.PdiSetup; +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; + + /** + * 查询生产计划的参数详情列表 + */ + @PreAuthorize("@ss.hasPermi('business:setup:list')") + @GetMapping("/list") + public TableDataInfo list(PdiSetup pdiSetup) + { + startPage(); + List list = pdiSetupService.selectPdiSetupList(pdiSetup); + return getDataTable(list); + } + + /** + * 导出生产计划的参数详情列表 + */ + @PreAuthorize("@ss.hasPermi('business:setup:export')") + @Log(title = "生产计划的参数详情", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, PdiSetup pdiSetup) + { + List list = pdiSetupService.selectPdiSetupList(pdiSetup); + ExcelUtil util = new ExcelUtil(PdiSetup.class); + util.exportExcel(response, list, "生产计划的参数详情数据"); + } + + /** + * 获取生产计划的参数详情详细信息 + */ + @PreAuthorize("@ss.hasPermi('business:setup:query')") + @GetMapping(value = "/{ID}") + public AjaxResult getInfo(@PathVariable("ID") Long ID) + { + return success(pdiSetupService.selectPdiSetupByID(ID)); + } + + /** + * 新增生产计划的参数详情 + */ + @PreAuthorize("@ss.hasPermi('business:setup:add')") + @Log(title = "生产计划的参数详情", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody PdiSetup pdiSetup) + { + return toAjax(pdiSetupService.insertPdiSetup(pdiSetup)); + } + + /** + * 修改生产计划的参数详情 + */ + @PreAuthorize("@ss.hasPermi('business:setup:edit')") + @Log(title = "生产计划的参数详情", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody PdiSetup pdiSetup) + { + return toAjax(pdiSetupService.updatePdiSetup(pdiSetup)); + } + + /** + * 删除生产计划的参数详情 + */ + @PreAuthorize("@ss.hasPermi('business:setup:remove')") + @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/SetupTensionController.java b/business/src/main/java/com/fizz/business/controller/SetupTensionController.java new file mode 100644 index 0000000..8a18431 --- /dev/null +++ b/business/src/main/java/com/fizz/business/controller/SetupTensionController.java @@ -0,0 +1,98 @@ +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.SetupTension; +import com.fizz.business.service.ISetupTensionService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 全线张力Controller + * + * @author Joshi + * @date 2025-09-25 + */ +@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(value = "/{THICK}") + public AjaxResult getInfo(@PathVariable("THICK") Long THICK) + { + return success(setupTensionService.selectSetupTensionByTHICK(THICK)); + } + + /** + * 新增全线张力 + */ + @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("/{THICKs}") + public AjaxResult remove(@PathVariable Long[] THICKs) + { + return toAjax(setupTensionService.deleteSetupTensionByTHICKs(THICKs)); + } +} 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..5fdea78 --- /dev/null +++ b/business/src/main/java/com/fizz/business/controller/SetupTlController.java @@ -0,0 +1,98 @@ +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.SetupTl; +import com.fizz.business.service.ISetupTlService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 拉矫机参数Controller + * + * @author Joshi + * @date 2025-09-25 + */ +@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(value = "/{steelGrade}") + public AjaxResult getInfo(@PathVariable("steelGrade") String steelGrade) + { + return success(setupTlService.selectSetupTlBySteelGrade(steelGrade)); + } + + /** + * 新增拉矫机参数 + */ + @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("/{steelGrades}") + public AjaxResult remove(@PathVariable String[] steelGrades) + { + return toAjax(setupTlService.deleteSetupTlBySteelGrades(steelGrades)); + } +} 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..c136d38 --- /dev/null +++ b/business/src/main/java/com/fizz/business/controller/SetupTmBendforceController.java @@ -0,0 +1,98 @@ +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.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-25 + */ +@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(value = "/{WIDTH}") + public AjaxResult getInfo(@PathVariable("WIDTH") Long WIDTH) + { + return success(setupTmBendforceService.selectSetupTmBendforceByWIDTH(WIDTH)); + } + + /** + * 新增光整机弯辊力 + */ + @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("/{WIDTHs}") + public AjaxResult remove(@PathVariable Long[] WIDTHs) + { + return toAjax(setupTmBendforceService.deleteSetupTmBendforceByWIDTHs(WIDTHs)); + } +} 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..20176de --- /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 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.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-25 + */ +@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(value = "/{steelGrade}") + public AjaxResult getInfo(@PathVariable("steelGrade") String steelGrade) + { + return success(setupTmMeshService.selectSetupTmMeshBySteelGrade(steelGrade)); + } + + /** + * 新增光整机插入量 + */ + @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("/{steelGrades}") + public AjaxResult remove(@PathVariable String[] steelGrades) + { + return toAjax(setupTmMeshService.deleteSetupTmMeshBySteelGrades(steelGrades)); + } +} 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..45e34cf --- /dev/null +++ b/business/src/main/java/com/fizz/business/controller/SetupTmRollforceController.java @@ -0,0 +1,98 @@ +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.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-25 + */ +@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(value = "/{steelGrade}") + public AjaxResult getInfo(@PathVariable("steelGrade") String steelGrade) + { + return success(setupTmRollforceService.selectSetupTmRollforceBySteelGrade(steelGrade)); + } + + /** + * 新增光整机轧制力 + */ + @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("/{steelGrades}") + public AjaxResult remove(@PathVariable String[] steelGrades) + { + return toAjax(setupTmRollforceService.deleteSetupTmRollforceBySteelGrades(steelGrades)); + } +} diff --git a/business/src/main/java/com/fizz/business/domain/PdiSetup.java b/business/src/main/java/com/fizz/business/domain/PdiSetup.java new file mode 100644 index 0000000..781bac8 --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/PdiSetup.java @@ -0,0 +1,375 @@ +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; + +/** + * 生产计划的参数详情对象 pdi_setup + * + * @author Joshi + * @date 2025-09-25 + */ +public class PdiSetup extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private Long ID; + + /** 钢卷号 */ + @Excel(name = "钢卷号") + private String COILID; + + /** 计划号 */ + @Excel(name = "计划号") + private String PLANID; + + /** 开卷机张力 */ + @Excel(name = "开卷机张力") + private Long porTension; + + /** 入口活套张力 */ + @Excel(name = "入口活套张力") + private Long celTension; + + /** 清洗段张力 */ + @Excel(name = "清洗段张力") + private Long cleanTension; + + /** 炉区张力 */ + @Excel(name = "炉区张力") + private Long furTension; + + /** 冷却塔张力 */ + @Excel(name = "冷却塔张力") + private Long towerTension; + + /** 光整机不投张力 */ + @Excel(name = "光整机不投张力") + private Long tmNoneTension; + + /** 光整机入口张力 */ + @Excel(name = "光整机入口张力") + private Long tmEntryTension; + + /** 光整机出口张力 */ + @Excel(name = "光整机出口张力") + private Long tmExitTension; + + /** 光整机轧制力 */ + @Excel(name = "光整机轧制力") + private Long tmRollforce; + + /** 光整机弯辊力 */ + @Excel(name = "光整机弯辊力") + private Long tmBendforce; + + /** 光整机防皱辊插入量 */ + @Excel(name = "光整机防皱辊插入量") + private Long tmAcrMesh; + + /** 光整机防颤辊插入量 */ + @Excel(name = "光整机防颤辊插入量") + private Long tmBrMesh; + + /** 拉矫机不投张力 */ + @Excel(name = "拉矫机不投张力") + private Long tlNoneTension; + + /** 拉矫机出口张力 */ + @Excel(name = "拉矫机出口张力") + private Long tlExitTension; + + /** 拉矫机延伸率 */ + @Excel(name = "拉矫机延伸率") + private Long tlElong; + + /** 拉矫机矫直辊插入量1 */ + @Excel(name = "拉矫机矫直辊插入量1") + private Long tlLvlMesh1; + + /** 拉矫机矫直辊插入量2 */ + @Excel(name = "拉矫机矫直辊插入量2") + private Long tlLvlMesh2; + + /** 拉矫机防横弓插入量 */ + @Excel(name = "拉矫机防横弓插入量") + private Long tlAcbMesh; + + /** 后处理张力 */ + @Excel(name = "后处理张力") + private Long coatTension; + + /** 出口活套张力 */ + @Excel(name = "出口活套张力") + private Long cxlTension; + + /** 卷取机张力 */ + @Excel(name = "卷取机张力") + private Long trTension; + + /** 类型，或可用于记录更改次数 */ + @Excel(name = "类型，或可用于记录更改次数") + private Long TYPE; + + public void setID(Long ID) + { + this.ID = ID; + } + + public Long getID() + { + return ID; + } + public void setCOILID(String COILID) + { + this.COILID = COILID; + } + + public String getCOILID() + { + return COILID; + } + public void setPLANID(String PLANID) + { + this.PLANID = PLANID; + } + + public String getPLANID() + { + return PLANID; + } + public void setPorTension(Long porTension) + { + this.porTension = porTension; + } + + public Long getPorTension() + { + return porTension; + } + public void setCelTension(Long celTension) + { + this.celTension = celTension; + } + + public Long getCelTension() + { + return celTension; + } + public void setCleanTension(Long cleanTension) + { + this.cleanTension = cleanTension; + } + + public Long getCleanTension() + { + return cleanTension; + } + public void setFurTension(Long furTension) + { + this.furTension = furTension; + } + + public Long getFurTension() + { + return furTension; + } + public void setTowerTension(Long towerTension) + { + this.towerTension = towerTension; + } + + public Long getTowerTension() + { + return towerTension; + } + public void setTmNoneTension(Long tmNoneTension) + { + this.tmNoneTension = tmNoneTension; + } + + public Long getTmNoneTension() + { + return tmNoneTension; + } + public void setTmEntryTension(Long tmEntryTension) + { + this.tmEntryTension = tmEntryTension; + } + + public Long getTmEntryTension() + { + return tmEntryTension; + } + public void setTmExitTension(Long tmExitTension) + { + this.tmExitTension = tmExitTension; + } + + public Long getTmExitTension() + { + return tmExitTension; + } + public void setTmRollforce(Long tmRollforce) + { + this.tmRollforce = tmRollforce; + } + + public Long getTmRollforce() + { + return tmRollforce; + } + public void setTmBendforce(Long tmBendforce) + { + this.tmBendforce = tmBendforce; + } + + public Long getTmBendforce() + { + return tmBendforce; + } + public void setTmAcrMesh(Long tmAcrMesh) + { + this.tmAcrMesh = tmAcrMesh; + } + + public Long getTmAcrMesh() + { + return tmAcrMesh; + } + public void setTmBrMesh(Long tmBrMesh) + { + this.tmBrMesh = tmBrMesh; + } + + public Long getTmBrMesh() + { + return tmBrMesh; + } + public void setTlNoneTension(Long tlNoneTension) + { + this.tlNoneTension = tlNoneTension; + } + + public Long getTlNoneTension() + { + return tlNoneTension; + } + public void setTlExitTension(Long tlExitTension) + { + this.tlExitTension = tlExitTension; + } + + public Long getTlExitTension() + { + return tlExitTension; + } + public void setTlElong(Long tlElong) + { + this.tlElong = tlElong; + } + + public Long getTlElong() + { + return tlElong; + } + public void setTlLvlMesh1(Long tlLvlMesh1) + { + this.tlLvlMesh1 = tlLvlMesh1; + } + + public Long getTlLvlMesh1() + { + return tlLvlMesh1; + } + public void setTlLvlMesh2(Long tlLvlMesh2) + { + this.tlLvlMesh2 = tlLvlMesh2; + } + + public Long getTlLvlMesh2() + { + return tlLvlMesh2; + } + public void setTlAcbMesh(Long tlAcbMesh) + { + this.tlAcbMesh = tlAcbMesh; + } + + public Long getTlAcbMesh() + { + return tlAcbMesh; + } + public void setCoatTension(Long coatTension) + { + this.coatTension = coatTension; + } + + public Long getCoatTension() + { + return coatTension; + } + public void setCxlTension(Long cxlTension) + { + this.cxlTension = cxlTension; + } + + public Long getCxlTension() + { + return cxlTension; + } + public void setTrTension(Long trTension) + { + this.trTension = trTension; + } + + public Long getTrTension() + { + return trTension; + } + public void setTYPE(Long TYPE) + { + this.TYPE = TYPE; + } + + public Long getTYPE() + { + return TYPE; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("ID", getID()) + .append("COILID", getCOILID()) + .append("PLANID", getPLANID()) + .append("porTension", getPorTension()) + .append("celTension", getCelTension()) + .append("cleanTension", getCleanTension()) + .append("furTension", getFurTension()) + .append("towerTension", getTowerTension()) + .append("tmNoneTension", getTmNoneTension()) + .append("tmEntryTension", getTmEntryTension()) + .append("tmExitTension", getTmExitTension()) + .append("tmRollforce", getTmRollforce()) + .append("tmBendforce", getTmBendforce()) + .append("tmAcrMesh", getTmAcrMesh()) + .append("tmBrMesh", getTmBrMesh()) + .append("tlNoneTension", getTlNoneTension()) + .append("tlExitTension", getTlExitTension()) + .append("tlElong", getTlElong()) + .append("tlLvlMesh1", getTlLvlMesh1()) + .append("tlLvlMesh2", getTlLvlMesh2()) + .append("tlAcbMesh", getTlAcbMesh()) + .append("coatTension", getCoatTension()) + .append("cxlTension", getCxlTension()) + .append("trTension", getTrTension()) + .append("createTime", getCreateTime()) + .append("updateTime", getUpdateTime()) + .append("TYPE", getTYPE()) + .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..d61980a --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/SetupTension.java @@ -0,0 +1,86 @@ +package com.fizz.business.domain; + +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; + +/** + * 全线张力对象 setup_tension + * + * @author Joshi + * @date 2025-09-25 + */ +@Data +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; + +} 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..f24bc30 --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/SetupTl.java @@ -0,0 +1,69 @@ +package com.fizz.business.domain; + +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; + +/** + * 拉矫机参数对象 setup_tl + * + * @author Joshi + * @date 2025-09-25 + */ +@Data +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; + +} 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..20f1ee7 --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/SetupTmBendforce.java @@ -0,0 +1,42 @@ +package com.fizz.business.domain; + +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; + +/** + * 光整机弯辊力对象 setup_tm_bendforce + * + * @author Joshi + * @date 2025-09-25 + */ +@Data +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; + +} 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..f8289ec --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/SetupTmMesh.java @@ -0,0 +1,69 @@ +package com.fizz.business.domain; + +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; + +/** + * 光整机插入量对象 setup_tm_mesh + * + * @author Joshi + * @date 2025-09-25 + */ +@Data +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; + +} 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..a2887c6 --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/SetupTmRollforce.java @@ -0,0 +1,72 @@ +package com.fizz.business.domain; + +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; + +/** + * 光整机轧制力对象 setup_tm_rollforce + * + * @author Joshi + * @date 2025-09-25 + */ +@Data +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; + +} 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..b297717 --- /dev/null +++ b/business/src/main/java/com/fizz/business/mapper/PdiSetupMapper.java @@ -0,0 +1,61 @@ +package com.fizz.business.mapper; + +import java.util.List; +import com.fizz.business.domain.PdiSetup; + +/** + * 生产计划的参数详情Mapper接口 + * + * @author Joshi + * @date 2025-09-25 + */ +public interface PdiSetupMapper +{ + /** + * 查询生产计划的参数详情 + * + * @param ID 生产计划的参数详情主键 + * @return 生产计划的参数详情 + */ + public PdiSetup selectPdiSetupByID(Long ID); + + /** + * 查询生产计划的参数详情列表 + * + * @param pdiSetup 生产计划的参数详情 + * @return 生产计划的参数详情集合 + */ + public List selectPdiSetupList(PdiSetup pdiSetup); + + /** + * 新增生产计划的参数详情 + * + * @param pdiSetup 生产计划的参数详情 + * @return 结果 + */ + public int insertPdiSetup(PdiSetup pdiSetup); + + /** + * 修改生产计划的参数详情 + * + * @param pdiSetup 生产计划的参数详情 + * @return 结果 + */ + public int updatePdiSetup(PdiSetup 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/SetupTensionMapper.java b/business/src/main/java/com/fizz/business/mapper/SetupTensionMapper.java new file mode 100644 index 0000000..f9d2853 --- /dev/null +++ b/business/src/main/java/com/fizz/business/mapper/SetupTensionMapper.java @@ -0,0 +1,61 @@ +package com.fizz.business.mapper; + +import java.util.List; +import com.fizz.business.domain.SetupTension; + +/** + * 全线张力Mapper接口 + * + * @author Joshi + * @date 2025-09-25 + */ +public interface SetupTensionMapper +{ + /** + * 查询全线张力 + * + * @param THICK 全线张力主键 + * @return 全线张力 + */ + public SetupTension selectSetupTensionByTHICK(Long THICK); + + /** + * 查询全线张力列表 + * + * @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(Long[] THICKs); +} 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..c0a5e03 --- /dev/null +++ b/business/src/main/java/com/fizz/business/mapper/SetupTlMapper.java @@ -0,0 +1,61 @@ +package com.fizz.business.mapper; + +import java.util.List; +import com.fizz.business.domain.SetupTl; + +/** + * 拉矫机参数Mapper接口 + * + * @author Joshi + * @date 2025-09-25 + */ +public interface SetupTlMapper +{ + /** + * 查询拉矫机参数 + * + * @param steelGrade 拉矫机参数主键 + * @return 拉矫机参数 + */ + public SetupTl selectSetupTlBySteelGrade(String steelGrade); + + /** + * 查询拉矫机参数列表 + * + * @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(String[] steelGrades); +} 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..785d762 --- /dev/null +++ b/business/src/main/java/com/fizz/business/mapper/SetupTmBendforceMapper.java @@ -0,0 +1,61 @@ +package com.fizz.business.mapper; + +import java.util.List; +import com.fizz.business.domain.SetupTmBendforce; + +/** + * 光整机弯辊力Mapper接口 + * + * @author Joshi + * @date 2025-09-25 + */ +public interface SetupTmBendforceMapper +{ + /** + * 查询光整机弯辊力 + * + * @param WIDTH 光整机弯辊力主键 + * @return 光整机弯辊力 + */ + public SetupTmBendforce selectSetupTmBendforceByWIDTH(Long WIDTH); + + /** + * 查询光整机弯辊力列表 + * + * @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(Long[] WIDTHs); +} 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..7f85d35 --- /dev/null +++ b/business/src/main/java/com/fizz/business/mapper/SetupTmMeshMapper.java @@ -0,0 +1,61 @@ +package com.fizz.business.mapper; + +import java.util.List; +import com.fizz.business.domain.SetupTmMesh; + +/** + * 光整机插入量Mapper接口 + * + * @author Joshi + * @date 2025-09-25 + */ +public interface SetupTmMeshMapper +{ + /** + * 查询光整机插入量 + * + * @param steelGrade 光整机插入量主键 + * @return 光整机插入量 + */ + public SetupTmMesh selectSetupTmMeshBySteelGrade(String steelGrade); + + /** + * 查询光整机插入量列表 + * + * @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(String[] steelGrades); +} 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..d59fc64 --- /dev/null +++ b/business/src/main/java/com/fizz/business/mapper/SetupTmRollforceMapper.java @@ -0,0 +1,61 @@ +package com.fizz.business.mapper; + +import java.util.List; +import com.fizz.business.domain.SetupTmRollforce; + +/** + * 光整机轧制力Mapper接口 + * + * @author Joshi + * @date 2025-09-25 + */ +public interface SetupTmRollforceMapper +{ + /** + * 查询光整机轧制力 + * + * @param steelGrade 光整机轧制力主键 + * @return 光整机轧制力 + */ + public SetupTmRollforce selectSetupTmRollforceBySteelGrade(String steelGrade); + + /** + * 查询光整机轧制力列表 + * + * @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(String[] steelGrades); +} 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..9994ffc --- /dev/null +++ b/business/src/main/java/com/fizz/business/service/IPdiSetupService.java @@ -0,0 +1,61 @@ +package com.fizz.business.service; + +import java.util.List; +import com.fizz.business.domain.PdiSetup; + +/** + * 生产计划的参数详情Service接口 + * + * @author Joshi + * @date 2025-09-25 + */ +public interface IPdiSetupService +{ + /** + * 查询生产计划的参数详情 + * + * @param ID 生产计划的参数详情主键 + * @return 生产计划的参数详情 + */ + public PdiSetup selectPdiSetupByID(Long ID); + + /** + * 查询生产计划的参数详情列表 + * + * @param pdiSetup 生产计划的参数详情 + * @return 生产计划的参数详情集合 + */ + public List selectPdiSetupList(PdiSetup pdiSetup); + + /** + * 新增生产计划的参数详情 + * + * @param pdiSetup 生产计划的参数详情 + * @return 结果 + */ + public int insertPdiSetup(PdiSetup pdiSetup); + + /** + * 修改生产计划的参数详情 + * + * @param pdiSetup 生产计划的参数详情 + * @return 结果 + */ + public int updatePdiSetup(PdiSetup pdiSetup); + + /** + * 批量删除生产计划的参数详情 + * + * @param IDs 需要删除的生产计划的参数详情主键集合 + * @return 结果 + */ + public int deletePdiSetupByIDs(Long[] IDs); + + /** + * 删除生产计划的参数详情信息 + * + * @param ID 生产计划的参数详情主键 + * @return 结果 + */ + public int deletePdiSetupByID(Long ID); +} 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..1a26344 --- /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 Joshi + * @date 2025-09-25 + */ +public interface ISetupTensionService +{ + /** + * 查询全线张力 + * + * @param THICK 全线张力主键 + * @return 全线张力 + */ + public SetupTension selectSetupTensionByTHICK(Long THICK); + + /** + * 查询全线张力列表 + * + * @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); + + /** + * 删除全线张力信息 + * + * @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..34b919d --- /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 Joshi + * @date 2025-09-25 + */ +public interface ISetupTlService +{ + /** + * 查询拉矫机参数 + * + * @param steelGrade 拉矫机参数主键 + * @return 拉矫机参数 + */ + public SetupTl selectSetupTlBySteelGrade(String steelGrade); + + /** + * 查询拉矫机参数列表 + * + * @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); + + /** + * 删除拉矫机参数信息 + * + * @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..6d5021c --- /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-25 + */ +public interface ISetupTmBendforceService +{ + /** + * 查询光整机弯辊力 + * + * @param WIDTH 光整机弯辊力主键 + * @return 光整机弯辊力 + */ + public SetupTmBendforce selectSetupTmBendforceByWIDTH(Long WIDTH); + + /** + * 查询光整机弯辊力列表 + * + * @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); + + /** + * 删除光整机弯辊力信息 + * + * @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..e2c8ce7 --- /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-25 + */ +public interface ISetupTmMeshService +{ + /** + * 查询光整机插入量 + * + * @param steelGrade 光整机插入量主键 + * @return 光整机插入量 + */ + public SetupTmMesh selectSetupTmMeshBySteelGrade(String steelGrade); + + /** + * 查询光整机插入量列表 + * + * @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); + + /** + * 删除光整机插入量信息 + * + * @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..4f90fc6 --- /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-25 + */ +public interface ISetupTmRollforceService +{ + /** + * 查询光整机轧制力 + * + * @param steelGrade 光整机轧制力主键 + * @return 光整机轧制力 + */ + public SetupTmRollforce selectSetupTmRollforceBySteelGrade(String steelGrade); + + /** + * 查询光整机轧制力列表 + * + * @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); + + /** + * 删除光整机轧制力信息 + * + * @param steelGrade 光整机轧制力主键 + * @return 结果 + */ + public int deleteSetupTmRollforceBySteelGrade(String steelGrade); +} diff --git a/business/src/main/java/com/fizz/business/service/impl/PdiSetupServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/PdiSetupServiceImpl.java new file mode 100644 index 0000000..69dee68 --- /dev/null +++ b/business/src/main/java/com/fizz/business/service/impl/PdiSetupServiceImpl.java @@ -0,0 +1,96 @@ +package com.fizz.business.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.fizz.business.mapper.PdiSetupMapper; +import com.fizz.business.domain.PdiSetup; +import com.fizz.business.service.IPdiSetupService; + +/** + * 生产计划的参数详情Service业务层处理 + * + * @author Joshi + * @date 2025-09-25 + */ +@Service +public class PdiSetupServiceImpl implements IPdiSetupService +{ + @Autowired + private PdiSetupMapper pdiSetupMapper; + + /** + * 查询生产计划的参数详情 + * + * @param ID 生产计划的参数详情主键 + * @return 生产计划的参数详情 + */ + @Override + public PdiSetup selectPdiSetupByID(Long ID) + { + return pdiSetupMapper.selectPdiSetupByID(ID); + } + + /** + * 查询生产计划的参数详情列表 + * + * @param pdiSetup 生产计划的参数详情 + * @return 生产计划的参数详情 + */ + @Override + public List selectPdiSetupList(PdiSetup pdiSetup) + { + return pdiSetupMapper.selectPdiSetupList(pdiSetup); + } + + /** + * 新增生产计划的参数详情 + * + * @param pdiSetup 生产计划的参数详情 + * @return 结果 + */ + @Override + public int insertPdiSetup(PdiSetup pdiSetup) + { + pdiSetup.setCreateTime(DateUtils.getNowDate()); + return pdiSetupMapper.insertPdiSetup(pdiSetup); + } + + /** + * 修改生产计划的参数详情 + * + * @param pdiSetup 生产计划的参数详情 + * @return 结果 + */ + @Override + public int updatePdiSetup(PdiSetup pdiSetup) + { + pdiSetup.setUpdateTime(DateUtils.getNowDate()); + return pdiSetupMapper.updatePdiSetup(pdiSetup); + } + + /** + * 批量删除生产计划的参数详情 + * + * @param IDs 需要删除的生产计划的参数详情主键 + * @return 结果 + */ + @Override + public int deletePdiSetupByIDs(Long[] IDs) + { + return pdiSetupMapper.deletePdiSetupByIDs(IDs); + } + + /** + * 删除生产计划的参数详情信息 + * + * @param ID 生产计划的参数详情主键 + * @return 结果 + */ + @Override + public int deletePdiSetupByID(Long ID) + { + return pdiSetupMapper.deletePdiSetupByID(ID); + } +} diff --git a/business/src/main/java/com/fizz/business/service/impl/SetupTensionServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/SetupTensionServiceImpl.java new file mode 100644 index 0000000..bead09c --- /dev/null +++ b/business/src/main/java/com/fizz/business/service/impl/SetupTensionServiceImpl.java @@ -0,0 +1,96 @@ +package com.fizz.business.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.fizz.business.mapper.SetupTensionMapper; +import com.fizz.business.domain.SetupTension; +import com.fizz.business.service.ISetupTensionService; + +/** + * 全线张力Service业务层处理 + * + * @author Joshi + * @date 2025-09-25 + */ +@Service +public class SetupTensionServiceImpl implements ISetupTensionService +{ + @Autowired + private SetupTensionMapper setupTensionMapper; + + /** + * 查询全线张力 + * + * @param THICK 全线张力主键 + * @return 全线张力 + */ + @Override + public SetupTension selectSetupTensionByTHICK(Long THICK) + { + return setupTensionMapper.selectSetupTensionByTHICK(THICK); + } + + /** + * 查询全线张力列表 + * + * @param setupTension 全线张力 + * @return 全线张力 + */ + @Override + public List selectSetupTensionList(SetupTension setupTension) + { + return setupTensionMapper.selectSetupTensionList(setupTension); + } + + /** + * 新增全线张力 + * + * @param setupTension 全线张力 + * @return 结果 + */ + @Override + public int insertSetupTension(SetupTension setupTension) + { + setupTension.setCreateTime(DateUtils.getNowDate()); + return setupTensionMapper.insertSetupTension(setupTension); + } + + /** + * 修改全线张力 + * + * @param setupTension 全线张力 + * @return 结果 + */ + @Override + public int updateSetupTension(SetupTension setupTension) + { + setupTension.setUpdateTime(DateUtils.getNowDate()); + return setupTensionMapper.updateSetupTension(setupTension); + } + + /** + * 批量删除全线张力 + * + * @param THICKs 需要删除的全线张力主键 + * @return 结果 + */ + @Override + public int deleteSetupTensionByTHICKs(Long[] THICKs) + { + return setupTensionMapper.deleteSetupTensionByTHICKs(THICKs); + } + + /** + * 删除全线张力信息 + * + * @param THICK 全线张力主键 + * @return 结果 + */ + @Override + public int deleteSetupTensionByTHICK(Long THICK) + { + return setupTensionMapper.deleteSetupTensionByTHICK(THICK); + } +} diff --git a/business/src/main/java/com/fizz/business/service/impl/SetupTlServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/SetupTlServiceImpl.java new file mode 100644 index 0000000..0dcca64 --- /dev/null +++ b/business/src/main/java/com/fizz/business/service/impl/SetupTlServiceImpl.java @@ -0,0 +1,96 @@ +package com.fizz.business.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.fizz.business.mapper.SetupTlMapper; +import com.fizz.business.domain.SetupTl; +import com.fizz.business.service.ISetupTlService; + +/** + * 拉矫机参数Service业务层处理 + * + * @author Joshi + * @date 2025-09-25 + */ +@Service +public class SetupTlServiceImpl implements ISetupTlService +{ + @Autowired + private SetupTlMapper setupTlMapper; + + /** + * 查询拉矫机参数 + * + * @param steelGrade 拉矫机参数主键 + * @return 拉矫机参数 + */ + @Override + public SetupTl selectSetupTlBySteelGrade(String steelGrade) + { + return setupTlMapper.selectSetupTlBySteelGrade(steelGrade); + } + + /** + * 查询拉矫机参数列表 + * + * @param setupTl 拉矫机参数 + * @return 拉矫机参数 + */ + @Override + public List selectSetupTlList(SetupTl setupTl) + { + return setupTlMapper.selectSetupTlList(setupTl); + } + + /** + * 新增拉矫机参数 + * + * @param setupTl 拉矫机参数 + * @return 结果 + */ + @Override + public int insertSetupTl(SetupTl setupTl) + { + setupTl.setCreateTime(DateUtils.getNowDate()); + return setupTlMapper.insertSetupTl(setupTl); + } + + /** + * 修改拉矫机参数 + * + * @param setupTl 拉矫机参数 + * @return 结果 + */ + @Override + public int updateSetupTl(SetupTl setupTl) + { + setupTl.setUpdateTime(DateUtils.getNowDate()); + return setupTlMapper.updateSetupTl(setupTl); + } + + /** + * 批量删除拉矫机参数 + * + * @param steelGrades 需要删除的拉矫机参数主键 + * @return 结果 + */ + @Override + public int deleteSetupTlBySteelGrades(String[] steelGrades) + { + return setupTlMapper.deleteSetupTlBySteelGrades(steelGrades); + } + + /** + * 删除拉矫机参数信息 + * + * @param steelGrade 拉矫机参数主键 + * @return 结果 + */ + @Override + public int deleteSetupTlBySteelGrade(String steelGrade) + { + return setupTlMapper.deleteSetupTlBySteelGrade(steelGrade); + } +} diff --git a/business/src/main/java/com/fizz/business/service/impl/SetupTmBendforceServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/SetupTmBendforceServiceImpl.java new file mode 100644 index 0000000..bb0a883 --- /dev/null +++ b/business/src/main/java/com/fizz/business/service/impl/SetupTmBendforceServiceImpl.java @@ -0,0 +1,96 @@ +package com.fizz.business.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.fizz.business.mapper.SetupTmBendforceMapper; +import com.fizz.business.domain.SetupTmBendforce; +import com.fizz.business.service.ISetupTmBendforceService; + +/** + * 光整机弯辊力Service业务层处理 + * + * @author Joshi + * @date 2025-09-25 + */ +@Service +public class SetupTmBendforceServiceImpl implements ISetupTmBendforceService +{ + @Autowired + private SetupTmBendforceMapper setupTmBendforceMapper; + + /** + * 查询光整机弯辊力 + * + * @param WIDTH 光整机弯辊力主键 + * @return 光整机弯辊力 + */ + @Override + public SetupTmBendforce selectSetupTmBendforceByWIDTH(Long WIDTH) + { + return setupTmBendforceMapper.selectSetupTmBendforceByWIDTH(WIDTH); + } + + /** + * 查询光整机弯辊力列表 + * + * @param setupTmBendforce 光整机弯辊力 + * @return 光整机弯辊力 + */ + @Override + public List selectSetupTmBendforceList(SetupTmBendforce setupTmBendforce) + { + return setupTmBendforceMapper.selectSetupTmBendforceList(setupTmBendforce); + } + + /** + * 新增光整机弯辊力 + * + * @param setupTmBendforce 光整机弯辊力 + * @return 结果 + */ + @Override + public int insertSetupTmBendforce(SetupTmBendforce setupTmBendforce) + { + setupTmBendforce.setCreateTime(DateUtils.getNowDate()); + return setupTmBendforceMapper.insertSetupTmBendforce(setupTmBendforce); + } + + /** + * 修改光整机弯辊力 + * + * @param setupTmBendforce 光整机弯辊力 + * @return 结果 + */ + @Override + public int updateSetupTmBendforce(SetupTmBendforce setupTmBendforce) + { + setupTmBendforce.setUpdateTime(DateUtils.getNowDate()); + return setupTmBendforceMapper.updateSetupTmBendforce(setupTmBendforce); + } + + /** + * 批量删除光整机弯辊力 + * + * @param WIDTHs 需要删除的光整机弯辊力主键 + * @return 结果 + */ + @Override + public int deleteSetupTmBendforceByWIDTHs(Long[] WIDTHs) + { + return setupTmBendforceMapper.deleteSetupTmBendforceByWIDTHs(WIDTHs); + } + + /** + * 删除光整机弯辊力信息 + * + * @param WIDTH 光整机弯辊力主键 + * @return 结果 + */ + @Override + public int deleteSetupTmBendforceByWIDTH(Long WIDTH) + { + return setupTmBendforceMapper.deleteSetupTmBendforceByWIDTH(WIDTH); + } +} diff --git a/business/src/main/java/com/fizz/business/service/impl/SetupTmMeshServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/SetupTmMeshServiceImpl.java new file mode 100644 index 0000000..63bb3a2 --- /dev/null +++ b/business/src/main/java/com/fizz/business/service/impl/SetupTmMeshServiceImpl.java @@ -0,0 +1,96 @@ +package com.fizz.business.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.fizz.business.mapper.SetupTmMeshMapper; +import com.fizz.business.domain.SetupTmMesh; +import com.fizz.business.service.ISetupTmMeshService; + +/** + * 光整机插入量Service业务层处理 + * + * @author Joshi + * @date 2025-09-25 + */ +@Service +public class SetupTmMeshServiceImpl implements ISetupTmMeshService +{ + @Autowired + private SetupTmMeshMapper setupTmMeshMapper; + + /** + * 查询光整机插入量 + * + * @param steelGrade 光整机插入量主键 + * @return 光整机插入量 + */ + @Override + public SetupTmMesh selectSetupTmMeshBySteelGrade(String steelGrade) + { + return setupTmMeshMapper.selectSetupTmMeshBySteelGrade(steelGrade); + } + + /** + * 查询光整机插入量列表 + * + * @param setupTmMesh 光整机插入量 + * @return 光整机插入量 + */ + @Override + public List selectSetupTmMeshList(SetupTmMesh setupTmMesh) + { + return setupTmMeshMapper.selectSetupTmMeshList(setupTmMesh); + } + + /** + * 新增光整机插入量 + * + * @param setupTmMesh 光整机插入量 + * @return 结果 + */ + @Override + public int insertSetupTmMesh(SetupTmMesh setupTmMesh) + { + setupTmMesh.setCreateTime(DateUtils.getNowDate()); + return setupTmMeshMapper.insertSetupTmMesh(setupTmMesh); + } + + /** + * 修改光整机插入量 + * + * @param setupTmMesh 光整机插入量 + * @return 结果 + */ + @Override + public int updateSetupTmMesh(SetupTmMesh setupTmMesh) + { + setupTmMesh.setUpdateTime(DateUtils.getNowDate()); + return setupTmMeshMapper.updateSetupTmMesh(setupTmMesh); + } + + /** + * 批量删除光整机插入量 + * + * @param steelGrades 需要删除的光整机插入量主键 + * @return 结果 + */ + @Override + public int deleteSetupTmMeshBySteelGrades(String[] steelGrades) + { + return setupTmMeshMapper.deleteSetupTmMeshBySteelGrades(steelGrades); + } + + /** + * 删除光整机插入量信息 + * + * @param steelGrade 光整机插入量主键 + * @return 结果 + */ + @Override + public int deleteSetupTmMeshBySteelGrade(String steelGrade) + { + return setupTmMeshMapper.deleteSetupTmMeshBySteelGrade(steelGrade); + } +} diff --git a/business/src/main/java/com/fizz/business/service/impl/SetupTmRollforceServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/SetupTmRollforceServiceImpl.java new file mode 100644 index 0000000..09a0381 --- /dev/null +++ b/business/src/main/java/com/fizz/business/service/impl/SetupTmRollforceServiceImpl.java @@ -0,0 +1,96 @@ +package com.fizz.business.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.fizz.business.mapper.SetupTmRollforceMapper; +import com.fizz.business.domain.SetupTmRollforce; +import com.fizz.business.service.ISetupTmRollforceService; + +/** + * 光整机轧制力Service业务层处理 + * + * @author Joshi + * @date 2025-09-25 + */ +@Service +public class SetupTmRollforceServiceImpl implements ISetupTmRollforceService +{ + @Autowired + private SetupTmRollforceMapper setupTmRollforceMapper; + + /** + * 查询光整机轧制力 + * + * @param steelGrade 光整机轧制力主键 + * @return 光整机轧制力 + */ + @Override + public SetupTmRollforce selectSetupTmRollforceBySteelGrade(String steelGrade) + { + return setupTmRollforceMapper.selectSetupTmRollforceBySteelGrade(steelGrade); + } + + /** + * 查询光整机轧制力列表 + * + * @param setupTmRollforce 光整机轧制力 + * @return 光整机轧制力 + */ + @Override + public List selectSetupTmRollforceList(SetupTmRollforce setupTmRollforce) + { + return setupTmRollforceMapper.selectSetupTmRollforceList(setupTmRollforce); + } + + /** + * 新增光整机轧制力 + * + * @param setupTmRollforce 光整机轧制力 + * @return 结果 + */ + @Override + public int insertSetupTmRollforce(SetupTmRollforce setupTmRollforce) + { + setupTmRollforce.setCreateTime(DateUtils.getNowDate()); + return setupTmRollforceMapper.insertSetupTmRollforce(setupTmRollforce); + } + + /** + * 修改光整机轧制力 + * + * @param setupTmRollforce 光整机轧制力 + * @return 结果 + */ + @Override + public int updateSetupTmRollforce(SetupTmRollforce setupTmRollforce) + { + setupTmRollforce.setUpdateTime(DateUtils.getNowDate()); + return setupTmRollforceMapper.updateSetupTmRollforce(setupTmRollforce); + } + + /** + * 批量删除光整机轧制力 + * + * @param steelGrades 需要删除的光整机轧制力主键 + * @return 结果 + */ + @Override + public int deleteSetupTmRollforceBySteelGrades(String[] steelGrades) + { + return setupTmRollforceMapper.deleteSetupTmRollforceBySteelGrades(steelGrades); + } + + /** + * 删除光整机轧制力信息 + * + * @param steelGrade 光整机轧制力主键 + * @return 结果 + */ + @Override + public int deleteSetupTmRollforceBySteelGrade(String steelGrade) + { + return setupTmRollforceMapper.deleteSetupTmRollforceBySteelGrade(steelGrade); + } +} diff --git a/business/src/main/resources/mapper/PdiSetupMapper.xml b/business/src/main/resources/mapper/PdiSetupMapper.xml new file mode 100644 index 0000000..342ea5c --- /dev/null +++ b/business/src/main/resources/mapper/PdiSetupMapper.xml @@ -0,0 +1,181 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select ID, COILID, PLANID, POR_TENSION, CEL_TENSION, CLEAN_TENSION, FUR_TENSION, TOWER_TENSION, TM_NONE_TENSION, TM_ENTRY_TENSION, TM_EXIT_TENSION, TM_ROLLFORCE, TM_BENDFORCE, TM_ACR_MESH, TM_BR_MESH, TL_NONE_TENSION, TL_EXIT_TENSION, TL_ELONG, TL_LVL_MESH1, TL_LVL_MESH2, TL_ACB_MESH, COAT_TENSION, CXL_TENSION, TR_TENSION, CREATE_TIME, UPDATE_TIME, TYPE from pdi_setup + + + + + + + + insert into pdi_setup + + COILID, + PLANID, + POR_TENSION, + CEL_TENSION, + CLEAN_TENSION, + FUR_TENSION, + TOWER_TENSION, + TM_NONE_TENSION, + TM_ENTRY_TENSION, + TM_EXIT_TENSION, + TM_ROLLFORCE, + TM_BENDFORCE, + TM_ACR_MESH, + TM_BR_MESH, + TL_NONE_TENSION, + TL_EXIT_TENSION, + TL_ELONG, + TL_LVL_MESH1, + TL_LVL_MESH2, + TL_ACB_MESH, + COAT_TENSION, + CXL_TENSION, + TR_TENSION, + CREATE_TIME, + UPDATE_TIME, + TYPE, + + + #{COILID}, + #{PLANID}, + #{porTension}, + #{celTension}, + #{cleanTension}, + #{furTension}, + #{towerTension}, + #{tmNoneTension}, + #{tmEntryTension}, + #{tmExitTension}, + #{tmRollforce}, + #{tmBendforce}, + #{tmAcrMesh}, + #{tmBrMesh}, + #{tlNoneTension}, + #{tlExitTension}, + #{tlElong}, + #{tlLvlMesh1}, + #{tlLvlMesh2}, + #{tlAcbMesh}, + #{coatTension}, + #{cxlTension}, + #{trTension}, + #{createTime}, + #{updateTime}, + #{TYPE}, + + + + + update pdi_setup + + COILID = #{COILID}, + PLANID = #{PLANID}, + POR_TENSION = #{porTension}, + CEL_TENSION = #{celTension}, + CLEAN_TENSION = #{cleanTension}, + FUR_TENSION = #{furTension}, + TOWER_TENSION = #{towerTension}, + TM_NONE_TENSION = #{tmNoneTension}, + TM_ENTRY_TENSION = #{tmEntryTension}, + TM_EXIT_TENSION = #{tmExitTension}, + TM_ROLLFORCE = #{tmRollforce}, + TM_BENDFORCE = #{tmBendforce}, + TM_ACR_MESH = #{tmAcrMesh}, + TM_BR_MESH = #{tmBrMesh}, + TL_NONE_TENSION = #{tlNoneTension}, + TL_EXIT_TENSION = #{tlExitTension}, + TL_ELONG = #{tlElong}, + TL_LVL_MESH1 = #{tlLvlMesh1}, + TL_LVL_MESH2 = #{tlLvlMesh2}, + TL_ACB_MESH = #{tlAcbMesh}, + COAT_TENSION = #{coatTension}, + CXL_TENSION = #{cxlTension}, + TR_TENSION = #{trTension}, + CREATE_TIME = #{createTime}, + UPDATE_TIME = #{updateTime}, + TYPE = #{TYPE}, + + where ID = #{ID} + + + + delete from pdi_setup where ID = #{ID} + + + + delete from pdi_setup where ID in + + #{ID} + + + \ No newline at end of file diff --git a/business/src/main/resources/mapper/SetupTensionMapper.xml b/business/src/main/resources/mapper/SetupTensionMapper.xml new file mode 100644 index 0000000..39f2067 --- /dev/null +++ b/business/src/main/resources/mapper/SetupTensionMapper.xml @@ -0,0 +1,142 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + select THICK, YIELD_STREN, VALUE1, VALUE2, VALUE3, VALUE4, VALUE5, VALUE6, VALUE7, VALUE8, VALUE9, VALUE10, VALUE11, VALUE12, VALUE13, VALUE14, VALUE15, CREATE_TIME, UPDATE_TIME from setup_tension + + + + + + + + insert into setup_tension + + THICK, + YIELD_STREN, + VALUE1, + VALUE2, + VALUE3, + VALUE4, + VALUE5, + VALUE6, + VALUE7, + VALUE8, + VALUE9, + VALUE10, + VALUE11, + VALUE12, + VALUE13, + VALUE14, + VALUE15, + CREATE_TIME, + UPDATE_TIME, + + + #{THICK}, + #{yieldStren}, + #{VALUE1}, + #{VALUE2}, + #{VALUE3}, + #{VALUE4}, + #{VALUE5}, + #{VALUE6}, + #{VALUE7}, + #{VALUE8}, + #{VALUE9}, + #{VALUE10}, + #{VALUE11}, + #{VALUE12}, + #{VALUE13}, + #{VALUE14}, + #{VALUE15}, + #{createTime}, + #{updateTime}, + + + + + update setup_tension + + YIELD_STREN = #{yieldStren}, + VALUE1 = #{VALUE1}, + VALUE2 = #{VALUE2}, + VALUE3 = #{VALUE3}, + VALUE4 = #{VALUE4}, + VALUE5 = #{VALUE5}, + VALUE6 = #{VALUE6}, + VALUE7 = #{VALUE7}, + VALUE8 = #{VALUE8}, + VALUE9 = #{VALUE9}, + VALUE10 = #{VALUE10}, + VALUE11 = #{VALUE11}, + VALUE12 = #{VALUE12}, + VALUE13 = #{VALUE13}, + VALUE14 = #{VALUE14}, + VALUE15 = #{VALUE15}, + CREATE_TIME = #{createTime}, + UPDATE_TIME = #{updateTime}, + + where THICK = #{THICK} + + + + delete from setup_tension where THICK = #{THICK} + + + + delete from setup_tension where THICK in + + #{THICK} + + + \ No newline at end of file diff --git a/business/src/main/resources/mapper/SetupTlMapper.xml b/business/src/main/resources/mapper/SetupTlMapper.xml new file mode 100644 index 0000000..b8a24b6 --- /dev/null +++ b/business/src/main/resources/mapper/SetupTlMapper.xml @@ -0,0 +1,121 @@ + + + + + + + + + + + + + + + + + + + + + + + + select STEEL_GRADE, YIELD_STREN, THICK, VALUE1, VALUE2, VALUE3, VALUE4, VALUE5, VALUE6, VALUE7, VALUE8, VALUE9, VALUE10, UPDATE_TIME, CREATE_TIME from setup_tl + + + + + + + + insert into setup_tl + + STEEL_GRADE, + YIELD_STREN, + THICK, + VALUE1, + VALUE2, + VALUE3, + VALUE4, + VALUE5, + VALUE6, + VALUE7, + VALUE8, + VALUE9, + VALUE10, + UPDATE_TIME, + CREATE_TIME, + + + #{steelGrade}, + #{yieldStren}, + #{THICK}, + #{VALUE1}, + #{VALUE2}, + #{VALUE3}, + #{VALUE4}, + #{VALUE5}, + #{VALUE6}, + #{VALUE7}, + #{VALUE8}, + #{VALUE9}, + #{VALUE10}, + #{updateTime}, + #{createTime}, + + + + + update setup_tl + + YIELD_STREN = #{yieldStren}, + THICK = #{THICK}, + VALUE1 = #{VALUE1}, + VALUE2 = #{VALUE2}, + VALUE3 = #{VALUE3}, + VALUE4 = #{VALUE4}, + VALUE5 = #{VALUE5}, + VALUE6 = #{VALUE6}, + VALUE7 = #{VALUE7}, + VALUE8 = #{VALUE8}, + VALUE9 = #{VALUE9}, + VALUE10 = #{VALUE10}, + UPDATE_TIME = #{updateTime}, + CREATE_TIME = #{createTime}, + + where STEEL_GRADE = #{steelGrade} + + + + delete from setup_tl where STEEL_GRADE = #{steelGrade} + + + + delete from setup_tl where STEEL_GRADE in + + #{steelGrade} + + + \ No newline at end of file diff --git a/business/src/main/resources/mapper/SetupTmBendforceMapper.xml b/business/src/main/resources/mapper/SetupTmBendforceMapper.xml new file mode 100644 index 0000000..ac9a66a --- /dev/null +++ b/business/src/main/resources/mapper/SetupTmBendforceMapper.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + select WIDTH, ROLL_FORCE, VALUE1, VALUE2, VALUE3, VALUE4, UPDATE_TIME, CREATE_TIME from setup_tm_bendforce + + + + + + + + insert into setup_tm_bendforce + + WIDTH, + ROLL_FORCE, + VALUE1, + VALUE2, + VALUE3, + VALUE4, + UPDATE_TIME, + CREATE_TIME, + + + #{WIDTH}, + #{rollForce}, + #{VALUE1}, + #{VALUE2}, + #{VALUE3}, + #{VALUE4}, + #{updateTime}, + #{createTime}, + + + + + update setup_tm_bendforce + + ROLL_FORCE = #{rollForce}, + VALUE1 = #{VALUE1}, + VALUE2 = #{VALUE2}, + VALUE3 = #{VALUE3}, + VALUE4 = #{VALUE4}, + UPDATE_TIME = #{updateTime}, + CREATE_TIME = #{createTime}, + + where WIDTH = #{WIDTH} + + + + delete from setup_tm_bendforce where WIDTH = #{WIDTH} + + + + delete from setup_tm_bendforce where WIDTH in + + #{WIDTH} + + + \ No newline at end of file diff --git a/business/src/main/resources/mapper/SetupTmMeshMapper.xml b/business/src/main/resources/mapper/SetupTmMeshMapper.xml new file mode 100644 index 0000000..eb779a3 --- /dev/null +++ b/business/src/main/resources/mapper/SetupTmMeshMapper.xml @@ -0,0 +1,121 @@ + + + + + + + + + + + + + + + + + + + + + + + + select STEEL_GRADE, YIELD_STREN, THICK, VALUE1, VALUE2, VALUE3, VALUE4, VALUE5, VALUE6, VALUE7, VALUE8, VALUE9, VALUE10, UPDATE_TIME, CREATE_TIME from setup_tm_mesh + + + + + + + + insert into setup_tm_mesh + + STEEL_GRADE, + YIELD_STREN, + THICK, + VALUE1, + VALUE2, + VALUE3, + VALUE4, + VALUE5, + VALUE6, + VALUE7, + VALUE8, + VALUE9, + VALUE10, + UPDATE_TIME, + CREATE_TIME, + + + #{steelGrade}, + #{yieldStren}, + #{THICK}, + #{VALUE1}, + #{VALUE2}, + #{VALUE3}, + #{VALUE4}, + #{VALUE5}, + #{VALUE6}, + #{VALUE7}, + #{VALUE8}, + #{VALUE9}, + #{VALUE10}, + #{updateTime}, + #{createTime}, + + + + + update setup_tm_mesh + + YIELD_STREN = #{yieldStren}, + THICK = #{THICK}, + VALUE1 = #{VALUE1}, + VALUE2 = #{VALUE2}, + VALUE3 = #{VALUE3}, + VALUE4 = #{VALUE4}, + VALUE5 = #{VALUE5}, + VALUE6 = #{VALUE6}, + VALUE7 = #{VALUE7}, + VALUE8 = #{VALUE8}, + VALUE9 = #{VALUE9}, + VALUE10 = #{VALUE10}, + UPDATE_TIME = #{updateTime}, + CREATE_TIME = #{createTime}, + + where STEEL_GRADE = #{steelGrade} + + + + delete from setup_tm_mesh where STEEL_GRADE = #{steelGrade} + + + + delete from setup_tm_mesh where STEEL_GRADE in + + #{steelGrade} + + + \ No newline at end of file diff --git a/business/src/main/resources/mapper/SetupTmRollforceMapper.xml b/business/src/main/resources/mapper/SetupTmRollforceMapper.xml new file mode 100644 index 0000000..14199b7 --- /dev/null +++ b/business/src/main/resources/mapper/SetupTmRollforceMapper.xml @@ -0,0 +1,125 @@ + + + + + + + + + + + + + + + + + + + + + + + + + select STEEL_GRADE, THICK, YIELD_STREN, ELONG, VALUE1, VALUE2, VALUE3, VALUE4, VALUE5, VALUE6, VALUE7, VALUE8, VALUE9, VALUE10, UPDATE_TIME, CREATE_TIME from setup_tm_rollforce + + + + + + + + insert into setup_tm_rollforce + + STEEL_GRADE, + THICK, + YIELD_STREN, + ELONG, + VALUE1, + VALUE2, + VALUE3, + VALUE4, + VALUE5, + VALUE6, + VALUE7, + VALUE8, + VALUE9, + VALUE10, + UPDATE_TIME, + CREATE_TIME, + + + #{steelGrade}, + #{THICK}, + #{yieldStren}, + #{ELONG}, + #{VALUE1}, + #{VALUE2}, + #{VALUE3}, + #{VALUE4}, + #{VALUE5}, + #{VALUE6}, + #{VALUE7}, + #{VALUE8}, + #{VALUE9}, + #{VALUE10}, + #{updateTime}, + #{createTime}, + + + + + update setup_tm_rollforce + + THICK = #{THICK}, + YIELD_STREN = #{yieldStren}, + ELONG = #{ELONG}, + VALUE1 = #{VALUE1}, + VALUE2 = #{VALUE2}, + VALUE3 = #{VALUE3}, + VALUE4 = #{VALUE4}, + VALUE5 = #{VALUE5}, + VALUE6 = #{VALUE6}, + VALUE7 = #{VALUE7}, + VALUE8 = #{VALUE8}, + VALUE9 = #{VALUE9}, + VALUE10 = #{VALUE10}, + UPDATE_TIME = #{updateTime}, + CREATE_TIME = #{createTime}, + + where STEEL_GRADE = #{steelGrade} + + + + delete from setup_tm_rollforce where STEEL_GRADE = #{steelGrade} + + + + delete from setup_tm_rollforce where STEEL_GRADE in + + #{steelGrade} + + + \ No newline at end of file From 24e724743e47a5dd38b07e7dab5ba3eec9ba18df Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Thu, 25 Sep 2025 15:40:42 +0800 Subject: [PATCH 06/12] =?UTF-8?q?refactor(domain):=E9=87=8D=E5=91=BD?= =?UTF-8?q?=E5=90=8DPdiSetup=E4=B8=BAPdiSetups=E5=B9=B6=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=BC=95=E7=94=A8-=20=E5=B0=86PdiSetup?= =?UTF-8?q?=E7=B1=BB=E9=87=8D=E5=91=BD=E5=90=8D=E4=B8=BAPdiSetups?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 更新所有相关的导入语句和服务接口定义 - 修改控制器、服务实现和映射器中的类型引用 - 调整Excel导出和数据传输对象的类型使用 - 确保分页查询与列表返回类型一致性 --- .../controller/PdiSetupController.java | 18 ++++++++++-------- .../domain/{PdiSetup.java => PdiSetups.java} | 2 +- .../fizz/business/mapper/PdiSetupMapper.java | 10 +++++----- .../business/service/IPdiSetupService.java | 11 ++++++----- .../service/impl/PdiSetupServiceImpl.java | 12 +++++++----- 5 files changed, 29 insertions(+), 24 deletions(-) rename business/src/main/java/com/fizz/business/domain/{PdiSetup.java => PdiSetups.java} (99%) diff --git a/business/src/main/java/com/fizz/business/controller/PdiSetupController.java b/business/src/main/java/com/fizz/business/controller/PdiSetupController.java index 2eff580..63e44df 100644 --- a/business/src/main/java/com/fizz/business/controller/PdiSetupController.java +++ b/business/src/main/java/com/fizz/business/controller/PdiSetupController.java @@ -2,6 +2,8 @@ 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.GetMapping; @@ -16,7 +18,7 @@ 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.PdiSetup; +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; @@ -39,10 +41,10 @@ public class PdiSetupController extends BaseController */ @PreAuthorize("@ss.hasPermi('business:setup:list')") @GetMapping("/list") - public TableDataInfo list(PdiSetup pdiSetup) + public TableDataInfo list(PdiSetups pdiSetup) { startPage(); - List list = pdiSetupService.selectPdiSetupList(pdiSetup); + List list = pdiSetupService.selectPdiSetupList(pdiSetup); return getDataTable(list); } @@ -52,10 +54,10 @@ public class PdiSetupController extends BaseController @PreAuthorize("@ss.hasPermi('business:setup:export')") @Log(title = "生产计划的参数详情", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, PdiSetup pdiSetup) + public void export(HttpServletResponse response, PdiSetups pdiSetup) { - List list = pdiSetupService.selectPdiSetupList(pdiSetup); - ExcelUtil util = new ExcelUtil(PdiSetup.class); + List list = pdiSetupService.selectPdiSetupList(pdiSetup); + ExcelUtil util = new ExcelUtil(PdiSetups.class); util.exportExcel(response, list, "生产计划的参数详情数据"); } @@ -75,7 +77,7 @@ public class PdiSetupController extends BaseController @PreAuthorize("@ss.hasPermi('business:setup:add')") @Log(title = "生产计划的参数详情", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody PdiSetup pdiSetup) + public AjaxResult add(@RequestBody PdiSetups pdiSetup) { return toAjax(pdiSetupService.insertPdiSetup(pdiSetup)); } @@ -86,7 +88,7 @@ public class PdiSetupController extends BaseController @PreAuthorize("@ss.hasPermi('business:setup:edit')") @Log(title = "生产计划的参数详情", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody PdiSetup pdiSetup) + public AjaxResult edit(@RequestBody PdiSetups pdiSetup) { return toAjax(pdiSetupService.updatePdiSetup(pdiSetup)); } diff --git a/business/src/main/java/com/fizz/business/domain/PdiSetup.java b/business/src/main/java/com/fizz/business/domain/PdiSetups.java similarity index 99% rename from business/src/main/java/com/fizz/business/domain/PdiSetup.java rename to business/src/main/java/com/fizz/business/domain/PdiSetups.java index 781bac8..2215afd 100644 --- a/business/src/main/java/com/fizz/business/domain/PdiSetup.java +++ b/business/src/main/java/com/fizz/business/domain/PdiSetups.java @@ -11,7 +11,7 @@ import com.ruoyi.common.core.domain.BaseEntity; * @author Joshi * @date 2025-09-25 */ -public class PdiSetup extends BaseEntity +public class PdiSetups extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/business/src/main/java/com/fizz/business/mapper/PdiSetupMapper.java b/business/src/main/java/com/fizz/business/mapper/PdiSetupMapper.java index b297717..28eda5b 100644 --- a/business/src/main/java/com/fizz/business/mapper/PdiSetupMapper.java +++ b/business/src/main/java/com/fizz/business/mapper/PdiSetupMapper.java @@ -1,7 +1,7 @@ package com.fizz.business.mapper; import java.util.List; -import com.fizz.business.domain.PdiSetup; +import com.fizz.business.domain.PdiSetups; /** * 生产计划的参数详情Mapper接口 @@ -17,7 +17,7 @@ public interface PdiSetupMapper * @param ID 生产计划的参数详情主键 * @return 生产计划的参数详情 */ - public PdiSetup selectPdiSetupByID(Long ID); + public PdiSetups selectPdiSetupByID(Long ID); /** * 查询生产计划的参数详情列表 @@ -25,7 +25,7 @@ public interface PdiSetupMapper * @param pdiSetup 生产计划的参数详情 * @return 生产计划的参数详情集合 */ - public List selectPdiSetupList(PdiSetup pdiSetup); + public List selectPdiSetupList(PdiSetups pdiSetup); /** * 新增生产计划的参数详情 @@ -33,7 +33,7 @@ public interface PdiSetupMapper * @param pdiSetup 生产计划的参数详情 * @return 结果 */ - public int insertPdiSetup(PdiSetup pdiSetup); + public int insertPdiSetup(PdiSetups pdiSetup); /** * 修改生产计划的参数详情 @@ -41,7 +41,7 @@ public interface PdiSetupMapper * @param pdiSetup 生产计划的参数详情 * @return 结果 */ - public int updatePdiSetup(PdiSetup pdiSetup); + public int updatePdiSetup(PdiSetups pdiSetup); /** * 删除生产计划的参数详情 diff --git a/business/src/main/java/com/fizz/business/service/IPdiSetupService.java b/business/src/main/java/com/fizz/business/service/IPdiSetupService.java index 9994ffc..6330c1e 100644 --- a/business/src/main/java/com/fizz/business/service/IPdiSetupService.java +++ b/business/src/main/java/com/fizz/business/service/IPdiSetupService.java @@ -1,7 +1,8 @@ package com.fizz.business.service; import java.util.List; -import com.fizz.business.domain.PdiSetup; +import com.fizz.business.domain.PdiSetups; +import com.fizz.business.domain.msg.PdiSetup; /** * 生产计划的参数详情Service接口 @@ -17,7 +18,7 @@ public interface IPdiSetupService * @param ID 生产计划的参数详情主键 * @return 生产计划的参数详情 */ - public PdiSetup selectPdiSetupByID(Long ID); + public PdiSetups selectPdiSetupByID(Long ID); /** * 查询生产计划的参数详情列表 @@ -25,7 +26,7 @@ public interface IPdiSetupService * @param pdiSetup 生产计划的参数详情 * @return 生产计划的参数详情集合 */ - public List selectPdiSetupList(PdiSetup pdiSetup); + public List selectPdiSetupList(PdiSetups pdiSetup); /** * 新增生产计划的参数详情 @@ -33,7 +34,7 @@ public interface IPdiSetupService * @param pdiSetup 生产计划的参数详情 * @return 结果 */ - public int insertPdiSetup(PdiSetup pdiSetup); + public int insertPdiSetup(PdiSetups pdiSetup); /** * 修改生产计划的参数详情 @@ -41,7 +42,7 @@ public interface IPdiSetupService * @param pdiSetup 生产计划的参数详情 * @return 结果 */ - public int updatePdiSetup(PdiSetup pdiSetup); + public int updatePdiSetup(PdiSetups pdiSetup); /** * 批量删除生产计划的参数详情 diff --git a/business/src/main/java/com/fizz/business/service/impl/PdiSetupServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/PdiSetupServiceImpl.java index 69dee68..a8dd825 100644 --- a/business/src/main/java/com/fizz/business/service/impl/PdiSetupServiceImpl.java +++ b/business/src/main/java/com/fizz/business/service/impl/PdiSetupServiceImpl.java @@ -1,11 +1,13 @@ package com.fizz.business.service.impl; import java.util.List; + +import com.fizz.business.domain.msg.PdiSetup; import com.ruoyi.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.fizz.business.mapper.PdiSetupMapper; -import com.fizz.business.domain.PdiSetup; +import com.fizz.business.domain.PdiSetups; import com.fizz.business.service.IPdiSetupService; /** @@ -27,7 +29,7 @@ public class PdiSetupServiceImpl implements IPdiSetupService * @return 生产计划的参数详情 */ @Override - public PdiSetup selectPdiSetupByID(Long ID) + public PdiSetups selectPdiSetupByID(Long ID) { return pdiSetupMapper.selectPdiSetupByID(ID); } @@ -39,7 +41,7 @@ public class PdiSetupServiceImpl implements IPdiSetupService * @return 生产计划的参数详情 */ @Override - public List selectPdiSetupList(PdiSetup pdiSetup) + public List selectPdiSetupList(PdiSetups pdiSetup) { return pdiSetupMapper.selectPdiSetupList(pdiSetup); } @@ -51,7 +53,7 @@ public class PdiSetupServiceImpl implements IPdiSetupService * @return 结果 */ @Override - public int insertPdiSetup(PdiSetup pdiSetup) + public int insertPdiSetup(PdiSetups pdiSetup) { pdiSetup.setCreateTime(DateUtils.getNowDate()); return pdiSetupMapper.insertPdiSetup(pdiSetup); @@ -64,7 +66,7 @@ public class PdiSetupServiceImpl implements IPdiSetupService * @return 结果 */ @Override - public int updatePdiSetup(PdiSetup pdiSetup) + public int updatePdiSetup(PdiSetups pdiSetup) { pdiSetup.setUpdateTime(DateUtils.getNowDate()); return pdiSetupMapper.updatePdiSetup(pdiSetup); From 9b4d7fdbad22916159d59e2b61d6b957d66d7a8a Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Fri, 26 Sep 2025 11:03:35 +0800 Subject: [PATCH 07/12] =?UTF-8?q?refactor(service):=E9=87=8D=E6=9E=84PdiSe?= =?UTF-8?q?tup=E6=9C=8D=E5=8A=A1=E6=8E=A5=E5=8F=A3=E4=B8=8E=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0-=20=E7=BB=A7=E6=89=BFIService=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=EF=BC=8C=E4=BD=BF=E7=94=A8MyBatis-Plus=E5=A2=9E=E5=BC=BA?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=20-=20=E7=BB=9F=E4=B8=80=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E5=91=BD=E5=90=8D=E8=A7=84=E8=8C=83=EF=BC=8C=E5=A6=82selectPdi?= =?UTF-8?q?SetupByID=E6=94=B9=E4=B8=BAselectPdiSetupByid=20-=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E8=BF=94=E5=9B=9E=E7=B1=BB=E5=9E=8B=E4=B8=BABoolean?= =?UTF-8?q?=EF=BC=8C=E6=8F=90=E5=8D=87=E7=B1=BB=E5=9E=8B=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E6=80=A7=20-=20=E6=9B=B4=E6=96=B0Mapper=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E7=BB=A7=E6=89=BFBaseMapper=EF=BC=8C=E7=AE=80=E5=8C=96?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=AE=BF=E9=97=AE=E5=B1=82=E5=AE=9E=E7=8E=B0?= =?UTF-8?q?=20-=20=E4=BC=98=E5=8C=96Controller=E5=B1=82=EF=BC=8C=E7=A7=BB?= =?UTF-8?q?=E9=99=A4=E6=9D=83=E9=99=90=E6=B3=A8=E8=A7=A3=EF=BC=8C=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E5=8F=82=E6=95=B0=E5=A4=84=E7=90=86=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=20-=20=E8=B0=83=E6=95=B4=E5=AE=9E=E4=BD=93=E7=B1=BBPdiSetups?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0MyBatis-Plus=E6=B3=A8=E8=A7=A3?= =?UTF-8?q?=E6=94=AF=E6=8C=81=20-=20=E6=9B=B4=E6=96=B0=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=9C=8D=E5=8A=A1=E6=8E=A5=E5=8F=A3=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E7=AD=BE=E5=90=8D=E5=8F=8A=E5=8F=82=E6=95=B0=E5=91=BD?= =?UTF-8?q?=E5=90=8D=E8=A7=84=E8=8C=83=20-=E4=BF=AE=E6=AD=A3SetupTension?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=E4=B8=8E=E5=AE=9E=E7=8E=B0?= =?UTF-8?q?=EF=BC=8C=E7=BB=9F=E4=B8=80=E5=8F=82=E6=95=B0=E5=91=BD=E5=90=8D?= =?UTF-8?q?=E9=A3=8E=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PdiSetupController.java | 18 +- .../controller/SetupTensionController.java | 25 +- .../controller/SetupTlController.java | 29 +- .../SetupTmBendforceController.java | 25 +- .../controller/SetupTmMeshController.java | 27 +- .../SetupTmRollforceController.java | 29 +- .../com/fizz/business/domain/PdiSetups.java | 302 +++--------------- .../fizz/business/domain/SetupTension.java | 216 +++++++++++-- .../com/fizz/business/domain/SetupTl.java | 166 +++++++++- .../business/domain/SetupTmBendforce.java | 82 ++++- .../com/fizz/business/domain/SetupTmMesh.java | 164 +++++++++- .../business/domain/SetupTmRollforce.java | 176 +++++++++- .../fizz/business/mapper/PdiSetupMapper.java | 16 +- .../business/mapper/SetupTensionMapper.java | 17 +- .../fizz/business/mapper/SetupTlMapper.java | 9 +- .../mapper/SetupTmBendforceMapper.java | 15 +- .../business/mapper/SetupTmMeshMapper.java | 9 +- .../mapper/SetupTmRollforceMapper.java | 10 +- .../business/service/IPdiSetupService.java | 21 +- .../service/ISetupTensionService.java | 16 +- .../business/service/ISetupTlService.java | 8 +- .../service/ISetupTmBendforceService.java | 14 +- .../business/service/ISetupTmMeshService.java | 6 +- .../service/ISetupTmRollforceService.java | 6 +- .../service/impl/PdiSetupServiceImpl.java | 41 +-- .../service/impl/SetupTensionServiceImpl.java | 22 +- .../service/impl/SetupTlServiceImpl.java | 12 +- .../impl/SetupTmBendforceServiceImpl.java | 20 +- .../service/impl/SetupTmMeshServiceImpl.java | 10 +- .../impl/SetupTmRollforceServiceImpl.java | 10 +- .../main/resources/mapper/PdiSetupMapper.xml | 12 +- .../resources/mapper/SetupTensionMapper.xml | 142 -------- .../main/resources/mapper/SetupTlMapper.xml | 121 ------- .../mapper/SetupTmBendforceMapper.xml | 87 ----- .../resources/mapper/SetupTmMeshMapper.xml | 121 ------- .../mapper/SetupTmRollforceMapper.xml | 125 -------- 36 files changed, 979 insertions(+), 1150 deletions(-) delete mode 100644 business/src/main/resources/mapper/SetupTensionMapper.xml delete mode 100644 business/src/main/resources/mapper/SetupTlMapper.xml delete mode 100644 business/src/main/resources/mapper/SetupTmBendforceMapper.xml delete mode 100644 business/src/main/resources/mapper/SetupTmMeshMapper.xml delete mode 100644 business/src/main/resources/mapper/SetupTmRollforceMapper.xml diff --git a/business/src/main/java/com/fizz/business/controller/PdiSetupController.java b/business/src/main/java/com/fizz/business/controller/PdiSetupController.java index 63e44df..ab1203a 100644 --- a/business/src/main/java/com/fizz/business/controller/PdiSetupController.java +++ b/business/src/main/java/com/fizz/business/controller/PdiSetupController.java @@ -39,7 +39,6 @@ public class PdiSetupController extends BaseController /** * 查询生产计划的参数详情列表 */ - @PreAuthorize("@ss.hasPermi('business:setup:list')") @GetMapping("/list") public TableDataInfo list(PdiSetups pdiSetup) { @@ -51,7 +50,6 @@ public class PdiSetupController extends BaseController /** * 导出生产计划的参数详情列表 */ - @PreAuthorize("@ss.hasPermi('business:setup:export')") @Log(title = "生产计划的参数详情", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, PdiSetups pdiSetup) @@ -64,17 +62,15 @@ public class PdiSetupController extends BaseController /** * 获取生产计划的参数详情详细信息 */ - @PreAuthorize("@ss.hasPermi('business:setup:query')") - @GetMapping(value = "/{ID}") - public AjaxResult getInfo(@PathVariable("ID") Long ID) + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { - return success(pdiSetupService.selectPdiSetupByID(ID)); + return success(pdiSetupService.selectPdiSetupByid(id)); } /** * 新增生产计划的参数详情 */ - @PreAuthorize("@ss.hasPermi('business:setup:add')") @Log(title = "生产计划的参数详情", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody PdiSetups pdiSetup) @@ -85,7 +81,6 @@ public class PdiSetupController extends BaseController /** * 修改生产计划的参数详情 */ - @PreAuthorize("@ss.hasPermi('business:setup:edit')") @Log(title = "生产计划的参数详情", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody PdiSetups pdiSetup) @@ -96,11 +91,10 @@ public class PdiSetupController extends BaseController /** * 删除生产计划的参数详情 */ - @PreAuthorize("@ss.hasPermi('business:setup:remove')") @Log(title = "生产计划的参数详情", businessType = BusinessType.DELETE) - @DeleteMapping("/{IDs}") - public AjaxResult remove(@PathVariable Long[] IDs) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { - return toAjax(pdiSetupService.deletePdiSetupByIDs(IDs)); + return toAjax(pdiSetupService.deletePdiSetupByids(ids)); } } diff --git a/business/src/main/java/com/fizz/business/controller/SetupTensionController.java b/business/src/main/java/com/fizz/business/controller/SetupTensionController.java index 8a18431..1e49f26 100644 --- a/business/src/main/java/com/fizz/business/controller/SetupTensionController.java +++ b/business/src/main/java/com/fizz/business/controller/SetupTensionController.java @@ -4,14 +4,7 @@ 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 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; @@ -24,8 +17,8 @@ import com.ruoyi.common.core.page.TableDataInfo; /** * 全线张力Controller * - * @author Joshi - * @date 2025-09-25 + * @author ruoyi + * @date 2025-09-26 */ @RestController @RequestMapping("/business/tension") @@ -60,10 +53,10 @@ public class SetupTensionController extends BaseController /** * 获取全线张力详细信息 */ - @GetMapping(value = "/{THICK}") - public AjaxResult getInfo(@PathVariable("THICK") Long THICK) + @GetMapping() + public AjaxResult getInfo(@RequestParam Long thick ,@RequestParam Long yieldStren) { - return success(setupTensionService.selectSetupTensionByTHICK(THICK)); + return success(setupTensionService.selectSetupTensionByThick(thick, yieldStren)); } /** @@ -90,9 +83,9 @@ public class SetupTensionController extends BaseController * 删除全线张力 */ @Log(title = "全线张力", businessType = BusinessType.DELETE) - @DeleteMapping("/{THICKs}") - public AjaxResult remove(@PathVariable Long[] THICKs) + @DeleteMapping() + public AjaxResult remove(@RequestParam Long[] thicks,@RequestParam Long[] yieldStrens) { - return toAjax(setupTensionService.deleteSetupTensionByTHICKs(THICKs)); + return toAjax(setupTensionService.deleteSetupTensionByThicks(thicks, yieldStrens)); } } diff --git a/business/src/main/java/com/fizz/business/controller/SetupTlController.java b/business/src/main/java/com/fizz/business/controller/SetupTlController.java index 5fdea78..c6b4d23 100644 --- a/business/src/main/java/com/fizz/business/controller/SetupTlController.java +++ b/business/src/main/java/com/fizz/business/controller/SetupTlController.java @@ -4,14 +4,7 @@ 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 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; @@ -24,8 +17,8 @@ import com.ruoyi.common.core.page.TableDataInfo; /** * 拉矫机参数Controller * - * @author Joshi - * @date 2025-09-25 + * @author ruoyi + * @date 2025-09-26 */ @RestController @RequestMapping("/business/tl") @@ -60,10 +53,12 @@ public class SetupTlController extends BaseController /** * 获取拉矫机参数详细信息 */ - @GetMapping(value = "/{steelGrade}") - public AjaxResult getInfo(@PathVariable("steelGrade") String steelGrade) + @GetMapping() + public AjaxResult getInfo(@RequestParam String steelGrade, + @RequestParam Long yieldStren, + @RequestParam Long thick) { - return success(setupTlService.selectSetupTlBySteelGrade(steelGrade)); + return success(setupTlService.selectSetupTlBySteelGrade(steelGrade, yieldStren, thick)); } /** @@ -90,9 +85,11 @@ public class SetupTlController extends BaseController * 删除拉矫机参数 */ @Log(title = "拉矫机参数", businessType = BusinessType.DELETE) - @DeleteMapping("/{steelGrades}") - public AjaxResult remove(@PathVariable String[] steelGrades) + @DeleteMapping() + public AjaxResult remove(@RequestParam String[] steelGrades, + @RequestParam Long[] yieldStrens, + @RequestParam Long[] thicks) { - return toAjax(setupTlService.deleteSetupTlBySteelGrades(steelGrades)); + return toAjax(setupTlService.deleteSetupTlBySteelGrades(steelGrades, yieldStrens, thicks)); } } diff --git a/business/src/main/java/com/fizz/business/controller/SetupTmBendforceController.java b/business/src/main/java/com/fizz/business/controller/SetupTmBendforceController.java index c136d38..bae77c4 100644 --- a/business/src/main/java/com/fizz/business/controller/SetupTmBendforceController.java +++ b/business/src/main/java/com/fizz/business/controller/SetupTmBendforceController.java @@ -4,14 +4,7 @@ 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 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; @@ -25,7 +18,7 @@ import com.ruoyi.common.core.page.TableDataInfo; * 光整机弯辊力Controller * * @author Joshi - * @date 2025-09-25 + * @date 2025-09-26 */ @RestController @RequestMapping("/business/bendforce") @@ -60,10 +53,11 @@ public class SetupTmBendforceController extends BaseController /** * 获取光整机弯辊力详细信息 */ - @GetMapping(value = "/{WIDTH}") - public AjaxResult getInfo(@PathVariable("WIDTH") Long WIDTH) + @GetMapping() + public AjaxResult getInfo(@RequestParam Long width, + @RequestParam Long rollForce) { - return success(setupTmBendforceService.selectSetupTmBendforceByWIDTH(WIDTH)); + return success(setupTmBendforceService.selectSetupTmBendforceByWidth(width,rollForce)); } /** @@ -90,9 +84,10 @@ public class SetupTmBendforceController extends BaseController * 删除光整机弯辊力 */ @Log(title = "光整机弯辊力", businessType = BusinessType.DELETE) - @DeleteMapping("/{WIDTHs}") - public AjaxResult remove(@PathVariable Long[] WIDTHs) + @DeleteMapping() + public AjaxResult remove(@RequestParam Long[] widths, + @RequestParam Long[] rollForces) { - return toAjax(setupTmBendforceService.deleteSetupTmBendforceByWIDTHs(WIDTHs)); + return toAjax(setupTmBendforceService.deleteSetupTmBendforceByWidths(widths,rollForces)); } } diff --git a/business/src/main/java/com/fizz/business/controller/SetupTmMeshController.java b/business/src/main/java/com/fizz/business/controller/SetupTmMeshController.java index 20176de..76983f9 100644 --- a/business/src/main/java/com/fizz/business/controller/SetupTmMeshController.java +++ b/business/src/main/java/com/fizz/business/controller/SetupTmMeshController.java @@ -4,14 +4,7 @@ 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 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; @@ -25,7 +18,7 @@ import com.ruoyi.common.core.page.TableDataInfo; * 光整机插入量Controller * * @author Joshi - * @date 2025-09-25 + * @date 2025-09-26 */ @RestController @RequestMapping("/business/mesh") @@ -60,10 +53,12 @@ public class SetupTmMeshController extends BaseController /** * 获取光整机插入量详细信息 */ - @GetMapping(value = "/{steelGrade}") - public AjaxResult getInfo(@PathVariable("steelGrade") String steelGrade) + @GetMapping() + public AjaxResult getInfo(@RequestParam String steelGrade, + @RequestParam Long yieldStren, + @RequestParam Long thick) { - return success(setupTmMeshService.selectSetupTmMeshBySteelGrade(steelGrade)); + return success(setupTmMeshService.selectSetupTmMeshBySteelGrade(steelGrade, yieldStren, thick)); } /** @@ -90,9 +85,11 @@ public class SetupTmMeshController extends BaseController * 删除光整机插入量 */ @Log(title = "光整机插入量", businessType = BusinessType.DELETE) - @DeleteMapping("/{steelGrades}") - public AjaxResult remove(@PathVariable String[] steelGrades) + @DeleteMapping() + public AjaxResult remove( @RequestParam String[] steelGrades, + @RequestParam Long[] yieldStrens, + @RequestParam Long[] thicks) { - return toAjax(setupTmMeshService.deleteSetupTmMeshBySteelGrades(steelGrades)); + return toAjax(setupTmMeshService.deleteSetupTmMeshBySteelGrades(steelGrades, yieldStrens, thicks)); } } diff --git a/business/src/main/java/com/fizz/business/controller/SetupTmRollforceController.java b/business/src/main/java/com/fizz/business/controller/SetupTmRollforceController.java index 45e34cf..318d93c 100644 --- a/business/src/main/java/com/fizz/business/controller/SetupTmRollforceController.java +++ b/business/src/main/java/com/fizz/business/controller/SetupTmRollforceController.java @@ -4,14 +4,7 @@ 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 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; @@ -25,7 +18,7 @@ import com.ruoyi.common.core.page.TableDataInfo; * 光整机轧制力Controller * * @author Joshi - * @date 2025-09-25 + * @date 2025-09-26 */ @RestController @RequestMapping("/business/rollforce") @@ -60,10 +53,13 @@ public class SetupTmRollforceController extends BaseController /** * 获取光整机轧制力详细信息 */ - @GetMapping(value = "/{steelGrade}") - public AjaxResult getInfo(@PathVariable("steelGrade") String steelGrade) + @GetMapping() + public AjaxResult getInfo(@RequestParam String steelGrade, + @RequestParam Long yieldStren, + @RequestParam Long thick, + @RequestParam Long elong) { - return success(setupTmRollforceService.selectSetupTmRollforceBySteelGrade(steelGrade)); + return success(setupTmRollforceService.selectSetupTmRollforceBySteelGrade(steelGrade, yieldStren, thick, elong)); } /** @@ -90,9 +86,12 @@ public class SetupTmRollforceController extends BaseController * 删除光整机轧制力 */ @Log(title = "光整机轧制力", businessType = BusinessType.DELETE) - @DeleteMapping("/{steelGrades}") - public AjaxResult remove(@PathVariable String[] steelGrades) + @DeleteMapping() + public AjaxResult remove(@RequestParam String[] steelGrades, + @RequestParam Long[] thicks, + @RequestParam Long[] yieldStrens, + @RequestParam Long[] elongs) { - return toAjax(setupTmRollforceService.deleteSetupTmRollforceBySteelGrades(steelGrades)); + return toAjax(setupTmRollforceService.deleteSetupTmRollforceBySteelGrades(steelGrades, thicks, yieldStrens, elongs)); } } diff --git a/business/src/main/java/com/fizz/business/domain/PdiSetups.java b/business/src/main/java/com/fizz/business/domain/PdiSetups.java index 2215afd..cc43376 100644 --- a/business/src/main/java/com/fizz/business/domain/PdiSetups.java +++ b/business/src/main/java/com/fizz/business/domain/PdiSetups.java @@ -1,5 +1,10 @@ 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; @@ -7,369 +12,138 @@ import com.ruoyi.common.core.domain.BaseEntity; /** * 生产计划的参数详情对象 pdi_setup - * + * * @author Joshi * @date 2025-09-25 */ +@Data +@TableName("pdi_setup") public class PdiSetups extends BaseEntity { private static final long serialVersionUID = 1L; - /** $column.columnComment */ - private Long ID; + /** 主键ID */ + @TableId(value = "ID", type = IdType.AUTO) + private Long id; /** 钢卷号 */ @Excel(name = "钢卷号") - private String COILID; + @TableField("COILID") + private String coilid; /** 计划号 */ @Excel(name = "计划号") - private String PLANID; + @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 = "类型，或可用于记录更改次数") - private Long TYPE; + @TableField("TYPE") + private Long type; - public void setID(Long ID) - { - this.ID = ID; - } - - public Long getID() - { - return ID; - } - public void setCOILID(String COILID) - { - this.COILID = COILID; - } - - public String getCOILID() - { - return COILID; - } - public void setPLANID(String PLANID) - { - this.PLANID = PLANID; - } - - public String getPLANID() - { - return PLANID; - } - public void setPorTension(Long porTension) - { - this.porTension = porTension; - } - - public Long getPorTension() - { - return porTension; - } - public void setCelTension(Long celTension) - { - this.celTension = celTension; - } - - public Long getCelTension() - { - return celTension; - } - public void setCleanTension(Long cleanTension) - { - this.cleanTension = cleanTension; - } - - public Long getCleanTension() - { - return cleanTension; - } - public void setFurTension(Long furTension) - { - this.furTension = furTension; - } - - public Long getFurTension() - { - return furTension; - } - public void setTowerTension(Long towerTension) - { - this.towerTension = towerTension; - } - - public Long getTowerTension() - { - return towerTension; - } - public void setTmNoneTension(Long tmNoneTension) - { - this.tmNoneTension = tmNoneTension; - } - - public Long getTmNoneTension() - { - return tmNoneTension; - } - public void setTmEntryTension(Long tmEntryTension) - { - this.tmEntryTension = tmEntryTension; - } - - public Long getTmEntryTension() - { - return tmEntryTension; - } - public void setTmExitTension(Long tmExitTension) - { - this.tmExitTension = tmExitTension; - } - - public Long getTmExitTension() - { - return tmExitTension; - } - public void setTmRollforce(Long tmRollforce) - { - this.tmRollforce = tmRollforce; - } - - public Long getTmRollforce() - { - return tmRollforce; - } - public void setTmBendforce(Long tmBendforce) - { - this.tmBendforce = tmBendforce; - } - - public Long getTmBendforce() - { - return tmBendforce; - } - public void setTmAcrMesh(Long tmAcrMesh) - { - this.tmAcrMesh = tmAcrMesh; - } - - public Long getTmAcrMesh() - { - return tmAcrMesh; - } - public void setTmBrMesh(Long tmBrMesh) - { - this.tmBrMesh = tmBrMesh; - } - - public Long getTmBrMesh() - { - return tmBrMesh; - } - public void setTlNoneTension(Long tlNoneTension) - { - this.tlNoneTension = tlNoneTension; - } - - public Long getTlNoneTension() - { - return tlNoneTension; - } - public void setTlExitTension(Long tlExitTension) - { - this.tlExitTension = tlExitTension; - } - - public Long getTlExitTension() - { - return tlExitTension; - } - public void setTlElong(Long tlElong) - { - this.tlElong = tlElong; - } - - public Long getTlElong() - { - return tlElong; - } - public void setTlLvlMesh1(Long tlLvlMesh1) - { - this.tlLvlMesh1 = tlLvlMesh1; - } - - public Long getTlLvlMesh1() - { - return tlLvlMesh1; - } - public void setTlLvlMesh2(Long tlLvlMesh2) - { - this.tlLvlMesh2 = tlLvlMesh2; - } - - public Long getTlLvlMesh2() - { - return tlLvlMesh2; - } - public void setTlAcbMesh(Long tlAcbMesh) - { - this.tlAcbMesh = tlAcbMesh; - } - - public Long getTlAcbMesh() - { - return tlAcbMesh; - } - public void setCoatTension(Long coatTension) - { - this.coatTension = coatTension; - } - - public Long getCoatTension() - { - return coatTension; - } - public void setCxlTension(Long cxlTension) - { - this.cxlTension = cxlTension; - } - - public Long getCxlTension() - { - return cxlTension; - } - public void setTrTension(Long trTension) - { - this.trTension = trTension; - } - - public Long getTrTension() - { - return trTension; - } - public void setTYPE(Long TYPE) - { - this.TYPE = TYPE; - } - - public Long getTYPE() - { - return TYPE; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("ID", getID()) - .append("COILID", getCOILID()) - .append("PLANID", getPLANID()) - .append("porTension", getPorTension()) - .append("celTension", getCelTension()) - .append("cleanTension", getCleanTension()) - .append("furTension", getFurTension()) - .append("towerTension", getTowerTension()) - .append("tmNoneTension", getTmNoneTension()) - .append("tmEntryTension", getTmEntryTension()) - .append("tmExitTension", getTmExitTension()) - .append("tmRollforce", getTmRollforce()) - .append("tmBendforce", getTmBendforce()) - .append("tmAcrMesh", getTmAcrMesh()) - .append("tmBrMesh", getTmBrMesh()) - .append("tlNoneTension", getTlNoneTension()) - .append("tlExitTension", getTlExitTension()) - .append("tlElong", getTlElong()) - .append("tlLvlMesh1", getTlLvlMesh1()) - .append("tlLvlMesh2", getTlLvlMesh2()) - .append("tlAcbMesh", getTlAcbMesh()) - .append("coatTension", getCoatTension()) - .append("cxlTension", getCxlTension()) - .append("trTension", getTrTension()) - .append("createTime", getCreateTime()) - .append("updateTime", getUpdateTime()) - .append("TYPE", getTYPE()) - .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 index d61980a..c440d5d 100644 --- a/business/src/main/java/com/fizz/business/domain/SetupTension.java +++ b/business/src/main/java/com/fizz/business/domain/SetupTension.java @@ -1,6 +1,5 @@ package com.fizz.business.domain; -import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -9,78 +8,255 @@ import com.ruoyi.common.core.domain.BaseEntity; /** * 全线张力对象 setup_tension * - * @author Joshi - * @date 2025-09-25 + * @author ruoyi + * @date 2025-09-26 */ -@Data public class SetupTension extends BaseEntity { private static final long serialVersionUID = 1L; /** $column.columnComment */ - private Long THICK; + private Long thick; /** 强度 */ private Long yieldStren; /** 开卷机张力 */ @Excel(name = "开卷机张力") - private Long VALUE1; + private Long value1; /** 入口活套 */ @Excel(name = "入口活套") - private Long VALUE2; + private Long value2; /** 清洗段 */ @Excel(name = "清洗段") - private Long VALUE3; + private Long value3; /** 炉区张力 */ @Excel(name = "炉区张力") - private Long VALUE4; + private Long value4; /** 冷却塔 */ @Excel(name = "冷却塔") - private Long VALUE5; + private Long value5; /** 光整机-不投 */ @Excel(name = "光整机-不投") - private Long VALUE6; + private Long value6; /** 光整机入口 */ @Excel(name = "光整机入口") - private Long VALUE7; + private Long value7; /** 光整机出口 */ @Excel(name = "光整机出口") - private Long VALUE8; + private Long value8; /** 拉矫机-不投 */ @Excel(name = "拉矫机-不投") - private Long VALUE9; + private Long value9; /** 拉矫机出口 */ @Excel(name = "拉矫机出口") - private Long VALUE10; + private Long value10; /** 后处理 */ @Excel(name = "后处理") - private Long VALUE11; + private Long value11; /** 出口活套 */ @Excel(name = "出口活套") - private Long VALUE12; + private Long value12; /** 卷取机 */ @Excel(name = "卷取机") - private Long VALUE13; + private Long value13; /** $column.columnComment */ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - private Long VALUE14; + private Long value14; /** $column.columnComment */ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - private Long VALUE15; + 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 index f24bc30..a9d9e68 100644 --- a/business/src/main/java/com/fizz/business/domain/SetupTl.java +++ b/business/src/main/java/com/fizz/business/domain/SetupTl.java @@ -1,6 +1,5 @@ package com.fizz.business.domain; -import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -9,10 +8,9 @@ import com.ruoyi.common.core.domain.BaseEntity; /** * 拉矫机参数对象 setup_tl * - * @author Joshi - * @date 2025-09-25 + * @author ruoyi + * @date 2025-09-26 */ -@Data public class SetupTl extends BaseEntity { private static final long serialVersionUID = 1L; @@ -24,46 +22,184 @@ public class SetupTl extends BaseEntity private Long yieldStren; /** $column.columnComment */ - private Long THICK; + private Long thick; /** 延伸率 */ @Excel(name = "延伸率") - private Long VALUE1; + private Long value1; /** 矫直辊插入量1 */ @Excel(name = "矫直辊插入量1") - private Long VALUE2; + private Long value2; /** 矫直辊插入量2 */ @Excel(name = "矫直辊插入量2") - private Long VALUE3; + private Long value3; /** 防横弓插入量 */ @Excel(name = "防横弓插入量") - private Long VALUE4; + private Long value4; /** $column.columnComment */ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - private Long VALUE5; + private Long value5; /** $column.columnComment */ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - private Long VALUE6; + private Long value6; /** $column.columnComment */ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - private Long VALUE7; + private Long value7; /** $column.columnComment */ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - private Long VALUE8; + private Long value8; /** $column.columnComment */ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - private Long VALUE9; + private Long value9; /** $column.columnComment */ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - private Long VALUE10; + 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 index 20f1ee7..2446848 100644 --- a/business/src/main/java/com/fizz/business/domain/SetupTmBendforce.java +++ b/business/src/main/java/com/fizz/business/domain/SetupTmBendforce.java @@ -1,6 +1,5 @@ package com.fizz.business.domain; -import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -10,33 +9,100 @@ import com.ruoyi.common.core.domain.BaseEntity; * 光整机弯辊力对象 setup_tm_bendforce * * @author Joshi - * @date 2025-09-25 + * @date 2025-09-26 */ -@Data public class SetupTmBendforce extends BaseEntity { private static final long serialVersionUID = 1L; /** 宽度 */ - private Long WIDTH; + private Long width; /** 轧制力 */ private Long rollForce; /** 弯辊力 */ @Excel(name = "弯辊力") - private Long VALUE1; + private Long value1; /** $column.columnComment */ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - private Long VALUE2; + private Long value2; /** $column.columnComment */ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - private Long VALUE3; + private Long value3; /** $column.columnComment */ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - private Long VALUE4; + 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 index f8289ec..b50bf91 100644 --- a/business/src/main/java/com/fizz/business/domain/SetupTmMesh.java +++ b/business/src/main/java/com/fizz/business/domain/SetupTmMesh.java @@ -1,6 +1,5 @@ package com.fizz.business.domain; -import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -10,9 +9,8 @@ import com.ruoyi.common.core.domain.BaseEntity; * 光整机插入量对象 setup_tm_mesh * * @author Joshi - * @date 2025-09-25 + * @date 2025-09-26 */ -@Data public class SetupTmMesh extends BaseEntity { private static final long serialVersionUID = 1L; @@ -24,46 +22,184 @@ public class SetupTmMesh extends BaseEntity private Long yieldStren; /** $column.columnComment */ - private Long THICK; + private Long thick; /** 防皱辊插入量 */ @Excel(name = "防皱辊插入量") - private Long VALUE1; + private Long value1; /** 防颤辊插入量 */ @Excel(name = "防颤辊插入量") - private Long VALUE2; + private Long value2; /** $column.columnComment */ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - private Long VALUE3; + private Long value3; /** $column.columnComment */ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - private Long VALUE4; + private Long value4; /** $column.columnComment */ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - private Long VALUE5; + private Long value5; /** $column.columnComment */ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - private Long VALUE6; + private Long value6; /** $column.columnComment */ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - private Long VALUE7; + private Long value7; /** $column.columnComment */ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - private Long VALUE8; + private Long value8; /** $column.columnComment */ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - private Long VALUE9; + private Long value9; /** $column.columnComment */ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - private Long VALUE10; + 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 index a2887c6..5ba1a86 100644 --- a/business/src/main/java/com/fizz/business/domain/SetupTmRollforce.java +++ b/business/src/main/java/com/fizz/business/domain/SetupTmRollforce.java @@ -1,6 +1,5 @@ package com.fizz.business.domain; -import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -10,9 +9,8 @@ import com.ruoyi.common.core.domain.BaseEntity; * 光整机轧制力对象 setup_tm_rollforce * * @author Joshi - * @date 2025-09-25 + * @date 2025-09-26 */ -@Data public class SetupTmRollforce extends BaseEntity { private static final long serialVersionUID = 1L; @@ -21,52 +19,200 @@ public class SetupTmRollforce extends BaseEntity private String steelGrade; /** $column.columnComment */ - private Long THICK; + private Long thick; /** $column.columnComment */ private Long yieldStren; /** 延伸率 */ - private Long ELONG; + private Long elong; /** 轧制力 */ @Excel(name = "轧制力") - private Long VALUE1; + private Long value1; /** $column.columnComment */ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - private Long VALUE2; + private Long value2; /** $column.columnComment */ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - private Long VALUE3; + private Long value3; /** $column.columnComment */ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - private Long VALUE4; + private Long value4; /** $column.columnComment */ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - private Long VALUE5; + private Long value5; /** $column.columnComment */ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - private Long VALUE6; + private Long value6; /** $column.columnComment */ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - private Long VALUE7; + private Long value7; /** $column.columnComment */ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - private Long VALUE8; + private Long value8; /** $column.columnComment */ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - private Long VALUE9; + private Long value9; /** $column.columnComment */ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - private Long VALUE10; + 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/mapper/PdiSetupMapper.java b/business/src/main/java/com/fizz/business/mapper/PdiSetupMapper.java index 28eda5b..b0418d6 100644 --- a/business/src/main/java/com/fizz/business/mapper/PdiSetupMapper.java +++ b/business/src/main/java/com/fizz/business/mapper/PdiSetupMapper.java @@ -1,6 +1,8 @@ package com.fizz.business.mapper; import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.fizz.business.domain.PdiSetups; /** @@ -9,15 +11,15 @@ import com.fizz.business.domain.PdiSetups; * @author Joshi * @date 2025-09-25 */ -public interface PdiSetupMapper +public interface PdiSetupMapper extends BaseMapper { /** * 查询生产计划的参数详情 * - * @param ID 生产计划的参数详情主键 + * @param id 生产计划的参数详情主键 * @return 生产计划的参数详情 */ - public PdiSetups selectPdiSetupByID(Long ID); + public PdiSetups selectPdiSetupById(Long id); /** * 查询生产计划的参数详情列表 @@ -46,16 +48,16 @@ public interface PdiSetupMapper /** * 删除生产计划的参数详情 * - * @param ID 生产计划的参数详情主键 + * @param id 生产计划的参数详情主键 * @return 结果 */ - public int deletePdiSetupByID(Long ID); + public int deletePdiSetupById(Long id); /** * 批量删除生产计划的参数详情 * - * @param IDs 需要删除的数据主键集合 + * @param ids 需要删除的数据主键集合 * @return 结果 */ - public int deletePdiSetupByIDs(Long[] IDs); + public int deletePdiSetupByIds(Long[] ids); } diff --git a/business/src/main/java/com/fizz/business/mapper/SetupTensionMapper.java b/business/src/main/java/com/fizz/business/mapper/SetupTensionMapper.java index f9d2853..e288c12 100644 --- a/business/src/main/java/com/fizz/business/mapper/SetupTensionMapper.java +++ b/business/src/main/java/com/fizz/business/mapper/SetupTensionMapper.java @@ -2,22 +2,23 @@ package com.fizz.business.mapper; import java.util.List; import com.fizz.business.domain.SetupTension; +import org.apache.ibatis.annotations.Param; /** * 全线张力Mapper接口 * - * @author Joshi - * @date 2025-09-25 + * @author ruoyi + * @date 2025-09-26 */ public interface SetupTensionMapper { /** * 查询全线张力 * - * @param THICK 全线张力主键 + * @param thick 全线张力主键 * @return 全线张力 */ - public SetupTension selectSetupTensionByTHICK(Long THICK); + public SetupTension selectSetupTensionByThick(@Param("thick") Long thick,@Param("yieldStren") Long yieldStren); /** * 查询全线张力列表 @@ -46,16 +47,16 @@ public interface SetupTensionMapper /** * 删除全线张力 * - * @param THICK 全线张力主键 + * @param thick 全线张力主键 * @return 结果 */ - public int deleteSetupTensionByTHICK(Long THICK); + public int deleteSetupTensionByThick(Long thick); /** * 批量删除全线张力 * - * @param THICKs 需要删除的数据主键集合 + * @param thicks 需要删除的数据主键集合 * @return 结果 */ - public int deleteSetupTensionByTHICKs(Long[] THICKs); + 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 index c0a5e03..c251d50 100644 --- a/business/src/main/java/com/fizz/business/mapper/SetupTlMapper.java +++ b/business/src/main/java/com/fizz/business/mapper/SetupTlMapper.java @@ -2,12 +2,13 @@ package com.fizz.business.mapper; import java.util.List; import com.fizz.business.domain.SetupTl; +import org.apache.ibatis.annotations.Param; /** * 拉矫机参数Mapper接口 * - * @author Joshi - * @date 2025-09-25 + * @author ruoyi + * @date 2025-09-26 */ public interface SetupTlMapper { @@ -17,7 +18,7 @@ public interface SetupTlMapper * @param steelGrade 拉矫机参数主键 * @return 拉矫机参数 */ - public SetupTl selectSetupTlBySteelGrade(String steelGrade); + public SetupTl selectSetupTlBySteelGrade(@Param("steelGrade") String steelGrade,@Param("yieldStren") Long yieldStren,@Param("thick") Long thick); /** * 查询拉矫机参数列表 @@ -57,5 +58,5 @@ public interface SetupTlMapper * @param steelGrades 需要删除的数据主键集合 * @return 结果 */ - public int deleteSetupTlBySteelGrades(String[] steelGrades); + 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 index 785d762..f4c4074 100644 --- a/business/src/main/java/com/fizz/business/mapper/SetupTmBendforceMapper.java +++ b/business/src/main/java/com/fizz/business/mapper/SetupTmBendforceMapper.java @@ -2,22 +2,23 @@ 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-25 + * @date 2025-09-26 */ public interface SetupTmBendforceMapper { /** * 查询光整机弯辊力 * - * @param WIDTH 光整机弯辊力主键 + * @param width 光整机弯辊力主键 * @return 光整机弯辊力 */ - public SetupTmBendforce selectSetupTmBendforceByWIDTH(Long WIDTH); + public SetupTmBendforce selectSetupTmBendforceByWidth(@Param("width") Long width,@Param("rollForce") Long rollForce); /** * 查询光整机弯辊力列表 @@ -46,16 +47,16 @@ public interface SetupTmBendforceMapper /** * 删除光整机弯辊力 * - * @param WIDTH 光整机弯辊力主键 + * @param width 光整机弯辊力主键 * @return 结果 */ - public int deleteSetupTmBendforceByWIDTH(Long WIDTH); + public int deleteSetupTmBendforceByWidth(Long width); /** * 批量删除光整机弯辊力 * - * @param WIDTHs 需要删除的数据主键集合 + * @param widths 需要删除的数据主键集合 * @return 结果 */ - public int deleteSetupTmBendforceByWIDTHs(Long[] WIDTHs); + 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 index 7f85d35..f9a5f2a 100644 --- a/business/src/main/java/com/fizz/business/mapper/SetupTmMeshMapper.java +++ b/business/src/main/java/com/fizz/business/mapper/SetupTmMeshMapper.java @@ -2,12 +2,13 @@ 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-25 + * @date 2025-09-26 */ public interface SetupTmMeshMapper { @@ -17,7 +18,7 @@ public interface SetupTmMeshMapper * @param steelGrade 光整机插入量主键 * @return 光整机插入量 */ - public SetupTmMesh selectSetupTmMeshBySteelGrade(String steelGrade); + public SetupTmMesh selectSetupTmMeshBySteelGrade(@Param("steelGrade") String steelGrade,@Param("yieldStren") Long yieldStren,@Param("thick") Long thick); /** * 查询光整机插入量列表 @@ -57,5 +58,7 @@ public interface SetupTmMeshMapper * @param steelGrades 需要删除的数据主键集合 * @return 结果 */ - public int deleteSetupTmMeshBySteelGrades(String[] steelGrades); + 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 index d59fc64..f6947d7 100644 --- a/business/src/main/java/com/fizz/business/mapper/SetupTmRollforceMapper.java +++ b/business/src/main/java/com/fizz/business/mapper/SetupTmRollforceMapper.java @@ -2,12 +2,13 @@ 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-25 + * @date 2025-09-26 */ public interface SetupTmRollforceMapper { @@ -17,7 +18,7 @@ public interface SetupTmRollforceMapper * @param steelGrade 光整机轧制力主键 * @return 光整机轧制力 */ - public SetupTmRollforce selectSetupTmRollforceBySteelGrade(String steelGrade); + public SetupTmRollforce selectSetupTmRollforceBySteelGrade(@Param("steelGrade") String steelGrade,@Param("yieldStren") Long yieldStren,@Param("thick") Long thick,@Param("elong") Long elong); /** * 查询光整机轧制力列表 @@ -57,5 +58,8 @@ public interface SetupTmRollforceMapper * @param steelGrades 需要删除的数据主键集合 * @return 结果 */ - public int deleteSetupTmRollforceBySteelGrades(String[] steelGrades); + 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/service/IPdiSetupService.java b/business/src/main/java/com/fizz/business/service/IPdiSetupService.java index 6330c1e..e575a77 100644 --- a/business/src/main/java/com/fizz/business/service/IPdiSetupService.java +++ b/business/src/main/java/com/fizz/business/service/IPdiSetupService.java @@ -1,7 +1,10 @@ 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; /** @@ -10,15 +13,15 @@ import com.fizz.business.domain.msg.PdiSetup; * @author Joshi * @date 2025-09-25 */ -public interface IPdiSetupService +public interface IPdiSetupService extends IService { /** * 查询生产计划的参数详情 * - * @param ID 生产计划的参数详情主键 + * @param id 生产计划的参数详情主键 * @return 生产计划的参数详情 */ - public PdiSetups selectPdiSetupByID(Long ID); + public PdiSetups selectPdiSetupByid(Long id); /** * 查询生产计划的参数详情列表 @@ -34,7 +37,7 @@ public interface IPdiSetupService * @param pdiSetup 生产计划的参数详情 * @return 结果 */ - public int insertPdiSetup(PdiSetups pdiSetup); + public Boolean insertPdiSetup(PdiSetups pdiSetup); /** * 修改生产计划的参数详情 @@ -42,21 +45,21 @@ public interface IPdiSetupService * @param pdiSetup 生产计划的参数详情 * @return 结果 */ - public int updatePdiSetup(PdiSetups pdiSetup); + public Boolean updatePdiSetup(PdiSetups pdiSetup); /** * 批量删除生产计划的参数详情 * - * @param IDs 需要删除的生产计划的参数详情主键集合 + * @param ids 需要删除的生产计划的参数详情主键集合 * @return 结果 */ - public int deletePdiSetupByIDs(Long[] IDs); + public Boolean deletePdiSetupByids(Long[] ids); /** * 删除生产计划的参数详情信息 * - * @param ID 生产计划的参数详情主键 + * @param id 生产计划的参数详情主键 * @return 结果 */ - public int deletePdiSetupByID(Long ID); + public Boolean deletePdiSetupByid(Long id); } diff --git a/business/src/main/java/com/fizz/business/service/ISetupTensionService.java b/business/src/main/java/com/fizz/business/service/ISetupTensionService.java index 1a26344..7dad000 100644 --- a/business/src/main/java/com/fizz/business/service/ISetupTensionService.java +++ b/business/src/main/java/com/fizz/business/service/ISetupTensionService.java @@ -6,18 +6,18 @@ import com.fizz.business.domain.SetupTension; /** * 全线张力Service接口 * - * @author Joshi - * @date 2025-09-25 + * @author ruoyi + * @date 2025-09-26 */ public interface ISetupTensionService { /** * 查询全线张力 * - * @param THICK 全线张力主键 + * @param thick 全线张力主键 * @return 全线张力 */ - public SetupTension selectSetupTensionByTHICK(Long THICK); + public SetupTension selectSetupTensionByThick(Long thick,Long yieldStren); /** * 查询全线张力列表 @@ -46,16 +46,16 @@ public interface ISetupTensionService /** * 批量删除全线张力 * - * @param THICKs 需要删除的全线张力主键集合 + * @param thicks 需要删除的全线张力主键集合 * @return 结果 */ - public int deleteSetupTensionByTHICKs(Long[] THICKs); + public int deleteSetupTensionByThicks(Long[] thicks,Long[] yieldStrens ); /** * 删除全线张力信息 * - * @param THICK 全线张力主键 + * @param thick 全线张力主键 * @return 结果 */ - public int deleteSetupTensionByTHICK(Long THICK); + 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 index 34b919d..301a4a3 100644 --- a/business/src/main/java/com/fizz/business/service/ISetupTlService.java +++ b/business/src/main/java/com/fizz/business/service/ISetupTlService.java @@ -6,8 +6,8 @@ import com.fizz.business.domain.SetupTl; /** * 拉矫机参数Service接口 * - * @author Joshi - * @date 2025-09-25 + * @author ruoyi + * @date 2025-09-26 */ public interface ISetupTlService { @@ -17,7 +17,7 @@ public interface ISetupTlService * @param steelGrade 拉矫机参数主键 * @return 拉矫机参数 */ - public SetupTl selectSetupTlBySteelGrade(String steelGrade); + public SetupTl selectSetupTlBySteelGrade(String steelGrade,Long yieldStren,Long thick); /** * 查询拉矫机参数列表 @@ -49,7 +49,7 @@ public interface ISetupTlService * @param steelGrades 需要删除的拉矫机参数主键集合 * @return 结果 */ - public int deleteSetupTlBySteelGrades(String[] steelGrades); + public int deleteSetupTlBySteelGrades(String[] steelGrades,Long[] yieldStrens,Long[] thicks); /** * 删除拉矫机参数信息 diff --git a/business/src/main/java/com/fizz/business/service/ISetupTmBendforceService.java b/business/src/main/java/com/fizz/business/service/ISetupTmBendforceService.java index 6d5021c..adad3ae 100644 --- a/business/src/main/java/com/fizz/business/service/ISetupTmBendforceService.java +++ b/business/src/main/java/com/fizz/business/service/ISetupTmBendforceService.java @@ -7,17 +7,17 @@ import com.fizz.business.domain.SetupTmBendforce; * 光整机弯辊力Service接口 * * @author Joshi - * @date 2025-09-25 + * @date 2025-09-26 */ public interface ISetupTmBendforceService { /** * 查询光整机弯辊力 * - * @param WIDTH 光整机弯辊力主键 + * @param width 光整机弯辊力主键 * @return 光整机弯辊力 */ - public SetupTmBendforce selectSetupTmBendforceByWIDTH(Long WIDTH); + public SetupTmBendforce selectSetupTmBendforceByWidth(Long width,Long rollForce); /** * 查询光整机弯辊力列表 @@ -46,16 +46,16 @@ public interface ISetupTmBendforceService /** * 批量删除光整机弯辊力 * - * @param WIDTHs 需要删除的光整机弯辊力主键集合 + * @param widths 需要删除的光整机弯辊力主键集合 * @return 结果 */ - public int deleteSetupTmBendforceByWIDTHs(Long[] WIDTHs); + public int deleteSetupTmBendforceByWidths(Long[] widths,Long[] rollForces); /** * 删除光整机弯辊力信息 * - * @param WIDTH 光整机弯辊力主键 + * @param width 光整机弯辊力主键 * @return 结果 */ - public int deleteSetupTmBendforceByWIDTH(Long WIDTH); + 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 index e2c8ce7..f289ef6 100644 --- a/business/src/main/java/com/fizz/business/service/ISetupTmMeshService.java +++ b/business/src/main/java/com/fizz/business/service/ISetupTmMeshService.java @@ -7,7 +7,7 @@ import com.fizz.business.domain.SetupTmMesh; * 光整机插入量Service接口 * * @author Joshi - * @date 2025-09-25 + * @date 2025-09-26 */ public interface ISetupTmMeshService { @@ -17,7 +17,7 @@ public interface ISetupTmMeshService * @param steelGrade 光整机插入量主键 * @return 光整机插入量 */ - public SetupTmMesh selectSetupTmMeshBySteelGrade(String steelGrade); + public SetupTmMesh selectSetupTmMeshBySteelGrade(String steelGrade,Long yildStren,Long thick); /** * 查询光整机插入量列表 @@ -49,7 +49,7 @@ public interface ISetupTmMeshService * @param steelGrades 需要删除的光整机插入量主键集合 * @return 结果 */ - public int deleteSetupTmMeshBySteelGrades(String[] steelGrades); + public int deleteSetupTmMeshBySteelGrades(String[] steelGrades,Long[] yildStrens,Long[] thicks); /** * 删除光整机插入量信息 diff --git a/business/src/main/java/com/fizz/business/service/ISetupTmRollforceService.java b/business/src/main/java/com/fizz/business/service/ISetupTmRollforceService.java index 4f90fc6..2f27ed4 100644 --- a/business/src/main/java/com/fizz/business/service/ISetupTmRollforceService.java +++ b/business/src/main/java/com/fizz/business/service/ISetupTmRollforceService.java @@ -7,7 +7,7 @@ import com.fizz.business.domain.SetupTmRollforce; * 光整机轧制力Service接口 * * @author Joshi - * @date 2025-09-25 + * @date 2025-09-26 */ public interface ISetupTmRollforceService { @@ -17,7 +17,7 @@ public interface ISetupTmRollforceService * @param steelGrade 光整机轧制力主键 * @return 光整机轧制力 */ - public SetupTmRollforce selectSetupTmRollforceBySteelGrade(String steelGrade); + public SetupTmRollforce selectSetupTmRollforceBySteelGrade(String steelGrade,Long yieldStren,Long thick,Long elong); /** * 查询光整机轧制力列表 @@ -49,7 +49,7 @@ public interface ISetupTmRollforceService * @param steelGrades 需要删除的光整机轧制力主键集合 * @return 结果 */ - public int deleteSetupTmRollforceBySteelGrades(String[] steelGrades); + public int deleteSetupTmRollforceBySteelGrades(String[] steelGrades,Long[] yieldStrens,Long[] thicks,Long[] elongs); /** * 删除光整机轧制力信息 diff --git a/business/src/main/java/com/fizz/business/service/impl/PdiSetupServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/PdiSetupServiceImpl.java index a8dd825..6d70157 100644 --- a/business/src/main/java/com/fizz/business/service/impl/PdiSetupServiceImpl.java +++ b/business/src/main/java/com/fizz/business/service/impl/PdiSetupServiceImpl.java @@ -1,8 +1,11 @@ package com.fizz.business.service.impl; +import java.util.Arrays; import java.util.List; -import com.fizz.business.domain.msg.PdiSetup; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -17,21 +20,17 @@ import com.fizz.business.service.IPdiSetupService; * @date 2025-09-25 */ @Service -public class PdiSetupServiceImpl implements IPdiSetupService -{ - @Autowired - private PdiSetupMapper pdiSetupMapper; - +public class PdiSetupServiceImpl extends ServiceImpl implements IPdiSetupService { /** * 查询生产计划的参数详情 * - * @param ID 生产计划的参数详情主键 + * @param id 生产计划的参数详情主键 * @return 生产计划的参数详情 */ @Override - public PdiSetups selectPdiSetupByID(Long ID) + public PdiSetups selectPdiSetupByid(Long id) { - return pdiSetupMapper.selectPdiSetupByID(ID); + return baseMapper.selectById(id); } /** @@ -43,7 +42,9 @@ public class PdiSetupServiceImpl implements IPdiSetupService @Override public List selectPdiSetupList(PdiSetups pdiSetup) { - return pdiSetupMapper.selectPdiSetupList(pdiSetup); + QueryWrapper queryWrapper = new QueryWrapper<>(pdiSetup); + queryWrapper.orderByDesc("create_time"); + return baseMapper.selectList(queryWrapper); } /** @@ -53,10 +54,10 @@ public class PdiSetupServiceImpl implements IPdiSetupService * @return 结果 */ @Override - public int insertPdiSetup(PdiSetups pdiSetup) + public Boolean insertPdiSetup(PdiSetups pdiSetup) { pdiSetup.setCreateTime(DateUtils.getNowDate()); - return pdiSetupMapper.insertPdiSetup(pdiSetup); + return this.save(pdiSetup); } /** @@ -66,33 +67,33 @@ public class PdiSetupServiceImpl implements IPdiSetupService * @return 结果 */ @Override - public int updatePdiSetup(PdiSetups pdiSetup) + public Boolean updatePdiSetup(PdiSetups pdiSetup) { pdiSetup.setUpdateTime(DateUtils.getNowDate()); - return pdiSetupMapper.updatePdiSetup(pdiSetup); + return this.updateById(pdiSetup); } /** * 批量删除生产计划的参数详情 * - * @param IDs 需要删除的生产计划的参数详情主键 + * @param ids 需要删除的生产计划的参数详情主键 * @return 结果 */ @Override - public int deletePdiSetupByIDs(Long[] IDs) + public Boolean deletePdiSetupByids(Long[] ids) { - return pdiSetupMapper.deletePdiSetupByIDs(IDs); + return this.removeByIds(Arrays.asList(ids)); } /** * 删除生产计划的参数详情信息 * - * @param ID 生产计划的参数详情主键 + * @param id 生产计划的参数详情主键 * @return 结果 */ @Override - public int deletePdiSetupByID(Long ID) + public Boolean deletePdiSetupByid(Long id) { - return pdiSetupMapper.deletePdiSetupByID(ID); + return this.removeById(id); } } diff --git a/business/src/main/java/com/fizz/business/service/impl/SetupTensionServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/SetupTensionServiceImpl.java index bead09c..fe825cd 100644 --- a/business/src/main/java/com/fizz/business/service/impl/SetupTensionServiceImpl.java +++ b/business/src/main/java/com/fizz/business/service/impl/SetupTensionServiceImpl.java @@ -11,8 +11,8 @@ import com.fizz.business.service.ISetupTensionService; /** * 全线张力Service业务层处理 * - * @author Joshi - * @date 2025-09-25 + * @author ruoyi + * @date 2025-09-26 */ @Service public class SetupTensionServiceImpl implements ISetupTensionService @@ -23,13 +23,13 @@ public class SetupTensionServiceImpl implements ISetupTensionService /** * 查询全线张力 * - * @param THICK 全线张力主键 + * @param thick 全线张力主键 * @return 全线张力 */ @Override - public SetupTension selectSetupTensionByTHICK(Long THICK) + public SetupTension selectSetupTensionByThick(Long thick,Long yieldStren) { - return setupTensionMapper.selectSetupTensionByTHICK(THICK); + return setupTensionMapper.selectSetupTensionByThick(thick,yieldStren); } /** @@ -73,24 +73,24 @@ public class SetupTensionServiceImpl implements ISetupTensionService /** * 批量删除全线张力 * - * @param THICKs 需要删除的全线张力主键 + * @param thicks 需要删除的全线张力主键 * @return 结果 */ @Override - public int deleteSetupTensionByTHICKs(Long[] THICKs) + public int deleteSetupTensionByThicks(Long[] thicks,Long[] yieldStrens) { - return setupTensionMapper.deleteSetupTensionByTHICKs(THICKs); + return setupTensionMapper.deleteSetupTensionByThicks(thicks,yieldStrens); } /** * 删除全线张力信息 * - * @param THICK 全线张力主键 + * @param thick 全线张力主键 * @return 结果 */ @Override - public int deleteSetupTensionByTHICK(Long THICK) + public int deleteSetupTensionByThick(Long thick) { - return setupTensionMapper.deleteSetupTensionByTHICK(THICK); + return setupTensionMapper.deleteSetupTensionByThick(thick); } } diff --git a/business/src/main/java/com/fizz/business/service/impl/SetupTlServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/SetupTlServiceImpl.java index 0dcca64..c7d43a8 100644 --- a/business/src/main/java/com/fizz/business/service/impl/SetupTlServiceImpl.java +++ b/business/src/main/java/com/fizz/business/service/impl/SetupTlServiceImpl.java @@ -11,8 +11,8 @@ import com.fizz.business.service.ISetupTlService; /** * 拉矫机参数Service业务层处理 * - * @author Joshi - * @date 2025-09-25 + * @author ruoyi + * @date 2025-09-26 */ @Service public class SetupTlServiceImpl implements ISetupTlService @@ -27,9 +27,9 @@ public class SetupTlServiceImpl implements ISetupTlService * @return 拉矫机参数 */ @Override - public SetupTl selectSetupTlBySteelGrade(String steelGrade) + public SetupTl selectSetupTlBySteelGrade(String steelGrade, Long yieldStren, Long thick) { - return setupTlMapper.selectSetupTlBySteelGrade(steelGrade); + return setupTlMapper.selectSetupTlBySteelGrade(steelGrade, yieldStren, thick); } /** @@ -77,9 +77,9 @@ public class SetupTlServiceImpl implements ISetupTlService * @return 结果 */ @Override - public int deleteSetupTlBySteelGrades(String[] steelGrades) + public int deleteSetupTlBySteelGrades(String[] steelGrades,Long[] yieldStres,Long[] thicks) { - return setupTlMapper.deleteSetupTlBySteelGrades(steelGrades); + return setupTlMapper.deleteSetupTlBySteelGrades(steelGrades, yieldStres, thicks); } /** diff --git a/business/src/main/java/com/fizz/business/service/impl/SetupTmBendforceServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/SetupTmBendforceServiceImpl.java index bb0a883..9927086 100644 --- a/business/src/main/java/com/fizz/business/service/impl/SetupTmBendforceServiceImpl.java +++ b/business/src/main/java/com/fizz/business/service/impl/SetupTmBendforceServiceImpl.java @@ -12,7 +12,7 @@ import com.fizz.business.service.ISetupTmBendforceService; * 光整机弯辊力Service业务层处理 * * @author Joshi - * @date 2025-09-25 + * @date 2025-09-26 */ @Service public class SetupTmBendforceServiceImpl implements ISetupTmBendforceService @@ -23,13 +23,13 @@ public class SetupTmBendforceServiceImpl implements ISetupTmBendforceService /** * 查询光整机弯辊力 * - * @param WIDTH 光整机弯辊力主键 + * @param width 光整机弯辊力主键 * @return 光整机弯辊力 */ @Override - public SetupTmBendforce selectSetupTmBendforceByWIDTH(Long WIDTH) + public SetupTmBendforce selectSetupTmBendforceByWidth(Long width,Long rollForce) { - return setupTmBendforceMapper.selectSetupTmBendforceByWIDTH(WIDTH); + return setupTmBendforceMapper.selectSetupTmBendforceByWidth(width,rollForce); } /** @@ -73,24 +73,24 @@ public class SetupTmBendforceServiceImpl implements ISetupTmBendforceService /** * 批量删除光整机弯辊力 * - * @param WIDTHs 需要删除的光整机弯辊力主键 + * @param widths 需要删除的光整机弯辊力主键 * @return 结果 */ @Override - public int deleteSetupTmBendforceByWIDTHs(Long[] WIDTHs) + public int deleteSetupTmBendforceByWidths(Long[] widths,Long[] rollForces) { - return setupTmBendforceMapper.deleteSetupTmBendforceByWIDTHs(WIDTHs); + return setupTmBendforceMapper.deleteSetupTmBendforceByWidths(widths,rollForces); } /** * 删除光整机弯辊力信息 * - * @param WIDTH 光整机弯辊力主键 + * @param width 光整机弯辊力主键 * @return 结果 */ @Override - public int deleteSetupTmBendforceByWIDTH(Long WIDTH) + public int deleteSetupTmBendforceByWidth(Long width) { - return setupTmBendforceMapper.deleteSetupTmBendforceByWIDTH(WIDTH); + return setupTmBendforceMapper.deleteSetupTmBendforceByWidth(width); } } diff --git a/business/src/main/java/com/fizz/business/service/impl/SetupTmMeshServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/SetupTmMeshServiceImpl.java index 63bb3a2..873ada6 100644 --- a/business/src/main/java/com/fizz/business/service/impl/SetupTmMeshServiceImpl.java +++ b/business/src/main/java/com/fizz/business/service/impl/SetupTmMeshServiceImpl.java @@ -12,7 +12,7 @@ import com.fizz.business.service.ISetupTmMeshService; * 光整机插入量Service业务层处理 * * @author Joshi - * @date 2025-09-25 + * @date 2025-09-26 */ @Service public class SetupTmMeshServiceImpl implements ISetupTmMeshService @@ -27,9 +27,9 @@ public class SetupTmMeshServiceImpl implements ISetupTmMeshService * @return 光整机插入量 */ @Override - public SetupTmMesh selectSetupTmMeshBySteelGrade(String steelGrade) + public SetupTmMesh selectSetupTmMeshBySteelGrade(String steelGrade, Long yieldStren, Long thick) { - return setupTmMeshMapper.selectSetupTmMeshBySteelGrade(steelGrade); + return setupTmMeshMapper.selectSetupTmMeshBySteelGrade(steelGrade, yieldStren, thick); } /** @@ -77,9 +77,9 @@ public class SetupTmMeshServiceImpl implements ISetupTmMeshService * @return 结果 */ @Override - public int deleteSetupTmMeshBySteelGrades(String[] steelGrades) + public int deleteSetupTmMeshBySteelGrades(String[] steelGrades, Long[] yieldStrens, Long[] thicks) { - return setupTmMeshMapper.deleteSetupTmMeshBySteelGrades(steelGrades); + return setupTmMeshMapper.deleteSetupTmMeshBySteelGrades(steelGrades, yieldStrens, thicks); } /** diff --git a/business/src/main/java/com/fizz/business/service/impl/SetupTmRollforceServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/SetupTmRollforceServiceImpl.java index 09a0381..1cb71c6 100644 --- a/business/src/main/java/com/fizz/business/service/impl/SetupTmRollforceServiceImpl.java +++ b/business/src/main/java/com/fizz/business/service/impl/SetupTmRollforceServiceImpl.java @@ -12,7 +12,7 @@ import com.fizz.business.service.ISetupTmRollforceService; * 光整机轧制力Service业务层处理 * * @author Joshi - * @date 2025-09-25 + * @date 2025-09-26 */ @Service public class SetupTmRollforceServiceImpl implements ISetupTmRollforceService @@ -27,9 +27,9 @@ public class SetupTmRollforceServiceImpl implements ISetupTmRollforceService * @return 光整机轧制力 */ @Override - public SetupTmRollforce selectSetupTmRollforceBySteelGrade(String steelGrade) + public SetupTmRollforce selectSetupTmRollforceBySteelGrade(String steelGrade, Long yieldStren, Long thick, Long elong) { - return setupTmRollforceMapper.selectSetupTmRollforceBySteelGrade(steelGrade); + return setupTmRollforceMapper.selectSetupTmRollforceBySteelGrade(steelGrade, yieldStren, thick, elong); } /** @@ -77,9 +77,9 @@ public class SetupTmRollforceServiceImpl implements ISetupTmRollforceService * @return 结果 */ @Override - public int deleteSetupTmRollforceBySteelGrades(String[] steelGrades) + public int deleteSetupTmRollforceBySteelGrades(String[] steelGrades, Long[] thicks, Long[] yieldStrens, Long[] elongs) { - return setupTmRollforceMapper.deleteSetupTmRollforceBySteelGrades(steelGrades); + return setupTmRollforceMapper.deleteSetupTmRollforceBySteelGrades(steelGrades, thicks, yieldStrens, elongs); } /** diff --git a/business/src/main/resources/mapper/PdiSetupMapper.xml b/business/src/main/resources/mapper/PdiSetupMapper.xml index 342ea5c..dba055a 100644 --- a/business/src/main/resources/mapper/PdiSetupMapper.xml +++ b/business/src/main/resources/mapper/PdiSetupMapper.xml @@ -70,9 +70,9 @@ - - where ID = #{ID} + where ID = #{id} @@ -168,14 +168,14 @@ where ID = #{ID} - - delete from pdi_setup where ID = #{ID} + + delete from pdi_setup where ID = #{id} - + delete from pdi_setup where ID in - #{ID} + #{id} \ No newline at end of file diff --git a/business/src/main/resources/mapper/SetupTensionMapper.xml b/business/src/main/resources/mapper/SetupTensionMapper.xml deleted file mode 100644 index 39f2067..0000000 --- a/business/src/main/resources/mapper/SetupTensionMapper.xml +++ /dev/null @@ -1,142 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - select THICK, YIELD_STREN, VALUE1, VALUE2, VALUE3, VALUE4, VALUE5, VALUE6, VALUE7, VALUE8, VALUE9, VALUE10, VALUE11, VALUE12, VALUE13, VALUE14, VALUE15, CREATE_TIME, UPDATE_TIME from setup_tension - - - - - - - - insert into setup_tension - - THICK, - YIELD_STREN, - VALUE1, - VALUE2, - VALUE3, - VALUE4, - VALUE5, - VALUE6, - VALUE7, - VALUE8, - VALUE9, - VALUE10, - VALUE11, - VALUE12, - VALUE13, - VALUE14, - VALUE15, - CREATE_TIME, - UPDATE_TIME, - - - #{THICK}, - #{yieldStren}, - #{VALUE1}, - #{VALUE2}, - #{VALUE3}, - #{VALUE4}, - #{VALUE5}, - #{VALUE6}, - #{VALUE7}, - #{VALUE8}, - #{VALUE9}, - #{VALUE10}, - #{VALUE11}, - #{VALUE12}, - #{VALUE13}, - #{VALUE14}, - #{VALUE15}, - #{createTime}, - #{updateTime}, - - - - - update setup_tension - - YIELD_STREN = #{yieldStren}, - VALUE1 = #{VALUE1}, - VALUE2 = #{VALUE2}, - VALUE3 = #{VALUE3}, - VALUE4 = #{VALUE4}, - VALUE5 = #{VALUE5}, - VALUE6 = #{VALUE6}, - VALUE7 = #{VALUE7}, - VALUE8 = #{VALUE8}, - VALUE9 = #{VALUE9}, - VALUE10 = #{VALUE10}, - VALUE11 = #{VALUE11}, - VALUE12 = #{VALUE12}, - VALUE13 = #{VALUE13}, - VALUE14 = #{VALUE14}, - VALUE15 = #{VALUE15}, - CREATE_TIME = #{createTime}, - UPDATE_TIME = #{updateTime}, - - where THICK = #{THICK} - - - - delete from setup_tension where THICK = #{THICK} - - - - delete from setup_tension where THICK in - - #{THICK} - - - \ No newline at end of file diff --git a/business/src/main/resources/mapper/SetupTlMapper.xml b/business/src/main/resources/mapper/SetupTlMapper.xml deleted file mode 100644 index b8a24b6..0000000 --- a/business/src/main/resources/mapper/SetupTlMapper.xml +++ /dev/null @@ -1,121 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - select STEEL_GRADE, YIELD_STREN, THICK, VALUE1, VALUE2, VALUE3, VALUE4, VALUE5, VALUE6, VALUE7, VALUE8, VALUE9, VALUE10, UPDATE_TIME, CREATE_TIME from setup_tl - - - - - - - - insert into setup_tl - - STEEL_GRADE, - YIELD_STREN, - THICK, - VALUE1, - VALUE2, - VALUE3, - VALUE4, - VALUE5, - VALUE6, - VALUE7, - VALUE8, - VALUE9, - VALUE10, - UPDATE_TIME, - CREATE_TIME, - - - #{steelGrade}, - #{yieldStren}, - #{THICK}, - #{VALUE1}, - #{VALUE2}, - #{VALUE3}, - #{VALUE4}, - #{VALUE5}, - #{VALUE6}, - #{VALUE7}, - #{VALUE8}, - #{VALUE9}, - #{VALUE10}, - #{updateTime}, - #{createTime}, - - - - - update setup_tl - - YIELD_STREN = #{yieldStren}, - THICK = #{THICK}, - VALUE1 = #{VALUE1}, - VALUE2 = #{VALUE2}, - VALUE3 = #{VALUE3}, - VALUE4 = #{VALUE4}, - VALUE5 = #{VALUE5}, - VALUE6 = #{VALUE6}, - VALUE7 = #{VALUE7}, - VALUE8 = #{VALUE8}, - VALUE9 = #{VALUE9}, - VALUE10 = #{VALUE10}, - UPDATE_TIME = #{updateTime}, - CREATE_TIME = #{createTime}, - - where STEEL_GRADE = #{steelGrade} - - - - delete from setup_tl where STEEL_GRADE = #{steelGrade} - - - - delete from setup_tl where STEEL_GRADE in - - #{steelGrade} - - - \ No newline at end of file diff --git a/business/src/main/resources/mapper/SetupTmBendforceMapper.xml b/business/src/main/resources/mapper/SetupTmBendforceMapper.xml deleted file mode 100644 index ac9a66a..0000000 --- a/business/src/main/resources/mapper/SetupTmBendforceMapper.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - - - - - - - - select WIDTH, ROLL_FORCE, VALUE1, VALUE2, VALUE3, VALUE4, UPDATE_TIME, CREATE_TIME from setup_tm_bendforce - - - - - - - - insert into setup_tm_bendforce - - WIDTH, - ROLL_FORCE, - VALUE1, - VALUE2, - VALUE3, - VALUE4, - UPDATE_TIME, - CREATE_TIME, - - - #{WIDTH}, - #{rollForce}, - #{VALUE1}, - #{VALUE2}, - #{VALUE3}, - #{VALUE4}, - #{updateTime}, - #{createTime}, - - - - - update setup_tm_bendforce - - ROLL_FORCE = #{rollForce}, - VALUE1 = #{VALUE1}, - VALUE2 = #{VALUE2}, - VALUE3 = #{VALUE3}, - VALUE4 = #{VALUE4}, - UPDATE_TIME = #{updateTime}, - CREATE_TIME = #{createTime}, - - where WIDTH = #{WIDTH} - - - - delete from setup_tm_bendforce where WIDTH = #{WIDTH} - - - - delete from setup_tm_bendforce where WIDTH in - - #{WIDTH} - - - \ No newline at end of file diff --git a/business/src/main/resources/mapper/SetupTmMeshMapper.xml b/business/src/main/resources/mapper/SetupTmMeshMapper.xml deleted file mode 100644 index eb779a3..0000000 --- a/business/src/main/resources/mapper/SetupTmMeshMapper.xml +++ /dev/null @@ -1,121 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - select STEEL_GRADE, YIELD_STREN, THICK, VALUE1, VALUE2, VALUE3, VALUE4, VALUE5, VALUE6, VALUE7, VALUE8, VALUE9, VALUE10, UPDATE_TIME, CREATE_TIME from setup_tm_mesh - - - - - - - - insert into setup_tm_mesh - - STEEL_GRADE, - YIELD_STREN, - THICK, - VALUE1, - VALUE2, - VALUE3, - VALUE4, - VALUE5, - VALUE6, - VALUE7, - VALUE8, - VALUE9, - VALUE10, - UPDATE_TIME, - CREATE_TIME, - - - #{steelGrade}, - #{yieldStren}, - #{THICK}, - #{VALUE1}, - #{VALUE2}, - #{VALUE3}, - #{VALUE4}, - #{VALUE5}, - #{VALUE6}, - #{VALUE7}, - #{VALUE8}, - #{VALUE9}, - #{VALUE10}, - #{updateTime}, - #{createTime}, - - - - - update setup_tm_mesh - - YIELD_STREN = #{yieldStren}, - THICK = #{THICK}, - VALUE1 = #{VALUE1}, - VALUE2 = #{VALUE2}, - VALUE3 = #{VALUE3}, - VALUE4 = #{VALUE4}, - VALUE5 = #{VALUE5}, - VALUE6 = #{VALUE6}, - VALUE7 = #{VALUE7}, - VALUE8 = #{VALUE8}, - VALUE9 = #{VALUE9}, - VALUE10 = #{VALUE10}, - UPDATE_TIME = #{updateTime}, - CREATE_TIME = #{createTime}, - - where STEEL_GRADE = #{steelGrade} - - - - delete from setup_tm_mesh where STEEL_GRADE = #{steelGrade} - - - - delete from setup_tm_mesh where STEEL_GRADE in - - #{steelGrade} - - - \ No newline at end of file diff --git a/business/src/main/resources/mapper/SetupTmRollforceMapper.xml b/business/src/main/resources/mapper/SetupTmRollforceMapper.xml deleted file mode 100644 index 14199b7..0000000 --- a/business/src/main/resources/mapper/SetupTmRollforceMapper.xml +++ /dev/null @@ -1,125 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - select STEEL_GRADE, THICK, YIELD_STREN, ELONG, VALUE1, VALUE2, VALUE3, VALUE4, VALUE5, VALUE6, VALUE7, VALUE8, VALUE9, VALUE10, UPDATE_TIME, CREATE_TIME from setup_tm_rollforce - - - - - - - - insert into setup_tm_rollforce - - STEEL_GRADE, - THICK, - YIELD_STREN, - ELONG, - VALUE1, - VALUE2, - VALUE3, - VALUE4, - VALUE5, - VALUE6, - VALUE7, - VALUE8, - VALUE9, - VALUE10, - UPDATE_TIME, - CREATE_TIME, - - - #{steelGrade}, - #{THICK}, - #{yieldStren}, - #{ELONG}, - #{VALUE1}, - #{VALUE2}, - #{VALUE3}, - #{VALUE4}, - #{VALUE5}, - #{VALUE6}, - #{VALUE7}, - #{VALUE8}, - #{VALUE9}, - #{VALUE10}, - #{updateTime}, - #{createTime}, - - - - - update setup_tm_rollforce - - THICK = #{THICK}, - YIELD_STREN = #{yieldStren}, - ELONG = #{ELONG}, - VALUE1 = #{VALUE1}, - VALUE2 = #{VALUE2}, - VALUE3 = #{VALUE3}, - VALUE4 = #{VALUE4}, - VALUE5 = #{VALUE5}, - VALUE6 = #{VALUE6}, - VALUE7 = #{VALUE7}, - VALUE8 = #{VALUE8}, - VALUE9 = #{VALUE9}, - VALUE10 = #{VALUE10}, - UPDATE_TIME = #{updateTime}, - CREATE_TIME = #{createTime}, - - where STEEL_GRADE = #{steelGrade} - - - - delete from setup_tm_rollforce where STEEL_GRADE = #{steelGrade} - - - - delete from setup_tm_rollforce where STEEL_GRADE in - - #{steelGrade} - - - \ No newline at end of file From e24fc6059ef1aaca15418b35d8d45cd2f443395e Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Fri, 26 Sep 2025 11:32:05 +0800 Subject: [PATCH 08/12] =?UTF-8?q?feat(mapper):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E8=A1=A8=E7=9A=84MyBatis=E6=98=A0=E5=B0=84?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增 SetupTensionMapper.xml，包含张力设置表的增删改查操作 - 新增 SetupTlMapper.xml，包含TL设置表的增删改查操作- 新增 SetupTmBendforceMapper.xml，包含弯曲力设置表的增删改查操作- 新增 SetupTmMeshMapper.xml，包含网格设置表的增删改查操作- 新增 SetupTmRollforceMapper.xml，包含轧制力设置表的增删改查操作- 所有映射文件均定义了完整的ResultMap和SQL片段 - 支持动态SQL查询和批量删除操作 --- .../resources/mapper/SetupTensionMapper.xml | 147 ++++++++++++++++++ .../main/resources/mapper/SetupTlMapper.xml | 130 ++++++++++++++++ .../mapper/SetupTmBendforceMapper.xml | 91 +++++++++++ .../resources/mapper/SetupTmMeshMapper.xml | 127 +++++++++++++++ .../mapper/SetupTmRollforceMapper.xml | 132 ++++++++++++++++ 5 files changed, 627 insertions(+) create mode 100644 business/src/main/resources/mapper/SetupTensionMapper.xml create mode 100644 business/src/main/resources/mapper/SetupTlMapper.xml create mode 100644 business/src/main/resources/mapper/SetupTmBendforceMapper.xml create mode 100644 business/src/main/resources/mapper/SetupTmMeshMapper.xml create mode 100644 business/src/main/resources/mapper/SetupTmRollforceMapper.xml diff --git a/business/src/main/resources/mapper/SetupTensionMapper.xml b/business/src/main/resources/mapper/SetupTensionMapper.xml new file mode 100644 index 0000000..4d14b72 --- /dev/null +++ b/business/src/main/resources/mapper/SetupTensionMapper.xml @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + select thick, yield_stren, value1, value2, value3, value4, value5, value6, value7, value8, value9, value10, value11, value12, value13, value14, value15, create_time, update_time from setup_tension + + + + + + + + insert into setup_tension + + thick, + yield_stren, + value1, + value2, + value3, + value4, + value5, + value6, + value7, + value8, + value9, + value10, + value11, + value12, + value13, + value14, + value15, + create_time, + update_time, + + + #{thick}, + #{yieldStren}, + #{value1}, + #{value2}, + #{value3}, + #{value4}, + #{value5}, + #{value6}, + #{value7}, + #{value8}, + #{value9}, + #{value10}, + #{value11}, + #{value12}, + #{value13}, + #{value14}, + #{value15}, + #{createTime}, + #{updateTime}, + + + + + update setup_tension + + yield_stren = #{yieldStren}, + value1 = #{value1}, + value2 = #{value2}, + value3 = #{value3}, + value4 = #{value4}, + value5 = #{value5}, + value6 = #{value6}, + value7 = #{value7}, + value8 = #{value8}, + value9 = #{value9}, + value10 = #{value10}, + value11 = #{value11}, + value12 = #{value12}, + value13 = #{value13}, + value14 = #{value14}, + value15 = #{value15}, + create_time = #{createTime}, + update_time = #{updateTime}, + + where thick = #{thick} + + + + delete from setup_tension where thick = #{thick} + + + + delete from setup_tension + where + + thick = #{thicks[${index}]} + AND yield_stren = #{yieldStren[${index}]} + + + \ No newline at end of file diff --git a/business/src/main/resources/mapper/SetupTlMapper.xml b/business/src/main/resources/mapper/SetupTlMapper.xml new file mode 100644 index 0000000..2c9eb4a --- /dev/null +++ b/business/src/main/resources/mapper/SetupTlMapper.xml @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + select steel_grade, yield_stren, thick, value1, value2, value3, value4, value5, value6, value7, value8, value9, value10, update_time, create_time from setup_tl + + + + + + + + insert into setup_tl + + steel_grade, + yield_stren, + thick, + value1, + value2, + value3, + value4, + value5, + value6, + value7, + value8, + value9, + value10, + update_time, + create_time, + + + #{steelGrade}, + #{yieldStren}, + #{thick}, + #{value1}, + #{value2}, + #{value3}, + #{value4}, + #{value5}, + #{value6}, + #{value7}, + #{value8}, + #{value9}, + #{value10}, + #{updateTime}, + #{createTime}, + + + + + update setup_tl + + yield_stren = #{yieldStren}, + thick = #{thick}, + value1 = #{value1}, + value2 = #{value2}, + value3 = #{value3}, + value4 = #{value4}, + value5 = #{value5}, + value6 = #{value6}, + value7 = #{value7}, + value8 = #{value8}, + value9 = #{value9}, + value10 = #{value10}, + update_time = #{updateTime}, + create_time = #{createTime}, + + where steel_grade = #{steelGrade} + + + + delete from setup_tl where steel_grade = #{steelGrade} + + + + DELETE FROM setup_tl + WHERE + + steel_grade = #{steelGrades[${index}]} + AND yield_stren = #{yieldStrens[${index}]} + AND thick = #{thicks[${index}]} + + + + \ No newline at end of file diff --git a/business/src/main/resources/mapper/SetupTmBendforceMapper.xml b/business/src/main/resources/mapper/SetupTmBendforceMapper.xml new file mode 100644 index 0000000..50ba98f --- /dev/null +++ b/business/src/main/resources/mapper/SetupTmBendforceMapper.xml @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + select width, roll_force, value1, value2, value3, value4, update_time, create_time from setup_tm_bendforce + + + + + + + + insert into setup_tm_bendforce + + width, + roll_force, + value1, + value2, + value3, + value4, + update_time, + create_time, + + + #{width}, + #{rollForce}, + #{value1}, + #{value2}, + #{value3}, + #{value4}, + #{updateTime}, + #{createTime}, + + + + + update setup_tm_bendforce + + roll_force = #{rollForce}, + value1 = #{value1}, + value2 = #{value2}, + value3 = #{value3}, + value4 = #{value4}, + update_time = #{updateTime}, + create_time = #{createTime}, + + where width = #{width} + + + + delete from setup_tm_bendforce where width = #{width} + + + + DELETE FROM setup_tm_bendforce + WHERE + + width = #{widths[${index}]} + AND roll_force = #{rollForces[${index}]} + + + + \ No newline at end of file diff --git a/business/src/main/resources/mapper/SetupTmMeshMapper.xml b/business/src/main/resources/mapper/SetupTmMeshMapper.xml new file mode 100644 index 0000000..9bb1383 --- /dev/null +++ b/business/src/main/resources/mapper/SetupTmMeshMapper.xml @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + select steel_grade, yield_stren, thick, value1, value2, value3, value4, value5, value6, value7, value8, value9, value10, update_time, create_time from setup_tm_mesh + + + + + + + + insert into setup_tm_mesh + + steel_grade, + yield_stren, + thick, + value1, + value2, + value3, + value4, + value5, + value6, + value7, + value8, + value9, + value10, + update_time, + create_time, + + + #{steelGrade}, + #{yieldStren}, + #{thick}, + #{value1}, + #{value2}, + #{value3}, + #{value4}, + #{value5}, + #{value6}, + #{value7}, + #{value8}, + #{value9}, + #{value10}, + #{updateTime}, + #{createTime}, + + + + + update setup_tm_mesh + + yield_stren = #{yieldStren}, + thick = #{thick}, + value1 = #{value1}, + value2 = #{value2}, + value3 = #{value3}, + value4 = #{value4}, + value5 = #{value5}, + value6 = #{value6}, + value7 = #{value7}, + value8 = #{value8}, + value9 = #{value9}, + value10 = #{value10}, + update_time = #{updateTime}, + create_time = #{createTime}, + + where steel_grade = #{steelGrade} + + + + delete from setup_tm_mesh where steel_grade = #{steelGrade} + + + + DELETE FROM setup_tm_mesh + WHERE + + thick = #{thicks[${index}]} + AND steel_grade = #{steelGrades[${index}]} + AND yield_stren = #{yieldStrens[${index}]} + + + + \ No newline at end of file diff --git a/business/src/main/resources/mapper/SetupTmRollforceMapper.xml b/business/src/main/resources/mapper/SetupTmRollforceMapper.xml new file mode 100644 index 0000000..25f3334 --- /dev/null +++ b/business/src/main/resources/mapper/SetupTmRollforceMapper.xml @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + select steel_grade, thick, yield_stren, elong, value1, value2, value3, value4, value5, value6, value7, value8, value9, value10, update_time, create_time from setup_tm_rollforce + + + + + + + + insert into setup_tm_rollforce + + steel_grade, + thick, + yield_stren, + elong, + value1, + value2, + value3, + value4, + value5, + value6, + value7, + value8, + value9, + value10, + update_time, + create_time, + + + #{steelGrade}, + #{thick}, + #{yieldStren}, + #{elong}, + #{value1}, + #{value2}, + #{value3}, + #{value4}, + #{value5}, + #{value6}, + #{value7}, + #{value8}, + #{value9}, + #{value10}, + #{updateTime}, + #{createTime}, + + + + + update setup_tm_rollforce + + thick = #{thick}, + yield_stren = #{yieldStren}, + elong = #{elong}, + value1 = #{value1}, + value2 = #{value2}, + value3 = #{value3}, + value4 = #{value4}, + value5 = #{value5}, + value6 = #{value6}, + value7 = #{value7}, + value8 = #{value8}, + value9 = #{value9}, + value10 = #{value10}, + update_time = #{updateTime}, + create_time = #{createTime}, + + where steel_grade = #{steelGrade} + + + + delete from setup_tm_rollforce where steel_grade = #{steelGrade} + + + + DELETE FROM setup_tm_rollforce + WHERE + + thick = #{thicks[${index}]} + AND steel_grade = #{steelGrades[${index}]} + AND yield_stren = #{yieldStrens[${index}]} + AND elong = #{elongs[${index}]} + + + + \ No newline at end of file From 2528cc6c425a64eff6c506f6af2042f3a3800de3 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Fri, 26 Sep 2025 13:14:24 +0800 Subject: [PATCH 09/12] =?UTF-8?q?refactor(controller):=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8E=A5=E5=8F=A3=E5=8F=82=E6=95=B0=E4=BC=A0?= =?UTF-8?q?=E9=80=92=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将多个删除接口的@RequestParam参数改为@RequestBody接收- 新增多个Form类用于封装删除参数 - 统一删除接口路径，增强接口语义化 - 优化Mapper中删除条件的参数引用- 移除实体类中冗余的字段更新逻辑 - 实体类实现Serializable接口并添加序列化ID - 简化Controller中注解导入语句 --- .../controller/PdiSetupController.java | 13 +++---------- .../controller/SetupTensionController.java | 12 ++++++++---- .../controller/SetupTlController.java | 19 ++++++++++--------- .../SetupTmBendforceController.java | 13 ++++++++----- .../controller/SetupTmMeshController.java | 15 +++++++++------ .../SetupTmRollforceController.java | 17 ++++++++++------- .../com/fizz/business/domain/PdiSetups.java | 4 +++- .../fizz/business/form/TensionDeleteForm.java | 12 ++++++++++++ .../com/fizz/business/form/TlDeleteForm.java | 13 +++++++++++++ .../business/form/TmBendforceDeleteForm.java | 12 ++++++++++++ .../fizz/business/form/TmMeshDeleteForm.java | 13 +++++++++++++ .../business/form/TmRollforceDeleteForm.java | 14 ++++++++++++++ .../service/impl/PdiSetupServiceImpl.java | 2 -- .../resources/mapper/SetupTensionMapper.xml | 5 ++--- .../main/resources/mapper/SetupTlMapper.xml | 4 +--- .../mapper/SetupTmBendforceMapper.xml | 3 +-- .../resources/mapper/SetupTmMeshMapper.xml | 4 +--- .../mapper/SetupTmRollforceMapper.xml | 5 +---- 18 files changed, 121 insertions(+), 59 deletions(-) create mode 100644 business/src/main/java/com/fizz/business/form/TensionDeleteForm.java create mode 100644 business/src/main/java/com/fizz/business/form/TlDeleteForm.java create mode 100644 business/src/main/java/com/fizz/business/form/TmBendforceDeleteForm.java create mode 100644 business/src/main/java/com/fizz/business/form/TmMeshDeleteForm.java create mode 100644 business/src/main/java/com/fizz/business/form/TmRollforceDeleteForm.java diff --git a/business/src/main/java/com/fizz/business/controller/PdiSetupController.java b/business/src/main/java/com/fizz/business/controller/PdiSetupController.java index ab1203a..cf1a008 100644 --- a/business/src/main/java/com/fizz/business/controller/PdiSetupController.java +++ b/business/src/main/java/com/fizz/business/controller/PdiSetupController.java @@ -6,14 +6,7 @@ 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.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 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; @@ -39,8 +32,8 @@ public class PdiSetupController extends BaseController /** * 查询生产计划的参数详情列表 */ - @GetMapping("/list") - public TableDataInfo list(PdiSetups pdiSetup) + @PostMapping("/list") + public TableDataInfo list(@RequestBody PdiSetups pdiSetup) { startPage(); List list = pdiSetupService.selectPdiSetupList(pdiSetup); diff --git a/business/src/main/java/com/fizz/business/controller/SetupTensionController.java b/business/src/main/java/com/fizz/business/controller/SetupTensionController.java index 1e49f26..0010a8b 100644 --- a/business/src/main/java/com/fizz/business/controller/SetupTensionController.java +++ b/business/src/main/java/com/fizz/business/controller/SetupTensionController.java @@ -2,6 +2,8 @@ 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.*; @@ -83,9 +85,11 @@ public class SetupTensionController extends BaseController * 删除全线张力 */ @Log(title = "全线张力", businessType = BusinessType.DELETE) - @DeleteMapping() - public AjaxResult remove(@RequestParam Long[] thicks,@RequestParam Long[] yieldStrens) - { - return toAjax(setupTensionService.deleteSetupTensionByThicks(thicks, yieldStrens)); + @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 index c6b4d23..711ea5f 100644 --- a/business/src/main/java/com/fizz/business/controller/SetupTlController.java +++ b/business/src/main/java/com/fizz/business/controller/SetupTlController.java @@ -2,6 +2,8 @@ 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.*; @@ -81,15 +83,14 @@ public class SetupTlController extends BaseController return toAjax(setupTlService.updateSetupTl(setupTl)); } - /** - * 删除拉矫机参数 - */ + // 拉矫机参数删除接口 @Log(title = "拉矫机参数", businessType = BusinessType.DELETE) - @DeleteMapping() - public AjaxResult remove(@RequestParam String[] steelGrades, - @RequestParam Long[] yieldStrens, - @RequestParam Long[] thicks) - { - return toAjax(setupTlService.deleteSetupTlBySteelGrades(steelGrades, yieldStrens, thicks)); + @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 index bae77c4..d3b4905 100644 --- a/business/src/main/java/com/fizz/business/controller/SetupTmBendforceController.java +++ b/business/src/main/java/com/fizz/business/controller/SetupTmBendforceController.java @@ -2,6 +2,8 @@ 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.*; @@ -84,10 +86,11 @@ public class SetupTmBendforceController extends BaseController * 删除光整机弯辊力 */ @Log(title = "光整机弯辊力", businessType = BusinessType.DELETE) - @DeleteMapping() - public AjaxResult remove(@RequestParam Long[] widths, - @RequestParam Long[] rollForces) - { - return toAjax(setupTmBendforceService.deleteSetupTmBendforceByWidths(widths,rollForces)); + @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 index 76983f9..c9c942e 100644 --- a/business/src/main/java/com/fizz/business/controller/SetupTmMeshController.java +++ b/business/src/main/java/com/fizz/business/controller/SetupTmMeshController.java @@ -2,6 +2,8 @@ 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.*; @@ -85,11 +87,12 @@ public class SetupTmMeshController extends BaseController * 删除光整机插入量 */ @Log(title = "光整机插入量", businessType = BusinessType.DELETE) - @DeleteMapping() - public AjaxResult remove( @RequestParam String[] steelGrades, - @RequestParam Long[] yieldStrens, - @RequestParam Long[] thicks) - { - return toAjax(setupTmMeshService.deleteSetupTmMeshBySteelGrades(steelGrades, yieldStrens, thicks)); + @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 index 318d93c..5ea5c48 100644 --- a/business/src/main/java/com/fizz/business/controller/SetupTmRollforceController.java +++ b/business/src/main/java/com/fizz/business/controller/SetupTmRollforceController.java @@ -2,6 +2,8 @@ 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.*; @@ -86,12 +88,13 @@ public class SetupTmRollforceController extends BaseController * 删除光整机轧制力 */ @Log(title = "光整机轧制力", businessType = BusinessType.DELETE) - @DeleteMapping() - public AjaxResult remove(@RequestParam String[] steelGrades, - @RequestParam Long[] thicks, - @RequestParam Long[] yieldStrens, - @RequestParam Long[] elongs) - { - return toAjax(setupTmRollforceService.deleteSetupTmRollforceBySteelGrades(steelGrades, thicks, yieldStrens, elongs)); + @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/domain/PdiSetups.java b/business/src/main/java/com/fizz/business/domain/PdiSetups.java index cc43376..d209a83 100644 --- a/business/src/main/java/com/fizz/business/domain/PdiSetups.java +++ b/business/src/main/java/com/fizz/business/domain/PdiSetups.java @@ -10,6 +10,8 @@ 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 * @@ -18,7 +20,7 @@ import com.ruoyi.common.core.domain.BaseEntity; */ @Data @TableName("pdi_setup") -public class PdiSetups extends BaseEntity +public class PdiSetups implements Serializable { private static final long serialVersionUID = 1L; 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/service/impl/PdiSetupServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/PdiSetupServiceImpl.java index 6d70157..bbf02a2 100644 --- a/business/src/main/java/com/fizz/business/service/impl/PdiSetupServiceImpl.java +++ b/business/src/main/java/com/fizz/business/service/impl/PdiSetupServiceImpl.java @@ -56,7 +56,6 @@ public class PdiSetupServiceImpl extends ServiceImpl @Override public Boolean insertPdiSetup(PdiSetups pdiSetup) { - pdiSetup.setCreateTime(DateUtils.getNowDate()); return this.save(pdiSetup); } @@ -69,7 +68,6 @@ public class PdiSetupServiceImpl extends ServiceImpl @Override public Boolean updatePdiSetup(PdiSetups pdiSetup) { - pdiSetup.setUpdateTime(DateUtils.getNowDate()); return this.updateById(pdiSetup); } diff --git a/business/src/main/resources/mapper/SetupTensionMapper.xml b/business/src/main/resources/mapper/SetupTensionMapper.xml index 4d14b72..e354acb 100644 --- a/business/src/main/resources/mapper/SetupTensionMapper.xml +++ b/business/src/main/resources/mapper/SetupTensionMapper.xml @@ -110,7 +110,6 @@ update setup_tension - yield_stren = #{yieldStren}, value1 = #{value1}, value2 = #{value2}, value3 = #{value3}, @@ -129,7 +128,7 @@ create_time = #{createTime}, update_time = #{updateTime}, - where thick = #{thick} + where thick = #{thick} and yield_stren = #{yieldStren} @@ -141,7 +140,7 @@ where thick = #{thicks[${index}]} - AND yield_stren = #{yieldStren[${index}]} + AND yield_stren = #{yieldStrens[${index}]} \ No newline at end of file diff --git a/business/src/main/resources/mapper/SetupTlMapper.xml b/business/src/main/resources/mapper/SetupTlMapper.xml index 2c9eb4a..33854de 100644 --- a/business/src/main/resources/mapper/SetupTlMapper.xml +++ b/business/src/main/resources/mapper/SetupTlMapper.xml @@ -95,8 +95,6 @@ update setup_tl - yield_stren = #{yieldStren}, - thick = #{thick}, value1 = #{value1}, value2 = #{value2}, value3 = #{value3}, @@ -110,7 +108,7 @@ update_time = #{updateTime}, create_time = #{createTime}, - where steel_grade = #{steelGrade} + where steel_grade = #{steelGrade} and yield_stren = #{yieldStren} and thick = #{thick} diff --git a/business/src/main/resources/mapper/SetupTmBendforceMapper.xml b/business/src/main/resources/mapper/SetupTmBendforceMapper.xml index 50ba98f..cf6dba8 100644 --- a/business/src/main/resources/mapper/SetupTmBendforceMapper.xml +++ b/business/src/main/resources/mapper/SetupTmBendforceMapper.xml @@ -64,7 +64,6 @@ update setup_tm_bendforce - roll_force = #{rollForce}, value1 = #{value1}, value2 = #{value2}, value3 = #{value3}, @@ -72,7 +71,7 @@ update_time = #{updateTime}, create_time = #{createTime}, - where width = #{width} + where width = #{width} and roll_force = #{rollForce} diff --git a/business/src/main/resources/mapper/SetupTmMeshMapper.xml b/business/src/main/resources/mapper/SetupTmMeshMapper.xml index 9bb1383..3e86e79 100644 --- a/business/src/main/resources/mapper/SetupTmMeshMapper.xml +++ b/business/src/main/resources/mapper/SetupTmMeshMapper.xml @@ -92,8 +92,6 @@ update setup_tm_mesh - yield_stren = #{yieldStren}, - thick = #{thick}, value1 = #{value1}, value2 = #{value2}, value3 = #{value3}, @@ -107,7 +105,7 @@ update_time = #{updateTime}, create_time = #{createTime}, - where steel_grade = #{steelGrade} + where steel_grade = #{steelGrade} and yield_stren = #{yieldStren} and thick = #{thick} diff --git a/business/src/main/resources/mapper/SetupTmRollforceMapper.xml b/business/src/main/resources/mapper/SetupTmRollforceMapper.xml index 25f3334..6784683 100644 --- a/business/src/main/resources/mapper/SetupTmRollforceMapper.xml +++ b/business/src/main/resources/mapper/SetupTmRollforceMapper.xml @@ -95,9 +95,6 @@ update setup_tm_rollforce - thick = #{thick}, - yield_stren = #{yieldStren}, - elong = #{elong}, value1 = #{value1}, value2 = #{value2}, value3 = #{value3}, @@ -111,7 +108,7 @@ update_time = #{updateTime}, create_time = #{createTime}, - where steel_grade = #{steelGrade} + where steel_grade = #{steelGrade} and thick = #{thick} and yield_stren = #{yieldStren} and elong = #{elong} From 2099b83c3fb4b503f6478e05d8e92a8d073a8f7c Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Mon, 29 Sep 2025 14:45:10 +0800 Subject: [PATCH 10/12] =?UTF-8?q?feat(business):=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E7=82=89=E7=81=AB=E6=AE=B5=E5=B7=A5=E8=89=BA=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 添加 SetupFurTemp 实体类及对应数据库映射文件 - 实现炉火段工艺参数的增删改查接口 - 提供 RESTful 控制器支持前后端交互 - 支持导出工艺参数数据为 Excel 文件 - 增加权限校验确保操作安全性 --- .../controller/SetupFurTempController.java | 104 +++++++++++ .../com/fizz/business/domain/PdiSetups.java | 15 ++ .../fizz/business/domain/SetupFurTemp.java | 172 ++++++++++++++++++ .../business/mapper/SetupFurTempMapper.java | 61 +++++++ .../service/ISetupFurTempService.java | 61 +++++++ .../service/impl/SetupFurTempServiceImpl.java | 96 ++++++++++ .../resources/mapper/SetupFurTempMapper.xml | 104 +++++++++++ .../target/classes/mapper/SegmentMapper.xml | 9 + 8 files changed, 622 insertions(+) create mode 100644 business/src/main/java/com/fizz/business/controller/SetupFurTempController.java create mode 100644 business/src/main/java/com/fizz/business/domain/SetupFurTemp.java create mode 100644 business/src/main/java/com/fizz/business/mapper/SetupFurTempMapper.java create mode 100644 business/src/main/java/com/fizz/business/service/ISetupFurTempService.java create mode 100644 business/src/main/java/com/fizz/business/service/impl/SetupFurTempServiceImpl.java create mode 100644 business/src/main/resources/mapper/SetupFurTempMapper.xml 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/domain/PdiSetups.java b/business/src/main/java/com/fizz/business/domain/PdiSetups.java index d209a83..7a28873 100644 --- a/business/src/main/java/com/fizz/business/domain/PdiSetups.java +++ b/business/src/main/java/com/fizz/business/domain/PdiSetups.java @@ -148,4 +148,19 @@ public class PdiSetups implements Serializable @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/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/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/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/impl/SetupFurTempServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/SetupFurTempServiceImpl.java new file mode 100644 index 0000000..b185e06 --- /dev/null +++ b/business/src/main/java/com/fizz/business/service/impl/SetupFurTempServiceImpl.java @@ -0,0 +1,96 @@ +package com.fizz.business.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.fizz.business.mapper.SetupFurTempMapper; +import com.fizz.business.domain.SetupFurTemp; +import com.fizz.business.service.ISetupFurTempService; + +/** + * 炉火段工艺参数Service业务层处理 + * + * @author ruoyi + * @date 2025-09-29 + */ +@Service +public class SetupFurTempServiceImpl implements ISetupFurTempService +{ + @Autowired + private SetupFurTempMapper setupFurTempMapper; + + /** + * 查询炉火段工艺参数 + * + * @param steelGrade 炉火段工艺参数主键 + * @return 炉火段工艺参数 + */ + @Override + public SetupFurTemp selectSetupFurTempBySteelGrade(String steelGrade) + { + return setupFurTempMapper.selectSetupFurTempBySteelGrade(steelGrade); + } + + /** + * 查询炉火段工艺参数列表 + * + * @param setupFurTemp 炉火段工艺参数 + * @return 炉火段工艺参数 + */ + @Override + public List selectSetupFurTempList(SetupFurTemp setupFurTemp) + { + return setupFurTempMapper.selectSetupFurTempList(setupFurTemp); + } + + /** + * 新增炉火段工艺参数 + * + * @param setupFurTemp 炉火段工艺参数 + * @return 结果 + */ + @Override + public int insertSetupFurTemp(SetupFurTemp setupFurTemp) + { + setupFurTemp.setCreateTime(DateUtils.getNowDate()); + return setupFurTempMapper.insertSetupFurTemp(setupFurTemp); + } + + /** + * 修改炉火段工艺参数 + * + * @param setupFurTemp 炉火段工艺参数 + * @return 结果 + */ + @Override + public int updateSetupFurTemp(SetupFurTemp setupFurTemp) + { + setupFurTemp.setUpdateTime(DateUtils.getNowDate()); + return setupFurTempMapper.updateSetupFurTemp(setupFurTemp); + } + + /** + * 批量删除炉火段工艺参数 + * + * @param steelGrades 需要删除的炉火段工艺参数主键 + * @return 结果 + */ + @Override + public int deleteSetupFurTempBySteelGrades(String[] steelGrades) + { + return setupFurTempMapper.deleteSetupFurTempBySteelGrades(steelGrades); + } + + /** + * 删除炉火段工艺参数信息 + * + * @param steelGrade 炉火段工艺参数主键 + * @return 结果 + */ + @Override + public int deleteSetupFurTempBySteelGrade(String steelGrade) + { + return setupFurTempMapper.deleteSetupFurTempBySteelGrade(steelGrade); + } +} diff --git a/business/src/main/resources/mapper/SetupFurTempMapper.xml b/business/src/main/resources/mapper/SetupFurTempMapper.xml new file mode 100644 index 0000000..c74041a --- /dev/null +++ b/business/src/main/resources/mapper/SetupFurTempMapper.xml @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + + + + + + select steel_grade, value1, value2, value3, value4, value5, value6, value7, value8, value9, value10, update_time, create_time from setup_fur_temp + + + + + + + + insert into setup_fur_temp + + steel_grade, + value1, + value2, + value3, + value4, + value5, + value6, + value7, + value8, + value9, + value10, + update_time, + create_time, + + + #{steelGrade}, + #{value1}, + #{value2}, + #{value3}, + #{value4}, + #{value5}, + #{value6}, + #{value7}, + #{value8}, + #{value9}, + #{value10}, + #{updateTime}, + #{createTime}, + + + + + update setup_fur_temp + + value1 = #{value1}, + value2 = #{value2}, + value3 = #{value3}, + value4 = #{value4}, + value5 = #{value5}, + value6 = #{value6}, + value7 = #{value7}, + value8 = #{value8}, + value9 = #{value9}, + value10 = #{value10}, + update_time = #{updateTime}, + create_time = #{createTime}, + + where steel_grade = #{steelGrade} + + + + delete from setup_fur_temp where steel_grade = #{steelGrade} + + + + delete from setup_fur_temp where steel_grade in + + #{steelGrade} + + + \ No newline at end of file diff --git a/business/target/classes/mapper/SegmentMapper.xml b/business/target/classes/mapper/SegmentMapper.xml index ced5338..04f0aa7 100644 --- a/business/target/classes/mapper/SegmentMapper.xml +++ b/business/target/classes/mapper/SegmentMapper.xml @@ -61,4 +61,13 @@ + + + From 909125c1b06da2de3505f899a168102f483f6fed Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Thu, 9 Oct 2025 10:38:31 +0800 Subject: [PATCH 11/12] =?UTF-8?q?feat(security):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=AF=B9=20/track/**=20=E8=B7=AF=E5=BE=84=E7=9A=84=E5=8C=BF?= =?UTF-8?q?=E5=90=8D=E8=AE=BF=E9=97=AE=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 SecurityConfig 中为 /track/** 路径配置 permitAll 权限 - 允许匿名用户访问跟踪相关接口 - 统一了匿名访问路径的配置方式 --- .../main/java/com/ruoyi/framework/config/SecurityConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java index 1cba320..834c54b 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java @@ -111,7 +111,7 @@ public class SecurityConfig .authorizeHttpRequests((requests) -> { permitAllUrl.getUrls().forEach(url -> requests.antMatchers(url).permitAll()); // 对于登录login 注册register 验证码captchaImage 允许匿名访问 - requests.antMatchers("/login", "/register", "/captchaImage", "/roller/**","/pdi/**","/pdo/**").permitAll() + requests.antMatchers("/login", "/register", "/captchaImage", "/roller/**","/pdi/**","/pdo/**","/track/**").permitAll() // 静态资源，可匿名访问 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll() .antMatchers("/doc.html","/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/v3/api-docs/**", "/druid/**").permitAll() From e6886f78bf33622d183dd5b99eaa8459ed9dc3c5 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Fri, 10 Oct 2025 14:09:25 +0800 Subject: [PATCH 12/12] =?UTF-8?q?feat(security):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=AF=B9=E4=B8=9A=E5=8A=A1=E6=8E=A5=E5=8F=A3=E7=9A=84=E5=8C=BF?= =?UTF-8?q?=E5=90=8D=E8=AE=BF=E9=97=AE=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在安全配置中新增 /business/** 路径的匿名访问权限- 扩展了默认允许匿名访问的URL列表 - 确保业务相关接口可以无需认证直接访问 --- .../main/java/com/ruoyi/framework/config/SecurityConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java index 834c54b..69c40a9 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java @@ -111,7 +111,7 @@ public class SecurityConfig .authorizeHttpRequests((requests) -> { permitAllUrl.getUrls().forEach(url -> requests.antMatchers(url).permitAll()); // 对于登录login 注册register 验证码captchaImage 允许匿名访问 - requests.antMatchers("/login", "/register", "/captchaImage", "/roller/**","/pdi/**","/pdo/**","/track/**").permitAll() + requests.antMatchers("/login", "/register", "/captchaImage", "/roller/**","/pdi/**","/pdo/**","/track/**","/business/**").permitAll() // 静态资源，可匿名访问 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll() .antMatchers("/doc.html","/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/v3/api-docs/**", "/druid/**").permitAll()