调度系统接口开发

src/main/resources/application-druid.yml

@@ -6,8 +6,8 @@ spring:
         druid:
             # 主库数据源
             master:
-#                url: jdbc:mysql://192.168.1.20: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.20: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

src/main/resources/application.yml

@@ -68,8 +68,8 @@ spring:
   # redis 配置
   redis:
     # 地址
-#    host: 192.168.1.20
-    host: 192.168.1.251
+    host: 192.168.1.20
+#    host: 192.168.1.251
 #    host: localhost
     # 端口，默认为6379
     port: 6379
@@ -150,8 +150,8 @@ agv:
 
 wcs:
   job:
-    create-url: http://192.168.1.230:8188/wcs/task/create
-
+    create-url: http://192.168.1.137:6060/API/Ruku         # WCS入库任务接口
+    chuku-url: http://192.168.1.137:6060/API/Chuku         # WCS出库任务接口
 #rfid:
 #  device:
 #    conn-id: 192.168.1.88:9090

src/main/resources/mybatis/wisdom/AgyWcsMapper.xml

@@ -3,7 +3,7 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.zg.project.wisdom.mapper.AgyWcsMapper">
+<mapper namespace="com.zg.project.wisdom.mapper.AgvWcsMapper">
 
     <resultMap id="AgyWcsResultMap" type="com.zg.project.wisdom.domain.AgyWcs">
         <id     property="id"        column="id"/>
@@ -12,8 +12,8 @@
     </resultMap>
 
     <!-- 插入 AGV-WCS 映射关系 -->
-    <insert id="insertAgyWcs" parameterType="com.zg.project.wisdom.domain.AgyWcs">
-        INSERT INTO agy_wcs (requestId, TaskID)
+    <insert id="insertAgvWcs" parameterType="com.zg.project.wisdom.domain.AgyWcs">
+        INSERT INTO agv_wcs (requestId, TaskID)
         VALUES (#{requestId}, #{taskId})
     </insert>
 

src/main/resources/mybatis/wisdom/WcsTaskResultMapper.xml

@@ -29,34 +29,18 @@
             task_id,
             task_status,
             msg,
-            job_id,
-            owner,
-            type,
-            priority,
-            source_name,
-            target_name,
             create_time,
-            update_time,
             is_delete,
-            create_by,
-            update_by
+            create_by
         )
         VALUES
             (
                 #{taskId},
-                #{TaskStatus},
+                #{taskStatus},
                 #{msg},
-                #{jobId},
-                #{owner},
-                #{type},
-                #{priority},
-                #{sourceName},
-                #{targetName},
                 #{createTime},
-                #{updateTime},
                 #{isDelete},
-                #{createBy},
-                #{updateBy}
+                #{createBy}
             )
     </insert>
 
@@ -64,7 +48,7 @@
         SELECT COUNT(*)
         FROM wcs_task_result
         WHERE task_id = #{taskId}
-          AND TaskStatus = '1'
+          AND task_status = '1'
     </select>
 
 </mapper>