定时任务下发返回体修改

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalScheduleRuleController.java

@@ -97,8 +97,8 @@ public class TerminalScheduleRuleController extends BaseController {
     @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
     @RequestMapping("/relateSchelduleRule")
     @Log(title = "关联任务规则", type = "修改")
-    public ResponseReult<GetListModel> relateSchelduleRule(@RequestBody @Validated RelateTerminalListRuleIdVo vo) {
+    public ResponseReult<GetScheduleRequestIdListModel> relateSchelduleRule(@RequestBody @Validated RelateTerminalListRuleIdVo vo) {
-        ServiceBody<GetListModel> serviceBody = terminalScheduleRuleService.relateSchelduleRule(vo);
+        ServiceBody<GetScheduleRequestIdListModel> serviceBody = terminalScheduleRuleService.relateSchelduleRule(vo);
         if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
             return ResponseReult.success(serviceBody.getData());
         } else {

xymanager_common/src/main/java/com/shxy/xymanager_common/model/GetScheduleRequestIdListModel.java

@@ -0,0 +1,34 @@
+package com.shxy.xymanager_common.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 装置下发request列表
+ */
+@Data
+@ApiModel(value = "装置下发request列表", description = "触发查询信息列表")
+public class GetScheduleRequestIdListModel implements Serializable {
+
+    @ApiModelProperty(value = "request返回", example = "123456")
+    private List<RequestBean> list;
+
+    @Data
+    public static class RequestBean {
+
+        @ApiModelProperty(value = "装置编号", example = "123456")
+        private Integer termid;
+
+        @ApiModelProperty(value = "通道编号", example = "AAAA")
+        private Integer channelid;
+
+        @ApiModelProperty(value = "请求编号", example = "AAAA")
+        private Integer requestid;
+
+    }
+
+}

xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/RequestResultsDao.java

@@ -13,7 +13,7 @@ public interface RequestResultsDao {
 
     List<RequestResults> selectByRequestIdList(@Param("list") List<Integer> id);
 
-    List<RequestResults> selectByTypeAndStatus(@Param("requesttype") Integer requesttype, @Param("clientid") Integer clientid, @Param("schedulestatus") Integer status);
+    List<RequestResults> selectByTypeAndStatus(@Param("requesttype") Integer requesttype, @Param("clientid") Integer clientid, @Param("result") Integer result, @Param("schedulestatus") Integer status);
 
     int updateByPrimaryKeySelective(RequestResults record);
 

xymanager_dao/src/main/resources/mappers/RequestResultsDao.xml

@@ -38,6 +38,7 @@
         from request_results
         where request_type = #{requesttype}
         and client_id = #{clientid}
+        and result = #{result}
         and request_schedule_status = #{schedulestatus}
     </select>
 

xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalScheduleRuleServiceImpl.java

@@ -227,8 +227,8 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ
      */
     @Override
     @Transactional
-    public ServiceBody<GetListModel> relateSchelduleRule(RelateTerminalListRuleIdVo vo) {
+    public ServiceBody<GetScheduleRequestIdListModel> relateSchelduleRule(RelateTerminalListRuleIdVo vo) {
-        GetListModel model = new GetListModel();
+        GetScheduleRequestIdListModel model = new GetScheduleRequestIdListModel();
         List<TerminalSchedulesTemp> list = terminalSchedulesTempDao.selectByTermAndChannel(vo.getList(), CommonStatus.DELETE.value());
         if (CollectionUtil.isNotEmpty(list)) {
 
@@ -272,7 +272,7 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ
             timestr.append(string);
         }
 
-        ArrayList<Integer> requestIdList = new ArrayList<>();
+        ArrayList<GetScheduleRequestIdListModel.RequestBean> requestIdList = new ArrayList<>();
         for (int x = 0; x < terminalsList.size(); x++) {
             ChannelAndTermDto channelAndTermDto = terminalsList.get(x);
             String cmd = Constants.CMD + "schedule --flag=1 --cmdid=" + channelAndTermDto.getCmdid() + "\t" + "--channel=" + channelAndTermDto.getChannelid() + "\t" +
@@ -280,7 +280,13 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ
 //            ProcessExecUtils.exec(cmd);
             int requestId = Integer.parseInt(Constants.REQUEST_ID.toString());
             Constants.REQUEST_ID.addAndGet(1);
-            requestIdList.add(requestId);
+
+            GetScheduleRequestIdListModel.RequestBean requestBean = new GetScheduleRequestIdListModel.RequestBean();
+            requestBean.setTermid(channelAndTermDto.getTermid());
+            requestBean.setChannelid(channelAndTermDto.getChannelid());
+            requestBean.setRequestid(requestId);
+            requestIdList.add(requestBean);
+
             Date date = new Date();
             TerminalSchedulesTemp temp = new TerminalSchedulesTemp();
             temp.setTermId(channelAndTermDto.getTermid());
@@ -372,10 +378,7 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ
          * 当定时任务或者用户主动查询下发状态时
          * */
         List<Integer> requestidlist = new ArrayList<>();
-        List<RequestResults> resultsList = requestResultsDao.selectByTypeAndStatus(scheduletype, clientid, null);
+        List<RequestResults> resultsList = requestResultsDao.selectByTypeAndStatus(scheduletype, clientid,255, null);
-        for (RequestResults item : resultsList) {
-            requestidlist.add(item.getRequestId());
-        }
         /*
          * 如果下发成功
          * 1,将临时表中的数据状态改成1下发成功状态
@@ -385,6 +388,10 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ
         if (CollectionUtil.isEmpty(resultsList)) {
             return Asserts.success("尚未查询到下发数据");
         }
+
+        for (RequestResults item : resultsList) {
+            requestidlist.add(item.getRequestId());
+        }
         terminalSchedulesTempDao.updateStatusByRequestIdList(requestidlist, CommonStatus.EFFECTIVE.value(), new Date());
 
         List<TerminalSchedulesTemp> terminalSchedulesTemps = terminalSchedulesTempDao.selectByRequestId(requestidlist, CommonStatus.EFFECTIVE.value());

xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalScheduleRuleService.java

@@ -54,7 +54,7 @@ public interface TerminalScheduleRuleService {
      * @param vo
      * @return
      */
-    ServiceBody<GetListModel> relateSchelduleRule(RelateTerminalListRuleIdVo vo);
+    ServiceBody<GetScheduleRequestIdListModel> relateSchelduleRule(RelateTerminalListRuleIdVo vo);
 
     /**
      * 查询规则下发状态