From 0f637043262ce627511260f18abc1e2f8ea3bb11 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 15 十二月 2025 15:42:17 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AreaGovernService.java | 7 ++-
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/AreaAgvService.java | 8 ++++
zy-acs-manager/src/main/resources/mapper/manager/AreaAgvMapper.xml | 5 ++
zy-acs-manager/src/main/java/com/zy/acs/manager/common/CodeBuilder.java | 6 +-
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AreaAgvServiceImpl.java | 12 ++++++
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/AreaAgv.java | 64 ++++++++++++++++++++++++++++++++
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/AreaAgvMapper.java | 12 ++++++
7 files changed, 108 insertions(+), 6 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/common/CodeBuilder.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/common/CodeBuilder.java
index 6ee2872..dcfe224 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/common/CodeBuilder.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/common/CodeBuilder.java
@@ -15,15 +15,15 @@
generator.frontendPrefixPath = "zy-acs-flow/";
generator.sqlOsType = SqlOsType.MYSQL;
- generator.url="localhost:3306/rcs_sca10";
+ generator.url="localhost:3306/rcs_ctu_stable";
generator.username="root";
generator.password="xltys1995";
// generator.url="47.97.1.152:51433;databasename=jkasrs";
// generator.username="sa";priority
// generator.password="Zoneyung@zy56$";
- generator.table="man_area";
- generator.tableDesc="Area";
+ generator.table="man_area_agv";
+ generator.tableDesc="AreaAgv";
generator.packagePath="com.zy.acs.manager.manager";
generator.build();
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AreaBootService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AreaGovernService.java
similarity index 98%
rename from zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AreaBootService.java
rename to zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AreaGovernService.java
index 5ffb780..b29eb03 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AreaBootService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AreaGovernService.java
@@ -2,7 +2,6 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zy.acs.common.constant.RedisConstant;
import com.zy.acs.common.utils.RedisSupport;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.manager.common.domain.AreaShapeDto;
@@ -19,12 +18,14 @@
import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Service;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@Slf4j
@Service
-public class AreaBootService {
+public class AreaGovernService {
// public static final Map<String, Set<Long>> CODE_AGV = new ConcurrentHashMap<>();
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/AreaAgv.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/AreaAgv.java
new file mode 100644
index 0000000..47f8ad1
--- /dev/null
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/AreaAgv.java
@@ -0,0 +1,64 @@
+package com.zy.acs.manager.manager.entity;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.zy.acs.framework.common.Cools;
+import com.zy.acs.framework.common.SpringUtils;
+import com.zy.acs.manager.system.service.UserService;
+import com.zy.acs.manager.system.service.HostService;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@TableName("man_area_agv")
+public class AreaAgv implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ @ApiModelProperty(value= "")
+ private Long areaId;
+
+ @ApiModelProperty(value= "")
+ private Long agvId;
+
+ public AreaAgv() {}
+
+ public AreaAgv(Long areaId,Long agvId) {
+ this.areaId = areaId;
+ this.agvId = agvId;
+ }
+
+// AreaAgv areaAgv = new AreaAgv(
+// null, // [闈炵┖]
+// null // [闈炵┖]
+// );
+
+
+
+ public Boolean getStatusBool(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return true;
+ case 0:
+ return false;
+ default:
+ return null;
+ }
+ }
+
+}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/AreaAgvMapper.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/AreaAgvMapper.java
new file mode 100644
index 0000000..6a5e73f
--- /dev/null
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/AreaAgvMapper.java
@@ -0,0 +1,12 @@
+package com.zy.acs.manager.manager.mapper;
+
+import com.zy.acs.manager.manager.entity.AreaAgv;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface AreaAgvMapper extends BaseMapper<AreaAgv> {
+
+}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/AreaAgvService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/AreaAgvService.java
new file mode 100644
index 0000000..234b484
--- /dev/null
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/AreaAgvService.java
@@ -0,0 +1,8 @@
+package com.zy.acs.manager.manager.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zy.acs.manager.manager.entity.AreaAgv;
+
+public interface AreaAgvService extends IService<AreaAgv> {
+
+}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AreaAgvServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AreaAgvServiceImpl.java
new file mode 100644
index 0000000..81e7e2e
--- /dev/null
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AreaAgvServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.acs.manager.manager.service.impl;
+
+import com.zy.acs.manager.manager.mapper.AreaAgvMapper;
+import com.zy.acs.manager.manager.entity.AreaAgv;
+import com.zy.acs.manager.manager.service.AreaAgvService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("areaAgvService")
+public class AreaAgvServiceImpl extends ServiceImpl<AreaAgvMapper, AreaAgv> implements AreaAgvService {
+
+}
diff --git a/zy-acs-manager/src/main/resources/mapper/manager/AreaAgvMapper.xml b/zy-acs-manager/src/main/resources/mapper/manager/AreaAgvMapper.xml
new file mode 100644
index 0000000..b634ddd
--- /dev/null
+++ b/zy-acs-manager/src/main/resources/mapper/manager/AreaAgvMapper.xml
@@ -0,0 +1,5 @@
+<?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.zy.acs.manager.manager.mapper.AreaAgvMapper">
+
+</mapper>
--
Gitblit v1.9.1