1. 添加 任务 以及 巡检单配置相关

This commit is contained in:
zhaowenyuan 2024-06-18 15:42:07 +08:00
parent 3d1136f219
commit 41012808a5
27 changed files with 698 additions and 2 deletions

View File

@ -0,0 +1,58 @@
package com.chushang.inspection.project.entity.po;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.chushang.common.mybatis.base.BaseEntity;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
/**
* @auther: zhao
* @date: 2024/6/18 15:39
*/
@Data
@EqualsAndHashCode(callSuper=true)
@AllArgsConstructor
@NoArgsConstructor
@TableName(value = "inspection_config")
public class InspectionConfig extends BaseEntity {
/**
* 配置id 主键
*/
@TableId(value = "config_id", type = IdType.ASSIGN_ID)
private Long configId;
/**
* 任务id
*/
@TableField(value = "task_id")
private Long taskId;
/**
* 对应部门Id
*/
@TableField(value = "dept_id")
private Long deptId;
/**
* 配置名称 name
*/
@TableField(value = "config_name")
private String configName;
/**
* 配置别名
*/
@TableField(value = "`alias`")
private String alias;
/**
* 模板名称
*/
@TableField(value = "`template`")
private String template;
}

View File

@ -0,0 +1,70 @@
package com.chushang.inspection.project.entity.po;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.chushang.common.mybatis.base.BaseEntity;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
/**
* @auther: zhao
* @date: 2024/6/18 15:39
*/
@Data
@EqualsAndHashCode(callSuper=true)
@AllArgsConstructor
@NoArgsConstructor
@TableName(value = "inspection_data")
public class InspectionData extends BaseEntity {
/**
* 配置id 主键
*/
@TableId(value = "data_id", type = IdType.ASSIGN_ID)
private Long dataId;
/**
* 任务id
*/
@TableField(value = "config_id")
private Long configId;
/**
* 对应部门Id
*/
@TableField(value = "dept_id")
private Long deptId;
/**
* 配置对应key
*/
@TableField(value = "config_key")
private String configKey;
/**
* 配置对应value
*/
@TableField(value = "config_value")
private String configValue;
/**
* key 对应类型
*/
@TableField(value = "config_type")
private Short configType;
/**
* 备注
*/
@TableField(value = "remark")
private String remark;
/**
* 对应模板别名
*/
@TableField(value = "`alias`")
private String alias;
}

View File

@ -0,0 +1,58 @@
package com.chushang.inspection.project.entity.po;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.chushang.common.mybatis.base.BaseEntity;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
/**
* @auther: zhao
* @date: 2024/6/18 15:39
*/
@Data
@EqualsAndHashCode(callSuper=true)
@AllArgsConstructor
@NoArgsConstructor
@TableName(value = "inspection_detail")
public class InspectionDetail extends BaseEntity {
/**
* 配置id 主键
*/
@TableId(value = "config_id", type = IdType.ASSIGN_ID)
private Long configId;
/**
* 任务id
*/
@TableField(value = "inspection_id")
private Long inspectionId;
/**
* 对应部门Id
*/
@TableField(value = "dept_id")
private Long deptId;
/**
* 配置对应label
*/
@TableField(value = "config_label")
private String configLabel;
/**
* 配置对应key
*/
@TableField(value = "config_key")
private String configKey;
/**
* key 对应类型
*/
@TableField(value = "config_type")
private Short configType;
}

View File

@ -0,0 +1,128 @@
package com.chushang.inspection.project.entity.po;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.chushang.common.mybatis.base.BaseEntity;
import java.util.Date;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
/**
* @auther: zhao
* @date: 2024/6/18 15:39
*/
/**
* 巡检任务表
*/
@Data
@EqualsAndHashCode(callSuper=true)
@AllArgsConstructor
@NoArgsConstructor
@TableName(value = "polling_task")
public class PollingTask extends BaseEntity {
/**
* 主键
*/
@TableId(value = "id", type = IdType.ASSIGN_ID)
private Long id;
/**
* 上级id
*/
@TableField(value = "pid")
private Long pid;
/**
* 任务名称
*/
@TableField(value = "`name`")
private String name;
/**
* 任务联系人
*/
@TableField(value = "contact")
private String contact;
/**
* 联系电话
*/
@TableField(value = "phone")
private String phone;
/**
* 编号
*/
@TableField(value = "`number`")
private String number;
/**
* 是否有电子巡检单
*/
@TableField(value = "is_inspection")
private Byte isInspection;
/**
* 巡检方式 0 业务员领取 1 只能派给负责项目的业务员 2 只能派给商户对应的客户经理
*/
@TableField(value = "dispatch_method")
private Byte dispatchMethod;
/**
* 巡检方式
*/
@TableField(value = "review_method")
private Byte reviewMethod;
/**
* 是否重复派单领取
*/
@TableField(value = "is_repeat")
private Byte isRepeat;
/**
* 租户id
*/
@TableField(value = "dept_id")
private Long deptId;
/**
* 开始时间
*/
@TableField(value = "start_time")
private Date startTime;
/**
* 结束时间
*/
@TableField(value = "end_time")
private Date endTime;
/**
* 任务状态
*/
@TableField(value = "enabled")
private Boolean enabled;
/**
* 索引
*/
@TableField(value = "search_num")
private String searchNum;
/**
* 机构层级
*/
@TableField(value = "`level`")
private Integer level;
/**
* 索引下标
*/
@TableField(value = "search_index")
private Byte searchIndex;
}

