整合提交

service-issue/pom.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>usky-modules</artifactId>
+        <groupId>com.usky</groupId>
+        <version>0.0.1</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>service-issue</artifactId>
+
+    <packaging>pom</packaging>
+    <version>0.0.1</version>
+
+    <modules>
+        <module>service-issue-biz</module>
+        <module>service-issue-api</module>
+    </modules>
+</project>

service-issue/service-issue-biz/src/main/java/com/usky/issue/controller/web/YtDeviceStatusController.java

@@ -7,11 +7,9 @@ import com.usky.issue.domain.YtDeviceStatus;
 import com.usky.issue.service.YtDeviceStatusService;
 import com.usky.issue.service.vo.YtDeviceStatusRequestVO;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
 
 /**
  * <p>
@@ -37,5 +35,15 @@ public class YtDeviceStatusController {
         return ApiResult.success(ytDeviceStatusService.page(requestVO));
     }
 
+    /**
+     * 导出
+     * @param
+     * @return
+     */
+    @GetMapping("export")
+    ApiResult<List<YtDeviceStatus>> export(){
+        return ApiResult.success(ytDeviceStatusService.export());
+    }
+
 }
 

service-issue/service-issue-biz/src/main/java/com/usky/issue/mapper/YtDeviceStatusMapper.java

@@ -20,4 +20,5 @@ public interface YtDeviceStatusMapper extends CrudMapper<YtDeviceStatus> {
     List<YtDeviceStatus> getDeviceStatusType(@Param("deviceType") String deviceType,
                                              @Param("Current") int Current,
                                              @Param("Size") int Size);
+    List<YtDeviceStatus> exportData();
 }

service-issue/service-issue-biz/src/main/java/com/usky/issue/service/YtDeviceStatusService.java

@@ -17,4 +17,5 @@ import java.util.List;
  */
 public interface YtDeviceStatusService extends CrudService<YtDeviceStatus> {
     CommonPage<YtDeviceStatus> page(YtDeviceStatusRequestVO requestVO);
+    List<YtDeviceStatus> export();
 }

service-issue/service-issue-biz/src/main/java/com/usky/issue/service/impl/YtDeviceStatusServiceImpl.java

@@ -57,4 +57,10 @@ public class YtDeviceStatusServiceImpl extends AbstractCrudService<YtDeviceStatu
 
         return new CommonPage<>(records, total, pageSize, pageCurrent);
     }
+
+    @Override
+    public List<YtDeviceStatus> export() {
+        return ytDeviceStatusMapper.exportData();
+    }
+
 }

service-issue/service-issue-biz/src/main/resources/mapper/issue/YtDeviceStatusMapper.xml

@@ -21,16 +21,32 @@
         device_code,device_name,address,device_type,company_name,company_code,data_time
         from yt_device_status yds
         <where>
