新增接收轧钢平台的退坯通知接口以及取消退坯通知接口

zgztBus/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java

@@ -170,6 +170,10 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/actualControl/rollbackNotice/rollbackNotice", "anon");
         //轧钢平台棒一称重数据返回接口排除
         filterChainDefinitionMap.put("/actualControl/exchange/returnBillet", "anon");
+        //接收轧钢平台的退坯通知接口排除
+        filterChainDefinitionMap.put("/actualControl/rollbackNotice/saveNotice", "anon");
+        //接收轧钢平台的取消退坯通知接口排除
+        filterChainDefinitionMap.put("/actualControl/cancelRollback/saveCancel", "anon");
 
         // update-begin--author:liusq Date:20230522 for：[issues/4829]访问不存在的url时会提示Token失效，请重新登录呢
         //错误路径排除

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/actualControl/heatsActuals/controller/CancelRollbackLogController.java

@@ -0,0 +1,41 @@
+package org.jeecg.modules.actualControl.heatsActuals.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.modules.actualControl.heatsActuals.dto.CancelRollbackRequest;
+import org.jeecg.modules.actualControl.heatsActuals.dto.CommonResponse;
+import org.jeecg.modules.actualControl.heatsActuals.service.ICancelRollbackLogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Api(tags = "取消退坯通知")
+@RestController
+@RequestMapping("/actualControl/cancelRollback")
+public class CancelRollbackLogController {
+
+    @Autowired
+    private ICancelRollbackLogService cancelRollbackLogService;
+
+    /**
+     * 接收轧钢平台的取消退坯通知
+     */
+    @ApiOperation(value = "接收轧钢平台的取消退坯通知", notes = "接收轧钢平台的取消退坯通知")
+    @PostMapping("/saveCancel")
+    public ResponseEntity<?> receiveCancelRollback(@RequestBody CancelRollbackRequest request) {
+        try {
+            cancelRollbackLogService.saveCancelRollbackLog(request);
+            return ResponseEntity.ok(new CommonResponse(200, "取消退坯通知接收成功"));
+        } catch (IllegalArgumentException e) {
+            return ResponseEntity.status(HttpStatus.BAD_REQUEST)
+                    .body(new CommonResponse(400, e.getMessage()));
+        } catch (Exception e) {
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+                    .body(new CommonResponse(590, "取消退坯通知处理异常：" + e.getMessage()));
+        }
+    }
+}

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/actualControl/heatsActuals/controller/RollbackNoticeController.java

