Преглед на файлове

pssr同步压力容器压力管道

jiangbiao преди 1 месец
родител
ревизия
9e19827947

+ 9 - 1
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPipeController.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
+import com.ruoyi.common.utils.http.HttpUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
@@ -130,15 +131,22 @@ public class TPssrPipeController extends BaseController {
         if (StringUtils.isNotEmpty(subcontent.getUnit())) {
             for (String unit : subcontent.getUnit().split(",")) {
                 TSpecdevYlgd tSpecdevYlgd = new TSpecdevYlgd();
+                String param = null;
                 if (unit.equals("610")) {
                     tSpecdevYlgd.setPlantCode("BCC");
                     tSpecdevYlgd.setUnit("SCTU");
+                    param = "unit="+tSpecdevYlgd.getUnit();
                 }else {
                     tSpecdevYlgd.setPlantCode("BCC");
                     tSpecdevYlgd.setDevno("-" + unit);
+                    param = "devNo="+tSpecdevYlgd.getDevno();
                 }
                 Date now = new Date(); //当前日期
-                for (TSpecdevYlgd t : tSpecdevYlgdMapper.selectTSpecdevYlgdListForPssr(tSpecdevYlgd)) {
+                // 通过http访问sems接口
+                String requertJson = HttpUtils.sendGet("http://127.0.0.1:8091/sems/specYlgd/syncPssrYlgd", "plantCode=" + tSpecdevYlgd.getPlantCode() + "&" + param);
+                List<TSpecdevYlgd> ylgds = JSON.parseArray(requertJson, TSpecdevYlgd.class);
+//                List<TSpecdevYlgd> ylgds = tSpecdevYlgdMapper.selectTSpecdevYlgdListForPssr(tSpecdevYlgd);
+                for (TSpecdevYlgd t : ylgds) {
 
                     TPssrPipe pipe = new TPssrPipe();
                     pipe.setWarnFlag(0l);

+ 7 - 1
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrVesselController.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
+import com.ruoyi.common.utils.http.HttpUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
@@ -14,6 +15,7 @@ import com.ruoyi.project.listener.pssr.ConfirmTaskCreateListener;
 import com.ruoyi.project.pssr.domain.*;
 import com.ruoyi.project.pssr.mapper.TPssrVesselMapper;
 import com.ruoyi.project.pssr.service.*;
+import com.ruoyi.project.sems.domain.TSpecdevYlgd;
 import com.ruoyi.project.sems.domain.TSpecdevYlrq;
 import com.ruoyi.project.sems.mapper.TSpecdevYlrqMapper;
 import com.ruoyi.project.system.domain.SysUser;
@@ -301,8 +303,12 @@ public class TPssrVesselController extends BaseController {
                 tSpecdevYlrq.setPlantCode("BCC");
                 tSpecdevYlrq.setDevno(unit + "-");
 
+                // 通过http访问sems接口
+                String requertJson = HttpUtils.sendGet("http://127.0.0.1:8091/sems/specYlrq/syncPssrYlrq", "plantCode=" + tSpecdevYlrq.getPlantCode() + "&devNo=" + tSpecdevYlrq.getDevno());
+                List<TSpecdevYlrq> ylrqs = JSON.parseArray(requertJson, TSpecdevYlrq.class);
+//                tSpecdevYlrqMapper.selectTSpecdevYlrqListForPssr(tSpecdevYlrq)
                 Date now = new Date(); //当前日期
-                for (TSpecdevYlrq t : tSpecdevYlrqMapper.selectTSpecdevYlrqListForPssr(tSpecdevYlrq)) {
+                for (TSpecdevYlrq t : ylrqs) {
 
 
                     TPssrVessel vessel = new TPssrVessel();