View File

@ -0,0 +1,40 @@
package com.chushang.inspection.project.entity.po;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.chushang.common.mybatis.base.BaseEntity;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
/**
* @auther: zhao
* @date: 2024/6/18 15:39
*/
@Data
@EqualsAndHashCode(callSuper=true)
@AllArgsConstructor
@NoArgsConstructor
@TableName(value = "polling_task_autograph")
public class PollingTaskAutograph extends BaseEntity {
/**
* 签名所属任务
*/
@TableId(value = "task_id", type = IdType.ASSIGN_ID)
private Long taskId;
/**
* 客户经理名称
*/
@TableField(value = "graph_name")
private String graphName;
/**
* 签名图片路径
*/
@TableField(value = "img_url")
private String imgUrl;
}

View File

@ -0,0 +1,18 @@
package com.chushang.inspection.project.controller;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @auther: zhao
* @date: 2024/6/18 15:41
*/
@Slf4j
@RestController
@RequestMapping(value = "/task")
public class PollTaskController {
}

View File

@ -0,0 +1,11 @@
package com.chushang.inspection.project.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.chushang.inspection.project.entity.po.InspectionConfig;
/**
* @auther: zhao
* @date: 2024/6/18 15:39
*/
public interface InspectionConfigMapper extends BaseMapper<InspectionConfig> {
}

View File

@ -0,0 +1,11 @@
package com.chushang.inspection.project.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.chushang.inspection.project.entity.po.InspectionData;
/**
* @auther: zhao
* @date: 2024/6/18 15:39
*/
public interface InspectionDataMapper extends BaseMapper<InspectionData> {
}

View File

@ -0,0 +1,11 @@
package com.chushang.inspection.project.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.chushang.inspection.project.entity.po.InspectionDetail;
/**
* @auther: zhao
* @date: 2024/6/18 15:39
*/
public interface InspectionDetailMapper extends BaseMapper<InspectionDetail> {
}

View File

@ -0,0 +1,11 @@
package com.chushang.inspection.project.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.chushang.inspection.project.entity.po.PollingTaskAutograph;
/**
* @auther: zhao
* @date: 2024/6/18 15:39
*/
public interface PollingTaskAutographMapper extends BaseMapper<PollingTaskAutograph> {
}

View File

@ -0,0 +1,11 @@
package com.chushang.inspection.project.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.chushang.inspection.project.entity.po.PollingTask;
/**
* @auther: zhao
* @date: 2024/6/18 15:39
*/
public interface PollingTaskMapper extends BaseMapper<PollingTask> {
}

View File

@ -0,0 +1,13 @@
package com.chushang.inspection.project.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.chushang.inspection.project.entity.po.InspectionConfig;
/**
* @auther: zhao
* @date: 2024/6/18 15:39
*/
public interface InspectionConfigService extends IService<InspectionConfig>{
}

View File

@ -0,0 +1,13 @@
package com.chushang.inspection.project.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.chushang.inspection.project.entity.po.InspectionData;
/**
* @auther: zhao
* @date: 2024/6/18 15:39
*/
public interface InspectionDataService extends IService<InspectionData>{
}

View File

@ -0,0 +1,13 @@
package com.chushang.inspection.project.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.chushang.inspection.project.entity.po.InspectionDetail;
/**
* @auther: zhao
* @date: 2024/6/18 15:39
*/
public interface InspectionDetailService extends IService<InspectionDetail>{
}

View File

@ -0,0 +1,13 @@
package com.chushang.inspection.project.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.chushang.inspection.project.entity.po.PollingTaskAutograph;
/**
* @auther: zhao
* @date: 2024/6/18 15:39
*/
public interface PollingTaskAutographService extends IService<PollingTaskAutograph>{
}

View File

@ -0,0 +1,13 @@
package com.chushang.inspection.project.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.chushang.inspection.project.entity.po.PollingTask;
/**
* @auther: zhao
* @date: 2024/6/18 15:39
*/
public interface PollingTaskService extends IService<PollingTask>{
}

View File

