“航征数据处理”

snws-gps/snws-gps-boot/src/main/java/com/tofly/gpsboot/handler/plan/PlanTimeoutHandler.java

@@ -33,7 +33,7 @@ public class PlanTimeoutHandler {
         List<String> planStateList = new ArrayList<>();
         planStateList.add(PlanStateEnum.PLAN_STATE_BEING_PERFORMED.getCode());
         planStateList.add(PlanStateEnum.PLAN_STATE_EXECUTION_NOT_STARTED.getCode());
-        planStateList.add(PlanStateEnum.PLAN_STATE_NOT_START_ON_TIME.getCode());
+        planStateList.add(PlanStateEnum.PLAN_STATE_NOT_START.getCode());
 
         List<Plan> planList = planService.list(new QueryWrapper<Plan>().lambda()
                 .in(Plan::getPlanState, planStateList));

snws-monitor/snws-monitor-api/src/main/java/com/tofly/pojo/TfStocksDeviceInfo.java

@@ -0,0 +1,103 @@
+/*
+ * Author: wangjian
+ * 生成entity
+ */
+package com.tofly.pojo;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+
+/**
+ * 物资设备信息表（包含物料、设备、药品）
+ *
+ * @author JF
+ * @date Wed Mar 29 00:00:00 CST 2023
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName(value="TF_STOCKS_DEVICE_INFO",resultMap = "tfStocksDeviceInfoMap")
+@KeySequence("TF_STOCKS_DEVICE_INFO")
+@ApiModel
+public class TfStocksDeviceInfo extends Model<TfStocksDeviceInfo> {
+    private static final long serialVersionUID = 1L;
+
+        /**
+     * $column.comments
+     */
+        @TableId(value = "id",type=  IdType.ASSIGN_ID)
+            @ApiModelProperty(value = "$column.comments")
+                private Long id;
+                /**
+     * 设备唯一编码
+     */
+            @ApiModelProperty(value = "设备唯一编码")
+                private String deviceNo;
+                /**
+     * 设备名称
+     */
+            @ApiModelProperty(value = "设备名称")
+                private String deviceName;
+                /**
+     * 设备规格型号
+     */
+            @ApiModelProperty(value = "设备规格型号")
+                private String deviceSpecsModel;
+                /**
+     * 设备单位（字典ID）
+     */
+            @ApiModelProperty(value = "设备单位（字典ID）")
+                private Long deviceUnitId;
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String deviceUnitIdName;
+                /**
+     * 设备单位名称
+     */
+            @ApiModelProperty(value = "设备单位名称")
+                private String deviceUnitName;
+                /**
+     * 设备所在地址
+     */
+            @ApiModelProperty(value = "设备所在地址")
+                private String deviceAddress;
+                /**
+     * 设备购买时间
+     */
+            @ApiModelProperty(value = "设备购买时间")
+        @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+                private Date devicePurchaseTime;
+                /**
+     * 设备安装时间
+     */
+            @ApiModelProperty(value = "设备安装时间")
+        @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+                private Date deviceInstallTime;
+                /**
+     * 物资类型
+     */
+            @ApiModelProperty(value = "物资类型")
+                private Long materialTypeId;
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String materialTypeName;
+                /**
+     * 物资类别（物料，设备，药品）
+     */
+            @ApiModelProperty(value = "物资类别（物料，设备，药品）")
+                private Long deviceType;
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String deviceTypeName;
+            
+}

snws-monitor/snws-monitor-api/src/main/java/com/tofly/pojo/TfStocksShelves.java

