wenshijun/smart_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调度模块添加仅立库模式

Browse Source 
新增mqtt功能
新增施工队信息导入功能
This commit is contained in:
wenshijun
2025-12-31 14:51:58 +08:00
parent b0bbeeec7c
commit 2b7e91e918
27 changed files with 1414 additions and 391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/resources/application-druid.yml
View File

@@ -7,9 +7,9 @@ spring:
# 主库数据源
master:
# url: jdbc:mysql://101.132.133.142:3306/wisdom?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
url: jdbc:mysql://192.168.1.28:3306/wisdom?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# url: jdbc:mysql://192.168.1.28:3306/wisdom?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# url: jdbc:mysql://192.168.1.192:3306/wisdom?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# url: jdbc:mysql://192.168.1.251:3306/wisdom?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
url: jdbc:mysql://192.168.1.251:3306/wisdom?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# url: jdbc:mysql://localhost:3306/wisdom?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: shzg

50
src/main/resources/application.yml
View File

@@ -169,4 +169,52 @@ mock:
#配送系统中调用大模型进行图片识别
qwen-ocr:
base-url: http://192.168.1.253:8087/ocr/extractErpByBase64
base-url: http://192.168.1.253:8087/ocr/extractErpByBase64
# =========================
# MQTT 配置（EMQX 接入）
# =========================
mqtt:
# 是否启用 MQTT 功能
# true：系统启动时自动连接 EMQX 并订阅 Topic
# false：不初始化 MQTT 客户端
enabled: true
# MQTT Broker 地址
# tcp://IP:1883 —— MQTT TCP
# ws://IP:8083 —— MQTT WebSocket
# ssl://IP:8883 —— MQTT SSL
broker: tcp://192.168.1.29:1883
# MQTT 客户端 ID（在 EMQX 中唯一）
# 建议：系统名 + 模块名，避免重复
clientId: zg-wms-backend
# MQTT 账号（EMQX Dashboard 中配置）
username: demo02
# MQTT 密码
password: admin123
# 是否清除会话
# true ：断开后清除订阅和未接收消息（推荐后端使用）
# false ：保留会话（适合设备端）
cleanSession: true
# 心跳时间（秒）
# 客户端与 Broker 保持连接的心跳间隔
keepAlive: 30
# 连接超时时间（秒）
timeout: 10
# 默认消息 QoS
# 0：最多一次（不保证到达，性能最好）
# 1：至少一次（推荐，业务数据常用）
# 2：仅一次（最严格，性能最差）
qos: 1
# 订阅的 Topic 列表（支持通配符）
# 建议先使用测试 Topic，确认链路正常后再接入真实业务 Topic
topics:
- zg/wms/test/#

3
src/main/resources/mybatis/wisdom/AgvTaskResultMapper.xml
View File

@@ -71,6 +71,9 @@
<select id="selectByTaskNo" resultType="com.zg.project.wisdom.domain.AgvTaskResult">
SELECT * FROM agv_task_result WHERE task_no = #{taskNo} AND is_delete = '0'
</select>
<select id="countByTaskNo" resultType="java.lang.Integer">
SELECT COUNT(*) FROM agv_task_result WHERE task_no = #{taskNo} AND is_delete = '0'
</select>
<insert id="insertAgvTaskResult" parameterType="AgvTaskResult" useGeneratedKeys="true" keyProperty="id">
INSERT INTO agv_task_result

199
src/main/resources/mybatis/wisdom/DdTaskMapper.xml
View File

