DeXun/be-process-control-system
9
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat():swagger3

Browse Source
This commit is contained in:
Penknife
2025-08-14 09:41:07 +08:00
parent 37d9a52d03
commit ac60645b59
47 changed files with 770 additions and 799 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
business/pom.xml
View File

@@ -28,18 +28,18 @@
<!-- <groupId>mysql</groupId>--> <!-- <groupId>mysql</groupId>-->
<!-- <artifactId>mysql-connector-java</artifactId>--> <!-- <artifactId>mysql-connector-java</artifactId>-->
<!-- </dependency>--> <!-- </dependency>-->
<dependency> <!-- <dependency>-->
<groupId>com.github.xiaoymin</groupId> <!-- <groupId>com.github.xiaoymin</groupId>-->
<artifactId>knife4j-spring-boot-starter</artifactId> <!-- <artifactId>knife4j-spring-boot-starter</artifactId>-->
<version>3.0.3</version> <!-- <version>3.0.3</version>-->
</dependency> <!-- </dependency>-->
<!-- 防止进入swagger页面报类型转换错误，排除3.0.0中的引用，手动增加1.6.2版本 --> <!-- 防止进入swagger页面报类型转换错误，排除3.0.0中的引用，手动增加1.6.2版本 -->
<dependency> <!-- <dependency>-->
<groupId>io.swagger</groupId> <!-- <groupId>io.swagger</groupId>-->
<artifactId>swagger-models</artifactId> <!-- <artifactId>swagger-models</artifactId>-->
<version>1.6.2</version> <!-- <version>1.6.2</version>-->
</dependency> <!-- </dependency>-->
<!-- 核心模块--> <!-- 核心模块-->
<dependency> <dependency>
@@ -108,11 +108,11 @@
<artifactId>spring-boot-starter-websocket</artifactId> <artifactId>spring-boot-starter-websocket</artifactId>
</dependency> </dependency>
<dependency> <!-- <dependency>-->
<groupId>com.alibaba</groupId> <!-- <groupId>com.alibaba</groupId>-->
<artifactId>fastjson</artifactId> <!-- <artifactId>fastjson</artifactId>-->
<version>1.2.83</version> <!-- <version>1.2.83</version>-->
</dependency> <!-- </dependency>-->
</dependencies> </dependencies>

24
business/src/main/java/com/fizz/business/controller/CrmPdiPlanController.java
View File

