diff --git a/business/src/main/java/com/fizz/business/constants/enums/RollerPositionEnum.java b/business/src/main/java/com/fizz/business/constants/enums/RollerPositionEnum.java new file mode 100644 index 0000000..ff06680 --- /dev/null +++ b/business/src/main/java/com/fizz/business/constants/enums/RollerPositionEnum.java @@ -0,0 +1,18 @@ +package com.fizz.business.constants.enums; + +import com.baomidou.mybatisplus.annotation.IEnum; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Getter; +@Getter +@AllArgsConstructor +@JsonFormat(shape = JsonFormat.Shape.OBJECT) +public enum RollerPositionEnum{ + TOP("TOP","上辊"), + BOTTOM("BOTTOM","下辊"); + + + private final String value; + private final String name; + +} diff --git a/business/src/main/java/com/fizz/business/constants/enums/RollerTypeEnum.java b/business/src/main/java/com/fizz/business/constants/enums/RollerTypeEnum.java new file mode 100644 index 0000000..cf62943 --- /dev/null +++ b/business/src/main/java/com/fizz/business/constants/enums/RollerTypeEnum.java @@ -0,0 +1,19 @@ +package com.fizz.business.constants.enums; + +import com.baomidou.mybatisplus.annotation.IEnum; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Getter; +@Getter +@AllArgsConstructor +@JsonFormat(shape = JsonFormat.Shape.OBJECT) +public enum RollerTypeEnum { + WORK("WORK","工作辊"), + INTERMEDIATE("INTERMEDIATE","中间辊"), + BACKUP("BACKUP","支撑辊"); + + + private final String value; + private final String name; + +} diff --git a/business/src/main/java/com/fizz/business/controller/RollerController.java b/business/src/main/java/com/fizz/business/controller/RollerController.java index 848645d..55d33a3 100644 --- a/business/src/main/java/com/fizz/business/controller/RollerController.java +++ b/business/src/main/java/com/fizz/business/controller/RollerController.java @@ -20,6 +20,7 @@ import java.util.List; @RestController @RequestMapping("/roller") @Api("南钢轧辊接口") +@Anonymous public class RollerController { @Resource RollHistoryService rollHistoryService; @@ -27,10 +28,10 @@ public class RollerController { @Resource RollDataService rollDataService; - @GetMapping("/data/backup") + @GetMapping("/data/standby") @ApiOperation("轧辊数据-获取当前备辊信息") public R > getReadyRollList() { - return R.ok(rollDataService.getReadyRollList(null,null,"BACKUP")); + return R.ok(rollDataService.getReadyRollList(null,null,"STANDBY")); } @GetMapping("/data/ready/{position}/{type}") @@ -45,13 +46,13 @@ public class RollerController { return R.ok(rollDataService.getOnlineRollList()); } - @GetMapping("/change/backup") + @PostMapping("/change/standby") @ApiOperation("轧辊操作-备辊") public R> backupRoll(@RequestBody List rollList) { return R.ok(rollDataService.BackupRoll(rollList)); } - @GetMapping("/change/online") + @PostMapping("/change/online") @ApiOperation("轧辊操作-上线") public R> onlineRoll() { return R.ok(rollDataService.onlineRoll()); diff --git a/business/src/main/java/com/fizz/business/service/impl/RollDataServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/RollDataServiceImpl.java index 2310fae..74c8ffa 100644 --- a/business/src/main/java/com/fizz/business/service/impl/RollDataServiceImpl.java +++ b/business/src/main/java/com/fizz/business/service/impl/RollDataServiceImpl.java @@ -4,6 +4,8 @@ import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.fizz.business.constants.enums.RollerPositionEnum; +import com.fizz.business.constants.enums.RollerTypeEnum; import com.fizz.business.domain.PlantConfig; import com.fizz.business.domain.RollData; import com.fizz.business.domain.RollHistory; @@ -67,6 +69,8 @@ public class RollDataServiceImpl extends ServiceImpl i ReadyRollDataVO readyRollDataVO = new ReadyRollDataVO(); // 使用 BeanUtils 复制属性 BeanUtils.copyProperties(rollData, readyRollDataVO); + readyRollDataVO.setPosition(RollerPositionEnum.valueOf(rollData.getPosition())); + readyRollDataVO.setType(RollerTypeEnum.valueOf(rollData.getType())); readyRollDataVOList.add(readyRollDataVO); } return readyRollDataVOList; @@ -82,6 +86,9 @@ public class RollDataServiceImpl extends ServiceImpl i OnlineRollDataVO onlineRollDataVO = new OnlineRollDataVO(); // 使用 BeanUtils 复制属性 BeanUtils.copyProperties(rollData, onlineRollDataVO); + onlineRollDataVO.setPosition(RollerPositionEnum.valueOf(rollData.getPosition())); + onlineRollDataVO.setType(RollerTypeEnum.valueOf(rollData.getType())); + String lengthKey=""; String weightKey=""; switch(rollData.getType()){ @@ -144,7 +151,7 @@ public class RollDataServiceImpl extends ServiceImpl i //清楚所有已有备辊，添加新备辊,有则更新数据,没有则新增 if(ObjectUtil.isEmpty(result)){ lambdaUpdate().set(RollData::getStatus,"OFFLINE") - .eq(RollData::getStatus,"BACKUP") + .eq(RollData::getStatus,"STANDBY") .update(); List newDataList = Lists.newArrayList(); @@ -153,8 +160,8 @@ public class RollDataServiceImpl extends ServiceImpl i RollData temp = rollDataList.stream().filter(n->n.getRollid().equals(item.getRollid())) .findFirst().orElse(RollData.builder() .rollid(item.getRollid()) - .position(item.getPosition()) - .type(item.getType()) + .position(item.getPosition().getValue()) + .type(item.getType().getValue()) .seton("CRM") .standid(1) .grindCount(0) @@ -163,7 +170,7 @@ public class RollDataServiceImpl extends ServiceImpl i temp.setDiameter(temp.getDiameter()); temp.setCrown(temp.getCrown()); temp.setRough(temp.getRough()); - + temp.setStatus("STANDBY"); newDataList.add(temp); }); this.saveOrUpdateBatch(newDataList); @@ -174,9 +181,9 @@ public class RollDataServiceImpl extends ServiceImpl i @Override public List onlineRoll() { - List backupRollList = getList(null, null,"BACKUP"); + List standByRollList = getList(null, null,"STANDBY"); List onlineRollList = getList(null, null,"ONLINE"); - if(ObjectUtil.isEmpty(backupRollList)){ + if(ObjectUtil.isEmpty(standByRollList)){ return getOnlineRollList(); } ShiftHistory shiftHistory = shiftHistoryService.getCurrent(); @@ -185,7 +192,7 @@ public class RollDataServiceImpl extends ServiceImpl i List rollHistoryList =Lists.newArrayList(); List changeRollList =Lists.newArrayList(); //更换轧辊 - backupRollList.forEach(item->{ + standByRollList.forEach(item->{ //上线卷 item.setStatus("ONLINE"); item.setGrindCount(item.getGrindCount()+1); diff --git a/business/src/main/java/com/fizz/business/vo/OnlineRollDataVO.java b/business/src/main/java/com/fizz/business/vo/OnlineRollDataVO.java index 8011cad..a356653 100644 --- a/business/src/main/java/com/fizz/business/vo/OnlineRollDataVO.java +++ b/business/src/main/java/com/fizz/business/vo/OnlineRollDataVO.java @@ -1,6 +1,8 @@ package com.fizz.business.vo; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fizz.business.constants.enums.RollerPositionEnum; +import com.fizz.business.constants.enums.RollerTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -13,10 +15,10 @@ public class OnlineRollDataVO { @ApiModelProperty(value = "类型") - private String type; + private RollerTypeEnum type; @ApiModelProperty(value = "位置") - private String position; + private RollerPositionEnum position; @ApiModelProperty(value = "直径") diff --git a/business/src/main/java/com/fizz/business/vo/ReadyRollDataVO.java b/business/src/main/java/com/fizz/business/vo/ReadyRollDataVO.java index 27408d6..8b76b84 100644 --- a/business/src/main/java/com/fizz/business/vo/ReadyRollDataVO.java +++ b/business/src/main/java/com/fizz/business/vo/ReadyRollDataVO.java @@ -1,5 +1,7 @@ package com.fizz.business.vo; +import com.fizz.business.constants.enums.RollerPositionEnum; +import com.fizz.business.constants.enums.RollerTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,10 +11,10 @@ public class ReadyRollDataVO { private String rollid; @ApiModelProperty(value = "类型") - private String type; + private RollerTypeEnum type; @ApiModelProperty(value = "位置") - private String position; + private RollerPositionEnum position; @ApiModelProperty(value = "直径") private Double diameter; diff --git a/ruoyi-admin/src/main/resources/banner.txt b/ruoyi-admin/src/main/resources/banner.txt index 0931cb8..95f8b48 100644 --- a/ruoyi-admin/src/main/resources/banner.txt +++ b/ruoyi-admin/src/main/resources/banner.txt @@ -1,24 +1,9 @@ Application Version: ${ruoyi.version} Spring Boot Version: ${spring-boot.version} -//////////////////////////////////////////////////////////////////// -// _ooOoo_ // -// o8888888o // -// 88" . "88 // -// (| ^_^ |) // -// O\ = /O // -// ____/`---'\____ // -// .' \\| |// `. // -// / \\||| : |||// \ // -// / _||||| -:- |||||- \ // -// | | \\\ - /// | | // -// | \_| ''\---/'' | | // -// \ .-\__ `-` ___/-. / // -// ___`. .' /--.--\ `. . ___ // -// ."" '< `.___\_<|>_/___.' >'"". // -// | | : `- \`.;`\ _ /`;.`/ - ` : | | // -// \ \ `-. \_ __\ /__ _/ .-` / / // -// ========`-.____`-.___\_____/___.-`____.-'======== // -// `=---=' // -// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ // -// 佛祖保佑 永不宕机 永无BUG // -//////////////////////////////////////////////////////////////////// \ No newline at end of file + ________ ___ ________ ________ +|\ _____\|\ \ |\_____ \ |\_____ \ +\ \ \__/ \ \ \ \|___/ /| \|___/ /| + \ \ __\ \ \ \ / / / / / / + \ \ \_| \ \ \ / /_/__ / /_/__ + \ \__\ \ \__\|\________\|\________\ + \|__| \|__| \|_______| \|_______| \ No newline at end of file