@ -0,0 +1,15 @@
package com.chushang.inspection.project.service.impl;
import com.chushang.inspection.project.service.InspectionConfigService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.chushang.inspection.project.entity.po.InspectionConfig;
import com.chushang.inspection.project.mapper.InspectionConfigMapper;
/**
* @auther: zhao
* @date: 2024/6/18 15:39
*/
@Service
public class InspectionConfigServiceImpl extends ServiceImpl<InspectionConfigMapper, InspectionConfig> implements InspectionConfigService {
}

View File

@ -0,0 +1,15 @@
package com.chushang.inspection.project.service.impl;
import com.chushang.inspection.project.service.InspectionDataService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.chushang.inspection.project.entity.po.InspectionData;
import com.chushang.inspection.project.mapper.InspectionDataMapper;
/**
* @auther: zhao
* @date: 2024/6/18 15:39
*/
@Service
public class InspectionDataServiceImpl extends ServiceImpl<InspectionDataMapper, InspectionData> implements InspectionDataService {
}

View File

@ -0,0 +1,15 @@
package com.chushang.inspection.project.service.impl;
import com.chushang.inspection.project.service.InspectionDetailService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.chushang.inspection.project.entity.po.InspectionDetail;
import com.chushang.inspection.project.mapper.InspectionDetailMapper;
/**
* @auther: zhao
* @date: 2024/6/18 15:39
*/
@Service
public class InspectionDetailServiceImpl extends ServiceImpl<InspectionDetailMapper, InspectionDetail> implements InspectionDetailService {
}

View File

@ -0,0 +1,15 @@
package com.chushang.inspection.project.service.impl;
import com.chushang.inspection.project.service.PollingTaskAutographService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.chushang.inspection.project.mapper.PollingTaskAutographMapper;
import com.chushang.inspection.project.entity.po.PollingTaskAutograph;
/**
* @auther: zhao
* @date: 2024/6/18 15:39
*/
@Service
public class PollingTaskAutographServiceImpl extends ServiceImpl<PollingTaskAutographMapper, PollingTaskAutograph> implements PollingTaskAutographService {
}

View File

@ -0,0 +1,15 @@
package com.chushang.inspection.project.service.impl;
import com.chushang.inspection.project.service.PollingTaskService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.chushang.inspection.project.mapper.PollingTaskMapper;
import com.chushang.inspection.project.entity.po.PollingTask;
/**
* @auther: zhao
* @date: 2024/6/18 15:39
*/
@Service
public class PollingTaskServiceImpl extends ServiceImpl<PollingTaskMapper, PollingTask> implements PollingTaskService {
}

View File

@ -13,12 +13,12 @@ spring:
discovery: discovery:
server-addr: ${spring.cloud.nacos.server-addr} server-addr: ${spring.cloud.nacos.server-addr}
namespace: ${nacos.namespace} namespace: ${nacos.namespace}
group: ${nacos.group} group: local
service: ${spring.application.name} service: ${spring.application.name}
config: config:
server-addr: ${spring.cloud.nacos.server-addr} server-addr: ${spring.cloud.nacos.server-addr}
namespace: ${spring.cloud.nacos.discovery.namespace} namespace: ${spring.cloud.nacos.discovery.namespace}
group: ${spring.cloud.nacos.discovery.group} group: ${nacos.group}
file-extension: yaml file-extension: yaml
refresh-enabled: true refresh-enabled: true
shared-configs: shared-configs:

View File

@ -0,0 +1,25 @@
<?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.chushang.inspection.project.mapper.InspectionConfigMapper">
<resultMap id="BaseResultMap" type="com.chushang.inspection.project.entity.po.InspectionConfig">
<!--@mbg.generated-->
<!--@Table inspection_config-->
<id column="config_id" jdbcType="BIGINT" property="configId" />
<result column="task_id" jdbcType="BIGINT" property="taskId" />
<result column="dept_id" jdbcType="BIGINT" property="deptId" />
<result column="config_name" jdbcType="VARCHAR" property="configName" />
<result column="alias" jdbcType="VARCHAR" property="alias" />
<result column="template" jdbcType="VARCHAR" property="template" />
<result column="version" jdbcType="BIGINT" property="version" />
<result column="del_state" jdbcType="BOOLEAN" property="delState" />
<result column="create_by" jdbcType="VARCHAR" property="createBy" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_by" jdbcType="VARCHAR" property="updateBy" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
config_id, task_id, dept_id, config_name, `alias`, `template`, version, del_state,
create_by, create_time, update_by, update_time
</sql>
</mapper>

View File

