From d67ee0b13feffab2ae4600d0b8181cee91ace0a1 Mon Sep 17 00:00:00 2001 From: 18616268358 <1440265357@qq.com> Date: Tue, 16 May 2023 18:10:14 +0800 Subject: [PATCH] =?UTF-8?q?#20230510=20=E6=AC=A3=E5=BD=B1=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=B9=B3=E5=8F=B0=E8=A3=85=E7=BD=AE=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SystemConfigController.java | 5 +++-- .../xymanager_common/constant/Constants.java | 2 +- .../TerminalScheduleRuleTimeListModel.java | 2 +- .../impl/SystemConfigServiceImpl.java | 21 +++++++++---------- .../impl/TerminalPhotoServiceImpl.java | 5 +++-- .../service/SystemConfigService.java | 3 ++- 6 files changed, 20 insertions(+), 18 deletions(-) diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/SystemConfigController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/SystemConfigController.java index 4d7c570..050f552 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/SystemConfigController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/SystemConfigController.java @@ -5,6 +5,7 @@ import com.shxy.xymanager_common.base.BaseController; import com.shxy.xymanager_common.base.ResponseReult; import com.shxy.xymanager_common.bean.ServiceBody; import com.shxy.xymanager_common.bean.ServiceStatus; +import com.shxy.xymanager_common.model.CmaBackModel; import com.shxy.xymanager_common.model.SystemConfigModel; import com.shxy.xymanager_common.model.UpperComputerInfoModel; import com.shxy.xymanager_common.vo.SystemConfigReqVo; @@ -36,8 +37,8 @@ public class SystemConfigController extends BaseController { @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) @RequestMapping("/getSystemConfigGet") @Log(title = "获取全局配置触发接口", type = "查询") - public ResponseReult getSystemConfigGet(@RequestParam("id") String id) { - ServiceBody serviceBody = configService.getSystemConfig(id); + public ResponseReult getSystemConfigGet(@RequestParam("id") String id) { + ServiceBody serviceBody = configService.getSystemConfig(id); if (serviceBody.getCode() == ServiceStatus.SUCCESS) { return ResponseReult.success(serviceBody.getData()); } else { diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/constant/Constants.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/constant/Constants.java index 87abb0b..4af62ee 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/constant/Constants.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/constant/Constants.java @@ -164,5 +164,5 @@ public class Constants /** * 调用JNI自增ID */ - public static AtomicInteger REQUEST_ID = new AtomicInteger(1); + public static AtomicInteger REQUEST_ID = new AtomicInteger((int) (System.currentTimeMillis()/1000)); } \ No newline at end of file diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalScheduleRuleTimeListModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalScheduleRuleTimeListModel.java index e073399..c8d0088 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalScheduleRuleTimeListModel.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalScheduleRuleTimeListModel.java @@ -20,6 +20,6 @@ public class TerminalScheduleRuleTimeListModel implements Serializable { @ApiModelProperty(value = "是否最新", example = "123456") - private Boolean isNew; + private Boolean isNew = false; } diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/SystemConfigServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/SystemConfigServiceImpl.java index f6b9727..28eb4ab 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/SystemConfigServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/SystemConfigServiceImpl.java @@ -7,6 +7,7 @@ import com.shxy.xymanager_common.dto.PhotoParamsDto; import com.shxy.xymanager_common.dto.UpperComputerInfoDto; import com.shxy.xymanager_common.entity.TerminalParams; import com.shxy.xymanager_common.exception.Asserts; +import com.shxy.xymanager_common.model.CmaBackModel; import com.shxy.xymanager_common.model.SystemConfigModel; import com.shxy.xymanager_common.model.TerminalPhotosParamsModel; import com.shxy.xymanager_common.model.UpperComputerInfoModel; @@ -39,16 +40,18 @@ public class SystemConfigServiceImpl implements SystemConfigService { @Override - public ServiceBody getSystemConfig(String cmdId) { + public ServiceBody getSystemConfig(String cmdId) { /* SystemConfigModel model = new SystemConfigModel(); Integer beatHeartTime = systemConfigDao.getTerminalParams(id); model.setHeartBeatTime(beatHeartTime); String globalTime = systemConfigDao.getGlobalTime(Constants.GLOBAL_TIME); model.setGlobalTime(Integer.parseInt(globalTime));*/ + CmaBackModel model = new CmaBackModel(); String cmd = "/usr/local/bin/xympadmn --server=127.0.0.1 --port=6891 --clientid=10 --act=sampling --flag=0 --cmdid="+cmdId+ "\t"+"--reqid="+Constants.REQUEST_ID; ProcessExecUtils.exec(cmd); + model.setRequestId(Integer.parseInt(Constants.REQUEST_ID.toString())); Constants.REQUEST_ID.addAndGet(1); - return Asserts.success(Integer.parseInt(Constants.REQUEST_ID.toString())); + return Asserts.success(model); } @Override @@ -59,20 +62,16 @@ public class SystemConfigServiceImpl implements SystemConfigService { systemConfigDao.updateSystemConfig(param); String cmd = "/usr/local/bin/xympadmn --server=127.0.0.1 --port=6891 --act=sampling --cmdid="+vo.getCmdId()+ "\t"+ "--heartbeat=" + vo.getHeartBeatTime(); - Integer retCode = ProcessExecUtils.exec(cmd); - if(retCode==0){ - return Asserts.success("修改成功"); - } - return Asserts.error("修改失败"); + ProcessExecUtils.exec(cmd); + return Asserts.success("修改成功"); } @Override public ServiceBody getSystemConfigDetail(SystemConfigReqVo vo) { - String result = terminalPhotoDao.getRequestResult(5);//待修改 + String result = terminalPhotoDao.getRequestResult(vo.getRequestId());//待修改 SystemConfigModel model = new SystemConfigModel(); if(StringUtils.isNotBlank(result)) { - JSONObject resultObj = JSONObject.parseObject(result); - model = JSONObject.parseObject(resultObj.get("groupData").toString(), SystemConfigModel.class); + model = JSONObject.parseObject(result, SystemConfigModel.class); }else{ Integer beatHeartTime = systemConfigDao.getTerminalParams(Constants.GLOBAL_TIME); model.setHeartBeatTime(beatHeartTime); @@ -92,7 +91,7 @@ public class SystemConfigServiceImpl implements SystemConfigService { @Override public ServiceBody getUpperComputerInfo(TerminalUpperComputerVo vo) { - String result = terminalPhotoDao.getRequestResult(5);//待修改 + String result = terminalPhotoDao.getRequestResult(vo.getRequestId());//待修改 UpperComputerInfoModel model = new UpperComputerInfoModel(); if(StringUtils.isNotBlank(result)) { model = JSONObject.parseObject(result, UpperComputerInfoModel.class); diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java index ced4168..b9c5a19 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java @@ -399,7 +399,8 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService { TerminalStatusGetModel model = new TerminalStatusGetModel(); String cmd = "/usr/local/bin/xympadmn --server=127.0.0.1 --port=6891 --act=imgparams --cmdid="+vo.getCmdId() +"\t" +"--clientid=10 --reqid="+Constants.REQUEST_ID+"\t" +"--flag=0 --rf=7 --channel=" + vo.getChannelId(); ProcessExecUtils.exec(cmd); - model.setRequestId(Constants.REQUEST_ID.addAndGet(1)); + model.setRequestId(Integer.parseInt(Constants.REQUEST_ID.toString())); + Constants.REQUEST_ID.addAndGet(1); /* TerminalPhotosParamsModel model = new TerminalPhotosParamsModel(); PhotoParamsDto dto= terminalPhotoDao.selectPhotoParams(termId); if(dto!=null) { @@ -418,7 +419,7 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService { @Override public ServiceBody getLastedPhotoQueryParam(ReturnedPhotoParamsVo vo) { - String result = terminalPhotoDao.getRequestResult(vo.getRequestId());//待修改 + String result = terminalPhotoDao.getRequestResult(vo.getRequestId()); TerminalPhotosParamsModel model = new TerminalPhotosParamsModel(); if (StringUtils.isNotBlank(result)) { model = JSONObject.parseObject(result, TerminalPhotosParamsModel.class); diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/SystemConfigService.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/SystemConfigService.java index 718d58b..5472a5d 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/SystemConfigService.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/SystemConfigService.java @@ -1,6 +1,7 @@ package com.shxy.xymanager_service.service; import com.shxy.xymanager_common.bean.ServiceBody; +import com.shxy.xymanager_common.model.CmaBackModel; import com.shxy.xymanager_common.model.SystemConfigModel; import com.shxy.xymanager_common.model.UpperComputerInfoModel; import com.shxy.xymanager_common.vo.SystemConfigReqVo; @@ -20,7 +21,7 @@ public interface SystemConfigService { * * @return */ - ServiceBody getSystemConfig(String id); + ServiceBody getSystemConfig(String id); /**