开发设备日志模块、铜管追溯接口

warewms-system/src/main/java/com/warewms/hailiang/contoller/DeviceController.java

@@ -1,5 +1,6 @@
 package com.warewms.hailiang.contoller;
 
+import com.warewms.common.core.domain.R;
 import com.warewms.hailiang.domain.Device;
 import com.warewms.hailiang.service.DeviceService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,7 +23,7 @@ public class DeviceController {
     DeviceService deviceService;
 
     @GetMapping("/list")
-    public List<Device> getList(){
-       return deviceService.getList();
+    public R<List<Device>> getList() {
+        return R.ok(deviceService.getList());
     }
 }

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

@@ -9,6 +9,8 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @author AD
  * @description 针对表【device_log(设备日志表)】的数据库操作Controller

warewms-system/src/main/java/com/warewms/hailiang/contoller/RetroactiveHistoryController.java

@@ -0,0 +1,38 @@
+package com.warewms.hailiang.contoller;
+
+import com.warewms.common.core.domain.R;
+import com.warewms.common.core.domain.base.page.PageDomain;
+import com.warewms.common.core.domain.base.page.TableDataInfo;
+import com.warewms.hailiang.domain.RetroactiveHistory;
+import com.warewms.hailiang.domain.RetroactiveNow;
+import com.warewms.hailiang.service.RetroactiveHistoryService;
+import com.warewms.hailiang.service.RetroactiveNowService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @author
+ * @description 针对表【retroactive_history(生产追溯表)】的数据库操作Controller
+ * @createDate 2023-08-29 10:21:29
+ */
+@RestController
+@RequestMapping("/retroactive/history")
+public class RetroactiveHistoryController {
+
+    @Autowired
+    RetroactiveHistoryService retroactiveHistoryService;
+
+    @GetMapping("/list")
+    public TableDataInfo<RetroactiveHistory> getList(RetroactiveHistory retroactiveHistory, PageDomain pageDomain){
+       return retroactiveHistoryService.getList(retroactiveHistory,pageDomain);
+    }
+
+    @GetMapping("/info")
+    public R<List<RetroactiveHistory>> getList(RetroactiveHistory retroactiveHistory){
+        return R.ok( retroactiveHistoryService.getHistoryList(retroactiveHistory));
+    }
+}

warewms-system/src/main/java/com/warewms/hailiang/contoller/RetroactiveNowController.java

@@ -0,0 +1,36 @@
+package com.warewms.hailiang.contoller;
+
+import com.warewms.common.core.domain.R;
+import com.warewms.common.core.domain.base.page.PageDomain;
+import com.warewms.common.core.domain.base.page.TableDataInfo;
+import com.warewms.hailiang.domain.DeviceLog;
+import com.warewms.hailiang.domain.RetroactiveNow;
+import com.warewms.hailiang.service.DeviceLogService;
+import com.warewms.hailiang.service.RetroactiveNowService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author
+ * @description 针对表【retroactive_now(生产追溯表)】的数据库操作Controller
+ * @createDate 2023-08-29 10:21:29
+ */
+@RestController
+@RequestMapping("/retroactive/now")
+public class RetroactiveNowController {
+
+    @Autowired
+    RetroactiveNowService retroactiveNowService;
+
+    @GetMapping("/list")
+    public TableDataInfo<RetroactiveNow> getList(RetroactiveNow retroactiveNow, PageDomain pageDomain) {
+        return retroactiveNowService.getList(retroactiveNow, pageDomain);
+    }
+
+    @GetMapping("/info")
+    public R<RetroactiveNow> getInfo(RetroactiveNow retroactiveNow) {
+        return R.ok(retroactiveNowService.selectTheOneByParameter(retroactiveNow));
+    }
+}

warewms-system/src/main/java/com/warewms/hailiang/contoller/TestContoller.java

@@ -23,11 +23,42 @@ public class TestContoller {
     PlcConnectServiceRunner plcConnectServiceRunner;
 
     @GetMapping("/pclTest")
-    public Object testPlc(String plcName,String db,String type){
-        db = "V"+db;
+    public Object testPlc(String plcName,String db,String type,String value){
         if (type.equals("1")){
+            db = "V"+db;
             return plcConnectServiceRunner.getPlcServer(plcName).readBoolean(db);
         }
+        if (type.equals("2")){
+            db = "Q"+db;
+            return plcConnectServiceRunner.getPlcServer(plcName).readBoolean(db);
+        }
+        if (type.equals("3")){
+            db = "I"+db;
+            return plcConnectServiceRunner.getPlcServer(plcName).readBoolean(db);
+        }
+        if (type.equals("4")){
+            db = "DB"+db;
+            return plcConnectServiceRunner.getPlcServer(plcName).readBoolean(db);
+        }
+        if (type.equals("5")){
+            db = "DB"+db;
+            plcConnectServiceRunner.getPlcServer(plcName).writeBoolean(db, Boolean.parseBoolean(value));
+            return "yes";
+        }
+        if (type.equals("6")){
+            db = "Q"+db;
+            plcConnectServiceRunner.getPlcServer(plcName).writeBoolean(db, Boolean.parseBoolean(value));
+            return "yes";
+        }
+        if (type.equals("7")){
+            db = "I"+db;
+            plcConnectServiceRunner.getPlcServer(plcName).writeBoolean(db, Boolean.parseBoolean(value));
+            return "yes";
+        }
         return null;
     }
+    @GetMapping("/getStatus")
+    public Object getStatus(String plcName){
+        return plcConnectServiceRunner.getPlcServer(plcName).checkConnected();
+    }
 }

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

@@ -6,6 +6,8 @@ import com.warewms.common.core.domain.base.page.PageDomain;
 import com.warewms.common.core.domain.base.page.TableDataInfo;
 import com.warewms.hailiang.domain.DeviceLog;
 
+import java.util.List;
+
 /**
 * @author AD
 * @description 针对表【device_log(设备日志表)】的数据库操作Service
@@ -16,4 +18,5 @@ public interface DeviceLogService extends IService<DeviceLog> {
     TableDataInfo<DeviceLog> getList(DeviceLog deviceLog, PageDomain pageDomain);
 
     void crateLog(DeviceLog deviceLog);
+
 }

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

@@ -9,4 +9,6 @@ import java.util.List;
  */
 public interface DeviceService {
     List<Device> getList();
+
+    boolean IsConnect(String key);
 }

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

@@ -1,7 +1,12 @@
 package com.warewms.hailiang.service;
 
+import com.warewms.common.core.domain.base.page.PageDomain;
+import com.warewms.common.core.domain.base.page.TableDataInfo;
 import com.warewms.hailiang.domain.RetroactiveHistory;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.warewms.hailiang.domain.RetroactiveNow;
+
+import java.util.List;
 
 /**
 * @author AD
@@ -10,4 +15,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 */
 public interface RetroactiveHistoryService extends IService<RetroactiveHistory> {
 
+    TableDataInfo<RetroactiveHistory> getList(RetroactiveHistory retroactiveHistory, PageDomain pageDomain);
+
+    List<RetroactiveHistory> getHistoryList(RetroactiveHistory retroactiveHistory);
 }

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

@@ -1,6 +1,9 @@
 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.DeviceLog;
 import com.warewms.hailiang.domain.RetroactiveNow;
 
 /**
@@ -10,7 +13,11 @@ import com.warewms.hailiang.domain.RetroactiveNow;
 */
 public interface RetroactiveNowService extends IService<RetroactiveNow> {
 
+    TableDataInfo<RetroactiveNow> getList(RetroactiveNow retroactiveNow, PageDomain pageDomain);
+
     int insertData(RetroactiveNow retroactiveNow);
 
     RetroactiveNow selectTheOneByParameter(RetroactiveNow retroactiveNow);
+
+    int updateData(RetroactiveNow retroactiveNow);
 }

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

@@ -15,6 +15,7 @@ import org.springframework.context.event.EventListener;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -38,7 +39,8 @@ public class DeviceLogServiceImpl extends ServiceImpl<DeviceLogMapper, DeviceLog
                 .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")));
+                        DeviceLog::getCreateTime, params.get("beginTime"), params.get("endTime"))
+                .orderByDesc(DeviceLog::getCreateTime));
         return TableDataInfo.build(deviceLogIPage);
     }
 
