From 1df825000b911e5f7b1ad33fc6d0de95793f071a Mon Sep 17 00:00:00 2001 From: 懒羊羊 <15939171744@163.com> Date: 星期四, 28 三月 2024 16:10:05 +0800 Subject: [PATCH] - --- jcdm-framework/src/main/java/com/jcdm/framework/config/SecurityConfig.java | 2 jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanItemsProject/controller/EmInspectionPlanItemsProjectController.java | 42 ++++++++++++++++++++- jcdm-ui/src/views/main/kb/stationTerminal/index.vue | 16 +++++++ jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java | 1 4 files changed, 57 insertions(+), 4 deletions(-) diff --git a/jcdm-framework/src/main/java/com/jcdm/framework/config/SecurityConfig.java b/jcdm-framework/src/main/java/com/jcdm/framework/config/SecurityConfig.java index 2adc5c6..1d256f7 100644 --- a/jcdm-framework/src/main/java/com/jcdm/framework/config/SecurityConfig.java +++ b/jcdm-framework/src/main/java/com/jcdm/framework/config/SecurityConfig.java @@ -111,7 +111,7 @@ // 杩囨护璇锋眰 .authorizeRequests() // 瀵逛簬鐧诲綍login 娉ㄥ唽register 楠岃瘉鐮乧aptchaImage 鍏佽鍖垮悕璁块棶 - .antMatchers("/login", "/register", "/captchaImage","/websocket/**","/postWebsocket/**","/em/inspectionPlanTask/noPageList","/em/inspectionPlanItemsProject/findPlanItemsProjectByPlanId").permitAll() + .antMatchers("/login", "/register", "/captchaImage","/websocket/**","/postWebsocket/**","/em/inspectionPlanTask/noPageList","/em/inspectionPlanItemsProject/**").permitAll() // 闈欐�佽祫婧愶紝鍙尶鍚嶈闂� .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll() .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll() diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java index 7d6755d..3ab7f5a 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java +++ b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java @@ -222,6 +222,7 @@ //鏇存柊杩囩珯璁板綍琛ㄥ嚭绔欐椂闂� DaPassingStationCollection daPassingStationCollection = new DaPassingStationCollection(); daPassingStationCollection.setWorkOrderNo(daParamCollection.getWorkOrderNo()); + daPassingStationCollection.setLocationCode(daParamCollection.getLocationCode()); List<DaPassingStationCollection> daPassingStationCollections = daPassingStationCollectionMapper.selectDaPassingStationCollectionList(daPassingStationCollection); daPassingStationCollections.get(0).setOutboundTime(new Date()); int i = daPassingStationCollectionMapper.updateDaPassingStationCollection(daPassingStationCollections.get(0)); diff --git a/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanItemsProject/controller/EmInspectionPlanItemsProjectController.java b/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanItemsProject/controller/EmInspectionPlanItemsProjectController.java index 3327804..ecaa8ea 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanItemsProject/controller/EmInspectionPlanItemsProjectController.java +++ b/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanItemsProject/controller/EmInspectionPlanItemsProjectController.java @@ -1,10 +1,16 @@ package com.jcdm.main.em.inspectionPlanItemsProject.controller; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; import javax.servlet.http.HttpServletResponse; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.jcdm.framework.websocket.WebSocketUsers; +import com.jcdm.main.em.inspectionPlanTask.domain.EmInspectionPlanTask; +import com.jcdm.main.em.inspectionPlanTask.service.IEmInspectionPlanTaskService; import org.aspectj.weaver.loadtime.Aj; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; @@ -31,15 +37,47 @@ @Autowired private IEmInspectionPlanItemsProjectService emInspectionPlanItemsProjectService; + @Autowired + private IEmInspectionPlanTaskService emInspectionPlanTaskService; + @GetMapping("/findPlanItemsProjectByPlanId") public AjaxResult list2(EmInspectionPlanItemsProject emInspectionPlanItemsProject) { + EmInspectionPlanTask byId = emInspectionPlanTaskService.getById(emInspectionPlanItemsProject.getPlanTaskId()); + List<EmInspectionPlanItemsProject> planTaskIdList = emInspectionPlanItemsProjectService .list(new LambdaQueryWrapper<EmInspectionPlanItemsProject>() - .eq(EmInspectionPlanItemsProject::getPlanTaskId,emInspectionPlanItemsProject.getPlanTaskId())); - return AjaxResult.success(planTaskIdList); + .eq(EmInspectionPlanItemsProject::getPlanTaskId,emInspectionPlanItemsProject.getPlanTaskId()) + .eq(EmInspectionPlanItemsProject::getItemsType,emInspectionPlanItemsProject.getItemsType())); + + Map<String,Object> resultMap = new HashMap<>(); + resultMap.put("planItemsProject", planTaskIdList); + resultMap.put("planTask",byId); + return AjaxResult.success(resultMap); } + @PostMapping("/updateItemsProjectResults") + public AjaxResult updateItemsProjectResults(@RequestBody EmInspectionPlanItemsProject emInspectionPlanItemsProject) + { + EmInspectionPlanItemsProject itemsProject = emInspectionPlanItemsProjectService.getById(emInspectionPlanItemsProject.getId()); + itemsProject.setResults(emInspectionPlanItemsProject.getResults()); + emInspectionPlanItemsProjectService.saveOrUpdate(itemsProject); + + List<EmInspectionPlanItemsProject> list = emInspectionPlanItemsProjectService.list(new LambdaQueryWrapper<EmInspectionPlanItemsProject>() + .eq(EmInspectionPlanItemsProject::getPlanTaskId, itemsProject.getPlanTaskId())); + + List<String> collect = list.stream().map(EmInspectionPlanItemsProject::getResults).collect(Collectors.toList()); + + if(collect.stream().noneMatch(s -> s.equals("0"))){ + EmInspectionPlanTask planTaskById = emInspectionPlanTaskService.getById(itemsProject.getPlanTaskId()); + planTaskById.setResults("1"); + emInspectionPlanTaskService.saveOrUpdate(planTaskById); + } + return AjaxResult.success(); + } + + + /** * 鏌ヨ鐐规浠诲姟-椤圭洰鍒楄〃 */ diff --git a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue index baaef08..2ddddc1 100644 --- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue +++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue @@ -360,7 +360,7 @@ }, content: '', activeName: 'first', - url: "ws://192.168.10.21:8080/websocket/message/", + url: "ws://192.168.10.198:8080/websocket/message/", message: "", text_content: "", ws: null, @@ -499,7 +499,15 @@ this.formulaChildList = response.rows; }); }, + endClear(){ + this.cakeLamp.InPlace= 0 //宸ヤ欢鍒颁綅 + this.cakeLamp.scanFinish= 0 + this.cakeLamp.startWork= 0 + this.cakeLamp.release= 0 //鍏佽鏀捐 + this.formulaChildList = [] + this.headContent.sfcCode = null + }, changeMenu(tab, event) { console.log(tab, event); }, @@ -562,6 +570,7 @@ alert("鏈繛鎺ュ埌鏈嶅姟鍣�"); } }, + initStation: async function () { await getIpv4().then(response => { this.StationConfQueryParams.ipAddress = response.msg @@ -603,6 +612,7 @@ } saveCampaignTimeParameters(param).then(response => {}); self.cakeLamp.release = 1; + self.endClear() } else if (event.data.includes("[")) { let formulaChilds = ""; @@ -635,6 +645,8 @@ }; }, + + //鎺ュ彈鏁版嵁鐨勫洖璋� callBack(value) { if (this.form1.isShowHistory) this.form1.desc = this.readLi().join(""); @@ -643,9 +655,11 @@ console.log("涓插彛鏀跺埌鏁版嵁-------------------"+scanValue) // if(this.cakeLamp.InPlace=== 1){ if(this.headContent.sfcCode !== ''){ + this.$message('鎵弿鐗╂枡缂栫爜'+scanValue); console.log(scanValue) this.serialPortMethod(scanValue) }else { + this.$message('鎵爜璇嗗埆浜у搧搴忓垪鍙�'+scanValue); this.headContent.sfcCode = scanValue; this.queryParams.productNum = scanValue; this.getList() -- Gitblit v1.9.3