@@ -49,7 +49,7 @@ public class TfStocksShelves extends Model<TfStocksShelves> {
                 private Long storeId;
     @ApiModelProperty(hidden = true)
     @TableField(exist = false)
-    private String storeName;
+    private TfStocksStore stocksStore;
                 /**
      * 货架编号
      */

snws-monitor/snws-monitor-boot/src/main/java/com/tofly/monitor/config/MqttConfig.java

@@ -62,8 +62,8 @@ public class MqttConfig {
     @Bean
     public MessageProducer inbound() {
         // Paho客户端消息驱动通道适配器，主要用来订阅主题
-        MqttPahoMessageDrivenChannelAdapter adapter = new MqttPahoMessageDrivenChannelAdapter("consumerClient-paho",
-                mqttClientFactory(), "boat", "collector", "battery", "+/sensor", "demo","hello_word1","my-topic");
+        MqttPahoMessageDrivenChannelAdapter adapter = new MqttPahoMessageDrivenChannelAdapter("consumerClient-hz",
+                mqttClientFactory(), "boat", "collector", "battery", "+/sensor", "demo","my-topic");
         adapter.setCompletionTimeout(5000);
 
         // Paho消息转换器

snws-monitor/snws-monitor-boot/src/main/java/com/tofly/monitor/controller/TfStocksDeviceInfoController.java

@@ -0,0 +1,116 @@
+/*
+ * Author: wangjian
+ * 生成controller
+ */
+package com.tofly.monitor.controller;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.tofly.common.core.entity.ResultRespone;
+import com.tofly.common.log.annotation.ToFlyAppLog;
+import com.tofly.monitor.service.TfStocksDeviceInfoService;
+import com.tofly.pojo.TfStocksDeviceInfo;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import org.springframework.web.bind.annotation.ModelAttribute;
+
+import java.util.Arrays;
+/**
+ * 物资设备信息表（包含物料、设备、药品）
+ *
+ * @author JF
+ * @date Wed Mar 29 00:00:00 CST 2023
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/tfstocksdeviceinfo")
+@Api(tags="物资设备信息表（包含物料、设备、药品）接口")
+public class TfStocksDeviceInfoController {
+
+    private final  TfStocksDeviceInfoService tfStocksDeviceInfoService;
+
+    /**
+    * 分页查询
+    * @param page 分页对象
+    * @param tfStocksDeviceInfo 物资设备信息表（包含物料、设备、药品）
+    * @return
+    */
+    @GetMapping("/page" )
+    @ApiOperation(value = "分页查询")
+    public ResultRespone getTfStocksDeviceInfoPage(Page page, @ModelAttribute TfStocksDeviceInfo tfStocksDeviceInfo) {
+      return ResultRespone.success(tfStocksDeviceInfoService.page(page, Wrappers.query(tfStocksDeviceInfo)));
+    }
+
+
+    /**
+     * 通过id查询物资设备信息表（包含物料、设备、药品）
+     * @param id id
+     * @return ResultRespone
+     */
+    @GetMapping("/{id}" )
+    @ApiOperation(value = "通过ID查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
+    })
+    public ResultRespone getById(@PathVariable("id" ) Long id) {
+      return ResultRespone.success(tfStocksDeviceInfoService.getById(id));
+    }
+
+    /**
+     * 新增物资设备信息表（包含物料、设备、药品）
+     * @param tfStocksDeviceInfo 物资设备信息表（包含物料、设备、药品）
+     * @return ResultRespone
+     */
+    @ToFlyAppLog(title="新增物资设备信息表（包含物料、设备、药品）" )
+    @ApiOperation(value = "新增物资设备信息表（包含物料、设备、药品）")
+    @PostMapping
+    public ResultRespone save(@RequestBody TfStocksDeviceInfo tfStocksDeviceInfo) {
+      return ResultRespone.success(tfStocksDeviceInfoService.save(tfStocksDeviceInfo));
+    }
+
+    /**
+     * 修改物资设备信息表（包含物料、设备、药品）
+     * @param tfStocksDeviceInfo 物资设备信息表（包含物料、设备、药品）
+     * @return ResultRespone
+     */
+    @ToFlyAppLog(title="修改物资设备信息表（包含物料、设备、药品）" )
+    @ApiOperation(value = "修改物资设备信息表（包含物料、设备、药品）")
+    @PutMapping
+    public ResultRespone updateById(@RequestBody TfStocksDeviceInfo tfStocksDeviceInfo) {
+      return ResultRespone.success(tfStocksDeviceInfoService.updateById(tfStocksDeviceInfo));
+    }
+
+    /**
+     * 通过id删除物资设备信息表（包含物料、设备、药品）
+     * @param id id
+     * @return ResultRespone
+     */
+    @ToFlyAppLog(title="通过id删除物资设备信息表（包含物料、设备、药品）" )
+    @ApiOperation(value = "通过ID删除物资设备信息表（包含物料、设备、药品）")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
+    })
+    @DeleteMapping("/{id}" )
+    public ResultRespone removeById(@PathVariable Long id) {
+      return ResultRespone.success(tfStocksDeviceInfoService.removeById(id));
+    }
+
+    /**
+     * 通过id批量删除物资设备信息表（包含物料、设备、药品）
+     * @param ids id
+     * @return ResultRespone
+     */
+    @ToFlyAppLog(title="通过id批量删除物资设备信息表（包含物料、设备、药品）" )
+    @ApiOperation(value = "通过ID批量删除物资设备信息表（包含物料、设备、药品）")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "ids", value = "批量删除，多个id以逗号隔开", required = true, dataType = "String")
+    })
+    @DeleteMapping("/deleteByIds" )
+    public ResultRespone removeById(String ids) {
+        return ResultRespone.success(tfStocksDeviceInfoService.removeByIds(Arrays.asList(ids.split(","))));
+    }
+}

