diff --git a/aucma-admin/src/main/java/com/aucma/web/controller/system/SysLoginController.java b/aucma-admin/src/main/java/com/aucma/web/controller/system/SysLoginController.java index 4cc90bd..628dca9 100644 --- a/aucma-admin/src/main/java/com/aucma/web/controller/system/SysLoginController.java +++ b/aucma-admin/src/main/java/com/aucma/web/controller/system/SysLoginController.java @@ -95,10 +95,13 @@ public class SysLoginController ajax.put("factoryName", "河南民权工厂"); List postList = postService.selectPostListByUserId(user.getUserId()); ajax.put("postList", postList); - if (postList.contains(9L)){ + if (postList.contains(121L)){ + //操作工返修措施权限 + ajax.put("userPermission", 0); + } else if (postList.contains(9L)) { //超级返修措施权限 ajax.put("userPermission", 2); - }else { + } else { //普通返修措施权限 ajax.put("userPermission", 1); } diff --git a/aucma-admin/src/main/resources/application-dev.yml b/aucma-admin/src/main/resources/application-dev.yml index e98e875..c4e413e 100644 --- a/aucma-admin/src/main/resources/application-dev.yml +++ b/aucma-admin/src/main/resources/application-dev.yml @@ -39,7 +39,7 @@ spring: enabled: true # redis 配置 redis: - host: 175.27.215.92 + host: 1.13.177.47 # 端口，默认为6379 port: 6379 # 数据库索引 @@ -65,7 +65,7 @@ spring: druid: # 主库数据源 master: - url: jdbc:oracle:thin:@10.100.72.20:1521/ORCLCDB + url: jdbc:oracle:thin:@28.tcp.cpolar.top:10884/ORCLCDB username: c##aucma_mes password: aucma # 从库数据源 diff --git a/aucma-admin/src/main/resources/application-local.yml b/aucma-admin/src/main/resources/application-local.yml index 80ffc97..3de1854 100644 --- a/aucma-admin/src/main/resources/application-local.yml +++ b/aucma-admin/src/main/resources/application-local.yml @@ -1,7 +1,7 @@ # 开发环境配置 server: # 服务器的HTTP端口，默认为8080 - port: 8080 + port: 6061 servlet: # 应用的访问路径 context-path: / @@ -19,8 +19,8 @@ server: # SAP接口 sap: # URL前缀 - prefix: 10.11.43.111:81 -# prefix: http://soaqas.aucma.com:8011 +# prefix: 10.11.43.111:81 + prefix: http://soaqas.aucma.com:8011 username: mes05 password: Abcd1234 @@ -41,7 +41,7 @@ spring: # redis 配置 redis: # 地址 - host: 175.27.215.92 + host: 1.13.177.47 # 端口，默认为6379 port: 6379 # 数据库索引 @@ -66,16 +66,16 @@ spring: druid: # 主库数据源 master: - url: jdbc:oracle:thin:@175.27.215.92:1521/helowin + url: jdbc:oracle:thin:@1.13.177.47:1521/helowin # url: jdbc:oracle:thin:@192.168.80.10:1521/orcl - username: aucma_mes + username: c##aucma_mes password: aucma # 从库数据源 slave: # 从数据源开关/默认关闭 enabled: true - url: jdbc:oracle:thin:@175.27.215.92:1521/helowin - username: aucma_scada + url: jdbc:oracle:thin:@1.13.177.47:1521/helowin + username: c##aucma_scada password: aucma # 初始连接数 initialSize: 5 diff --git a/aucma-admin/src/main/resources/application.yml b/aucma-admin/src/main/resources/application.yml index 09ac8c6..33a15d7 100644 --- a/aucma-admin/src/main/resources/application.yml +++ b/aucma-admin/src/main/resources/application.yml @@ -13,7 +13,7 @@ ruoyi: # 获取ip地址开关 addressEnabled: false # 验证码类型 math 数字计算 char 字符验证 - captchaType: math + captchaType: char # Spring配置 spring: @@ -24,8 +24,8 @@ spring: # 运行环境 profiles: # active: local - active: dev -# active: prod +# active: dev + active: prod # 日志配置 diff --git a/aucma-api/src/main/java/com/aucma/api/controller/PdaApiController.java b/aucma-api/src/main/java/com/aucma/api/controller/PdaApiController.java index c8e72c0..75bb52b 100644 --- a/aucma-api/src/main/java/com/aucma/api/controller/PdaApiController.java +++ b/aucma-api/src/main/java/com/aucma/api/controller/PdaApiController.java @@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; import java.util.List; +import java.util.concurrent.CompletableFuture; import static com.aucma.common.core.domain.AjaxResult.error; import static com.aucma.common.core.domain.AjaxResult.success; @@ -98,32 +99,33 @@ public class PdaApiController { @PostMapping("/check/query") public AjaxResult checkQuery(String code, String station) { long begin = System.currentTimeMillis(); - logger.info("质量检测checkQuery1:" + code + "工位： " + station); String boxName = service.selectBoxNameByCode(code); if (boxName == null) { - // boxName = "固定数据"; return error("条码信息扫描错误！"); } + long one = System.currentTimeMillis(); //检验前一工位是否已完成质检 - logger.info("质量检测checkQuery2:" + code + "工位："+ station); + long two = 0; + long three = 0; if (StringUtils.isNotEmpty(station)) { //箱体发泡检验01工位、二线箱体预装检验工位 对 壳胆绑定进行验证 + two = System.currentTimeMillis(); if (station.equals("2003") || station.equals("2018") || station.equals("2103") || station.equals("2104")) { String result = service.checkShellBinding(code, station); - logger.info("质量检测checkQuery3:" + code + "工位：" + station); if (StringUtils.isNotNull(result)) { return error(result); } } String result = qualityService.checkBeforeStationInspection(code, station); - logger.info("质量检测checkQuery4:" + code + "工位：" + station); + three = System.currentTimeMillis(); if (StringUtils.isNotNull(result)) { return error(result); } } List list = service.checkSelectRepairInfo(code); long end = System.currentTimeMillis(); - logger.info("质量检测checkQuery5:" + code + "运行时间：" + (end - begin) + "工位：" + station); + logger.info("质量检测checkQuery:" + code + "|总运行时间：" + (end - begin) + "|工位：" + station + + "|one:" + (one - begin) + "|two:" + (two - one) + "|three:" + (three - two) + "|three:" + (end - three)); return success(boxName, list); } @@ -134,13 +136,13 @@ public class PdaApiController { long begin = System.currentTimeMillis(); List list = checkInfo.getList(); int size = (list == null || list.isEmpty()) ? 1 : list.size(); - logger.info("质检提交checkSubmit1:" + checkInfo.getCode() + "工位：" + checkInfo.getStationCode()); +// logger.info("质检提交checkSubmit1:" + checkInfo.getCode() + "工位：" + checkInfo.getStationCode()); for (int i = 0; i < size; i++) { ReportQualityInspection inspection = new ReportQualityInspection(); inspection.setBarCode(checkInfo.getCode()); String boxName = service.selectBoxNameBarCode(checkInfo.getCode()); - logger.info("质检提交checkSubmit2:" + checkInfo.getCode() + "工位：" + checkInfo.getStationCode()); +// logger.info("质检提交checkSubmit2:" + checkInfo.getCode() + "工位：" + checkInfo.getStationCode()); inspection.setMaterialName(boxName); String measure = checkInfo.getMeasure(); @@ -149,7 +151,6 @@ public class PdaApiController { inspection.setIsFlag(1L); } //检测人 -// inspection.setInspectorCode(checkInfo.getUserName()); inspection.setInspectorCode(SecurityUtils.getUsername()); inspection.setInspectorTime(new Date()); inspection.setStationCode(checkInfo.getStationCode()); @@ -160,35 +161,41 @@ public class PdaApiController { BaseProcessStation processStation = new BaseProcessStation(); processStation.setParentId(checkInfo.getStationCode()); List processStations = baseProcessStationService.selectBaseProcessStationList(processStation); - logger.info("质检提交checkSubmit3:" + checkInfo.getCode() + "工位：" + checkInfo.getStationCode()); +// logger.info("质检提交checkSubmit3:" + checkInfo.getCode() + "工位：" + checkInfo.getStationCode()); inspection.setProcessCode(processStations.get(0).getProcessCode()); inspection.setProductLineName(processStations.get(0).getProductLineCode()); } catch (Exception e) { - e.printStackTrace(); + logger.info("质检提交查质检工序checkSubmitException:{}|工位：{}|{}", checkInfo.getCode(), checkInfo.getStationCode(), e.getMessage()); } - assert list != null; - if (!list.isEmpty()) { - CheckInfoDto.DefectBeen defectBeen = list.get(i); - inspection.setSubmitQualtyId(defectBeen.getObjId()); - inspection.setTestItemCode(list.get(i).getStationCode()); - inspection.setQualityDefectCode(list.get(i).getQualityDefectCode()); - inspection.setQualityDefectName(list.get(i).getQualityDefectName()); - } - qualityService.insertReportQualityInspection(inspection); - logger.info("质检提交checkSubmit4:" + checkInfo.getCode() + "工位：" + checkInfo.getStationCode()); - //质检处理措施（3=合格,1=返修） - if (inspection.getTreatmentMeasure().equals("3")) { - try { - completionService.inspectionProcessing(inspection); - logger.info("质检提交checkSubmit5:" + checkInfo.getCode() + "工位：" + checkInfo.getStationCode()); - } catch (Exception e) { - e.printStackTrace(); + int finalI = i; + CompletableFuture.runAsync(() -> { + assert list != null; + if (!list.isEmpty()) { + CheckInfoDto.DefectBeen defectBeen = list.get(finalI); + inspection.setSubmitQualtyId(defectBeen.getObjId()); + inspection.setTestItemCode(list.get(finalI).getStationCode()); + inspection.setQualityDefectCode(list.get(finalI).getQualityDefectCode()); + inspection.setQualityDefectName(list.get(finalI).getQualityDefectName()); } - } + qualityService.insertReportQualityInspection(inspection); +// logger.info("质检提交checkSubmit4:" + checkInfo.getCode() + "工位：" + checkInfo.getStationCode()); + //质检处理措施（3=合格,1=返修） + if (inspection.getTreatmentMeasure().equals("3")) { + try { + completionService.inspectionProcessing(inspection); +// logger.info("质检提交checkSubmit5:" + checkInfo.getCode() + "工位：" + checkInfo.getStationCode()); + } catch (Exception e) { + logger.info("质检提交checkSubmitException:{}|工位：{}|{}", checkInfo.getCode(), checkInfo.getStationCode(), e.getMessage()); + } + } + }); } long end = System.currentTimeMillis(); - logger.info("质量检测checkQuery6:" + checkInfo.getCode() + "运行时间："+ (end - begin) + "工位：" + checkInfo.getStationCode()); + CompletableFuture.runAsync(() -> { + logger.info("质检提交checkSubmit:" + checkInfo.getCode() + + "|运行时间：" + (end - begin) + "|工位：" + checkInfo.getStationCode()); + }); return success(); } diff --git a/aucma-report/src/main/java/com/aucma/report/service/impl/QualityReportServiceImpl.java b/aucma-report/src/main/java/com/aucma/report/service/impl/QualityReportServiceImpl.java index 2824ed9..2b8e026 100644 --- a/aucma-report/src/main/java/com/aucma/report/service/impl/QualityReportServiceImpl.java +++ b/aucma-report/src/main/java/com/aucma/report/service/impl/QualityReportServiceImpl.java @@ -177,8 +177,8 @@ public class QualityReportServiceImpl implements IQualityReportService { } } } else { - String[] stationCodeLists = {"null"}; - hashMap.put("stationCodeList", stationCodeLists); +// String[] stationCodeLists = {"null"}; +// hashMap.put("stationCodeList", stationCodeLists); } //日 diff --git a/aucma-report/src/main/resources/mapper/report/ReportQualityInspectionMapper.xml b/aucma-report/src/main/resources/mapper/report/ReportQualityInspectionMapper.xml index c6bdca4..d991d44 100644 --- a/aucma-report/src/main/resources/mapper/report/ReportQualityInspectionMapper.xml +++ b/aucma-report/src/main/resources/mapper/report/ReportQualityInspectionMapper.xml @@ -92,7 +92,7 @@ and rqi.updated_by = #{updatedBy} and rqi.updated_time = #{updatedTime} - AND TO_CHAR(rqi.inspector_time, 'YYYY-MM-DD HH24:MI:SS') BETWEEN #{beginBeginTime} AND #{endBeginTime} + AND rqi.inspector_time BETWEEN TO_DATE(#{beginBeginTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endBeginTime}, 'YYYY-MM-DD HH24:MI:SS') order by rqi.inspector_time desc