下发查询修改

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

@@ -1,10 +1,7 @@
 package com.shxy.xymanager_common.model;
 
-import com.shxy.xymanager_common.dto.TerminalChannelsAndScheduleDto;
-import com.shxy.xymanager_common.dto.TerminalChannelsDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import jdk.nashorn.internal.ir.Terminal;
 import lombok.Data;
 
 import java.io.Serializable;

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

@@ -13,6 +13,7 @@ public interface TerminalSchedulesTempDao {
 
     List<TerminalSchedulesTemp> selectByRequestId(@Param("list") List<Integer> id, @Param("status") Integer status);
 
+
     int deleteByPrimaryKey(Integer id);
 
     int insert(TerminalSchedulesTemp record);

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

@@ -46,6 +46,7 @@
         </if>
     </select>
 
+
     <select id="selectByPrimaryKey" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"/>

xymanager_framework/src/main/java/com/shxy/xymanager_framework/timeTask/ScheduledTask.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Component;
  * @date 2021-01-27 15:06
  */
 @Component
-@EnableScheduling
+//@EnableScheduling
 @Slf4j
 public class ScheduledTask {
 

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

@@ -232,7 +232,6 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ
         GetScheduleRequestIdListModel model = new GetScheduleRequestIdListModel();
        /* List<TerminalSchedulesTemp> list = terminalSchedulesTempDao.selectByTermAndChannel(vo.getList(), CommonStatus.DELETE.value());
         if (CollectionUtil.isNotEmpty(list)) {
-
             return Asserts.error("有装置时间尚未下发成功");
         }*/
         List<RelateTerminalListRuleIdVo.Items> termlist = vo.getList();
@@ -277,7 +276,7 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ
                     endTimeHour + " --min" + (indexAdd) + "=" + endTimeMin + " --preset" + (indexAdd) + "=255 --hour" + indexAddT + "=" + span1 + " --min" + indexAddT +
                     "=" + span2 + " --preset" + indexAddT + "=255";
             timestr.append(string);
-            index = indexAddT+1;
+            index = indexAddT + 1;
         }
 
         ArrayList<GetScheduleRequestIdListModel.RequestBean> requestIdList = new ArrayList<>();
@@ -285,7 +284,7 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ
             ChannelAndTermDto channelAndTermDto = terminalsList.get(x);
             int requestId = Constants.REQUEST_ID.addAndGet(1);
 
-            String cmd = Constants.CMD + "schedule --group=" + dtoList.size()*3 + " --flag=1 --clientid=10 --cmdid="
+            String cmd = Constants.CMD + "schedule --group=" + dtoList.size() * 3 + " --flag=1 --clientid=10 --cmdid="
                     + channelAndTermDto.getCmdid() + " --reqid=" + requestId + " --channel=" + channelAndTermDto.getChannelid() + " " +
                     timestr.toString();
             ProcessExecUtils.exec(cmd);
@@ -336,13 +335,7 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ
         if (CollectionUtil.isEmpty(requestidlist)) {
             return Asserts.error("查询编号列表缺少");
         }
-        List<RequestResults> resultsList = requestResultsDao.selectByRequestIdList(requestidlist);
+        List<TerminalSchedulesTemp> resultsList = terminalSchedulesTempDao.selectByRequestId(requestidlist, CommonStatus.EFFECTIVE.value());
-        /*
-         * 如果下发成功
-         * 1,将临时表中的数据状态改成1下发成功状态
-         * 2，将装置关联拍照时间正式表改为临时表的对应状态
-         * 3，将装置自身detial表插入新数据
-         * */
         ArrayList<ScheduleRequestIdListModel.RequestStatusBean> modellist = new ArrayList<>();
         if (CollectionUtil.isEmpty(resultsList)) {
             for (RequestIdListVo.RequestBean it : list) {
@@ -371,50 +364,7 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ
             }
             model.setList(modellist);
         }
-        terminalSchedulesTempDao.updateStatusByRequestIdList(requestidlist, CommonStatus.EFFECTIVE.value(), new Date());
-
-        List<TerminalSchedulesTemp> terminalSchedulesTemps = terminalSchedulesTempDao.selectByRequestId(requestidlist, CommonStatus.EFFECTIVE.value());
-
-        ArrayList<TerminalSchedule> terminalSchedules = new ArrayList<>();
-        ArrayList<Integer> scheduleidlist = new ArrayList<>();
-        for (TerminalSchedulesTemp item : terminalSchedulesTemps) {
-            TerminalSchedule record = new TerminalSchedule();
-            record.setChannelId(item.getChannelId());
-            record.setScheduleId(item.getScheduleId());
-            record.setTermId(item.getTermId());
-            scheduleidlist.add(item.getScheduleId());
-            terminalSchedules.add(record);
-        }
-        Date date = new Date();
-        terminalScheduleDao.insertOrUpdate(terminalSchedules, date, date);//将实际的拍照时间表规则从临时表更新到正式表中
-
-        ArrayList<Integer> distinct = CollectionUtil.distinct(scheduleidlist);
-        List<ScheduleDetails> scheduleDetails = scheduleDetailsDao.selectAllBySceduleidList(distinct);
-        ArrayList<TerminalScheduleDetails> terminalScheduleDetails = new ArrayList<>();
-        for (int i = 0; i < terminalSchedules.size(); i++) {
-            for (int j = 0; j < scheduleDetails.size(); j++) {
-                TerminalSchedule terminalSchedule = terminalSchedules.get(i);
-                ScheduleDetails scheduleDetailsbean = scheduleDetails.get(j);
-                if (scheduleDetailsbean.getScheduleId().intValue() == terminalSchedule.getScheduleId().intValue()) {
-                    TerminalScheduleDetails bean = new TerminalScheduleDetails();
-                    bean.setTermId(terminalSchedule.getTermId());
-                    bean.setChannelId(terminalSchedule.getChannelId());
-                    bean.setStartTime(scheduleDetailsbean.getStartTime());
-                    bean.setEndTime(scheduleDetailsbean.getEndTime());
-                    bean.setSpan(scheduleDetailsbean.getSpan());
-                    terminalScheduleDetails.add(bean);
-                }
-            }
-        }
-        terminalScheduleDetailsDao.deleteByTermidAndChannelIdList(terminalSchedules);
-        terminalScheduleDetailsDao.insertList(terminalScheduleDetails, date, date);
-        int i = requestResultsDao.updateByRequestIdList(requestidlist, CommonStatus.EFFECTIVE.value());//根据requestid将结果表中的状态修改为已下发
-
-        if (i != 0) {
         return Asserts.success(model);
-        } else {
-            return Asserts.error("关联失败");
-        }
     }