snws-monitor/snws-monitor-boot/src/main/java/com/tofly/monitor/controller/TfStocksShelvesController.java

@@ -9,7 +9,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.tofly.common.core.entity.ResultRespone;
 import com.tofly.common.log.annotation.ToFlyAppLog;
 import com.tofly.monitor.service.TfStocksShelvesService;
+import com.tofly.monitor.service.TfStocksStoreService;
 import com.tofly.pojo.TfStocksShelves;
+import com.tofly.pojo.TfStocksStore;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.Api;
@@ -32,6 +34,7 @@ import java.util.Arrays;
 public class TfStocksShelvesController {
 
     private final  TfStocksShelvesService tfStocksShelvesService;
+    private final TfStocksStoreService tfStocksStoreService;
 
     /**
     * 分页查询
@@ -42,7 +45,9 @@ public class TfStocksShelvesController {
     @GetMapping("/page" )
     @ApiOperation(value = "分页查询")
     public ResultRespone getTfStocksShelvesPage(Page page, @ModelAttribute TfStocksShelves tfStocksShelves) {
-      return ResultRespone.success(tfStocksShelvesService.page(page, Wrappers.query(tfStocksShelves)));
+        Page<TfStocksShelves> shelvesPage = tfStocksShelvesService.page(page, Wrappers.query(tfStocksShelves));
+        shelvesPage.getRecords().forEach(e -> e.setStocksStore(tfStocksStoreService.getById(e.getStoreId())));
+      return ResultRespone.success(shelvesPage);
     }
 
 

snws-monitor/snws-monitor-boot/src/main/java/com/tofly/monitor/mapper/TfStocksDeviceInfoMapper.java

@@ -0,0 +1,16 @@
+/*
+ * Author: wangjian
+ * 生成mapper
+ */
+package com.tofly.monitor.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.tofly.pojo.TfStocksDeviceInfo;
+/**
+ * 物资设备信息表（包含物料、设备、药品）
+ *
+ * @author JF
+ * @date Wed Mar 29 00:00:00 CST 2023
+ */
+public interface TfStocksDeviceInfoMapper extends BaseMapper<TfStocksDeviceInfo> {
+                                            }

snws-monitor/snws-monitor-boot/src/main/java/com/tofly/monitor/mqtt/HangZhengTopicHandler.java

@@ -109,7 +109,7 @@ public class HangZhengTopicHandler implements TopicHandler {
                 indexVal.setId(Long.parseLong(String.valueOf(indexVal2.get(0).get("id"))));
                 customDisplayMapper.updateTemp(indexVal);
             }
-            indexVal.setId(null);
+            indexVal.setId(id);
             indexValList.add(indexVal);
         }
 
@@ -141,7 +141,7 @@ public class HangZhengTopicHandler implements TopicHandler {
                 indexVal.setId(Long.parseLong(String.valueOf(indexVal1.get(0).get("id"))));
                 customDisplayMapper.updateTemp(indexVal);
             }
