From e82bc1161c6b611ac2213433c4ea1ad2d70c6121 Mon Sep 17 00:00:00 2001 From: caixiang <939387484@qq.com> Date: Fri, 31 Mar 2023 10:31:20 +0800 Subject: [PATCH] mark for pull --- .../src/main/resources/application-dev.yml | 32 +- ym-gateway/src/main/resources/application.yml | 4 +- .../com/cnbm/dispatch/KukaJoinThread.java | 492 +++++++++--------- .../packing/controller/TestController.java | 14 +- .../cnbm/packing/mapper/CamlineMapper.java | 2 +- .../service/DynamicDataSourceService.java | 4 +- .../main/resources/mapper/CamlineMapper.xml | 73 +-- 7 files changed, 295 insertions(+), 326 deletions(-) diff --git a/ym-gateway/src/main/resources/application-dev.yml b/ym-gateway/src/main/resources/application-dev.yml index cc956c6..da8f64c 100644 --- a/ym-gateway/src/main/resources/application-dev.yml +++ b/ym-gateway/src/main/resources/application-dev.yml @@ -2,14 +2,14 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver #MySQL-local -# url: jdbc:mysql://10.0.1.249:3306/mt_cigs4?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true -# username: cigs4 -# password: 1qazxsw2 + url: jdbc:mysql://10.0.1.249:3306/mt_cigs4?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true + username: cigs4 + password: 1qazxsw2 #MySQL-remote - url: jdbc:mysql://mysql.picaiba.com:30307/mt_cigs4?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true - username: root - password: 1qaz@WSX3edc$RFV +# url: jdbc:mysql://mysql.picaiba.com:30307/mt_cigs4?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true +# username: root +# password: 1qaz@WSX3edc$RFV # #Oracle # driver-class-name: oracle.jdbc.OracleDriver # url: jdbc:oracle:thin:@192.168.10.10:1521:xe @@ -66,15 +66,15 @@ dynamic: # username: root # password: 1qaz@WSX3edc$RFV ## camline系统 - remote - camline: - driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://mysql.picaiba.com:30307/mt_cigs4?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true - username: root - password: 1qaz@WSX3edc$RFV -# - #camline系统 - local # camline: # driver-class-name: com.mysql.cj.jdbc.Driver -# url: jdbc:mysql://10.0.1.23:3306/synapse?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true -# username: offline_data -# password: tpvmfab4 \ No newline at end of file +# url: jdbc:mysql://mysql.picaiba.com:30307/mt_cigs4?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true +# username: root +# password: 1qaz@WSX3edc$RFV +# + #camline系统 - local + camline: + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://10.0.1.23:3306/synapse?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true + username: offline_data + password: tpvmfab4 \ No newline at end of file diff --git a/ym-gateway/src/main/resources/application.yml b/ym-gateway/src/main/resources/application.yml index bb0ed3e..209f3fc 100644 --- a/ym-gateway/src/main/resources/application.yml +++ b/ym-gateway/src/main/resources/application.yml @@ -33,8 +33,8 @@ spring: enabled: true redis: database: 6 - host: 127.0.0.1 - #host: 10.0.1.249 + #host: 127.0.0.1 + host: 10.0.1.249 #host: 192.168.0.102 port: 6379 password: '' # 密码（默认为空） diff --git a/ym-packing/src/main/java/com/cnbm/dispatch/KukaJoinThread.java b/ym-packing/src/main/java/com/cnbm/dispatch/KukaJoinThread.java index c8e357f..d34116b 100644 --- a/ym-packing/src/main/java/com/cnbm/dispatch/KukaJoinThread.java +++ b/ym-packing/src/main/java/com/cnbm/dispatch/KukaJoinThread.java @@ -206,252 +206,252 @@ public class KukaJoinThread implements ApplicationRunner { @Override public void run(ApplicationArguments args) throws Exception { -// kukaStep1.scheduleAtFixedRate(new Runnable() { -// @Override -// public void run() { -// try { -// -// //调度开始 -//// logger.info(""); -//// logger.info("================= 现在开始执行 过程一 任务 =================="); -// Integer subArrived = waitingForTarget(Step1Plc2MesVar.SubArrivedToMes, true); -// if(subArrived != 1){ -// logger.info("标签打印Event--- 失败"+" --- "+" MES监听 Step1Plc2MesVar.SubArrivedToMes 是否 等于 1 失败"); -// } -// -// //一. 从plc 中获取 subId 和 lineNum -// String subId = (String) read(S7Client.S7_KUKA,Step1Plc2MesVar.SubIdToMes); -// Integer lineNum = (Integer) read(S7Client.S7_KUKA,Step1Plc2MesVar.LineNum); -// //把基板ID字符串的空格去掉，因为plc中设置的20位，但实际基板ID就是17位，因为带空格去数据库查询 有问题的。 -// subId = removeKG(subId); -// -// //二. MES 业务 -// //=============== MES 业务 开始 ================= -// //1. 从comline数据库中获取 实际pmpp -// float pmppActual = service.getPMPPBySubId(subId); -// //2. 匹配和计算补偿功率 -// float pmppCompensation = compensationPowerServiceBiz.calculCompensationPMPP(pmppActual,lineNum); -// //3. 依据补偿功率，获取工艺参数，并且把这些工艺参数传给kuka -// WoPowerLevel argByPMPP = levelServiceBiz.getArgByPMPP(pmppCompensation, lineNum); -// write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Pnom,Integer.valueOf(argByPMPP.getPowerClass())); -// write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Voc,argByPMPP.getLableVoc()); -// write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Isc,argByPMPP.getLableIsc()); -// write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Vmpp,argByPMPP.getLableVmpp()); -// write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Impp,argByPMPP.getLableImpp()); -// logger.info("标签打印Event--- 采集到 基板ID: "+subId+", 线边号："+lineNum+"，从camline 获取到实际pmpp"+pmppActual+",计算后 补偿功率："+pmppCompensation+",dLable_Pnom: "+argByPMPP.getPowerClass() +",dLable_Voc: "+argByPMPP.getLableVoc()+",dLable_Isc: "+argByPMPP.getLableIsc()+",dLable_Vmpp: "+argByPMPP.getLableVmpp()+",dLable_Impp: "+argByPMPP.getLableImpp()); -// -// -// -// //4. 把基板录到数据库 -// WoPackagingBoxSubstrate woPackagingBoxSubstrate = new WoPackagingBoxSubstrate(); -// woPackagingBoxSubstrate.setLineBody(lineNum); -// woPackagingBoxSubstrate.setPowerLevel(argByPMPP.getPowerClass()); -// woPackagingBoxSubstrate.setSapMaterial(argByPMPP.getSapMaterialNum()); -// woPackagingBoxSubstrate.setWoSubstrateId(subId); -// woPackagingBoxSubstrate.setActualPmpp(pmppActual); -// woPackagingBoxSubstrate.setCreateTime(LocalDateTime.now()); -// woPackagingBoxSubstrate.setPmpp(pmppCompensation); -// -// -// //5. 从camline那里获取可变字段 -// CamlineExtendArgDTO extendArgFromCamline = service.getExtendArgFromCamline(subId); -// logger.info("标签打印Event--- 基板ID: "+subId+", 从camline获取PID16~PID22 的实测数据 成功, 数据内容:"+extendArgFromCamline.toString()); -// woPackagingBoxSubstrate.setLastUpdateTime(extendArgFromCamline.getLastUpdateTime()); -// -// woPackagingBoxSubstrate.setOrderName(extendArgFromCamline.getOrderName()); -// woPackagingBoxSubstrate.setBinclassFl1(extendArgFromCamline.getBinclassFl1()); -// woPackagingBoxSubstrate.setBinclassFl2(extendArgFromCamline.getBinclassFl2()); -// woPackagingBoxSubstrate.setEtaFl1(extendArgFromCamline.getEtaFl1()); -// woPackagingBoxSubstrate.setEtaFl2(extendArgFromCamline.getEtaFl2()); -// woPackagingBoxSubstrate.setFfFl1(extendArgFromCamline.getFfFl1()); -// woPackagingBoxSubstrate.setFfFl2(extendArgFromCamline.getFfFl2()); -// woPackagingBoxSubstrate.setImppFl1(extendArgFromCamline.getImppFl1()); -// woPackagingBoxSubstrate.setImppFl2(extendArgFromCamline.getImppFl2()); -// woPackagingBoxSubstrate.setInsolflashcontrolFl1(extendArgFromCamline.getInsolflashcontrolFl1()); -// woPackagingBoxSubstrate.setInsolflashcontrolFl2(extendArgFromCamline.getInsolflashcontrolFl2()); -// woPackagingBoxSubstrate.setInsolmppFl1(extendArgFromCamline.getInsolmppFl1()); -// woPackagingBoxSubstrate.setInsolmppFl2(extendArgFromCamline.getInsolmppFl2()); -// woPackagingBoxSubstrate.setInsolvocFl1(extendArgFromCamline.getInsolvocFl1()); -// woPackagingBoxSubstrate.setInsolvocFl2(extendArgFromCamline.getInsolvocFl2()); -// woPackagingBoxSubstrate.setInsolFl1(extendArgFromCamline.getInsolFl1()); -// woPackagingBoxSubstrate.setInsolFl2(extendArgFromCamline.getInsolFl2()); -// woPackagingBoxSubstrate.setIscFl1(extendArgFromCamline.getIscFl1()); -// woPackagingBoxSubstrate.setIscFl2(extendArgFromCamline.getIscFl2()); -// woPackagingBoxSubstrate.setMeasTimeFl1(extendArgFromCamline.getMeasTimeFl1()); -// woPackagingBoxSubstrate.setMeasTimeFl2(extendArgFromCamline.getMeasTimeFl2()); -// woPackagingBoxSubstrate.setPmppFl1(extendArgFromCamline.getPmppFl1()); -// woPackagingBoxSubstrate.setPmppFl2(extendArgFromCamline.getPmppFl2()); -// woPackagingBoxSubstrate.setTcellFl1(extendArgFromCamline.getTcellFl1()); -// woPackagingBoxSubstrate.setTcellFl2(extendArgFromCamline.getTcellFl2()); -// woPackagingBoxSubstrate.setTmonicellFl1(extendArgFromCamline.getTmonicellFl1()); -// woPackagingBoxSubstrate.setTmonicellFl2(extendArgFromCamline.getTmonicellFl2()); -// woPackagingBoxSubstrate.setUmppFl1(extendArgFromCamline.getUmppFl1()); -// woPackagingBoxSubstrate.setUmppFl2(extendArgFromCamline.getUmppFl2()); -// woPackagingBoxSubstrate.setUocFl1(extendArgFromCamline.getUocFl1()); -// woPackagingBoxSubstrate.setUocFl1(extendArgFromCamline.getUocFl2()); -// -// substrateServiceBiz.insert(woPackagingBoxSubstrate); -// logger.info("标签打印Event--- 基板ID: "+subId+", 录入数据库成功"); -// //=============== MES 业务 结束 ================= -// -// //三. 当MES完成任务后，把MesToPlc.SubArrivedFinish变量置为true，告诉plc，我操作完成了 -// write(S7Client.S7_KUKA,Step1Mes2PlcVar.SubArrivedFinish,true); -// logger.info("标签打印Event--- 基板ID: "+subId+", SubArrivedFinish，置为true 成功"); -// //四. mes 监控 到PlcToMes.SubArrived==false，就把MesToPlc.SubArrivedFinish置为false -// Integer subArrived2 = waitingForTarget(Step1Plc2MesVar.SubArrivedToMes, false); -// if(subArrived2 != 1){ -// logger.info("标签打印Event--- 失败"+" --- "+"MES监听 Step1Plc2MesVar.SubArrivedToMes 是否 等于 1 失败"); -// } -// -// write(S7Client.S7_KUKA,Step1Mes2PlcVar.SubArrivedFinish,false); -// logger.info("标签打印Event--- 基板ID: "+subId+", SubArrivedFinish，置为 false 成功, Event1 成功结束"); -// -// }catch (Throwable e){ -// e.printStackTrace(); -// logger.info("标签打印Event--- 出现异常 :"+e.toString()); -// } -// } -// },1,1, TimeUnit.SECONDS); -// -// kukaStep2.scheduleAtFixedRate(new Runnable() { -// @Override -// public void run() { -// try { -// -// //调度开始 -// Integer shelfIsFull = waitingForTarget(Step2Plc2MesVar.ShelfIsFull, true); -// if(shelfIsFull != 1){ -// logger.info("BOXID生成Event-------失败"+" --- "+"MES监听 Step2Plc2MesVar.ShelfIsFull 是否 等于 1 失败"); -// } -// -// //一. 从plc 中获取 subIdList 和 lineNum -// String[] subIdList = (String[])read(S7Client.S7_KUKA,Step2Plc2MesVar.SubIdList); -// Integer listSize = (Integer)read(S7Client.S7_KUKA,Step2Plc2MesVar.PackageNumberSet)-1; -// -// -// //二. MES 业务 -// //=============== MES 业务 开始 ================= -// //1.MES 生成BoxId -// if(subIdList.length<=0){ -// logger.info("BOXID生成Event-------失败"+" --- "+"从plc里面获取到的基板列表 为空"); -// throw new Exception("BOXID生成Event-------kuka机械手 取到了空箱"); -// } -// //真实的基板ID 就是17位的，plc读取过来，有空格，要把后面3位空格去掉就行了。 -// for(int i=0;i alllCamlineSubForImp = service.getAlllCamlineSubForImp(); + public R forImport(@RequestBody WoCompensationPowerDTO dto) throws UnsupportedEncodingException, ParseException { + List alllCamlineSubForImp = service.getAlllCamlineSubForImp(dto.getRemark().split(",")); for(CamlineSubIdForImportDTO cam:alllCamlineSubForImp){ WoPackagingBoxSubstrate woPackagingBoxSubstrate = new WoPackagingBoxSubstrate(); woPackagingBoxSubstrate.setWoSubstrateId(cam.getSubId()); @@ -158,6 +159,15 @@ public class TestController { return R.ok(); } +// @PostMapping("/forImport") +// public R forImport(@RequestBody WoCompensationPowerDTO dto) throws UnsupportedEncodingException, ParseException { +// System.out.println(dto.getRemark()); +// +// List alllCamlineSubForImp = service.getAlllCamlineSubForImp(dto.getRemark().split(",")); +// +// return R.ok().put("data",alllCamlineSubForImp); +// } + @PostMapping("/forTestMix") public R forTestMix() throws UnsupportedEncodingException, ParseException { String[] s = new String[20]; diff --git a/ym-packing/src/main/java/com/cnbm/packing/mapper/CamlineMapper.java b/ym-packing/src/main/java/com/cnbm/packing/mapper/CamlineMapper.java index 5daa7dd..af7fe1a 100644 --- a/ym-packing/src/main/java/com/cnbm/packing/mapper/CamlineMapper.java +++ b/ym-packing/src/main/java/com/cnbm/packing/mapper/CamlineMapper.java @@ -31,5 +31,5 @@ public interface CamlineMapper { CamlineSubIdDTO getSubIdByCamline(@Param("subId") String subId); - List getSubIdByCamlineForImpoet(); + List getSubIdByCamlineForImpoet(@Param("subIds") String[] subIds); } \ No newline at end of file diff --git a/ym-packing/src/main/java/com/cnbm/packing/service/DynamicDataSourceService.java b/ym-packing/src/main/java/com/cnbm/packing/service/DynamicDataSourceService.java index 2117e3a..79749a4 100644 --- a/ym-packing/src/main/java/com/cnbm/packing/service/DynamicDataSourceService.java +++ b/ym-packing/src/main/java/com/cnbm/packing/service/DynamicDataSourceService.java @@ -57,8 +57,8 @@ public class DynamicDataSourceService { @DataSource("camline") @Transactional - public List getAlllCamlineSubForImp(){ - return mapper.getSubIdByCamlineForImpoet(); + public List getAlllCamlineSubForImp(String[] subIds){ + return mapper.getSubIdByCamlineForImpoet(subIds); } } diff --git a/ym-packing/src/main/resources/mapper/CamlineMapper.xml b/ym-packing/src/main/resources/mapper/CamlineMapper.xml index 31de29c..b5e8303 100644 --- a/ym-packing/src/main/resources/mapper/CamlineMapper.xml +++ b/ym-packing/src/main/resources/mapper/CamlineMapper.xml @@ -153,66 +153,25 @@ LEFT JOIN e_tracking_unit tu ON flc.mainid = tu.id LEFT JOIN er_order eo ON tu.ORDER_ID = eo.ID WHERE - tu.NAME IN ( - '30110012303050629', - '30110012302272118', - '30110012303050331', - '30110012303050321', - '30110012303030164', - '30110012303023000', - '30110012303011203', - '30110012303012089', - '30110012303011487', - '30110012302271154', - '30110012302283324', - '30110012303030787', - '30110012303050373', - '30110012303022841', - '30110012303021008', - '30110012303030325', - '30110012302283810', - '30110012303011490', - '30110012303022163', - '30110012303012695', - '30110012303010372', - '30110012303020247', - '30110012303022801', - '30110012303022407', - '30110012303012915', - '30110012303022996', - '30110012303022721', - '30110012303040003', - '30110012303023102', - '30110012302281213', - '30110012303022204', - '30110012302281212', - '30110012303022970', - '30110012303022415', - '30110012303050341', - '30110012303022434', - '30110012302271569', - '30110012303030505', - '30110012303021276', - '30110012302280295', - '30110012303022166', - '30110012303022299', - '30110012303020988', - '30110012302271160', - '30110012302281215', - '30110012303050537', - '30110012302272052', - '30110012303011213', - '30110012303030488', - '30110012303021614', - '30110012303012878', - '30110012302242962', - '30110012303030608', - '30110012303012697', - '30110012303020737' - ) + tu.NAME IN + + #{subId} + and flc.PMPP != 0 GROUP BY tu.`NAME` + + + + + + + + + + + +