From 7ac684ac8fd23d1688830c8be3de13c244f9cd03 Mon Sep 17 00:00:00 2001 From: chengqf <584883665@139.com> Date: Thu, 13 Apr 2023 15:51:15 +0800 Subject: [PATCH 1/3] updateTime --- .../java/com/glxp/api/idc/service/impl/IdcServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java b/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java index 4a924756..ec520942 100644 --- a/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java +++ b/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java @@ -255,7 +255,7 @@ public class IdcServiceImpl implements IdcService { try { String[] tnames = t.split("/"); - String lastUpdateTime = getUpdateTime(tnames[2] + "." + tnames[0]); + String lastUpdateTime = getUpdateTime(tnames[2] + "." + tnames[0]+"."+tnames[1]); Date nowUpdateTime = new Date(); // if (!StringUtils.isEmpty(tnames[0])) { @@ -301,7 +301,7 @@ public class IdcServiceImpl implements IdcService { if (sync) { result = syncMasterData(map, isUpload, syncIp); if (result) { - setUpdateTime(tnames[2] + "." + tnames[0], DateUtil.formatDate(nowUpdateTime, "yyyy-MM-dd HH:mm:ss")); + setUpdateTime(tnames[2] + "." + tnames[0]+"."+tnames[1], DateUtil.formatDate(nowUpdateTime, "yyyy-MM-dd HH:mm:ss")); } } //} From 7ec318795737a4abe73c3a4ec3f2685d89e88b99 Mon Sep 17 00:00:00 2001 From: chengqf <584883665@139.com> Date: Thu, 13 Apr 2023 15:52:05 +0800 Subject: [PATCH 2/3] connect check --- .../api/idc/controller/ConnectController.java | 35 ++++++++ .../glxp/api/idc/service/ConnectService.java | 12 +++ .../idc/service/impl/ConnectServiceImpl.java | 81 +++++++++++++++++++ 3 files changed, 128 insertions(+) create mode 100644 src/main/java/com/glxp/api/idc/controller/ConnectController.java create mode 100644 src/main/java/com/glxp/api/idc/service/ConnectService.java create mode 100644 src/main/java/com/glxp/api/idc/service/impl/ConnectServiceImpl.java diff --git a/src/main/java/com/glxp/api/idc/controller/ConnectController.java b/src/main/java/com/glxp/api/idc/controller/ConnectController.java new file mode 100644 index 00000000..434eb64d --- /dev/null +++ b/src/main/java/com/glxp/api/idc/controller/ConnectController.java @@ -0,0 +1,35 @@ +package com.glxp.api.idc.controller; + +import java.util.Map; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; + +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.idc.service.ConnectService; + + + + +/** + * 中继服务接口 + */ + +@RestController +public class ConnectController { + @Resource + ConnectService connectService; + + @RequestMapping(value = "/spssync/common/connect") + @ResponseBody + public BaseResponse connect(HttpServletRequest request, @RequestBody Map params) { + + return connectService.connectStatus(request,params); + } + +} diff --git a/src/main/java/com/glxp/api/idc/service/ConnectService.java b/src/main/java/com/glxp/api/idc/service/ConnectService.java new file mode 100644 index 00000000..0b6f402c --- /dev/null +++ b/src/main/java/com/glxp/api/idc/service/ConnectService.java @@ -0,0 +1,12 @@ +package com.glxp.api.idc.service; + +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; + +import com.glxp.api.common.res.BaseResponse; + +/*连通状态服务*/ +public interface ConnectService { + BaseResponse connectStatus(HttpServletRequest request,Map params); +} diff --git a/src/main/java/com/glxp/api/idc/service/impl/ConnectServiceImpl.java b/src/main/java/com/glxp/api/idc/service/impl/ConnectServiceImpl.java new file mode 100644 index 00000000..7b919cf4 --- /dev/null +++ b/src/main/java/com/glxp/api/idc/service/impl/ConnectServiceImpl.java @@ -0,0 +1,81 @@ +package com.glxp.api.idc.service.impl; + +import java.util.HashMap; +import java.util.Map; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; + +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.dao.idc.DbDao; +import com.glxp.api.idc.service.ConnectService; +import com.glxp.api.idc.utils.IDCUtils; + + +/*连通检测*/ +@Service +public class ConnectServiceImpl implements ConnectService { + private static final Logger logger = LoggerFactory.getLogger(IdcServiceImpl.class); + @Resource + private DbDao dbDao; + private static String NUM_STRS = "⊙①②③④⑤⑥⑦⑧⑨⑩⑪⑫⑬⑭⑮⑯"; + //⊙①②③④⑤⑥⑦⑧⑨⑩→⊗ + @Override + public BaseResponse connectStatus(HttpServletRequest request,Map params) { + int level = 0; + if(params.get("level")!=null) { + level = Integer.valueOf(params.get("level").toString()); + } else if(params.get("data")!=null) { + Map data = JSONObject.parseObject(JSON.toJSONString(params.get("data")), Map.class); + if(data.get("level")!=null) { + level = Integer.valueOf(data.get("level").toString()); + } + } + level++; + Map map = new HashMap(); + map.put("level", level); + Map config = new HashMap<>(); + try + { + if(level==0) { + config = dbDao.get("select syncIp as paramValue from sync_data_set limit 1"); + } else { + config = dbDao.get("select * from system_param_config where paramKey='upper_server_ip'"); + } + } catch (Exception ex) { + + } + String msg = "UDI管理系统"; + for(int i=1;i Date: Thu, 13 Apr 2023 15:53:58 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=20=E5=AE=A1=E6=A0=B8=E9=80=81=E8=B4=A7?= =?UTF-8?q?=E5=8D=95=20=E5=A2=9E=E5=8A=A0=E6=A0=B8=E5=AF=B9=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/glxp/api/res/inout/IoOrderResponse.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java index 940b6d74..cf0c2b33 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java @@ -96,6 +96,11 @@ public class IoOrderResponse { */ private Date updateTime; + /** + * 核对时间 + */ + private Date checkTime; + /** * 验收人 */