-            indexVal.setId(null);
+            indexVal.setId(id);
             indexValList.add(indexVal);
 
             id = SnowFlake.nextId();
@@ -159,7 +159,7 @@ public class HangZhengTopicHandler implements TopicHandler {
                 indexVal.setId(Long.parseLong(String.valueOf(indexVal2.get(0).get("id"))));
                 customDisplayMapper.updateTemp(indexVal);
             }
-            indexVal.setId(null);
+            indexVal.setId(id);
             indexValList.add(indexVal);
         }
 
@@ -191,7 +191,7 @@ public class HangZhengTopicHandler implements TopicHandler {
                 indexVal.setId(Long.parseLong(String.valueOf(indexVal1.get(0).get("id"))));
                 customDisplayMapper.updateTemp(indexVal);
             }
-            indexVal.setId(null);
+            indexVal.setId(id);
             indexValList.add(indexVal);
 
             id = SnowFlake.nextId();
@@ -209,7 +209,7 @@ public class HangZhengTopicHandler implements TopicHandler {
                 indexVal.setId(Long.parseLong(String.valueOf(indexVal2.get(0).get("id"))));
                 customDisplayMapper.updateTemp(indexVal);
             }
-            indexVal.setId(null);
+            indexVal.setId(id);
             indexValList.add(indexVal);
         }
 
@@ -241,7 +241,7 @@ public class HangZhengTopicHandler implements TopicHandler {
                 indexVal.setId(Long.parseLong(String.valueOf(indexVal1.get(0).get("id"))));
                 customDisplayMapper.updateTemp(indexVal);
             }
-            indexVal.setId(null);
+            indexVal.setId(id);
             indexValList.add(indexVal);
         }
 

snws-monitor/snws-monitor-boot/src/main/java/com/tofly/monitor/mqtt/HelloWordTopicHandler.java

@@ -1,17 +0,0 @@
-package com.tofly.monitor.mqtt;
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.messaging.Message;
-import org.springframework.stereotype.Service;
-
-@Service("helloWordTopicHandler")
-@Slf4j
-public class HelloWordTopicHandler implements TopicHandler {
-
-    @Override
-    public void handler(Message<?> message) {
-        String payload = String.valueOf(message.getPayload());
-        log.info("handler(),串口数据接收,payload:{}", payload);
-    }
-
-}

snws-monitor/snws-monitor-boot/src/main/java/com/tofly/monitor/mqtt/MqttTopicEnum.java

