From 3baca21e0e6563f8379359ef2ba78c224eb4bc80 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 23 九月 2025 22:45:51 +0800
Subject: [PATCH] 修复审批表，确认表内容
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/test/MyTestController.java | 145 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 119 insertions(+), 26 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/test/MyTestController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/test/MyTestController.java
index 5d0d65d..3fc9e1b 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/test/MyTestController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/test/MyTestController.java
@@ -1,16 +1,35 @@
package org.springblade.mdm.test;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.mail.MessagingException;
+import jakarta.xml.soap.SOAPException;
+import jakarta.xml.ws.WebServiceContext;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.io.IOUtils;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.tool.utils.SpringUtil;
import org.springblade.mdm.basesetting.machine.entity.Machine;
-import org.springblade.mdm.gkw.programnode.entity.MachineFile;
+import org.springblade.mdm.commons.service.InternalEmailService;
+import org.springblade.mdm.flow.entity.MesSync;
+import org.springblade.mdm.flow.excution.events.CureFinishedEvent;
+import org.springblade.mdm.flow.service.MesSyncService;
+import org.springblade.mdm.flow.service.WIthdrawService;
+import org.springblade.mdm.machinefile.entity.FileSendRecord;
+import org.springblade.mdm.machinefile.entity.MachineFile;
+import org.springblade.mdm.machinefile.service.FileSendRecordService;
+import org.springblade.mdm.machinefile.service.MachineFileScanService;
import org.springblade.mdm.program.entity.NcNode;
+import org.springblade.mdm.program.entity.ProgramOnMachine;
+import org.springblade.mdm.program.service.NcNodeHisService;
import org.springblade.mdm.program.service.NcNodeService;
import org.springblade.mdm.program.service.ProgramAnnotationService;
+import org.springblade.mdm.program.service.ProgramOnMachineService;
+import org.springblade.mdm.task.InternalEmailNotifyTask;
import org.springblade.mdm.task.MachineFileScanTask;
+import org.springblade.mdm.task.ReceiveDirCheckTask;
import org.springblade.mdm.utils.FileContentUtil;
import org.springblade.system.feign.IDictBizClient;
import org.springblade.system.pojo.entity.DictBiz;
@@ -19,11 +38,13 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import javax.wsdl.WSDLException;
import java.io.FileInputStream;
-import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
+import java.util.Date;
import java.util.List;
+import java.util.Optional;
@Slf4j
@RestController
@@ -33,13 +54,25 @@
@Autowired
private NcNodeService service;
-
@Autowired
- private MachineFileScanTask machineFileScanTask;
+ private MesSyncService mesSyncService;
@Autowired
- private ProgramAnnotationService programAnnotationService;
+ private ReceiveDirCheckTask fileCheckTask;
@Autowired
private IDictBizClient bizDictClient;
+ @Autowired
+ private InternalEmailService mailService;
+ @Autowired
+ private MachineFileScanService machineFileScanService;
+ @Autowired
+ private WIthdrawService withdrawService;
+ @Autowired
+ private InternalEmailNotifyTask notifyTask;
+
+ @Autowired
+ private NcNodeHisService nodeHisService;
+ @Autowired
+ private FileSendRecordService fileSendRecordService;
/**
* 鏂板
*/
@@ -69,37 +102,97 @@
}
- @GetMapping("/scan")
+ @GetMapping("/scandir")
@Operation(summary = "test鎵弿", description = "test鎵弿")
public R<Void> scan() throws IOException {
Machine machine = new Machine();
machine.setCode("M_01_FN");
machine.setProgReceiveDir("d:/data/machine1/rec");
- machineFileScanTask.scanDir(machine, MachineFile.DIR_TYPE_REC);
+ machineFileScanService.scanDir(machine, MachineFile.DIR_TYPE_REC);
return R.success();
}
- @GetMapping("/repalce-anno")
- @Operation(summary = "鏇挎崲娉ㄩ噴", description = "test鎵弿")
- public R<List<String>> repalceAnno() throws IOException {
- InputStream res;
- try(FileInputStream fis = new FileInputStream("d:/b.txt");) {
- res = programAnnotationService.setSendDirAndStatusAnnotation("D:/mysend", "PL", fis,"FANUC");
- }
- List<String> lines = null;
- if(res!=null) {
- try(res) {
- lines = IOUtils.readLines(res, "utf-8");
- }
- }
- return R.data(lines);
- }
@GetMapping("/dict-biz")
- @Operation(summary = "鏇挎崲娉ㄩ噴", description = "test鎵弿")
+ @Operation(summary = "biz", description = "test鎵弿")
public R<List<DictBiz>> giz(String code) throws IOException {
-
- return this.bizDictClient.getList(code);
+ log.info("mytset涓殑鏃ュ織");
+ return this.bizDictClient.getList (code);
}
+ @GetMapping("/sendmail")
+ @Operation(summary = "sendmail", description = "sendmail")
+ public R<Void> sendmail(String from,String to,String subject,String content) throws IOException, MessagingException {
+ this.mailService.send(from,to,null,null,subject,content,null);
+ return R.success();
+ }
+
+ @GetMapping("/withdraw")
+ public R<Void> withdraw(String id) throws IOException, MessagingException {
+ withdrawService.withdraw(id);
+ return R.success();
+ }
+
+ @GetMapping("/scanfile")
+ public void scanFile(){
+ machineFileScanService.scanMachineFile();
+ }
+
+ @GetMapping("/notify")
+ public void emailNotify(){
+ SOAPException s;
+ notifyTask.execute();
+ }
+
+ @GetMapping("/movehis")
+ public void moveHis(Date time){
+ //format:?time=2025-09-16%2010:11:10
+ nodeHisService.mergeNodeToHisGeTime(time);
+ }
+ @GetMapping("/mes-sync")
+ public void mesSync(){
+ mesSyncService.syncToMes();
+ }
+
+ @GetMapping("/publish-cure")
+ public void publishCure(){
+ CureFinishedEvent e = new CureFinishedEvent(this,"0000000173");
+ SpringUtil.publishEvent(e);
+ }
+
+ @GetMapping("/call-mes")
+ public void callMess(){
+ JSONObject jsonObject = new JSONObject();
+
+ JSONArray dataList = new JSONArray();
+
+ JSONObject item = new JSONObject();
+ item.put("operationId","id1");
+ item.put("programNo","00001");
+ item.put("curedTime", DateUtil.formatDateTime(new Date()));
+
+ dataList.add(item);
+
+ jsonObject.put("batchData", dataList);
+
+ log.info("mestest data:{}",jsonObject);
+
+ int code = mesSyncService.postData(jsonObject);
+ log.info("mestest response:{}",code);
+ }
+
+ @GetMapping("/check-files")
+ public void checkFiles(){
+ fileCheckTask.checkFiles();
+ }
+
+ @GetMapping("/likeright")
+ public Object likeRight(){
+ Optional<FileSendRecord> optFile = fileSendRecordService.lambdaQuery()
+ .eq(FileSendRecord::getMachineCode,"P01")
+ .likeRight(FileSendRecord::getName,"a-P%").last("limit 1")
+ .orderByDesc(FileSendRecord::getCreateTime).oneOpt();
+
+ return optFile.get();
+ }
}
--
Gitblit v1.9.3