-                company_code in ('10357','10356','10354','10352','10349','10350','10347','10346','10334','10188',
+                difference > 48
+                AND company_code in ('10357','10356','10354','10352','10349','10350','10347','10346','10334','10188',
                 '10343','10348','10331','10320','10320','10164','10071','10345','10144','10064','10336','10131','10205',
                 '10340','10339','10225','10323','10320','10134','10337','10226','10214','10160','10076','10079','10078',
                 '10215','10324','10324','10154','10106','10121','10067','10325','10323','10322','10320','10128','10314',
                 '10315','10312','10222','10077','10146','10151','10232','10116','10114','10122','10166','10353','10358',
                 '10359','10361','10360','10140','10362','10206','10355','10105','10338','10318','10367','10124','10365',
                 '10363','10368','10371','10341','10375','10373','10126','10374','10376','10378')
-                AND difference > 48
         </where>
-        order by company_code asc
+        ORDER BY company_code ASC
+    </select>
+    <select id="exportData" resultType="com.usky.issue.domain.YtDeviceStatus">
+        SELECT device_code,device_name,address,device_type,company_name,company_code,data_time
+        FROM yt_device_status yds
+        <where>
+            device_type NOT IN ('烟感系统','电气火灾','视频监测')
+            AND difference > 48
+            AND company_code IN ('10357','10356','10354','10352','10349','10350','10347','10346','10334','10188',
+            '10343','10348','10331','10320','10320','10164','10071','10345','10144','10064','10336','10131','10205',
+            '10340','10339','10225','10323','10320','10134','10337','10226','10214','10160','10076','10079','10078',
+            '10215','10324','10324','10154','10106','10121','10067','10325','10323','10322','10320','10128','10314',
+            '10315','10312','10222','10077','10146','10151','10232','10116','10114','10122','10166','10353','10358',
+            '10359','10361','10360','10140','10362','10206','10355','10105','10338','10318','10367','10124','10365',
+            '10363','10368','10371','10341','10375','10373','10126','10374','10376','10378')
+        </where>
+        ORDER BY company_code ASC
     </select>
 
 </mapper>

service-park/service-park-biz/src/main/java/com/usky/park/MybatisGenerator.java

@@ -32,7 +32,7 @@ public class MybatisGenerator {
         projectPath+="/"+model;
         gc.setOutputDir(projectPath+ "/src/main/java");  //生成路径(一般都是生成在此项目的src/main/java下面)
         //修改为自己的名字
-        gc.setAuthor("zyj"); //设置作者
+        gc.setAuthor("fu"); //设置作者
         gc.setOpen(false);
         gc.setFileOverride(true); //第二次生成会把第一次生成的覆盖掉
         gc.setServiceName("%sService"); //生成的service接口名字首字母是否为I，这样设置就没有
@@ -70,7 +70,7 @@ public class MybatisGenerator {
         // strategy.setTablePrefix("t_"); // 表名前缀
         strategy.setEntityLombokModel(true); //使用lombok
         //修改自己想要生成的表
-        strategy.setInclude("event_eg");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
+        strategy.setInclude("data_st_history");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
         mpg.setStrategy(strategy);
 
         // 关闭默认 xml 生成，调整生成 至 根目录

service-park/service-park-biz/src/main/java/com/usky/park/controller/web/DataStHistoryController.java

@@ -0,0 +1,44 @@
+package com.usky.park.controller.web;
+
+
+import com.usky.park.domain.DataStHistory;
+import com.usky.park.mapper.DataStHistoryMapper;
+import com.usky.park.service.DataStHistoryService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 无人驿站历史数据 前端控制器
+ * </p>
+ *
+ * @author fu
+ * @since 2023-11-29
+ */
+@RestController
+@RequestMapping("/dataStHistory")
+public class DataStHistoryController {
+
+    @Autowired
+    private DataStHistoryService dataStHistoryService;
+
+    @Autowired
+    private DataStHistoryMapper dataStHistoryMapper;
+
+
+    /**
+     * 新增
+     *
+     * @param dataStHistory
+     * @return
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody DataStHistory dataStHistory,
+                    @RequestHeader("appKey") String appKey) {
+        dataStHistoryService.add(dataStHistory, appKey);
+    }
+
+}
+

service-park/service-park-biz/src/main/java/com/usky/park/domain/DataStHistory.java

@@ -0,0 +1,82 @@
+package com.usky.park.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.influxdb.annotation.Column;
+
+/**
+ * <p>
+ * 无人驿站历史数据
+ * </p>
+ *
+ * @author fu
+ * @since 2023-11-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DataStHistory implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 订单编号
+     */
+    private String packNo;
+
+    /**
+     * 快递名称
+     */
+    private String expressName;
+
+    /**
+     * 接收人电话
+     */
+    private String receiverPhone;
+
+    /**
+     * 联系电话
+     */
+    private String contactPhone;
+
+    /**
+     * 取件地址
+     */
+    private String pickupAddress;
+
+    /**
+     * 取件编号
+     */
+    private String pickupCode;
+
+    /**
+     * 描述内容
+     */
+    private String content;
+
+    /**
+     * 驿站标识
+     */
+    private String appKey;
+
+    /**
+     * 数据时间
+     */
+    private LocalDateTime dataTime;
+
+    /**
+     * 订单状态;0：已推送，1：未推送
+     */
+    private Integer packStatus;
+
+
+}

service-park/service-park-biz/src/main/java/com/usky/park/mapper/DataStHistoryMapper.java

@@ -0,0 +1,20 @@
+package com.usky.park.mapper;
+
+import com.usky.park.domain.DataStHistory;
+import com.usky.common.mybatis.core.CrudMapper;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 无人驿站历史数据 Mapper 接口
+ * </p>
+ *
+ * @author fu
+ * @since 2023-11-29
+ */
+@Repository
+public interface DataStHistoryMapper extends CrudMapper<DataStHistory> {
+    List<DataStHistory> checkPackNo(String packNo);
+}

service-park/service-park-biz/src/main/java/com/usky/park/service/DataStHistoryService.java

@@ -0,0 +1,16 @@
+package com.usky.park.service;
+
+import com.usky.park.domain.DataStHistory;
+import com.usky.common.mybatis.core.CrudService;
+
+/**
+ * <p>
+ * 无人驿站历史数据 服务类
+ * </p>
+ *
+ * @author fu
+ * @since 2023-11-29
+ */
+public interface DataStHistoryService extends CrudService<DataStHistory> {
+    void add(DataStHistory dataStHistory,String appKey);
+}

service-park/service-park-biz/src/main/java/com/usky/park/service/impl/DataStHistoryServiceImpl.java

@@ -0,0 +1,48 @@
+package com.usky.park.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.usky.common.core.exception.BusinessException;
+import com.usky.park.domain.DataStHistory;
+import com.usky.park.mapper.DataStHistoryMapper;
+import com.usky.park.service.DataStHistoryService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 无人驿站历史数据 服务实现类
+ * </p>
+ *
+ * @author fu
+ * @since 2023-11-29
+ */
+@Service
+public class DataStHistoryServiceImpl extends AbstractCrudService<DataStHistoryMapper, DataStHistory> implements DataStHistoryService {
+    @Autowired
+    private DataStHistoryMapper dataStHistoryMapper;
+
+    @Override
+    public void add(DataStHistory dataStHistory, String appKey) {
+
+        String appKeyLo = "6C57702BB93E9BA136B9337F0C1BA1BC";
+
+        if (!appKey.equals(appKeyLo)) {
+            throw new IllegalArgumentException("appKey不正确!");
+        } else if ((dataStHistoryMapper.checkPackNo(dataStHistory.getPackNo())).size() > 0) {
+            throw new BusinessException("订单编号已存在!请再次核对");
+        } else {
+            dataStHistory.setAppKey(appKey);
+        }
+
+        LocalDateTime dataTime = LocalDateTime.now();
+        Integer packStatus = 1;
+        dataStHistory.setDataTime(dataTime);
+        dataStHistory.setPackStatus(packStatus);
+
+        baseMapper.insert(dataStHistory);
+    }
+}

service-park/service-park-biz/src/main/resources/mapper/park/DataStHistoryMapper.xml

@@ -0,0 +1,28 @@
+<?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.usky.park.mapper.DataStHistoryMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.park.domain.DataStHistory">
+        <id column="id" property="id" />
+        <result column="pack_no" property="packNo" />
+        <result column="express_name" property="expressName" />
+        <result column="receiver_phone" property="receiverPhone" />
+        <result column="contact_phone" property="contactPhone" />
+        <result column="pickup_address" property="pickupAddress" />
+        <result column="pickup_code" property="pickupCode" />
+        <result column="content" property="content" />
+        <result column="app_key" property="appKey" />
+        <result column="data_time" property="dataTime" />
+        <result column="pack_status" property="packStatus" />
+    </resultMap>
+
+    <select id="checkPackNo" resultType="com.usky.park.domain.DataStHistory">
+        <if test="packNo != null">
+            SELECT *
+            FROM data_st_history
+            WHERE pack_no = #{packNo}
+        </if>
+    </select>
+
+</mapper>