@@ -11,7 +11,6 @@ import java.util.Map;
 @Getter
 public enum MqttTopicEnum {
     Serial_PORT("demo", "测试topic", "demoTopicHandler", DemoTopicHandler.class),
-    Serial_PORT_MY_TOPIC("hello_word1", "hello_word1", "helloWordTopicHandler", HelloWordTopicHandler.class),
     Serial_PORT_HANG_ZHENG("my-topic", "my-topic", "hangZhengTopicHandler", HangZhengTopicHandler.class),
     ;
     private String topic;

snws-monitor/snws-monitor-boot/src/main/java/com/tofly/monitor/service/TfStocksDeviceInfoService.java

@@ -0,0 +1,19 @@
+/*
+ * Author: wangjian
+ * 生成Service
+ */
+package com.tofly.monitor.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.tofly.pojo.TfStocksDeviceInfo;
+
+/**
+ * 物资设备信息表（包含物料、设备、药品）
+ *
+ * @author JF
+ * @date Wed Mar 29 00:00:00 CST 2023
+ */
+public interface TfStocksDeviceInfoService extends IService<TfStocksDeviceInfo> {
+
+}

snws-monitor/snws-monitor-boot/src/main/java/com/tofly/monitor/service/impl/TfStocksDeviceInfoServiceImpl.java

@@ -0,0 +1,23 @@
+/*
+ * Author: wangjian
+ * 生成ServiceImpl
+ */
+package com.tofly.monitor.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.tofly.monitor.service.TfStocksDeviceInfoService;
+import com.tofly.pojo.TfStocksDeviceInfo;
+import org.springframework.stereotype.Service;
+import com.tofly.monitor.mapper.TfStocksDeviceInfoMapper;
+
+/**
+ * 物资设备信息表（包含物料、设备、药品）
+ *
+ * @author JF
+ * @date Wed Mar 29 00:00:00 CST 2023
+ */
+@Service("tfStocksDeviceInfoService")
+public class TfStocksDeviceInfoServiceImpl extends ServiceImpl<TfStocksDeviceInfoMapper, TfStocksDeviceInfo> implements TfStocksDeviceInfoService {
+
+}

snws-monitor/snws-monitor-boot/src/main/resources/mapper/TfStocksDeviceInfoMapper.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.tofly.monitor.mapper.TfStocksDeviceInfoMapper">
+
+  <resultMap id="tfStocksDeviceInfoMap" type="com.tofly.pojo.TfStocksDeviceInfo">
+                <id property="id" column="ID"/>
+                    <result property="deviceNo" column="DEVICE_NO"/>
+                      <result property="deviceName" column="DEVICE_NAME"/>
+                      <result property="deviceSpecsModel" column="DEVICE_SPECS_MODEL"/>
+                      <result property="deviceUnitId" column="DEVICE_UNIT_ID"/>
+                      <result property="deviceUnitName" column="DEVICE_UNIT_NAME"/>
+                      <result property="deviceAddress" column="DEVICE_ADDRESS"/>
+                      <result property="devicePurchaseTime" column="DEVICE_PURCHASE_TIME"/>
+                      <result property="deviceInstallTime" column="DEVICE_INSTALL_TIME"/>
+                      <result property="materialTypeId" column="MATERIAL_TYPE_ID"/>
+                      <result property="deviceType" column="DEVICE_TYPE"/>
+    <association property="materialTypeName" column="MATERIAL_TYPE_ID" select="selectMaterialTypeName"></association>
+    <association property="deviceTypeName" column="DEVICE_TYPE" select="selectDeviceTypeName"></association>
+    <association property="deviceUnitIdName" column="DEVICE_UNIT_ID" select="selectDeviceUnitIdName"></association>
+  </resultMap>
+
+  <select id="selectMaterialTypeName" resultType="String">
+    select MATERIAL_TYPE_NAME materialTypeName
+    FROM TF_STOCKS_MATERIAL_TYPE
+    where id = #{materialTypeId}
+  </select>
+
+  <select id="selectDeviceTypeName" resultType="String">
+    select CNAME deviceTypeName
+    from TF_YWPN_SYSCHILDCODE_D
+    where ID = #{deviceType}
+  </select>
+
+  <select id="selectDeviceUnitIdName" resultType="String">
+    select CNAME deviceUnitIdName
+    from TF_YWPN_SYSCHILDCODE_D
+    where ID = #{deviceUnitId}
+  </select>
+
+                                                                    
+</mapper>

snws-monitor/snws-monitor-boot/src/main/resources/mapper/TfStocksInstockDetailMapper.xml

@@ -29,7 +29,7 @@
 
     <select id="selectDeviceName" resultType="String">
         select name deviceName
-        FROM TF_YWPN_MONITOR_DEVICE_W
+        FROM TF_STOCKS_DEVICE_INFO
         where id = #{deviceId}
     </select>
 

snws-monitor/snws-monitor-boot/src/main/resources/mapper/TfStocksShelvesMapper.xml

@@ -13,7 +13,6 @@
                       <result property="shelvesRemark" column="SHELVES_REMARK"/>
       <result property="belongStationId" column="belong_station_id"/>
       <association property="belongStationName" column="belong_station_id" select="selectBelongStationName"></association>
-      <association property="storeName" column="STORE_ID" select="selectStoreName"></association>
   </resultMap>
 
     <select id="selectBelongStationName" resultType="String">
@@ -22,12 +21,6 @@
         where id = #{belongStationId} and del_flag = '0'
     </select>
 
-    <select id="selectStoreName" resultType="String">
-        select STORE_NAME
-        from TF_STOCKS_STORE
-        where ID = #{storeId}
-    </select>
-
 
                                             
 </mapper>