From 955ec151b467016c24235e28b9ea09d324db7139 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 24 九月 2024 14:26:02 +0800
Subject: [PATCH] 2024-09-24 朱宝民 修改付款方式
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealControllerTramp.java | 2
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/dto/StartPoint.java | 33 +++
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/dto/StopPoint.java | 32 +++
pipIrr-platform/pipIrr-global/src/main/resources/application-database-test.yml | 4
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/dto/TrackPoint.java | 33 +++
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectCtrl.java | 22 ++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoOp/OpeInspect.java | 59 ++++++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoOp/OpeTrack.java | 66 +++++++
pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeInspectMapper.xml | 91 ++++++++++
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java | 7
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectSv.java | 24 ++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoOp/OpeInspectMapper.java | 27 +++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoOp/OpeTrackMapper.java | 27 +++
pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeTrackMapper.xml | 102 +++++++++++
pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml | 5
15 files changed, 524 insertions(+), 10 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoOp/OpeInspectMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoOp/OpeInspectMapper.java
new file mode 100644
index 0000000..86ab9e7
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoOp/OpeInspectMapper.java
@@ -0,0 +1,27 @@
+package com.dy.pipIrrGlobal.daoOp;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dy.pipIrrGlobal.pojoOp.OpeInspect;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author ZhuBaoMin
+ * @date 2024-09-24 10:07
+ * @LastEditTime 2024-09-24 10:07
+ * @Description
+ */
+
+@Mapper
+public interface OpeInspectMapper extends BaseMapper<OpeInspect> {
+ int deleteByPrimaryKey(Long id);
+
+ int insert(OpeInspect record);
+
+ int insertSelective(OpeInspect record);
+
+ OpeInspect selectByPrimaryKey(Long id);
+
+ int updateByPrimaryKeySelective(OpeInspect record);
+
+ int updateByPrimaryKey(OpeInspect record);
+}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoOp/OpeTrackMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoOp/OpeTrackMapper.java
new file mode 100644
index 0000000..8e639bf
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoOp/OpeTrackMapper.java
@@ -0,0 +1,27 @@
+package com.dy.pipIrrGlobal.daoOp;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dy.pipIrrGlobal.pojoOp.OpeTrack;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author ZhuBaoMin
+ * @date 2024-09-24 10:08
+ * @LastEditTime 2024-09-24 10:08
+ * @Description
+ */
+
+@Mapper
+public interface OpeTrackMapper extends BaseMapper<OpeTrack> {
+ int deleteByPrimaryKey(Long id);
+
+ int insert(OpeTrack record);
+
+ int insertSelective(OpeTrack record);
+
+ OpeTrack selectByPrimaryKey(Long id);
+
+ int updateByPrimaryKeySelective(OpeTrack record);
+
+ int updateByPrimaryKey(OpeTrack record);
+}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoOp/OpeInspect.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoOp/OpeInspect.java
new file mode 100644
index 0000000..85b2b9c
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoOp/OpeInspect.java
@@ -0,0 +1,59 @@
+package com.dy.pipIrrGlobal.pojoOp;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.dy.common.po.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import jakarta.validation.constraints.NotNull;
+import lombok.*;
+
+import java.util.Date;
+
+/**
+ * @author ZhuBaoMin
+ * @date 2024-09-24 10:07
+ * @LastEditTime 2024-09-24 10:07
+ * @Description
+ */
+/**
+ * 宸℃琛�
+ */
+
+@TableName(value = "ope_inspect", autoResultMap = true)
+@Data
+@Builder
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+public class OpeInspect implements BaseEntity {
+ public static final long serialVersionUID = 202409241013001L;
+
+ /**
+ * 涓婚敭
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ @TableId(type = IdType.INPUT)
+ private Long id;
+
+ /**
+ * 宸℃鍛業D
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ @NotNull(message = "宸℃鍛業D涓嶈兘涓虹┖")
+ private Long inspectorId;
+
+ /**
+ * 寮�濮嬪贰妫�鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date startTime;
+
+ /**
+ * 缁撴潫宸℃鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date stopTime;
+}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoOp/OpeTrack.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoOp/OpeTrack.java
new file mode 100644
index 0000000..4496986
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoOp/OpeTrack.java
@@ -0,0 +1,66 @@
+package com.dy.pipIrrGlobal.pojoOp;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.dy.common.po.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import jakarta.validation.constraints.NotNull;
+import lombok.*;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author ZhuBaoMin
+ * @date 2024-09-24 10:08
+ * @LastEditTime 2024-09-24 10:08
+ * @Description
+ */
+/**
+ * 宸℃杞ㄨ抗琛�
+ */
+
+@TableName(value = "ope_track", autoResultMap = true)
+@Data
+@Builder
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+public class OpeTrack implements BaseEntity {
+ public static final long serialVersionUID = 202409241013001L;
+
+ /**
+ * 涓婚敭
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ @TableId(type = IdType.INPUT)
+ private Long id;
+
+ /**
+ * 宸℃ID
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ @NotNull(message = "宸℃ID涓嶈兘涓虹┖")
+ private Long inspectId;
+
+ /**
+ * 缁忓害
+ */
+ @NotNull(message = "缁忓害涓嶈兘涓虹┖")
+ private BigDecimal lng;
+
+ /**
+ * 绾害
+ */
+ @NotNull(message = "绾害涓嶈兘涓虹┖")
+ private BigDecimal lat;
+
+ /**
+ * 鎵撶偣鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date locateTime;
+}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-database-test.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-database-test.yml
index 4e972d0..742d541 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-database-test.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-database-test.yml
@@ -6,8 +6,8 @@
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
# url: jdbc:mysql://192.168.40.166:3306/pipIrr_test?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
-# url: jdbc:mysql://8.130.130.233:3306/pipIrr_test?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
- url: jdbc:mysql://127.0.0.1:3306/pipIrr_test?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+ url: jdbc:mysql://8.130.130.233:3306/pipIrr_test?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+# url: jdbc:mysql://127.0.0.1:3306/pipIrr_test?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
username: root
password: dysql,;.abc!@#
druid:
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml b/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml
index ade2283..55fe57e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml
@@ -21,9 +21,8 @@
<user name="瓒呯骇绠＄悊鍛�" phone="admin" password="dyyjy" supperAdmin="1" />
<payments>
<item1 name="鐜伴噾"/>
- <item2 name="寰俊鏀粯"/>
- <item3 name="鏀粯瀹濇敮浠�"/>
- <item4 name="閾惰杞处"/>
+ <item2 name="POS鏈�"/>
+ <item3 name="閾惰杞处"/>
</payments>
<settings>
<item1 item_name="lng" item_value="101.89878161146011" remarks="缁忓害"/>
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeInspectMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeInspectMapper.xml
new file mode 100644
index 0000000..888dd76
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeInspectMapper.xml
@@ -0,0 +1,91 @@
+<?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.dy.pipIrrGlobal.daoOp.OpeInspectMapper">
+ <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoOp.OpeInspect">
+ <!--@mbg.generated-->
+ <!--@Table ope_inspect-->
+ <id column="id" jdbcType="BIGINT" property="id" />
+ <result column="inspector_id" jdbcType="BIGINT" property="inspectorId" />
+ <result column="start_time" jdbcType="TIMESTAMP" property="startTime" />
+ <result column="stop_time" jdbcType="TIMESTAMP" property="stopTime" />
+ </resultMap>
+ <sql id="Base_Column_List">
+ <!--@mbg.generated-->
+ id, inspector_id, start_time, stop_time
+ </sql>
+ <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+ <!--@mbg.generated-->
+ select
+ <include refid="Base_Column_List" />
+ from ope_inspect
+ where id = #{id,jdbcType=BIGINT}
+ </select>
+ <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+ <!--@mbg.generated-->
+ delete from ope_inspect
+ where id = #{id,jdbcType=BIGINT}
+ </delete>
+ <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoOp.OpeInspect">
+ <!--@mbg.generated-->
+ insert into ope_inspect (id, inspector_id, start_time,
+ stop_time)
+ values (#{id,jdbcType=BIGINT}, #{inspectorId,jdbcType=BIGINT}, #{startTime,jdbcType=TIMESTAMP},
+ #{stopTime,jdbcType=TIMESTAMP})
+ </insert>
+ <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoOp.OpeInspect">
+ <!--@mbg.generated-->
+ insert into ope_inspect
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null">
+ id,
+ </if>
+ <if test="inspectorId != null">
+ inspector_id,
+ </if>
+ <if test="startTime != null">
+ start_time,
+ </if>
+ <if test="stopTime != null">
+ stop_time,
+ </if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="id != null">
+ #{id,jdbcType=BIGINT},
+ </if>
+ <if test="inspectorId != null">
+ #{inspectorId,jdbcType=BIGINT},
+ </if>
+ <if test="startTime != null">
+ #{startTime,jdbcType=TIMESTAMP},
+ </if>
+ <if test="stopTime != null">
+ #{stopTime,jdbcType=TIMESTAMP},
+ </if>
+ </trim>
+ </insert>
+ <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoOp.OpeInspect">
+ <!--@mbg.generated-->
+ update ope_inspect
+ <set>
+ <if test="inspectorId != null">
+ inspector_id = #{inspectorId,jdbcType=BIGINT},
+ </if>
+ <if test="startTime != null">
+ start_time = #{startTime,jdbcType=TIMESTAMP},
+ </if>
+ <if test="stopTime != null">
+ stop_time = #{stopTime,jdbcType=TIMESTAMP},
+ </if>
+ </set>
+ where id = #{id,jdbcType=BIGINT}
+ </update>
+ <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoOp.OpeInspect">
+ <!--@mbg.generated-->
+ update ope_inspect
+ set inspector_id = #{inspectorId,jdbcType=BIGINT},
+ start_time = #{startTime,jdbcType=TIMESTAMP},
+ stop_time = #{stopTime,jdbcType=TIMESTAMP}
+ where id = #{id,jdbcType=BIGINT}
+ </update>
+</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeTrackMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeTrackMapper.xml
new file mode 100644
index 0000000..fc9cd24
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeTrackMapper.xml
@@ -0,0 +1,102 @@
+<?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.dy.pipIrrGlobal.daoOp.OpeTrackMapper">
+ <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoOp.OpeTrack">
+ <!--@mbg.generated-->
+ <!--@Table ope_track-->
+ <id column="id" jdbcType="BIGINT" property="id" />
+ <result column="inspect_id" jdbcType="BIGINT" property="inspectId" />
+ <result column="lng" jdbcType="DECIMAL" property="lng" />
+ <result column="lat" jdbcType="DECIMAL" property="lat" />
+ <result column="locate_time" jdbcType="TIMESTAMP" property="locateTime" />
+ </resultMap>
+ <sql id="Base_Column_List">
+ <!--@mbg.generated-->
+ id, inspect_id, lng, lat, locate_time
+ </sql>
+ <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+ <!--@mbg.generated-->
+ select
+ <include refid="Base_Column_List" />
+ from ope_track
+ where id = #{id,jdbcType=BIGINT}
+ </select>
+ <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+ <!--@mbg.generated-->
+ delete from ope_track
+ where id = #{id,jdbcType=BIGINT}
+ </delete>
+ <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoOp.OpeTrack">
+ <!--@mbg.generated-->
+ insert into ope_track (id, inspect_id, lng,
+ lat, locate_time)
+ values (#{id,jdbcType=BIGINT}, #{inspectId,jdbcType=BIGINT}, #{lng,jdbcType=DECIMAL},
+ #{lat,jdbcType=DECIMAL}, #{locateTime,jdbcType=TIMESTAMP})
+ </insert>
+ <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoOp.OpeTrack">
+ <!--@mbg.generated-->
+ insert into ope_track
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null">
+ id,
+ </if>
+ <if test="inspectId != null">
+ inspect_id,
+ </if>
+ <if test="lng != null">
+ lng,
+ </if>
+ <if test="lat != null">
+ lat,
+ </if>
+ <if test="locateTime != null">
+ locate_time,
+ </if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="id != null">
+ #{id,jdbcType=BIGINT},
+ </if>
+ <if test="inspectId != null">
+ #{inspectId,jdbcType=BIGINT},
+ </if>
+ <if test="lng != null">
+ #{lng,jdbcType=DECIMAL},
+ </if>
+ <if test="lat != null">
+ #{lat,jdbcType=DECIMAL},
+ </if>
+ <if test="locateTime != null">
+ #{locateTime,jdbcType=TIMESTAMP},
+ </if>
+ </trim>
+ </insert>
+ <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoOp.OpeTrack">
+ <!--@mbg.generated-->
+ update ope_track
+ <set>
+ <if test="inspectId != null">
+ inspect_id = #{inspectId,jdbcType=BIGINT},
+ </if>
+ <if test="lng != null">
+ lng = #{lng,jdbcType=DECIMAL},
+ </if>
+ <if test="lat != null">
+ lat = #{lat,jdbcType=DECIMAL},
+ </if>
+ <if test="locateTime != null">
+ locate_time = #{locateTime,jdbcType=TIMESTAMP},
+ </if>
+ </set>
+ where id = #{id,jdbcType=BIGINT}
+ </update>
+ <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoOp.OpeTrack">
+ <!--@mbg.generated-->
+ update ope_track
+ set inspect_id = #{inspectId,jdbcType=BIGINT},
+ lng = #{lng,jdbcType=DECIMAL},
+ lat = #{lat,jdbcType=DECIMAL},
+ locate_time = #{locateTime,jdbcType=TIMESTAMP}
+ where id = #{id,jdbcType=BIGINT}
+ </update>
+</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java
index adc38bb..c8e5bc5 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java
@@ -1,6 +1,5 @@
package com.dy.rtuMw.server.rtuData.dbSv;
-import com.alibaba.fastjson2.JSON;
import com.dy.common.util.NumUtil;
import com.dy.pipIrrGlobal.daoPr.PrControllerMapper;
import com.dy.pipIrrGlobal.daoPr.PrControllerTrampMapper;
@@ -153,9 +152,9 @@
*/
@Transactional(rollbackFor = Exception.class)
public void savePrConctrollerTramp(PrControllerTramp po){
- System.out.println("------------------------------********************--------------------");
- po.setOrgTag("DY");
- System.out.println(JSON.toJSONString(po));
+ if(po.getOrgTag().trim().length() > 2) {
+ po.setOrgTag("DY");
+ }
this.prControllerTrampMapperDao.insert(po) ;
}
/**
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealControllerTramp.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealControllerTramp.java
index 4f53df5..9ad6865 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealControllerTramp.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealControllerTramp.java
@@ -1,8 +1,8 @@
package com.dy.rtuMw.server.rtuData.p206V1_0_0;
+import com.dy.pipIrrGlobal.pojoPr.PrControllerTramp;
import com.dy.rtuMw.server.rtuData.TaskSurpport;
import com.dy.rtuMw.server.rtuData.dbSv.DbSv;
-import com.dy.pipIrrGlobal.pojoPr.PrControllerTramp;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectCtrl.java
new file mode 100644
index 0000000..d71764c
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectCtrl.java
@@ -0,0 +1,22 @@
+package com.dy.pipIrrApp.inspect;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author ZhuBaoMin
+ * @date 2024-09-24 10:21
+ * @LastEditTime 2024-09-24 10:21
+ * @Description
+ */
+
+@Slf4j
+@RestController
+@RequestMapping(path="inspect")
+public class InspectCtrl {
+ @Autowired
+ private InspectSv inspectSv;
+
+}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectSv.java
new file mode 100644
index 0000000..9b5f884
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectSv.java
@@ -0,0 +1,24 @@
+package com.dy.pipIrrApp.inspect;
+
+import com.dy.pipIrrGlobal.daoOp.OpeInspectMapper;
+import com.dy.pipIrrGlobal.daoOp.OpeTrackMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author ZhuBaoMin
+ * @date 2024-09-24 10:21
+ * @LastEditTime 2024-09-24 10:21
+ * @Description
+ */
+
+@Slf4j
+@Service
+public class InspectSv {
+ @Autowired
+ private OpeInspectMapper opeInspectMapper;
+
+ @Autowired
+ private OpeTrackMapper opeTrackMapper;
+}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/dto/StartPoint.java b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/dto/StartPoint.java
new file mode 100644
index 0000000..ed2c013
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/dto/StartPoint.java
@@ -0,0 +1,33 @@
+package com.dy.pipIrrApp.inspect.dto;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author ZhuBaoMin
+ * @date 2024-09-24 10:32
+ * @LastEditTime 2024-09-24 10:32
+ * @Description 寮�濮嬪贰妫�鎵撶偣瀵硅薄
+ */
+
+@Data
+public class StartPoint {
+ public static final long serialVersionUID = 202409241034001L;
+
+ /**
+ * 宸℃鍛業D
+ */
+ private Long inspectorId;
+
+ /**
+ * 寮�濮嬪贰妫�鏃堕棿
+ */
+ private Date startTime;
+
+ /**
+ * 鎵撳崱鐐�
+ */
+ private TrackPoint trackPoint;
+
+}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/dto/StopPoint.java b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/dto/StopPoint.java
new file mode 100644
index 0000000..363565b
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/dto/StopPoint.java
@@ -0,0 +1,32 @@
+package com.dy.pipIrrApp.inspect.dto;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author ZhuBaoMin
+ * @date 2024-09-24 10:49
+ * @LastEditTime 2024-09-24 10:49
+ * @Description 缁撴潫宸℃鎵撶偣瀵硅薄
+ */
+
+@Data
+public class StopPoint {
+ public static final long serialVersionUID = 202409241053001L;
+
+ /**
+ * 宸℃ID
+ */
+ private Long inspectId;
+
+ /**
+ * 缁撴潫宸℃鏃堕棿
+ */
+ private Date stopTime;
+
+ /**
+ * 鎵撳崱鐐�
+ */
+ private TrackPoint trackPoint;
+}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/dto/TrackPoint.java b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/dto/TrackPoint.java
new file mode 100644
index 0000000..9e859e9
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/dto/TrackPoint.java
@@ -0,0 +1,33 @@
+package com.dy.pipIrrApp.inspect.dto;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author ZhuBaoMin
+ * @date 2024-09-24 10:44
+ * @LastEditTime 2024-09-24 10:44
+ * @Description 鎵撶偣瀵硅薄
+ */
+
+@Data
+public class TrackPoint {
+ public static final long serialVersionUID = 202409241045001L;
+
+ /**
+ * 鎵撶偣绮惧害
+ */
+ private BigDecimal lng;
+
+ /**
+ * 鎵撶偣绾害
+ */
+ private BigDecimal lat;
+
+ /**
+ * 鎵撶偣鏃堕棿
+ */
+ private Date locateTime;
+}
--
Gitblit v1.8.0