@@ -46,8 +48,11 @@ public class DeviceLogServiceImpl extends ServiceImpl<DeviceLogMapper, DeviceLog
     @Async
     @EventListener
     public void crateLog(DeviceLog deviceLog) {
+        deviceLog.setCreateBy("system");
+        deviceLog.setUpdateBy("system");
         deviceLogMapper.insert(deviceLog);
     }
+
 }
 
 

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

@@ -15,16 +15,20 @@ public class DeviceServiceImpl implements DeviceService {
     private List<Device> devices = new ArrayList<>();
 
     {
-        devices.add(new Device("Z1_Daojia_PMJG-1-27.2", "DaoJiaoJiPlc", "倒角机", "Z1", "172.20.27.2", 102, "S7", "2"));
-        devices.add(new Device("Z1_DaoJiao_PMQ-1-27.4", "PanMaQi", "喷码器", "Z1", "172.20.27.4", 102, "TCP", "2"));
+        devices.add(new Device("Z1_ChengZhong_PLC-1-52.21", "ChengZhongPlc", "称重辊道PLC", "Z1", "172.20.52.21", 102, "S7", "2"));
+        devices.add(new Device("Z1_Daojiao_PlC-1-27.2", "DaoJiaoJiPlc", "倒角机", "Z1", "172.20.27.2", 102, "S7", "2"));
+        devices.add(new Device("Z1_DaoJiao_PMQ-1-27.4", "InkjetPrinters", "喷码器", "Z1", "172.20.27.4", 102, "TCP", "2"));
         devices.add(new Device("Z1_DaoJia_DMQ-1-27.3", "CodeReader3", "倒角读码器", "Z1", "172.20.27.3", 51236, "TCP", "2"));
+        devices.add(new Device("Z1_Ximian_PLC-1-52.22", "XiMianPlc", "铣面辊道PLC", "Z1", "172.20.52.22", 102, "S7", "2"));
         devices.add(new Device("Z1_XiMian_DMQ-1-27.5", "CodeReader5", "铣面读码器", "Z1", "172.20.27.5", 51236, "TCP", "2"));
+        devices.add(new Device("Z1_Zhazhi_PLC-1-52.24", "ZhaZhiPlc", "轧制辊道PLC", "Z1", "172.20.52.24", 102, "S7", "2"));
         devices.add(new Device("Z1_ZhaZhi_DMQ-1-27.6", "CodeReader6", "轧制读码器", "Z1", "172.20.27.6", 51236, "TCP", "2"));
+        devices.add(new Device("Z1_DaSanPan_PLC-1-54.121", "DaSanPanPlc", "大散盘PLC", "Z1", "172.20.54.121", 102, "S7", "2"));
         devices.add(new Device("Z1_DaSanPan_DMQ-1-27.7", "CodeReader7", "大散盘读码器1", "Z1", "172.20.27.7", 51236, "TCP", "2"));
         devices.add(new Device("Z1_DaSanPan_DMQ-2-27.8", "CodeReader8", "大散盘读码器2", "Z1", "172.20.27.8", 51236, "TCP", "2"));
         devices.add(new Device("Z1_DaSanPan_DMQ-3-27.9", "CodeReader9", "大散盘读码器3", "Z1", "172.20.27.9", 51236, "TCP", "2"));
         devices.add(new Device("Z1_DaSanPan_DMQ-4-27.12", "CodeReader12", "大散盘读码器4", "Z1", "172.20.27.12", 51236, "TCP", "2"));
-        devices.add(new Device("Z1_TuiHuoSShangLiao_DMQ-1-27.13", "CodeReader13", "退货上料读码器", "Z1", "172.20.27.13", 51236, "TCP", "2"));
+        devices.add(new Device("Z1_TuiHuoShangLiao_DMQ-1-27.13", "CodeReader13", "退货上料读码器", "Z1", "172.20.27.13", 51236, "TCP", "2"));
         devices.add(new Device("Z1_TuiHuoXiaLiao_DMQ-1-27.14", "CodeReader14", "退货下料读码器", "Z1", "172.20.27.14", 51236, "TCP", "2"));
     }
 
@@ -33,6 +37,17 @@ public class DeviceServiceImpl implements DeviceService {
         return devices;
     }
 
+    @Override
+    public boolean IsConnect(String key) {
+        boolean a = false;
+        for (Device device : devices) {
+            if (device.getDeviceName().equals(key)) {
+                a = "1".equals(device.getStatus()) ;
+            }
+        }
+        return a;
+    }
+
     @Async
     @EventListener
     void updateStatus(Device d){

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

@@ -1,11 +1,19 @@
 package com.warewms.hailiang.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+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.domain.RetroactiveHistory;
+import com.warewms.hailiang.domain.RetroactiveNow;
 import com.warewms.hailiang.service.RetroactiveHistoryService;
 import com.warewms.hailiang.mapper.RetroactiveHistoryMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
 * @author AD
 * @description 针对表【retroactive_history(生产历史追溯表)】的数据库操作Service实现
@@ -15,6 +23,27 @@ import org.springframework.stereotype.Service;
 public class RetroactiveHistoryServiceImpl extends ServiceImpl<RetroactiveHistoryMapper, RetroactiveHistory>
     implements RetroactiveHistoryService{
 
+    @Autowired
+    RetroactiveHistoryMapper retroactiveHistoryMapper;
+
+    @Override
+    public TableDataInfo<RetroactiveHistory> getList(RetroactiveHistory retroactiveHistory, PageDomain pageDomain) {
+        return TableDataInfo.build(retroactiveHistoryMapper.selectPage(pageDomain.build(),new LambdaQueryWrapper<RetroactiveHistory>()
+                .like(StringUtils.isNotEmpty(retroactiveHistory.getProductionLine()),RetroactiveHistory::getProductionLine,retroactiveHistory.getProductionLine())
+                .like(StringUtils.isNotEmpty(retroactiveHistory.getBatchNo()),RetroactiveHistory::getBatchNo,retroactiveHistory.getBatchNo())
+                .like(StringUtils.isNotEmpty(retroactiveHistory.getLotNo()),RetroactiveHistory::getLotNo,retroactiveHistory.getLotNo())
+                .eq(StringUtils.isNotEmpty(retroactiveHistory.getStatus()),RetroactiveHistory::getStatus,retroactiveHistory.getStatus())
+                .orderByDesc(RetroactiveHistory::getCreateTime)
+
+        ));
+    }
+
+    @Override
+    public List<RetroactiveHistory> getHistoryList(RetroactiveHistory retroactiveHistory) {
+        return retroactiveHistoryMapper.selectList(new LambdaQueryWrapper<RetroactiveHistory>()
+                .like(StringUtils.isNotEmpty(retroactiveHistory.getRetroactiveId()),RetroactiveHistory::getRetroactiveId,retroactiveHistory.getRetroactiveId())
+                .orderByDesc(RetroactiveHistory::getCreateTime));
+    }
 }
 
 

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

@@ -1,9 +1,14 @@
 package com.warewms.hailiang.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.warewms.common.core.domain.base.page.PageDomain;
+import com.warewms.common.core.domain.base.page.TableDataInfo;
+import com.warewms.common.exception.ServiceException;
 import com.warewms.common.utils.StringUtils;
+import com.warewms.hailiang.domain.DeviceLog;
 import com.warewms.hailiang.domain.RetroactiveHistory;
 import com.warewms.hailiang.domain.RetroactiveNow;
 import com.warewms.hailiang.mapper.RetroactiveHistoryMapper;
@@ -15,6 +20,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.Map;
 
 /**
 * @author AD
@@ -33,14 +39,24 @@ public class RetroactiveNowServiceImpl extends ServiceImpl<RetroactiveNowMapper,
     private RetroactiveHistoryMapper retroactiveHistoryMapper;
 
     @Override
-    @Transactional
+    public TableDataInfo<RetroactiveNow> getList(RetroactiveNow retroactiveNow, PageDomain pageDomain) {
+        Map<String, Object> params = retroactiveNow.getParams();
+        return TableDataInfo.build(retroactiveNowMapper.selectPage(pageDomain.build(),new LambdaQueryWrapper<RetroactiveNow>()
+                .like(StringUtils.isNotEmpty(retroactiveNow.getProductionLine()),RetroactiveNow::getProductionLine,retroactiveNow.getProductionLine())
+                .like(StringUtils.isNotEmpty(retroactiveNow.getBatchNo()),RetroactiveNow::getBatchNo,retroactiveNow.getBatchNo())
+                .like(StringUtils.isNotEmpty(retroactiveNow.getLotNo()),RetroactiveNow::getLotNo,retroactiveNow.getLotNo())
+                .eq(StringUtils.isNotEmpty(retroactiveNow.getStatus()),RetroactiveNow::getStatus,retroactiveNow.getStatus())
+                .orderByDesc(RetroactiveNow::getCreateTime)
+        ));
+    }
+
+    @Override
     public int insertData(RetroactiveNow retroactiveNow) {
         List<RetroactiveNow> retroactiveNows = retroactiveNowMapper.selectList(new LambdaQueryWrapper<RetroactiveNow>()
                 .eq(RetroactiveNow::getBatchNo, retroactiveNow.getBatchNo())
         );
         if (retroactiveNows.size()>0){
-            log.info("数据库中已存在相同批次号");
-            return 0;
+            throw new ServiceException("数据库中已存在相同批次号");
         }
         retroactiveNowMapper.insert(retroactiveNow);
         return retroactiveHistoryMapper.insert(BeanUtil.copyProperties(retroactiveNow,RetroactiveHistory.class));
@@ -49,10 +65,31 @@ public class RetroactiveNowServiceImpl extends ServiceImpl<RetroactiveNowMapper,
     @Override
     public RetroactiveNow selectTheOneByParameter(RetroactiveNow retroactiveNow) {
         return retroactiveNowMapper.selectOne(new LambdaQueryWrapper<RetroactiveNow>()
+                .eq(StringUtils.isNotEmpty(retroactiveNow.getRetroactiveId()),RetroactiveNow::getRetroactiveId,retroactiveNow.getRetroactiveId())
                 .eq(StringUtils.isNotEmpty(retroactiveNow.getBatchNo()),RetroactiveNow::getBatchNo,retroactiveNow.getBatchNo())
                 .eq(StringUtils.isNotEmpty(retroactiveNow.getStatus()),RetroactiveNow::getStatus,retroactiveNow.getStatus())
         );
     }
+
+    @Override
+    @Transactional
+    public int updateData(RetroactiveNow retroactiveNow) {
+        RetroactiveNow baseData = retroactiveNowMapper.selectOne(new LambdaQueryWrapper<RetroactiveNow>()
+                .eq(RetroactiveNow::getBatchNo, retroactiveNow.getBatchNo())
+        );
+        if (ObjectUtil.isNull(baseData)){
+            throw new ServiceException("数据库中不存在该批次号,"+ retroactiveNow.getBatchNo());
+        }
+        if (baseData.getStatus().equals(retroactiveNow)){
+            log.info("数据库存在该状态的数据");
+            return 0;
+        }
+            baseData.setStatus(retroactiveNow.getStatus());
+            baseData.setDeviceId(retroactiveNow.getDeviceId());
+            retroactiveNowMapper.updateById(baseData);
+            return retroactiveHistoryMapper.insert(BeanUtil.copyProperties(baseData,RetroactiveHistory.class));
+
+    }
 }
 
 

warewms-system/src/main/resources/mapper/hailiang/DeviceLogMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.warewms.hailiang.mapper.DeviceLogMapper">
 
-    <resultMap id="BaseResultMap" type="com.warewms.hailiang.domian.DeviceLog">
+    <resultMap id="BaseResultMap" type="com.warewms.hailiang.domain.DeviceLog">
             <id property="deviceLogId" column="device_log_id" jdbcType="BIGINT"/>
             <result property="deviceId" column="device_id" jdbcType="VARCHAR"/>
             <result property="deviceName" column="device_name" jdbcType="VARCHAR"/>

warewms-system/src/main/resources/mapper/hailiang/RetroactiveHistoryMapper.xml

@@ -5,7 +5,8 @@
 <mapper namespace="com.warewms.hailiang.mapper.RetroactiveHistoryMapper">
 
     <resultMap id="BaseResultMap" type="com.warewms.hailiang.domain.RetroactiveHistory">
-            <id property="retroactiveId" column="retroactive_id" jdbcType="VARCHAR"/>
+            <id property="historyId" column="history_id" jdbcType="BIGINT"/>
+            <result property="retroactiveId" column="retroactive_id" jdbcType="VARCHAR"/>
             <result property="productionLine" column="production_line" jdbcType="VARCHAR"/>
             <result property="batchNo" column="batch_no" jdbcType="VARCHAR"/>
             <result property="lotNo" column="lot_no" jdbcType="VARCHAR"/>