|
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
|
|
import com.ruoyi.common.utils.DateUtils;
|
|
import com.ruoyi.common.utils.DateUtils;
|
|
import com.ruoyi.common.utils.StringUtils;
|
|
import com.ruoyi.common.utils.StringUtils;
|
|
import com.ruoyi.common.utils.file.ExcelUtils;
|
|
import com.ruoyi.common.utils.file.ExcelUtils;
|
|
|
|
+import com.ruoyi.common.utils.http.HttpUtils;
|
|
import com.ruoyi.common.utils.poi.ExcelUtil;
|
|
import com.ruoyi.common.utils.poi.ExcelUtil;
|
|
import com.ruoyi.framework.aspectj.lang.annotation.Log;
|
|
import com.ruoyi.framework.aspectj.lang.annotation.Log;
|
|
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
|
|
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.domain.*;
|
|
import com.ruoyi.project.pssr.mapper.TPssrVesselMapper;
|
|
import com.ruoyi.project.pssr.mapper.TPssrVesselMapper;
|
|
import com.ruoyi.project.pssr.service.*;
|
|
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.domain.TSpecdevYlrq;
|
|
import com.ruoyi.project.sems.mapper.TSpecdevYlrqMapper;
|
|
import com.ruoyi.project.sems.mapper.TSpecdevYlrqMapper;
|
|
import com.ruoyi.project.system.domain.SysUser;
|
|
import com.ruoyi.project.system.domain.SysUser;
|
|
@@ -301,8 +303,12 @@ public class TPssrVesselController extends BaseController {
|
|
tSpecdevYlrq.setPlantCode("BCC");
|
|
tSpecdevYlrq.setPlantCode("BCC");
|
|
tSpecdevYlrq.setDevno(unit + "-");
|
|
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(); //当前日期
|
|
Date now = new Date(); //当前日期
|
|
- for (TSpecdevYlrq t : tSpecdevYlrqMapper.selectTSpecdevYlrqListForPssr(tSpecdevYlrq)) {
|
|
|
|
|
|
+ for (TSpecdevYlrq t : ylrqs) {
|
|
|
|
|
|
|
|
|
|
TPssrVessel vessel = new TPssrVessel();
|
|
TPssrVessel vessel = new TPssrVessel();
|