diff --git a/sql/v2.1.sql b/sql/v2.1.sql index fcb9a50b..d1f23fca 100644 --- a/sql/v2.1.sql +++ b/sql/v2.1.sql @@ -241,7 +241,7 @@ CREATE TABLE `xhpc_device_message` `type` varchar(50) DEFAULT NULL COMMENT '设备类型（PILE-充电桩，TERMINAL-终端）', `serial_number` varchar(32) DEFAULT NULL COMMENT '设备流水号', `content` text CHARACTER SET utf8 COMMENT '报文16进制原文', - `charge_order_no` varchar(50) default null COMMENT '充电订单号', + `charge_order_no` varchar(50) default null COMMENT '充电订单号', `status` int(10) DEFAULT '0' COMMENT '状态（0正常 1停用）', `create_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '创建时间', `create_by` varchar(30) CHARACTER SET utf8 DEFAULT NULL COMMENT '创建者', @@ -258,6 +258,185 @@ CREATE TABLE `xhpc_device_message` ROW_FORMAT=DYNAMIC; + +CREATE TABLE `xhpc_station_device` +( + `device_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '设备ID', + `device_name` varchar(100) DEFAULT NULL COMMENT '设备名称', + `device_type` varchar(32) DEFAULT NULL COMMENT '设备类型', + `current_type` varchar(32) DEFAULT NULL COMMENT '充电电流类型（直流，交流）', + `station_id` bigint(20) DEFAULT NULL COMMENT '所属场站', + `brand_model` varchar(100) DEFAULT NULL COMMENT '品牌型号', + `parent_device_id` bigint(20) DEFAULT NULL COMMENT '上级设备ID', + `serial_number` varchar(50) DEFAULT NULL COMMENT '设备编码', + `status` smallint(4) DEFAULT NULL COMMENT '设备状态（0-未启用，1-正常，2-异常，3-维修中，4-待检测）', + `del_flag` smallint(2) DEFAULT NULL COMMENT '是否删除（0-正常，2-删除）', + `create_time` datetime DEFAULT NULL COMMENT '创建时间', + `create_by` varchar(50) DEFAULT NULL COMMENT '创建人', + `update_time` datetime DEFAULT NULL COMMENT '更新时间', + `update_by` varchar(50) DEFAULT NULL COMMENT '更新人', + PRIMARY KEY (`device_id`) +) ENGINE=InnoDB + COMMENT = '场站设备信息表' + AUTO_INCREMENT=1 + DEFAULT CHARSET=utf8mb4 + COLLATE='utf8mb4_general_ci' + ROW_FORMAT=DYNAMIC; + +CREATE TABLE `xhpc_work_dept` +( + `work_dept_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '部门ID', + `dept_name` varchar(100) DEFAULT NULL COMMENT '部门名称', + `code` varchar(16) DEFAULT NULL COMMENT '部门编码', + `sort` smallint(4) DEFAULT NULL COMMENT '排序', + `parent_dept_id` bigint(20) DEFAULT NULL COMMENT '上级部门ID', + `status` smallint(2) DEFAULT NULL COMMENT '状态（0-未启用，1-已启用）', + `del_flag` smallint(2) DEFAULT NULL COMMENT '删除（0-正常，2-删除）', + `tenant_id` varchar(16) DEFAULT '000000' COMMENT '租户ID', + `create_time` datetime DEFAULT NULL COMMENT '创建时间', + `create_by` varchar(50) DEFAULT NULL COMMENT '创建人', + `update_time` datetime DEFAULT NULL COMMENT '更新时间', + `update_by` varchar(50) DEFAULT NULL COMMENT '更新人', + PRIMARY KEY (`work_dept_id`) +) ENGINE=InnoDB + COMMENT = '工单部门表' + AUTO_INCREMENT=1 + DEFAULT CHARSET=utf8mb4 + COLLATE='utf8mb4_general_ci' + ROW_FORMAT=DYNAMIC; + +CREATE TABLE `xhpc_work_order` +( + `work_order_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '工单ID', + `type` smallint(4) DEFAULT NULL COMMENT '工单类型', + `title` varchar(100) DEFAULT NULL COMMENT '工单标题', + `content` varchar(1000) DEFAULT NULL COMMENT '工单内容描述', + `fault_time` datetime DEFAULT NULL COMMENT '故障时间', + `device_type` varchar(32) DEFAULT NULL COMMENT '设备类型', + `serial_number` varchar(100) DEFAULT NULL COMMENT '设备编码', + `dept_id` bigint(20) DEFAULT NULL COMMENT '指派处理部门', + `user_id` bigint(20) DEFAULT NULL COMMENT '指派处理人', + `reason` varchar(200) DEFAULT NULL COMMENT '故障原因', + `disposal_method` varchar(500) DEFAULT NULL COMMENT '详细处理描述', + `status` smallint(4) DEFAULT NULL COMMENT '状态, 0-编辑，1-派发处理，2-处理完成', + `del_flag` smallint(2) DEFAULT NULL COMMENT '是否删除（0-正常，2-删除）', + `tenant_id` varchar(50) DEFAULT '000000' COMMENT '租户ID', + `create_time` datetime DEFAULT NULL COMMENT '创建时间', + `create_by` varchar(100) DEFAULT NULL COMMENT '创建人', + `update_time` datetime DEFAULT NULL COMMENT '更新时间', + `update_by` varchar(100) DEFAULT NULL COMMENT '更新人', + PRIMARY KEY (`work_order_id`) +) ENGINE=InnoDB + COMMENT = '工单详情表' + AUTO_INCREMENT=1 + DEFAULT CHARSET=utf8mb4 + COLLATE='utf8mb4_general_ci' + ROW_FORMAT=DYNAMIC; + +CREATE TABLE `xhpc_work_order_image` +( + `order_image_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '图片ID', + `order_id` bigint(20) DEFAULT NULL COMMENT '工单ID', + `file_name` varchar(100) DEFAULT NULL COMMENT '文件名称', + `url` varchar(200) DEFAULT NULL COMMENT '文件地址', + `type` smallint(2) DEFAULT NULL COMMENT '文件类型（1-问题展示图片，2-处理反馈图片）', + `del_flag` smallint(2) DEFAULT NULL COMMENT '删除标记（0-正常，2-已删除）', + `create_time` datetime DEFAULT NULL COMMENT '创建时间', + `create_by` varchar(50) DEFAULT NULL COMMENT '创建人', + PRIMARY KEY (`order_image_id`) +) ENGINE=InnoDB + COMMENT = '工单文件表' + AUTO_INCREMENT=1 + DEFAULT CHARSET=utf8mb4 + COLLATE='utf8mb4_general_ci' + ROW_FORMAT=DYNAMIC; + + +CREATE TABLE `xhpc_work_order_push_message` +( + `order_push_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '消息推送ID', + `target` varchar(64) DEFAULT NULL COMMENT '接收方（邮箱、手机号、openID等）', + `type` smallint(2) DEFAULT NULL COMMENT '推送方式（1-手机短信，2-电子邮件，3-微信公众号，4-微信小程序，5-支付宝小程序，6-其他）', + `content` varchar(255) DEFAULT NULL COMMENT '推送内容', + `status` smallint(2) DEFAULT NULL COMMENT '推送状态标志（0-创建，1-成功，2-推送失败）', + `fail_msg` varchar(200) DEFAULT NULL COMMENT '推送失败详细信息', + `remark` varchar(255) DEFAULT NULL COMMENT '备注', + `create_time` datetime DEFAULT NULL COMMENT '创建时间', + `create_by` varchar(50) DEFAULT NULL COMMENT '创建人', + `update_time` datetime DEFAULT NULL COMMENT '更新时间', + `update_by` varchar(50) DEFAULT NULL COMMENT '更新人', + PRIMARY KEY (`order_push_id`) +) ENGINE=InnoDB + COMMENT = '工单消息推送表' + AUTO_INCREMENT=1 + DEFAULT CHARSET=utf8mb4 + COLLATE='utf8mb4_general_ci' + ROW_FORMAT=DYNAMIC; + + +CREATE TABLE `xhpc_work_station` +( + `work_station_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '电站id', + `name` varchar(30) CHARACTER SET utf8 DEFAULT NULL COMMENT '名称', + `operator_id` bigint(20) DEFAULT NULL COMMENT '运营商id', + `type` int(2) DEFAULT NULL COMMENT '电站位置(地上电站、地下电站)', + `construction_site` smallint(6) DEFAULT NULL COMMENT '建设场所', + `service_facilities` text CHARACTER SET utf8 COMMENT '服务设施', + `periphery_facilities` text CHARACTER SET utf8 COMMENT '周边设施', + `address` varchar(50) CHARACTER SET utf8 DEFAULT NULL COMMENT '电站地址', + `detailed_address` varchar(50) CHARACTER SET utf8 DEFAULT NULL COMMENT '详细地址', + `longitude` varchar(30) CHARACTER SET utf8 DEFAULT NULL COMMENT '经度', + `latitude` varchar(30) CHARACTER SET utf8 DEFAULT NULL COMMENT '维度', + `parking_instructions` varchar(255) CHARACTER SET utf8 DEFAULT NULL COMMENT '停车说明', + `serial_number` varchar(50) CHARACTER SET utf8 DEFAULT NULL COMMENT '编号', + `status` int(10) DEFAULT '0' COMMENT '状态（0启用 1停用）', + `del_flag` int(2) DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）', + `create_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '创建时间', + `create_by` varchar(30) CHARACTER SET utf8 DEFAULT '' COMMENT '创建者', + `update_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `update_by` varchar(30) CHARACTER SET utf8 DEFAULT NULL COMMENT '更新者', + `remark` varchar(255) CHARACTER SET utf8 DEFAULT NULL COMMENT '备注', + `business_instructions` varchar(255) DEFAULT NULL COMMENT '营业说明', + `reminder_instructions` varchar(255) DEFAULT NULL COMMENT '温馨提示', + `img_id` varchar(500) DEFAULT NULL COMMENT '图片集合', + `station_type` smallint(6) DEFAULT NULL COMMENT '电站类型', + `service_tel` varchar(20) DEFAULT NULL COMMENT '站点电话', + `park_nums` mediumint(9) DEFAULT NULL COMMENT '侧位数量', + `tenant_id` varchar(12) DEFAULT '000000' COMMENT '租户id', + PRIMARY KEY (`work_station_id`) USING BTREE +) ENGINE=InnoDB + COMMENT = '工单场站信息表' + AUTO_INCREMENT=1 + DEFAULT CHARSET=utf8mb4 + COLLATE='utf8mb4_general_ci' + ROW_FORMAT=DYNAMIC; + + +CREATE TABLE `xhpc_work_user` +( + `work_user_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '人员ID', + `user_name` varchar(64) DEFAULT NULL COMMENT '人员姓名', + `dept_id` bigint(20) DEFAULT NULL COMMENT '所属部门ID', + `post_name` varchar(64) DEFAULT NULL COMMENT '岗位名称', + `phone` varchar(16) DEFAULT NULL COMMENT '联系电话', + `email` varchar(64) DEFAULT NULL COMMENT '邮箱地址', + `wechat_openid` varchar(64) DEFAULT NULL COMMENT '微信OPENID', + `is_leader` smallint(2) DEFAULT NULL COMMENT '是否部门负责人', + `status` smallint(2) DEFAULT NULL COMMENT '状态（0-未启用，1-正常）', + `del_flag` smallint(2) DEFAULT NULL COMMENT '删除（0-正常，2-删除）', + `create_time` datetime DEFAULT NULL COMMENT '创建时间', + `create_by` varchar(50) DEFAULT NULL COMMENT '创建人', + `update_time` datetime DEFAULT NULL COMMENT '更新时间', + `update_by` varchar(50) DEFAULT NULL COMMENT '更新人', + PRIMARY KEY (`work_user_id`) +) ENGINE=InnoDB + COMMENT = '工单人员信息表' + AUTO_INCREMENT=1 + DEFAULT CHARSET=utf8mb4 + COLLATE='utf8mb4_general_ci' + ROW_FORMAT=DYNAMIC; + + ALTER TABLE `et_auth_sec_token` ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id'; ALTER TABLE `et_charge_order_info` diff --git a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/controller/WorkOrderController.java b/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/controller/WorkOrderController.java index 9336ef00..0bbc8026 100644 --- a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/controller/WorkOrderController.java +++ b/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/controller/WorkOrderController.java @@ -9,11 +9,9 @@ import com.xhpc.common.log.enums.BusinessType; import com.xhpc.workorder.domain.XhpcWorkOrderDomain; import com.xhpc.workorder.service.WorkOrderService; import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import java.util.HashMap; -import java.util.List; import java.util.Map; diff --git a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/domain/XhpcWorkOrderDomain.java b/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/domain/XhpcWorkOrderDomain.java index bed12de6..bcefcc6b 100644 --- a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/domain/XhpcWorkOrderDomain.java +++ b/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/domain/XhpcWorkOrderDomain.java @@ -69,7 +69,7 @@ public class XhpcWorkOrderDomain implements Serializable { private String disposalMethod; /** - * 状态 + * 状态, 0-编辑，1-派发处理，2-处理完成 */ private Short status; diff --git a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/enums/WorkOrderTypeEnum.java b/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/enums/WorkOrderTypeEnum.java index 65157116..f2489fcb 100644 --- a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/enums/WorkOrderTypeEnum.java +++ b/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/enums/WorkOrderTypeEnum.java @@ -1,8 +1,6 @@ package com.xhpc.workorder.enums; -import com.xhpc.common.enums.PowerTypeEnum; - public enum WorkOrderTypeEnum { PILE_OFFLINE(1, "充电桩离线"), diff --git a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/mapper/XhpcWorkOrderImageMapper.java b/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/mapper/XhpcWorkOrderImageMapper.java index dc23c504..9dc14d31 100644 --- a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/mapper/XhpcWorkOrderImageMapper.java +++ b/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/mapper/XhpcWorkOrderImageMapper.java @@ -8,12 +8,9 @@ public interface XhpcWorkOrderImageMapper { List selectByOrderIdAndType(Long orderId, Integer type); - List selectImageIdByOrderIdAndType(Long orderId, Integer type); - int deleteByImageIds(List ids); - - + int deleteByImageIds(List imageIds); int deleteByPrimaryKey(Long orderImageId); diff --git a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/service/impl/WorkOrderServiceImpl.java b/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/service/impl/WorkOrderServiceImpl.java index e909dcc6..1dd7400e 100644 --- a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/service/impl/WorkOrderServiceImpl.java +++ b/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/service/impl/WorkOrderServiceImpl.java @@ -1,6 +1,5 @@ package com.xhpc.workorder.service.impl; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; import com.xhpc.common.api.SmsService; import com.xhpc.common.core.domain.R; @@ -11,7 +10,6 @@ import com.xhpc.workorder.service.WorkOrderService; import com.xhpc.workorder.service.WorkUserService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import java.util.HashMap; diff --git a/xhpc-modules/xhpc-workorder/src/main/resources/mapper/XhpcWorkOrderImageMapper.xml b/xhpc-modules/xhpc-workorder/src/main/resources/mapper/XhpcWorkOrderImageMapper.xml index 8abf79fd..292cbb51 100644 --- a/xhpc-modules/xhpc-workorder/src/main/resources/mapper/XhpcWorkOrderImageMapper.xml +++ b/xhpc-modules/xhpc-workorder/src/main/resources/mapper/XhpcWorkOrderImageMapper.xml @@ -25,8 +25,8 @@ delete from xhpc_work_order_image where order_image_id in - - #{id} + + #{imageId}