@@ -1,34 +1,41 @@
<?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">
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zg.project.wisdom.mapper.DdTaskMapper">
<!-- ======================= ResultMap ======================= -->
<resultMap id="DdTaskResult" type="com.zg.project.wisdom.domain.DdTask">
<result property="id" column="id" />
<result property="taskNo" column="task_no" />
<result property="taskDtl" column="task_dtl" />
<result property="taskType" column="task_type" />
<result property="taskStatus" column="task_status" />
<result property="midStatus" column="mid_status" />
<result property="mid" column="mid" />
<result property="num" column="num" />
<result property="midType" column="mid_type" />
<result property="sourceName" column="source_name" />
<result property="targetName" column="target_name" />
<result property="operator" column="operator" />
<result property="approver" column="approver" />
<result property="rcptim" column="rcptim" />
<result property="rid" column="rid" />
<result property="doCount" column="do_count" />
<result property="prf" column="prf" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="isDelete" column="is_delete" />
<result property="id" column="id"/>
<result property="taskNo" column="task_no"/>
<result property="taskDtl" column="task_dtl"/>
<result property="taskType" column="task_type"/>
<result property="taskStatus" column="task_status"/>
<result property="midStatus" column="mid_status"/>
<result property="mid" column="mid"/>
<result property="num" column="num"/>
<result property="midType" column="mid_type"/>
<result property="sourceName" column="source_name"/>
<result property="targetName" column="target_name"/>
<result property="operator" column="operator"/>
<result property="approver" column="approver"/>
<result property="rcptim" column="rcptim"/>
<result property="rid" column="rid"/>
<result property="doCount" column="do_count"/>
<result property="prf" column="prf"/>
<result property="dispatchMode" column="dispatch_mode"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="isDelete" column="is_delete"/>
</resultMap>
<!-- ======================= 查询列表 ======================= -->
<select id="selectDdTaskList" resultMap="DdTaskResult">
SELECT * FROM dd_task
SELECT *
FROM dd_task
<where>
<if test="taskNo != null and taskNo != ''">
AND task_no = #{taskNo}
@@ -39,6 +46,9 @@
<if test="taskStatus != null">
AND task_status = #{taskStatus}
</if>
<if test="dispatchMode != null">
AND dispatch_mode = #{dispatchMode}
</if>
<if test="isDelete != null">
AND is_delete = #{isDelete}
</if>
@@ -46,30 +56,133 @@
ORDER BY id DESC
</select>
<!-- ======================= 根据ID查询 ======================= -->
<select id="selectDdTaskById" resultMap="DdTaskResult">
SELECT * FROM dd_task WHERE id = #{id} AND is_delete = '0'
SELECT *
FROM dd_task
WHERE id = #{id}
AND is_delete = '0'
</select>
<!-- 根据任务编号查询 -->
<!-- ======================= 根据任务号查询 ======================= -->
<select id="selectByTaskNo" resultMap="DdTaskResult" parameterType="String">
SELECT * FROM dd_task WHERE task_no = #{taskNo} AND is_delete = '0' LIMIT 1
SELECT *
FROM dd_task
WHERE task_no = #{taskNo}
AND is_delete = '0'
LIMIT 1
</select>
<insert id="insertDdTask" parameterType="DdTask">
<!-- ======================= 新增调度任务 ======================= -->
<insert id="insertDdTask" parameterType="com.zg.project.wisdom.domain.DdTask">
INSERT INTO dd_task (
task_no, task_dtl, task_type, task_status, mid_status, mid, num, mid_type, source_name,
target_name, operator, approver, rcptim, rid, do_count, prf,
create_by, create_time, update_by, update_time, is_delete
task_no,
task_dtl,
task_type,
task_status,
mid_status,
mid,
num,
mid_type,
source_name,
target_name,
operator,
approver,
rcptim,
rid,
do_count,
prf,
dispatch_mode,
create_by,
create_time,
update_by,
update_time,
is_delete
) VALUES (
#{taskNo}, #{taskDtl}, #{taskType}, #{taskStatus}, #{midStatus}, #{mid}, #{num}, #{midType}, #{sourceName},
#{targetName}, #{operator}, #{approver}, #{rcptim}, #{rid}, #{doCount}, #{prf},
#{createBy}, #{createTime}, #{updateBy}, #{updateTime}, #{isDelete}
#{taskNo},
#{taskDtl},
#{taskType},
#{taskStatus},
#{midStatus},
#{mid},
#{num},
#{midType},
#{sourceName},
#{targetName},
#{operator},
#{approver},
#{rcptim},
#{rid},
#{doCount},
#{prf},
#{dispatchMode},
#{createBy},
#{createTime},
#{updateBy},
#{updateTime},
#{isDelete}
)
</insert>
<update id="updateDdTask" parameterType="DdTask">
<!-- ======================= 批量新增调度任务 ======================= -->
<insert id="batchInsertDdTask">
INSERT INTO dd_task (
task_no,
task_dtl,
task_type,
task_status,
mid_status,
mid,
num,
mid_type,
source_name,
target_name,
operator,
approver,
rcptim,
rid,
do_count,
prf,
dispatch_mode,
create_by,
create_time,
update_by,
update_time,
is_delete
)
VALUES
<foreach collection="list" item="item" separator=",">
(
#{item.taskNo},
#{item.taskDtl},
#{item.taskType},
#{item.taskStatus},
#{item.midStatus},
#{item.mid},
#{item.num},
#{item.midType},
#{item.sourceName},
#{item.targetName},
#{item.operator},
#{item.approver},
#{item.rcptim},
#{item.rid},
#{item.doCount},
#{item.prf},
#{item.dispatchMode},
#{item.createBy},
#{item.createTime},
#{item.updateBy},
#{item.updateTime},
#{item.isDelete}
)
</foreach>
</insert>
<!-- ======================= 修改调度任务 ======================= -->
<update id="updateDdTask" parameterType="com.zg.project.wisdom.domain.DdTask">
UPDATE dd_task
SET task_no = #{taskNo},
SET
task_dtl = #{taskDtl},
task_type = #{taskType},
task_status = #{taskStatus},
@@ -85,12 +198,14 @@
rid = #{rid},
do_count = #{doCount},
prf = #{prf},
dispatch_mode = #{dispatchMode},
update_by = #{updateBy},
update_time = #{updateTime},
is_delete = #{isDelete}
update_time = #{updateTime}
WHERE id = #{id}
AND is_delete = '0'
</update>
<!-- ======================= 根据任务号更新状态 ======================= -->
<update id="updateTaskStatusByTaskNo">
UPDATE dd_task
SET task_status = #{status},
@@ -99,15 +214,19 @@
AND is_delete = '0'
</update>
<!-- ======================= 批量删除 ======================= -->
<delete id="deleteDdTaskByIds">
DELETE FROM dd_task WHERE id IN
DELETE FROM dd_task
WHERE id IN
<foreach collection="array" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
<!-- ======================= 单条删除 ======================= -->
<delete id="deleteDdTaskById">
DELETE FROM dd_task WHERE id = #{id}
DELETE FROM dd_task
WHERE id = #{id}
</delete>
</mapper>