作业执行查询

ktg-iscs/src/main/java/com/ktg/iscs/domain/dto/ticket/PageTicketDTO.java

@@ -14,6 +14,9 @@ public class PageTicketDTO
 {
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "作业票id")
+    private Long ticketId;
+
     @ApiModelProperty(value = "作业票编号")
     private String ticketCode;
 

ktg-iscs/src/main/java/com/ktg/iscs/service/impl/IsMapServiceImpl.java

@@ -45,23 +45,25 @@ public class IsMapServiceImpl extends ServiceImpl<IsMapMapper, IsMap> implements
     @Override
     public IsMap selectIsMapById(Long id) {
         IsMap map = getById(id);
-        IsMapPoint point = new IsMapPoint();
-        point.setMapId(id);
-        List<IsMapPoint> list = iIsMapPointService.getIsMapPointList(point);
-        List<UpdateSwitchStatusDTO> switchStatusList = redisCache.getCacheList(SYS_ATTR + "sys.points.switch.records");
-        if (!switchStatusList.isEmpty() && !list.isEmpty()) {
-            for (IsMapPoint isMapPoint : list) {
-                for (UpdateSwitchStatusDTO updateSwitchStatusDTO : switchStatusList) {
-                    if (StringUtils.isNotBlank(isMapPoint.getPointSerialNumber())
-                            && StringUtils.isNotBlank(updateSwitchStatusDTO.getPointSerialNumber())
-                            && isMapPoint.getPointSerialNumber().equals(updateSwitchStatusDTO.getPointSerialNumber())) {
-                        isMapPoint.setSwitchStatus(updateSwitchStatusDTO.getSwitchStatus());
-                        isMapPoint.setSwitchLastUpdateTime(updateSwitchStatusDTO.getSwitchLastUpdateTime());
+        if (map != null) {
+            IsMapPoint point = new IsMapPoint();
+            point.setMapId(id);
+            List<IsMapPoint> list = iIsMapPointService.getIsMapPointList(point);
+            List<UpdateSwitchStatusDTO> switchStatusList = redisCache.getCacheList(SYS_ATTR + "sys.points.switch.records");
+            if (!switchStatusList.isEmpty() && !list.isEmpty()) {
+                for (IsMapPoint isMapPoint : list) {
+                    for (UpdateSwitchStatusDTO updateSwitchStatusDTO : switchStatusList) {
+                        if (StringUtils.isNotBlank(isMapPoint.getPointSerialNumber())
+                                && StringUtils.isNotBlank(updateSwitchStatusDTO.getPointSerialNumber())
+                                && isMapPoint.getPointSerialNumber().equals(updateSwitchStatusDTO.getPointSerialNumber())) {
+                            isMapPoint.setSwitchStatus(updateSwitchStatusDTO.getSwitchStatus());
+                            isMapPoint.setSwitchLastUpdateTime(updateSwitchStatusDTO.getSwitchLastUpdateTime());
+                        }
                     }
                 }
             }
+            map.setPointList(list);
         }
-        map.setPointList(list);
         return map;
     }
 

ktg-iscs/src/main/resources/mapper/IsJobTicketMapper.xml

@@ -218,6 +218,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dto.endTime != null and dto.endTime.trim != ''">
                 and j.create_time &lt;= #{dto.endTime}
             </if>
+            <if test="dto.ticketId != null">
+                and j.ticket_id = #{dto.ticketId}
+            </if>
         </where>
             order by j.ticket_id desc
     </select>