@@ -8,8 +8,8 @@ import com.fizz.business.service.CrmPdiPlanService;
import com.fizz.business.vo.CrmPdiPlanVO; import com.fizz.business.vo.CrmPdiPlanVO;
import com.fizz.business.vo.PdiPlanSetupInfoVO; import com.fizz.business.vo.PdiPlanSetupInfoVO;
import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.R;
import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
@@ -17,33 +17,33 @@ import java.util.List;
@RestController @RestController
@RequestMapping("/pdi") @RequestMapping("/pdi")
@Api("南钢计划接口") @Tag(name="南钢计划接口")
public class CrmPdiPlanController { public class CrmPdiPlanController {
@Resource @Resource
private CrmPdiPlanService crmPdiPlanService; private CrmPdiPlanService crmPdiPlanService;
@GetMapping("/get/{coilid}") @GetMapping("/get/{coilid}")
@ApiOperation("通过钢卷号或者状态查询计划") @Operation(summary ="通过钢卷号或者状态查询计划")
public R<CrmPdiPlanVO> getByCoilId(@PathVariable String coilid) { public R<CrmPdiPlanVO> getByCoilId(@PathVariable String coilid) {
return R.ok(crmPdiPlanService.getByCoilIdAndOperId(coilid)); return R.ok(crmPdiPlanService.getByCoilIdAndOperId(coilid));
} }
@GetMapping("/getOnlineCoil") @GetMapping("/getOnlineCoil")
@ApiOperation("通过钢卷号或者状态查询计划") @Operation(summary ="通过钢卷号或者状态查询计划")
public R<CrmPdiPlan> getByCoilId() { public R<CrmPdiPlan> getByCoilId() {
return R.ok(crmPdiPlanService.getOnlineCoil()); return R.ok(crmPdiPlanService.getOnlineCoil());
} }
@GetMapping("/getCoilInfoAndSetupList") @GetMapping("/getCoilInfoAndSetupList")
@ApiOperation("通过钢卷号获取钢卷信息和设定值列表") @Operation(summary ="通过钢卷号获取钢卷信息和设定值列表")
public R<PdiPlanSetupInfoVO> getCoilInfoAndSetupList(@RequestParam String coilid) { public R<PdiPlanSetupInfoVO> getCoilInfoAndSetupList(@RequestParam String coilid) {
return R.ok(crmPdiPlanService.getCoilInfoAndSetupList(coilid)); return R.ok(crmPdiPlanService.getCoilInfoAndSetupList(coilid));
} }
@PostMapping("/save/coilInfo") @PostMapping("/save/coilInfo")
@ApiOperation("保存钢卷信息") @Operation(summary ="保存钢卷信息")
public R<String> editCoilInfo(@RequestBody CrmPdiPlanForm coilid) { public R<String> editCoilInfo(@RequestBody CrmPdiPlanForm coilid) {
return R.ok(crmPdiPlanService.editCoilInfo(coilid)); return R.ok(crmPdiPlanService.editCoilInfo(coilid));
@@ -51,7 +51,7 @@ public class CrmPdiPlanController {
} }
@PostMapping("/calc") @PostMapping("/calc")
@ApiOperation("计算设定值") @Operation(summary ="计算设定值")
public R<String> editCoilInfo(@RequestBody CalcPdiPlanForm coilid) { public R<String> editCoilInfo(@RequestBody CalcPdiPlanForm coilid) {
return R.ok(crmPdiPlanService.calcSetup(coilid)); return R.ok(crmPdiPlanService.calcSetup(coilid));
@@ -59,25 +59,25 @@ public class CrmPdiPlanController {
@PostMapping("/add") @PostMapping("/add")
@ApiOperation("新增计划") @Operation(summary ="新增计划")
public R<Boolean> add(@RequestBody CrmPdiPlan crmPdiPlan) { public R<Boolean> add(@RequestBody CrmPdiPlan crmPdiPlan) {
return R.ok(crmPdiPlanService.addCrmPdiPlan(crmPdiPlan)); return R.ok(crmPdiPlanService.addCrmPdiPlan(crmPdiPlan));
} }
@PutMapping("/update") @PutMapping("/update")
@ApiOperation("修改计划") @Operation(summary ="修改计划")
public R<Boolean> update(@RequestBody CrmPdiPlan crmPdiPlan) { public R<Boolean> update(@RequestBody CrmPdiPlan crmPdiPlan) {
return R.ok(crmPdiPlanService.updateCrmPdiPlan(crmPdiPlan)); return R.ok(crmPdiPlanService.updateCrmPdiPlan(crmPdiPlan));
} }
@PostMapping("/delete") @PostMapping("/delete")
@ApiOperation("计划删除") @Operation(summary ="计划删除")
public R<Boolean> delete(@RequestBody List<Long> coilid) { public R<Boolean> delete(@RequestBody List<Long> coilid) {
return R.ok(crmPdiPlanService.deleteCrmPdiPlan(coilid)); return R.ok(crmPdiPlanService.deleteCrmPdiPlan(coilid));
} }
@PostMapping("/list") @PostMapping("/list")
@ApiOperation("查询计划列表") @Operation(summary ="查询计划列表")
public R<List<CrmPdiPlanVO>> list(@RequestBody PlanQueryForm form) { public R<List<CrmPdiPlanVO>> list(@RequestBody PlanQueryForm form) {
return R.ok(crmPdiPlanService.listAll(form)); return R.ok(crmPdiPlanService.listAll(form));
} }

17
business/src/main/java/com/fizz/business/controller/CrmPdoExcoilController.java
View File

@@ -3,10 +3,9 @@ package com.fizz.business.controller;
import com.fizz.business.domain.CrmPdoExcoil; import com.fizz.business.domain.CrmPdoExcoil;
import com.fizz.business.form.CrmPdoExcoilForm; import com.fizz.business.form.CrmPdoExcoilForm;
import com.fizz.business.service.CrmPdoExcoilService; import com.fizz.business.service.CrmPdoExcoilService;
import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.R;
import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
@@ -14,39 +13,39 @@ import java.util.List;
@RestController @RestController
@RequestMapping("/pdo") @RequestMapping("/pdo")
@Api("南钢实绩接口") @Tag(name ="南钢实绩接口")
public class CrmPdoExcoilController { public class CrmPdoExcoilController {
@Resource @Resource
private CrmPdoExcoilService crmPdoExcoilService; private CrmPdoExcoilService crmPdoExcoilService;
@GetMapping("/get/{excoilid}/{operid}") @GetMapping("/get/{excoilid}/{operid}")
@ApiOperation("查询实绩") @Operation(summary ="查询实绩")
public R<CrmPdoExcoil> getByExcoilIdAndOperId(@PathVariable String excoilid, @PathVariable Integer operid) { public R<CrmPdoExcoil> getByExcoilIdAndOperId(@PathVariable String excoilid, @PathVariable Integer operid) {
return R.ok(crmPdoExcoilService.getByExcoilIdAndOperId(excoilid, operid)); return R.ok(crmPdoExcoilService.getByExcoilIdAndOperId(excoilid, operid));
} }
@PostMapping("/add") @PostMapping("/add")
@ApiOperation("新增实绩") @Operation(summary ="新增实绩")
public R<Boolean> add(@RequestBody CrmPdoExcoil crmPdoExcoil) { public R<Boolean> add(@RequestBody CrmPdoExcoil crmPdoExcoil) {
return R.ok(crmPdoExcoilService.addCrmPdoExcoil(crmPdoExcoil)); return R.ok(crmPdoExcoilService.addCrmPdoExcoil(crmPdoExcoil));
} }
@PutMapping("/update") @PutMapping("/update")
@ApiOperation("修改") @Operation(summary ="修改")
public R<Boolean> update(@RequestBody CrmPdoExcoil crmPdoExcoil) { public R<Boolean> update(@RequestBody CrmPdoExcoil crmPdoExcoil) {
return R.ok(crmPdoExcoilService.updateCrmPdoExcoil(crmPdoExcoil)); return R.ok(crmPdoExcoilService.updateCrmPdoExcoil(crmPdoExcoil));
} }
@DeleteMapping("/delete/{excoilid}/{operid}") @DeleteMapping("/delete/{excoilid}/{operid}")
@ApiOperation("删除实绩") @Operation(summary ="删除实绩")
public R<Boolean> delete(@PathVariable String excoilid, @PathVariable Integer operid) { public R<Boolean> delete(@PathVariable String excoilid, @PathVariable Integer operid) {
return R.ok(crmPdoExcoilService.deleteCrmPdoExcoil(excoilid, operid)); return R.ok(crmPdoExcoilService.deleteCrmPdoExcoil(excoilid, operid));
} }
@PostMapping("/list") @PostMapping("/list")
@ApiOperation("查询实绩列表") @Operation(summary ="查询实绩列表")
public R<List<CrmPdoExcoil>> list(@RequestBody CrmPdoExcoilForm form) { public R<List<CrmPdoExcoil>> list(@RequestBody CrmPdoExcoilForm form) {
return R.ok(crmPdoExcoilService.listAll(form)); return R.ok(crmPdoExcoilService.listAll(form));
} }

7
business/src/main/java/com/fizz/business/controller/LogDataController.java
View File

@@ -6,9 +6,8 @@ import com.fizz.business.service.LogDataService;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.ruoyi.common.annotation.Anonymous; import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.core.domain.R; 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.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@@ -17,13 +16,13 @@ import java.util.List;
@RestController @RestController
@RequiredArgsConstructor @RequiredArgsConstructor
@RequestMapping("/logdata" ) @RequestMapping("/logdata" )
@Api("南钢日志接口") @Tag(name="日志管理")
@Anonymous @Anonymous
public class LogDataController { public class LogDataController {
private final LogDataService logDataService; private final LogDataService logDataService;
@ApiOperation("历史记录") @Operation(summary = "历史记录")
@PostMapping ("/list" ) @PostMapping ("/list" )
public R<PageInfo<LogData>> getLogDataPage(@RequestBody LogDataForm logDataForm) { public R<PageInfo<LogData>> getLogDataPage(@RequestBody LogDataForm logDataForm) {
return R.ok(logDataService.pageList(logDataForm)); return R.ok(logDataService.pageList(logDataForm));

13
business/src/main/java/com/fizz/business/controller/ModSetupResultController.java
View File

@@ -1,13 +1,12 @@
package com.fizz.business.controller; package com.fizz.business.controller;
import com.fizz.business.domain.ModSetupResult;
import com.fizz.business.form.CalcPdiPlanForm; import com.fizz.business.form.CalcPdiPlanForm;
import com.fizz.business.form.ModSetupResultForm; import com.fizz.business.form.ModSetupResultForm;
import com.fizz.business.service.ModSetupResultService; import com.fizz.business.service.ModSetupResultService;
import com.fizz.business.vo.ModSetupResultVO; import com.fizz.business.vo.ModSetupResultVO;
import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.R;
import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
@@ -15,7 +14,7 @@ import java.util.List;
@RestController @RestController
@RequestMapping("/setup") @RequestMapping("/setup")
@Api("南钢设定值接口") @Tag(name ="南钢设定值接口")
public class ModSetupResultController { public class ModSetupResultController {
@Resource @Resource
@@ -23,20 +22,20 @@ public class ModSetupResultController {
// 查询所有记录 // 查询所有记录
@PostMapping("/list") @PostMapping("/list")
@ApiOperation("查询设定值列表") @Operation(summary = "查询设定值列表")
public R<List<ModSetupResultVO>> list(@RequestBody ModSetupResultForm form) { public R<List<ModSetupResultVO>> list(@RequestBody ModSetupResultForm form) {
return R.ok(modSetupResultService.list(form)); return R.ok(modSetupResultService.list(form));
} }
@PostMapping("/calc") @PostMapping("/calc")
@ApiOperation("计算设定值") @Operation(summary ="计算设定值")
public R<String> calcSetup(@RequestBody CalcPdiPlanForm form) { public R<String> calcSetup(@RequestBody CalcPdiPlanForm form) {
return R.ok(modSetupResultService.calcSetup(form)); return R.ok(modSetupResultService.calcSetup(form));
} }
@GetMapping("/retry") @GetMapping("/retry")
@ApiOperation("手动下发设定值") @Operation(summary ="手动下发设定值")
public R<String> retrySetup(@RequestParam String coilid) { public R<String> retrySetup(@RequestParam String coilid) {
return R.ok(modSetupResultService.retrySetup(coilid)); return R.ok(modSetupResultService.retrySetup(coilid));
} }

28
business/src/main/java/com/fizz/business/controller/ProStoppageController.java
View File

@@ -1,14 +1,12 @@
package com.fizz.business.controller; package com.fizz.business.controller;
import com.fizz.business.domain.CrmPdoExcoil;
import com.fizz.business.domain.ProStoppage; import com.fizz.business.domain.ProStoppage;
import com.fizz.business.form.CrmPdoExcoilForm;
import com.fizz.business.form.ProStoppageForm; import com.fizz.business.form.ProStoppageForm;
import com.fizz.business.service.CrmPdoExcoilService;
import com.fizz.business.service.ProStoppageService; import com.fizz.business.service.ProStoppageService;
import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.R;
import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
@@ -16,32 +14,32 @@ import java.util.List;
@RestController @RestController
@RequestMapping("/stoppage") @RequestMapping("/stoppage")
@Api("南钢停机接口") @Tag(name= "停机管理",description = "停机管理")
public class ProStoppageController { public class ProStoppageController {
@Resource @Resource
private ProStoppageService proStoppageService; private ProStoppageService proStoppageService;
@PostMapping("/add") // @PostMapping("/add")
@ApiOperation("新增实绩") // @ApiOperation("新增停机记录")
public R<Boolean> add(@RequestBody ProStoppage proStoppage) { // public R<Boolean> add(@RequestBody ProStoppage proStoppage) {
return R.ok(proStoppageService.addProStoppage(proStoppage)); // return R.ok(proStoppageService.addProStoppage(proStoppage));
} // }
@PutMapping("/update") @PutMapping("/update")
@ApiOperation("修改") @Operation(summary = "修改停机记录")
public R<Boolean> update(@RequestBody ProStoppage proStoppage) { public R<Boolean> update(@RequestBody ProStoppage proStoppage) {
return R.ok(proStoppageService.updateProStoppage(proStoppage)); return R.ok(proStoppageService.updateProStoppage(proStoppage));
} }
@DeleteMapping("/delete/{stopid}") @DeleteMapping("/delete/{stopid}")
@ApiOperation("删除实绩") @Operation(summary ="删除实绩记录")
public R<Boolean> delete(@PathVariable Long stopid) { public R<Boolean> delete(@PathVariable @Parameter(description="停机记录的唯一标识ID") Long stopid) {
return R.ok(proStoppageService.deleteProStoppage(stopid)); return R.ok(proStoppageService.deleteProStoppage(stopid));
} }
@PostMapping("/list") @PostMapping("/list")
@ApiOperation("查询实绩列表") @Operation(summary ="查询实绩记录")
public R<List<ProStoppage>> list(@RequestBody ProStoppageForm form) { public R<List<ProStoppage>> list(@RequestBody ProStoppageForm form) {
return R.ok(proStoppageService.listAll(form)); return R.ok(proStoppageService.listAll(form));
} }

22
business/src/main/java/com/fizz/business/controller/RollerController.java
View File

@@ -12,8 +12,8 @@ import com.fizz.business.vo.ReadyRollDataVO;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.ruoyi.common.annotation.Anonymous; import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.R;
import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
@@ -22,7 +22,7 @@ import java.util.Map;
@RestController @RestController
@RequestMapping("/roller") @RequestMapping("/roller")
@Api("南钢轧辊接口") @Tag(name="南钢轧辊接口")
@Anonymous @Anonymous
public class RollerController { public class RollerController {
@Resource @Resource
@@ -32,25 +32,25 @@ public class RollerController {
RollDataService rollDataService; RollDataService rollDataService;
@GetMapping("/data/standby") @GetMapping("/data/standby")
@ApiOperation("轧辊数据-获取当前备辊信息") @Operation(summary = "轧辊数据-获取当前备辊信息")
public R<Map<String,ReadyRollDataVO>> getReadyRollList() { public R<Map<String,ReadyRollDataVO>> getReadyRollList() {
return R.ok(rollDataService.getAllReadyRollList()); return R.ok(rollDataService.getAllReadyRollList());
} }
@GetMapping("/data/ready/{position}/{type}") @GetMapping("/data/ready/{position}/{type}")
@ApiOperation("轧辊数据-获取离线辊信息") @Operation(summary = "轧辊数据-获取离线辊信息")
public R<List<ReadyRollDataVO> > getOfflineRollList(@PathVariable String position, @PathVariable String type) { public R<List<ReadyRollDataVO> > getOfflineRollList(@PathVariable String position, @PathVariable String type) {
return R.ok(rollDataService.getReadyRollList(position,type,"OFFLINE")); return R.ok(rollDataService.getReadyRollList(position,type,"OFFLINE"));
} }
@GetMapping("/data/online") @GetMapping("/data/online")
@ApiOperation("轧辊数据-获取在线辊信息") @Operation(summary = "轧辊数据-获取在线辊信息")
public R<List<OnlineRollDataVO>> getOnlineRollList() { public R<List<OnlineRollDataVO>> getOnlineRollList() {
return R.ok(rollDataService.getOnlineRollList()); return R.ok(rollDataService.getOnlineRollList());
} }
@PostMapping("/change/standby") @PostMapping("/change/standby")
@ApiOperation("轧辊操作-备辊") @Operation(summary = "轧辊操作-备辊")
public R<String> backupRoll(@RequestBody List<ReadyRollDataVO> rollList) { public R<String> backupRoll(@RequestBody List<ReadyRollDataVO> rollList) {
String msg = rollDataService.BackupRoll(rollList); String msg = rollDataService.BackupRoll(rollList);
if(ObjectUtil.isEmpty(msg)){ if(ObjectUtil.isEmpty(msg)){
@@ -62,25 +62,25 @@ public class RollerController {
} }
@PostMapping("/change/online") @PostMapping("/change/online")
@ApiOperation("轧辊操作-上线") @Operation(summary = "轧辊操作-上线")
public R<List<OnlineRollDataVO>> onlineRoll() { public R<List<OnlineRollDataVO>> onlineRoll() {
return R.ok(rollDataService.onlineRoll()); return R.ok(rollDataService.onlineRoll());
} }
@GetMapping("/history/changeid") @GetMapping("/history/changeid")
@ApiOperation("轧辊历史-获取所有换辊号") @Operation(summary = "轧辊历史-获取所有换辊号")
public R<List<String>> getChangeIdList() { public R<List<String>> getChangeIdList() {
return R.ok(rollHistoryService.getChangeIdList()); return R.ok(rollHistoryService.getChangeIdList());
} }
@GetMapping("/history/rollid") @GetMapping("/history/rollid")
@ApiOperation("轧辊历史-获取所有轧辊号") @Operation(summary = "轧辊历史-获取所有轧辊号")
public R<List<String>> getRollIdList() { public R<List<String>> getRollIdList() {
return R.ok(rollHistoryService.getRollIdList()); return R.ok(rollHistoryService.getRollIdList());
} }
@PostMapping("/history/list") @PostMapping("/history/list")
@ApiOperation("轧辊历史-获取换辊记录") @Operation(summary = "轧辊历史-获取换辊记录")
public R<PageInfo<RollHistory>> getRollHistorytList(@RequestBody RollHistoryForm rollHistoryForm) { public R<PageInfo<RollHistory>> getRollHistorytList(@RequestBody RollHistoryForm rollHistoryForm) {
return R.ok(rollHistoryService.getRollHistory(rollHistoryForm)); return R.ok(rollHistoryService.getRollHistory(rollHistoryForm));
} }

16
business/src/main/java/com/fizz/business/controller/SteelGradeInfoController.java
View File

@@ -5,8 +5,8 @@ import com.fizz.business.domain.StdAlloy;
import com.fizz.business.service.SteelGradeInfoService; import com.fizz.business.service.SteelGradeInfoService;
import com.fizz.business.vo.StdAlloyVO; import com.fizz.business.vo.StdAlloyVO;
import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.R;
import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@@ -15,7 +15,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
@Api("南钢钢种接口") @Tag(name ="南钢钢种接口")
@RestController @RestController
@RequestMapping("/steelGrade") @RequestMapping("/steelGrade")
public class SteelGradeInfoController { public class SteelGradeInfoController {
@@ -24,7 +24,7 @@ public class SteelGradeInfoController {
private SteelGradeInfoService steelGradeInfoService; private SteelGradeInfoService steelGradeInfoService;
@GetMapping("/list") @GetMapping("/list")
@ApiOperation("查询钢种列表") @Operation(summary ="查询钢种列表")
public R<List<StdAlloyVO>> list() { public R<List<StdAlloyVO>> list() {
// 使用 LambdaQueryWrapper 查询 StdAlloy 表中的数据 // 使用 LambdaQueryWrapper 查询 StdAlloy 表中的数据
@@ -48,7 +48,7 @@ public class SteelGradeInfoController {
} }
@GetMapping("/info") @GetMapping("/info")
@ApiOperation("查询单个钢种详情") @Operation(summary ="询单个钢种详情")
public R<StdAlloy> getSteelGradeInfo(@RequestParam Integer gradeid) { public R<StdAlloy> getSteelGradeInfo(@RequestParam Integer gradeid) {
// 使用 LambdaQueryWrapper 查询 StdAlloy 表中的数据 // 使用 LambdaQueryWrapper 查询 StdAlloy 表中的数据
@@ -64,18 +64,18 @@ public class SteelGradeInfoController {
@PostMapping("/add") @PostMapping("/add")
@ApiOperation("新增") @Operation(summary ="新增")
public R<Boolean> add(@RequestBody StdAlloy steelGradeInfo) { public R<Boolean> add(@RequestBody StdAlloy steelGradeInfo) {
return R.ok(steelGradeInfoService.save(steelGradeInfo)); return R.ok(steelGradeInfoService.save(steelGradeInfo));
} }
@PutMapping("/update") @PutMapping("/update")
@ApiOperation("更新") @Operation(summary ="更新")
public R<Boolean> update(@RequestBody StdAlloy steelGradeInfo) { public R<Boolean> update(@RequestBody StdAlloy steelGradeInfo) {
return R.ok(steelGradeInfoService.updateById(steelGradeInfo)); return R.ok(steelGradeInfoService.updateById(steelGradeInfo));
} }
@ApiOperation("删除") @Operation(summary ="删除")
@DeleteMapping("/delete/{id}") @DeleteMapping("/delete/{id}")
public R<Boolean> delete(@PathVariable Integer id) { public R<Boolean> delete(@PathVariable Integer id) {
return R.ok(steelGradeInfoService.removeById(id)); return R.ok(steelGradeInfoService.removeById(id));

12
business/src/main/java/com/fizz/business/controller/TrackController.java
View File

@@ -5,8 +5,8 @@ import com.fizz.business.form.WebOperateMatForm;
import com.fizz.business.mq.RabbitMQ.RabbitQueueListener; import com.fizz.business.mq.RabbitMQ.RabbitQueueListener;
import com.fizz.business.service.TrackService; import com.fizz.business.service.TrackService;
import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.R;
import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
@@ -19,28 +19,28 @@ import java.util.List;
*/ */
@RestController @RestController
@RequestMapping("/track") @RequestMapping("/track")
@Api(value = "过程跟踪页面", tags = "过程跟踪") @Tag(name = "过程跟踪")
public class TrackController { public class TrackController {
@Resource @Resource
TrackService trackService; TrackService trackService;
@PostMapping("/manual/operate/mat") @PostMapping("/manual/operate/mat")
@ApiOperation(value = "页面手动操作钢卷 上线，回退") @Operation(summary = "页面手动操作钢卷 上线，回退")
public R<String> manualOperateMat(@RequestBody @Valid WebOperateMatForm form) { public R<String> manualOperateMat(@RequestBody @Valid WebOperateMatForm form) {
trackService.operateMatWeb(form); trackService.operateMatWeb(form);
return R.ok(); return R.ok();
} }
@PostMapping("/manual/tr/unload") @PostMapping("/manual/tr/unload")
@ApiOperation(value = "页面卷取机手动卸卷登记产出") @Operation(summary = "页面卷取机手动卸卷登记产出")
public R<String> manualtrUnload(@RequestBody @Valid WebOperateMatForm form) { public R<String> manualtrUnload(@RequestBody @Valid WebOperateMatForm form) {
trackService.trUnload(form); trackService.trUnload(form);
return R.ok(); return R.ok();
} }
@GetMapping("/measure/list") @GetMapping("/measure/list")
@ApiOperation(value = "获取测量数据list") @Operation(summary = "获取测量数据list")
public R<List<String>> measureList() { public R<List<String>> measureList() {
return R.ok(RabbitQueueListener.measureList); return R.ok(RabbitQueueListener.measureList);
} }

86
business/src/main/java/com/fizz/business/domain/CrmPdiPlan.java
View File

@@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import com.fizz.business.constants.enums.NextUnitEnum; import com.fizz.business.constants.enums.NextUnitEnum;
import com.fizz.business.constants.enums.OperModeEnum; import com.fizz.business.constants.enums.OperModeEnum;
import com.fizz.business.constants.enums.PlanStatusEnum; import com.fizz.business.constants.enums.PlanStatusEnum;
import io.swagger.annotations.ApiModelProperty; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
@@ -19,134 +19,134 @@ import java.time.LocalDateTime;
public class CrmPdiPlan implements Serializable { public class CrmPdiPlan implements Serializable {
@TableId(type = IdType.AUTO) @TableId(type = IdType.AUTO)
@ApiModelProperty(value = "id") @Schema(description = "id")
private Long id; private Long id;
@ApiModelProperty(value = "序号") @Schema(description = "序号")
private Integer seqid; private Integer seqid;
@ApiModelProperty(value = "多火轧制次数") @Schema(description = "多火轧制次数")
private Integer operid; private Integer operid;
@ApiModelProperty(value = "轧制模式") @Schema(description = "轧制模式")
private Integer operMode; private Integer operMode;
@ApiModelProperty(value = "钢卷id") @Schema(description = "钢卷id")
private String coilid; private String coilid;
@ApiModelProperty(value = "热轧卷ID") @Schema(description = "热轧卷ID")
private String hotCoilid; private String hotCoilid;
@ApiModelProperty(value = "道次数") @Schema(description = "道次数")
private Integer passno; private Integer passno;
@ApiModelProperty(value = "退火厚度") @Schema(description = "退火厚度")
private Double annealThick; private Double annealThick;
@ApiModelProperty(value = "入口厚度") @Schema(description = "入口厚度")
private Double entryThick; private Double entryThick;
@ApiModelProperty(value = "入口宽度") @Schema(description = "入口宽度")
private Double entryWidth; private Double entryWidth;
@ApiModelProperty(value = "入口重量") @Schema(description = "入口重量")
private Double entryWeight; private Double entryWeight;
@ApiModelProperty(value = "入口长度") @Schema(description = "入口长度")
private Double entryLength; private Double entryLength;
@ApiModelProperty(value = "入口内径") @Schema(description = "入口内径")
private Integer entryInnerDiameter; private Integer entryInnerDiameter;
@ApiModelProperty(value = "入口外径") @Schema(description = "入口外径")
private Integer entryOuterDiameter; private Integer entryOuterDiameter;
@ApiModelProperty(value = "出口卷号") @Schema(description = "出口卷号")
private String exitCoilid; private String exitCoilid;
@ApiModelProperty(value = "下工序代码") @Schema(description = "下工序代码")
private String nextUnit; private String nextUnit;
@ApiModelProperty(value = "分切数量") @Schema(description = "分切数量")
private Integer splitNum; private Integer splitNum;
@ApiModelProperty(value = "分切模式") @Schema(description = "分切模式")
private Integer cutMode; private Integer cutMode;
@ApiModelProperty(value = "出口重量1") @Schema(description = "出口重量1")
private Double exitValue1; private Double exitValue1;
@ApiModelProperty(value = "出口重量2") @Schema(description = "出口重量2")
private Double exitValue2; private Double exitValue2;
@ApiModelProperty(value = "出口重量3") @Schema(description = "出口重量3")
private Double exitValue3; private Double exitValue3;
@ApiModelProperty(value = "出口重量4") @Schema(description = "出口重量4")
private Double exitValue4; private Double exitValue4;
@ApiModelProperty(value = "出口重量5") @Schema(description = "出口重量5")
private Double exitValue5; private Double exitValue5;
@ApiModelProperty(value = "出口重量6") @Schema(description = "出口重量6")
private Double exitValue6; private Double exitValue6;
@ApiModelProperty(value = "出口重量") @Schema(description = "出口重量")
private Double exitWeight; private Double exitWeight;
@ApiModelProperty(value = "出口长度") @Schema(description = "出口长度")
private Double exitLength; private Double exitLength;
@ApiModelProperty(value = "出口厚度") @Schema(description = "出口厚度")
private Double exitThick; private Double exitThick;
@ApiModelProperty(value = "出口宽度") @Schema(description = "出口宽度")
private Double exitWidth; private Double exitWidth;
@ApiModelProperty(value = "钢种") @Schema(description = "钢种")
private String grade; private String grade;
@ApiModelProperty(value = "屈服强度") @Schema(description = "屈服强度")
private Integer yieldStrength; private Integer yieldStrength;
@ApiModelProperty(value = "抗拉强度") @Schema(description = "抗拉强度")
private Integer tensileStrength; private Integer tensileStrength;
@ApiModelProperty(value = "状态") @Schema(description = "状态")
private String status; private String status;
@ApiModelProperty(value = "计划号") @Schema(description = "计划号")
private String planNo; private String planNo;
@ApiModelProperty(value = "压下率") @Schema(description = "压下率")
private Double reductionRate; private Double reductionRate;
@ApiModelProperty(value = "热卷温度") @Schema(description = "热卷温度")
private Double hotCoilTemp; private Double hotCoilTemp;
@ApiModelProperty(value = "厚度正偏差") @Schema(description = "厚度正偏差")
private Double entryThickMaxtol; private Double entryThickMaxtol;
@ApiModelProperty(value = "厚度正偏差") @Schema(description = "厚度正偏差")
private Double entryThickMintol; private Double entryThickMintol;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "计划日期") @Schema(description = "计划日期")
private LocalDateTime createTime; private LocalDateTime createTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "记录日期") @Schema(description = "记录日期")
private LocalDateTime insdate; private LocalDateTime insdate;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "上线时间") @Schema(description = "上线时间")
private LocalDateTime onlineTime; private LocalDateTime onlineTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "开始日期") @Schema(description = "开始日期")
private LocalDateTime startDate; private LocalDateTime startDate;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "结束日期") @Schema(description = "结束日期")
private LocalDateTime endDate; private LocalDateTime endDate;
} }

64
business/src/main/java/com/fizz/business/domain/CrmPdoExcoil.java
View File

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
@@ -16,99 +16,99 @@ import java.time.LocalDateTime;
public class CrmPdoExcoil implements Serializable { public class CrmPdoExcoil implements Serializable {
@TableId(type = IdType.AUTO) @TableId(type = IdType.AUTO)
@ApiModelProperty(value = "id") @Schema(description = "id")
private Long id; private Long id;
@ApiModelProperty(value = "成品卷ID") @Schema(description = "成品卷ID")
private String exitCoilid; private String exitCoilid;
@ApiModelProperty(value = "进入卷ID") @Schema(description = "进入卷ID")
private String encoilid; private String encoilid;
@ApiModelProperty(value = "钢种") @Schema(description = "钢种")
private String grade; private String grade;
@ApiModelProperty(value = "多火轧制次数") @Schema(description = "多火轧制次数")
private Integer operid; private Integer operid;
@ApiModelProperty(value = "分卷id") @Schema(description = "分卷id")
private Integer subid; private Integer subid;
@ApiModelProperty(value = "头部位置") @Schema(description = "头部位置")
private Double headpos; private Double headpos;
@ApiModelProperty(value = "尾部位置") @Schema(description = "尾部位置")
private Double tailpos; private Double tailpos;
@ApiModelProperty(value = "班次") @Schema(description = "班次")
private String shift; private String shift;
@ApiModelProperty(value = "班组") @Schema(description = "班组")
private String crew; private String crew;
@ApiModelProperty(value = "退火厚度") @Schema(description = "退火厚度")
private Double annealThick; private Double annealThick;
@ApiModelProperty(value = "入口厚度") @Schema(description = "入口厚度")
private Double entryThick; private Double entryThick;
@ApiModelProperty(value = "入口宽度") @Schema(description = "入口宽度")
private Double entryWidth; private Double entryWidth;
@ApiModelProperty(value = "入口重量") @Schema(description = "入口重量")
private Double entryWeight; private Double entryWeight;
@ApiModelProperty(value = "成品厚度") @Schema(description = "成品厚度")
private Double exitThick; private Double exitThick;
@ApiModelProperty(value = "成品宽度") @Schema(description = "成品宽度")
private Double exitWidth; private Double exitWidth;
@ApiModelProperty(value = "成品长度") @Schema(description = "成品长度")
private Double exitLength; private Double exitLength;
@ApiModelProperty(value = "成品内径") @Schema(description = "成品内径")
private Double exitInnerDiameter; private Double exitInnerDiameter;
@ApiModelProperty(value = "理论出口重量") @Schema(description = "理论出口重量")
private Double calcExitWeight; private Double calcExitWeight;
@ApiModelProperty(value = "实际出口重量") @Schema(description = "实际出口重量")
private Double measExitWeight; private Double measExitWeight;
@ApiModelProperty(value = "外径") @Schema(description = "外径")
private Double outerDiameter; private Double outerDiameter;
@ApiModelProperty(value = "状态") @Schema(description = "状态")
private String status; private String status;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "上线时间") @Schema(description = "上线时间")
private LocalDateTime onlineDate; private LocalDateTime onlineDate;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "开始时间") @Schema(description = "开始时间")
private LocalDateTime startDate; private LocalDateTime startDate;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "结束时间") @Schema(description = "结束时间")
private LocalDateTime endDate; private LocalDateTime endDate;
@ApiModelProperty(value = "插入日期") @Schema(description = "插入日期")
private LocalDateTime insdate; private LocalDateTime insdate;
@ApiModelProperty(value = "质量") @Schema(description = "质量")
private Double quality; private Double quality;
@ApiModelProperty(value = "热卷ID") @Schema(description = "热卷ID")
private String hotCoilid; private String hotCoilid;
@ApiModelProperty(value = "下机组代码") @Schema(description = "下机组代码")
private String nextUnit; private String nextUnit;
@ApiModelProperty(value = "备注") @Schema(description = "备注")
private String comments; private String comments;
@ApiModelProperty(value = "目的地") @Schema(description = "目的地")
private String destination; private String destination;
} }

117
business/src/main/java/com/fizz/business/domain/ModSetupResult.java
View File

@@ -4,186 +4,185 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@Data @Data
@TableName("mod_setup_result") @TableName("mod_setup_result")
@ApiModel(value = "ModSetupResult对象", description = "轧机设置结果实体类") @Schema( description= "轧机设置结果实体类")
public class ModSetupResult { public class ModSetupResult {
@ApiModelProperty(value = "自增主键") @Schema(description = "自增主键")
@TableId(value = "id", type = IdType.AUTO) @TableId(value = "id", type = IdType.AUTO)
private Integer id; private Integer id;
@ApiModelProperty(value = "logid") @Schema(description = "logid")
private Long logId; private Long logId;
@ApiModelProperty(value = "钢卷ID") @Schema(description = "钢卷ID")
private String coilId; private String coilId;
@ApiModelProperty(value = "道次号") @Schema(description = "道次号")
private Integer passno; private Integer passno;
@ApiModelProperty(value = "机架号") @Schema(description = "机架号")
private Integer standId; private Integer standId;
@ApiModelProperty(value = "断面ID") @Schema(description = "断面ID")
private Integer fractId; private Integer fractId;
@ApiModelProperty(value = "速度限制") @Schema(description = "速度限制")
private Integer speedLimit; private Integer speedLimit;
@ApiModelProperty(value = "力限制") @Schema(description = "力限制")
private Integer forceLimit; private Integer forceLimit;
@ApiModelProperty(value = "功率限制") @Schema(description = "功率限制")
private Integer powerLimit; private Integer powerLimit;
@ApiModelProperty(value = "入口厚度") @Schema(description = "入口厚度")
private Float entryThick; private Float entryThick;
@ApiModelProperty(value = "出口厚度") @Schema(description = "出口厚度")
private Float exitThick; private Float exitThick;
@ApiModelProperty(value = "最小厚度") @Schema(description = "最小厚度")
private Float minThick; private Float minThick;
@ApiModelProperty(value = "压下率") @Schema(description = "压下率")
private Float reduction; private Float reduction;
@ApiModelProperty(value = "摩擦系数") @Schema(description = "摩擦系数")
private Float friction; private Float friction;
@ApiModelProperty(value = "入口凸度") @Schema(description = "入口凸度")
private Float entryCrown; private Float entryCrown;
@ApiModelProperty(value = "出口凸度") @Schema(description = "出口凸度")
private Float exitCrown; private Float exitCrown;
@ApiModelProperty(value = "入口张力") @Schema(description = "入口张力")
private Float entryTension; private Float entryTension;
@ApiModelProperty(value = "出口张力") @Schema(description = "出口张力")
private Float exitTension; private Float exitTension;
@ApiModelProperty(value = "入口应力") @Schema(description = "入口应力")
private Float entryTenstress; private Float entryTenstress;
@ApiModelProperty(value = "出口应力") @Schema(description = "出口应力")
private Float exitTenstress; private Float exitTenstress;
@ApiModelProperty(value = "速度比") @Schema(description = "速度比")
private Float speedFract; private Float speedFract;
@ApiModelProperty(value = "入口速度") @Schema(description = "入口速度")
private Float entrySpeed; private Float entrySpeed;
@ApiModelProperty(value = "出口速度") @Schema(description = "出口速度")
private Float exitSpeed; private Float exitSpeed;
@ApiModelProperty(value = "轧制速度") @Schema(description = "轧制速度")
private Float rollSpeed; private Float rollSpeed;
@ApiModelProperty(value = "入口应变") @Schema(description = "入口应变")
private Float sigmae; private Float sigmae;
@ApiModelProperty(value = "出口应变") @Schema(description = "出口应变")
private Float sigmas; private Float sigmas;
@ApiModelProperty(value = "平均应变") @Schema(description = "平均应变")
private Float sigmaave; private Float sigmaave;
@ApiModelProperty(value = "轧制力") @Schema(description = "轧制力")
private Float rollForce; private Float rollForce;
@ApiModelProperty(value = "轧辊间隙") @Schema(description = "轧辊间隙")
private Float rollgap; private Float rollgap;
@ApiModelProperty(value = "超出间隙") @Schema(description = "超出间隙")
private Float overgap; private Float overgap;
@ApiModelProperty(value = "轧机刚度") @Schema(description = "轧机刚度")
private Float millModulus; private Float millModulus;
@ApiModelProperty(value = "滑移") @Schema(description = "滑移")
private Float slip; private Float slip;
@ApiModelProperty(value = "变形半径") @Schema(description = "变形半径")
private Float rdef; private Float rdef;
@ApiModelProperty(value = "轧制角度") @Schema(description = "轧制角度")
private Float angle; private Float angle;
@ApiModelProperty(value = "中心流量") @Schema(description = "中心流量")
private Float centerFlow; private Float centerFlow;
@ApiModelProperty(value = "边缘流量") @Schema(description = "边缘流量")
private Float edgeFlow; private Float edgeFlow;
@ApiModelProperty(value = "中心压力") @Schema(description = "中心压力")
private Float centerPress; private Float centerPress;
@ApiModelProperty(value = "边缘压力") @Schema(description = "边缘压力")
private Float edgePress; private Float edgePress;
@ApiModelProperty(value = "入口温度") @Schema(description = "入口温度")
private Float entryTemp; private Float entryTemp;
@ApiModelProperty(value = "出口温度") @Schema(description = "出口温度")
private Float exitTemp; private Float exitTemp;
@ApiModelProperty(value = "工作辊弯曲") @Schema(description = "工作辊弯曲")
private Float wrbend; private Float wrbend;
@ApiModelProperty(value = "支撑辊弯曲") @Schema(description = "支撑辊弯曲")
private Float irbend; private Float irbend;
@ApiModelProperty(value = "支撑辊位移") @Schema(description = "支撑辊位移")
private Float irshift; private Float irshift;
@ApiModelProperty(value = "电机电流") @Schema(description = "电机电流")
private Float motorCurrent; private Float motorCurrent;
@ApiModelProperty(value = "电机电压") @Schema(description = "电机电压")
private Float motorVoltage; private Float motorVoltage;
@ApiModelProperty(value = "轧制扭矩") @Schema(description = "轧制扭矩")
private Float rollTorque; private Float rollTorque;
@ApiModelProperty(value = "总轧制扭矩") @Schema(description = "总轧制扭矩")
private Float totalRollTorque; private Float totalRollTorque;
@ApiModelProperty(value = "电机扭矩") @Schema(description = "电机扭矩")
private Float motorTorque; private Float motorTorque;
@ApiModelProperty(value = "扭矩比") @Schema(description = "扭矩比")
private Float torqueRatio; private Float torqueRatio;
@ApiModelProperty(value = "比扭矩") @Schema(description = "比扭矩")
private Float specTorque; private Float specTorque;
@ApiModelProperty(value = "功率") @Schema(description = "功率")
private Float power; private Float power;
@ApiModelProperty(value = "负载比") @Schema(description = "负载比")
private Float loadRatio; private Float loadRatio;
@ApiModelProperty(value = "计算ID 实际用的这个值") @Schema(description = "计算ID 实际用的这个值")
private String calcId; private String calcId;
@ApiModelProperty(value = "记录插入时间") @Schema(description = "记录插入时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime insdate; private LocalDateTime insdate;
@ApiModelProperty(value = "创建时间") @Schema(description = "创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime; private LocalDateTime createTime;
@ApiModelProperty(value = "更新时间") @Schema(description = "更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime; private LocalDateTime updateTime;
} }

17
business/src/main/java/com/fizz/business/domain/PlantConfig.java
View File

@@ -2,8 +2,7 @@ package com.fizz.business.domain;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
@@ -11,26 +10,26 @@ import java.time.LocalDateTime;
@Data @Data
@TableName("plant_config") @TableName("plant_config")
@ApiModel(value = "PlantConfig对象", description = "配置数据") @Schema(name = "PlantConfig对象", description = "配置数据")
public class PlantConfig implements Serializable { public class PlantConfig implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "名称") @Schema(description = "名称")
private String varname; private String varname;
@ApiModelProperty(value = "arrayindex") @Schema(description = "arrayindex")
private Integer arrayindex; private Integer arrayindex;
@ApiModelProperty(value = "描述") @Schema(description = "描述")
private String description; private String description;
@ApiModelProperty(value = "值") @Schema(description = "值")
private String value; private String value;
@ApiModelProperty(value = "单位") @Schema(description = "单位")
private String unit; private String unit;
@ApiModelProperty(value = "时间") @Schema(description = "时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime timestamp; private LocalDateTime timestamp;
} }

31
business/src/main/java/com/fizz/business/domain/ProStoppage.java
View File

@@ -4,8 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@@ -15,51 +14,51 @@ import java.time.LocalDateTime;
@Data @Data
@TableName("pro_stoppage") @TableName("pro_stoppage")
@ApiModel(value = "ProStoppage对象", description = "") @Schema(description = "ProStoppage对象")
public class ProStoppage implements Serializable { public class ProStoppage implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "停机ID") @Schema(description = "停机ID")
@TableId(value = "stopid", type = IdType.AUTO) @TableId(value = "stopid", type = IdType.AUTO)
private Long stopid; private Long stopid;
@ApiModelProperty(value = "钢卷号") @Schema(description = "钢卷号")
private String coilid; private String coilid;
@ApiModelProperty(value = "班") @Schema(description = "班")
private String shift; private String shift;
@ApiModelProperty(value = "组") @Schema(description = "组")
private String crew; private String crew;
@ApiModelProperty(value = "区域") @Schema(description = "区域")
private String area; private String area;
@ApiModelProperty(value = "机组") @Schema(description = "机组")
private String unit; private String unit;
@ApiModelProperty(value = "设备") @Schema(description = "设备")
private String seton; private String seton;
@ApiModelProperty(value = "开始时间") @Schema(description = "开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime startDate; private LocalDateTime startDate;
@ApiModelProperty(value = "结束时间") @Schema(description = "结束时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime endDate; private LocalDateTime endDate;
@ApiModelProperty(value = "停机时长") @Schema(description = "停机时长")
private BigDecimal duration; private BigDecimal duration;
@ApiModelProperty(value = "更新时间") @Schema(description = "更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private String insdate; private String insdate;
@ApiModelProperty(value = "停机类型") @Schema(description = "停机类型")
private String stopType; private String stopType;
@ApiModelProperty(value = "停机原因") @Schema(description = "停机原因")
private String remark; private String remark;
} }

19
business/src/main/java/com/fizz/business/domain/RollChangeCycle.java
View File

@@ -2,8 +2,7 @@ package com.fizz.business.domain;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
@@ -11,29 +10,29 @@ import java.time.LocalDateTime;
@Data @Data
@TableName("roll_change_cycle") @TableName("roll_change_cycle")
@ApiModel(value = "RollChangeCycle对象", description = "换辊") @Schema(description = "换辊")
public class RollChangeCycle implements Serializable { public class RollChangeCycle implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "类型") @Schema(description = "类型")
private String type; private String type;
@ApiModelProperty(value = "位置") @Schema(description = "位置")
private String position; private String position;
@ApiModelProperty(value = "机架号") @Schema(description = "机架号")
private Integer standid; private Integer standid;
@ApiModelProperty(value = "轧制长度") @Schema(description = "轧制长度")
private Double rolledLength; private Double rolledLength;
@ApiModelProperty(value = "轧制重量") @Schema(description = "轧制重量")
private Double rolledWeight; private Double rolledWeight;
@ApiModelProperty(value = "轧制数量") @Schema(description = "轧制数量")
private Integer rolledCount; private Integer rolledCount;
@ApiModelProperty(value = "insdate") @Schema(description = "insdate")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime insdate; private LocalDateTime insdate;
} }

45
business/src/main/java/com/fizz/business/domain/RollData.java
View File

@@ -4,8 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.Getter; import lombok.Getter;
@@ -15,7 +14,7 @@ import java.io.Serializable;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@TableName("roll_data") @TableName("roll_data")
@ApiModel(value = "RollData对象", description = "轧辊数据") @Schema(description = "轧辊数据")
@Getter @Getter
@Setter @Setter
@Builder @Builder
@@ -23,66 +22,66 @@ public class RollData implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@TableId(value = "rollid",type = IdType.INPUT) @TableId(value = "rollid",type = IdType.INPUT)
@ApiModelProperty(value = "轧辊号") @Schema(description = "轧辊号")
private String rollid; private String rollid;
@ApiModelProperty(value = "工序") @Schema(description = "工序")
private String seton; private String seton;
@ApiModelProperty(value = "类型") @Schema(description = "类型")
private String type; private String type;
@ApiModelProperty(value = "位置") @Schema(description = "位置")
private String position; private String position;
@ApiModelProperty(value = "机架号") @Schema(description = "机架号")
private Integer standid; private Integer standid;
@ApiModelProperty(value = "消耗") @Schema(description = "消耗")
private Integer composition; private Integer composition;
@ApiModelProperty(value = "直径") @Schema(description = "直径")
private Double diameter; private Double diameter;
@ApiModelProperty(value = "粗糙度") @Schema(description = "粗糙度")
private Double rough; private Double rough;
@ApiModelProperty(value = "凸度") @Schema(description = "凸度")
private Double crown; private Double crown;
@ApiModelProperty(value = "轧制长度") @Schema(description = "轧制长度")
private Double rolledLength; private Double rolledLength;
@ApiModelProperty(value = "轧制重量") @Schema(description = "轧制重量")
private Double rolledWeight; private Double rolledWeight;
@ApiModelProperty(value = "轧制数量") @Schema(description = "轧制数量")
private Integer rolledCount; private Integer rolledCount;
@ApiModelProperty(value = "总轧制重量") @Schema(description = "总轧制重量")
private Double totalRolledWeight; private Double totalRolledWeight;
@ApiModelProperty(value = "总轧制长度") @Schema(description = "总轧制长度")
private Double totalRolledLength; private Double totalRolledLength;
@ApiModelProperty(value = "总轧制数量") @Schema(description = "总轧制数量")
private Integer totalRolledCount; private Integer totalRolledCount;
@ApiModelProperty(value = "修理次数") @Schema(description = "修理次数")
private Integer grindCount; private Integer grindCount;
@ApiModelProperty(value = "状态") @Schema(description = "状态")
private String status; private String status;
@ApiModelProperty(value = "Installation Time") @Schema(description = "Installation Time")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime instalTime; private LocalDateTime instalTime;
@ApiModelProperty(value = "Deinstallation Time") @Schema(description = "Deinstallation Time")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime deinstalTime; private LocalDateTime deinstalTime;
@ApiModelProperty(value = "Update Time") @Schema(description = "Update Time")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updtime; private LocalDateTime updtime;
} }

51
business/src/main/java/com/fizz/business/domain/RollHistory.java
View File

@@ -2,8 +2,7 @@ package com.fizz.business.domain;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.Getter; import lombok.Getter;
@@ -16,79 +15,79 @@ import java.time.LocalDateTime;
@Setter @Setter
@Builder @Builder
@TableName("Roll_history") @TableName("Roll_history")
@ApiModel(value = "RollHistory对象", description = "轧辊历史") @Schema( description = "轧辊历史")
public class RollHistory implements Serializable { public class RollHistory implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "轧辊号") @Schema(description = "轧辊号")
private String rollid; private String rollid;
@ApiModelProperty(value = "换辊id") @Schema(description = "换辊id")
private String changeid; private String changeid;
@ApiModelProperty(value = "班") @Schema(description = "班")
private String shift; private String shift;
@ApiModelProperty(value = "组") @Schema(description = "组")
private String crew; private String crew;
@ApiModelProperty(value = "工序") @Schema(description = "工序")
private String seton; private String seton;
@ApiModelProperty(value = "类型") @Schema(description = "类型")
private String type; private String type;
@ApiModelProperty(value = "位置") @Schema(description = "位置")
private String position; private String position;
@ApiModelProperty(value = "机架号") @Schema(description = "机架号")
private Integer standid; private Integer standid;
@ApiModelProperty(value = "消化") @Schema(description = "消化")
private Integer composition; private Integer composition;
@ApiModelProperty(value = "直径") @Schema(description = "直径")
private Double diameter; private Double diameter;
@ApiModelProperty(value = "粗糙度") @Schema(description = "粗糙度")
private Double rough; private Double rough;
@ApiModelProperty(value = "凸度") @Schema(description = "凸度")
private Double crown; private Double crown;
@ApiModelProperty(value = "轧制长度") @Schema(description = "轧制长度")
private Double rolledLength; private Double rolledLength;
@ApiModelProperty(value = "轧制重量") @Schema(description = "轧制重量")
private Double rolledWeight; private Double rolledWeight;
@ApiModelProperty(value = "轧制数量") @Schema(description = "轧制数量")
private Integer rolledCount; private Integer rolledCount;
@ApiModelProperty(value = "总轧制重量") @Schema(description = "总轧制重量")
private Double totalRolledWeight; private Double totalRolledWeight;
@ApiModelProperty(value = "总轧制长度") @Schema(description = "总轧制长度")
private Double totalRolledLength; private Double totalRolledLength;
@ApiModelProperty(value = "总轧制数量") @Schema(description = "总轧制数量")
private Integer totalRolledCount; private Integer totalRolledCount;
@ApiModelProperty(value = "修理次数") @Schema(description = "修理次数")
private Integer grindCount; private Integer grindCount;
@ApiModelProperty(value = "换辊类型") @Schema(description = "换辊类型")
private String changeType; private String changeType;
@ApiModelProperty(value = "Installation Time") @Schema(description = "Installation Time")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime instalTime; private LocalDateTime instalTime;
@ApiModelProperty(value = "Deinstallation Time") @Schema(description = "Deinstallation Time")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime deinstalTime; private LocalDateTime deinstalTime;
@ApiModelProperty(value = "changeTime") @Schema(description = "changeTime")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime changeTime; private LocalDateTime changeTime;
} }

11
business/src/main/java/com/fizz/business/domain/ShiftHistory.java
View File

@@ -2,8 +2,7 @@ package com.fizz.business.domain;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
@@ -12,17 +11,17 @@ import java.time.LocalDateTime;
@TableName("shift_history") @TableName("shift_history")
@Data @Data
@ApiModel(value = "RollData对象", description = "轧辊数据") @Schema( description = "轧辊数据")
public class ShiftHistory implements Serializable { public class ShiftHistory implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "班次") @Schema(description = "班次")
private String shift; private String shift;
@ApiModelProperty(value = "组次") @Schema(description = "组次")
private String crew; private String crew;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "时间") @Schema(description = "时间")
private LocalDateTime insdate; private LocalDateTime insdate;
} }

12
business/src/main/java/com/fizz/business/domain/SteelGradeInfo.java
View File

@@ -2,7 +2,7 @@ package com.fizz.business.domain;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
@@ -14,25 +14,25 @@ import java.time.LocalDateTime;
public class SteelGradeInfo implements Serializable { public class SteelGradeInfo implements Serializable {
@TableId(value = "steel_grade_id", type = IdType.AUTO) @TableId(value = "steel_grade_id", type = IdType.AUTO)
@ApiModelProperty(value = "钢种ID") @Schema(description = "钢种ID")
private Integer steelGradeId; private Integer steelGradeId;
@TableField("steel_grade_name") @TableField("steel_grade_name")
@ApiModelProperty(value = "钢种名称") @Schema(description = "钢种名称")
private String steelGradeName; private String steelGradeName;
@TableField("steel_grade_des") @TableField("steel_grade_des")
@ApiModelProperty(value = "钢种描述") @Schema(description = "钢种描述")
private String steelGradeDes; private String steelGradeDes;
@TableField(value = "create_time", fill = FieldFill.INSERT) @TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建时间") @Schema(description = "创建时间")
private LocalDateTime createTime; private LocalDateTime createTime;
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE) @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新时间") @Schema(description = "更新时间")
private LocalDateTime updateTime; private LocalDateTime updateTime;
// Getters and Setters // Getters and Setters

25
business/src/main/java/com/fizz/business/form/CalcPdiPlanForm.java
View File

@@ -1,7 +1,6 @@
package com.fizz.business.form; package com.fizz.business.form;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;
@@ -9,37 +8,37 @@ import java.util.List;
@Data @Data
public class CalcPdiPlanForm { public class CalcPdiPlanForm {
@ApiModelProperty(value = "多火轧制次数") @Schema(description = "多火轧制次数")
private Integer operid; private Integer operid;
@ApiModelProperty(value = "轧制模式 1轧制力 2延伸率") @Schema(description = "轧制模式 1轧制力 2延伸率")
private Integer operMode; private Integer operMode;
@ApiModelProperty(value = "钢种") @Schema(description = "钢种")
private String grade; private String grade;
@ApiModelProperty(value = "卷ID") @Schema(description = "卷ID")
private String coilid; private String coilid;
@ApiModelProperty(value = "热轧卷ID") @Schema(description = "热轧卷ID")
private String hotCoilid; private String hotCoilid;
@ApiModelProperty(value = "道次数") @Schema(description = "道次数")
private Integer passno; private Integer passno;
@ApiModelProperty(value = "入口宽度") @Schema(description = "入口宽度")
private Double entryWidth; private Double entryWidth;
@ApiModelProperty(value = "退火厚度") @Schema(description = "退火厚度")
private Double annealThick; private Double annealThick;
@ApiModelProperty(value = "入口厚度") @Schema(description = "入口厚度")
private Double entryThick; private Double entryThick;
@ApiModelProperty(value = "出口厚度") @Schema(description = "出口厚度")
private Double exitThick; private Double exitThick;
@ApiModelProperty(value = "设定值列表") @Schema(description = "设定值列表")
List<ModSetupResultCalcForm> lists; List<ModSetupResultCalcForm> lists;
} }

8
business/src/main/java/com/fizz/business/form/ChangePlanStatusForm.java
View File

@@ -1,6 +1,6 @@
package com.fizz.business.form; package com.fizz.business.form;
import io.swagger.annotations.ApiModelProperty; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
@@ -20,15 +20,15 @@ import java.io.Serializable;
public class ChangePlanStatusForm implements Serializable { public class ChangePlanStatusForm implements Serializable {
@NotNull(message = "状态变更类型不能为空") @NotNull(message = "状态变更类型不能为空")
@ApiModelProperty("ONLINE-钢卷上线，UNLOAD-手动卸卷，PRODUCT-生产完成") @Schema(description="ONLINE-钢卷上线，UNLOAD-手动卸卷，PRODUCT-生产完成")
private String operation; private String operation;
@NotNull(message = "计划id不能为空") @NotNull(message = "计划id不能为空")
@ApiModelProperty("主键id") @Schema(description="主键id")
private Long id; private Long id;
@NotNull(message = "钢卷号不能为空") @NotNull(message = "钢卷号不能为空")
@ApiModelProperty("钢卷号") @Schema(description="钢卷号")
private String coilId; private String coilId;

76
business/src/main/java/com/fizz/business/form/CrmPdiPlanForm.java
View File

@@ -1,7 +1,7 @@
package com.fizz.business.form; package com.fizz.business.form;
import com.fizz.business.vo.ModSetupResultVO; import com.fizz.business.vo.ModSetupResultVO;
import io.swagger.annotations.ApiModelProperty; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;
@@ -10,115 +10,115 @@ import java.util.List;
@Data @Data
public class CrmPdiPlanForm { public class CrmPdiPlanForm {
@ApiModelProperty(value = "序列号") @Schema(description = "序列号")
private Integer seqid; private Integer seqid;
@ApiModelProperty(value = "多火轧制次数") @Schema(description = "多火轧制次数")
private Integer operid; private Integer operid;
@ApiModelProperty(value = "轧制模式 1轧制力 2延伸率") @Schema(description = "轧制模式 1轧制力 2延伸率")
private Integer operMode; private Integer operMode;
@ApiModelProperty(value = "卷ID") @Schema(description = "卷ID")
private String coilid; private String coilid;
@ApiModelProperty(value = "热轧卷ID") @Schema(description = "热轧卷ID")
private String hotCoilid; private String hotCoilid;
@ApiModelProperty(value = "道次数") @Schema(description = "道次数")
private Integer passno; private Integer passno;
@ApiModelProperty(value = "退火厚度") @Schema(description = "退火厚度")
private Double annealThick; private Double annealThick;
@ApiModelProperty(value = "入口厚度") @Schema(description = "入口厚度")
private Double entryThick; private Double entryThick;
@ApiModelProperty(value = "入口宽度") @Schema(description = "入口宽度")
private Double entryWidth; private Double entryWidth;
@ApiModelProperty(value = "入口重量") @Schema(description = "入口重量")
private Double entryWeight; private Double entryWeight;
@ApiModelProperty(value = "入口长度") @Schema(description = "入口长度")
private Double entryLength; private Double entryLength;
@ApiModelProperty(value = "入口内径") @Schema(description = "入口内径")
private Integer entryInnerDiameter; private Integer entryInnerDiameter;
@ApiModelProperty(value = "入口外径") @Schema(description = "入口外径")
private Integer entryOuterDiameter; private Integer entryOuterDiameter;
@ApiModelProperty(value = "出口卷号") @Schema(description = "出口卷号")
private String exitCoilid; private String exitCoilid;
@ApiModelProperty(value = "下工序代码 1冷硬卷 2退火卷 3其他 ") @Schema(description = "下工序代码 1冷硬卷 2退火卷 3其他 ")
private String nextUnit; private String nextUnit;
@ApiModelProperty(value = "分割数量") @Schema(description = "分割数量")
private Integer splitNum; private Integer splitNum;
@ApiModelProperty(value = "切割模式") @Schema(description = "切割模式")
private Integer cutMode; private Integer cutMode;
@ApiModelProperty(value = "出口重量1") @Schema(description = "出口重量1")
private Double exitValue1; private Double exitValue1;
@ApiModelProperty(value = "出口重量2") @Schema(description = "出口重量2")
private Double exitValue2; private Double exitValue2;
@ApiModelProperty(value = "出口重量3") @Schema(description = "出口重量3")
private Double exitValue3; private Double exitValue3;
@ApiModelProperty(value = "出口重量4") @Schema(description = "出口重量4")
private Double exitValue4; private Double exitValue4;
@ApiModelProperty(value = "出口重量5") @Schema(description = "出口重量5")
private Double exitValue5; private Double exitValue5;
@ApiModelProperty(value = "出口重量6") @Schema(description = "出口重量6")
private Double exitValue6; private Double exitValue6;
@ApiModelProperty(value = "出口重量") @Schema(description = "出口重量")
private Double exitWeight; private Double exitWeight;
@ApiModelProperty(value = "出口长度") @Schema(description = "出口长度")
private Double exitLength; private Double exitLength;
@ApiModelProperty(value = "出口厚度") @Schema(description = "出口厚度")
private Double exitThick; private Double exitThick;
@ApiModelProperty(value = "出口宽度") @Schema(description = "出口宽度")
private Double exitWidth; private Double exitWidth;
@ApiModelProperty(value = "钢种") @Schema(description = "钢种")
private String grade; private String grade;
@ApiModelProperty(value = "屈服强度") @Schema(description = "屈服强度")
private Integer yieldStrength; private Integer yieldStrength;
@ApiModelProperty(value = "抗拉强度") @Schema(description = "抗拉强度")
private Integer tensileStrength; private Integer tensileStrength;
@ApiModelProperty(value = "状态 NEW READY ONLINE PRODUCING PRODUCT") @Schema(description = "状态 NEW READY ONLINE PRODUCING PRODUCT")
private String status; private String status;
@ApiModelProperty(value = "计划号") @Schema(description = "计划号")
private String planNo; private String planNo;
@ApiModelProperty(value = "压下率") @Schema(description = "压下率")
private Double reductionRate; private Double reductionRate;
@ApiModelProperty(value = "热卷温度") @Schema(description = "热卷温度")
private Double hotCoilTemp; private Double hotCoilTemp;
@ApiModelProperty(value = "厚度正偏差") @Schema(description = "厚度正偏差")
private Double entryThickMaxtol; private Double entryThickMaxtol;
@ApiModelProperty(value = "厚度正偏差") @Schema(description = "厚度正偏差")
private Double entryThickMintol; private Double entryThickMintol;
@ApiModelProperty(value = "设定值列表") @Schema(description = "设定值列表")
List<ModSetupResultVO> lists; List<ModSetupResultVO> lists;
} }

10
business/src/main/java/com/fizz/business/form/CrmPdoExcoilForm.java
View File

@@ -1,8 +1,6 @@
package com.fizz.business.form; package com.fizz.business.form;
import io.swagger.v3.oas.annotations.media.Schema;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@@ -11,13 +9,13 @@ import java.time.LocalDateTime;
public class CrmPdoExcoilForm { public class CrmPdoExcoilForm {
@ApiModelProperty(value = "钢卷号") @Schema(description = "钢卷号")
private String encoilid; private String encoilid;
@ApiModelProperty(value = "开始日期") @Schema(description = "开始日期")
private String startDate; private String startDate;
@ApiModelProperty(value = "结束日期") @Schema(description = "结束日期")
private String endDate; private String endDate;
} }

17
business/src/main/java/com/fizz/business/form/LogDataForm.java
View File

@@ -1,14 +1,11 @@
package com.fizz.business.form; package com.fizz.business.form;
import cn.hutool.core.date.DatePattern;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Date;
@Data @Data
public class LogDataForm implements Serializable { 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") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime startTime; private LocalDateTime startTime;
@ApiModelProperty(value = "结束时间") @Schema(description = "结束时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime endTime; private LocalDateTime endTime;
@ApiModelProperty(value = "报警类型") @Schema(description = "报警类型")
private String logtype; private String logtype;
/** /**
* 报警模块 * 报警模块
*/ */
@ApiModelProperty(value = "报警模块") @Schema(description = "报警模块")
private String module; private String module;
/** /**
* 警报内容 * 警报内容
*/ */
@ApiModelProperty(value = "警报内容") @Schema(description = "警报内容")
private String logtext; private String logtext;
/** /**
* 报警状态 * 报警状态
*/ */
@ApiModelProperty(value = "报警状态") @Schema(description = "报警状态")
private Integer status; private Integer status;
private int pageNum; private int pageNum;

10
business/src/main/java/com/fizz/business/form/ModSetupResultCalcForm.java
View File

@@ -1,22 +1,22 @@
package com.fizz.business.form; package com.fizz.business.form;
import io.swagger.annotations.ApiModelProperty; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
@Data @Data
public class ModSetupResultCalcForm { public class ModSetupResultCalcForm {
@ApiModelProperty(value = "入口厚度") @Schema(description = "入口厚度")
private Float entryThick; private Float entryThick;
@ApiModelProperty(value = "出口厚度") @Schema(description = "出口厚度")
private Float exitThick; private Float exitThick;
@ApiModelProperty(value = "入口张力") @Schema(description = "入口张力")
private Float entryTension; private Float entryTension;
@ApiModelProperty(value = "出口张力") @Schema(description = "出口张力")
private Float exitTension; private Float exitTension;

14
business/src/main/java/com/fizz/business/form/ModSetupResultForm.java
View File

@@ -1,27 +1,27 @@
package com.fizz.business.form; package com.fizz.business.form;
import io.swagger.annotations.ApiModelProperty; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
@Data @Data
public class ModSetupResultForm { public class ModSetupResultForm {
@ApiModelProperty(value = "钢卷ID") @Schema(description = "钢卷ID")
private String coilId; private String coilId;
@ApiModelProperty(value = "钢种") @Schema(description = "钢种")
private String grade; private String grade;
@ApiModelProperty(value = "道次号") @Schema(description = "道次号")
private Integer passno; private Integer passno;
@ApiModelProperty(value = "退火厚度") @Schema(description = "退火厚度")
private Integer annealThick; private Integer annealThick;
@ApiModelProperty(value = "入口厚度") @Schema(description = "入口厚度")
private Double entryThick; private Double entryThick;
@ApiModelProperty(value = "出口厚度") @Schema(description = "出口厚度")
private Double exitThick; private Double exitThick;
} }

26
business/src/main/java/com/fizz/business/form/PlanQueryForm.java
View File

@@ -1,6 +1,6 @@
package com.fizz.business.form; package com.fizz.business.form;
import io.swagger.annotations.ApiModelProperty; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@@ -9,40 +9,40 @@ import java.time.LocalDateTime;
@Data @Data
public class PlanQueryForm { public class PlanQueryForm {
@ApiModelProperty(value = "卷ID") @Schema(description = "卷ID")
private String coilid; private String coilid;
@ApiModelProperty(value = "热轧卷ID") @Schema(description = "热轧卷ID")
private String hotCoilid; private String hotCoilid;
@ApiModelProperty(value = "道次数") @Schema(description = "道次数")
private Integer passno; private Integer passno;
@ApiModelProperty(value = "入口厚度") @Schema(description = "入口厚度")
private Float entryThick; private Float entryThick;
@ApiModelProperty(value = "入口宽度") @Schema(description = "入口宽度")
private Float entryWidth; private Float entryWidth;
@ApiModelProperty(value = "入口内径") @Schema(description = "入口内径")
private Integer entryInnerDiameter; private Integer entryInnerDiameter;
@ApiModelProperty(value = "入口外径") @Schema(description = "入口外径")
private Integer entryOuterDiameter; private Integer entryOuterDiameter;
@ApiModelProperty(value = "状态") @Schema(description = "状态")
private String status; private String status;
@ApiModelProperty(value = "记录日期") @Schema(description = "记录日期")
private LocalDateTime insdate; private LocalDateTime insdate;
@ApiModelProperty(value = "上线时间") @Schema(description = "上线时间")
private LocalDateTime onlineTime; private LocalDateTime onlineTime;
@ApiModelProperty(value = "开始日期") @Schema(description = "开始日期")
private LocalDateTime startDate; private LocalDateTime startDate;
@ApiModelProperty(value = "结束日期") @Schema(description = "结束日期")
private LocalDateTime endDate; private LocalDateTime endDate;
} }

6
business/src/main/java/com/fizz/business/form/ProStoppageForm.java
View File

@@ -1,13 +1,13 @@
package com.fizz.business.form; package com.fizz.business.form;
import io.swagger.annotations.ApiModelProperty; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
@Data @Data
public class ProStoppageForm { public class ProStoppageForm {
@ApiModelProperty(value = "开始日期") @Schema(description = "开始时间", example = "2023-08-12", format = "date", pattern = "yyyy-MM-dd")
private String startDate; private String startDate;
@ApiModelProperty(value = "结束日期") @Schema(description = "结束时间", example = "2025-08-13", format = "date", pattern = "yyyy-MM-dd")
private String endDate; private String endDate;
} }

10
business/src/main/java/com/fizz/business/form/RollHistoryForm.java
View File

@@ -1,25 +1,25 @@
package com.fizz.business.form; package com.fizz.business.form;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@Data @Data
public class RollHistoryForm { public class RollHistoryForm {
@ApiModelProperty(value = "开始时间") @Schema(description = "开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime startTime; private LocalDateTime startTime;
@ApiModelProperty(value = "结束时间") @Schema(description = "结束时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime endTime; private LocalDateTime endTime;
@ApiModelProperty(value = "换辊号") @Schema(description = "换辊号")
private String changeId; private String changeId;
@ApiModelProperty(value = "轧辊号") @Schema(description = "轧辊号")
private String rollid; private String rollid;
private int pageNum; private int pageNum;

12
business/src/main/java/com/fizz/business/form/WebOperateMatForm.java
View File

@@ -1,7 +1,7 @@
package com.fizz.business.form; package com.fizz.business.form;
import com.fizz.business.constants.enums.WebMatOperateEnum; import com.fizz.business.constants.enums.WebMatOperateEnum;
import io.swagger.annotations.ApiModelProperty; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
@@ -22,21 +22,21 @@ import java.io.Serializable;
public class WebOperateMatForm implements Serializable { public class WebOperateMatForm implements Serializable {
@NotNull(message = "操作不存在") @NotNull(message = "操作不存在")
@ApiModelProperty("ONLINE-钢卷上线，NEW-回退，PRODUCT-生成完成") @Schema(description = "ONLINE-钢卷上线，NEW-回退，PRODUCT-生成完成")
private WebMatOperateEnum operation; private WebMatOperateEnum operation;
@NotNull(message = "主键id不能为空") @NotNull(message = "主键id不能为空")
@ApiModelProperty("主键id") @Schema(description = "主键id")
private Long id; private Long id;
@NotBlank(message = "钢卷号不能为空") @NotBlank(message = "钢卷号不能为空")
@ApiModelProperty(value = "钢卷号") @Schema(description = "钢卷号")
private String entryMatId; private String entryMatId;
@ApiModelProperty(value = "计划号") @Schema(description = "计划号")
private String planNo; private String planNo;
@ApiModelProperty(value = "重量") @Schema(description = "重量")
private Double weight; private Double weight;
} }

4
business/src/main/java/com/fizz/business/mq/RabbitMQ/RabbitQueueListener.java
View File

@@ -8,8 +8,8 @@ import com.fizz.business.service.impl.ModSetupResultServiceImpl;
import com.fizz.business.utils.WebSocketUtil; import com.fizz.business.utils.WebSocketUtil;
import com.fizz.business.vo.ModSetupResultKeyVO; import com.fizz.business.vo.ModSetupResultKeyVO;
import com.fizz.business.vo.ModSetupResultVO; import com.fizz.business.vo.ModSetupResultVO;
import com.google.common.collect.Lists;
import lombok.extern.log4j.Log4j2; 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.RabbitHandler;
import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.messaging.handler.annotation.Headers; import org.springframework.messaging.handler.annotation.Headers;
@@ -21,7 +21,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
@Log4j2 @Log4j2
@Component //@Component
public class RabbitQueueListener { public class RabbitQueueListener {
public static List<String> measureList = Lists.newArrayList(); public static List<String> measureList = Lists.newArrayList();

4
business/src/main/java/com/fizz/business/utils/WebSocketUtil.java
View File

@@ -4,7 +4,6 @@ import com.alibaba.druid.support.json.JSONUtils;
import com.fizz.business.constants.enums.WsTypeEnum; import com.fizz.business.constants.enums.WsTypeEnum;
import com.fizz.business.service.client.TrackWsHandler; import com.fizz.business.service.client.TrackWsHandler;
import com.fizz.business.vo.CrmPdiPlanVO; import com.fizz.business.vo.CrmPdiPlanVO;
import com.google.common.collect.Maps;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@@ -14,6 +13,7 @@ import org.springframework.web.socket.WebSocketSession;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.io.IOException; import java.io.IOException;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@Slf4j @Slf4j
@@ -28,7 +28,7 @@ public class WebSocketUtil {
} }
public static void sendMessage(WsTypeEnum type, String text) { public static void sendMessage(WsTypeEnum type, String text) {
Map<String, WebSocketSession> clients = trackWsHandler.getClients().getOrDefault(type.name(), Maps.newConcurrentMap()); Map<String, WebSocketSession> clients = trackWsHandler.getClients().getOrDefault(type.name(), new ConcurrentHashMap<>());
TextMessage message = new TextMessage(text); TextMessage message = new TextMessage(text);
clients.values().forEach(s -> { clients.values().forEach(s -> {
try { try {

89
business/src/main/java/com/fizz/business/vo/CrmPdiPlanVO.java
View File

@@ -1,10 +1,7 @@
package com.fizz.business.vo; package com.fizz.business.vo;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.fizz.business.constants.enums.NextUnitEnum; import io.swagger.v3.oas.annotations.media.Schema;
import com.fizz.business.constants.enums.OperModeEnum;
import com.fizz.business.constants.enums.PlanStatusEnum;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@@ -13,134 +10,134 @@ import java.time.LocalDateTime;
@Data @Data
public class CrmPdiPlanVO { public class CrmPdiPlanVO {
@ApiModelProperty(value = "id") @Schema(description = "id")
private Long id; private Long id;
@ApiModelProperty(value = "序列号") @Schema(description = "序列号")
private Integer seqid; private Integer seqid;
@ApiModelProperty(value = "多火轧制次数") @Schema(description = "多火轧制次数")
private Integer operid; private Integer operid;
@ApiModelProperty(value = "轧制模式 1轧制力 2延伸率") @Schema(description = "轧制模式 1轧制力 2延伸率")
private Integer operMode; private Integer operMode;
@ApiModelProperty(value = "卷ID") @Schema(description = "卷ID")
private String coilid; private String coilid;
@ApiModelProperty(value = "热轧卷ID") @Schema(description = "热轧卷ID")
private String hotCoilid; private String hotCoilid;
@ApiModelProperty(value = "道次数") @Schema(description = "道次数")
private Integer passno; private Integer passno;
@ApiModelProperty(value = "退火厚度") @Schema(description = "退火厚度")
private Integer annealThick; private Integer annealThick;
@ApiModelProperty(value = "入口厚度") @Schema(description = "入口厚度")
private Double entryThick; private Double entryThick;
@ApiModelProperty(value = "入口宽度") @Schema(description = "入口宽度")
private Double entryWidth; private Double entryWidth;
@ApiModelProperty(value = "入口重量") @Schema(description = "入口重量")
private Double entryWeight; private Double entryWeight;
@ApiModelProperty(value = "入口长度") @Schema(description = "入口长度")
private Double entryLength; private Double entryLength;
@ApiModelProperty(value = "入口内径") @Schema(description = "入口内径")
private Integer entryInnerDiameter; private Integer entryInnerDiameter;
@ApiModelProperty(value = "入口外径") @Schema(description = "入口外径")
private Integer entryOuterDiameter; private Integer entryOuterDiameter;
@ApiModelProperty(value = "出口卷号") @Schema(description = "出口卷号")
private String exitCoilid; private String exitCoilid;
@ApiModelProperty(value = "下工序代码 1冷硬卷 2退火卷 3其他 ") @Schema(description = "下工序代码 1冷硬卷 2退火卷 3其他 ")
private String nextUnit; private String nextUnit;
@ApiModelProperty(value = "分割数量") @Schema(description = "分割数量")
private Integer splitNum; private Integer splitNum;
@ApiModelProperty(value = "切割模式") @Schema(description = "切割模式")
private Integer cutMode; private Integer cutMode;
@ApiModelProperty(value = "出口重量1") @Schema(description = "出口重量1")
private Double exitValue1; private Double exitValue1;
@ApiModelProperty(value = "出口重量2") @Schema(description = "出口重量2")
private Double exitValue2; private Double exitValue2;
@ApiModelProperty(value = "出口重量3") @Schema(description = "出口重量3")
private Double exitValue3; private Double exitValue3;
@ApiModelProperty(value = "出口重量4") @Schema(description = "出口重量4")
private Double exitValue4; private Double exitValue4;
@ApiModelProperty(value = "出口重量5") @Schema(description = "出口重量5")
private Double exitValue5; private Double exitValue5;
@ApiModelProperty(value = "出口重量6") @Schema(description = "出口重量6")
private Double exitValue6; private Double exitValue6;
@ApiModelProperty(value = "出口重量") @Schema(description = "出口重量")
private Double exitWeight; private Double exitWeight;
@ApiModelProperty(value = "出口长度") @Schema(description = "出口长度")
private Double exitLength; private Double exitLength;
@ApiModelProperty(value = "出口厚度") @Schema(description = "出口厚度")
private Double exitThick; private Double exitThick;
@ApiModelProperty(value = "出口宽度") @Schema(description = "出口宽度")
private Double exitWidth; private Double exitWidth;
@ApiModelProperty(value = "钢种") @Schema(description = "钢种")
private String grade; private String grade;
@ApiModelProperty(value = "屈服强度") @Schema(description = "屈服强度")
private Integer yieldStrength; private Integer yieldStrength;
@ApiModelProperty(value = "抗拉强度") @Schema(description = "抗拉强度")
private Integer tensileStrength; private Integer tensileStrength;
@ApiModelProperty(value = "状态 NEW READY ONLINE PRODUCING PRODUCT") @Schema(description = "状态 NEW READY ONLINE PRODUCING PRODUCT")
private String status; private String status;
@ApiModelProperty(value = "计划号") @Schema(description = "计划号")
private String planNo; private String planNo;
@ApiModelProperty(value = "压下率") @Schema(description = "压下率")
private Double reductionRate; private Double reductionRate;
@ApiModelProperty(value = "热卷温度") @Schema(description = "热卷温度")
private Double hotCoilTemp; private Double hotCoilTemp;
@ApiModelProperty(value = "厚度正偏差") @Schema(description = "厚度正偏差")
private Double entryThickMaxtol; private Double entryThickMaxtol;
@ApiModelProperty(value = "厚度正偏差") @Schema(description = "厚度正偏差")
private Double entryThickMintol; private Double entryThickMintol;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "计划日期") @Schema(description = "计划日期")
private LocalDateTime createTime; private LocalDateTime createTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "记录日期") @Schema(description = "记录日期")
private LocalDateTime insdate; private LocalDateTime insdate;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "上线时间") @Schema(description = "上线时间")
private LocalDateTime onlineTime; private LocalDateTime onlineTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "开始日期") @Schema(description = "开始日期")
private LocalDateTime startDate; private LocalDateTime startDate;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "结束日期") @Schema(description = "结束日期")
private LocalDateTime endDate; private LocalDateTime endDate;
} }

63
business/src/main/java/com/fizz/business/vo/ModSetupResultVO.java
View File

@@ -3,8 +3,7 @@ package com.fizz.business.vo;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@@ -12,95 +11,95 @@ import java.time.LocalDateTime;
@Data @Data
public class ModSetupResultVO { public class ModSetupResultVO {
@ApiModelProperty(value = "自增主键") @Schema(description = "自增主键")
@TableId(value = "id", type = IdType.AUTO) @TableId(value = "id", type = IdType.AUTO)
private Integer id; private Integer id;
@ApiModelProperty(value = "logid") @Schema(description = "logid")
private Long logId; private Long logId;
@ApiModelProperty(value = "钢卷ID") @Schema(description = "钢卷ID")
private String coilId; private String coilId;
@ApiModelProperty(value = "道次号") @Schema(description = "道次号")
private Integer passno; private Integer passno;
@ApiModelProperty(value = "入口厚度") @Schema(description = "入口厚度")
private Float entryThick; private Float entryThick;
@ApiModelProperty(value = "出口厚度") @Schema(description = "出口厚度")
private Float exitThick; private Float exitThick;
@ApiModelProperty(value = "压下率") @Schema(description = "压下率")
private Float reduction; private Float reduction;
@ApiModelProperty(value = "入口张力") @Schema(description = "入口张力")
private Float entryTension; private Float entryTension;
@ApiModelProperty(value = "出口张力") @Schema(description = "出口张力")
private Float exitTension; private Float exitTension;
@ApiModelProperty(value = "入口应力") @Schema(description = "入口应力")
private Float entryTenstress; private Float entryTenstress;
@ApiModelProperty(value = "出口应力") @Schema(description = "出口应力")
private Float exitTenstress; private Float exitTenstress;
@ApiModelProperty(value = "速度比") @Schema(description = "速度比")
private Float speedFract; private Float speedFract;
@ApiModelProperty(value = "入口速度") @Schema(description = "入口速度")
private Float entrySpeed; private Float entrySpeed;
@ApiModelProperty(value = "出口速度") @Schema(description = "出口速度")
private Float exitSpeed; private Float exitSpeed;
@ApiModelProperty(value = "轧制速度") @Schema(description = "轧制速度")
private Float rollSpeed; private Float rollSpeed;
@ApiModelProperty(value = "轧制力") @Schema(description = "轧制力")
private Float rollForce; private Float rollForce;
@ApiModelProperty(value = "轧辊间隙") @Schema(description = "轧辊间隙")
private Float rollgap; private Float rollgap;
@ApiModelProperty(value = "超出间隙") @Schema(description = "超出间隙")
private Float overgap; private Float overgap;
@ApiModelProperty(value = "轧机刚度") @Schema(description = "轧机刚度")
private Float millModulus; private Float millModulus;
@ApiModelProperty(value = "前滑") @Schema(description = "前滑")
private Float slip; private Float slip;
@ApiModelProperty(value = "工作辊弯辊力") @Schema(description = "工作辊弯辊力")
private Float wrbend; private Float wrbend;
@ApiModelProperty(value = "支撑辊弯辊力") @Schema(description = "支撑辊弯辊力")
private Float irbend; private Float irbend;
@ApiModelProperty(value = "轧制扭矩") @Schema(description = "轧制扭矩")
private Float rollTorque; private Float rollTorque;
@ApiModelProperty(value = "总轧制扭矩") @Schema(description = "总轧制扭矩")
private Float totalRollTorque; private Float totalRollTorque;
@ApiModelProperty(value = "电机扭矩") @Schema(description = "电机扭矩")
private Float motorTorque; private Float motorTorque;
@ApiModelProperty(value = "扭矩比") @Schema(description = "扭矩比")
private Float torqueRatio; private Float torqueRatio;
@ApiModelProperty(value = "比扭矩") @Schema(description = "比扭矩")
private Float specTorque; private Float specTorque;
@ApiModelProperty(value = "功率") @Schema(description = "功率")
private Float power; private Float power;
@ApiModelProperty(value = "负载比") @Schema(description = "负载比")
private Float loadRatio; private Float loadRatio;
@ApiModelProperty(value = "计算ID 实际用的这个值") @Schema(description = "计算ID 实际用的这个值")
private String calcId; private String calcId;
} }

30
business/src/main/java/com/fizz/business/vo/OnlineRollDataVO.java
View File

@@ -3,55 +3,55 @@ package com.fizz.business.vo;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.fizz.business.constants.enums.RollerPositionEnum; import com.fizz.business.constants.enums.RollerPositionEnum;
import com.fizz.business.constants.enums.RollerTypeEnum; import com.fizz.business.constants.enums.RollerTypeEnum;
import io.swagger.annotations.ApiModelProperty; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@Data @Data
public class OnlineRollDataVO { public class OnlineRollDataVO {
@ApiModelProperty(value = "轧辊号") @Schema(description = "轧辊号")
private String rollid; private String rollid;
@ApiModelProperty(value = "类型") @Schema(description = "类型")
private RollerTypeEnum type; private RollerTypeEnum type;
@ApiModelProperty(value = "位置") @Schema(description = "位置")
private RollerPositionEnum position; private RollerPositionEnum position;
@ApiModelProperty(value = "直径") @Schema(description = "直径")
private Double diameter; private Double diameter;
@ApiModelProperty(value = "粗糙度") @Schema(description = "粗糙度")
private Double rough; private Double rough;
@ApiModelProperty(value = "凸度") @Schema(description = "凸度")
private Double crown; private Double crown;
@ApiModelProperty(value = "轧制长度") @Schema(description = "轧制长度")
private Double rolledLength; private Double rolledLength;
@ApiModelProperty(value = "轧制重量") @Schema(description = "轧制重量")
private Double rolledWeight; private Double rolledWeight;
@ApiModelProperty(value = "轧制数量") @Schema(description = "轧制数量")
private Integer rolledCount; private Integer rolledCount;
@ApiModelProperty(value = "Installation Time") @Schema(description = "Installation Time")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime instalTime; private LocalDateTime instalTime;
@ApiModelProperty(value = "可用长度") @Schema(description = "可用长度")
private Double usableLength; private Double usableLength;
@ApiModelProperty(value = "剩余长度") @Schema(description = "剩余长度")
private Double leftLength; private Double leftLength;
@ApiModelProperty(value = "可用重量") @Schema(description = "可用重量")
private Double usableWeight; private Double usableWeight;
@ApiModelProperty(value = "剩余重量") @Schema(description = "剩余重量")
private Double leftWeight; private Double leftWeight;
} }

88
business/src/main/java/com/fizz/business/vo/PdiPlanSetupInfoVO.java
View File

@@ -2,7 +2,7 @@ package com.fizz.business.vo;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@@ -11,138 +11,138 @@ import java.util.List;
@Data @Data
public class PdiPlanSetupInfoVO { public class PdiPlanSetupInfoVO {
@ApiModelProperty(value = "id") @Schema(description = "id")
private Long id; private Long id;
@ApiModelProperty(value = "序列号") @Schema(description = "序列号")
private Integer seqid; private Integer seqid;
@ApiModelProperty(value = "多火轧制次数") @Schema(description = "多火轧制次数")
private Integer operid; private Integer operid;
@ApiModelProperty(value = "轧制模式 1轧制力 2延伸率") @Schema(description = "轧制模式 1轧制力 2延伸率")
private Integer operMode; private Integer operMode;
@ApiModelProperty(value = "卷ID") @Schema(description = "卷ID")
private String coilid; private String coilid;
@ApiModelProperty(value = "热轧卷ID") @Schema(description = "热轧卷ID")
private String hotCoilid; private String hotCoilid;
@ApiModelProperty(value = "道次数") @Schema(description = "道次数")
private Integer passno; private Integer passno;
@ApiModelProperty(value = "退火厚度") @Schema(description = "退火厚度")
private Integer annealThick; private Integer annealThick;
@ApiModelProperty(value = "入口厚度") @Schema(description = "入口厚度")
private Double entryThick; private Double entryThick;
@ApiModelProperty(value = "入口宽度") @Schema(description = "入口宽度")
private Double entryWidth; private Double entryWidth;
@ApiModelProperty(value = "入口重量") @Schema(description = "入口重量")
private Double entryWeight; private Double entryWeight;
@ApiModelProperty(value = "入口长度") @Schema(description = "入口长度")
private Double entryLength; private Double entryLength;
@ApiModelProperty(value = "入口内径") @Schema(description = "入口内径")
private Integer entryInnerDiameter; private Integer entryInnerDiameter;
@ApiModelProperty(value = "入口外径") @Schema(description = "入口外径")
private Integer entryOuterDiameter; private Integer entryOuterDiameter;
@ApiModelProperty(value = "出口卷号") @Schema(description = "出口卷号")
private String exitCoilid; private String exitCoilid;
@ApiModelProperty(value = "下工序代码 1冷硬卷 2退火卷 3其他 ") @Schema(description = "下工序代码 1冷硬卷 2退火卷 3其他 ")
private String nextUnit; private String nextUnit;
@ApiModelProperty(value = "分割数量") @Schema(description = "分割数量")
private Integer splitNum; private Integer splitNum;
@ApiModelProperty(value = "切割模式") @Schema(description = "切割模式")
private Integer cutMode; private Integer cutMode;
@ApiModelProperty(value = "出口重量1") @Schema(description = "出口重量1")
private Double exitValue1; private Double exitValue1;
@ApiModelProperty(value = "出口重量2") @Schema(description = "出口重量2")
private Double exitValue2; private Double exitValue2;
@ApiModelProperty(value = "出口重量3") @Schema(description = "出口重量3")
private Double exitValue3; private Double exitValue3;
@ApiModelProperty(value = "出口重量4") @Schema(description = "出口重量4")
private Double exitValue4; private Double exitValue4;
@ApiModelProperty(value = "出口重量5") @Schema(description = "出口重量5")
private Double exitValue5; private Double exitValue5;
@ApiModelProperty(value = "出口重量6") @Schema(description = "出口重量6")
private Double exitValue6; private Double exitValue6;
@ApiModelProperty(value = "出口重量") @Schema(description = "出口重量")
private Double exitWeight; private Double exitWeight;
@ApiModelProperty(value = "出口长度") @Schema(description = "出口长度")
private Double exitLength; private Double exitLength;
@ApiModelProperty(value = "出口厚度") @Schema(description = "出口厚度")
private Double exitThick; private Double exitThick;
@ApiModelProperty(value = "出口宽度") @Schema(description = "出口宽度")
private Double exitWidth; private Double exitWidth;
@ApiModelProperty(value = "钢种") @Schema(description = "钢种")
private String grade; private String grade;
@ApiModelProperty(value = "屈服强度") @Schema(description = "屈服强度")
private Integer yieldStrength; private Integer yieldStrength;
@ApiModelProperty(value = "抗拉强度") @Schema(description = "抗拉强度")
private Integer tensileStrength; private Integer tensileStrength;
@ApiModelProperty(value = "状态 NEW READY ONLINE PRODUCING PRODUCT") @Schema(description = "状态 NEW READY ONLINE PRODUCING PRODUCT")
private String status; private String status;
@ApiModelProperty(value = "计划号") @Schema(description = "计划号")
private String planNo; private String planNo;
@ApiModelProperty(value = "压下率") @Schema(description = "压下率")
private Double reductionRate; private Double reductionRate;
@ApiModelProperty(value = "热卷温度") @Schema(description = "热卷温度")
private Double hotCoilTemp; private Double hotCoilTemp;
@ApiModelProperty(value = "厚度正偏差") @Schema(description = "厚度正偏差")
private Double entryThickMaxtol; private Double entryThickMaxtol;
@ApiModelProperty(value = "厚度正偏差") @Schema(description = "厚度正偏差")
private Double entryThickMintol; private Double entryThickMintol;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "计划日期") @Schema(description = "计划日期")
private LocalDateTime createTime; private LocalDateTime createTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "记录日期") @Schema(description = "记录日期")
private LocalDateTime insdate; private LocalDateTime insdate;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "上线时间") @Schema(description = "上线时间")
private LocalDateTime onlineTime; private LocalDateTime onlineTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "开始日期") @Schema(description = "开始日期")
private LocalDateTime startDate; private LocalDateTime startDate;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "结束日期") @Schema(description = "结束日期")
private LocalDateTime endDate; private LocalDateTime endDate;
@ApiModelProperty(value = "设定值列表") @Schema(description = "设定值列表")
List<ModSetupResultVO> lists; List<ModSetupResultVO> lists;
} }

51
business/src/main/java/com/fizz/business/vo/Plan2PdoVO.java
View File

@@ -1,9 +1,6 @@
package com.fizz.business.vo; package com.fizz.business.vo;
import com.baomidou.mybatisplus.annotation.IdType; import io.swagger.v3.oas.annotations.media.Schema;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@@ -13,74 +10,74 @@ import java.time.LocalDateTime;
public class Plan2PdoVO { public class Plan2PdoVO {
@ApiModelProperty(value = "多火轧制次数") @Schema(description = "多火轧制次数")
private Integer operid; private Integer operid;
@ApiModelProperty(value = "钢卷id") @Schema(description = "钢卷id")
private String coilid; private String coilid;
@ApiModelProperty(value = "热轧卷ID") @Schema(description = "热轧卷ID")
private String hotCoilid; private String hotCoilid;
@ApiModelProperty(value = "道次数") @Schema(description = "道次数")
private Integer passno; private Integer passno;
@ApiModelProperty(value = "退火厚度") @Schema(description = "退火厚度")
private Integer annealThick; private Integer annealThick;
@ApiModelProperty(value = "入口厚度") @Schema(description = "入口厚度")
private Double entryThick; private Double entryThick;
@ApiModelProperty(value = "入口宽度") @Schema(description = "入口宽度")
private Double entryWidth; private Double entryWidth;
@ApiModelProperty(value = "入口重量") @Schema(description = "入口重量")
private Double entryWeight; private Double entryWeight;
@ApiModelProperty(value = "入口长度") @Schema(description = "入口长度")
private Double entryLength; private Double entryLength;
@ApiModelProperty(value = "入口内径") @Schema(description = "入口内径")
private Integer entryInnerDiameter; private Integer entryInnerDiameter;
@ApiModelProperty(value = "入口外径") @Schema(description = "入口外径")
private Integer entryOuterDiameter; private Integer entryOuterDiameter;
@ApiModelProperty(value = "出口卷号") @Schema(description = "出口卷号")
private String exitCoilid; private String exitCoilid;
@ApiModelProperty(value = "下工序代码") @Schema(description = "下工序代码")
private String nextUnit; private String nextUnit;
@ApiModelProperty(value = "出口长度") @Schema(description = "出口长度")
private Double exitLength; private Double exitLength;
@ApiModelProperty(value = "出口厚度") @Schema(description = "出口厚度")
private Double exitThick; private Double exitThick;
@ApiModelProperty(value = "出口宽度") @Schema(description = "出口宽度")
private Double exitWidth; private Double exitWidth;
@ApiModelProperty(value = "钢种") @Schema(description = "钢种")
private String grade; private String grade;
@ApiModelProperty(value = "屈服强度") @Schema(description = "屈服强度")
private Integer yieldStrength; private Integer yieldStrength;
@ApiModelProperty(value = "抗拉强度") @Schema(description = "抗拉强度")
private Integer tensileStrength; private Integer tensileStrength;
@ApiModelProperty(value = "状态") @Schema(description = "状态")
private String status; private String status;
@ApiModelProperty(value = "计划号") @Schema(description = "计划号")
private String planNo; private String planNo;
@ApiModelProperty(value = "压下率") @Schema(description = "压下率")
private Double reductionRate; private Double reductionRate;
@ApiModelProperty(value = "热卷温度") @Schema(description = "热卷温度")
private Double hotCoilTemp; private Double hotCoilTemp;

14
business/src/main/java/com/fizz/business/vo/ReadyRollDataVO.java
View File

@@ -2,26 +2,26 @@ package com.fizz.business.vo;
import com.fizz.business.constants.enums.RollerPositionEnum; import com.fizz.business.constants.enums.RollerPositionEnum;
import com.fizz.business.constants.enums.RollerTypeEnum; import com.fizz.business.constants.enums.RollerTypeEnum;
import io.swagger.annotations.ApiModelProperty; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
@Data @Data
public class ReadyRollDataVO { public class ReadyRollDataVO {
@ApiModelProperty(value = "轧辊号") @Schema(description = "轧辊号")
private String rollid; private String rollid;
@ApiModelProperty(value = "类型") @Schema(description = "类型")
private RollerTypeEnum type; private RollerTypeEnum type;
@ApiModelProperty(value = "位置") @Schema(description = "位置")
private RollerPositionEnum position; private RollerPositionEnum position;
@ApiModelProperty(value = "直径") @Schema(description = "直径")
private Double diameter; private Double diameter;
@ApiModelProperty(value = "粗糙度") @Schema(description = "粗糙度")
private Double rough; private Double rough;
@ApiModelProperty(value = "凸度") @Schema(description = "凸度")
private Double crown; private Double crown;
} }

12
business/src/main/java/com/fizz/business/vo/SteelGradeInfoVO.java
View File

@@ -1,7 +1,7 @@
package com.fizz.business.vo; package com.fizz.business.vo;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
@@ -11,21 +11,21 @@ import java.time.LocalDateTime;
public class SteelGradeInfoVO implements Serializable { public class SteelGradeInfoVO implements Serializable {
@ApiModelProperty(value = "钢种ID") @Schema(description = "钢种ID")
private Integer steelGradeId; private Integer steelGradeId;
@ApiModelProperty(value = "钢种名称") @Schema(description = "钢种名称")
private String steelGradeName; private String steelGradeName;
@ApiModelProperty(value = "钢种描述") @Schema(description = "钢种描述")
private String steelGradeDes; private String steelGradeDes;
@ApiModelProperty(value = "创建时间") @Schema(description = "创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime; private LocalDateTime createTime;
@ApiModelProperty(value = "更新时间") @Schema(description = "更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime; private LocalDateTime updateTime;

43
pom.xml
View File

@@ -22,7 +22,7 @@
<spring-security.version>5.7.12</spring-security.version> <spring-security.version>5.7.12</spring-security.version>
<druid.version>1.2.23</druid.version> <druid.version>1.2.23</druid.version>
<bitwalker.version>1.21</bitwalker.version> <bitwalker.version>1.21</bitwalker.version>
<swagger.version>3.0.0</swagger.version> <!-- <swagger.version>3.0.0</swagger.version>-->
<kaptcha.version>2.3.3</kaptcha.version> <kaptcha.version>2.3.3</kaptcha.version>
<pagehelper.boot.version>1.4.7</pagehelper.boot.version> <pagehelper.boot.version>1.4.7</pagehelper.boot.version>
<fastjson.version>2.0.43</fastjson.version> <fastjson.version>2.0.43</fastjson.version>
@@ -31,6 +31,9 @@
<poi.version>4.1.2</poi.version> <poi.version>4.1.2</poi.version>
<velocity.version>2.3</velocity.version> <velocity.version>2.3</velocity.version>
<jwt.version>0.9.1</jwt.version> <jwt.version>0.9.1</jwt.version>
<knife4j.version>4.5.0</knife4j.version>
<springdoc.version>1.7.0</springdoc.version>
<mybatis.version>3.5.2</mybatis.version>
</properties> </properties>
<!-- 依赖声明 --> <!-- 依赖声明 -->
@@ -93,18 +96,31 @@
</dependency> </dependency>
<!-- Swagger3依赖 --> <!-- Swagger3依赖 -->
<!-- <dependency>-->
<!-- <groupId>io.springfox</groupId>-->
<!-- <artifactId>springfox-boot-starter</artifactId>-->
<!-- <version>${swagger.version}</version>-->
<!-- <exclusions>-->
<!-- <exclusion>-->
<!-- <groupId>io.swagger</groupId>-->
<!-- <artifactId>swagger-models</artifactId>-->
<!-- </exclusion>-->
<!-- </exclusions>-->
<!-- </dependency>-->
<dependency> <dependency>
<groupId>io.springfox</groupId> <groupId>com.github.xiaoymin</groupId>
<artifactId>springfox-boot-starter</artifactId> <artifactId>knife4j-openapi3-spring-boot-starter</artifactId>
<version>${swagger.version}</version> <version>${knife4j.version}</version>
<exclusions>
<exclusion>
<groupId>io.swagger</groupId>
<artifactId>swagger-models</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-ui</artifactId>
<version>${springdoc.version}</version>
</dependency>
<!-- io常用工具类 --> <!-- io常用工具类 -->
<dependency> <dependency>
<groupId>commons-io</groupId> <groupId>commons-io</groupId>
@@ -189,6 +205,13 @@
<version>${ruoyi.version}</version> <version>${ruoyi.version}</version>
</dependency> </dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>${mybatis.version}</version>
<!-- <version>3.5.2</version>-->
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>

59
ruoyi-admin/src/main/java/com/ruoyi/web/config/SwaggerConfig.java Normal file
View File

@@ -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());
}
}

78
ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java
View File

@@ -4,6 +4,13 @@ import java.util.ArrayList;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; 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.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; 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.controller.BaseController;
import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.utils.StringUtils; 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 用户测试方法 * swagger 用户测试方法
* *
* @author ruoyi * @author ruoyi
*/ */
@Api("用户信息管理") @Tag(name="用户信息管理")
@RestController @RestController
@RequestMapping("/test/user") @RequestMapping("/test/user")
public class TestController extends BaseController public class TestController extends BaseController
@@ -38,7 +39,7 @@ public class TestController extends BaseController
users.put(2, new UserEntity(2, "ry", "admin123", "15666666666")); users.put(2, new UserEntity(2, "ry", "admin123", "15666666666"));
} }
@ApiOperation("获取用户列表") @Operation(summary = "获取用户列表")
@GetMapping("/list") @GetMapping("/list")
public R<List<UserEntity>> userList() public R<List<UserEntity>> userList()
{ {
@@ -46,8 +47,14 @@ public class TestController extends BaseController
return R.ok(userList); return R.ok(userList);
} }
@ApiOperation("获取用户详细") @Operation(summary = "获取用户详细")
@ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path", dataTypeClass = Integer.class) @Parameter(
name = "userId",
description = "用户ID",
required = true,
schema = @Schema(type = "integer", format = "int32"), // 替代 dataType
in = ParameterIn.PATH // 替代 paramType
)
@GetMapping("/{userId}") @GetMapping("/{userId}")
public R<UserEntity> getUser(@PathVariable Integer userId) public R<UserEntity> getUser(@PathVariable Integer userId)
{ {
@@ -61,12 +68,28 @@ public class TestController extends BaseController
} }
} }
@ApiOperation("新增用户") @Operation(summary = "新增用户")
@ApiImplicitParams({ @Parameters({
@ApiImplicitParam(name = "userId", value = "用户id", dataType = "Integer", dataTypeClass = Integer.class), @Parameter(
@ApiImplicitParam(name = "username", value = "用户名称", dataType = "String", dataTypeClass = String.class), name = "userId",
@ApiImplicitParam(name = "password", value = "用户密码", dataType = "String", dataTypeClass = String.class), description = "用户id",
@ApiImplicitParam(name = "mobile", value = "用户手机", dataType = "String", dataTypeClass = String.class) 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") @PostMapping("/save")
public R<String> save(UserEntity user) public R<String> save(UserEntity user)
@@ -79,7 +102,7 @@ public class TestController extends BaseController
return R.ok(); return R.ok();
} }
@ApiOperation("更新用户") @Operation(summary = "更新用户")
@PutMapping("/update") @PutMapping("/update")
public R<String> update(@RequestBody UserEntity user) public R<String> update(@RequestBody UserEntity user)
{ {
@@ -96,9 +119,14 @@ public class TestController extends BaseController
return R.ok(); return R.ok();
} }
@ApiOperation("删除用户信息") @Operation(summary = "删除用户信息")
@ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path", dataTypeClass = Integer.class) @Parameter(
@DeleteMapping("/{userId}") name = "userId",
description = "用户ID",
required = true,
schema = @Schema(type = "integer", format = "int32"), // 替代 dataType
in = ParameterIn.PATH // 替代 paramType
)@DeleteMapping("/{userId}")
public R<String> delete(@PathVariable Integer userId) public R<String> delete(@PathVariable Integer userId)
{ {
if (!users.isEmpty() && users.containsKey(userId)) if (!users.isEmpty() && users.containsKey(userId))
@@ -113,19 +141,19 @@ public class TestController extends BaseController
} }
} }
@ApiModel(value = "UserEntity", description = "用户实体") @Schema(description = "用户实体")
class UserEntity class UserEntity
{ {
@ApiModelProperty("用户ID") @Schema(description = "用户ID")
private Integer userId; private Integer userId;
@ApiModelProperty("用户名称") @Schema(description = "用户名称")
private String username; private String username;
@ApiModelProperty("用户密码") @Schema(description = "用户密码")
private String password; private String password;
@ApiModelProperty("用户手机") @Schema(description = "用户手机")
private String mobile; private String mobile;
public UserEntity() public UserEntity()

12
ruoyi-admin/src/main/resources/application-druid.yml
View File

@@ -7,12 +7,12 @@ spring:
druid: druid:
# 主库数据源 # 主库数据源
master: master:
#ur#l: jdbc:mysql://47.109.139.82:3306/ngcrm?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 ur#l: jdbc:mysql://47.109.139.82:3306/cgldb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
#username: ngcrm username: cgldb
#password: ngcrm password: cgldb@123456
url: jdbc:mysql://127.0.0.1:3306/ngcrm?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 # url: jdbc:mysql://127.0.0.1:3306/ngcrm?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root # username: root
password: root # password: root
# 从库数据源 # 从库数据源
slave: slave:
# 从数据源开关/默认关闭 # 从数据源开关/默认关闭

36
ruoyi-admin/src/main/resources/application.yml
View File

@@ -126,13 +126,6 @@ pagehelper:
supportMethodsArguments: true supportMethodsArguments: true
params: count=countSql params: count=countSql
# Swagger配置
swagger:
# 是否开启swagger
enabled: true
# 请求前缀
pathMapping: /
# 防止XSS攻击 # 防止XSS攻击
xss: xss:
# 过滤开关 # 过滤开关
@@ -147,13 +140,24 @@ xss:
#producer: #producer:
#group: test #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: knife4j:
#开启增强配置 enable: true # 启用 Knife4j
enable: true setting:
#开启生产环境屏蔽 language: zh-CN # 中文界面
production: false enable-swagger-model: true # 显示模型
basic: enable-document-manage: true # 启用文档管理
enable: false cors: true # 允许跨域
username: admin
password: 123456

24
ruoyi-common/pom.xml
View File

@@ -123,14 +123,14 @@
<dependency> <dependency>
<groupId>com.baomidou</groupId> <groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId> <artifactId>mybatis-plus-boot-starter</artifactId>
<version>3.5.2</version> <!-- <version>3.5.2</version>-->
</dependency> </dependency>
<!-- lombok插件 --> <!-- lombok插件 -->
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
<version>1.18.12</version> <!-- <version>1.18.12</version>-->
</dependency> </dependency>
<dependency> <dependency>
@@ -140,18 +140,24 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.xiaoymin</groupId> <groupId>org.springdoc</groupId>
<artifactId>knife4j-spring-boot-starter</artifactId> <artifactId>springdoc-openapi-ui</artifactId>
<version>3.0.3</version>
</dependency> </dependency>
<!-- 防止进入swagger页面报类型转换错误，排除3.0.0中的引用，手动增加1.6.2版本 -->
<dependency> <dependency>
<groupId>io.swagger</groupId> <groupId>com.github.xiaoymin</groupId>
<artifactId>swagger-models</artifactId> <artifactId>knife4j-openapi3-spring-boot-starter</artifactId>
<version>1.6.2</version>
</dependency> </dependency>
<!-- 防止进入swagger页面报类型转换错误，排除3.0.0中的引用，手动增加1.6.2版本 -->
<!-- <dependency>-->
<!-- <groupId>io.swagger</groupId>-->
<!-- <artifactId>swagger-models</artifactId>-->
<!-- <version>1.6.2</version>-->
<!-- </dependency>-->
</dependencies> </dependencies>
</project> </project>

124
ruoyi-common/src/main/java/com/ruoyi/common/config/SwaggerConfig.java
View File

@@ -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<SecurityScheme> securitySchemes()
{
List<SecurityScheme> apiKeyList = new ArrayList<SecurityScheme>();
apiKeyList.add(new ApiKey("Authorization", "Authorization", In.HEADER.toValue()));
return apiKeyList;
}
/**
* 安全上下文
*/
private List<SecurityContext> securityContexts()
{
List<SecurityContext> securityContexts = new ArrayList<>();
securityContexts.add(
SecurityContext.builder()
.securityReferences(defaultAuth())
.operationSelector(o -> o.requestMappingPattern().matches("/.*"))
.build());
return securityContexts;
}
/**
* 默认的安全上引用
*/
private List<SecurityReference> defaultAuth()
{
AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything");
AuthorizationScope[] authorizationScopes = new AuthorizationScope[1];
authorizationScopes[0] = authorizationScope;
List<SecurityReference> 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();
}
}

2
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
View File

@@ -114,7 +114,7 @@ public class SecurityConfig
requests.antMatchers("/login", "/register", "/captchaImage", "/roller/**","/pdi/**","/pdo/**").permitAll() requests.antMatchers("/login", "/register", "/captchaImage", "/roller/**","/pdi/**","/pdo/**").permitAll()
// 静态资源，可匿名访问 // 静态资源，可匿名访问
.antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").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 //websocket
.antMatchers("/websocket/**").permitAll() .antMatchers("/websocket/**").permitAll()
// 除上面外的所有请求全部需要鉴权认证 // 除上面外的所有请求全部需要鉴权认证