diff --git a/business/pom.xml b/business/pom.xml
index eff6da5..278b63a 100644
--- a/business/pom.xml
+++ b/business/pom.xml
@@ -28,18 +28,18 @@
-
- com.github.xiaoymin
- knife4j-spring-boot-starter
- 3.0.3
-
+
+
+
+
+
-
- io.swagger
- swagger-models
- 1.6.2
-
+
+
+
+
+
@@ -108,11 +108,11 @@
spring-boot-starter-websocket
-
- com.alibaba
- fastjson
- 1.2.83
-
+
+
+
+
+
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 b1feeb1..f52025d 100644
--- a/business/src/main/java/com/fizz/business/controller/CrmPdiPlanController.java
+++ b/business/src/main/java/com/fizz/business/controller/CrmPdiPlanController.java
@@ -8,8 +8,8 @@ import com.fizz.business.service.CrmPdiPlanService;
import com.fizz.business.vo.CrmPdiPlanVO;
import com.fizz.business.vo.PdiPlanSetupInfoVO;
import com.ruoyi.common.core.domain.R;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -17,33 +17,33 @@ import java.util.List;
@RestController
@RequestMapping("/pdi")
-@Api("南钢计划接口")
+@Tag(name="南钢计划接口")
public class CrmPdiPlanController {
@Resource
private CrmPdiPlanService crmPdiPlanService;
@GetMapping("/get/{coilid}")
- @ApiOperation("通过钢卷号或者状态查询计划")
+ @Operation(summary ="通过钢卷号或者状态查询计划")
public R getByCoilId(@PathVariable String coilid) {
return R.ok(crmPdiPlanService.getByCoilIdAndOperId(coilid));
}
@GetMapping("/getOnlineCoil")
- @ApiOperation("通过钢卷号或者状态查询计划")
+ @Operation(summary ="通过钢卷号或者状态查询计划")
public R getByCoilId() {
return R.ok(crmPdiPlanService.getOnlineCoil());
}
@GetMapping("/getCoilInfoAndSetupList")
- @ApiOperation("通过钢卷号获取钢卷信息和设定值列表")
+ @Operation(summary ="通过钢卷号获取钢卷信息和设定值列表")
public R getCoilInfoAndSetupList(@RequestParam String coilid) {
return R.ok(crmPdiPlanService.getCoilInfoAndSetupList(coilid));
}
@PostMapping("/save/coilInfo")
- @ApiOperation("保存钢卷信息")
+ @Operation(summary ="保存钢卷信息")
public R editCoilInfo(@RequestBody CrmPdiPlanForm coilid) {
return R.ok(crmPdiPlanService.editCoilInfo(coilid));
@@ -51,7 +51,7 @@ public class CrmPdiPlanController {
}
@PostMapping("/calc")
- @ApiOperation("计算设定值")
+ @Operation(summary ="计算设定值")
public R editCoilInfo(@RequestBody CalcPdiPlanForm coilid) {
return R.ok(crmPdiPlanService.calcSetup(coilid));
@@ -59,25 +59,25 @@ public class CrmPdiPlanController {
@PostMapping("/add")
- @ApiOperation("新增计划")
+ @Operation(summary ="新增计划")
public R add(@RequestBody CrmPdiPlan crmPdiPlan) {
return R.ok(crmPdiPlanService.addCrmPdiPlan(crmPdiPlan));
}
@PutMapping("/update")
- @ApiOperation("修改计划")
+ @Operation(summary ="修改计划")
public R update(@RequestBody CrmPdiPlan crmPdiPlan) {
return R.ok(crmPdiPlanService.updateCrmPdiPlan(crmPdiPlan));
}
@PostMapping("/delete")
- @ApiOperation("计划删除")
+ @Operation(summary ="计划删除")
public R delete(@RequestBody List coilid) {
return R.ok(crmPdiPlanService.deleteCrmPdiPlan(coilid));
}
@PostMapping("/list")
- @ApiOperation("查询计划列表")
+ @Operation(summary ="查询计划列表")
public R> list(@RequestBody PlanQueryForm form) {
return R.ok(crmPdiPlanService.listAll(form));
}
diff --git a/business/src/main/java/com/fizz/business/controller/CrmPdoExcoilController.java b/business/src/main/java/com/fizz/business/controller/CrmPdoExcoilController.java
index 092d103..3c2d510 100644
--- a/business/src/main/java/com/fizz/business/controller/CrmPdoExcoilController.java
+++ b/business/src/main/java/com/fizz/business/controller/CrmPdoExcoilController.java
@@ -3,10 +3,9 @@ package com.fizz.business.controller;
import com.fizz.business.domain.CrmPdoExcoil;
import com.fizz.business.form.CrmPdoExcoilForm;
import com.fizz.business.service.CrmPdoExcoilService;
-import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.core.domain.R;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -14,39 +13,39 @@ import java.util.List;
@RestController
@RequestMapping("/pdo")
-@Api("南钢实绩接口")
+@Tag(name ="南钢实绩接口")
public class CrmPdoExcoilController {
@Resource
private CrmPdoExcoilService crmPdoExcoilService;
@GetMapping("/get/{excoilid}/{operid}")
- @ApiOperation("查询实绩")
+ @Operation(summary ="查询实绩")
public R getByExcoilIdAndOperId(@PathVariable String excoilid, @PathVariable Integer operid) {
return R.ok(crmPdoExcoilService.getByExcoilIdAndOperId(excoilid, operid));
}
@PostMapping("/add")
- @ApiOperation("新增实绩")
+ @Operation(summary ="新增实绩")
public R add(@RequestBody CrmPdoExcoil crmPdoExcoil) {
return R.ok(crmPdoExcoilService.addCrmPdoExcoil(crmPdoExcoil));
}
@PutMapping("/update")
- @ApiOperation("修改")
+ @Operation(summary ="修改")
public R update(@RequestBody CrmPdoExcoil crmPdoExcoil) {
return R.ok(crmPdoExcoilService.updateCrmPdoExcoil(crmPdoExcoil));
}
@DeleteMapping("/delete/{excoilid}/{operid}")
- @ApiOperation("删除实绩")
+ @Operation(summary ="删除实绩")
public R delete(@PathVariable String excoilid, @PathVariable Integer operid) {
return R.ok(crmPdoExcoilService.deleteCrmPdoExcoil(excoilid, operid));
}
@PostMapping("/list")
- @ApiOperation("查询实绩列表")
+ @Operation(summary ="查询实绩列表")
public R> list(@RequestBody CrmPdoExcoilForm form) {
return R.ok(crmPdoExcoilService.listAll(form));
}
diff --git a/business/src/main/java/com/fizz/business/controller/LogDataController.java b/business/src/main/java/com/fizz/business/controller/LogDataController.java
index 4a2e62c..8a6a63b 100644
--- a/business/src/main/java/com/fizz/business/controller/LogDataController.java
+++ b/business/src/main/java/com/fizz/business/controller/LogDataController.java
@@ -6,9 +6,8 @@ import com.fizz.business.service.LogDataService;
import com.github.pagehelper.PageInfo;
import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.core.domain.R;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -17,13 +16,13 @@ import java.util.List;
@RestController
@RequiredArgsConstructor
@RequestMapping("/logdata" )
-@Api("南钢日志接口")
+@Tag(name="日志管理")
@Anonymous
public class LogDataController {
private final LogDataService logDataService;
- @ApiOperation("历史记录")
+ @Operation(summary = "历史记录")
@PostMapping ("/list" )
public R> getLogDataPage(@RequestBody LogDataForm logDataForm) {
return R.ok(logDataService.pageList(logDataForm));
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 8e94733..fa85e9f 100644
--- a/business/src/main/java/com/fizz/business/controller/ModSetupResultController.java
+++ b/business/src/main/java/com/fizz/business/controller/ModSetupResultController.java
@@ -1,13 +1,12 @@
package com.fizz.business.controller;
-import com.fizz.business.domain.ModSetupResult;
import com.fizz.business.form.CalcPdiPlanForm;
import com.fizz.business.form.ModSetupResultForm;
import com.fizz.business.service.ModSetupResultService;
import com.fizz.business.vo.ModSetupResultVO;
import com.ruoyi.common.core.domain.R;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -15,7 +14,7 @@ import java.util.List;
@RestController
@RequestMapping("/setup")
-@Api("南钢设定值接口")
+@Tag(name ="南钢设定值接口")
public class ModSetupResultController {
@Resource
@@ -23,20 +22,20 @@ public class ModSetupResultController {
// 查询所有记录
@PostMapping("/list")
- @ApiOperation("查询设定值列表")
+ @Operation(summary = "查询设定值列表")
public R> list(@RequestBody ModSetupResultForm form) {
return R.ok(modSetupResultService.list(form));
}
@PostMapping("/calc")
- @ApiOperation("计算设定值")
+ @Operation(summary ="计算设定值")
public R calcSetup(@RequestBody CalcPdiPlanForm form) {
return R.ok(modSetupResultService.calcSetup(form));
}
@GetMapping("/retry")
- @ApiOperation("手动下发设定值")
+ @Operation(summary ="手动下发设定值")
public R retrySetup(@RequestParam String coilid) {
return R.ok(modSetupResultService.retrySetup(coilid));
}
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 6444c44..0f1735c 100644
--- a/business/src/main/java/com/fizz/business/controller/ProStoppageController.java
+++ b/business/src/main/java/com/fizz/business/controller/ProStoppageController.java
@@ -1,14 +1,12 @@
package com.fizz.business.controller;
-import com.fizz.business.domain.CrmPdoExcoil;
import com.fizz.business.domain.ProStoppage;
-import com.fizz.business.form.CrmPdoExcoilForm;
import com.fizz.business.form.ProStoppageForm;
-import com.fizz.business.service.CrmPdoExcoilService;
import com.fizz.business.service.ProStoppageService;
import com.ruoyi.common.core.domain.R;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -16,32 +14,32 @@ import java.util.List;
@RestController
@RequestMapping("/stoppage")
-@Api("南钢停机接口")
+@Tag(name= "停机管理",description = "停机管理")
public class ProStoppageController {
@Resource
private ProStoppageService proStoppageService;
- @PostMapping("/add")
- @ApiOperation("新增实绩")
- public R add(@RequestBody ProStoppage proStoppage) {
- return R.ok(proStoppageService.addProStoppage(proStoppage));
- }
+// @PostMapping("/add")
+// @ApiOperation("新增停机记录")
+// public R add(@RequestBody ProStoppage proStoppage) {
+// return R.ok(proStoppageService.addProStoppage(proStoppage));
+// }
@PutMapping("/update")
- @ApiOperation("修改")
+ @Operation(summary = "修改停机记录")
public R update(@RequestBody ProStoppage proStoppage) {
return R.ok(proStoppageService.updateProStoppage(proStoppage));
}
@DeleteMapping("/delete/{stopid}")
- @ApiOperation("删除实绩")
- public R delete(@PathVariable Long stopid) {
+ @Operation(summary ="删除实绩记录")
+ public R delete(@PathVariable @Parameter(description="停机记录的唯一标识ID") Long stopid) {
return R.ok(proStoppageService.deleteProStoppage(stopid));
}
@PostMapping("/list")
- @ApiOperation("查询实绩列表")
+ @Operation(summary ="查询实绩记录")
public R> list(@RequestBody ProStoppageForm form) {
return R.ok(proStoppageService.listAll(form));
}
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 a0f2909..f835d2b 100644
--- a/business/src/main/java/com/fizz/business/controller/RollerController.java
+++ b/business/src/main/java/com/fizz/business/controller/RollerController.java
@@ -12,8 +12,8 @@ import com.fizz.business.vo.ReadyRollDataVO;
import com.github.pagehelper.PageInfo;
import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.core.domain.R;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -22,7 +22,7 @@ import java.util.Map;
@RestController
@RequestMapping("/roller")
-@Api("南钢轧辊接口")
+@Tag(name="南钢轧辊接口")
@Anonymous
public class RollerController {
@Resource
@@ -32,25 +32,25 @@ public class RollerController {
RollDataService rollDataService;
@GetMapping("/data/standby")
- @ApiOperation("轧辊数据-获取当前备辊信息")
+ @Operation(summary = "轧辊数据-获取当前备辊信息")
public R> getReadyRollList() {
return R.ok(rollDataService.getAllReadyRollList());
}
@GetMapping("/data/ready/{position}/{type}")
- @ApiOperation("轧辊数据-获取离线辊信息")
+ @Operation(summary = "轧辊数据-获取离线辊信息")
public R > getOfflineRollList(@PathVariable String position, @PathVariable String type) {
return R.ok(rollDataService.getReadyRollList(position,type,"OFFLINE"));
}
@GetMapping("/data/online")
- @ApiOperation("轧辊数据-获取在线辊信息")
+ @Operation(summary = "轧辊数据-获取在线辊信息")
public R> getOnlineRollList() {
return R.ok(rollDataService.getOnlineRollList());
}
@PostMapping("/change/standby")
- @ApiOperation("轧辊操作-备辊")
+ @Operation(summary = "轧辊操作-备辊")
public R backupRoll(@RequestBody List rollList) {
String msg = rollDataService.BackupRoll(rollList);
if(ObjectUtil.isEmpty(msg)){
@@ -62,25 +62,25 @@ public class RollerController {
}
@PostMapping("/change/online")
- @ApiOperation("轧辊操作-上线")
+ @Operation(summary = "轧辊操作-上线")
public R> onlineRoll() {
return R.ok(rollDataService.onlineRoll());
}
@GetMapping("/history/changeid")
- @ApiOperation("轧辊历史-获取所有换辊号")
+ @Operation(summary = "轧辊历史-获取所有换辊号")
public R> getChangeIdList() {
return R.ok(rollHistoryService.getChangeIdList());
}
@GetMapping("/history/rollid")
- @ApiOperation("轧辊历史-获取所有轧辊号")
+ @Operation(summary = "轧辊历史-获取所有轧辊号")
public R> getRollIdList() {
return R.ok(rollHistoryService.getRollIdList());
}
@PostMapping("/history/list")
- @ApiOperation("轧辊历史-获取换辊记录")
+ @Operation(summary = "轧辊历史-获取换辊记录")
public R> getRollHistorytList(@RequestBody RollHistoryForm rollHistoryForm) {
return R.ok(rollHistoryService.getRollHistory(rollHistoryForm));
}
diff --git a/business/src/main/java/com/fizz/business/controller/SteelGradeInfoController.java b/business/src/main/java/com/fizz/business/controller/SteelGradeInfoController.java
index 74ade8f..d419890 100644
--- a/business/src/main/java/com/fizz/business/controller/SteelGradeInfoController.java
+++ b/business/src/main/java/com/fizz/business/controller/SteelGradeInfoController.java
@@ -5,8 +5,8 @@ import com.fizz.business.domain.StdAlloy;
import com.fizz.business.service.SteelGradeInfoService;
import com.fizz.business.vo.StdAlloyVO;
import com.ruoyi.common.core.domain.R;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -15,7 +15,7 @@ import java.util.ArrayList;
import java.util.List;
-@Api("南钢钢种接口")
+@Tag(name ="南钢钢种接口")
@RestController
@RequestMapping("/steelGrade")
public class SteelGradeInfoController {
@@ -24,7 +24,7 @@ public class SteelGradeInfoController {
private SteelGradeInfoService steelGradeInfoService;
@GetMapping("/list")
- @ApiOperation("查询钢种列表")
+ @Operation(summary ="查询钢种列表")
public R> list() {
// 使用 LambdaQueryWrapper 查询 StdAlloy 表中的数据
@@ -48,7 +48,7 @@ public class SteelGradeInfoController {
}
@GetMapping("/info")
- @ApiOperation("查询单个钢种详情")
+ @Operation(summary ="询单个钢种详情")
public R getSteelGradeInfo(@RequestParam Integer gradeid) {
// 使用 LambdaQueryWrapper 查询 StdAlloy 表中的数据
@@ -64,18 +64,18 @@ public class SteelGradeInfoController {
@PostMapping("/add")
- @ApiOperation("新增")
+ @Operation(summary ="新增")
public R add(@RequestBody StdAlloy steelGradeInfo) {
return R.ok(steelGradeInfoService.save(steelGradeInfo));
}
@PutMapping("/update")
- @ApiOperation("更新")
+ @Operation(summary ="更新")
public R update(@RequestBody StdAlloy steelGradeInfo) {
return R.ok(steelGradeInfoService.updateById(steelGradeInfo));
}
- @ApiOperation("删除")
+ @Operation(summary ="删除")
@DeleteMapping("/delete/{id}")
public R delete(@PathVariable Integer id) {
return R.ok(steelGradeInfoService.removeById(id));
diff --git a/business/src/main/java/com/fizz/business/controller/TrackController.java b/business/src/main/java/com/fizz/business/controller/TrackController.java
index b3b6600..96b7201 100644
--- a/business/src/main/java/com/fizz/business/controller/TrackController.java
+++ b/business/src/main/java/com/fizz/business/controller/TrackController.java
@@ -5,8 +5,8 @@ import com.fizz.business.form.WebOperateMatForm;
import com.fizz.business.mq.RabbitMQ.RabbitQueueListener;
import com.fizz.business.service.TrackService;
import com.ruoyi.common.core.domain.R;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -19,28 +19,28 @@ import java.util.List;
*/
@RestController
@RequestMapping("/track")
-@Api(value = "过程跟踪页面", tags = "过程跟踪")
+@Tag(name = "过程跟踪")
public class TrackController {
@Resource
TrackService trackService;
@PostMapping("/manual/operate/mat")
- @ApiOperation(value = "页面手动操作钢卷 上线，回退")
+ @Operation(summary = "页面手动操作钢卷 上线，回退")
public R manualOperateMat(@RequestBody @Valid WebOperateMatForm form) {
trackService.operateMatWeb(form);
return R.ok();
}
@PostMapping("/manual/tr/unload")
- @ApiOperation(value = "页面卷取机手动卸卷登记产出")
+ @Operation(summary = "页面卷取机手动卸卷登记产出")
public R manualtrUnload(@RequestBody @Valid WebOperateMatForm form) {
trackService.trUnload(form);
return R.ok();
}
@GetMapping("/measure/list")
- @ApiOperation(value = "获取测量数据list")
+ @Operation(summary = "获取测量数据list")
public R> measureList() {
return R.ok(RabbitQueueListener.measureList);
}
diff --git a/business/src/main/java/com/fizz/business/domain/CrmPdiPlan.java b/business/src/main/java/com/fizz/business/domain/CrmPdiPlan.java
index 1abc83d..7309f5a 100644
--- a/business/src/main/java/com/fizz/business/domain/CrmPdiPlan.java
+++ b/business/src/main/java/com/fizz/business/domain/CrmPdiPlan.java
@@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import com.fizz.business.constants.enums.NextUnitEnum;
import com.fizz.business.constants.enums.OperModeEnum;
import com.fizz.business.constants.enums.PlanStatusEnum;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
@@ -19,134 +19,134 @@ import java.time.LocalDateTime;
public class CrmPdiPlan implements Serializable {
@TableId(type = IdType.AUTO)
- @ApiModelProperty(value = "id")
+ @Schema(description = "id")
private Long id;
- @ApiModelProperty(value = "序号")
+ @Schema(description = "序号")
private Integer seqid;
- @ApiModelProperty(value = "多火轧制次数")
+ @Schema(description = "多火轧制次数")
private Integer operid;
- @ApiModelProperty(value = "轧制模式")
+ @Schema(description = "轧制模式")
private Integer operMode;
- @ApiModelProperty(value = "钢卷id")
+ @Schema(description = "钢卷id")
private String coilid;
- @ApiModelProperty(value = "热轧卷ID")
+ @Schema(description = "热轧卷ID")
private String hotCoilid;
- @ApiModelProperty(value = "道次数")
+ @Schema(description = "道次数")
private Integer passno;
- @ApiModelProperty(value = "退火厚度")
+ @Schema(description = "退火厚度")
private Double annealThick;
- @ApiModelProperty(value = "入口厚度")
+ @Schema(description = "入口厚度")
private Double entryThick;
- @ApiModelProperty(value = "入口宽度")
+ @Schema(description = "入口宽度")
private Double entryWidth;
- @ApiModelProperty(value = "入口重量")
+ @Schema(description = "入口重量")
private Double entryWeight;
- @ApiModelProperty(value = "入口长度")
+ @Schema(description = "入口长度")
private Double entryLength;
- @ApiModelProperty(value = "入口内径")
+ @Schema(description = "入口内径")
private Integer entryInnerDiameter;
- @ApiModelProperty(value = "入口外径")
+ @Schema(description = "入口外径")
private Integer entryOuterDiameter;
- @ApiModelProperty(value = "出口卷号")
+ @Schema(description = "出口卷号")
private String exitCoilid;
- @ApiModelProperty(value = "下工序代码")
+ @Schema(description = "下工序代码")
private String nextUnit;
- @ApiModelProperty(value = "分切数量")
+ @Schema(description = "分切数量")
private Integer splitNum;
- @ApiModelProperty(value = "分切模式")
+ @Schema(description = "分切模式")
private Integer cutMode;
- @ApiModelProperty(value = "出口重量1")
+ @Schema(description = "出口重量1")
private Double exitValue1;
- @ApiModelProperty(value = "出口重量2")
+ @Schema(description = "出口重量2")
private Double exitValue2;
- @ApiModelProperty(value = "出口重量3")
+ @Schema(description = "出口重量3")
private Double exitValue3;
- @ApiModelProperty(value = "出口重量4")
+ @Schema(description = "出口重量4")
private Double exitValue4;
- @ApiModelProperty(value = "出口重量5")
+ @Schema(description = "出口重量5")
private Double exitValue5;
- @ApiModelProperty(value = "出口重量6")
+ @Schema(description = "出口重量6")
private Double exitValue6;
- @ApiModelProperty(value = "出口重量")
+ @Schema(description = "出口重量")
private Double exitWeight;
- @ApiModelProperty(value = "出口长度")
+ @Schema(description = "出口长度")
private Double exitLength;
- @ApiModelProperty(value = "出口厚度")
+ @Schema(description = "出口厚度")
private Double exitThick;
- @ApiModelProperty(value = "出口宽度")
+ @Schema(description = "出口宽度")
private Double exitWidth;
- @ApiModelProperty(value = "钢种")
+ @Schema(description = "钢种")
private String grade;
- @ApiModelProperty(value = "屈服强度")
+ @Schema(description = "屈服强度")
private Integer yieldStrength;
- @ApiModelProperty(value = "抗拉强度")
+ @Schema(description = "抗拉强度")
private Integer tensileStrength;
- @ApiModelProperty(value = "状态")
+ @Schema(description = "状态")
private String status;
- @ApiModelProperty(value = "计划号")
+ @Schema(description = "计划号")
private String planNo;
- @ApiModelProperty(value = "压下率")
+ @Schema(description = "压下率")
private Double reductionRate;
- @ApiModelProperty(value = "热卷温度")
+ @Schema(description = "热卷温度")
private Double hotCoilTemp;
- @ApiModelProperty(value = "厚度正偏差")
+ @Schema(description = "厚度正偏差")
private Double entryThickMaxtol;
- @ApiModelProperty(value = "厚度正偏差")
+ @Schema(description = "厚度正偏差")
private Double entryThickMintol;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty(value = "计划日期")
+ @Schema(description = "计划日期")
private LocalDateTime createTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty(value = "记录日期")
+ @Schema(description = "记录日期")
private LocalDateTime insdate;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty(value = "上线时间")
+ @Schema(description = "上线时间")
private LocalDateTime onlineTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty(value = "开始日期")
+ @Schema(description = "开始日期")
private LocalDateTime startDate;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty(value = "结束日期")
+ @Schema(description = "结束日期")
private LocalDateTime endDate;
}
\ No newline at end of file
diff --git a/business/src/main/java/com/fizz/business/domain/CrmPdoExcoil.java b/business/src/main/java/com/fizz/business/domain/CrmPdoExcoil.java
index cf69457..d4cb60d 100644
--- a/business/src/main/java/com/fizz/business/domain/CrmPdoExcoil.java
+++ b/business/src/main/java/com/fizz/business/domain/CrmPdoExcoil.java
@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
@@ -16,99 +16,99 @@ import java.time.LocalDateTime;
public class CrmPdoExcoil implements Serializable {
@TableId(type = IdType.AUTO)
- @ApiModelProperty(value = "id")
+ @Schema(description = "id")
private Long id;
- @ApiModelProperty(value = "成品卷ID")
+ @Schema(description = "成品卷ID")
private String exitCoilid;
- @ApiModelProperty(value = "进入卷ID")
+ @Schema(description = "进入卷ID")
private String encoilid;
- @ApiModelProperty(value = "钢种")
+ @Schema(description = "钢种")
private String grade;
- @ApiModelProperty(value = "多火轧制次数")
+ @Schema(description = "多火轧制次数")
private Integer operid;
- @ApiModelProperty(value = "分卷id")
+ @Schema(description = "分卷id")
private Integer subid;
- @ApiModelProperty(value = "头部位置")
+ @Schema(description = "头部位置")
private Double headpos;
- @ApiModelProperty(value = "尾部位置")
+ @Schema(description = "尾部位置")
private Double tailpos;
- @ApiModelProperty(value = "班次")
+ @Schema(description = "班次")
private String shift;
- @ApiModelProperty(value = "班组")
+ @Schema(description = "班组")
private String crew;
- @ApiModelProperty(value = "退火厚度")
+ @Schema(description = "退火厚度")
private Double annealThick;
- @ApiModelProperty(value = "入口厚度")
+ @Schema(description = "入口厚度")
private Double entryThick;
- @ApiModelProperty(value = "入口宽度")
+ @Schema(description = "入口宽度")
private Double entryWidth;
- @ApiModelProperty(value = "入口重量")
+ @Schema(description = "入口重量")
private Double entryWeight;
- @ApiModelProperty(value = "成品厚度")
+ @Schema(description = "成品厚度")
private Double exitThick;
- @ApiModelProperty(value = "成品宽度")
+ @Schema(description = "成品宽度")
private Double exitWidth;
- @ApiModelProperty(value = "成品长度")
+ @Schema(description = "成品长度")
private Double exitLength;
- @ApiModelProperty(value = "成品内径")
+ @Schema(description = "成品内径")
private Double exitInnerDiameter;
- @ApiModelProperty(value = "理论出口重量")
+ @Schema(description = "理论出口重量")
private Double calcExitWeight;
- @ApiModelProperty(value = "实际出口重量")
+ @Schema(description = "实际出口重量")
private Double measExitWeight;
- @ApiModelProperty(value = "外径")
+ @Schema(description = "外径")
private Double outerDiameter;
- @ApiModelProperty(value = "状态")
+ @Schema(description = "状态")
private String status;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty(value = "上线时间")
+ @Schema(description = "上线时间")
private LocalDateTime onlineDate;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty(value = "开始时间")
+ @Schema(description = "开始时间")
private LocalDateTime startDate;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty(value = "结束时间")
+ @Schema(description = "结束时间")
private LocalDateTime endDate;
- @ApiModelProperty(value = "插入日期")
+ @Schema(description = "插入日期")
private LocalDateTime insdate;
- @ApiModelProperty(value = "质量")
+ @Schema(description = "质量")
private Double quality;
- @ApiModelProperty(value = "热卷ID")
+ @Schema(description = "热卷ID")
private String hotCoilid;
- @ApiModelProperty(value = "下机组代码")
+ @Schema(description = "下机组代码")
private String nextUnit;
- @ApiModelProperty(value = "备注")
+ @Schema(description = "备注")
private String comments;
- @ApiModelProperty(value = "目的地")
+ @Schema(description = "目的地")
private String destination;
}
diff --git a/business/src/main/java/com/fizz/business/domain/ModSetupResult.java b/business/src/main/java/com/fizz/business/domain/ModSetupResult.java
index 778bfae..4c86e27 100644
--- a/business/src/main/java/com/fizz/business/domain/ModSetupResult.java
+++ b/business/src/main/java/com/fizz/business/domain/ModSetupResult.java
@@ -4,186 +4,185 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
@Data
@TableName("mod_setup_result")
-@ApiModel(value = "ModSetupResult对象", description = "轧机设置结果实体类")
+@Schema( description= "轧机设置结果实体类")
public class ModSetupResult {
- @ApiModelProperty(value = "自增主键")
+ @Schema(description = "自增主键")
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty(value = "logid")
+ @Schema(description = "logid")
private Long logId;
- @ApiModelProperty(value = "钢卷ID")
+ @Schema(description = "钢卷ID")
private String coilId;
- @ApiModelProperty(value = "道次号")
+ @Schema(description = "道次号")
private Integer passno;
- @ApiModelProperty(value = "机架号")
+ @Schema(description = "机架号")
private Integer standId;
- @ApiModelProperty(value = "断面ID")
+ @Schema(description = "断面ID")
private Integer fractId;
- @ApiModelProperty(value = "速度限制")
+ @Schema(description = "速度限制")
private Integer speedLimit;
- @ApiModelProperty(value = "力限制")
+ @Schema(description = "力限制")
private Integer forceLimit;
- @ApiModelProperty(value = "功率限制")
+ @Schema(description = "功率限制")
private Integer powerLimit;
- @ApiModelProperty(value = "入口厚度")
+ @Schema(description = "入口厚度")
private Float entryThick;
- @ApiModelProperty(value = "出口厚度")
+ @Schema(description = "出口厚度")
private Float exitThick;
- @ApiModelProperty(value = "最小厚度")
+ @Schema(description = "最小厚度")
private Float minThick;
- @ApiModelProperty(value = "压下率")
+ @Schema(description = "压下率")
private Float reduction;
- @ApiModelProperty(value = "摩擦系数")
+ @Schema(description = "摩擦系数")
private Float friction;
- @ApiModelProperty(value = "入口凸度")
+ @Schema(description = "入口凸度")
private Float entryCrown;
- @ApiModelProperty(value = "出口凸度")
+ @Schema(description = "出口凸度")
private Float exitCrown;
- @ApiModelProperty(value = "入口张力")
+ @Schema(description = "入口张力")
private Float entryTension;
- @ApiModelProperty(value = "出口张力")
+ @Schema(description = "出口张力")
private Float exitTension;
- @ApiModelProperty(value = "入口应力")
+ @Schema(description = "入口应力")
private Float entryTenstress;
- @ApiModelProperty(value = "出口应力")
+ @Schema(description = "出口应力")
private Float exitTenstress;
- @ApiModelProperty(value = "速度比")
+ @Schema(description = "速度比")
private Float speedFract;
- @ApiModelProperty(value = "入口速度")
+ @Schema(description = "入口速度")
private Float entrySpeed;
- @ApiModelProperty(value = "出口速度")
+ @Schema(description = "出口速度")
private Float exitSpeed;
- @ApiModelProperty(value = "轧制速度")
+ @Schema(description = "轧制速度")
private Float rollSpeed;
- @ApiModelProperty(value = "入口应变")
+ @Schema(description = "入口应变")
private Float sigmae;
- @ApiModelProperty(value = "出口应变")
+ @Schema(description = "出口应变")
private Float sigmas;
- @ApiModelProperty(value = "平均应变")
+ @Schema(description = "平均应变")
private Float sigmaave;
- @ApiModelProperty(value = "轧制力")
+ @Schema(description = "轧制力")
private Float rollForce;
- @ApiModelProperty(value = "轧辊间隙")
+ @Schema(description = "轧辊间隙")
private Float rollgap;
- @ApiModelProperty(value = "超出间隙")
+ @Schema(description = "超出间隙")
private Float overgap;
- @ApiModelProperty(value = "轧机刚度")
+ @Schema(description = "轧机刚度")
private Float millModulus;
- @ApiModelProperty(value = "滑移")
+ @Schema(description = "滑移")
private Float slip;
- @ApiModelProperty(value = "变形半径")
+ @Schema(description = "变形半径")
private Float rdef;
- @ApiModelProperty(value = "轧制角度")
+ @Schema(description = "轧制角度")
private Float angle;
- @ApiModelProperty(value = "中心流量")
+ @Schema(description = "中心流量")
private Float centerFlow;
- @ApiModelProperty(value = "边缘流量")
+ @Schema(description = "边缘流量")
private Float edgeFlow;
- @ApiModelProperty(value = "中心压力")
+ @Schema(description = "中心压力")
private Float centerPress;
- @ApiModelProperty(value = "边缘压力")
+ @Schema(description = "边缘压力")
private Float edgePress;
- @ApiModelProperty(value = "入口温度")
+ @Schema(description = "入口温度")
private Float entryTemp;
- @ApiModelProperty(value = "出口温度")
+ @Schema(description = "出口温度")
private Float exitTemp;
- @ApiModelProperty(value = "工作辊弯曲")
+ @Schema(description = "工作辊弯曲")
private Float wrbend;
- @ApiModelProperty(value = "支撑辊弯曲")
+ @Schema(description = "支撑辊弯曲")
private Float irbend;
- @ApiModelProperty(value = "支撑辊位移")
+ @Schema(description = "支撑辊位移")
private Float irshift;
- @ApiModelProperty(value = "电机电流")
+ @Schema(description = "电机电流")
private Float motorCurrent;
- @ApiModelProperty(value = "电机电压")
+ @Schema(description = "电机电压")
private Float motorVoltage;
- @ApiModelProperty(value = "轧制扭矩")
+ @Schema(description = "轧制扭矩")
private Float rollTorque;
- @ApiModelProperty(value = "总轧制扭矩")
+ @Schema(description = "总轧制扭矩")
private Float totalRollTorque;
- @ApiModelProperty(value = "电机扭矩")
+ @Schema(description = "电机扭矩")
private Float motorTorque;
- @ApiModelProperty(value = "扭矩比")
+ @Schema(description = "扭矩比")
private Float torqueRatio;
- @ApiModelProperty(value = "比扭矩")
+ @Schema(description = "比扭矩")
private Float specTorque;
- @ApiModelProperty(value = "功率")
+ @Schema(description = "功率")
private Float power;
- @ApiModelProperty(value = "负载比")
+ @Schema(description = "负载比")
private Float loadRatio;
- @ApiModelProperty(value = "计算ID 实际用的这个值")
+ @Schema(description = "计算ID 实际用的这个值")
private String calcId;
- @ApiModelProperty(value = "记录插入时间")
+ @Schema(description = "记录插入时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime insdate;
- @ApiModelProperty(value = "创建时间")
+ @Schema(description = "创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
- @ApiModelProperty(value = "更新时间")
+ @Schema(description = "更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
}
diff --git a/business/src/main/java/com/fizz/business/domain/PlantConfig.java b/business/src/main/java/com/fizz/business/domain/PlantConfig.java
index 19c64fe..095453f 100644
--- a/business/src/main/java/com/fizz/business/domain/PlantConfig.java
+++ b/business/src/main/java/com/fizz/business/domain/PlantConfig.java
@@ -2,8 +2,7 @@ package com.fizz.business.domain;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
@@ -11,26 +10,26 @@ import java.time.LocalDateTime;
@Data
@TableName("plant_config")
-@ApiModel(value = "PlantConfig对象", description = "配置数据")
+@Schema(name = "PlantConfig对象", description = "配置数据")
public class PlantConfig implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "名称")
+ @Schema(description = "名称")
private String varname;
- @ApiModelProperty(value = "arrayindex")
+ @Schema(description = "arrayindex")
private Integer arrayindex;
- @ApiModelProperty(value = "描述")
+ @Schema(description = "描述")
private String description;
- @ApiModelProperty(value = "值")
+ @Schema(description = "值")
private String value;
- @ApiModelProperty(value = "单位")
+ @Schema(description = "单位")
private String unit;
- @ApiModelProperty(value = "时间")
+ @Schema(description = "时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime timestamp;
}
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 7606b03..d28f795 100644
--- a/business/src/main/java/com/fizz/business/domain/ProStoppage.java
+++ b/business/src/main/java/com/fizz/business/domain/ProStoppage.java
@@ -4,8 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -15,51 +14,51 @@ import java.time.LocalDateTime;
@Data
@TableName("pro_stoppage")
-@ApiModel(value = "ProStoppage对象", description = "")
+@Schema(description = "ProStoppage对象")
public class ProStoppage implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "停机ID")
+ @Schema(description = "停机ID")
@TableId(value = "stopid", type = IdType.AUTO)
private Long stopid;
- @ApiModelProperty(value = "钢卷号")
+ @Schema(description = "钢卷号")
private String coilid;
- @ApiModelProperty(value = "班")
+ @Schema(description = "班")
private String shift;
- @ApiModelProperty(value = "组")
+ @Schema(description = "组")
private String crew;
- @ApiModelProperty(value = "区域")
+ @Schema(description = "区域")
private String area;
- @ApiModelProperty(value = "机组")
+ @Schema(description = "机组")
private String unit;
- @ApiModelProperty(value = "设备")
+ @Schema(description = "设备")
private String seton;
- @ApiModelProperty(value = "开始时间")
+ @Schema(description = "开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime startDate;
- @ApiModelProperty(value = "结束时间")
+ @Schema(description = "结束时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime endDate;
- @ApiModelProperty(value = "停机时长")
+ @Schema(description = "停机时长")
private BigDecimal duration;
- @ApiModelProperty(value = "更新时间")
+ @Schema(description = "更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private String insdate;
- @ApiModelProperty(value = "停机类型")
+ @Schema(description = "停机类型")
private String stopType;
- @ApiModelProperty(value = "停机原因")
+ @Schema(description = "停机原因")
private String remark;
}
diff --git a/business/src/main/java/com/fizz/business/domain/RollChangeCycle.java b/business/src/main/java/com/fizz/business/domain/RollChangeCycle.java
index 47d255a..e8afa30 100644
--- a/business/src/main/java/com/fizz/business/domain/RollChangeCycle.java
+++ b/business/src/main/java/com/fizz/business/domain/RollChangeCycle.java
@@ -2,8 +2,7 @@ package com.fizz.business.domain;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
@@ -11,29 +10,29 @@ import java.time.LocalDateTime;
@Data
@TableName("roll_change_cycle")
-@ApiModel(value = "RollChangeCycle对象", description = "换辊")
+@Schema(description = "换辊")
public class RollChangeCycle implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "类型")
+ @Schema(description = "类型")
private String type;
- @ApiModelProperty(value = "位置")
+ @Schema(description = "位置")
private String position;
- @ApiModelProperty(value = "机架号")
+ @Schema(description = "机架号")
private Integer standid;
- @ApiModelProperty(value = "轧制长度")
+ @Schema(description = "轧制长度")
private Double rolledLength;
- @ApiModelProperty(value = "轧制重量")
+ @Schema(description = "轧制重量")
private Double rolledWeight;
- @ApiModelProperty(value = "轧制数量")
+ @Schema(description = "轧制数量")
private Integer rolledCount;
- @ApiModelProperty(value = "insdate")
+ @Schema(description = "insdate")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime insdate;
}
diff --git a/business/src/main/java/com/fizz/business/domain/RollData.java b/business/src/main/java/com/fizz/business/domain/RollData.java
index 3213368..cba6cbf 100644
--- a/business/src/main/java/com/fizz/business/domain/RollData.java
+++ b/business/src/main/java/com/fizz/business/domain/RollData.java
@@ -4,8 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Builder;
import lombok.Data;
import lombok.Getter;
@@ -15,7 +14,7 @@ import java.io.Serializable;
import java.time.LocalDateTime;
@TableName("roll_data")
-@ApiModel(value = "RollData对象", description = "轧辊数据")
+@Schema(description = "轧辊数据")
@Getter
@Setter
@Builder
@@ -23,66 +22,66 @@ public class RollData implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "rollid",type = IdType.INPUT)
- @ApiModelProperty(value = "轧辊号")
+ @Schema(description = "轧辊号")
private String rollid;
- @ApiModelProperty(value = "工序")
+ @Schema(description = "工序")
private String seton;
- @ApiModelProperty(value = "类型")
+ @Schema(description = "类型")
private String type;
- @ApiModelProperty(value = "位置")
+ @Schema(description = "位置")
private String position;
- @ApiModelProperty(value = "机架号")
+ @Schema(description = "机架号")
private Integer standid;
- @ApiModelProperty(value = "消耗")
+ @Schema(description = "消耗")
private Integer composition;
- @ApiModelProperty(value = "直径")
+ @Schema(description = "直径")
private Double diameter;
- @ApiModelProperty(value = "粗糙度")
+ @Schema(description = "粗糙度")
private Double rough;
- @ApiModelProperty(value = "凸度")
+ @Schema(description = "凸度")
private Double crown;
- @ApiModelProperty(value = "轧制长度")
+ @Schema(description = "轧制长度")
private Double rolledLength;
- @ApiModelProperty(value = "轧制重量")
+ @Schema(description = "轧制重量")
private Double rolledWeight;
- @ApiModelProperty(value = "轧制数量")
+ @Schema(description = "轧制数量")
private Integer rolledCount;
- @ApiModelProperty(value = "总轧制重量")
+ @Schema(description = "总轧制重量")
private Double totalRolledWeight;
- @ApiModelProperty(value = "总轧制长度")
+ @Schema(description = "总轧制长度")
private Double totalRolledLength;
- @ApiModelProperty(value = "总轧制数量")
+ @Schema(description = "总轧制数量")
private Integer totalRolledCount;
- @ApiModelProperty(value = "修理次数")
+ @Schema(description = "修理次数")
private Integer grindCount;
- @ApiModelProperty(value = "状态")
+ @Schema(description = "状态")
private String status;
- @ApiModelProperty(value = "Installation Time")
+ @Schema(description = "Installation Time")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime instalTime;
- @ApiModelProperty(value = "Deinstallation Time")
+ @Schema(description = "Deinstallation Time")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime deinstalTime;
- @ApiModelProperty(value = "Update Time")
+ @Schema(description = "Update Time")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updtime;
}
diff --git a/business/src/main/java/com/fizz/business/domain/RollHistory.java b/business/src/main/java/com/fizz/business/domain/RollHistory.java
index 486acba..19b020e 100644
--- a/business/src/main/java/com/fizz/business/domain/RollHistory.java
+++ b/business/src/main/java/com/fizz/business/domain/RollHistory.java
@@ -2,8 +2,7 @@ package com.fizz.business.domain;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Builder;
import lombok.Data;
import lombok.Getter;
@@ -16,79 +15,79 @@ import java.time.LocalDateTime;
@Setter
@Builder
@TableName("Roll_history")
-@ApiModel(value = "RollHistory对象", description = "轧辊历史")
+@Schema( description = "轧辊历史")
public class RollHistory implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "轧辊号")
+ @Schema(description = "轧辊号")
private String rollid;
- @ApiModelProperty(value = "换辊id")
+ @Schema(description = "换辊id")
private String changeid;
- @ApiModelProperty(value = "班")
+ @Schema(description = "班")
private String shift;
- @ApiModelProperty(value = "组")
+ @Schema(description = "组")
private String crew;
- @ApiModelProperty(value = "工序")
+ @Schema(description = "工序")
private String seton;
- @ApiModelProperty(value = "类型")
+ @Schema(description = "类型")
private String type;
- @ApiModelProperty(value = "位置")
+ @Schema(description = "位置")
private String position;
- @ApiModelProperty(value = "机架号")
+ @Schema(description = "机架号")
private Integer standid;
- @ApiModelProperty(value = "消化")
+ @Schema(description = "消化")
private Integer composition;
- @ApiModelProperty(value = "直径")
+ @Schema(description = "直径")
private Double diameter;
- @ApiModelProperty(value = "粗糙度")
+ @Schema(description = "粗糙度")
private Double rough;
- @ApiModelProperty(value = "凸度")
+ @Schema(description = "凸度")
private Double crown;
- @ApiModelProperty(value = "轧制长度")
+ @Schema(description = "轧制长度")
private Double rolledLength;
- @ApiModelProperty(value = "轧制重量")
+ @Schema(description = "轧制重量")
private Double rolledWeight;
- @ApiModelProperty(value = "轧制数量")
+ @Schema(description = "轧制数量")
private Integer rolledCount;
- @ApiModelProperty(value = "总轧制重量")
+ @Schema(description = "总轧制重量")
private Double totalRolledWeight;
- @ApiModelProperty(value = "总轧制长度")
+ @Schema(description = "总轧制长度")
private Double totalRolledLength;
- @ApiModelProperty(value = "总轧制数量")
+ @Schema(description = "总轧制数量")
private Integer totalRolledCount;
- @ApiModelProperty(value = "修理次数")
+ @Schema(description = "修理次数")
private Integer grindCount;
- @ApiModelProperty(value = "换辊类型")
+ @Schema(description = "换辊类型")
private String changeType;
- @ApiModelProperty(value = "Installation Time")
+ @Schema(description = "Installation Time")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime instalTime;
- @ApiModelProperty(value = "Deinstallation Time")
+ @Schema(description = "Deinstallation Time")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime deinstalTime;
- @ApiModelProperty(value = "changeTime")
+ @Schema(description = "changeTime")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime changeTime;
}
diff --git a/business/src/main/java/com/fizz/business/domain/ShiftHistory.java b/business/src/main/java/com/fizz/business/domain/ShiftHistory.java
index 3d83c78..7d7dbf2 100644
--- a/business/src/main/java/com/fizz/business/domain/ShiftHistory.java
+++ b/business/src/main/java/com/fizz/business/domain/ShiftHistory.java
@@ -2,8 +2,7 @@ package com.fizz.business.domain;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
@@ -12,17 +11,17 @@ import java.time.LocalDateTime;
@TableName("shift_history")
@Data
-@ApiModel(value = "RollData对象", description = "轧辊数据")
+@Schema( description = "轧辊数据")
public class ShiftHistory implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "班次")
+ @Schema(description = "班次")
private String shift;
- @ApiModelProperty(value = "组次")
+ @Schema(description = "组次")
private String crew;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty(value = "时间")
+ @Schema(description = "时间")
private LocalDateTime insdate;
}
diff --git a/business/src/main/java/com/fizz/business/domain/SteelGradeInfo.java b/business/src/main/java/com/fizz/business/domain/SteelGradeInfo.java
index 24853c5..05be8f2 100644
--- a/business/src/main/java/com/fizz/business/domain/SteelGradeInfo.java
+++ b/business/src/main/java/com/fizz/business/domain/SteelGradeInfo.java
@@ -2,7 +2,7 @@ package com.fizz.business.domain;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
@@ -14,25 +14,25 @@ import java.time.LocalDateTime;
public class SteelGradeInfo implements Serializable {
@TableId(value = "steel_grade_id", type = IdType.AUTO)
- @ApiModelProperty(value = "钢种ID")
+ @Schema(description = "钢种ID")
private Integer steelGradeId;
@TableField("steel_grade_name")
- @ApiModelProperty(value = "钢种名称")
+ @Schema(description = "钢种名称")
private String steelGradeName;
@TableField("steel_grade_des")
- @ApiModelProperty(value = "钢种描述")
+ @Schema(description = "钢种描述")
private String steelGradeDes;
@TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty(value = "创建时间")
+ @Schema(description = "创建时间")
private LocalDateTime createTime;
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty(value = "更新时间")
+ @Schema(description = "更新时间")
private LocalDateTime updateTime;
// Getters and Setters
diff --git a/business/src/main/java/com/fizz/business/form/CalcPdiPlanForm.java b/business/src/main/java/com/fizz/business/form/CalcPdiPlanForm.java
index 21808cc..b1d2a07 100644
--- a/business/src/main/java/com/fizz/business/form/CalcPdiPlanForm.java
+++ b/business/src/main/java/com/fizz/business/form/CalcPdiPlanForm.java
@@ -1,7 +1,6 @@
package com.fizz.business.form;
-
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.util.List;
@@ -9,37 +8,37 @@ import java.util.List;
@Data
public class CalcPdiPlanForm {
- @ApiModelProperty(value = "多火轧制次数")
+ @Schema(description = "多火轧制次数")
private Integer operid;
- @ApiModelProperty(value = "轧制模式 1轧制力 2延伸率")
+ @Schema(description = "轧制模式 1轧制力 2延伸率")
private Integer operMode;
- @ApiModelProperty(value = "钢种")
+ @Schema(description = "钢种")
private String grade;
- @ApiModelProperty(value = "卷ID")
+ @Schema(description = "卷ID")
private String coilid;
- @ApiModelProperty(value = "热轧卷ID")
+ @Schema(description = "热轧卷ID")
private String hotCoilid;
- @ApiModelProperty(value = "道次数")
+ @Schema(description = "道次数")
private Integer passno;
- @ApiModelProperty(value = "入口宽度")
+ @Schema(description = "入口宽度")
private Double entryWidth;
- @ApiModelProperty(value = "退火厚度")
+ @Schema(description = "退火厚度")
private Double annealThick;
- @ApiModelProperty(value = "入口厚度")
+ @Schema(description = "入口厚度")
private Double entryThick;
- @ApiModelProperty(value = "出口厚度")
+ @Schema(description = "出口厚度")
private Double exitThick;
- @ApiModelProperty(value = "设定值列表")
+ @Schema(description = "设定值列表")
List lists;
}
diff --git a/business/src/main/java/com/fizz/business/form/ChangePlanStatusForm.java b/business/src/main/java/com/fizz/business/form/ChangePlanStatusForm.java
index 950ecac..928334f 100644
--- a/business/src/main/java/com/fizz/business/form/ChangePlanStatusForm.java
+++ b/business/src/main/java/com/fizz/business/form/ChangePlanStatusForm.java
@@ -1,6 +1,6 @@
package com.fizz.business.form;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import javax.validation.constraints.NotNull;
@@ -20,15 +20,15 @@ import java.io.Serializable;
public class ChangePlanStatusForm implements Serializable {
@NotNull(message = "状态变更类型不能为空")
- @ApiModelProperty("ONLINE-钢卷上线，UNLOAD-手动卸卷，PRODUCT-生产完成")
+ @Schema(description="ONLINE-钢卷上线，UNLOAD-手动卸卷，PRODUCT-生产完成")
private String operation;
@NotNull(message = "计划id不能为空")
- @ApiModelProperty("主键id")
+ @Schema(description="主键id")
private Long id;
@NotNull(message = "钢卷号不能为空")
- @ApiModelProperty("钢卷号")
+ @Schema(description="钢卷号")
private String coilId;
diff --git a/business/src/main/java/com/fizz/business/form/CrmPdiPlanForm.java b/business/src/main/java/com/fizz/business/form/CrmPdiPlanForm.java
index 8c5c469..cdca8c3 100644
--- a/business/src/main/java/com/fizz/business/form/CrmPdiPlanForm.java
+++ b/business/src/main/java/com/fizz/business/form/CrmPdiPlanForm.java
@@ -1,7 +1,7 @@
package com.fizz.business.form;
import com.fizz.business.vo.ModSetupResultVO;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.util.List;
@@ -10,115 +10,115 @@ import java.util.List;
@Data
public class CrmPdiPlanForm {
- @ApiModelProperty(value = "序列号")
+ @Schema(description = "序列号")
private Integer seqid;
- @ApiModelProperty(value = "多火轧制次数")
+ @Schema(description = "多火轧制次数")
private Integer operid;
- @ApiModelProperty(value = "轧制模式 1轧制力 2延伸率")
+ @Schema(description = "轧制模式 1轧制力 2延伸率")
private Integer operMode;
- @ApiModelProperty(value = "卷ID")
+ @Schema(description = "卷ID")
private String coilid;
- @ApiModelProperty(value = "热轧卷ID")
+ @Schema(description = "热轧卷ID")
private String hotCoilid;
- @ApiModelProperty(value = "道次数")
+ @Schema(description = "道次数")
private Integer passno;
- @ApiModelProperty(value = "退火厚度")
+ @Schema(description = "退火厚度")
private Double annealThick;
- @ApiModelProperty(value = "入口厚度")
+ @Schema(description = "入口厚度")
private Double entryThick;
- @ApiModelProperty(value = "入口宽度")
+ @Schema(description = "入口宽度")
private Double entryWidth;
- @ApiModelProperty(value = "入口重量")
+ @Schema(description = "入口重量")
private Double entryWeight;
- @ApiModelProperty(value = "入口长度")
+ @Schema(description = "入口长度")
private Double entryLength;
- @ApiModelProperty(value = "入口内径")
+ @Schema(description = "入口内径")
private Integer entryInnerDiameter;
- @ApiModelProperty(value = "入口外径")
+ @Schema(description = "入口外径")
private Integer entryOuterDiameter;
- @ApiModelProperty(value = "出口卷号")
+ @Schema(description = "出口卷号")
private String exitCoilid;
- @ApiModelProperty(value = "下工序代码 1冷硬卷 2退火卷 3其他 ")
+ @Schema(description = "下工序代码 1冷硬卷 2退火卷 3其他 ")
private String nextUnit;
- @ApiModelProperty(value = "分割数量")
+ @Schema(description = "分割数量")
private Integer splitNum;
- @ApiModelProperty(value = "切割模式")
+ @Schema(description = "切割模式")
private Integer cutMode;
- @ApiModelProperty(value = "出口重量1")
+ @Schema(description = "出口重量1")
private Double exitValue1;
- @ApiModelProperty(value = "出口重量2")
+ @Schema(description = "出口重量2")
private Double exitValue2;
- @ApiModelProperty(value = "出口重量3")
+ @Schema(description = "出口重量3")
private Double exitValue3;
- @ApiModelProperty(value = "出口重量4")
+ @Schema(description = "出口重量4")
private Double exitValue4;
- @ApiModelProperty(value = "出口重量5")
+ @Schema(description = "出口重量5")
private Double exitValue5;
- @ApiModelProperty(value = "出口重量6")
+ @Schema(description = "出口重量6")
private Double exitValue6;
- @ApiModelProperty(value = "出口重量")
+ @Schema(description = "出口重量")
private Double exitWeight;
- @ApiModelProperty(value = "出口长度")
+ @Schema(description = "出口长度")
private Double exitLength;
- @ApiModelProperty(value = "出口厚度")
+ @Schema(description = "出口厚度")
private Double exitThick;
- @ApiModelProperty(value = "出口宽度")
+ @Schema(description = "出口宽度")
private Double exitWidth;
- @ApiModelProperty(value = "钢种")
+ @Schema(description = "钢种")
private String grade;
- @ApiModelProperty(value = "屈服强度")
+ @Schema(description = "屈服强度")
private Integer yieldStrength;
- @ApiModelProperty(value = "抗拉强度")
+ @Schema(description = "抗拉强度")
private Integer tensileStrength;
- @ApiModelProperty(value = "状态 NEW READY ONLINE PRODUCING PRODUCT")
+ @Schema(description = "状态 NEW READY ONLINE PRODUCING PRODUCT")
private String status;
- @ApiModelProperty(value = "计划号")
+ @Schema(description = "计划号")
private String planNo;
- @ApiModelProperty(value = "压下率")
+ @Schema(description = "压下率")
private Double reductionRate;
- @ApiModelProperty(value = "热卷温度")
+ @Schema(description = "热卷温度")
private Double hotCoilTemp;
- @ApiModelProperty(value = "厚度正偏差")
+ @Schema(description = "厚度正偏差")
private Double entryThickMaxtol;
- @ApiModelProperty(value = "厚度正偏差")
+ @Schema(description = "厚度正偏差")
private Double entryThickMintol;
- @ApiModelProperty(value = "设定值列表")
+ @Schema(description = "设定值列表")
List lists;
}
diff --git a/business/src/main/java/com/fizz/business/form/CrmPdoExcoilForm.java b/business/src/main/java/com/fizz/business/form/CrmPdoExcoilForm.java
index c86ff32..f233743 100644
--- a/business/src/main/java/com/fizz/business/form/CrmPdoExcoilForm.java
+++ b/business/src/main/java/com/fizz/business/form/CrmPdoExcoilForm.java
@@ -1,8 +1,6 @@
package com.fizz.business.form;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
@@ -11,13 +9,13 @@ import java.time.LocalDateTime;
public class CrmPdoExcoilForm {
- @ApiModelProperty(value = "钢卷号")
+ @Schema(description = "钢卷号")
private String encoilid;
- @ApiModelProperty(value = "开始日期")
+ @Schema(description = "开始日期")
private String startDate;
- @ApiModelProperty(value = "结束日期")
+ @Schema(description = "结束日期")
private String endDate;
}
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 6847269..4f9f053 100644
--- a/business/src/main/java/com/fizz/business/form/LogDataForm.java
+++ b/business/src/main/java/com/fizz/business/form/LogDataForm.java
@@ -1,14 +1,11 @@
package com.fizz.business.form;
-import cn.hutool.core.date.DatePattern;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.time.LocalDateTime;
-import java.util.Date;
@Data
public class LogDataForm implements Serializable {
@@ -17,33 +14,33 @@ public class LogDataForm implements Serializable {
/**
* 开始时间
*/
- @ApiModelProperty(value = "开始时间")
+ @Schema(description = "开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime startTime;
- @ApiModelProperty(value = "结束时间")
+ @Schema(description = "结束时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime endTime;
- @ApiModelProperty(value = "报警类型")
+ @Schema(description = "报警类型")
private String logtype;
/**
* 报警模块
*/
- @ApiModelProperty(value = "报警模块")
+ @Schema(description = "报警模块")
private String module;
/**
* 警报内容
*/
- @ApiModelProperty(value = "警报内容")
+ @Schema(description = "警报内容")
private String logtext;
/**
* 报警状态
*/
- @ApiModelProperty(value = "报警状态")
+ @Schema(description = "报警状态")
private Integer status;
private int pageNum;
diff --git a/business/src/main/java/com/fizz/business/form/ModSetupResultCalcForm.java b/business/src/main/java/com/fizz/business/form/ModSetupResultCalcForm.java
index 417e13d..d79826d 100644
--- a/business/src/main/java/com/fizz/business/form/ModSetupResultCalcForm.java
+++ b/business/src/main/java/com/fizz/business/form/ModSetupResultCalcForm.java
@@ -1,22 +1,22 @@
package com.fizz.business.form;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Data
public class ModSetupResultCalcForm {
- @ApiModelProperty(value = "入口厚度")
+ @Schema(description = "入口厚度")
private Float entryThick;
- @ApiModelProperty(value = "出口厚度")
+ @Schema(description = "出口厚度")
private Float exitThick;
- @ApiModelProperty(value = "入口张力")
+ @Schema(description = "入口张力")
private Float entryTension;
- @ApiModelProperty(value = "出口张力")
+ @Schema(description = "出口张力")
private Float exitTension;
diff --git a/business/src/main/java/com/fizz/business/form/ModSetupResultForm.java b/business/src/main/java/com/fizz/business/form/ModSetupResultForm.java
index 2ec56c8..1d918c5 100644
--- a/business/src/main/java/com/fizz/business/form/ModSetupResultForm.java
+++ b/business/src/main/java/com/fizz/business/form/ModSetupResultForm.java
@@ -1,27 +1,27 @@
package com.fizz.business.form;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Data
public class ModSetupResultForm {
- @ApiModelProperty(value = "钢卷ID")
+ @Schema(description = "钢卷ID")
private String coilId;
- @ApiModelProperty(value = "钢种")
+ @Schema(description = "钢种")
private String grade;
- @ApiModelProperty(value = "道次号")
+ @Schema(description = "道次号")
private Integer passno;
- @ApiModelProperty(value = "退火厚度")
+ @Schema(description = "退火厚度")
private Integer annealThick;
- @ApiModelProperty(value = "入口厚度")
+ @Schema(description = "入口厚度")
private Double entryThick;
- @ApiModelProperty(value = "出口厚度")
+ @Schema(description = "出口厚度")
private Double exitThick;
}
diff --git a/business/src/main/java/com/fizz/business/form/PlanQueryForm.java b/business/src/main/java/com/fizz/business/form/PlanQueryForm.java
index c944b36..03e3467 100644
--- a/business/src/main/java/com/fizz/business/form/PlanQueryForm.java
+++ b/business/src/main/java/com/fizz/business/form/PlanQueryForm.java
@@ -1,6 +1,6 @@
package com.fizz.business.form;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
@@ -9,40 +9,40 @@ import java.time.LocalDateTime;
@Data
public class PlanQueryForm {
- @ApiModelProperty(value = "卷ID")
+ @Schema(description = "卷ID")
private String coilid;
- @ApiModelProperty(value = "热轧卷ID")
+ @Schema(description = "热轧卷ID")
private String hotCoilid;
- @ApiModelProperty(value = "道次数")
+ @Schema(description = "道次数")
private Integer passno;
- @ApiModelProperty(value = "入口厚度")
+ @Schema(description = "入口厚度")
private Float entryThick;
- @ApiModelProperty(value = "入口宽度")
+ @Schema(description = "入口宽度")
private Float entryWidth;
- @ApiModelProperty(value = "入口内径")
+ @Schema(description = "入口内径")
private Integer entryInnerDiameter;
- @ApiModelProperty(value = "入口外径")
+ @Schema(description = "入口外径")
private Integer entryOuterDiameter;
- @ApiModelProperty(value = "状态")
+ @Schema(description = "状态")
private String status;
- @ApiModelProperty(value = "记录日期")
+ @Schema(description = "记录日期")
private LocalDateTime insdate;
- @ApiModelProperty(value = "上线时间")
+ @Schema(description = "上线时间")
private LocalDateTime onlineTime;
- @ApiModelProperty(value = "开始日期")
+ @Schema(description = "开始日期")
private LocalDateTime startDate;
- @ApiModelProperty(value = "结束日期")
+ @Schema(description = "结束日期")
private LocalDateTime endDate;
}
diff --git a/business/src/main/java/com/fizz/business/form/ProStoppageForm.java b/business/src/main/java/com/fizz/business/form/ProStoppageForm.java
index 1450e6d..f7e9c53 100644
--- a/business/src/main/java/com/fizz/business/form/ProStoppageForm.java
+++ b/business/src/main/java/com/fizz/business/form/ProStoppageForm.java
@@ -1,13 +1,13 @@
package com.fizz.business.form;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Data
public class ProStoppageForm {
- @ApiModelProperty(value = "开始日期")
+ @Schema(description = "开始时间", example = "2023-08-12", format = "date", pattern = "yyyy-MM-dd")
private String startDate;
- @ApiModelProperty(value = "结束日期")
+ @Schema(description = "结束时间", example = "2025-08-13", format = "date", pattern = "yyyy-MM-dd")
private String endDate;
}
diff --git a/business/src/main/java/com/fizz/business/form/RollHistoryForm.java b/business/src/main/java/com/fizz/business/form/RollHistoryForm.java
index ed49afc..6de0bd1 100644
--- a/business/src/main/java/com/fizz/business/form/RollHistoryForm.java
+++ b/business/src/main/java/com/fizz/business/form/RollHistoryForm.java
@@ -1,25 +1,25 @@
package com.fizz.business.form;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
@Data
public class RollHistoryForm {
- @ApiModelProperty(value = "开始时间")
+ @Schema(description = "开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime startTime;
- @ApiModelProperty(value = "结束时间")
+ @Schema(description = "结束时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime endTime;
- @ApiModelProperty(value = "换辊号")
+ @Schema(description = "换辊号")
private String changeId;
- @ApiModelProperty(value = "轧辊号")
+ @Schema(description = "轧辊号")
private String rollid;
private int pageNum;
diff --git a/business/src/main/java/com/fizz/business/form/WebOperateMatForm.java b/business/src/main/java/com/fizz/business/form/WebOperateMatForm.java
index c968d56..d60835f 100644
--- a/business/src/main/java/com/fizz/business/form/WebOperateMatForm.java
+++ b/business/src/main/java/com/fizz/business/form/WebOperateMatForm.java
@@ -1,7 +1,7 @@
package com.fizz.business.form;
import com.fizz.business.constants.enums.WebMatOperateEnum;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import javax.validation.constraints.NotBlank;
@@ -22,21 +22,21 @@ import java.io.Serializable;
public class WebOperateMatForm implements Serializable {
@NotNull(message = "操作不存在")
- @ApiModelProperty("ONLINE-钢卷上线，NEW-回退，PRODUCT-生成完成")
+ @Schema(description = "ONLINE-钢卷上线，NEW-回退，PRODUCT-生成完成")
private WebMatOperateEnum operation;
@NotNull(message = "主键id不能为空")
- @ApiModelProperty("主键id")
+ @Schema(description = "主键id")
private Long id;
@NotBlank(message = "钢卷号不能为空")
- @ApiModelProperty(value = "钢卷号")
+ @Schema(description = "钢卷号")
private String entryMatId;
- @ApiModelProperty(value = "计划号")
+ @Schema(description = "计划号")
private String planNo;
- @ApiModelProperty(value = "重量")
+ @Schema(description = "重量")
private Double weight;
}
diff --git a/business/src/main/java/com/fizz/business/mq/RabbitMQ/RabbitQueueListener.java b/business/src/main/java/com/fizz/business/mq/RabbitMQ/RabbitQueueListener.java
index e103233..ca129e8 100644
--- a/business/src/main/java/com/fizz/business/mq/RabbitMQ/RabbitQueueListener.java
+++ b/business/src/main/java/com/fizz/business/mq/RabbitMQ/RabbitQueueListener.java
@@ -8,8 +8,8 @@ import com.fizz.business.service.impl.ModSetupResultServiceImpl;
import com.fizz.business.utils.WebSocketUtil;
import com.fizz.business.vo.ModSetupResultKeyVO;
import com.fizz.business.vo.ModSetupResultVO;
-import com.google.common.collect.Lists;
import lombok.extern.log4j.Log4j2;
+import org.apache.commons.compress.utils.Lists;
import org.springframework.amqp.rabbit.annotation.RabbitHandler;
import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.messaging.handler.annotation.Headers;
@@ -21,7 +21,7 @@ import java.util.List;
import java.util.Map;
@Log4j2
-@Component
+//@Component
public class RabbitQueueListener {
public static List measureList = Lists.newArrayList();
diff --git a/business/src/main/java/com/fizz/business/utils/WebSocketUtil.java b/business/src/main/java/com/fizz/business/utils/WebSocketUtil.java
index 8e043a2..a60b169 100644
--- a/business/src/main/java/com/fizz/business/utils/WebSocketUtil.java
+++ b/business/src/main/java/com/fizz/business/utils/WebSocketUtil.java
@@ -4,7 +4,6 @@ import com.alibaba.druid.support.json.JSONUtils;
import com.fizz.business.constants.enums.WsTypeEnum;
import com.fizz.business.service.client.TrackWsHandler;
import com.fizz.business.vo.CrmPdiPlanVO;
-import com.google.common.collect.Maps;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -14,6 +13,7 @@ import org.springframework.web.socket.WebSocketSession;
import javax.annotation.Resource;
import java.io.IOException;
import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
@Slf4j
@@ -28,7 +28,7 @@ public class WebSocketUtil {
}
public static void sendMessage(WsTypeEnum type, String text) {
- Map clients = trackWsHandler.getClients().getOrDefault(type.name(), Maps.newConcurrentMap());
+ Map clients = trackWsHandler.getClients().getOrDefault(type.name(), new ConcurrentHashMap<>());
TextMessage message = new TextMessage(text);
clients.values().forEach(s -> {
try {
diff --git a/business/src/main/java/com/fizz/business/vo/CrmPdiPlanVO.java b/business/src/main/java/com/fizz/business/vo/CrmPdiPlanVO.java
index dc420e5..6cb03f5 100644
--- a/business/src/main/java/com/fizz/business/vo/CrmPdiPlanVO.java
+++ b/business/src/main/java/com/fizz/business/vo/CrmPdiPlanVO.java
@@ -1,10 +1,7 @@
package com.fizz.business.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fizz.business.constants.enums.NextUnitEnum;
-import com.fizz.business.constants.enums.OperModeEnum;
-import com.fizz.business.constants.enums.PlanStatusEnum;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
@@ -13,134 +10,134 @@ import java.time.LocalDateTime;
@Data
public class CrmPdiPlanVO {
- @ApiModelProperty(value = "id")
+ @Schema(description = "id")
private Long id;
- @ApiModelProperty(value = "序列号")
+ @Schema(description = "序列号")
private Integer seqid;
- @ApiModelProperty(value = "多火轧制次数")
+ @Schema(description = "多火轧制次数")
private Integer operid;
- @ApiModelProperty(value = "轧制模式 1轧制力 2延伸率")
+ @Schema(description = "轧制模式 1轧制力 2延伸率")
private Integer operMode;
- @ApiModelProperty(value = "卷ID")
+ @Schema(description = "卷ID")
private String coilid;
- @ApiModelProperty(value = "热轧卷ID")
+ @Schema(description = "热轧卷ID")
private String hotCoilid;
- @ApiModelProperty(value = "道次数")
+ @Schema(description = "道次数")
private Integer passno;
- @ApiModelProperty(value = "退火厚度")
+ @Schema(description = "退火厚度")
private Integer annealThick;
- @ApiModelProperty(value = "入口厚度")
+ @Schema(description = "入口厚度")
private Double entryThick;
- @ApiModelProperty(value = "入口宽度")
+ @Schema(description = "入口宽度")
private Double entryWidth;
- @ApiModelProperty(value = "入口重量")
+ @Schema(description = "入口重量")
private Double entryWeight;
- @ApiModelProperty(value = "入口长度")
+ @Schema(description = "入口长度")
private Double entryLength;
- @ApiModelProperty(value = "入口内径")
+ @Schema(description = "入口内径")
private Integer entryInnerDiameter;
- @ApiModelProperty(value = "入口外径")
+ @Schema(description = "入口外径")
private Integer entryOuterDiameter;
- @ApiModelProperty(value = "出口卷号")
+ @Schema(description = "出口卷号")
private String exitCoilid;
- @ApiModelProperty(value = "下工序代码 1冷硬卷 2退火卷 3其他 ")
+ @Schema(description = "下工序代码 1冷硬卷 2退火卷 3其他 ")
private String nextUnit;
- @ApiModelProperty(value = "分割数量")
+ @Schema(description = "分割数量")
private Integer splitNum;
- @ApiModelProperty(value = "切割模式")
+ @Schema(description = "切割模式")
private Integer cutMode;
- @ApiModelProperty(value = "出口重量1")
+ @Schema(description = "出口重量1")
private Double exitValue1;
- @ApiModelProperty(value = "出口重量2")
+ @Schema(description = "出口重量2")
private Double exitValue2;
- @ApiModelProperty(value = "出口重量3")
+ @Schema(description = "出口重量3")
private Double exitValue3;
- @ApiModelProperty(value = "出口重量4")
+ @Schema(description = "出口重量4")
private Double exitValue4;
- @ApiModelProperty(value = "出口重量5")
+ @Schema(description = "出口重量5")
private Double exitValue5;
- @ApiModelProperty(value = "出口重量6")
+ @Schema(description = "出口重量6")
private Double exitValue6;
- @ApiModelProperty(value = "出口重量")
+ @Schema(description = "出口重量")
private Double exitWeight;
- @ApiModelProperty(value = "出口长度")
+ @Schema(description = "出口长度")
private Double exitLength;
- @ApiModelProperty(value = "出口厚度")
+ @Schema(description = "出口厚度")
private Double exitThick;
- @ApiModelProperty(value = "出口宽度")
+ @Schema(description = "出口宽度")
private Double exitWidth;
- @ApiModelProperty(value = "钢种")
+ @Schema(description = "钢种")
private String grade;
- @ApiModelProperty(value = "屈服强度")
+ @Schema(description = "屈服强度")
private Integer yieldStrength;
- @ApiModelProperty(value = "抗拉强度")
+ @Schema(description = "抗拉强度")
private Integer tensileStrength;
- @ApiModelProperty(value = "状态 NEW READY ONLINE PRODUCING PRODUCT")
+ @Schema(description = "状态 NEW READY ONLINE PRODUCING PRODUCT")
private String status;
- @ApiModelProperty(value = "计划号")
+ @Schema(description = "计划号")
private String planNo;
- @ApiModelProperty(value = "压下率")
+ @Schema(description = "压下率")
private Double reductionRate;
- @ApiModelProperty(value = "热卷温度")
+ @Schema(description = "热卷温度")
private Double hotCoilTemp;
- @ApiModelProperty(value = "厚度正偏差")
+ @Schema(description = "厚度正偏差")
private Double entryThickMaxtol;
- @ApiModelProperty(value = "厚度正偏差")
+ @Schema(description = "厚度正偏差")
private Double entryThickMintol;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty(value = "计划日期")
+ @Schema(description = "计划日期")
private LocalDateTime createTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty(value = "记录日期")
+ @Schema(description = "记录日期")
private LocalDateTime insdate;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty(value = "上线时间")
+ @Schema(description = "上线时间")
private LocalDateTime onlineTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty(value = "开始日期")
+ @Schema(description = "开始日期")
private LocalDateTime startDate;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty(value = "结束日期")
+ @Schema(description = "结束日期")
private LocalDateTime endDate;
}
diff --git a/business/src/main/java/com/fizz/business/vo/ModSetupResultVO.java b/business/src/main/java/com/fizz/business/vo/ModSetupResultVO.java
index 4ec56ab..75572d1 100644
--- a/business/src/main/java/com/fizz/business/vo/ModSetupResultVO.java
+++ b/business/src/main/java/com/fizz/business/vo/ModSetupResultVO.java
@@ -3,8 +3,7 @@ package com.fizz.business.vo;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
@@ -12,95 +11,95 @@ import java.time.LocalDateTime;
@Data
public class ModSetupResultVO {
- @ApiModelProperty(value = "自增主键")
+ @Schema(description = "自增主键")
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty(value = "logid")
+ @Schema(description = "logid")
private Long logId;
- @ApiModelProperty(value = "钢卷ID")
+ @Schema(description = "钢卷ID")
private String coilId;
- @ApiModelProperty(value = "道次号")
+ @Schema(description = "道次号")
private Integer passno;
- @ApiModelProperty(value = "入口厚度")
+ @Schema(description = "入口厚度")
private Float entryThick;
- @ApiModelProperty(value = "出口厚度")
+ @Schema(description = "出口厚度")
private Float exitThick;
- @ApiModelProperty(value = "压下率")
+ @Schema(description = "压下率")
private Float reduction;
- @ApiModelProperty(value = "入口张力")
+ @Schema(description = "入口张力")
private Float entryTension;
- @ApiModelProperty(value = "出口张力")
+ @Schema(description = "出口张力")
private Float exitTension;
- @ApiModelProperty(value = "入口应力")
+ @Schema(description = "入口应力")
private Float entryTenstress;
- @ApiModelProperty(value = "出口应力")
+ @Schema(description = "出口应力")
private Float exitTenstress;
- @ApiModelProperty(value = "速度比")
+ @Schema(description = "速度比")
private Float speedFract;
- @ApiModelProperty(value = "入口速度")
+ @Schema(description = "入口速度")
private Float entrySpeed;
- @ApiModelProperty(value = "出口速度")
+ @Schema(description = "出口速度")
private Float exitSpeed;
- @ApiModelProperty(value = "轧制速度")
+ @Schema(description = "轧制速度")
private Float rollSpeed;
- @ApiModelProperty(value = "轧制力")
+ @Schema(description = "轧制力")
private Float rollForce;
- @ApiModelProperty(value = "轧辊间隙")
+ @Schema(description = "轧辊间隙")
private Float rollgap;
- @ApiModelProperty(value = "超出间隙")
+ @Schema(description = "超出间隙")
private Float overgap;
- @ApiModelProperty(value = "轧机刚度")
+ @Schema(description = "轧机刚度")
private Float millModulus;
- @ApiModelProperty(value = "前滑")
+ @Schema(description = "前滑")
private Float slip;
- @ApiModelProperty(value = "工作辊弯辊力")
+ @Schema(description = "工作辊弯辊力")
private Float wrbend;
- @ApiModelProperty(value = "支撑辊弯辊力")
+ @Schema(description = "支撑辊弯辊力")
private Float irbend;
- @ApiModelProperty(value = "轧制扭矩")
+ @Schema(description = "轧制扭矩")
private Float rollTorque;
- @ApiModelProperty(value = "总轧制扭矩")
+ @Schema(description = "总轧制扭矩")
private Float totalRollTorque;
- @ApiModelProperty(value = "电机扭矩")
+ @Schema(description = "电机扭矩")
private Float motorTorque;
- @ApiModelProperty(value = "扭矩比")
+ @Schema(description = "扭矩比")
private Float torqueRatio;
- @ApiModelProperty(value = "比扭矩")
+ @Schema(description = "比扭矩")
private Float specTorque;
- @ApiModelProperty(value = "功率")
+ @Schema(description = "功率")
private Float power;
- @ApiModelProperty(value = "负载比")
+ @Schema(description = "负载比")
private Float loadRatio;
- @ApiModelProperty(value = "计算ID 实际用的这个值")
+ @Schema(description = "计算ID 实际用的这个值")
private String calcId;
}
diff --git a/business/src/main/java/com/fizz/business/vo/OnlineRollDataVO.java b/business/src/main/java/com/fizz/business/vo/OnlineRollDataVO.java
index a356653..6396ad4 100644
--- a/business/src/main/java/com/fizz/business/vo/OnlineRollDataVO.java
+++ b/business/src/main/java/com/fizz/business/vo/OnlineRollDataVO.java
@@ -3,55 +3,55 @@ package com.fizz.business.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fizz.business.constants.enums.RollerPositionEnum;
import com.fizz.business.constants.enums.RollerTypeEnum;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
@Data
public class OnlineRollDataVO {
- @ApiModelProperty(value = "轧辊号")
+ @Schema(description = "轧辊号")
private String rollid;
- @ApiModelProperty(value = "类型")
+ @Schema(description = "类型")
private RollerTypeEnum type;
- @ApiModelProperty(value = "位置")
+ @Schema(description = "位置")
private RollerPositionEnum position;
- @ApiModelProperty(value = "直径")
+ @Schema(description = "直径")
private Double diameter;
- @ApiModelProperty(value = "粗糙度")
+ @Schema(description = "粗糙度")
private Double rough;
- @ApiModelProperty(value = "凸度")
+ @Schema(description = "凸度")
private Double crown;
- @ApiModelProperty(value = "轧制长度")
+ @Schema(description = "轧制长度")
private Double rolledLength;
- @ApiModelProperty(value = "轧制重量")
+ @Schema(description = "轧制重量")
private Double rolledWeight;
- @ApiModelProperty(value = "轧制数量")
+ @Schema(description = "轧制数量")
private Integer rolledCount;
- @ApiModelProperty(value = "Installation Time")
+ @Schema(description = "Installation Time")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime instalTime;
- @ApiModelProperty(value = "可用长度")
+ @Schema(description = "可用长度")
private Double usableLength;
- @ApiModelProperty(value = "剩余长度")
+ @Schema(description = "剩余长度")
private Double leftLength;
- @ApiModelProperty(value = "可用重量")
+ @Schema(description = "可用重量")
private Double usableWeight;
- @ApiModelProperty(value = "剩余重量")
+ @Schema(description = "剩余重量")
private Double leftWeight;
}
diff --git a/business/src/main/java/com/fizz/business/vo/PdiPlanSetupInfoVO.java b/business/src/main/java/com/fizz/business/vo/PdiPlanSetupInfoVO.java
index 9e41c32..ba4b075 100644
--- a/business/src/main/java/com/fizz/business/vo/PdiPlanSetupInfoVO.java
+++ b/business/src/main/java/com/fizz/business/vo/PdiPlanSetupInfoVO.java
@@ -2,7 +2,7 @@ package com.fizz.business.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
@@ -11,138 +11,138 @@ import java.util.List;
@Data
public class PdiPlanSetupInfoVO {
- @ApiModelProperty(value = "id")
+ @Schema(description = "id")
private Long id;
- @ApiModelProperty(value = "序列号")
+ @Schema(description = "序列号")
private Integer seqid;
- @ApiModelProperty(value = "多火轧制次数")
+ @Schema(description = "多火轧制次数")
private Integer operid;
- @ApiModelProperty(value = "轧制模式 1轧制力 2延伸率")
+ @Schema(description = "轧制模式 1轧制力 2延伸率")
private Integer operMode;
- @ApiModelProperty(value = "卷ID")
+ @Schema(description = "卷ID")
private String coilid;
- @ApiModelProperty(value = "热轧卷ID")
+ @Schema(description = "热轧卷ID")
private String hotCoilid;
- @ApiModelProperty(value = "道次数")
+ @Schema(description = "道次数")
private Integer passno;
- @ApiModelProperty(value = "退火厚度")
+ @Schema(description = "退火厚度")
private Integer annealThick;
- @ApiModelProperty(value = "入口厚度")
+ @Schema(description = "入口厚度")
private Double entryThick;
- @ApiModelProperty(value = "入口宽度")
+ @Schema(description = "入口宽度")
private Double entryWidth;
- @ApiModelProperty(value = "入口重量")
+ @Schema(description = "入口重量")
private Double entryWeight;
- @ApiModelProperty(value = "入口长度")
+ @Schema(description = "入口长度")
private Double entryLength;
- @ApiModelProperty(value = "入口内径")
+ @Schema(description = "入口内径")
private Integer entryInnerDiameter;
- @ApiModelProperty(value = "入口外径")
+ @Schema(description = "入口外径")
private Integer entryOuterDiameter;
- @ApiModelProperty(value = "出口卷号")
+ @Schema(description = "出口卷号")
private String exitCoilid;
- @ApiModelProperty(value = "下工序代码 1冷硬卷 2退火卷 3其他 ")
+ @Schema(description = "下工序代码 1冷硬卷 2退火卷 3其他 ")
private String nextUnit;
- @ApiModelProperty(value = "分割数量")
+ @Schema(description = "分割数量")
private Integer splitNum;
- @ApiModelProperty(value = "切割模式")
+ @Schema(description = "切割模式")
private Integer cutMode;
- @ApiModelProperty(value = "出口重量1")
+ @Schema(description = "出口重量1")
private Double exitValue1;
- @ApiModelProperty(value = "出口重量2")
+ @Schema(description = "出口重量2")
private Double exitValue2;
- @ApiModelProperty(value = "出口重量3")
+ @Schema(description = "出口重量3")
private Double exitValue3;
- @ApiModelProperty(value = "出口重量4")
+ @Schema(description = "出口重量4")
private Double exitValue4;
- @ApiModelProperty(value = "出口重量5")
+ @Schema(description = "出口重量5")
private Double exitValue5;
- @ApiModelProperty(value = "出口重量6")
+ @Schema(description = "出口重量6")
private Double exitValue6;
- @ApiModelProperty(value = "出口重量")
+ @Schema(description = "出口重量")
private Double exitWeight;
- @ApiModelProperty(value = "出口长度")
+ @Schema(description = "出口长度")
private Double exitLength;
- @ApiModelProperty(value = "出口厚度")
+ @Schema(description = "出口厚度")
private Double exitThick;
- @ApiModelProperty(value = "出口宽度")
+ @Schema(description = "出口宽度")
private Double exitWidth;
- @ApiModelProperty(value = "钢种")
+ @Schema(description = "钢种")
private String grade;
- @ApiModelProperty(value = "屈服强度")
+ @Schema(description = "屈服强度")
private Integer yieldStrength;
- @ApiModelProperty(value = "抗拉强度")
+ @Schema(description = "抗拉强度")
private Integer tensileStrength;
- @ApiModelProperty(value = "状态 NEW READY ONLINE PRODUCING PRODUCT")
+ @Schema(description = "状态 NEW READY ONLINE PRODUCING PRODUCT")
private String status;
- @ApiModelProperty(value = "计划号")
+ @Schema(description = "计划号")
private String planNo;
- @ApiModelProperty(value = "压下率")
+ @Schema(description = "压下率")
private Double reductionRate;
- @ApiModelProperty(value = "热卷温度")
+ @Schema(description = "热卷温度")
private Double hotCoilTemp;
- @ApiModelProperty(value = "厚度正偏差")
+ @Schema(description = "厚度正偏差")
private Double entryThickMaxtol;
- @ApiModelProperty(value = "厚度正偏差")
+ @Schema(description = "厚度正偏差")
private Double entryThickMintol;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty(value = "计划日期")
+ @Schema(description = "计划日期")
private LocalDateTime createTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty(value = "记录日期")
+ @Schema(description = "记录日期")
private LocalDateTime insdate;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty(value = "上线时间")
+ @Schema(description = "上线时间")
private LocalDateTime onlineTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty(value = "开始日期")
+ @Schema(description = "开始日期")
private LocalDateTime startDate;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty(value = "结束日期")
+ @Schema(description = "结束日期")
private LocalDateTime endDate;
- @ApiModelProperty(value = "设定值列表")
+ @Schema(description = "设定值列表")
List lists;
}
diff --git a/business/src/main/java/com/fizz/business/vo/Plan2PdoVO.java b/business/src/main/java/com/fizz/business/vo/Plan2PdoVO.java
index b8dc3c6..8290d3a 100644
--- a/business/src/main/java/com/fizz/business/vo/Plan2PdoVO.java
+++ b/business/src/main/java/com/fizz/business/vo/Plan2PdoVO.java
@@ -1,9 +1,6 @@
package com.fizz.business.vo;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
@@ -13,74 +10,74 @@ import java.time.LocalDateTime;
public class Plan2PdoVO {
- @ApiModelProperty(value = "多火轧制次数")
+ @Schema(description = "多火轧制次数")
private Integer operid;
- @ApiModelProperty(value = "钢卷id")
+ @Schema(description = "钢卷id")
private String coilid;
- @ApiModelProperty(value = "热轧卷ID")
+ @Schema(description = "热轧卷ID")
private String hotCoilid;
- @ApiModelProperty(value = "道次数")
+ @Schema(description = "道次数")
private Integer passno;
- @ApiModelProperty(value = "退火厚度")
+ @Schema(description = "退火厚度")
private Integer annealThick;
- @ApiModelProperty(value = "入口厚度")
+ @Schema(description = "入口厚度")
private Double entryThick;
- @ApiModelProperty(value = "入口宽度")
+ @Schema(description = "入口宽度")
private Double entryWidth;
- @ApiModelProperty(value = "入口重量")
+ @Schema(description = "入口重量")
private Double entryWeight;
- @ApiModelProperty(value = "入口长度")
+ @Schema(description = "入口长度")
private Double entryLength;
- @ApiModelProperty(value = "入口内径")
+ @Schema(description = "入口内径")
private Integer entryInnerDiameter;
- @ApiModelProperty(value = "入口外径")
+ @Schema(description = "入口外径")
private Integer entryOuterDiameter;
- @ApiModelProperty(value = "出口卷号")
+ @Schema(description = "出口卷号")
private String exitCoilid;
- @ApiModelProperty(value = "下工序代码")
+ @Schema(description = "下工序代码")
private String nextUnit;
- @ApiModelProperty(value = "出口长度")
+ @Schema(description = "出口长度")
private Double exitLength;
- @ApiModelProperty(value = "出口厚度")
+ @Schema(description = "出口厚度")
private Double exitThick;
- @ApiModelProperty(value = "出口宽度")
+ @Schema(description = "出口宽度")
private Double exitWidth;
- @ApiModelProperty(value = "钢种")
+ @Schema(description = "钢种")
private String grade;
- @ApiModelProperty(value = "屈服强度")
+ @Schema(description = "屈服强度")
private Integer yieldStrength;
- @ApiModelProperty(value = "抗拉强度")
+ @Schema(description = "抗拉强度")
private Integer tensileStrength;
- @ApiModelProperty(value = "状态")
+ @Schema(description = "状态")
private String status;
- @ApiModelProperty(value = "计划号")
+ @Schema(description = "计划号")
private String planNo;
- @ApiModelProperty(value = "压下率")
+ @Schema(description = "压下率")
private Double reductionRate;
- @ApiModelProperty(value = "热卷温度")
+ @Schema(description = "热卷温度")
private Double hotCoilTemp;
diff --git a/business/src/main/java/com/fizz/business/vo/ReadyRollDataVO.java b/business/src/main/java/com/fizz/business/vo/ReadyRollDataVO.java
index 8b76b84..e53f7a9 100644
--- a/business/src/main/java/com/fizz/business/vo/ReadyRollDataVO.java
+++ b/business/src/main/java/com/fizz/business/vo/ReadyRollDataVO.java
@@ -2,26 +2,26 @@ package com.fizz.business.vo;
import com.fizz.business.constants.enums.RollerPositionEnum;
import com.fizz.business.constants.enums.RollerTypeEnum;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Data
public class ReadyRollDataVO {
- @ApiModelProperty(value = "轧辊号")
+ @Schema(description = "轧辊号")
private String rollid;
- @ApiModelProperty(value = "类型")
+ @Schema(description = "类型")
private RollerTypeEnum type;
- @ApiModelProperty(value = "位置")
+ @Schema(description = "位置")
private RollerPositionEnum position;
- @ApiModelProperty(value = "直径")
+ @Schema(description = "直径")
private Double diameter;
- @ApiModelProperty(value = "粗糙度")
+ @Schema(description = "粗糙度")
private Double rough;
- @ApiModelProperty(value = "凸度")
+ @Schema(description = "凸度")
private Double crown;
}
diff --git a/business/src/main/java/com/fizz/business/vo/SteelGradeInfoVO.java b/business/src/main/java/com/fizz/business/vo/SteelGradeInfoVO.java
index 100efb1..e452097 100644
--- a/business/src/main/java/com/fizz/business/vo/SteelGradeInfoVO.java
+++ b/business/src/main/java/com/fizz/business/vo/SteelGradeInfoVO.java
@@ -1,7 +1,7 @@
package com.fizz.business.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
@@ -11,21 +11,21 @@ import java.time.LocalDateTime;
public class SteelGradeInfoVO implements Serializable {
- @ApiModelProperty(value = "钢种ID")
+ @Schema(description = "钢种ID")
private Integer steelGradeId;
- @ApiModelProperty(value = "钢种名称")
+ @Schema(description = "钢种名称")
private String steelGradeName;
- @ApiModelProperty(value = "钢种描述")
+ @Schema(description = "钢种描述")
private String steelGradeDes;
- @ApiModelProperty(value = "创建时间")
+ @Schema(description = "创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
- @ApiModelProperty(value = "更新时间")
+ @Schema(description = "更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
diff --git a/pom.xml b/pom.xml
index d351528..4f8c787 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
5.7.12
1.2.23
1.21
- 3.0.0
+
2.3.3
1.4.7
2.0.43
@@ -31,6 +31,9 @@
4.1.2
2.3
0.9.1
+ 4.5.0
+ 1.7.0
+ 3.5.2
@@ -93,18 +96,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
- io.springfox
- springfox-boot-starter
- ${swagger.version}
-
-
- io.swagger
- swagger-models
-
-
+ com.github.xiaoymin
+ knife4j-openapi3-spring-boot-starter
+ ${knife4j.version}
+
+ org.springdoc
+ springdoc-openapi-ui
+ ${springdoc.version}
+
+
+
commons-io
@@ -189,6 +205,13 @@
${ruoyi.version}
+
+ com.baomidou
+ mybatis-plus-boot-starter
+ ${mybatis.version}
+
+
+
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
new file mode 100644
index 0000000..91622e7
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/config/SwaggerConfig.java
@@ -0,0 +1,59 @@
+package com.ruoyi.web.config;
+
+import com.ruoyi.common.config.RuoYiConfig;
+import io.swagger.v3.oas.models.Components;
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.info.Contact;
+import io.swagger.v3.oas.models.info.Info;
+import io.swagger.v3.oas.models.security.SecurityRequirement;
+import io.swagger.v3.oas.models.security.SecurityScheme;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class SwaggerConfig
+{
+ /** 系统基础配置 */
+ @Autowired
+ private RuoYiConfig ruoyiConfig;
+
+ /**
+ * 自定义的 OpenAPI 对象
+ */
+ @Bean
+ public OpenAPI customOpenApi()
+ {
+ return new OpenAPI().components(new Components()
+ // 设置认证的请求头
+ .addSecuritySchemes("apikey", securityScheme()))
+ .addSecurityItem(new SecurityRequirement().addList("apikey"))
+ .info(getApiInfo());
+ }
+
+ @Bean
+ public SecurityScheme securityScheme()
+ {
+ return new SecurityScheme()
+ .type(SecurityScheme.Type.APIKEY)
+ .name("Authorization")
+ .in(SecurityScheme.In.HEADER)
+ .scheme("Bearer");
+ }
+
+ /**
+ * 添加摘要信息
+ */
+ public Info getApiInfo()
+ {
+ return new Info()
+ // 设置标题
+ .title("标题：若依管理系统_接口文档")
+ // 描述
+ .description("描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...")
+ // 作者信息
+ .contact(new Contact().name(ruoyiConfig.getName()))
+ // 版本
+ .version("版本号:" + ruoyiConfig.getVersion());
+ }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java
index b4f6bac..e9457de 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java
@@ -4,6 +4,13 @@ import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.enums.ParameterIn;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@@ -15,19 +22,13 @@ import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.utils.StringUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiOperation;
/**
* swagger 用户测试方法
*
* @author ruoyi
*/
-@Api("用户信息管理")
+@Tag(name="用户信息管理")
@RestController
@RequestMapping("/test/user")
public class TestController extends BaseController
@@ -38,7 +39,7 @@ public class TestController extends BaseController
users.put(2, new UserEntity(2, "ry", "admin123", "15666666666"));
}
- @ApiOperation("获取用户列表")
+ @Operation(summary = "获取用户列表")
@GetMapping("/list")
public R> userList()
{
@@ -46,8 +47,14 @@ public class TestController extends BaseController
return R.ok(userList);
}
- @ApiOperation("获取用户详细")
- @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path", dataTypeClass = Integer.class)
+ @Operation(summary = "获取用户详细")
+ @Parameter(
+ name = "userId",
+ description = "用户ID",
+ required = true,
+ schema = @Schema(type = "integer", format = "int32"), // 替代 dataType
+ in = ParameterIn.PATH // 替代 paramType
+ )
@GetMapping("/{userId}")
public R getUser(@PathVariable Integer userId)
{
@@ -61,12 +68,28 @@ public class TestController extends BaseController
}
}
- @ApiOperation("新增用户")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "userId", value = "用户id", dataType = "Integer", dataTypeClass = Integer.class),
- @ApiImplicitParam(name = "username", value = "用户名称", dataType = "String", dataTypeClass = String.class),
- @ApiImplicitParam(name = "password", value = "用户密码", dataType = "String", dataTypeClass = String.class),
- @ApiImplicitParam(name = "mobile", value = "用户手机", dataType = "String", dataTypeClass = String.class)
+ @Operation(summary = "新增用户")
+ @Parameters({
+ @Parameter(
+ name = "userId",
+ description = "用户id",
+ schema = @Schema(implementation = Integer.class)
+ ),
+ @Parameter(
+ name = "username",
+ description = "用户名称",
+ schema = @Schema(implementation = String.class)
+ ),
+ @Parameter(
+ name = "password",
+ description = "用户密码",
+ schema = @Schema(implementation = String.class)
+ ),
+ @Parameter(
+ name = "mobile",
+ description = "用户手机",
+ schema = @Schema(implementation = String.class)
+ )
})
@PostMapping("/save")
public R save(UserEntity user)
@@ -79,7 +102,7 @@ public class TestController extends BaseController
return R.ok();
}
- @ApiOperation("更新用户")
+ @Operation(summary = "更新用户")
@PutMapping("/update")
public R update(@RequestBody UserEntity user)
{
@@ -96,9 +119,14 @@ public class TestController extends BaseController
return R.ok();
}
- @ApiOperation("删除用户信息")
- @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path", dataTypeClass = Integer.class)
- @DeleteMapping("/{userId}")
+ @Operation(summary = "删除用户信息")
+ @Parameter(
+ name = "userId",
+ description = "用户ID",
+ required = true,
+ schema = @Schema(type = "integer", format = "int32"), // 替代 dataType
+ in = ParameterIn.PATH // 替代 paramType
+ )@DeleteMapping("/{userId}")
public R delete(@PathVariable Integer userId)
{
if (!users.isEmpty() && users.containsKey(userId))
@@ -113,19 +141,19 @@ public class TestController extends BaseController
}
}
-@ApiModel(value = "UserEntity", description = "用户实体")
+@Schema(description = "用户实体")
class UserEntity
{
- @ApiModelProperty("用户ID")
+ @Schema(description = "用户ID")
private Integer userId;
- @ApiModelProperty("用户名称")
+ @Schema(description = "用户名称")
private String username;
- @ApiModelProperty("用户密码")
+ @Schema(description = "用户密码")
private String password;
- @ApiModelProperty("用户手机")
+ @Schema(description = "用户手机")
private String mobile;
public UserEntity()
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 6ac7959..fb17f3b 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -7,12 +7,12 @@ spring:
druid:
# 主库数据源
master:
- #ur#l: jdbc:mysql://47.109.139.82:3306/ngcrm?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- #username: ngcrm
- #password: ngcrm
- url: jdbc:mysql://127.0.0.1:3306/ngcrm?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: root
+ 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://127.0.0.1:3306/ngcrm?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+# username: root
+# password: root
# 从库数据源
slave:
# 从数据源开关/默认关闭
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index d8ab082..512e71d 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -126,13 +126,6 @@ pagehelper:
supportMethodsArguments: true
params: count=countSql
-# Swagger配置
-swagger:
- # 是否开启swagger
- enabled: true
- # 请求前缀
- pathMapping: /
-
# 防止XSS攻击
xss:
# 过滤开关
@@ -147,13 +140,24 @@ xss:
#producer:
#group: test
-# Knife4j配置
+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: '/**'
+ packages-to-scan: com.fizz.business.controller
+
+
knife4j:
- #开启增强配置
- enable: true
- #开启生产环境屏蔽
- production: false
- basic:
- enable: false
- username: admin
- password: 123456
+ enable: true # 启用 Knife4j
+ setting:
+ language: zh-CN # 中文界面
+ enable-swagger-model: true # 显示模型
+ enable-document-manage: true # 启用文档管理
+ cors: true # 允许跨域
\ No newline at end of file
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index cf89f3a..39f6a4e 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -123,14 +123,14 @@
com.baomidou
mybatis-plus-boot-starter
- 3.5.2
+
org.projectlombok
lombok
- 1.18.12
+
@@ -140,18 +140,24 @@
- com.github.xiaoymin
- knife4j-spring-boot-starter
- 3.0.3
+ org.springdoc
+ springdoc-openapi-ui
-
- io.swagger
- swagger-models
- 1.6.2
+ com.github.xiaoymin
+ knife4j-openapi3-spring-boot-starter
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/config/SwaggerConfig.java b/ruoyi-common/src/main/java/com/ruoyi/common/config/SwaggerConfig.java
deleted file mode 100644
index 392c596..0000000
--- a/ruoyi-common/src/main/java/com/ruoyi/common/config/SwaggerConfig.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package com.ruoyi.common.config;
-
-
-
-import io.swagger.annotations.ApiOperation;
-import io.swagger.models.auth.In;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import springfox.documentation.builders.ApiInfoBuilder;
-import springfox.documentation.builders.PathSelectors;
-import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.service.*;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spi.service.contexts.SecurityContext;
-import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Swagger2的接口配置
- *
- * @author ruoyi
- */
-@Configuration
-@EnableSwagger2
-public class SwaggerConfig
-{
- /** 系统基础配置 */
- @Autowired
- private RuoYiConfig ruoyiConfig;
-
- /** 是否开启swagger */
- @Value("${swagger.enabled}")
- private boolean enabled;
-
- /** 设置请求的统一前缀 */
- @Value("${swagger.pathMapping}")
- private String pathMapping;
-
- /**
- * 创建API
- */
- @Bean
- public Docket createRestApi()
- {
- return new Docket(DocumentationType.OAS_30)
- // 是否启用Swagger
- .enable(enabled)
- // 用来创建该API的基本信息，展示在文档的页面中（自定义展示的信息）
- .apiInfo(apiInfo())
- // 设置哪些接口暴露给Swagger展示
- .select()
- // 扫描所有有注解的api，用这种方式更灵活
- .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
- // 扫描指定包中的swagger注解
- // .apis(RequestHandlerSelectors.basePackage("com.ruoyi.project.tool.swagger"))
- // 扫描所有 .apis(RequestHandlerSelectors.any())
- .paths(PathSelectors.any())
- .build()
- /* 设置安全模式，swagger可以设置访问token */
- .securitySchemes(securitySchemes())
- .securityContexts(securityContexts())
- .pathMapping(pathMapping);
- }
-
- /**
- * 安全模式，这里指定token通过Authorization头请求头传递
- */
- private List securitySchemes()
- {
- List apiKeyList = new ArrayList();
- apiKeyList.add(new ApiKey("Authorization", "Authorization", In.HEADER.toValue()));
- return apiKeyList;
- }
-
- /**
- * 安全上下文
- */
- private List securityContexts()
- {
- List securityContexts = new ArrayList<>();
- securityContexts.add(
- SecurityContext.builder()
- .securityReferences(defaultAuth())
- .operationSelector(o -> o.requestMappingPattern().matches("/.*"))
- .build());
- return securityContexts;
- }
-
- /**
- * 默认的安全上引用
- */
- private List defaultAuth()
- {
- AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything");
- AuthorizationScope[] authorizationScopes = new AuthorizationScope[1];
- authorizationScopes[0] = authorizationScope;
- List securityReferences = new ArrayList<>();
- securityReferences.add(new SecurityReference("Authorization", authorizationScopes));
- return securityReferences;
- }
-
- /**
- * 添加摘要信息
- */
- private ApiInfo apiInfo()
- {
- // 用ApiInfoBuilder进行定制
- return new ApiInfoBuilder()
- // 设置标题
- .title("标题：若依管理系统_接口文档")
- // 描述
- .description("描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...")
- // 作者信息
- .contact(new Contact(ruoyiConfig.getName(), null, null))
- // 版本
- .version("版本号:" + ruoyiConfig.getVersion())
- .build();
- }
-}
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 8240ee3..1cba320 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
@@ -114,7 +114,7 @@ public class SecurityConfig
requests.antMatchers("/login", "/register", "/captchaImage", "/roller/**","/pdi/**","/pdo/**").permitAll()
// 静态资源，可匿名访问
.antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
- .antMatchers("/doc.html","/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
+ .antMatchers("/doc.html","/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/v3/api-docs/**", "/druid/**").permitAll()
//websocket
.antMatchers("/websocket/**").permitAll()
// 除上面外的所有请求全部需要鉴权认证