diff --git a/business/src/main/java/com/fizz/business/controller/CrmPdiPlanController.java b/business/src/main/java/com/fizz/business/controller/CrmPdiPlanController.java index 3e521cd..2df8921 100644 --- a/business/src/main/java/com/fizz/business/controller/CrmPdiPlanController.java +++ b/business/src/main/java/com/fizz/business/controller/CrmPdiPlanController.java @@ -17,7 +17,7 @@ import java.util.List; @RestController @RequestMapping("/pdi") -@Tag(name="南钢计划接口") +@Tag(name="计划管理") public class CrmPdiPlanController { @Resource diff --git a/business/src/main/java/com/fizz/business/controller/CrmPdoExcoilController.java b/business/src/main/java/com/fizz/business/controller/CrmPdoExcoilController.java index 3c2d510..bf19367 100644 --- a/business/src/main/java/com/fizz/business/controller/CrmPdoExcoilController.java +++ b/business/src/main/java/com/fizz/business/controller/CrmPdoExcoilController.java @@ -13,7 +13,7 @@ import java.util.List; @RestController @RequestMapping("/pdo") -@Tag(name ="南钢实绩接口") +@Tag(name ="实绩管理") public class CrmPdoExcoilController { @Resource diff --git a/business/src/main/java/com/fizz/business/controller/LogDataController.java b/business/src/main/java/com/fizz/business/controller/LogDataController.java index 8a6a63b..ac666a0 100644 --- a/business/src/main/java/com/fizz/business/controller/LogDataController.java +++ b/business/src/main/java/com/fizz/business/controller/LogDataController.java @@ -15,7 +15,7 @@ import java.util.List; @RestController @RequiredArgsConstructor -@RequestMapping("/logdata" ) +@RequestMapping("/api/logdata" ) @Tag(name="日志管理") @Anonymous public class LogDataController { diff --git a/business/src/main/java/com/fizz/business/controller/ModSetupResultController.java b/business/src/main/java/com/fizz/business/controller/ModSetupResultController.java index fa85e9f..7991f0a 100644 --- a/business/src/main/java/com/fizz/business/controller/ModSetupResultController.java +++ b/business/src/main/java/com/fizz/business/controller/ModSetupResultController.java @@ -14,7 +14,7 @@ import java.util.List; @RestController @RequestMapping("/setup") -@Tag(name ="南钢设定值接口") +@Tag(name ="设定值管理") public class ModSetupResultController { @Resource 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 0f1735c..e4f0e6c 100644 --- a/business/src/main/java/com/fizz/business/controller/ProStoppageController.java +++ b/business/src/main/java/com/fizz/business/controller/ProStoppageController.java @@ -3,6 +3,7 @@ package com.fizz.business.controller; import com.fizz.business.domain.ProStoppage; import com.fizz.business.form.ProStoppageForm; import com.fizz.business.service.ProStoppageService; +import com.ruoyi.common.annotation.Anonymous; import com.ruoyi.common.core.domain.R; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -13,8 +14,9 @@ import javax.annotation.Resource; import java.util.List; @RestController -@RequestMapping("/stoppage") +@RequestMapping("/api/stoppage") @Tag(name= "停机管理",description = "停机管理") +@Anonymous public class ProStoppageController { @Resource diff --git a/business/src/main/java/com/fizz/business/controller/RollerController.java b/business/src/main/java/com/fizz/business/controller/RollerController.java index f835d2b..2db33f1 100644 --- a/business/src/main/java/com/fizz/business/controller/RollerController.java +++ b/business/src/main/java/com/fizz/business/controller/RollerController.java @@ -21,8 +21,8 @@ import java.util.List; import java.util.Map; @RestController -@RequestMapping("/roller") -@Tag(name="南钢轧辊接口") +@RequestMapping("/api/roller") +@Tag(name="轧辊管理") @Anonymous public class RollerController { @Resource 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 d419890..b831db9 100644 --- a/business/src/main/java/com/fizz/business/controller/SteelGradeInfoController.java +++ b/business/src/main/java/com/fizz/business/controller/SteelGradeInfoController.java @@ -15,7 +15,7 @@ import java.util.ArrayList; import java.util.List; -@Tag(name ="南钢钢种接口") +@Tag(name ="钢种管理") @RestController @RequestMapping("/steelGrade") public class SteelGradeInfoController { diff --git a/business/src/main/java/com/fizz/business/domain/ProStoppage.java b/business/src/main/java/com/fizz/business/domain/ProStoppage.java index d28f795..bf34ada 100644 --- a/business/src/main/java/com/fizz/business/domain/ProStoppage.java +++ b/business/src/main/java/com/fizz/business/domain/ProStoppage.java @@ -40,18 +40,18 @@ public class ProStoppage implements Serializable { @Schema(description = "设备") private String seton; - @Schema(description = "开始时间") + @Schema(description = "开始时间", format = "date", pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime startDate; - @Schema(description = "结束时间") + @Schema(description = "结束时间", format = "date", pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime endDate; @Schema(description = "停机时长") private BigDecimal duration; - @Schema(description = "更新时间") + @Schema(description = "更新时间", format = "date", pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private String insdate; diff --git a/business/src/main/java/com/fizz/business/domain/RollHistory.java b/business/src/main/java/com/fizz/business/domain/RollHistory.java index 19b020e..aed5e9c 100644 --- a/business/src/main/java/com/fizz/business/domain/RollHistory.java +++ b/business/src/main/java/com/fizz/business/domain/RollHistory.java @@ -14,7 +14,7 @@ import java.time.LocalDateTime; @Getter @Setter @Builder -@TableName("Roll_history") +@TableName("roll_history") @Schema( description = "轧辊历史") public class RollHistory implements Serializable { private static final long serialVersionUID = 1L; diff --git a/business/src/main/java/com/fizz/business/form/LogDataForm.java b/business/src/main/java/com/fizz/business/form/LogDataForm.java index 4f9f053..b3a2157 100644 --- a/business/src/main/java/com/fizz/business/form/LogDataForm.java +++ b/business/src/main/java/com/fizz/business/form/LogDataForm.java @@ -14,11 +14,11 @@ public class LogDataForm implements Serializable { /** * 开始时间 */ - @Schema(description = "开始时间") + @Schema(description = "开始时间", format = "date", pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime startTime; - @Schema(description = "结束时间") + @Schema(description = "结束时间", format = "date", pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime endTime; diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 0edf184..815b131 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -9,7 +9,7 @@ 4.0.0 jar - nan-steel-dev + process-control-dev web服务入口 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/config/SwaggerConfig.java b/ruoyi-admin/src/main/java/com/ruoyi/web/config/SwaggerConfig.java index 91622e7..f8aa1ef 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/config/SwaggerConfig.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/config/SwaggerConfig.java @@ -48,9 +48,9 @@ public class SwaggerConfig { return new Info() // 设置标题 - .title("标题：若依管理系统_接口文档") + .title("L2系统API") // 描述 - .description("描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...") + .description("过程自动化控制系统接口文档") // 作者信息 .contact(new Contact().name(ruoyiConfig.getName())) // 版本 diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index fb17f3b..e41404a 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -7,9 +7,12 @@ spring: druid: # 主库数据源 master: - ur#l: 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://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 diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index aea3115..899b016 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -1,9 +1,9 @@ # 项目相关配置 ruoyi: # 名称 - name: RuoYi - # 版本 - version: 3.8.8 + name: Fizz + # 版本 3.8.8 + version: 1.0.0 # 版权年份 copyrightYear: 2024 # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） @@ -16,7 +16,8 @@ ruoyi: # 开发环境配置 server: # 服务器的HTTP端口，默认为8080 - port: 8082 + port: 8089 + forward-headers-strategy: framework servlet: # 应用的访问路径 context-path: / @@ -73,8 +74,8 @@ spring: port: 6379 # 数据库索引 database: 0 - # 密码 abcd1234 fe2b3cef78b74d3692909bdcbdf46331 - password: + # 密码 abcd1234 fe2b3cef78b74d3692909bdcbdf46331 KeLunPu123! + password: KeLunPu123! #password: # 连接超时时间 timeout: 10s @@ -154,7 +155,7 @@ springdoc: group-configs: - group: 'default' display-name: 'default' - paths-to-match: '/**' + paths-to-match: '/api/**' packages-to-scan: com.fizz.business.controller diff --git a/ruoyi-admin/src/main/resources/logback.xml b/ruoyi-admin/src/main/resources/logback.xml index a360583..281dc14 100644 --- a/ruoyi-admin/src/main/resources/logback.xml +++ b/ruoyi-admin/src/main/resources/logback.xml @@ -1,7 +1,7 @@ - + @@ -20,7 +20,7 @@ ${log.path}/sys-info.%d{yyyy-MM-dd}.log - 60 + 7 ${log.pattern} @@ -42,7 +42,7 @@ ${log.path}/sys-error.%d{yyyy-MM-dd}.log - 60 + 7 ${log.pattern} @@ -64,7 +64,7 @@ ${log.path}/sys-user.%d{yyyy-MM-dd}.log - 60 + 7 ${log.pattern}