@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-@Api(tags="轧钢平台退坯通知")
+@Api(tags = "轧钢平台退坯通知")
 @RestController
 @RequestMapping("/actualControl/rollbackNotice")
 public class RollbackNoticeController {
@@ -24,8 +24,8 @@ public class RollbackNoticeController {
     /**
      * 接收轧钢平台的退坯通知
      */
-    @ApiOperation(value="接收轧钢平台的退坯通知", notes="接收轧钢平台的退坯通知")
-    @PostMapping("/rollbackNotice")
+    @ApiOperation(value = "接收轧钢平台的退坯通知", notes = "接收轧钢平台的退坯通知")
+    @PostMapping("/saveNotice")
     public ResponseEntity<?> receiveRollbackNotice(@RequestBody RollbackNoticeRequest request) {
         try {
             rollbackNoticeService.saveRollbackNoticeLog(request);

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/actualControl/heatsActuals/dto/CancelRollbackRequest.java

@@ -0,0 +1,21 @@
+package org.jeecg.modules.actualControl.heatsActuals.dto;
+
+import lombok.Data;
+
+@Data
+public class CancelRollbackRequest {
+
+    /**
+     * 炉号
+     */
+    private String heatNo;
+    /**
+     * 产线标识
+     */
+    private String rollNo;
+    /**
+     * 铸坯号
+     */
+    private String billetNo;
+
+}

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/actualControl/heatsActuals/dto/RollbackNoticeRequest.java

@@ -2,8 +2,6 @@ package org.jeecg.modules.actualControl.heatsActuals.dto;
 
 import lombok.Data;
 
-import java.util.List;
-
 @Data
 public class RollbackNoticeRequest {
 
@@ -20,11 +18,7 @@ public class RollbackNoticeRequest {
      */
     private String rollNo;
     /**
-     * 退坯日期
-     */
-    private String sendTime;
-    /**
-     * 铸坯号列表
+     * 铸坯号
      */
-    private List<String> billetList;
+    private String billetNo;
 }

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/actualControl/heatsActuals/entity/CancelRollbackLog.java

@@ -0,0 +1,48 @@
+package org.jeecg.modules.actualControl.heatsActuals.entity;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+@TableName("cancel_rollback_log")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "cancel_rollback_log对象", description = "取消退坯通知接口记录日志")
+public class CancelRollbackLog {
+
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+    @ApiModelProperty(value = "炉号")
+    private String heatNo;
+
+    /**
+     * 产线标识:
+     * 棒一:“T”   棒二:“TA”  棒三:“TB”
+     * 高线：“G”  板带:“YL”
+     */
+    @ApiModelProperty(value = "产线标识")
+    private String rollNo;
+
+    @ApiModelProperty(value = "铸坯号")
+    private String billetNo;
+
+
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "取消退坯时间")
+    private Date sendTime;
+
+}

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/actualControl/heatsActuals/entity/RollbackNoticeLog.java

@@ -2,14 +2,22 @@ package org.jeecg.modules.actualControl.heatsActuals.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
 @Data
+@TableName("rollback_notice_log")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "rollback_notice_log对象", description = "退坯通知接口记录日志")
 public class RollbackNoticeLog {
 
     @TableId(type = IdType.ASSIGN_ID)
@@ -28,7 +36,7 @@ public class RollbackNoticeLog {
     private String rollNo;
 
     @ApiModelProperty(value = "铸坯号")
-    private String billetList;
+    private String billetNo;
 
     /**
      * 退坯原因:

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/actualControl/heatsActuals/mapper/CancelRollbackLogMapper.java

@@ -0,0 +1,11 @@
+package org.jeecg.modules.actualControl.heatsActuals.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.jeecg.modules.actualControl.heatsActuals.entity.CancelRollbackLog;
+
+@Mapper
+public interface CancelRollbackLogMapper extends BaseMapper<CancelRollbackLog> {
+
+
+}

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/actualControl/heatsActuals/service/ICancelRollbackLogService.java

@@ -0,0 +1,10 @@
+package org.jeecg.modules.actualControl.heatsActuals.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.actualControl.heatsActuals.dto.CancelRollbackRequest;
+import org.jeecg.modules.actualControl.heatsActuals.entity.CancelRollbackLog;
+
+public interface ICancelRollbackLogService extends IService<CancelRollbackLog> {
+
+    void saveCancelRollbackLog(CancelRollbackRequest request);
+}

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/actualControl/heatsActuals/service/impl/CancelRollbackLogServiceImpl.java

@@ -0,0 +1,38 @@
+package org.jeecg.modules.actualControl.heatsActuals.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.actualControl.heatsActuals.dto.CancelRollbackRequest;
+import org.jeecg.modules.actualControl.heatsActuals.entity.CancelRollbackLog;
+import org.jeecg.modules.actualControl.heatsActuals.mapper.CancelRollbackLogMapper;
+import org.jeecg.modules.actualControl.heatsActuals.service.ICancelRollbackLogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+
+@Service
+public class CancelRollbackLogServiceImpl extends ServiceImpl<CancelRollbackLogMapper, CancelRollbackLog> implements ICancelRollbackLogService {
+
+    @Autowired
+    private CancelRollbackLogMapper cancelRollbackLogMapper;
+
+
+    @Override
+    public void saveCancelRollbackLog(CancelRollbackRequest request) {
+
+        if (request == null || oConvertUtils.isEmpty(request.getBilletNo())) {
+            throw new IllegalArgumentException("取消退坯通知请求为空或铸坯号为空");
+        }
+
+        CancelRollbackLog log = new CancelRollbackLog();
+        log.setHeatNo(request.getHeatNo());
+        log.setRollNo(request.getRollNo());
+        log.setSendTime(new Date());
+        log.setBilletNo(request.getBilletNo());
+
+        cancelRollbackLogMapper.insert(log);
+
+    }
+
+}

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/actualControl/heatsActuals/service/impl/RollbackNoticeServiceImpl.java

@@ -1,8 +1,7 @@
 package org.jeecg.modules.actualControl.heatsActuals.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.actualControl.heatsActuals.dto.RollbackNoticeRequest;
 import org.jeecg.modules.actualControl.heatsActuals.entity.RollbackNoticeLog;
 import org.jeecg.modules.actualControl.heatsActuals.mapper.RollbackNoticeLogMapper;
@@ -10,8 +9,6 @@ import org.jeecg.modules.actualControl.heatsActuals.service.IRollbackNoticeServi
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.Date;
 
 @Service
@@ -22,29 +19,18 @@ public class RollbackNoticeServiceImpl extends ServiceImpl<RollbackNoticeLogMapp
 
     @Override
     public void saveRollbackNoticeLog(RollbackNoticeRequest request) {
-        if (request == null || CollectionUtils.isEmpty(request.getBilletList())) {
-            throw new IllegalArgumentException("退坯通知请求为空或钢坯列表为空");
+        if (request == null || oConvertUtils.isEmpty(request.getBilletNo())) {
+            throw new IllegalArgumentException("退坯通知请求为空或铸坯号为空");
         }
 
         RollbackNoticeLog log = new RollbackNoticeLog();
         log.setHeatNo(request.getHeatNo());
         log.setRollNo(request.getRollNo());
         log.setReason(request.getReason());
-        log.setSendTime(parseDate(request.getSendTime()));
-        log.setBilletList(String.join(",", request.getBilletList())); // 这里拼接成用逗号隔开的字符串
+        log.setSendTime(new Date());
+        log.setBilletNo(request.getBilletNo());
 
         rollbackNoticeLogMapper.insert(log);
     }
 
-
-    private Date parseDate(String dateStr) {
-        if (StringUtils.isBlank(dateStr)) {
-            return null;
-        }
-        try {
-            return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(dateStr);
-        } catch (ParseException e) {
-            throw new RuntimeException("退坯通知时间格式解析异常：" + dateStr);
-        }
-    }
 }