From 685d26c3a34dbb532a2612ce4cd5f9d904c8d6d1 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 17 八月 2025 16:22:08 +0800
Subject: [PATCH] 新增工控网回传历史接口
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/DncBackFile.java | 2
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/DncBackFileQueryVO.java | 7 +++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/DncBackFileMapper.java | 2
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/DncBackFileVO.java | 7 ++-
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/DncBackFileMapper.xml | 18 ++++++--
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DncBackFileService.java | 34 +++++++++++++++++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/DncSendBackController.java | 12 +++++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/DispatchFinishListener.java | 5 --
8 files changed, 71 insertions(+), 16 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/DispatchFinishListener.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/DispatchFinishListener.java
index 462f6b5..4666f08 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/DispatchFinishListener.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/DispatchFinishListener.java
@@ -91,11 +91,6 @@
ncNodeService.save(newCuredNode);
//鏂扮殑娴佺▼瀵瑰簲鐨勬枃浠舵洿鏂板埌鏂拌妭鐐逛笅
- /*
- List<FlowProgramFile> newFlowFileList = flowProgramFileService.lambdaQuery()
- .eq(FlowProgramFile::getProcessInstanceId, progProperties.getProcessInstanceId()).list();
-
- */
List<FlowProgramFile> newFlowFileList = flowProgramFileService.listByProcessInstanceId(progProperties.getProcessInstanceId());
for (FlowProgramFile newFlowFile : newFlowFileList) {
NcNode newProgramNode = new NcNode();
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/DncSendBackController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/DncSendBackController.java
index a810df2..ecaffba 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/DncSendBackController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/DncSendBackController.java
@@ -1,6 +1,7 @@
package org.springblade.mdm.program.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
@@ -10,7 +11,8 @@
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springblade.mdm.program.service.DNCSendBackService;
-import org.springblade.mdm.program.vo.DncSendBackData;
+import org.springblade.mdm.program.service.DncBackFileService;
+import org.springblade.mdm.program.vo.*;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -30,6 +32,7 @@
public class DncSendBackController {
private final DNCSendBackService dncSendBackService;
+ private final DncBackFileService dncBackFileService;
/**
* 涓婁紶DNC鍥炰紶鏂囦欢
*
@@ -68,4 +71,11 @@
}
return R.success();
}
+
+ @Operation(summary = "宸ユ帶缃戝洖浼犺褰曞垎椤垫煡璇�", description = "宸ユ帶缃戝洖浼犺褰曞垎椤垫煡璇�,鏌ヨ鍥炰紶鍘嗗彶")
+ @GetMapping("/dnc-back-page")
+ public R<IPage<DncBackFileVO>> page(DncBackFileQueryVO query) {
+
+ return R.data(dncBackFileService.pageQuery(query));
+ }
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/DncBackFile.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/DncBackFile.java
index 7910bb8..5d1af03 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/DncBackFile.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/DncBackFile.java
@@ -20,7 +20,7 @@
/**
* 绋嬪簭鍖呭悕 鑺傜偣 鐨刬d
*/
- private Long ncNodeId;
+ private Long approvedId;
/**
* 纭鏃堕棿
*/
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/DncBackFileMapper.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/DncBackFileMapper.java
index 3cedc0d..f4325ca 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/DncBackFileMapper.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/DncBackFileMapper.java
@@ -15,6 +15,6 @@
* @param queryVO
* @return
*/
- IPage<DncBackFileVO> pageQuery(IPage<DncBackFile> page, @Param("query") DncBackFileQueryVO queryVO);
+ IPage<DncBackFileVO> pageQuery(@Param("page")IPage<DncBackFile> page, @Param("query") DncBackFileQueryVO queryVO);
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/DncBackFileMapper.xml b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/DncBackFileMapper.xml
index e971831..2543dbd 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/DncBackFileMapper.xml
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/DncBackFileMapper.xml
@@ -13,13 +13,15 @@
<!--DNC鍥炰紶绋嬪簭澶勭悊鍒嗛〉-->
<select id="pageQuery" resultType="org.springblade.mdm.program.vo.DncBackFileVO">
- select f.id,p.name name,p.is_cured,f.create_time,m.code machine_code, m.name machine_name,f.create_time arrived_time
+ select f.id,n.name name,f.create_time,m.code machine_code, m.name machine_name,f.create_time
from mdm_dnc_back_file f
- left join mdm_nc_program p on f.nc_program_id=p.id
- left join mdm_machine m on p.machine_code=m.code
- <where>
- f.status=1 and f.is_deleted=0
+ left join mdm_nc_program_approved a on f.approved_id=a.id
+ join mdm_nc_node n on a.nc_node_id=n.id
+ left join mdm_machine m on n.machine_code=m.code
+
+ <where>
+ f.is_deleted=0
<if test="query.machineSpec!=null and query.machineSpec!=''">
and m.machine_spec=#{query.machineSpec,jdbcType=VARCHAR}
</if>
@@ -28,6 +30,12 @@
or p.name like CONCAT('%', #{query.keyword,jdbcType=VARCHAR},'%')
)
</if>
+ <if test="query.createTimeBegin!=null">
+ and a.create_time >= #{query.createTimeBegin}
+ </if>
+ <if test="query.createTimeEnd!=null">
+ and a.create_time <= #{query.createTimeEnd}
+ </if>
</where>
</select>
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DncBackFileService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DncBackFileService.java
new file mode 100644
index 0000000..85b4b00
--- /dev/null
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DncBackFileService.java
@@ -0,0 +1,34 @@
+
+package org.springblade.mdm.program.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.mp.base.BizServiceImpl;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.oss.OssTemplate;
+import org.springblade.mdm.program.entity.DncBackFile;
+import org.springblade.mdm.program.mapper.DncBackFileMapper;
+import org.springblade.mdm.program.vo.DncBackFileQueryVO;
+import org.springblade.mdm.program.vo.DncBackFileVO;
+import org.springframework.stereotype.Service;
+
+/**
+ * DNC鍥炰紶鏂囦欢澶勭悊鏈嶅姟
+ *
+ * @author yangys
+ */
+@Slf4j
+@Service
+@AllArgsConstructor
+public class DncBackFileService extends BizServiceImpl<DncBackFileMapper, DncBackFile> {
+ private final NcNodeService ncNodeService;
+ private final OssTemplate ossTemplate;
+
+
+ public IPage<DncBackFileVO> pageQuery(DncBackFileQueryVO query) {
+ return this.baseMapper.pageQuery(Condition.getPage(query),query);
+ }
+}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/DncBackFileQueryVO.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/DncBackFileQueryVO.java
index 9883d68..77185aa 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/DncBackFileQueryVO.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/DncBackFileQueryVO.java
@@ -5,6 +5,8 @@
import lombok.Setter;
import org.springblade.core.mp.support.Query;
+import java.util.Date;
+
/**
* 鍒嗛〉鏌ヨ鍙傛暟
*/
@@ -18,4 +20,9 @@
@Schema(description = "瑙勬牸")
private String machineSpec;
+ @Schema(description = "鍥炰紶鏃堕棿寮�濮�")
+ private Date createTimeBegin;
+ @Schema(description = "鍥炰紶鏃堕棿鎴")
+ private Date createTimeEnd;
+
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/DncBackFileVO.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/DncBackFileVO.java
index 97c746f..27a563f 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/DncBackFileVO.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/DncBackFileVO.java
@@ -7,18 +7,19 @@
import java.util.Date;
+/**
+ * 浠庡伐鎺х綉鍥炰紶娑夊瘑缃戠殑瀵煎叆鏂囦欢鍘嗗彶
+ */
@Schema(description = "DNC鍥炰紶鏂囦欢")
@Setter
@Getter
public class DncBackFileVO extends BaseVO {
@Schema(description = "鏂囦欢鍚嶇О")
private String name;
- @Schema(description = "鏈哄簥缂栧彿/鍥炰紶鏈哄簥")
+ @Schema(description = "鏈哄簥缂栧彿")
private String machineCode;
@Schema(description = "绋嬪簭缂栧彿")
private String code;
- @Schema(description = "鍥哄寲鐘舵��")
- private Integer isCured=0;
@Schema(description = "鏂囦欢鍒拌揪鏃堕棿")
private Date arrivedTime;
}
--
Gitblit v1.9.3