From 9aeff869a6a21ee2c3aba78b5654d1c731917b56 Mon Sep 17 00:00:00 2001 From: liuxy Date: Mon, 15 May 2023 11:53:40 +0800 Subject: [PATCH 1/4] =?UTF-8?q?rev:=20=E6=88=90=E5=93=81=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E5=88=86=E9=85=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../storage/SectattrController.java | 4 +- .../dao/mapper/xml/StIvtSectattrMapper.xml | 6 +- .../impl/StIvtIostorinvCpServiceImpl.java | 19 +++++-- .../nladmin-system/src/test/java/Test3.java | 56 +++++++++++++++++++ mes/qd/src/api/wms/basedata/st/sectattr.js | 6 +- mes/qd/src/api/wms/basedata/st/storattr.js | 12 ++-- .../product/productIn/DivDialog.vue | 3 +- 7 files changed, 86 insertions(+), 20 deletions(-) create mode 100644 mes/hd/nladmin-system/src/test/java/Test3.java diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/SectattrController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/SectattrController.java index 7fec72f7..8b0df038 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/SectattrController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/SectattrController.java @@ -72,10 +72,10 @@ public class SectattrController { return new ResponseEntity<>(HttpStatus.OK); } - @GetMapping("/getSect") + @PostMapping("/getSect") @Log("查询库区下拉框") @ApiOperation("查询库区下拉框") - public ResponseEntity querySect(@RequestParam JSONObject query) { + public ResponseEntity querySect(@RequestBody JSONObject query) { List list = isectattrService.getSect(query); return new ResponseEntity<>(TableDataInfo.build(list), HttpStatus.OK); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dao/mapper/xml/StIvtSectattrMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dao/mapper/xml/StIvtSectattrMapper.xml index 14ffda24..38ca0712 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dao/mapper/xml/StIvtSectattrMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dao/mapper/xml/StIvtSectattrMapper.xml @@ -7,9 +7,9 @@ st_ivt_sectattr.sect_name, st_ivt_sectattr.sect_id, st_ivt_sectattr.sect_code, - st_ivt_bsrealstorattr.stor_name, - st_ivt_bsrealstorattr.stor_id, - st_ivt_bsrealstorattr.stor_code + stor.stor_name, + stor.stor_id, + stor.stor_code FROM st_ivt_sectattr LEFT JOIN st_ivt_bsrealstorattr stor ON st_ivt_sectattr.stor_id = stor.stor_id diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpServiceImpl.java index 26bbbcb5..a204117e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpServiceImpl.java @@ -321,6 +321,7 @@ public class StIvtIostorinvCpServiceImpl extends ServiceImpl().lambda() - .eq(StIvtStructattr::getStruct_id,struct_id) - ); + attrDao = iStIvtStructattrService.getById(struct_id); } if (ObjectUtil.isEmpty(attrDao.getStruct_code())) throw new BadRequestException("未找到仓位!"); @@ -346,7 +344,18 @@ public class StIvtIostorinvCpServiceImpl extends ServiceImpl name = array.stream().map(row -> ((JSONObject) row)).collect(Collectors.toSet()); + HashMap name1 = array.stream().collect(HashMap::new, (k, v) -> k.put(((JSONObject) v).getString("name"), (JSONObject) v), HashMap::putAll); + HashSet collect = array.stream().collect(HashSet::new, (k, v) -> k.add((JSONObject) v), HashSet::addAll); + collect.stream().forEach(json -> a(json.getString("name"))); + + List maps = new ArrayList<>(); + + HashMap map = new HashMap<>(); + map.put("storagevehicle_code","1"); + map.put("storagevehicle_name","sadfs"); + maps.add(map); + HashMap map2 = new HashMap<>(); + map2.put("storagevehicle_code","2"); + map2.put("storagevehicle_name","sdfd"); + maps.add(map2); + + boolean age = array.stream().filter(row -> ((JSONObject) row).getString("age").equals("18")).findAny().isPresent(); + System.out.println(age); + + + } + + public static void a(String name) { + } + + public static void b(String name) { + } + + +} + diff --git a/mes/qd/src/api/wms/basedata/st/sectattr.js b/mes/qd/src/api/wms/basedata/st/sectattr.js index 18b511af..2b5f2936 100644 --- a/mes/qd/src/api/wms/basedata/st/sectattr.js +++ b/mes/qd/src/api/wms/basedata/st/sectattr.js @@ -24,11 +24,11 @@ export function edit(data) { }) } -export function getSect(params) { +export function getSect(data) { return request({ url: 'api/sectattr/getSect', - method: 'get', - params + method: 'post', + data }) } diff --git a/mes/qd/src/api/wms/basedata/st/storattr.js b/mes/qd/src/api/wms/basedata/st/storattr.js index 61c3eb3b..6518f7c6 100644 --- a/mes/qd/src/api/wms/basedata/st/storattr.js +++ b/mes/qd/src/api/wms/basedata/st/storattr.js @@ -2,7 +2,7 @@ import request from '@/utils/request' export function add(data) { return request({ - url: '/api/stIvtBsrealstorattr', + url: '/api/Storattr', method: 'post', data }) @@ -10,7 +10,7 @@ export function add(data) { export function del(ids) { return request({ - url: '/api/stIvtBsrealstorattr', + url: '/api/Storattr', method: 'delete', data: ids }) @@ -18,7 +18,7 @@ export function del(ids) { export function edit(data) { return request({ - url: '/api/stIvtBsrealstorattr', + url: '/api/Storattr', method: 'put', data }) @@ -26,7 +26,7 @@ export function edit(data) { export function getStor(params) { return request({ - url: '/api/stIvtBsrealstorattr/getStor', + url: '/api/Storattr/getStor', method: 'get', params }) @@ -34,7 +34,7 @@ export function getStor(params) { export function changeActive(data) { return request({ - url: '/api/stIvtBsrealstorattr/changeActive', + url: '/api/Storattr/changeActive', method: 'put', data }) @@ -42,7 +42,7 @@ export function changeActive(data) { export function queryStor(data) { return request({ - url: '/api/stIvtBsrealstorattr/queryStor', + url: '/api/Storattr/queryStor', method: 'post', data }) diff --git a/mes/qd/src/views/wms/storage_manage/product/productIn/DivDialog.vue b/mes/qd/src/views/wms/storage_manage/product/productIn/DivDialog.vue index 989e3b84..a95a2a48 100644 --- a/mes/qd/src/views/wms/storage_manage/product/productIn/DivDialog.vue +++ b/mes/qd/src/views/wms/storage_manage/product/productIn/DivDialog.vue @@ -223,6 +223,7 @@ import StructDiv from '@/views/wms/pub/StructDialog' import crudProductIn from '@/views/wms/storage_manage/product/productIn/productin' import crudPoint from '@/api/wms/sch/point' import AddBox from '@/views/wms/storage_manage/product/productIn/AddBox' +import crudSectattr from '@/api/wms/basedata/st/sectattr' export default { name: 'DivDialog', @@ -285,7 +286,7 @@ export default { }, methods: { open() { - crudProductIn.getSect({ 'stor_id': this.storId }).then(res => { + crudSectattr.getSect({ 'stor_id': this.storId }).then(res => { this.sects = res.content }) const area_type = 'A1_RK01' From f2a4fcb105d1c5fdcbf5b5226055e002052b20d3 Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Mon, 22 May 2023 16:57:43 +0800 Subject: [PATCH 2/4] =?UTF-8?q?add:=E8=B0=83=E5=BA=A6=E7=BA=BF=E8=B7=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/wms/product_manage/pdm.xls | Bin 215040 -> 215040 bytes .../scheduler/SchedulerController.java | 39 +++++ .../region/impl/SchBaseRegionServiceImpl.java | 15 +- .../service/scheduler/SchedulerService.java | 140 ++++++++++++++++++ .../labelConverter/BaseConverter.java | 24 +++ .../scheduler/labelConverter/BaseElement.java | 61 ++++++++ .../labelConverter/impl/EndConverter.java | 24 +++ .../labelConverter/impl/EndElement.java | 9 ++ .../labelConverter/impl/FlowConverter.java | 49 ++++++ .../labelConverter/impl/FlowElement.java | 64 ++++++++ .../labelConverter/impl/GatwayConverter.java | 20 +++ .../labelConverter/impl/ProcessConverter.java | 46 ++++++ .../labelConverter/impl/ProcessElement.java | 43 ++++++ .../labelConverter/impl/StartConverter.java | 25 ++++ .../labelConverter/impl/StartElement.java | 9 ++ .../src/main/resources/config/application.yml | 1 + .../src/main/resources/scheduler.xml | 22 +++ 17 files changed, 582 insertions(+), 9 deletions(-) create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/controller/scheduler/SchedulerController.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/scheduler/SchedulerService.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/scheduler/labelConverter/BaseConverter.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/scheduler/labelConverter/BaseElement.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/scheduler/labelConverter/impl/EndConverter.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/scheduler/labelConverter/impl/EndElement.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/scheduler/labelConverter/impl/FlowConverter.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/scheduler/labelConverter/impl/FlowElement.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/scheduler/labelConverter/impl/GatwayConverter.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/scheduler/labelConverter/impl/ProcessConverter.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/scheduler/labelConverter/impl/ProcessElement.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/scheduler/labelConverter/impl/StartConverter.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/scheduler/labelConverter/impl/StartElement.java create mode 100644 mes/hd/nladmin-system/src/main/resources/scheduler.xml diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/pdm.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/pdm.xls index 78870a96022ac194e5564a5dc62240341d983b41..aa248e2c31646aa7ed7b37377314b3fa90da27b9 100644 GIT binary patch delta 33 ncmZpez}ql^cS8;fo55@SwaGorMJ(+_EQ~ allprocess(){ + return new ResponseEntity<>(schedulerService.all(), HttpStatus.OK); + } + @GetMapping("/process") + public ResponseEntity allprocess(String process){ + return new ResponseEntity<>(schedulerService.getProcess(process), HttpStatus.OK); + } + @GetMapping("/processFlow") + public ResponseEntity allprocess(String process,String flow){ + FlowElement element = schedulerService.currentFlow(process, flow); + return new ResponseEntity<>(element, HttpStatus.OK); + } +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/region/impl/SchBaseRegionServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/region/impl/SchBaseRegionServiceImpl.java index cd6deaea..33ea146a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/region/impl/SchBaseRegionServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/region/impl/SchBaseRegionServiceImpl.java @@ -1,28 +1,21 @@ package org.nl.wms.scheduler_manage.service.region.impl; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; -import org.apache.commons.lang3.StringUtils; import org.nl.common.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; -import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.modules.wql.util.WqlUtil; -import org.nl.wms.product_manage.sch.service.dto.RegionDto; -import org.nl.wms.scheduler_manage.service.point.dao.SchBasePoint; import org.nl.wms.scheduler_manage.service.region.ISchBaseRegionService; import org.nl.wms.scheduler_manage.service.region.dao.SchBaseRegion; import org.nl.wms.scheduler_manage.service.region.dao.mapper.SchBaseRegionMapper; +import org.nl.wms.scheduler_manage.service.scheduler.labelConverter.impl.ProcessElement; import org.nl.wms.system_manage.service.dict.ISysDictService; import org.nl.wms.system_manage.service.dict.dao.Dict; import org.springframework.beans.factory.annotation.Autowired; @@ -31,7 +24,6 @@ import org.springframework.util.Assert; import javax.annotation.Resource; import java.util.Date; -import java.util.HashMap; import java.util.List; import java.util.Map; @@ -169,4 +161,9 @@ public class SchBaseRegionServiceImpl extends ServiceImpl converterMap =new HashMap<>(); + + + public List all(){ + List readall = XmlReadUtil.readall(); + return readall; + } + + public ProcessElement getProcess(String processId){ + ProcessElement processElement = XmlReadUtil.readProcess(processId); + return processElement; + } + + public FlowElement currentFlow(String processId,String flowId){ + ProcessElement processElement = XmlReadUtil.readProcess(processId); + if (processElement!=null){ + return processElement.flowId(flowId); + } + return null; + } + + static class XmlReadUtil{ + + static FileSystemResourceLoader loader = new FileSystemResourceLoader(); + + @SneakyThrows + public static ProcessElement readProcess(String processId){//生成参数： + Function function = xtr -> { + try { + while (xtr.hasNext()){ + if (XMLStreamConstants.START_ELEMENT == xtr.next()){ + System.out.println(xtr.getLocalName()+"___"+processId); + if (xtr.getLocalName().equals("process") && xtr.getAttributeValue(0).equals(processId)){ + BaseConverter converter = converterMap.get(xtr.getLocalName()); + return (ProcessElement)converter.process(xtr); + } + } + } + }catch (Exception ex){ + throw new BadRequestException(ex.getMessage()); + } + return null; + }; + ProcessElement processElement = readXml("classpath:/scheduler.xml", function); + return processElement; + } + + @SneakyThrows + public static List readall() { + //生成参数： + Function function = xtr -> { + List list = new ArrayList<>(); + try { + while (xtr.hasNext()) { + if (XMLStreamConstants.START_ELEMENT == xtr.next()) { + System.out.println(xtr.getLocalName()); + BaseConverter converter = converterMap.get(xtr.getLocalName()); + if (converter != null) { + list.add(converter.process(xtr)); + } + } + } + }catch (Exception ex){ + throw new BadRequestException(ex.getMessage()); + } + return list; + }; + List baseElements = readXml("classpath:/scheduler.xml", function); + return baseElements; + } + private static T readXml(String path, Function function) throws IOException, XMLStreamException { + FileInputStream inputStream = null; + InputStreamReader streamReader = null; + Resource resource = loader.getResource(path); + try { + inputStream = new FileInputStream(resource.getFile()); + streamReader = new InputStreamReader(inputStream, "UTF-8"); + //TODO:schama校验 + XMLStreamReader reader = XMLInputFactory.newInstance().createXMLStreamReader(streamReader); + return function.apply(reader); + }finally { + if (streamReader!=null){ + streamReader.close(); + } + if (inputStream!=null){ + inputStream.close(); + } + } + } + } + + + @Override + public Object postProcessAfterInitialization(@NotNull Object bean, String beanName) throws BeansException { + if (bean instanceof BaseConverter){ + converterMap.put(beanName,(BaseConverter)bean); + } + return bean; + } +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/scheduler/labelConverter/BaseConverter.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/scheduler/labelConverter/BaseConverter.java new file mode 100644 index 00000000..a1652130 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/scheduler/labelConverter/BaseConverter.java @@ -0,0 +1,24 @@ +package org.nl.wms.scheduler_manage.service.scheduler.labelConverter; + +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamReader; +import java.util.HashMap; +import java.util.Map; + +/* + * @author ZZQ + * @Date 2023/5/19 11:00 + */ +public interface BaseConverter { + BaseElement process(XMLStreamReader xtr) throws XMLStreamException; + + default void setBaseLabel(BaseElement element,XMLStreamReader xtr,String...labels){ + Map map = new HashMap<>(); + for (String label : labels) { + map.put(label,xtr.getAttributeValue(null,label)); + } + element.setAttributeValue(map); + element.setId(xtr.getAttributeValue(null,"id")); + element.setName(xtr.getAttributeValue(null,"name")); + } +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/scheduler/labelConverter/BaseElement.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/scheduler/labelConverter/BaseElement.java new file mode 100644 index 00000000..3fa3e924 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/scheduler/labelConverter/BaseElement.java @@ -0,0 +1,61 @@ +package org.nl.wms.scheduler_manage.service.scheduler.labelConverter; + +import lombok.Data; + +import javax.xml.stream.XMLStreamReader; +import java.io.Serializable; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/* + * @author ZZQ + * @Date 2023/5/21 18:03 + */ +public class BaseElement implements Serializable { + private String id; + private String name; + private int xmlRowNumber; + private int xmlColumnNumber; + private Map attributeValue; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getXmlRowNumber() { + return xmlRowNumber; + } + + public void setXmlRowNumber(int xmlRowNumber) { + this.xmlRowNumber = xmlRowNumber; + } + + public int getXmlColumnNumber() { + return xmlColumnNumber; + } + + public void setXmlColumnNumber(int xmlColumnNumber) { + this.xmlColumnNumber = xmlColumnNumber; + } + + public Map getAttributeValue() { + return attributeValue; + } + + public void setAttributeValue(Map attributeValue) { + this.attributeValue = attributeValue; + } +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/scheduler/labelConverter/impl/EndConverter.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/scheduler/labelConverter/impl/EndConverter.java new file mode 100644 index 00000000..48a7bea6 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/scheduler/labelConverter/impl/EndConverter.java @@ -0,0 +1,24 @@ +package org.nl.wms.scheduler_manage.service.scheduler.labelConverter.impl; + +import org.nl.wms.scheduler_manage.service.scheduler.labelConverter.BaseConverter; +import org.nl.wms.scheduler_manage.service.scheduler.labelConverter.BaseElement; +import org.springframework.stereotype.Service; + +import javax.xml.stream.XMLStreamReader; + +/* + * @author ZZQ + * @Date 2023/5/19 11:00 + */ +@Service("end") +public class EndConverter implements BaseConverter { + String[] labels = new String[]{"id","name","sourceRef"}; + @Override + public BaseElement process(XMLStreamReader xtr) { + EndElement element = new EndElement(); + setBaseLabel(element,xtr,labels); + element.setSourceRefId(xtr.getAttributeValue(null,"sourceRef")); + element.setTargetRefId(xtr.getAttributeValue(null,"targetRef")); + return element; + } +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/scheduler/labelConverter/impl/EndElement.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/scheduler/labelConverter/impl/EndElement.java new file mode 100644 index 00000000..d3c705b9 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/scheduler/labelConverter/impl/EndElement.java @@ -0,0 +1,9 @@ +package org.nl.wms.scheduler_manage.service.scheduler.labelConverter.impl; + +/* + * @author ZZQ + * @Date 2023/5/21 18:03 + */ +public class EndElement extends FlowElement { + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/scheduler/labelConverter/impl/FlowConverter.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/scheduler/labelConverter/impl/FlowConverter.java new file mode 100644 index 00000000..7b46ef69 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/scheduler/labelConverter/impl/FlowConverter.java @@ -0,0 +1,49 @@ +package org.nl.wms.scheduler_manage.service.scheduler.labelConverter.impl; + +import lombok.SneakyThrows; +import org.apache.commons.lang3.StringUtils; +import org.nl.wms.scheduler_manage.service.scheduler.labelConverter.BaseConverter; +import org.nl.wms.scheduler_manage.service.scheduler.labelConverter.BaseElement; +import org.springframework.stereotype.Service; + +import javax.xml.stream.XMLStreamConstants; +import javax.xml.stream.XMLStreamReader; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/* + * @author ZZQ + * @Date 2023/5/19 11:00 + */ +@Service("flow") +public class FlowConverter implements BaseConverter { + String[] labels = new String[]{"id","name","sourceRef","targetRef"}; + @Override + @SneakyThrows + public BaseElement process(XMLStreamReader xtr) { + FlowElement element = new FlowElement(); + setBaseLabel(element,xtr,labels); + element.setSourceRefId(xtr.getAttributeValue(null,"sourceRef")); + element.setTargetRefId(xtr.getAttributeValue(null,"targetRef")); + String has = xtr.getAttributeValue(null, "has"); + if (StringUtils.isNotEmpty(has)){ + int i = 0; + while (true){ + if (i == Integer.valueOf(has)){ + break; + } + if (XMLStreamConstants.START_ELEMENT == xtr.next()){ + System.out.println(xtr.getLocalName()); + Map param = new HashMap(); + param.put(xtr.getAttributeValue(null,"id"),xtr.getAttributeValue(null,"value")); + element.getParams().add(param); + i++; + } + } + } + return element; + } + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/scheduler/labelConverter/impl/FlowElement.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/scheduler/labelConverter/impl/FlowElement.java new file mode 100644 index 00000000..2877451d --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/scheduler/labelConverter/impl/FlowElement.java @@ -0,0 +1,64 @@ +package org.nl.wms.scheduler_manage.service.scheduler.labelConverter.impl; + +import org.nl.wms.scheduler_manage.service.scheduler.labelConverter.BaseElement; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +/* + * @author ZZQ + * @Date 2023/5/21 18:03 + */ +public class FlowElement extends BaseElement { + + private FlowElement sourceRef; + private FlowElement targetRef; + private String sourceRefId; + private String targetRefId; + private List> params = new ArrayList<>(); + + + + public FlowElement pre() { + return sourceRef; + } + + public FlowElement next() { + return targetRef; + } + + + protected void setSourceRef(FlowElement sourceRef) { + this.sourceRef = sourceRef; + } + + + protected void setTargetRef(FlowElement targetRef) { + this.targetRef = targetRef; + } + + protected String getSourceRefId() { + return sourceRefId; + } + + protected void setSourceRefId(String sourceRefId) { + this.sourceRefId = sourceRefId; + } + + protected String getTargetRefId() { + return targetRefId; + } + + protected void setTargetRefId(String targetRefId) { + this.targetRefId = targetRefId; + } + + public List> getParams() { + return params; + } + + public void setParams(List> params) { + this.params = params; + } +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/scheduler/labelConverter/impl/GatwayConverter.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/scheduler/labelConverter/impl/GatwayConverter.java new file mode 100644 index 00000000..d69ae9ba --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/scheduler/labelConverter/impl/GatwayConverter.java @@ -0,0 +1,20 @@ +package org.nl.wms.scheduler_manage.service.scheduler.labelConverter.impl; + +import org.nl.wms.scheduler_manage.service.scheduler.labelConverter.BaseConverter; +import org.nl.wms.scheduler_manage.service.scheduler.labelConverter.BaseElement; +import org.springframework.stereotype.Service; + +import javax.xml.stream.XMLStreamReader; + +/* + * @author ZZQ + * @Date 2023/5/19 11:00 + */ +@Service("gatway") +public class GatwayConverter implements BaseConverter { + + @Override + public BaseElement process(XMLStreamReader xtr) { + return null; + } +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/scheduler/labelConverter/impl/ProcessConverter.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/scheduler/labelConverter/impl/ProcessConverter.java new file mode 100644 index 00000000..c643d91b --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/scheduler/labelConverter/impl/ProcessConverter.java @@ -0,0 +1,46 @@ +package org.nl.wms.scheduler_manage.service.scheduler.labelConverter.impl; + +import com.alibaba.fastjson.JSON; +import org.nl.wms.scheduler_manage.service.scheduler.labelConverter.BaseConverter; +import org.nl.wms.scheduler_manage.service.scheduler.labelConverter.BaseElement; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.xml.stream.XMLStreamConstants; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamReader; +import java.util.HashMap; +import java.util.Map; + +/* + * @author ZZQ + * @Date 2023/5/19 11:00 + */ +@Service("process") +public class ProcessConverter implements BaseConverter { + String[] labels = new String[]{"id","name"}; + @Autowired + private Map converterMap; + + @Override + public BaseElement process(XMLStreamReader xtr) throws XMLStreamException { + ProcessElement element = new ProcessElement(); + setBaseLabel(element,xtr,labels); + while (xtr.hasNext()){ + if (XMLStreamConstants.START_ELEMENT == xtr.next()){ + String localName = xtr.getLocalName(); + element.getFlowElements().add((FlowElement) converterMap.get(localName).process(xtr)); + if (localName.equals("end")){ + break; + } + } + } + Map eleMap = element.getFlowElements().stream().collect(HashMap::new, (k, v) -> k.put(v.getId(), v), HashMap::putAll); + for (FlowElement flowElement : element.getFlowElements()) { + flowElement.setTargetRef(eleMap.get(flowElement.getTargetRefId())); + flowElement.setSourceRef(eleMap.get(flowElement.getSourceRefId())); + } + element.setStartElement(eleMap.get("start")); + return element; + } +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/scheduler/labelConverter/impl/ProcessElement.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/scheduler/labelConverter/impl/ProcessElement.java new file mode 100644 index 00000000..4174ddb4 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/scheduler/labelConverter/impl/ProcessElement.java @@ -0,0 +1,43 @@ +package org.nl.wms.scheduler_manage.service.scheduler.labelConverter.impl; + +import org.nl.wms.scheduler_manage.service.scheduler.labelConverter.BaseElement; + +import java.util.ArrayList; +import java.util.List; + +/* + * @author ZZQ + * @Date 2023/5/21 18:03 + */ +public class ProcessElement extends BaseElement { + + private StartElement startElement; + + private List flowElements = new ArrayList<>(); + + public List getFlowElements() { + return flowElements; + } + + public FlowElement flowId(String flowId){ + for (FlowElement flowElement : flowElements) { + if (flowElement.getId().equals(flowId)){ + return flowElement; + } + } + return null; + } + + public void setFlowElements(List flowElements) { + this.flowElements = flowElements; + } + + public StartElement getStartElement() { + return startElement; + } + + + public void setStartElement(BaseElement startElement) { + this.startElement = (StartElement)startElement; + } +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/scheduler/labelConverter/impl/StartConverter.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/scheduler/labelConverter/impl/StartConverter.java new file mode 100644 index 00000000..fc47259f --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/scheduler/labelConverter/impl/StartConverter.java @@ -0,0 +1,25 @@ +package org.nl.wms.scheduler_manage.service.scheduler.labelConverter.impl; + +import org.nl.wms.scheduler_manage.service.scheduler.labelConverter.BaseConverter; +import org.nl.wms.scheduler_manage.service.scheduler.labelConverter.BaseElement; +import org.springframework.stereotype.Service; + +import javax.xml.stream.XMLStreamReader; + +/* + * @author ZZQ + * @Date 2023/5/19 11:00 + */ +@Service("start") +public class StartConverter implements BaseConverter { + String[] labels = new String[]{"id","name","targetRef"}; + @Override + public BaseElement process(XMLStreamReader xtr) { + StartElement element = new StartElement(); + setBaseLabel(element,xtr,labels); + element.setSourceRefId(xtr.getAttributeValue(null,"sourceRef")); + element.setTargetRefId(xtr.getAttributeValue(null,"targetRef")); + return element; + } +} + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/scheduler/labelConverter/impl/StartElement.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/scheduler/labelConverter/impl/StartElement.java new file mode 100644 index 00000000..72804de5 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/scheduler/labelConverter/impl/StartElement.java @@ -0,0 +1,9 @@ +package org.nl.wms.scheduler_manage.service.scheduler.labelConverter.impl; + +/* + * @author ZZQ + * @Date 2023/5/21 18:03 + */ +public class StartElement extends FlowElement { + +} diff --git a/mes/hd/nladmin-system/src/main/resources/config/application.yml b/mes/hd/nladmin-system/src/main/resources/config/application.yml index 0d141f34..2774a8e9 100644 --- a/mes/hd/nladmin-system/src/main/resources/config/application.yml +++ b/mes/hd/nladmin-system/src/main/resources/config/application.yml @@ -92,3 +92,4 @@ mybatis-plus: db-config: id-type: INPUT banner: false +schedulerFile: classpath:/scheduler.xml diff --git a/mes/hd/nladmin-system/src/main/resources/scheduler.xml b/mes/hd/nladmin-system/src/main/resources/scheduler.xml new file mode 100644 index 00000000..c434d833 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/resources/scheduler.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + From 47fe4727394195b1c34ce26544ee5e4b3b478369 Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Tue, 23 May 2023 10:14:08 +0800 Subject: [PATCH 3/4] =?UTF-8?q?rev:=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=94=B9=E5=A4=96=E7=BD=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/config/application-dev.yml | 16 ++++++++-------- .../main/resources/config/application-dev3.yml | 12 ++++++------ .../main/resources/config/application-prod.yml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/resources/config/application-dev.yml b/mes/hd/nladmin-system/src/main/resources/config/application-dev.yml index 33a2a28d..0e4982e5 100644 --- a/mes/hd/nladmin-system/src/main/resources/config/application-dev.yml +++ b/mes/hd/nladmin-system/src/main/resources/config/application-dev.yml @@ -8,16 +8,16 @@ spring: enabled: true client: reactive: - #endpoints: 172.31.185.110:9200,172.31.154.9:9200 #内网 - # endpoints: 192.168.46.225:8200 #外网 - endpoints: http://192.168.46.225:8200 #外网 + #endpoints: 172.31.185.110:8200,172.31.154.9:8200 #内网 + # endpoints: 47.96.133.178:8200 #外网 + endpoints: http://47.96.133.178:8200 #外网 elasticsearch: rest: - #uris: 172.31.185.110:9200,172.31.154.9:9200 #内网 - # uris: 192.168.46.225:8200 #外网 - uris: http://192.168.46.225:9200 #外网 -# username: elastic -# password: 123456 + #uris: 172.31.185.110:8200,172.31.154.9:8200 #内网 + # uris: 47.96.133.178:8200 #外网 + uris: http://47.96.133.178:8200 #外网 + username: elastic + password: 123456 datasource: druid: db-type: com.alibaba.druid.pool.DruidDataSource diff --git a/mes/hd/nladmin-system/src/main/resources/config/application-dev3.yml b/mes/hd/nladmin-system/src/main/resources/config/application-dev3.yml index 404dcb25..513e292f 100644 --- a/mes/hd/nladmin-system/src/main/resources/config/application-dev3.yml +++ b/mes/hd/nladmin-system/src/main/resources/config/application-dev3.yml @@ -8,14 +8,14 @@ spring: enabled: true client: reactive: - #endpoints: 172.31.185.110:9200,172.31.154.9:9200 #内网 - # endpoints: 192.168.46.2255:8200 #外网 - endpoints: http://192.168.46.2255:8200 #外网 + #endpoints: 172.31.185.110:8200,172.31.154.9:8200 #内网 + # endpoints: 47.96.133.1785:8200 #外网 + endpoints: http://47.96.133.1785:8200 #外网 elasticsearch: rest: - #uris: 172.31.185.110:9200,172.31.154.9:9200 #内网 - # uris: 192.168.46.2255:8200 #外网 - uris: http://192.168.46.2255:8200 #外网 + #uris: 172.31.185.110:8200,172.31.154.9:8200 #内网 + # uris: 47.96.133.1785:8200 #外网 + uris: http://47.96.133.1785:8200 #外网 username: elastic password: 123456 datasource: diff --git a/mes/hd/nladmin-system/src/main/resources/config/application-prod.yml b/mes/hd/nladmin-system/src/main/resources/config/application-prod.yml index d58e2f2e..3889c63b 100644 --- a/mes/hd/nladmin-system/src/main/resources/config/application-prod.yml +++ b/mes/hd/nladmin-system/src/main/resources/config/application-prod.yml @@ -10,7 +10,7 @@ spring: reactive: #endpoints: 172.31.185.110:9200,172.31.154.9:9200 #内网 # endpoints: 192.168.46.2255:8200 #外网 - endpoints: http://192.168.46.2255:8200 #外网 + endpoints: http://192.168.46.2255:9200 #外网 elasticsearch: rest: #uris: 172.31.185.110:9200,172.31.154.9:9200 #内网 diff --git a/mes/hd/nladmin-system/src/main/resources/logback-spring.xml b/mes/hd/nladmin-system/src/main/resources/logback-spring.xml index 25e184ff..62780f2f 100644 --- a/mes/hd/nladmin-system/src/main/resources/logback-spring.xml +++ b/mes/hd/nladmin-system/src/main/resources/logback-spring.xml @@ -18,7 +18,7 @@ https://juejin.cn/post/6844903775631572999