@ -0,0 +1,27 @@
<?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.chushang.inspection.project.mapper.InspectionDataMapper">
<resultMap id="BaseResultMap" type="com.chushang.inspection.project.entity.po.InspectionData">
<!--@mbg.generated-->
<!--@Table inspection_data-->
<id column="data_id" jdbcType="BIGINT" property="dataId" />
<result column="config_id" jdbcType="BIGINT" property="configId" />
<result column="dept_id" jdbcType="BIGINT" property="deptId" />
<result column="config_key" jdbcType="VARCHAR" property="configKey" />
<result column="config_value" jdbcType="VARCHAR" property="configValue" />
<result column="config_type" jdbcType="SMALLINT" property="configType" />
<result column="remark" jdbcType="VARCHAR" property="remark" />
<result column="alias" jdbcType="VARCHAR" property="alias" />
<result column="version" jdbcType="BIGINT" property="version" />
<result column="del_state" jdbcType="BOOLEAN" property="delState" />
<result column="create_by" jdbcType="VARCHAR" property="createBy" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_by" jdbcType="VARCHAR" property="updateBy" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
data_id, config_id, dept_id, config_key, config_value, config_type, remark, `alias`,
version, del_state, create_by, create_time, update_by, update_time
</sql>
</mapper>

View File

@ -0,0 +1,25 @@
<?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.chushang.inspection.project.mapper.InspectionDetailMapper">
<resultMap id="BaseResultMap" type="com.chushang.inspection.project.entity.po.InspectionDetail">
<!--@mbg.generated-->
<!--@Table inspection_detail-->
<id column="config_id" jdbcType="BIGINT" property="configId" />
<result column="inspection_id" jdbcType="BIGINT" property="inspectionId" />
<result column="dept_id" jdbcType="BIGINT" property="deptId" />
<result column="config_label" jdbcType="VARCHAR" property="configLabel" />
<result column="config_key" jdbcType="VARCHAR" property="configKey" />
<result column="config_type" jdbcType="SMALLINT" property="configType" />
<result column="version" jdbcType="BIGINT" property="version" />
<result column="del_state" jdbcType="BOOLEAN" property="delState" />
<result column="create_by" jdbcType="VARCHAR" property="createBy" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_by" jdbcType="VARCHAR" property="updateBy" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
config_id, inspection_id, dept_id, config_label, config_key, config_type, version,
del_state, create_by, create_time, update_by, update_time
</sql>
</mapper>

View File

@ -0,0 +1,15 @@
<?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.chushang.inspection.project.mapper.PollingTaskAutographMapper">
<resultMap id="BaseResultMap" type="com.chushang.inspection.project.entity.po.PollingTaskAutograph">
<!--@mbg.generated-->
<!--@Table polling_task_autograph-->
<id column="task_id" jdbcType="BIGINT" property="taskId" />
<result column="graph_name" jdbcType="VARCHAR" property="graphName" />
<result column="img_url" jdbcType="VARCHAR" property="imgUrl" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
task_id, graph_name, img_url
</sql>
</mapper>

View File

@ -0,0 +1,37 @@
<?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.chushang.inspection.project.mapper.PollingTaskMapper">
<resultMap id="BaseResultMap" type="com.chushang.inspection.project.entity.po.PollingTask">
<!--@mbg.generated-->
<!--@Table polling_task-->
<id column="id" jdbcType="BIGINT" property="id" />
<result column="pid" jdbcType="BIGINT" property="pid" />
<result column="name" jdbcType="VARCHAR" property="name" />
<result column="contact" jdbcType="VARCHAR" property="contact" />
<result column="phone" jdbcType="VARCHAR" property="phone" />
<result column="number" jdbcType="VARCHAR" property="number" />
<result column="is_inspection" jdbcType="TINYINT" property="isInspection" />
<result column="dispatch_method" jdbcType="TINYINT" property="dispatchMethod" />
<result column="review_method" jdbcType="TINYINT" property="reviewMethod" />
<result column="is_repeat" jdbcType="TINYINT" property="isRepeat" />
<result column="dept_id" jdbcType="BIGINT" property="deptId" />
<result column="start_time" jdbcType="TIMESTAMP" property="startTime" />
<result column="end_time" jdbcType="TIMESTAMP" property="endTime" />
<result column="enabled" jdbcType="BOOLEAN" property="enabled" />
<result column="version" jdbcType="BIGINT" property="version" />
<result column="del_state" jdbcType="BOOLEAN" property="delState" />
<result column="create_by" jdbcType="VARCHAR" property="createBy" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_by" jdbcType="VARCHAR" property="updateBy" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="search_num" jdbcType="VARCHAR" property="searchNum" />
<result column="level" jdbcType="INTEGER" property="level" />
<result column="search_index" jdbcType="TINYINT" property="searchIndex" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, pid, `name`, contact, phone, `number`, is_inspection, dispatch_method, review_method,
is_repeat, dept_id, start_time, end_time, enabled, version, del_state, create_by,
create_time, update_by, update_time, search_num, `level`, search_index
</sql>
</mapper>