主数据导入完善

Leon 4 years ago
parent 17630619e7
commit ccd05fd6d1

@ -8,8 +8,8 @@ spring:
driver-class-name: com.sap.db.jdbc.Driver
jndi-name: jdbc/jts/wipPool
activemq:
enabled: false
brokerUrl: tcp://localhost:61616?wireFormat.maxInactivityDuration=0
enabled: true
brokerUrl: tcp://121.36.58.109:61616?wireFormat.maxInactivityDuration=0
password: admin
user: admin
pool:

@ -10,8 +10,8 @@ spring:
password: wip
driver-class-name: oracle.jdbc.OracleDriver
activemq:
enabled: false
brokerUrl: tcp://localhost:61616?wireFormat.maxInactivityDuration=0
enabled: true
brokerUrl: tcp://121.36.58.109:61616?wireFormat.maxInactivityDuration=0
password: admin
user: admin
pool:

@ -1,21 +1,17 @@
package com.foreverwin.mesnac.dataimport.controller;
import com.foreverwin.mesnac.anomaly.service.FileUploadedService;
import com.foreverwin.mesnac.dataimport.util.APResult;
import com.foreverwin.mesnac.dataimport.util.ImportRequest;
import com.foreverwin.mesnac.common.model.ExportTemplate;
import com.foreverwin.mesnac.common.service.ExportTemplateService;
import com.foreverwin.mesnac.dataimport.service.impl.MasterDataImportServiceImpl;
import com.foreverwin.mesnac.dataimport.util.APResult;
import com.foreverwin.mesnac.dataimport.util.ImportRequest;
import com.foreverwin.modular.core.util.CommonMethods;
import com.foreverwin.modular.core.util.R;
import com.foreverwin.modular.core.util.SpringUtil;
import com.sap.me.frame.Utils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.websocket.server.PathParam;
@ -31,26 +27,18 @@ public class DataImportController {
@Autowired
private MasterDataImportServiceImpl masterDataImportService;
@Autowired
FileUploadedService fileUploadedService;
@RequestMapping("/import")
public String importFile(@PathParam("fileType") String fileType, @PathParam("site") String site,
@PathParam("user") String user, @PathParam("handleType") final String handleType,
@PathParam("mode") final String mode, @RequestParam("file") MultipartFile multipartFile,@PathParam("taskNo")String taskNo) {
@PostMapping("/import")
public String importFile(@PathParam("fileType") String fileType, @PathParam("site") String site, @PathParam("user") String user, @PathParam("handleType") final String handleType, @PathParam("mode") final String mode, @RequestParam("file") MultipartFile multipartFile) {
ImportRequest importRequest = new ImportRequest();
importRequest.setFileType(fileType);
importRequest.setSite(site);
importRequest.setUser(user);
importRequest.setMode(mode);
importRequest.setMasterType(handleType);
//-----------------------------------------------------------------------------------------------------------------------------------------
try {
// String transInfo = masterDataImportService.importFile(multipartFile, importRequest);
fileUploadedService.uploadAttachment(multipartFile,site,taskNo,fileType);
return new APResult().getResult(0,"上传成功",null);
String transInfo = masterDataImportService.importFile(multipartFile, importRequest);
return new APResult().getResult(0, transInfo, transInfo);
} catch (Exception e) {
e.printStackTrace();
return new APResult().getResult(9999, e.getMessage(), e.getMessage());

@ -10,6 +10,7 @@ import org.springframework.jms.core.JmsMessagingTemplate;
import org.springframework.messaging.MessageHeaders;
import org.springframework.stereotype.Component;
import javax.jms.Queue;
/**
@ -38,14 +39,14 @@ public class ResourceMQConsume {
String resultString = resourceMQProcess.resourceStatusProcess(text);
//返回设备处理结果
//template.convertAndSend((Queue) headers.get("jms_replyTo"), resultString);
template.convertAndSend((Queue) headers.get("jms_replyTo"), resultString);
}
@JmsListener(destination = "resource.alarm.process", containerFactory = "defaultFactory")
public void resourceAlarmProcess(String text, MessageHeaders headers) {
logger.info("接收设备报警数据:" + text);
resourceMQProcess.resourceFaultProcess(text);
//template.convertAndSend((Queue) headers.get("jms_replyTo"), "");
String resultString = resourceMQProcess.resourceFaultProcess(text);
template.convertAndSend((Queue) headers.get("jms_replyTo"), resultString);
}
@JmsListener(destination = "resource.edc.process", containerFactory = "defaultFactory", concurrency = "5")

@ -0,0 +1,278 @@
package com.foreverwin.mesnac.integration.dto;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
@XmlAccessorType( XmlAccessType.FIELD )
@XmlType(name = "ItemRequest", propOrder = {
"TRANID",
"DATE_TIME",
"SITE",
"ITEM",
"REVISION",
"MAKTX",
"STATUS",
"ITEM_TYPE",
"PROCUREMENT_TYPE",
"LOT_SIZE",
"UNIT_OF_MEASURE",
"ASSY_DATA_TYPE",
"INV_ASSY_DATA_TYPE",
"INGRED_TYPE",
"WEIGHT",
"SPEC",
"MODEL",
"TEXTURE",
"DRAWING",
"DRAWING_REVISION"
})
public class ItemRequest {
@XmlElement(name = "TRANID")
private String TRANID;
@XmlElement(name = "DATE_TIME")
private String DATE_TIME;
@XmlElement(name = "SITE")
private String SITE;
@XmlElement(name = "ITEM")
private String ITEM;
@XmlElement(name = "REVISION")
private String REVISION;
@XmlElement(name = "MAKTX")
private String MAKTX;
@XmlElement(name = "STATUS")
private String STATUS;
@XmlElement(name = "ITEM_TYPE")
private String ITEM_TYPE;
@XmlElement(name = "PROCUREMENT_TYPE")
private String PROCUREMENT_TYPE;
@XmlElement(name = "LOT_SIZE")
private String LOT_SIZE;
@XmlElement(name = "UNIT_OF_MEASURE")
private String UNIT_OF_MEASURE;
@XmlElement(name = "ASSY_DATA_TYPE")
private String ASSY_DATA_TYPE;
@XmlElement(name = "INV_ASSY_DATA_TYPE")
private String INV_ASSY_DATA_TYPE;
@XmlElement(name = "INGRED_TYPE")
private String INGRED_TYPE;
@XmlElement(name = "WEIGHT")
private String WEIGHT;
@XmlElement(name = "SPEC")
private String SPEC;
@XmlElement(name = "MODEL")
private String MODEL;
@XmlElement(name = "TEXTURE")
private String TEXTURE;
@XmlElement(name = "DRAWING")
private String DRAWING;
@XmlElement(name = "TEXTURE")
private String DRAWING_REVISION;
public String getTRANID() {
return TRANID;
}
public void setTRANID(String TRANID) {
this.TRANID = TRANID;
}
public String getDATE_TIME() {
return DATE_TIME;
}
public void setDATE_TIME(String DATE_TIME) {
this.DATE_TIME = DATE_TIME;
}
public String getSITE() {
return SITE;
}
public void setSITE(String SITE) {
this.SITE = SITE;
}
public String getITEM() {
return ITEM;
}
public void setITEM(String ITEM) {
this.ITEM = ITEM;
}
public String getREVISION() {
return REVISION;
}
public void setREVISION(String REVISION) {
this.REVISION = REVISION;
}
public String getMAKTX() {
return MAKTX;
}
public void setMAKTX(String MAKTX) {
this.MAKTX = MAKTX;
}
public String getSTATUS() {
return STATUS;
}
public void setSTATUS(String STATUS) {
this.STATUS = STATUS;
}
public String getITEM_TYPE() {
return ITEM_TYPE;
}
public void setITEM_TYPE(String ITEM_TYPE) {
this.ITEM_TYPE = ITEM_TYPE;
}
public String getPROCUREMENT_TYPE() {
return PROCUREMENT_TYPE;
}
public void setPROCUREMENT_TYPE(String PROCUREMENT_TYPE) {
this.PROCUREMENT_TYPE = PROCUREMENT_TYPE;
}
public String getLOT_SIZE() {
return LOT_SIZE;
}
public void setLOT_SIZE(String LOT_SIZE) {
this.LOT_SIZE = LOT_SIZE;
}
public String getUNIT_OF_MEASURE() {
return UNIT_OF_MEASURE;
}
public void setUNIT_OF_MEASURE(String UNIT_OF_MEASURE) {
this.UNIT_OF_MEASURE = UNIT_OF_MEASURE;
}
public String getASSY_DATA_TYPE() {
return ASSY_DATA_TYPE;
}
public void setASSY_DATA_TYPE(String ASSY_DATA_TYPE) {
this.ASSY_DATA_TYPE = ASSY_DATA_TYPE;
}
public String getINV_ASSY_DATA_TYPE() {
return INV_ASSY_DATA_TYPE;
}
public void setINV_ASSY_DATA_TYPE(String INV_ASSY_DATA_TYPE) {
this.INV_ASSY_DATA_TYPE = INV_ASSY_DATA_TYPE;
}
public String getINGRED_TYPE() {
return INGRED_TYPE;
}
public void setINGRED_TYPE(String INGRED_TYPE) {
this.INGRED_TYPE = INGRED_TYPE;
}
public String getWEIGHT() {
return WEIGHT;
}
public void setWEIGHT(String WEIGHT) {
this.WEIGHT = WEIGHT;
}
public String getSPEC() {
return SPEC;
}
public void setSPEC(String SPEC) {
this.SPEC = SPEC;
}
public String getMODEL() {
return MODEL;
}
public void setMODEL(String MODEL) {
this.MODEL = MODEL;
}
public String getTEXTURE() {
return TEXTURE;
}
public void setTEXTURE(String TEXTURE) {
this.TEXTURE = TEXTURE;
}
public String getDRAWING() {
return DRAWING;
}
public void setDRAWING(String DRAWING) {
this.DRAWING = DRAWING;
}
public String getDRAWING_REVISION() {
return DRAWING_REVISION;
}
public void setDRAWING_REVISION(String DRAWING_REVISION) {
this.DRAWING_REVISION = DRAWING_REVISION;
}
@Override
public String toString() {
return "ItemRequest{" +
"TRANID='" + TRANID + '\'' +
", DATE_TIME='" + DATE_TIME + '\'' +
", SITE='" + SITE + '\'' +
", ITEM='" + ITEM + '\'' +
", REVISION='" + REVISION + '\'' +
", MAKTX='" + MAKTX + '\'' +
", STATUS='" + STATUS + '\'' +
", ITEM_TYPE='" + ITEM_TYPE + '\'' +
", PROCUREMENT_TYPE='" + PROCUREMENT_TYPE + '\'' +
", LOT_SIZE='" + LOT_SIZE + '\'' +
", UNIT_OF_MEASURE='" + UNIT_OF_MEASURE + '\'' +
", ASSY_DATA_TYPE='" + ASSY_DATA_TYPE + '\'' +
", INV_ASSY_DATA_TYPE='" + INV_ASSY_DATA_TYPE + '\'' +
", INGRED_TYPE='" + INGRED_TYPE + '\'' +
", WEIGHT='" + WEIGHT + '\'' +
", SPEC='" + SPEC + '\'' +
", MODEL='" + MODEL + '\'' +
", TEXTURE='" + TEXTURE + '\'' +
", DRAWING='" + DRAWING + '\'' +
", DRAWING_REVISION='" + DRAWING_REVISION + '\'' +
'}';
}
}
Loading…
Cancel
Save