添加设备日志查询页面

warewms-admin/src/main/resources/application-test.yml

@@ -67,9 +67,9 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://172.20.2.8:3306/trace_system?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true
-        username: warewms
-        password: warewms123
+        url: jdbc:mysql://localhost:3306/ahhl_tarece?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true
+        username: root
+        password: root
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭

warewms-system/src/main/java/com/warewms/hailiang/MES/impl/MesServiceImpl.java

@@ -176,7 +176,7 @@ public class MesServiceImpl implements MesService {
         return null;
     }
 
-    /**
+        /**
      *  MES反馈重试
      * @param URl
      * @param body

warewms-system/src/main/java/com/warewms/hailiang/controller/DeviceLogController.java

@@ -6,6 +6,7 @@ import com.warewms.common.core.domain.base.page.PageDomain;
 import com.warewms.common.core.domain.base.page.TableDataInfo;
 import com.warewms.common.utils.poi.ExcelUtil;
 import com.warewms.hailiang.domain.DTO.DeviceLogDTO;
+import com.warewms.hailiang.domain.DTO.RetroactiveHistoryDTO;
 import com.warewms.hailiang.domain.DeviceLog;
 import com.warewms.hailiang.service.DeviceLogService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,7 +16,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author AD
@@ -42,4 +46,13 @@ public class DeviceLogController {
         ExcelUtil<DeviceLogDTO> util = new ExcelUtil<DeviceLogDTO>(DeviceLogDTO.class);
         util.exportExcel(response, transform, "设备日志");
     }
+
+    @PostMapping("/exportByIds")
+    public void exportByIds(HttpServletResponse response, String  ids)
+    {
+        List<Long> collect = Arrays.asList(ids.split(",")).stream().map(s -> Long.parseLong(s.trim())).collect(Collectors.toList());
+        List<DeviceLogDTO> historyList = deviceLogService.getByIds(collect);
+        ExcelUtil<DeviceLogDTO> util = new ExcelUtil<DeviceLogDTO>(DeviceLogDTO.class);
+        util.exportExcel(response, historyList, "设备日志");
+    }
 }

warewms-system/src/main/java/com/warewms/hailiang/domain/DeviceLog.java

@@ -2,9 +2,12 @@ package com.warewms.hailiang.domain;
 
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.warewms.common.annotation.Excel;
 import com.warewms.common.core.domain.base.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
@@ -26,6 +29,7 @@ public class DeviceLog extends BaseEntity implements Serializable  {
      * 日志编号
      */
     @TableId(type = IdType.ASSIGN_ID)
+    @JsonSerialize(using= ToStringSerializer.class)
     private Long deviceLogId;
 
     /**
@@ -52,6 +56,12 @@ public class DeviceLog extends BaseEntity implements Serializable  {
     @Excel(name = "类型",readConverterExp="1=信息,2=报警")
     private String status;
 
+    @TableField(exist = false)
+    private String beginTime;
+
+    @TableField(exist = false)
+    private String endTime;
+
 
     private static final long serialVersionUID = 1L;
 

warewms-system/src/main/java/com/warewms/hailiang/init/PlcConnectServiceRunner.java

@@ -21,10 +21,7 @@ import org.springframework.stereotype.Component;
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.*;
 
 /**
  * plc连接
@@ -57,6 +54,8 @@ public class PlcConnectServiceRunner implements CommandLineRunner {
 
     private ArrayList<String> reTryPlc = new ArrayList<>();
 
+    private HashMap<String, ScheduledFuture<?>> heartbeatThreads = new HashMap<>();
+
     /**
      * 初始化
      */
@@ -70,6 +69,7 @@ public class PlcConnectServiceRunner implements CommandLineRunner {
                     if (s7PLC.checkConnected()){
                         plcToolsMap.put(plcConfig.getName(),s7PLC);
                         SpringUtil.getApplicationContext().publishEvent(new Device(plcConfig.getName(), "1"));
+                        plcConnectsTheHeartbeat(plcConfig,s7PLC);
                         log.info("plc:{},ip:{},连接成功",plcConfig.getName(),plcConfig.getIp());
                     }
                 }catch (Exception e){
@@ -83,6 +83,10 @@ public class PlcConnectServiceRunner implements CommandLineRunner {
 
     public void retry(PlcConfig plcConfig) {
         reTryPlc.add(plcConfig.getName());
+        ScheduledFuture<?> scheduledFuture = heartbeatThreads.get(plcConfig.getName());
+        if (ObjectUtil.isNotNull(scheduledFuture)){
+            scheduledFuture.cancel(true);
+        }
         threadPoolTaskExecutor.execute (() -> {
             Retryer<Boolean> retryer = RetryerBuilder.<Boolean>newBuilder()
                     .retryIfResult(Boolean.FALSE::equals)
@@ -124,17 +128,18 @@ public class PlcConnectServiceRunner implements CommandLineRunner {
     private void plcConnectsTheHeartbeat(PlcConfig plcConfig,S7PLC s7PLC){
         String heartbeatAdd = plcConfig.getHeartbeat();
         if (StringUtils.isNotEmpty(heartbeatAdd)){
-            scheduledExecutorService.scheduleWithFixedDelay(()->{
-                if (!reTryPlc.contains(plcConfig.getName())){
+            ScheduledFuture<?> scheduledFuture = scheduledExecutorService.scheduleWithFixedDelay(() -> {
+                if (!reTryPlc.contains(plcConfig.getName())) {
                     try {
                         s7PLC.readBoolean(plcConfig.getHeartbeat());
-                    }catch (Exception e){
-                        log.error("设备：{},连接中断",plcConfig.getName());
+                    } catch (Exception e) {
+                        log.error("设备：{},连接中断", plcConfig.getName());
                         SpringUtil.getApplicationContext().publishEvent(new Device(plcConfig.getName(), "2"));
                         retry(plcConfig);
                     }
                 }
-            },0,3,TimeUnit.SECONDS);
+            }, 0, 3, TimeUnit.SECONDS);
+            heartbeatThreads.put(plcConfig.getName(),scheduledFuture);
         }
     }
 

warewms-system/src/main/java/com/warewms/hailiang/init/TcpServiceRunner.java

@@ -47,17 +47,17 @@ public class TcpServiceRunner implements CommandLineRunner {
             Object o = aClass.newInstance();
             if (o instanceof TCPConnectBase) {
                 TCPConnectBase nodeModel = (TCPConnectBase) o;
-                threadPoolTaskExecutor.execute(() -> {
-                    try {
-                        nodeModel.init();
-                        TCPInstanceList.put(nodeModel.getDeviceName(),nodeModel);
-                    } catch (IOException e) {
-                        nodeModel.close();
-                        throw new RuntimeException(e);
-                    } catch (InterruptedException e) {
-                        throw new RuntimeException(e);
-                    }
-                });
+//                threadPoolTaskExecutor.execute(() -> {
+//                    try {
+//                        nodeModel.init();
+//                        TCPInstanceList.put(nodeModel.getDeviceName(),nodeModel);
+//                    } catch (IOException e) {
+//                        nodeModel.close();
+//                        throw new RuntimeException(e);
+//                    } catch (InterruptedException e) {
+//                        throw new RuntimeException(e);
+//                    }
+//                });
             }
         }
     }

warewms-system/src/main/java/com/warewms/hailiang/service/DeviceLogService.java

@@ -4,6 +4,8 @@ package com.warewms.hailiang.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.warewms.common.core.domain.base.page.PageDomain;
 import com.warewms.common.core.domain.base.page.TableDataInfo;
+import com.warewms.hailiang.domain.DTO.DeviceLogDTO;
+import com.warewms.hailiang.domain.DTO.RetroactiveHistoryDTO;
 import com.warewms.hailiang.domain.DeviceLog;
 
 import java.util.List;
@@ -22,4 +24,6 @@ public interface DeviceLogService extends IService<DeviceLog> {
     List<DeviceLog> getList(DeviceLog deviceLog);
 
     int cleanUpDataFromAWeekAgo();
+
+    List<DeviceLogDTO> getByIds( List<Long> idList);
 }

warewms-system/src/main/java/com/warewms/hailiang/service/impl/DeviceLogServiceImpl.java

@@ -10,11 +10,14 @@ import com.warewms.common.core.domain.base.page.PageDomain;
 import com.warewms.common.core.domain.base.page.TableDataInfo;
 import com.warewms.common.utils.StringUtils;
 import com.warewms.hailiang.config.DeviceMessageSocket;
+import com.warewms.hailiang.domain.DTO.DeviceLogDTO;
+import com.warewms.hailiang.domain.DTO.RetroactiveHistoryDTO;
 import com.warewms.hailiang.domain.Device;
 import com.warewms.hailiang.domain.DeviceLog;
 import com.warewms.hailiang.mapper.DeviceLogMapper;
 import com.warewms.hailiang.service.DeviceLogService;
 import com.warewms.hailiang.service.DeviceService;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.event.EventListener;
 import org.springframework.scheduling.annotation.Async;
@@ -46,12 +49,13 @@ public class DeviceLogServiceImpl extends ServiceImpl<DeviceLogMapper, DeviceLog
     @Override
     public TableDataInfo<DeviceLog> getList(DeviceLog deviceLog, PageDomain pageDomain) {
         Map<String, Object> params = deviceLog.getParams();
+        System.out.println(params);
         IPage<DeviceLog> deviceLogIPage = deviceLogMapper.selectPage(pageDomain.build(), new LambdaQueryWrapper<DeviceLog>()
                 .eq(StringUtils.isNotEmpty(deviceLog.getDeviceId()), DeviceLog::getDeviceId, deviceLog.getDeviceId())
                 .eq(StringUtils.isNotEmpty(deviceLog.getDeviceName()), DeviceLog::getDeviceName, deviceLog.getDeviceName())
                 .eq(StringUtils.isNotEmpty(deviceLog.getStatus()), DeviceLog::getStatus, deviceLog.getStatus())
-                .between(params.get("beginTime") != null && params.get("endTime") != null,
-                        DeviceLog::getCreateTime, params.get("beginTime"), params.get("endTime"))
+                .between(StringUtils.isNotEmpty(deviceLog.getBeginTime()) &&StringUtils.isNotEmpty(deviceLog.getEndTime()),
+                        DeviceLog::getCreateTime,deviceLog.getBeginTime(),deviceLog.getEndTime())
                 .orderByDesc(DeviceLog::getCreateTime));
         return TableDataInfo.build(deviceLogIPage);
     }
@@ -99,6 +103,17 @@ public class DeviceLogServiceImpl extends ServiceImpl<DeviceLogMapper, DeviceLog
     public int cleanUpDataFromAWeekAgo() {
         return  deviceLogMapper.cleanUpDataFromAWeekAgo();
     }
+
+    @Override
+    public List<DeviceLogDTO> getByIds(List<Long> IdList) {
+        List<DeviceLog> deviceLogs = deviceLogMapper.selectBatchIds(IdList);
+        List<DeviceLogDTO> collect = deviceLogs.stream().map(item -> {
+            DeviceLogDTO deviceLogDTO = new DeviceLogDTO();
+            BeanUtils.copyProperties(item, deviceLogDTO);
+            return deviceLogDTO;
+        }).collect(Collectors.toList());
+        return collect;
+    }
 }
 
 

warewms-system/src/main/java/com/warewms/hailiang/service/impl/RetroactiveHistoryServiceImpl.java

@@ -96,7 +96,6 @@ public class RetroactiveHistoryServiceImpl extends ServiceImpl<RetroactiveHistor
                 longs.add(ids);
             } else {
                 longs = Arrays.asList(split);
-                System.out.println(longs);
                 retroactiveHistoryLambdaQueryWrapper.in(RetroactiveHistory::getHistoryId, longs)
                         .orderByAsc(RetroactiveHistory::getCreateTime);
             }

warewms-system/src/main/java/com/warewms/hailiang/service/impl/RetroactiveNowServiceImpl.java

@@ -111,10 +111,13 @@ public class RetroactiveNowServiceImpl extends ServiceImpl<RetroactiveNowMapper,
         baseData.setDeviceId(retroactiveNow.getDeviceId());
         baseData.setUpdateBy("system");
         baseData.setUpdateTime(new Date());
-        retroactiveNowMapper.updateById(baseData);
-        RetroactiveHistory retroactiveHistory = BeanUtil.copyProperties(baseData, RetroactiveHistory.class);
-        retroactiveHistory.setCreateTime(baseData.getUpdateTime());
-        return retroactiveHistoryMapper.insert(retroactiveHistory);
+        int i = retroactiveNowMapper.updateById(baseData);
+        if (!"6".equals(baseData.getStatus())){
+            RetroactiveHistory retroactiveHistory = BeanUtil.copyProperties(baseData, RetroactiveHistory.class);
+            retroactiveHistory.setCreateTime(baseData.getUpdateTime());
+             retroactiveHistoryMapper.insert(retroactiveHistory);
+        }
+        return i;
     }
 
     @Override
@@ -129,7 +132,6 @@ public class RetroactiveNowServiceImpl extends ServiceImpl<RetroactiveNowMapper,
         int delete = retroactiveNowMapper.delete(new LambdaQueryWrapper<RetroactiveNow>().eq(RetroactiveNow::getBatchNo, retroactiveNow.getBatchNo()));
         if (delete == 1) {
             retroactiveHistoryMapper.insert(retroactiveHistory);
-
         }
         return delete;
     }
@@ -188,20 +190,30 @@ public class RetroactiveNowServiceImpl extends ServiceImpl<RetroactiveNowMapper,
     }
 
     @Override
+    @Transactional
     public R update(RetroactiveNow retroactiveNow) {
         RetroactiveNow baseData = retroactiveNowMapper.selectOne(new LambdaQueryWrapper<RetroactiveNow>()
                 .eq(StringUtils.isNotEmpty(retroactiveNow.getBatchNo()), RetroactiveNow::getBatchNo, retroactiveNow.getBatchNo())
-                .eq (RetroactiveNow::getStatus, "6")
         );
         if (ObjectUtil.isNull(baseData)) {
             throw new ServiceException("数据库中不存在该批次号," + retroactiveNow.getBatchNo());
         }
+        if (!"6".equals(baseData.getStatus())){
+            baseData.setStatus("6");
+            baseData.setDeviceId("Z1_TuiHuoShangLiao_DMQ-1-27.13");
+        }
         baseData.setUniuCode(retroactiveNow.getUniuCode());
         baseData.setShelfNumber(retroactiveNow.getShelfNumber());
         baseData.setLotAddress(retroactiveNow.getLotAddress());
         baseData.setNumberOfLayers(retroactiveNow.getNumberOfLayers());
         retroactiveNowMapper.updateById(baseData);
-        mesService .tuiHuoShangLiao(baseData);
+        if (!"6".equals(baseData.getStatus())){
+            baseData.setRemark("PDA手动补码");
+        }
+        RetroactiveHistory retroactiveHistory = BeanUtil.copyProperties(baseData, RetroactiveHistory.class);
+        retroactiveHistory.setCreateTime(baseData.getUpdateTime());
+        retroactiveHistoryMapper.insert(retroactiveHistory);
+        mesService.tuiHuoShangLiao(baseData);
         return R.ok();
     }