去除无用模块

pom.xml

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.tofly</groupId>
+        <artifactId>tofly-webParent</artifactId>
+        <version>1.0.3</version>
+    </parent>
+    <modules>
+        <module>zgsw-admin</module>
+        <module>zgsw-gis</module>
+    </modules>
+
+    <artifactId>tofly-zgsw</artifactId>
+    <version>1.0.0</version>
+    <packaging>pom</packaging>
+    <dependencies>
+        <dependency>
+            <groupId>org.jxls</groupId>
+            <artifactId>jxls</artifactId>
+            <version>2.10.0-rc3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jxls</groupId>
+            <artifactId>jxls-poi</artifactId>
+            <version>1.2.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jxls</groupId>
+            <artifactId>jxls-reader</artifactId>
+            <version>2.0.6</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.5.7</version>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

zgsw-admin/zgsw-admin-service/src/main/java/com/tofly/base/controller/UserAscriptionController.java

@@ -1,159 +0,0 @@
-/*
- * Author: wangjian
- * 生成controller
- */
-package com.tofly.base.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.tofly.base.em.Constant;
-import com.tofly.base.entity.App;
-import com.tofly.base.entity.UserAscription;
-import com.tofly.base.entity.dto.UserAscriptionDto;
-import com.tofly.base.service.AppService;
-import com.tofly.base.service.UserAscriptionService;
-import com.tofly.common.core.entity.ResultRespone;
-import com.tofly.common.core.util.StringUtil;
-import com.tofly.common.log.annotation.ToFlyAppLog;
-import com.tofly.common.oauth.util.SecurityUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * 用户归属管理
- *
- * @author fcl
- * @date Wed Mar 10 00:00:00 CST 2021
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/userAscription")
-@Api(tags = "用户归属管理")
-public class UserAscriptionController {
-
-    private final UserAscriptionService userAscriptionService;
-
-    /**
-     * 分页查询
-     *
-     * @param page           分页对象
-     * @param userAscription
-     * @return
-     */
-    @GetMapping("/page")
-    @ApiOperation(value = "分页查询")
-    public ResultRespone getAppPage(Page page, @ModelAttribute UserAscription userAscription) {
-        return ResultRespone.success(userAscriptionService.page(page, Wrappers.query(userAscription)));
-    }
-
-    @GetMapping("/getUserAscriptionMap")
-    @ApiOperation(value = "查询父子级关系归属Map")
-    public ResultRespone getUserAscriptionMap(@ModelAttribute UserAscription userAscription) {
-        List<UserAscription> list = userAscriptionService.list(Wrappers.query(userAscription));
-        List<UserAscriptionDto> dtoList  = new ArrayList<>();
-        if(null!=list && list.size()>0){
-           // 父级分组
-            Map<String, List<UserAscription>> collect = list.stream().collect(Collectors.groupingBy(UserAscription::getParentUserLonginName));
-            collect.forEach((k,v)->{
-                UserAscriptionDto dto = new UserAscriptionDto();
-                dto.setParentUserLonginName(k);
-                List<String> userNameList = new ArrayList<>();
-                v.forEach(i->{
-                    userNameList.add(i.getUserLonginName());
-                });
-                dto.setUserLonginNameList(userNameList);
-                dtoList.add(dto);
-            });
-        }
-
-
-        return ResultRespone.success(dtoList);
-    }
-
-
-    /**
-     * 通过id查询
-     *
-     * @param id id
-     * @return ResultRespone
-     */
-    @GetMapping("/{id}")
-    @ApiOperation(value = "通过ID查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-    })
-    public ResultRespone getById(@PathVariable("id") Long id) {
-        return ResultRespone.success(userAscriptionService.getById(id));
-    }
-
-    /**
-     * 新增
-     *
-     * @param parentUserId
-     * @param userIds
-     * @return ResultRespone
-     */
-    @ApiOperation(value = "新增(可重复绑定)")
-    @PostMapping("/save")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "parentUserId", value = "父级id", required = true, dataType = "Long"),
-            @ApiImplicitParam(name = "userIds", value = "用户id,多个以,分隔", required = true, dataType = "String")
-    })
-    public ResultRespone save(Long parentUserId, String userIds) {
-        List<Long> userIdList = Arrays.stream(userIds.split(Constant.CSV)).map(s -> Long.parseLong(s.trim()))
-                .collect(Collectors.toList());
-        userIdList.forEach(info -> {
-            UserAscription userAscription = new UserAscription();
-            userAscription.setParentUserId(parentUserId);
-            userAscription.setUserId(info);
-            userAscriptionService.save(userAscription);
-        });
-        return ResultRespone.success();
-    }
-
-    @ApiOperation(value = "通过父级id,用户id批量删除,绑定关系")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "parentUserId", value = "父级id", required = true, dataType = "Long"),
-            @ApiImplicitParam(name = "userIds", value = "用户id,多个以,分隔", required = true, dataType = "String")
-    })
-    @DeleteMapping("/deleteByUserIds")
-    public ResultRespone deleteByUserIds(Long parentUserId,String userIds) {
-        List<Long> userIdList = Arrays.stream(userIds.split(Constant.CSV)).map(s -> Long.parseLong(s.trim()))
-                .collect(Collectors.toList());
-        // 查询当前该用户列表中是否存绑定关系 存在则删除
-        List<UserAscription> list = userAscriptionService.list(new QueryWrapper<UserAscription>().lambda()
-                .eq(UserAscription::getParentUserId,parentUserId)
-                .in(UserAscription::getUserId, userIdList));
-        if (null != list && list.size() > 0) {
-            userAscriptionService.removeByIds(list.stream().map(UserAscription::getId).collect(Collectors.toList()));
-        }
-        return ResultRespone.success();
-    }
-
-    /**
-     * 通过id批量删除
-     *
-     * @param ids id
-     * @return ResultRespone
-     */
-
-    @ApiOperation(value = "通过ID批量删除")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "ids", value = "批量删除，多个id以逗号隔开", required = true, dataType = "String")
-    })
-    @DeleteMapping("/deleteByIds")
-    public ResultRespone removeById(String ids) {
-        return ResultRespone.success(userAscriptionService.removeByIds(Arrays.asList(ids.split(","))));
-    }
-
-}

zgsw-admin/zgsw-admin-service/src/main/java/com/tofly/base/controller/UserController.java

@@ -98,8 +98,6 @@ public class UserController {
     private MessagerecipientService messagerecipientService;
     @Autowired
     private UsertaskService usertaskService;
-    @Autowired
-    private UserMiddleService userMiddleService;
 
     @GetMapping("/userSyslist")
     @ApiOperation(value = "查询用户系统信息")

zgsw-admin/zgsw-admin-service/src/main/java/com/tofly/base/handler/user/UserSynchronizeHandler.java

@@ -0,0 +1,31 @@
+package com.tofly.base.handler.user;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.tofly.base.em.IsHandlerEnum;
+import com.tofly.base.service.messge.UsertaskService;
+import com.tofly.base.util.DateTimeUtil;
+import com.tofly.pojo.message.Usertask;
+import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 用户同步
+ * @author BZ-DJJ
+ */
+@Component
+@Slf4j
+public class UserSynchronizeHandler {
+
+    @XxlJob("userSynchronizeHandler")
+    public ReturnT<String> userSynchronizeHandler(String param){
+
+        return ReturnT.SUCCESS;
+    }
+}

zgsw-admin/zgsw-admin-service/src/main/java/com/tofly/base/mapper/SysparentcodeMapper.java

@@ -1,22 +0,0 @@
-/*
- * Author: wangjian
- * 生成mapper
- */
-package com.tofly.base.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.tofly.base.entity.Syschildcode;
-import com.tofly.base.entity.Sysparentcode;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 系统通用码表父级表
- *
- * @author wangjieliu
- * @date Thu Mar 18 00:00:00 CST 2021
- */
-public interface SysparentcodeMapper extends BaseMapper<Sysparentcode> {
-
-}

zgsw-admin/zgsw-admin-service/src/main/java/com/tofly/base/mapper/UserAscriptionMapper.java

@@ -1,23 +0,0 @@
-/*
- * Author: wangjian
- * 生成mapper
- */
-package com.tofly.base.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.tofly.base.entity.App;
-import com.tofly.base.entity.UserAscription;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * ${comments}
- *
- * @author fcl
- * @date Wed Mar 10 00:00:00 CST 2021
- */
-public interface UserAscriptionMapper extends BaseMapper<UserAscription> {
-}

zgsw-admin/zgsw-admin-service/src/main/java/com/tofly/base/service/SysparentcodeService.java

@@ -1,20 +0,0 @@
-/*
- * Author: wangjian
- * 生成Service
- */
-package com.tofly.base.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.tofly.base.entity.Syschildcode;
-import com.tofly.base.entity.Sysparentcode;
-
-import java.util.List;
-
-/**
- * 系统通用码表父级表
- *
- * @author wangjieliu
- * @date Thu Mar 18 00:00:00 CST 2021
- */
-public interface SysparentcodeService extends IService<Sysparentcode> {
-}

zgsw-admin/zgsw-admin-service/src/main/java/com/tofly/base/service/UserAscriptionService.java

@@ -1,25 +0,0 @@
-/*
- * Author: wangjian
- * 生成Service
- */
-package com.tofly.base.service;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.tofly.base.entity.App;
-import com.tofly.base.entity.UserAscription;
-import com.tofly.common.core.entity.ResultRespone;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.Map;
-
-/**
- * ${comments}
- *
- * @author fcl
- * @date Wed Mar 10 00:00:00 CST 2021
- */
-public interface UserAscriptionService extends IService<UserAscription> {
-
-
-}

zgsw-admin/zgsw-admin-service/src/main/java/com/tofly/base/service/impl/SyschildcodeServiceImpl.java

@@ -12,7 +12,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.tofly.base.entity.Syschildcode;
 import com.tofly.base.mapper.SyschildcodeMapper;
 import com.tofly.base.service.SyschildcodeService;
-import com.tofly.base.service.SysparentcodeService;
 import com.tofly.common.core.util.JSONUtil;
 import com.tofly.common.core.util.StringUtil;
 import com.tofly.common.oauth.exception.ToflyDeniedException;

zgsw-admin/zgsw-admin-service/src/main/java/com/tofly/base/service/impl/SysparentcodeServiceImpl.java

@@ -1,28 +0,0 @@
-/*
- * Author: wangjian
- * 生成ServiceImpl
- */
-package com.tofly.base.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.tofly.base.entity.Syschildcode;
-import com.tofly.base.entity.Sysparentcode;
-import com.tofly.base.mapper.SysparentcodeMapper;
-import com.tofly.base.service.SysparentcodeService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 系统通用码表父级表
- *
- * @author wangjieliu
- * @date Thu Mar 18 00:00:00 CST 2021
- */
-@Service("sysparentcodeService")
-public class SysparentcodeServiceImpl extends ServiceImpl<SysparentcodeMapper, Sysparentcode> implements SysparentcodeService {
-
-
-
-
-}

zgsw-admin/zgsw-admin-service/src/main/java/com/tofly/base/service/impl/UserAscriptionServiceImpl.java

@@ -1,24 +0,0 @@
-/*
- * Author: wangjian
- * 生成Service
- */
-package com.tofly.base.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.tofly.base.entity.UserAscription;
-import com.tofly.base.mapper.UserAscriptionMapper;
-import com.tofly.base.service.UserAscriptionService;
-import org.springframework.stereotype.Service;
-
-/**
- * ${comments}
- *
- * @author fcl
- * @date Wed Mar 10 00:00:00 CST 2021
- */
-@Service("userAscriptionService")
-public class UserAscriptionServiceImpl extends ServiceImpl<UserAscriptionMapper, UserAscription> implements UserAscriptionService {
-
-
-}

zgsw-admin/zgsw-admin-service/src/main/resources/mapper/SysparentcodeMapper.xml

@@ -1,15 +0,0 @@
-<?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.tofly.base.mapper.SysparentcodeMapper">
-
-    <resultMap id="sysparentcodeMap" type="com.tofly.base.entity.Sysparentcode">
-        <id property="id" column="ID"/>
-        <result property="pcname" column="PCNAME"/>
-    </resultMap>
-
-
-
-
-
-</mapper>

zgsw-admin/zgsw-admin-service/src/main/resources/mapper/UserAscriptionMapper.xml

@@ -1,22 +0,0 @@
-<?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.tofly.base.mapper.UserAscriptionMapper">
-
-  <resultMap id="userParentMap" type="com.tofly.base.entity.UserAscription">
-      <id property="id" column="ID"/>
-      <result property="parentUserId" column="PARENT_USER_ID"/>
-      <result property="userId" column="USER_ID"/>
-      <association property="parentUserIdName" column="PARENT_USER_ID" select="com.tofly.baseapi.mapper.ToflyCodeCommonMapper.getUserName"/>
-      <association property="userIdName" column="USER_ID" select="com.tofly.baseapi.mapper.ToflyCodeCommonMapper.getUserName"/>
-      <association property="parentUserLonginName" column="PARENT_USER_ID" select="getUserLonginName"/>
-      <association property="userLonginName" column="USER_ID" select="getUserLonginName"/>
-  </resultMap>
-
-    <select id="getUserLonginName" resultType="String">
-        select USERNAME
-        from  TF_SMPN_USER_X
-        where id = #{userId}
-    </select>
-
-</mapper>

zgsw-gis/pom.xml

@@ -17,16 +17,6 @@
 			<artifactId>commons-text</artifactId>
 			<version>1.8</version>
 		</dependency>
-		<dependency>
-			<groupId>com.tofly</groupId>
-			<artifactId>zgsw-mis-api</artifactId>
-			<version>1.0.0</version>
-		</dependency>
-		<dependency>
-			<groupId>com.tofly</groupId>
-			<artifactId>zgsw-gps-api</artifactId>
-			<version>1.0.0</version>
-		</dependency>
 		<dependency>
 			<groupId>com.tofly</groupId>
 			<artifactId>zgsw-admin-api</artifactId>
@@ -78,7 +68,6 @@
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
-			<version>5.1.47</version>
 		</dependency>
 		<dependency>
 			<groupId>mysql</groupId>

zgsw-gis/zgsw-gis.iml

@@ -22,14 +22,6 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.8" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.9" level="project" />
-    <orderEntry type="module" module-name="zgsw-mis-api" />
-    <orderEntry type="module" module-name="zgsw-gps-api" />
-    <orderEntry type="library" name="Maven: com.tofly:common-redis:1.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.2.10.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.2.10.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.2.10.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.2.9.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: redis.clients:jedis:3.1.0" level="project" />
     <orderEntry type="module" module-name="zgsw-admin-api" />
     <orderEntry type="library" name="Maven: io.github.openfeign:feign-okhttp:10.10.1" level="project" />
     <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.14.9" level="project" />
@@ -41,6 +33,12 @@
     <orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf:3.0.11.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.attoparser:attoparser:2.0.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.unbescape:unbescape:1.1.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.tofly:common-redis:1.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.2.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.2.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.2.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.2.9.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: redis.clients:jedis:3.1.0" level="project" />
     <orderEntry type="library" name="Maven: com.xuxueli:xxl-job-core:2.2.0" level="project" />
     <orderEntry type="library" name="Maven: io.netty:netty-all:4.1.52.Final" level="project" />
     <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.6" level="project" />

zgsw-gps/pom.xml

@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.tofly</groupId>
-        <artifactId>tofly-zgsw</artifactId>
-        <version>1.0.0</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>pom</packaging>
-    <modules>
-        <module>zgsw-gps-api</module>
-        <module>zgsw-gps-boot</module>
-    </modules>
-
-
-
-    <artifactId>zgsw-gps</artifactId>
-    <version>1.0.0</version>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.tofly</groupId>
-            <artifactId>common-es</artifactId>
-            <version>1.0.3</version>
-            <exclusions>
-            <exclusion>
-                <groupId>com.baomidou</groupId>
-                <artifactId>mybatis-plus-core</artifactId>
-            </exclusion>
-                <exclusion>
-                    <groupId>com.baomidou</groupId>
-                    <artifactId>mybatis-plus-extension</artifactId>
-                </exclusion>
-        </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>com.tofly</groupId>
-            <artifactId>common-redis</artifactId>
-            <version>1.0.3</version>
-        </dependency>
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>3.3.2</version>
-            <scope>compile</scope>
-        </dependency>
-    </dependencies>
-
-
-
-</project>

zgsw-gps/zgsw-gps-api/pom.xml

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.tofly</groupId>
-        <artifactId>zgsw-gps</artifactId>
-        <version>1.0.0</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>zgsw-gps-api</artifactId>
-    <version>1.0.0</version>
-    <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
-    </properties>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/api/audit/AuditClient.java

@@ -1,33 +0,0 @@
-package com.tofly.api.audit;
-
-import com.tofly.common.core.entity.ResultRespone;
-import com.tofly.pojo.comm.Audit;
-import com.tofly.pojo.plan.Checkhistory;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import java.util.List;
-
-/**
- * @author BZ-DJJ
- */
-@FeignClient(name = "tofly-xrty-gps",contextId="AuditClient")
-public interface AuditClient {
-    @PostMapping(value = "/audit/save")
-    ResultRespone<Object> save(@RequestParam(value = "json")String json);
-    @PostMapping(value = "/audit/getAuditInfo")
-    ResultRespone<List<Audit>> getAuditInfo(@RequestBody Audit audit);
-    @PostMapping(value = "/audit/update")
-    ResultRespone<Object> update(@RequestBody Audit audit);
-    @GetMapping("/audit/getAuditInfoList")
-    ResultRespone<List<Audit>> getAuditInfoList(@RequestParam(value = "users") String users,@RequestParam(value = "auditType") String auditType,@RequestParam(value = "auditState") String auditState);
-    @PostMapping(value = "/audit/delete")
-    ResultRespone<Object> delete(@RequestParam(value = "type")String type, @RequestParam(value = "planId")Long planId);
-    @PostMapping(value = "/audit/saveAuditHisInfo")
-    ResultRespone<Object> saveAuditHisInfo(@RequestBody Checkhistory checkhistory);
-    @PostMapping(value = "/audit/getAuditHisInfo")
-    ResultRespone<Object> getAuditHisInfo(@RequestBody Checkhistory checkhistory);
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/api/mssage/SendMessageFeign.java

@@ -1,21 +0,0 @@
-package com.tofly.api.mssage;
-
-import com.tofly.common.core.entity.ResultRespone;
-import com.tofly.pojo.note.SendNoteEn;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * @author FlashWJL
- * @date 2021/7/12 13:45
- */
-@FeignClient(value = "tofly-xrtygis")
-public interface SendMessageFeign {
-    /**
-     * 系统添加应急记录
-     * @return
-     */
-    @PostMapping("/send/sendMessage")
-    ResultRespone sendMessage(@RequestBody SendNoteEn sendNoteEn);
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/api/order/OrderClient.java

@@ -1,57 +0,0 @@
-package com.tofly.api.order;
-
-import com.tofly.common.core.entity.ResultRespone;
-import com.tofly.pojo.maintain.dto.RepairorderDto;
-import com.tofly.pojo.maintain.vo.AuxiliarySingleVo;
-import com.tofly.pojo.maintain.vo.datail.RepairOrderDetailVo;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.validation.Valid;
-import java.util.List;
-
-/**
- * @author BZ-DJJ
- */
-@FeignClient(name = "tofly-xrty-gps",contextId="OrderClient")
-public interface OrderClient {
-    /**
-     * 新增抢维修工单
-     * @param parDto
-     * @return
-     */
-    @PostMapping("/repairorder/saveFeign")
-    ResultRespone<Object> saveRepairOrderFeign(@RequestBody RepairorderDto parDto);
-
-    /**
-     * 通过ID查询抢维修工单详情
-     * @param id   工单id
-     * @param flag 是否展示部门下所有数据 是则填1 个人不填为空
-     * @return
-     */
-    @GetMapping("/repairorder/getPlanRepairOrderDetail")
-    ResultRespone<RepairOrderDetailVo> getPlanRepairOrderDetail(@RequestParam(value = "id") Long id,@RequestParam(value = "flag",required = false)String flag);
-
-    /**
-     * 终止抢维修工单
-     * @param orderId 工单id
-     * @return
-     */
-    @GetMapping("/repairorder/terminationRepairOrder")
-    ResultRespone<Boolean> terminationRepairOrder(@RequestParam("orderId") String orderId);
-
-    @GetMapping("/repairorder/getAuxiliarySingle")
-    ResultRespone<List<AuxiliarySingleVo>> getAuxiliarySingle(@RequestParam("deptIds") String deptIds);
-
-    /**
-     * 获取用户部门今天已签到的所有用户最新位置信息列表
-     * @param deptId 部门id
-     * @param flag 是否获取所有用户(所有部门) 1为是
-     * @return
-     */
-    @GetMapping("/repairorder/getAuxiliarySingle")
-    ResultRespone<List<AuxiliarySingleVo>> getAuxiliarySingle(@RequestParam(value = "deptId",required = false)Long deptId, @RequestParam(value = "flag",required = false)String flag);
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/es/CarGpsUpload.java

@@ -1,59 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.es;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.data.elasticsearch.annotations.Document;
-import org.springframework.data.elasticsearch.annotations.Field;
-import org.springframework.data.elasticsearch.annotations.FieldType;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-
-/**
- * 车载设备上报位置上报
- * @author BZ-DJJ
- */
-@Data
-@Document(indexName = "hnlscargps_"+"#{T(com.tofly.common.core.util.Date8Util).getYearMonth()}", type = "cargps")
-public class CarGpsUpload implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "ID",type= IdType.INPUT)
-    @ApiModelProperty(value = "分类ID")
-    private String id;
-    @ApiModelProperty(value = "用户id")
-    private Long userId;
-    @ApiModelProperty(value = "GPS经度")
-    private BigDecimal locationLongitude;
-    @ApiModelProperty(value = "GPS纬度")
-    private BigDecimal locationLatitude;
-    @ApiModelProperty(value = "速度(触发器计算)")
-    private BigDecimal speed;
-    @ApiModelProperty(value = "方向")
-    private BigDecimal direction;
-    @ApiModelProperty(value = "上传时间")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @Field(type = FieldType.Date,fielddata=true)
-    private Date uploadTime;
-    @ApiModelProperty(value = "定位时间")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @Field(type = FieldType.Date,fielddata=true)
-    private Date gpsTime;
-    @ApiModelProperty(value = "上传轨迹速度")
-    private BigDecimal gpsSpeed;
-    @ApiModelProperty(value = "设备ID")
-    private String gpsId;
-    @ApiModelProperty(value = "0:无效 1：有效")
-    private BigDecimal isValid;
-
-
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/es/EsInfo.java

@@ -1,55 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.es;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-
-
-/**
- * ES存储信息
- *
- * @author admin
- * @date Sat Apr 17 00:00:00 CST 2021
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName(value = "TF_YWPN_ESSINFO_E", resultMap = "esInfoMap")
-@KeySequence("TF_YWPN_ESSINFO_E")
-@ApiModel
-public class EsInfo extends Model<EsInfo> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * es存储的索引
-     */
-    @ApiModelProperty(value = "es存储的索引")
-    @TableField(value = "ESINDEX")
-    private String esIndex;
-    /**
-     * 首次存储时间
-     */
-    @ApiModelProperty(value = "首次存储时间")
-    @TableField(value = "FRISTTIME")
-    private String fristTime;
-    /**
-     * 首次存储时间
-     */
-    @ApiModelProperty(value = "首次存储时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "CREATE_DATE", fill = FieldFill.INSERT)
-    private Date createDate;
-
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/es/GpsUpload.java

@@ -1,67 +0,0 @@
-package com.tofly.es;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.data.elasticsearch.annotations.Document;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 位置轨迹上报
- * @author BZ-DJJ
- */
-@Data
-@Document(indexName = "hnlsgps_" + "#{T(com.tofly.common.core.util.Date8Util).getYearMonth()}", type = "gps")
-public class GpsUpload implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "关键ID")
-    private Long id;
-    @ApiModelProperty(value = "上报用户ID")
-    private Long userId;
-    @ApiModelProperty(value = "上报用户名称")
-    private String userName;
-    @ApiModelProperty(value = "GPS经度")
-    private BigDecimal locationLongitude;
-    @ApiModelProperty(value = "GPS纬度")
-    private BigDecimal locationLatitude;
-    @ApiModelProperty(value = "速度(触发器计算)")
-    private BigDecimal speed;
-    @ApiModelProperty(value = "方向")
-    private BigDecimal direction;
-    @ApiModelProperty(value = "定位网络(gps1,基站2,wifi3)")
-    private String network;
-    @ApiModelProperty(value = "距离(触发器计算)")
-    private BigDecimal distance;
-    @ApiModelProperty(value = "上传时间")
-    private Date uploadTime;
-    @ApiModelProperty(value = "定位时间")
-    private Date gpsTime;
-    @ApiModelProperty(value = "距离上次gps定位时长（单位：秒）")
-    private BigDecimal gpsTimespan;
-    @ApiModelProperty(value = "定位精度")
-    private String gpsPrecision;
-    @ApiModelProperty(value = "卫星个数")
-    private BigDecimal gpsStar;
-    @ApiModelProperty(value = "上传轨迹速度")
-    private BigDecimal gpsSpeed;
-    @ApiModelProperty(value = "0:异常 1：正常")
-    private String gpsState;
-    @ApiModelProperty(value = "手机数据唯一标识")
-    private Long gpsId;
-    @ApiModelProperty(value = "定位手机的时间")
-    private Date checkTime;
-    @ApiModelProperty(value = "手机上传分段数")
-    private BigDecimal gpsSection;
-    @ApiModelProperty(value = "0:无效 1：有效")
-    private String isValid;
-    @ApiModelProperty(value = "0：人巡 1：车巡")
-    private String gpsType;
-    @ApiModelProperty(value = "车载设备唯一标识，关联表TF_YWPN_GPSDEVICE_W关键值")
-    private Long gpsDeviceId;
-    @ApiModelProperty(value = "设备id")
-    private Long pdaId;
-
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/es/PdaDeviceUpload.java

@@ -1,117 +0,0 @@
-package com.tofly.es;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.data.elasticsearch.annotations.Document;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 巡检设备信息上传表
- *
- * @author BZ-DJJ
- */
-@Data
-@Document(indexName = "hnlspda_" + "#{T(com.tofly.common.core.util.Date8Util).getYearMonth()}", type = "pdadevice")
-public class PdaDeviceUpload implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-
-    /**
-     * 数据唯一标识
-     */
-    @TableId(value = "ID", type = IdType.INPUT)
-    @ApiModelProperty(value = "数据唯一标识")
-    private Long id;
-    @ApiModelProperty(value = "上报用户ID")
-    private Long userId;
-    @ApiModelProperty(value = "上报用户名称")
-    private String userName;
-    /**
-     * 用户唯一标识
-     */
-    @ApiModelProperty(value = "用户唯一标识")
-    @TableField(value = "CREATE_USER", fill = FieldFill.INSERT)
-    private Long createUser;
-    @ApiModelProperty(hidden = true)
-    private String createUserName;
-    /**
-     * gps状态 0：关闭 1:打开
-     */
-    @ApiModelProperty(value = "gps状态 0：关闭 1:打开")
-    private String gpsState;
-    /**
-     * 定位网络(gps 1,基站2,wifi 3)
-     */
-    @ApiModelProperty(value = "定位网络(1 卫星定位,2 前次定位,4 缓存定位,5 Wifi定位,6 基站定位,8 离线定位,9 最后位置缓存)")
-    private String network;
-    /**
-     * 网络状态 0：关闭 1：打开
-     */
-    @ApiModelProperty(value = "网络状态 0：关闭 1：打开")
-    private String networkState;
-    /**
-     * 设备检测时间
-     */
-    @ApiModelProperty(value = "设备检测时间")
-
-    private Date checkTime;
-    /**
-     * 上传时间
-     */
-    @ApiModelProperty(value = "上传时间")
-    private Date uploadTime;
-    /**
-     * 设备电量
-     */
-    @ApiModelProperty(value = "设备电量")
-    private String electricity;
-    /**
-     * 工作状态  1：上班  2：工作中  3：下班  4:异常
-     */
-    @ApiModelProperty(value = "工作状态  1：上班  2：工作中  3：下班  4:异常")
-    private String workState;
-    /**
-     * 定位精度
-     */
-    @ApiModelProperty(value = "定位精度")
-    private String gpsPrecision;
-    /**
-     * 卫星个数
-     */
-    @ApiModelProperty(value = "卫星个数")
-    private Integer gpsStar;
-    /**
-     * 剩余空间
-     */
-    @ApiModelProperty(value = "剩余空间")
-    private String residualSpace;
-    /**
-     * 车载设备唯一标识，关联表TF_YWPN_GPSDEVICE_W关键值
-     */
-    @ApiModelProperty(value = "车载设备唯一标识，关联表TF_YWPN_GPSDEVICE_W关键值")
-    private Long gpsDeviceid;
-    /**
-     * 0：人巡 1：车巡
-     */
-    @ApiModelProperty(value = "0：人巡 1：车巡")
-    private String gpsType;
-    /**
-     * 手机设备唯一标识
-     */
-    @ApiModelProperty(value = "手机设备唯一标识")
-    private String pdaid;
-    /**
-     * 监控日期 yyyy/mm/dd
-     */
-    @ApiModelProperty(value = "监控日期 yyyy/mm/dd")
-    private Date monitorDate;
-
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/es/dto/EsCarGpsUploadQueryDto.java

@@ -1,32 +0,0 @@
-package com.tofly.es.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * @author tuonbed
- * @date 2020/5/18  9:39
- */
-@Data
-public class EsCarGpsUploadQueryDto {
-
-    @ApiModelProperty(value = "车辆ID")
-    private Long carId;
-
-    @ApiModelProperty(value = "gpsTime开始时间")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
-
-    @ApiModelProperty(value = "gpsTime结束时间")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    private Date endTime;
-
-    @ApiModelProperty(value = "0：人巡 1：车巡")
-    private Long gpsType;
-
-    @ApiModelProperty(value = "排序默认倒序，true为正序")
-    private Boolean orderAsc;
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/es/dto/EsQueryDto.java

@@ -1,47 +0,0 @@
-package com.tofly.es.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * @author tuonbed
- * @date 2020/5/18  9:39
- */
-@Data
-public class EsQueryDto {
-
-    @ApiModelProperty(value = "用户ID")
-    private Long userId;
-
-    @ApiModelProperty(value = "上传开始时间")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    private Date startDate;
-
-    @ApiModelProperty(value = "上传结束时间")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    private Date endDate;
-
-    @ApiModelProperty(value = "部门ID")
-    private Long deptId;
-
-    @ApiModelProperty(value = "是否正序")
-    private Boolean isAsc;
-
-    @ApiModelProperty(value = "工作状态  1：上班  2：工作中  3：下班  4:异常")
-    private String workState;
-    @ApiModelProperty(value = "定位网络(1 卫星定位,2 前次定位,4 缓存定位,5 Wifi定位,6 基站定位,8 离线定位,9 最后位置缓存)")
-    private String network;
-    @ApiModelProperty(value = "网络状态 0：关闭 1：打开")
-    private String networkState;
-
-    @ApiModelProperty(value = "多个用户ID查询,多个以,分隔")
-    private String userIds;
-    /**
-     * 添加该字段是由于，导出的时候默认升序排列，用于区分判断排序
-     */
-    @ApiModelProperty(value = "是否导出，1导出")
-    private String isExport;
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/es/dto/EsQueryParamDto.java

@@ -1,33 +0,0 @@
-package com.tofly.es.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * @author BZ-DJJ
- */
-@Data
-public class EsQueryParamDto {
-
-    @ApiModelProperty(value = "用户ID")
-    private Long userId;
-
-    @ApiModelProperty(value = "开始时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date startDate;
-
-    @ApiModelProperty(value = "结束时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date endDate;
-
-    @ApiModelProperty(value = "gpsType巡检类型[人巡0，车巡1]")
-    private Long gpsType;
-
-    @ApiModelProperty(value = "isvalid")
-    private BigDecimal isvalid;
-
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/es/dto/GpsSectionSearchDto.java

@@ -1,21 +0,0 @@
-package com.tofly.es.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-@Data
-public class GpsSectionSearchDto {
-    @ApiModelProperty(value = "查询起始日期-默认当天[选填]yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date startDate;
-
-    @ApiModelProperty(value = "查询结束日期[选填]yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date endDate;
-
-    @ApiModelProperty(value = "用户唯一编码[选填]")
-    private Long userId;
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/es/dto/StatisticalInfoDto.java

@@ -1,29 +0,0 @@
-package com.tofly.es.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.util.Date;
-
-
-/**
- * @author BZ-DJJ
- */
-@Data
-public class StatisticalInfoDto implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "查询起始日期-默认当天yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date startDate;
-
-    @ApiModelProperty(value = "查询结束日期yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date endDate;
-
-    @ApiModelProperty(value = "用户唯一编码[选填]")
-    private Long userId;
-
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/es/dto/UserGpsSearchDto.java

@@ -1,30 +0,0 @@
-package com.tofly.es.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Data
-public class UserGpsSearchDto {
-
-    @ApiModelProperty(value = "查询起始日期-默认当天[选填]yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date startDate;
-
-    @ApiModelProperty(value = "查询结束日期[选填]yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date endDate;
-
-    @ApiModelProperty(value = "用户唯一编码[选填]")
-    private Long userId;
-
-    @ApiModelProperty(value = "0:无效 1：有效[选填]")
-    private String isValid;
-
-    @ApiModelProperty(value = "分段数[可填]")
-    private BigDecimal section;
-
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/es/vo/StatisticalInfoVo.java

@@ -1,33 +0,0 @@
-package com.tofly.es.vo;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @author BZ-DJJ
- */
-@Data
-public class StatisticalInfoVo implements Serializable {
-    private static final long serialVersionUID = 1L;
-    @ApiModelProperty(value = "有效耗时")
-    private Double vaildTotalTime;
-    @ApiModelProperty(value = "有效里程")
-    private Double vaildTotalDistance;
-    @ApiModelProperty(value = "有效速度")
-    private Double vaildSpeed;
-    @ApiModelProperty(value = "巡查用户ID")
-    @TableField(value = "USER_ID", fill = FieldFill.INSERT)
-    private Long userId;
-    @ApiModelProperty(value = "巡查用户名称")
-    private String userIdName;
-    @ApiModelProperty(value = "巡检里程")
-    private Double planTotalDistance;
-    @ApiModelProperty(value = "巡检时长,秒数")
-    private Double planTotalTime;
-    @ApiModelProperty(value = "巡检平均时速")
-    private Double planTotalAverage;
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/build/Build.java

@@ -1,230 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.pojo.build;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-import java.util.List;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-
-
-/**
- * 工地监护上报信息表
- *
- * @author admin
- * @date Mon Mar 29 00:00:00 CST 2021
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName(value = "TF_YWPN_BUILD_W", resultMap = "buildMap")
-@KeySequence("TF_YWPN_BUILD_W")
-@ApiModel
-public class Build extends Model<Build> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 上报时间
-     */
-    @ApiModelProperty(value = "上报时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date submitTime;
-    /**
-     * 上报人
-     */
-    @ApiModelProperty(value = "上报人")
-    private Long submitUser;
-
-    @TableField(exist = false)
-    @ApiModelProperty(value = "上报人名称")
-    private String submitUserName;
-    /**
-     * 0：未审核；1：通过；2：未通过
-     */
-    @ApiModelProperty(value = "0：未审核；1：通过；2：未通过")
-    private String auditResult;
-
-    @TableField(exist = false)
-    private String auditResultName;
-    /**
-     * 审核时间
-     */
-    @ApiModelProperty(value = "审核时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date auditTime;
-    /**
-     * 审核人
-     */
-    @ApiModelProperty(value = "审核人")
-    private Long auditUser;
-    /**
-     * 审核意见,备注
-     */
-    @ApiModelProperty(value = "审核意见,备注")
-    private String auditNotes;
-    /**
-     * 是否接收查看，0：未查看；1：已查看
-     */
-    @ApiModelProperty(value = "是否接收查看，0：未查看；1：已查看")
-    private Long isread;
-
-    @TableField(exist = false)
-    private String isreadName;
-    /**
-     * 工地监护工单主键ID
-     */
-    @TableId(value = "ID", type = IdType.INPUT)
-    @ApiModelProperty(value = "工地监护工单主键ID")
-    private Long id;
-    /**
-     * 工地类型ID，关联表TF_YWPN_BUILDTYPE_D
-     */
-    @ApiModelProperty(value = "工地类型ID，关联表TF_YWPN_BUILDTYPE_D")
-    private Long typeId;
-
-    @TableField(exist = false)
-    private String typeIdName;
-    /**
-     * 上报途径，0:手机端现场上报，1内业上报
-     */
-    @ApiModelProperty(value = "上报途径，0:手机端现场上报，1内业上报")
-    private String uploadType;
-
-    @TableField(exist = false)
-    private String uploadTypeName;
-    /**
-     * 上报位置经度
-     */
-    @ApiModelProperty(value = "上报位置经度")
-    private Double lgtd;
-    /**
-     * 上报位置纬度
-     */
-    @ApiModelProperty(value = "上报位置纬度")
-    private Double lttd;
-    /**
-     * 地址
-     */
-    @ApiModelProperty(value = "地址")
-    private String address;
-    /**
-     * 施工单位名称
-     */
-    @ApiModelProperty(value = "施工单位名称")
-    private String sgdw;
-    /**
-     * 施工负责人
-     */
-    @ApiModelProperty(value = "施工负责人")
-    private String gdfzr;
-    /**
-     * 联系电话
-     */
-    @ApiModelProperty(value = "联系电话")
-    private String phone;
-
-    /**
-     * 业主单位名称
-     */
-    @ApiModelProperty(value = "业主单位名称")
-    private String ownerUnitName;
-    /**
-     * 业主负责人
-     */
-    @ApiModelProperty(value = "业主负责人")
-    private String ownerUnitUser;
-    /**
-     * 业主联系电话
-     */
-    @ApiModelProperty(value = "业主联系电话")
-    private String ownerUnitPhone;
-
-    /**
-     * 备注
-     */
-    @ApiModelProperty(value = "备注")
-    private String notes;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "CREATE_TIME", fill = FieldFill.INSERT)
-    private Date createTime;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    @TableField(value = "CREATE_USER", fill = FieldFill.INSERT)
-    private Long createUser;
-    @TableField(exist = false)
-    @ApiModelProperty(hidden = true)
-    private String createUserName;
-    /**
-     * 工地现场附件IDS，多个附件id用英文等号分割“,”,关联公共文件表TF_YWPN_FILE _W主键
-     */
-    @ApiModelProperty(value = "工地现场附件IDS，多个附件id用英文等号分割“,”,关联公共文件表TF_YWPN_FILE _W主键")
-    private String uploadFileids;
-    /**
-     * 审核人是否确认查收，0未查询，1已查收
-     */
-    @ApiModelProperty(value = "审核人是否确认查收，0未查询，1已查收")
-    private String ischeackRead;
-    @TableField(exist = false)
-    private String ischeackReadName;
-    /**
-     * 是否需要人员监护巡查，0否，1是
-     */
-    @ApiModelProperty(value = "是否需要人员监护巡查，0否，1是")
-    private String isrespect;
-
-    @TableField(exist = false)
-    private String isrespectName;
-    /**
-     * 监护状态，0无需监护、1监护巡查、2已结束、3监护结束申请
-     */
-    @ApiModelProperty(value = "监护状态，0无需监护、1监护巡查、2已结束、3监护结束申请,4已上报")
-    private String state;
-    @TableField(exist = false)
-    private String stateName;
-    /**
-     * 上报状态；0：未提交；1：已提交
-     */
-    @ApiModelProperty(value = "上报状态；0：未提交；1：已提交")
-    private String isSubmit;
-    @TableField(exist = false)
-    private String isSubmitName;
-    /**
-     * 所属片区
-     */
-    @ApiModelProperty(value = "所属片区编码")
-    private String regionId;
-
-    /**
-     * 片区名称
-     */
-    @ApiModelProperty(value = "片区名称")
-    private String regionName;
-
-    @ApiModelProperty(value = "工地名称")
-    private String siteName;
-    @TableField(exist = false)
-    @ApiModelProperty(value = "审核人名称")
-    private String auditUserName;
-    @TableField(exist = false)
-    @ApiModelProperty(value = "文件路径列表")
-    List<String> filePathList;
-
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/build/Buildplan.java

@@ -1,67 +0,0 @@
-/*
- * Author: Zev
- * 生成entity
- */
-package com.tofly.pojo.build;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-
-
-/**
- * 工地巡查计划关联信息表
- *
- * @author admin
- * @date Thu Mar 18 00:00:00 CST 2021
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName(value = "TF_YWPN_BUILDPLAN_W", resultMap = "buildplanMap")
-@KeySequence("TF_YWPN_BUILDPLAN_W")
-@ApiModel
-public class Buildplan extends Model<Buildplan> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 唯一标识编号
-     */
-    @TableId(value = "ID", type = IdType.INPUT)
-    @ApiModelProperty(value = "唯一标识编号")
-    private Long id;
-    /**
-     * 工地ID,关联表TF_YWPN_BUILD_W主键
-     */
-    @ApiModelProperty(value = "工地ID,关联表TF_YWPN_BUILD_W主键")
-    private Long buildId;
-    /**
-     * 计划ID关联表TF_YWPN__PLAN_W主键
-     */
-    @ApiModelProperty(value = "计划ID关联表TF_YWPN__PLAN_W主键")
-    private Long planId;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    @TableField(value = "CREATE_USER", fill = FieldFill.INSERT)
-    private Long createUser;
-    @ApiModelProperty(hidden = true)
-    private String createUserName;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "CREATE_TIME", fill = FieldFill.INSERT)
-    private Date createTime;
-
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/build/Buildtype.java

@@ -1,67 +0,0 @@
-/*
- * Author: Zev
- * 生成entity
- */
-package com.tofly.pojo.build;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-
-
-/**
- * 工地类型信息表
- *
- * @author admin
- * @date Thu Mar 18 00:00:00 CST 2021
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName(value = "TF_YWPN_BUILDTYPE_D", resultMap = "buildtypeDMap")
-@KeySequence("TF_YWPN_BUILDTYPE_D")
-@ApiModel
-public class Buildtype extends Model<Buildtype> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 唯一标识编号
-     */
-    @TableId(value = "ID", type = IdType.INPUT)
-    @ApiModelProperty(value = "唯一标识编号")
-    private Long id;
-    /**
-     * 工地类型（代建工地、外部施工工地）
-     */
-    @ApiModelProperty(value = "工地类型（代建工地、外部施工工地）")
-    private String name;
-    /**
-     * 备注
-     */
-    @ApiModelProperty(value = "备注")
-    private String notes;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    @TableField(value = "CREATE_USER", fill = FieldFill.INSERT)
-    private Long createUser;
-    @ApiModelProperty(hidden = true)
-    private String createUserName;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "CREATE_TIME", fill = FieldFill.INSERT)
-    private Date createTime;
-
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/build/Bulidclear.java

@@ -1,100 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.pojo.build;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-
-
-/**
- * 工地监护结束记录表
- *
- * @author admin
- * @date Mon Mar 29 00:00:00 CST 2021
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName(value = "TF_YWPN_BULIDCLEAR_W", resultMap = "bulidclearMap")
-@KeySequence("TF_YWPN_BULIDCLEAR_W")
-@ApiModel
-public class Bulidclear extends Model<Bulidclear> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 上报人
-     */
-    @ApiModelProperty(value = "上报人")
-    private Long submitUser;
-    /**
-     * 0：未审核；1：通过；2：未通过
-     */
-    @ApiModelProperty(value = "0：未审核；1：通过；2：未通过")
-    private String auditResult;
-    /**
-     * 审核时间
-     */
-    @ApiModelProperty(value = "审核时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date auditTime;
-    /**
-     * 审核人
-     */
-    @ApiModelProperty(value = "审核人")
-    private Long auditUser;
-    /**
-     * 审核意见,备注
-     */
-    @ApiModelProperty(value = "审核意见,备注")
-    private String auditNotes;
-    /**
-     * 主键ID
-     */
-    @TableId(value = "ID", type = IdType.INPUT)
-    @ApiModelProperty(value = "主键ID")
-    private Long id;
-    /**
-     * 工地id，关联表TF_YWPN_BUILD_W主键
-     */
-    @ApiModelProperty(value = "工地id，关联表TF_YWPN_BUILD_W主键")
-    private Long buildId;
-    /**
-     * 工地现场情况说明
-     */
-    @ApiModelProperty(value = "工地现场情况说明")
-    private String notes;
-    /**
-     * 结束监护附件IDS，多个附件id用英文等号分割“,”,关联公共文件表TF_YWPN_FILE _W主键
-     */
-    @ApiModelProperty(value = "结束监护附件IDS，多个附件id用英文等号分割“,”,关联公共文件表TF_YWPN_FILE _W主键")
-    private String clearFileids;
-    /**
-     * 是否读取，0未读，1已读
-     */
-    @ApiModelProperty(value = "是否读取，0未读，1已读")
-    private String isread;
-    /**
-     * 上报状态；0：未提交；1：已提交
-     */
-    @ApiModelProperty(value = "上报状态；0：未提交；1：已提交")
-    private String isSubmit;
-    /**
-     * 上报时间
-     */
-    @ApiModelProperty(value = "上报时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date submitTime;
-
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/build/dto/BuildDto.java

@@ -1,190 +0,0 @@
-/*
- * Author: Zev
- * 生成entity
- */
-package com.tofly.pojo.build.dto;
-
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-
-/**
- * 工地监护上报信息表
- *
- * @author admin
- * @date Thu Mar 18 00:00:00 CST 2021
- */
-@Data
-@ApiModel
-public class BuildDto extends Model<BuildDto> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 上报时间
-     */
-    @ApiModelProperty(value = "上报时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date submitTime;
-    /**
-     * 上报人
-     */
-    @ApiModelProperty(value = "上报人")
-    private Long submitUser;
-    /**
-     * 0：未审核；1：通过；2：未通过
-     */
-    @ApiModelProperty(value = "0：未审核；1：通过；2：未通过")
-    private String auditResult;
-    /**
-     * 审核时间
-     */
-    @ApiModelProperty(value = "审核时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date auditTime;
-    /**
-     * 审核人
-     */
-    @ApiModelProperty(value = "审核人")
-    private Long auditUser;
-    /**
-     * 审核意见,备注
-     */
-    @ApiModelProperty(value = "审核意见,备注")
-    private String auditNotes;
-    /**
-     * 是否接收查看，0：未查看；1：已查看
-     */
-    @ApiModelProperty(value = "是否接收查看，0：未查看；1：已查看")
-    private Long isread;
-    /**
-     * 工地监护工单主键ID
-     */
-    @ApiModelProperty(value = "工地监护工单主键ID")
-    private Long id;
-    /**
-     * 工地类型ID，关联表TF_YWPN_BUILDTYPE_D
-     */
-    @ApiModelProperty(value = "工地类型ID，关联表TF_YWPN_BUILDTYPE_D")
-    private Long typeId;
-    /**
-     * 上报途径，0:手机端现场上报，1内业上报
-     */
-    @ApiModelProperty(value = "上报途径，0:手机端现场上报，1内业上报")
-    private String uploadType;
-    /**
-     * 上报位置经度
-     */
-    @ApiModelProperty(value = "上报位置经度")
-    private Double lgtd;
-    /**
-     * 上报位置纬度
-     */
-    @ApiModelProperty(value = "上报位置纬度")
-    private Double lttd;
-    /**
-     * 地址
-     */
-    @ApiModelProperty(value = "地址")
-    private String address;
-    /**
-     * 施工单位名称
-     */
-    @ApiModelProperty(value = "施工单位名称")
-    private String sgdw;
-    /**
-     * 施工负责人
-     */
-    @ApiModelProperty(value = "施工负责人")
-    private String gdfzr;
-    /**
-     * 联系电话
-     */
-    @ApiModelProperty(value = "联系电话")
-    private String phone;
-    /**
-     * 业主单位名称
-     */
-    @ApiModelProperty(value = "业主单位名称")
-    private String ownerUnitName;
-    /**
-     * 业主负责人
-     */
-    @ApiModelProperty(value = "业主负责人")
-    private String ownerUnitUser;
-    /**
-     * 业主联系电话
-     */
-    @ApiModelProperty(value = "业主联系电话")
-    private String ownerUnitPhone;
-    /**
-     * 备注
-     */
-    @ApiModelProperty(value = "备注")
-    private String notes;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    private Long createUser;
-    @ApiModelProperty(hidden = true)
-    private String createUserName;
-    /**
-     * 工地现场附件IDS，多个附件id用英文等号分割“,”,关联公共文件表TF_YWPN_FILE _W主键
-     */
-    @ApiModelProperty(value = "工地现场附件IDS，多个附件id用英文等号分割“,”,关联公共文件表TF_YWPN_FILE _W主键")
-    private String uploadFileids;
-    /**
-     * 审核人是否确认查收，0未查询，1已查收
-     */
-    @ApiModelProperty(value = "审核人是否确认查收，0未查询，1已查收")
-    private String ischeackRead;
-    /**
-     * 是否需要人员监护巡查，0否，1是
-     */
-    @ApiModelProperty(value = "是否需要人员监护巡查，0否，1是")
-    private String isrespect;
-    /**
-     * 监护状态，0无需监护、1监护巡查、2已结束、3监护结束申请
-     */
-    @ApiModelProperty(value = "监护状态，0无需监护、1监护巡查、2已结束、3监护结束申请")
-    private String state;
-    /**
-     * 上报状态；0：未提交；1：已提交
-     */
-    @ApiModelProperty(value = "上报状态；0：未提交；1：已提交")
-    private String isSubmit;
-
-    @ApiModelProperty(value = "auditResult 审核状态查询,多个状态 以 , 隔开")
-    private String auditResults;
-
-    /**
-     * 所属片区
-     */
-    @ApiModelProperty(value = "所属片区编码")
-    private String regionId;
-
-    /**
-     * 片区名称
-     */
-    @ApiModelProperty(value = "片区名称")
-    private String regionName;
-    @ApiModelProperty(value = "是否查询当前用户下的处理列表,flag为1 默认不填写")
-    private String flag;
-    @ApiModelProperty(value = "工地名称")
-    private String siteName;
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/build/dto/BuildplanDto.java

@@ -1,58 +0,0 @@
-/*
- * Author: Zev
- * 生成entity
- */
-package com.tofly.pojo.build.dto;
-
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-
-/**
- * 工地巡查计划关联信息表
- *
- * @author admin
- * @date Thu Mar 18 00:00:00 CST 2021
- */
-@Data
-@ApiModel
-public class BuildplanDto extends Model<BuildplanDto> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 唯一标识编号
-     */
-    @ApiModelProperty(value = "唯一标识编号")
-    private Long id;
-    /**
-     * 工地ID,关联表TF_YWPN_BUILD_W主键
-     */
-    @ApiModelProperty(value = "工地ID,关联表TF_YWPN_BUILD_W主键")
-    private Long buildId;
-    /**
-     * 计划ID关联表TF_YWPN__PLAN_W主键
-     */
-    @ApiModelProperty(value = "计划ID关联表TF_YWPN__PLAN_W主键")
-    private Long planId;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    private Long createUser;
-    @ApiModelProperty(hidden = true)
-    private String createUserName;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/build/dto/BuildtypeDto.java

@@ -1,58 +0,0 @@
-/*
- * Author: Zev
- * 生成entity
- */
-package com.tofly.pojo.build.dto;
-
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-
-/**
- * 工地类型信息表
- *
- * @author admin
- * @date Thu Mar 18 00:00:00 CST 2021
- */
-@Data
-@ApiModel
-public class BuildtypeDto extends Model<BuildtypeDto> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 唯一标识编号
-     */
-    @ApiModelProperty(value = "唯一标识编号")
-    private Long id;
-    /**
-     * 工地类型（代建工地、外部施工工地）
-     */
-    @ApiModelProperty(value = "工地类型（代建工地、外部施工工地）")
-    private String name;
-    /**
-     * 备注
-     */
-    @ApiModelProperty(value = "备注")
-    private String notes;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    private Long createUser;
-    @ApiModelProperty(hidden = true)
-    private String createUserName;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/build/dto/BulidclearDto.java

@@ -1,97 +0,0 @@
-/*
- * Author: Zev
- * 生成entity
- */
-package com.tofly.pojo.build.dto;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-
-/**
- * 工地监护结束记录表
- *
- * @author admin
- * @date Thu Mar 18 00:00:00 CST 2021
- */
-@Data
-@ApiModel
-public class BulidclearDto extends Model<BulidclearDto> {
-    private static final long serialVersionUID = 1L;
-
-
-    /**
-     * 上报人
-     */
-    @ApiModelProperty(value = "上报人")
-    private Long submitUser;
-    /**
-     * 0：未审核；1：通过；2：未通过
-     */
-    @ApiModelProperty(value = "0：未审核；1：通过；2：未通过")
-    private String auditResult;
-    /**
-     * 审核时间
-     */
-    @ApiModelProperty(value = "审核时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date auditTime;
-    /**
-     * 审核人
-     */
-    @ApiModelProperty(value = "审核人")
-    private Long auditUser;
-    /**
-     * 审核意见,备注
-     */
-    @ApiModelProperty(value = "审核意见,备注")
-    private String auditNotes;
-    /**
-     * 主键ID
-     */
-    @TableId(value = "ID", type = IdType.INPUT)
-    @ApiModelProperty(value = "主键ID")
-    private Long id;
-    /**
-     * 工地id，关联表TF_YWPN_BUILD_W主键
-     */
-    @ApiModelProperty(value = "工地id，关联表TF_YWPN_BUILD_W主键")
-    private Long buildId;
-    /**
-     * 工地现场情况说明
-     */
-    @ApiModelProperty(value = "工地现场情况说明")
-    private String notes;
-    /**
-     * 结束监护附件IDS，多个附件id用英文等号分割“,”,关联公共文件表TF_YWPN_FILE _W主键
-     */
-    @ApiModelProperty(value = "结束监护附件IDS，多个附件id用英文等号分割“,”,关联公共文件表TF_YWPN_FILE _W主键")
-    private String clearFileids;
-    /**
-     * 是否读取，0未读，1已读
-     */
-    @ApiModelProperty(value = "是否读取，0未读，1已读")
-    private String isread;
-    /**
-     * 上报状态；0：未提交；1：已提交
-     */
-    @ApiModelProperty(value = "上报状态；0：未提交；1：已提交")
-    private String isSubmit;
-    /**
-     * 上报时间
-     */
-    @ApiModelProperty(value = "上报时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date submitTime;
-
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/build/vo/BuildVo.java

@@ -1,207 +0,0 @@
-/*
- * Author: Zev
- * 生成entity
- */
-package com.tofly.pojo.build.vo;
-
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-import java.util.List;
-
-
-/**
- * 工地监护上报信息表
- *
- * @author admin
- * @date Thu Mar 18 00:00:00 CST 2021
- */
-@Data
-@ApiModel
-public class BuildVo extends Model<BuildVo> {
-    private static final long serialVersionUID = 1L;
-    /**
-     * 上报时间
-     */
-    @ApiModelProperty(value = "上报时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date submitTime;
-    /**
-     * 上报人
-     */
-    @ApiModelProperty(value = "上报人")
-    private Long submitUser;
-    /**
-     * 0：未审核；1：通过；2：未通过
-     */
-    @ApiModelProperty(value = "0：未审核；1：通过；2：未通过")
-    private String auditResult;
-    /**
-     * 审核时间
-     */
-    @ApiModelProperty(value = "审核时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date auditTime;
-    /**
-     * 审核人
-     */
-    @ApiModelProperty(value = "审核人")
-    private Long auditUser;
-    /**
-     * 审核意见,备注
-     */
-    @ApiModelProperty(value = "审核意见,备注")
-    private String auditNotes;
-    /**
-     * 是否接收查看，0：未查看；1：已查看
-     */
-    @ApiModelProperty(value = "是否接收查看，0：未查看；1：已查看")
-    private String isread;
-    /**
-     * 工地监护工单主键ID
-     */
-    @ApiModelProperty(value = "工地监护工单主键ID")
-    private Long id;
-    /**
-     * 工地类型ID，关联表TF_YWPN_BUILDTYPE_D
-     */
-    @ApiModelProperty(value = "工地类型ID，关联表TF_YWPN_BUILDTYPE_D")
-    private Long typeId;
-    /**
-     * 工地类型名称
-     */
-    @ApiModelProperty(value = "工地类型名称")
-    private String type;
-    /**
-     * 上报途径，0:手机端现场上报，1内业上报
-     */
-    @ApiModelProperty(value = "上报途径，0:手机端现场上报，1内业上报")
-    private String uploadType;
-    /**
-     * 上报位置经度
-     */
-    @ApiModelProperty(value = "上报位置经度")
-    private Double lgtd;
-    /**
-     * 上报位置纬度
-     */
-    @ApiModelProperty(value = "上报位置纬度")
-    private Double lttd;
-    /**
-     * 地址
-     */
-    @ApiModelProperty(value = "地址")
-    private String address;
-    /**
-     * 施工单位名称
-     */
-    @ApiModelProperty(value = "施工单位名称")
-    private String sgdw;
-    /**
-     * 施工负责人
-     */
-    @ApiModelProperty(value = "施工负责人")
-    private String gdfzr;
-    /**
-     * 联系电话
-     */
-    @ApiModelProperty(value = "联系电话")
-    private String phone;
-    /**
-     * 业主单位名称
-     */
-    @ApiModelProperty(value = "业主单位名称")
-    private String ownerUnitName;
-    /**
-     * 业主负责人
-     */
-    @ApiModelProperty(value = "业主负责人")
-    private String ownerUnitUser;
-    /**
-     * 业主联系电话
-     */
-    @ApiModelProperty(value = "业主联系电话")
-    private String ownerUnitPhone;
-    /**
-     * 备注
-     */
-    @ApiModelProperty(value = "备注")
-    private String notes;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    private Long createUser;
-    @ApiModelProperty(hidden = true)
-    private String createUserName;
-    /**
-     * 工地现场附件IDS，多个附件id用英文等号分割“,”,关联公共文件表TF_YWPN_FILE _W主键
-     */
-    @ApiModelProperty(value = "工地现场附件IDS，多个附件id用英文等号分割“,”,关联公共文件表TF_YWPN_FILE _W主键")
-    private String uploadFileids;
-    /**
-     * 审核人是否确认查收，0未查询，1已查收
-     */
-    @ApiModelProperty(value = "审核人是否确认查收，0未查询，1已查收")
-    private String ischeackRead;
-    /**
-     * 是否需要人员监护巡查，0否，1是
-     */
-    @ApiModelProperty(value = "是否需要人员监护巡查，0否，1是")
-    private String isrespect;
-    /**
-     * 监护状态，0无需监护、1监护巡查、2已结束、3监护结束申请
-     */
-    @ApiModelProperty(value = "监护状态，0无需监护、1监护巡查、2已结束、3监护结束申请")
-    private String state;
-    /**
-     * 上报状态；0：未提交；1：已提交
-     */
-    @ApiModelProperty(value = "上报状态；0：未提交；1：已提交")
-    private String isSubmit;
-
-    /**
-     * 审核人名称
-     */
-    @ApiModelProperty(value = "审核人名称")
-    private String auditUserName;
-    /**
-     * 上报人名称
-     */
-    @ApiModelProperty(value = "上报人名称")
-    private String submitUserName;
-
-    /**
-     * 所属片区
-     */
-    @ApiModelProperty(value = "所属片区编码")
-    private String regionId;
-
-    /**
-     * 片区名称
-     */
-    @ApiModelProperty(value = "片区名称")
-    private String regionName;
-
-    /**
-     * 文件路径列表
-     */
-    @ApiModelProperty(value = "文件路径列表")
-    List<String> filePathList;
-    @ApiModelProperty(value = "工地名称")
-    private String siteName;
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/build/vo/BuildplanVo.java

@@ -1,58 +0,0 @@
-/*
- * Author: Zev
- * 生成entity
- */
-package com.tofly.pojo.build.vo;
-
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-
-/**
- * 工地巡查计划关联信息表
- *
- * @author admin
- * @date Thu Mar 18 00:00:00 CST 2021
- */
-@Data
-@ApiModel
-public class BuildplanVo extends Model<BuildplanVo> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 唯一标识编号
-     */
-    @ApiModelProperty(value = "唯一标识编号")
-    private Long id;
-    /**
-     * 工地ID,关联表TF_YWPN_BUILD_W主键
-     */
-    @ApiModelProperty(value = "工地ID,关联表TF_YWPN_BUILD_W主键")
-    private Long buildId;
-    /**
-     * 计划ID关联表TF_YWPN__PLAN_W主键
-     */
-    @ApiModelProperty(value = "计划ID关联表TF_YWPN__PLAN_W主键")
-    private Long planId;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    private Long createUser;
-    @ApiModelProperty(hidden = true)
-    private String createUserName;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/build/vo/BuildtypeVo.java

@@ -1,58 +0,0 @@
-/*
- * Author: Zev
- * 生成entity
- */
-package com.tofly.pojo.build.vo;
-
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-
-/**
- * 工地类型信息表
- *
- * @author admin
- * @date Thu Mar 18 00:00:00 CST 2021
- */
-@Data
-@ApiModel
-public class BuildtypeVo extends Model<BuildtypeVo> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 唯一标识编号
-     */
-    @ApiModelProperty(value = "唯一标识编号")
-    private Long id;
-    /**
-     * 工地类型（代建工地、外部施工工地）
-     */
-    @ApiModelProperty(value = "工地类型（代建工地、外部施工工地）")
-    private String name;
-    /**
-     * 备注
-     */
-    @ApiModelProperty(value = "备注")
-    private String notes;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    private Long createUser;
-    @ApiModelProperty(hidden = true)
-    private String createUserName;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/build/vo/BulidclearVo.java

@@ -1,142 +0,0 @@
-/*
- * Author: Zev
- * 生成entity
- */
-package com.tofly.pojo.build.vo;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-import java.util.List;
-
-
-/**
- * 工地监护结束记录表
- *
- * @author admin
- * @date Thu Mar 18 00:00:00 CST 2021
- */
-@Data
-@ApiModel
-public class BulidclearVo extends Model<BulidclearVo> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 上报人
-     */
-    @ApiModelProperty(value = "上报人")
-    private Long submitUser;
-    /**
-     * 0：未审核；1：通过；2：未通过
-     */
-    @ApiModelProperty(value = "0：未审核；1：通过；2：未通过")
-    private String auditResult;
-    /**
-     * 审核时间
-     */
-    @ApiModelProperty(value = "审核时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date auditTime;
-    /**
-     * 审核人
-     */
-    @ApiModelProperty(value = "审核人")
-    private Long auditUser;
-    /**
-     * 审核意见,备注
-     */
-    @ApiModelProperty(value = "审核意见,备注")
-    private String auditNotes;
-    /**
-     * 主键ID
-     */
-    @TableId(value = "ID", type = IdType.INPUT)
-    @ApiModelProperty(value = "主键ID")
-    private Long id;
-    /**
-     * 工地id，关联表TF_YWPN_BUILD_W主键
-     */
-    @ApiModelProperty(value = "工地id，关联表TF_YWPN_BUILD_W主键")
-    private Long buildId;
-    /**
-     * 工地现场情况说明
-     */
-    @ApiModelProperty(value = "工地现场情况说明")
-    private String notes;
-    /**
-     * 结束监护附件IDS，多个附件id用英文等号分割“,”,关联公共文件表TF_YWPN_FILE _W主键
-     */
-    @ApiModelProperty(value = "结束监护附件IDS，多个附件id用英文等号分割“,”,关联公共文件表TF_YWPN_FILE _W主键")
-    private String clearFileids;
-    /**
-     * 是否读取，0未读，1已读
-     */
-    @ApiModelProperty(value = "是否读取，0未读，1已读")
-    private String isread;
-    /**
-     * 上报状态；0：未提交；1：已提交
-     */
-    @ApiModelProperty(value = "上报状态；0：未提交；1：已提交")
-    private String isSubmit;
-    /**
-     * 上报时间
-     */
-    @ApiModelProperty(value = "上报时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date submitTime;
-
-    /**
-     * 审核人名称
-     */
-    @ApiModelProperty(value = "审核人名称")
-    private String auditUserName;
-    /**
-     * 上报人名称
-     */
-    @ApiModelProperty(value = "上报人名称")
-    private String submitUserName;
-
-    /**
-     * 文件路径列表
-     */
-    @ApiModelProperty(value = "文件路径列表")
-    List<String> filePathList;
-
-    /**
-     * 地址
-     */
-    @ApiModelProperty(value = "地址")
-    private String address;
-    /**
-     * 施工单位名称
-     */
-    @ApiModelProperty(value = "施工单位名称")
-    private String sgdw;
-    /**
-     * 施工负责人
-     */
-    @ApiModelProperty(value = "施工负责人")
-    private String gdfzr;
-    /**
-     * 联系电话
-     */
-    @ApiModelProperty(value = "联系电话")
-    private String phone;
-    /**
-     * 工地类型ID，关联表TF_YWPN_BUILDTYPE_D
-     */
-    @ApiModelProperty(value = "工地类型ID，关联表TF_YWPN_BUILDTYPE_D")
-    private Long typeId;
-
-    @ApiModelProperty(value = "工地类型名称")
-    private String typeName;
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/build/vo/detail/BuildDetailVo.java

@@ -1,47 +0,0 @@
-/*
- * Author: Zev
- * 生成entity
- */
-package com.tofly.pojo.build.vo.detail;
-
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.tofly.pojo.build.Build;
-import com.tofly.pojo.build.vo.BuildVo;
-import com.tofly.pojo.build.vo.BulidclearVo;
-import com.tofly.pojo.plan.Planchild;
-import com.tofly.pojo.plan.vo.PlanchildVo;
-import com.tofly.pojo.plan.vo.RecordVo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-
-/**
- * 工地监护详情
- *
- * @author admin
- * @date Thu Mar 18 00:00:00 CST 2021
- */
-@Data
-@ApiModel
-public class BuildDetailVo extends Model<BuildDetailVo> {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "当前对应-子计划信息")
-    private List<Planchild> planchildVoList;
-
-    @ApiModelProperty(value = "工地监护结束申请信息")
-    private List<BulidclearVo> bulidclearVoList;
-
-    @ApiModelProperty(value = "工地巡查记录信息")
-    private List<RecordVo> recordVoList;
-
-    @ApiModelProperty(value = "工地监护派工信息")
-    private BuildDispatchingVo buildDispatchingVo;
-
-    @ApiModelProperty(value = "工地信息")
-    private Build buildVo;
-
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/build/vo/detail/BuildDispatchingVo.java

@@ -1,65 +0,0 @@
-/*
- * Author: Zev
- * 生成entity
- */
-package com.tofly.pojo.build.vo.detail;
-
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-
-/**
- * 工地监护派工信息
- *
- * @author admin
- * @date Thu Mar 18 00:00:00 CST 2021
- */
-@Data
-@ApiModel
-public class BuildDispatchingVo extends Model<BuildDispatchingVo> {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "是否需人员监护，0否，1是")
-    private String isrespect;
-
-    @ApiModelProperty(value = "0：未审核；1：通过；2：未通过")
-    private String auditResult;
-
-    @ApiModelProperty(value = "审核人id")
-    private Long auditUser;
-
-    @ApiModelProperty(value = "审核人Name")
-    private String auditUserName;
-
-    @ApiModelProperty(value = "巡检组名称")
-    private String inspectGroupIdName;
-
-    @ApiModelProperty(value = "巡检周期；关联周期表：TF_YWPN_PERIOD_D")
-    private Long periodId;
-
-    @ApiModelProperty(value = "巡检周期名称")
-    private String periodName;
-
-    @ApiModelProperty(value = "间隔天数")
-    private Integer interValDay;
-
-    @ApiModelProperty(value = "巡检人名称")
-    private String inspectUserName;
-
-    @ApiModelProperty(value = "巡检计划开始时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date planBegindate;
-
-    @ApiModelProperty(value = "巡检计划结束时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date planEnddate;
-
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/build/vo/detail/BuildEliminationAuditVo.java

@@ -1,38 +0,0 @@
-/*
- * Author: Zev
- * 生成entity
- */
-package com.tofly.pojo.build.vo.detail;
-
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-
-/**
- * 工地监护审核
- *
- * @author admin
- * @date Thu Mar 18 00:00:00 CST 2021
- */
-@Data
-@ApiModel
-public class BuildEliminationAuditVo extends Model<BuildEliminationAuditVo> {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "审核时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date auditTime;
-
-    @ApiModelProperty(value = "0：未审核；1：通过；2：未通过")
-    private String auditResult;
-
-    @ApiModelProperty(value = "审核意见")
-    private String auditNotes;
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/build/vo/detail/BuildEliminationRegistrationVo.java

@@ -1,31 +0,0 @@
-/*
- * Author: Zev
- * 生成entity
- */
-package com.tofly.pojo.build.vo.detail;
-
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.tofly.pojo.build.vo.BulidclearVo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-
-/**
- * 工地监护结束申请
- *
- * @author admin
- * @date Thu Mar 18 00:00:00 CST 2021
- */
-@Data
-@ApiModel
-public class BuildEliminationRegistrationVo extends Model<BuildEliminationRegistrationVo> {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "工地监护结束申请列表")
-    private List<BulidclearVo> bulidClearVoList;
-
-
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/build/vo/detail/BuildInspectionRecordVo.java

@@ -1,29 +0,0 @@
-/*
- * Author: Zev
- * 生成entity
- */
-package com.tofly.pojo.build.vo.detail;
-
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.tofly.pojo.plan.vo.RecordVo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-
-/**
- * 工地巡查记录
- *
- * @author admin
- * @date Thu Mar 18 00:00:00 CST 2021
- */
-@Data
-@ApiModel
-public class BuildInspectionRecordVo extends Model<BuildInspectionRecordVo> {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "工地巡查记录列表")
-    private List<RecordVo> recordVoList;
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/build/vo/detail/BuildRecordVo.java

@@ -1,62 +0,0 @@
-package com.tofly.pojo.build.vo.detail;
-
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * 工地信息
- * @author BZ-DJJ
- */
-@Data
-@ApiModel
-public class BuildRecordVo extends Model<BuildRecordVo> {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "所属片区编码")
-    private String regionId;
-
-    @ApiModelProperty(value = "片区名称")
-    private String regionName;
-
-    @ApiModelProperty(value = "上报时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date submitTime;
-
-    @ApiModelProperty(value = "工地类型ID，关联表TF_YWPN_BUILDTYPE_D")
-    private Long typeId;
-
-    @ApiModelProperty(value = "工地类型名称")
-    private Long typeName;
-
-    @ApiModelProperty(value = "地址")
-    private String address;
-
-    @ApiModelProperty(value = "上报位置经度")
-    private Double lgtd;
-
-    @ApiModelProperty(value = "上报位置纬度")
-    private Double lttd;
-
-    @ApiModelProperty(value = "施工单位名称")
-    private String sgdw;
-
-    @ApiModelProperty(value = "施工负责人")
-    private String gdfzr;
-
-    @ApiModelProperty(value = "联系电话")
-    private String phone;
-
-    @ApiModelProperty(value = "工地现场附件IDS，多个附件id用英文等号分割“,”,关联公共文件表TF_YWPN_FILE _W主键")
-    private String uploadFileids;
-
-    @ApiModelProperty(value = "文件路径列表")
-    List<String> filePathList;
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/comm/Audit.java

@@ -1,85 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.pojo.comm;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-
-
-
-/**
- * 审批表
- *
- * @author zev
- * @date Fri May 21 00:00:00 CST 2021
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName(value = "TF_YMPN_AUDIT_W", resultMap = "auditMap")
-@KeySequence("TF_YMPN_AUDIT_W")
-@ApiModel
-public class Audit extends Model<Audit> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * $column.comments
-     */
-    @TableId(value = "ID", type = IdType.INPUT)
-    @ApiModelProperty(value = "$column.comments")
-    private Long id;
-    /**
-     * 审批类型
-     */
-    @ApiModelProperty(value = "审批类型")
-    private String auditType;
-    /**
-     * 当前审批计划id
-     */
-    @ApiModelProperty(value = "当前审批计划id")
-    private Long auditPlanId;
-    /**
-     * 审批状态(0未审核,1通过,2未通过,3不可审批)
-     */
-    @ApiModelProperty(value = "审批状态(0未审核,1通过,2未通过,3不可审批)")
-    private String auditState;
-    @TableField(exist = false)
-    private String auditStateName;
-    /**
-     * 审核时间
-     */
-    @ApiModelProperty(value = "审核时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date auditTime;
-    /**
-     * 审核意见
-     */
-    @ApiModelProperty(value = "审核意见")
-    private String auditNote;
-    /**
-     * 审核人ID
-     */
-    @ApiModelProperty(value = "审核人ID")
-    private Long auditUser;
-
-    @TableField(exist = false)
-    private String auditUserName;
-    /**
-     * 审批级别
-     */
-    @ApiModelProperty(value = "审批级别")
-    private Integer auditLevel;
-
-
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/comm/File.java

@@ -1,96 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.pojo.comm;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-
-/**
- * 公共文件表： TF_YWPN_FILE_W
- *
- * @author admin
- * @date Wed Mar 10 00:00:00 CST 2021
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName(value = "TF_YWPN_FILE_W", resultMap = "fileMap")
-@KeySequence("TF_YWPN_FILE_W")
-@ApiModel
-public class File extends Model<File> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 唯一编码
-     */
-    @TableId(value = "ID", type = IdType.INPUT)
-    @ApiModelProperty(value = "唯一编码")
-    private Long id;
-    /**
-     * 关联表名字
-     */
-    @ApiModelProperty(value = "关联表名字")
-    private String tableName;
-    /**
-     * 关联表名对应关键字ID
-     */
-    @ApiModelProperty(value = "关联表名对应关键字ID")
-    private Long tableId;
-    /**
-     * 文件路径
-     */
-    @ApiModelProperty(value = "文件路径")
-    private String filePath;
-    /**
-     * 有效标志；0：正常；1：删除
-     */
-    @ApiModelProperty(value = "有效标志；0：正常；1：删除")
-    private String statusFlag;
-    /**
-     * 文件原名称
-     */
-    @ApiModelProperty(value = "文件原名称")
-    private String fileName;
-    /**
-     * 文件上传后名称
-     */
-    @ApiModelProperty(value = "文件上传后名称")
-    private String otherName;
-    /**
-     * 文件后缀
-     */
-    @ApiModelProperty(value = "文件后缀")
-    private String fileFormat;
-    /**
-     * 文件大小
-     */
-    @ApiModelProperty(value = "文件大小")
-    private String fileSize;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "CREATE_TIME", fill = FieldFill.INSERT)
-    private Date createTime;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    @TableField(value = "CREATE_USER", fill = FieldFill.INSERT)
-    private Long createUser;
-    @ApiModelProperty(hidden = true)
-    private String createUserName;
-
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/comm/ResponseNote.java

@@ -1,16 +0,0 @@
-package com.tofly.pojo.comm;
-
-import lombok.Data;
-
-/**
- * 短信响应实体
- * @author FlashWJL
- * @date 2021/4/6 10:42
- */
-@Data
-public class ResponseNote {
-    private String rspcod;	//响应状态码
-    private String msgGroup;	//消息批次号，由云MAS平台生成，用于验证短信提交报告和状态报告的一致性（取值msgGroup）注:如果数据验证不通过msgGroup为空
-    private boolean success;	//数据校验结果
-
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/comm/Rxsmsmessage.java

@@ -1,107 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.pojo.comm;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-
-/**
- * 消息发送记录表
- *
- * @author admin
- * @date Thu Mar 03 00:00:00 CST 2022
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName(value = "TF_YWPN_RXSMSMESSAGE_W", resultMap = "rxsmsmessageMap")
-@KeySequence("TF_YWPN_RXSMSMESSAGE_W")
-@ApiModel
-public class Rxsmsmessage extends Model<Rxsmsmessage> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * ID
-     */
-    @TableId(value = "ID", type = IdType.INPUT)
-    @ApiModelProperty(value = "ID")
-    private Long id;
-    /**
-     * 流水编号
-     */
-    @ApiModelProperty(value = "流水编号")
-    private String lsbh;
-    /**
-     * 提醒类型
-     */
-    @ApiModelProperty(value = "提醒类型")
-    private String txlx;
-    /**
-     * 提醒内容
-     */
-    @ApiModelProperty(value = "提醒内容")
-    private String txnr;
-    /**
-     * 发送状态(0=待发,1=成功,2=失败)
-     */
-    @ApiModelProperty(value = "发送状态(0=待发,1=成功,2=失败)")
-    private String fszt;
-    /**
-     * 处理人员
-     */
-    @ApiModelProperty(value = "处理人员")
-    private String clry;
-    /**
-     * 处理时间
-     */
-    @ApiModelProperty(value = "处理时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date clsj;
-    /**
-     * 创建人员
-     */
-    @ApiModelProperty(value = "创建人员")
-    @TableField(value = "CREATE_USER", fill = FieldFill.INSERT)
-    private Long createUser;
-    @ApiModelProperty(hidden = true)
-    private String createUserName;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "CREATE_DATE", fill = FieldFill.INSERT)
-    private Date createDate;
-    /**
-     * 是否锁定（0否，1是）
-     */
-    @ApiModelProperty(value = "是否锁定（0否，1是）")
-    private String islock;
-    /**
-     * 备注（记录发送失败信息）
-     */
-    @ApiModelProperty(value = "备注（记录发送失败信息）")
-    private String bz;
-    /**
-     * 电话号码
-     */
-    @ApiModelProperty(value = "电话号码")
-    private String mobile;
-
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/comm/SendNote.java

@@ -1,22 +0,0 @@
-package com.tofly.pojo.comm;
-
-import lombok.Data;
-
-/**
- * 短信实体类
- * @author FlashWJL
- * @date 2021/4/6 10:40
- */
-@Data
-public class SendNote {
-
-    private String ecName;		//集团客户名称
-    private String apId;		//用户名
-    private String secretKey;	        //密码
-    private String mobiles;		//手机号码逗号分隔。(如“18137282928,18137282922,18137282923”)
-    private String content;		//发送短信内容
-    private String sign;		//网关签名编码，必填，签名编码在中国移动集团开通帐号后分配，可以在云MAS网页端管理子系统-SMS接口管理功能中下载。
-    private String addSerial;	        //扩展码，根据向移动公司申请的通道填写，如果申请的精确匹配通道，则填写空字符串("")，否则添加移动公司允许的扩展码。
-    private String mac;			//API输入参数签名结果，签名算法：将ecName，apId，secretKey，mobiles，content ，sign，addSerial按照顺序拼接，然后通过md5(32位小写)计算后得出的值。
-
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/comm/dto/AuditDto.java

@@ -1,71 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.pojo.comm.dto;
-
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-
-/**
- * 审批表
- *
- * @author zev
- * @date Fri May 21 00:00:00 CST 2021
- */
-@Data
-@ApiModel
-public class AuditDto extends Model<AuditDto> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * $column.comments
-     */
-    @ApiModelProperty(value = "$column.comments")
-    private Long id;
-    /**
-     * 审批类型
-     */
-    @ApiModelProperty(value = "审批类型")
-    private String auditType;
-    /**
-     * 当前审批计划id
-     */
-    @ApiModelProperty(value = "当前审批计划id")
-    private Long auditPlanId;
-    /**
-     * 审批状态(0未审核,1通过,2未通过,3不可审批)
-     */
-    @ApiModelProperty(value = "审批状态(0未审核,1通过,2未通过,3不可审批)")
-    private String auditState;
-    /**
-     * 审核时间
-     */
-    @ApiModelProperty(value = "审核时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date auditTime;
-    /**
-     * 审核意见
-     */
-    @ApiModelProperty(value = "审核意见")
-    private String auditNote;
-    /**
-     * 审核人ID
-     */
-    @ApiModelProperty(value = "审核人ID")
-    private Long auditUser;
-    /**
-     * 审批级别
-     */
-    @ApiModelProperty(value = "审批级别")
-    private Integer auditLevel;
-
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/comm/vo/AuditVo.java

@@ -1,85 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.pojo.comm.vo;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-
-/**
- * 审批表
- *
- * @author zev
- * @date Fri May 21 00:00:00 CST 2021
- */
-@Data
-@ApiModel
-public class AuditVo extends Model<AuditVo> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * $column.comments
-     */
-    @ApiModelProperty(value = "$column.comments")
-    private Long id;
-    /**
-     * 审批类型
-     */
-    @ApiModelProperty(value = "审批类型")
-    private String auditType;
-    /**
-     * 当前审批计划id
-     */
-    @ApiModelProperty(value = "当前审批计划id")
-    private Long auditPlanId;
-    /**
-     * 审批状态(0未审核,1通过,2未通过,3不可审批)
-     */
-    @ApiModelProperty(value = "审批状态(0未审核,1通过,2未通过,3不可审批)")
-    private String auditState;
-    @TableField(exist = false)
-    private String auditStateName;
-
-    /**
-     * 审核时间
-     */
-    @ApiModelProperty(value = "审核时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date auditTime;
-    @TableField(exist = false)
-    private String auditTimeStr;
-    /**
-     * 审核意见
-     */
-    @ApiModelProperty(value = "审核意见")
-    private String auditNote;
-    /**
-     * 审核人ID
-     */
-    @ApiModelProperty(value = "审核人ID")
-    private Long auditUser;
-    @TableField(exist = false)
-    @ApiModelProperty(value = "审核人名称")
-    private String auditUserName;
-    /**
-     * 审批级别
-     */
-    @ApiModelProperty(value = "审批级别")
-    private Integer auditLevel;
-
-    @ApiModelProperty(value = "核定用时")
-    @TableField(exist = false)
-    private BigDecimal length;
-
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/comm/vo/ImageVo.java

@@ -1,18 +0,0 @@
-package com.tofly.pojo.comm.vo;
-
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-/**
- * 导出word图片对象
- */
-@Data
-@ApiModel
-public class ImageVo extends Model<ImageVo> {
-    private String path;
-
-    public ImageVo(String path) {
-        this.path = path;
-    }
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/emergency/Emergency.java

@@ -1,168 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.pojo.emergency;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-
-/**
- * 应急事件记录表
- *
- * @author admin
- * @date Tue Feb 22 00:00:00 CST 2022
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName(value = "TF_YWPN_EMERGENCY_W", resultMap = "emergencyMap")
-@KeySequence("TF_YWPN_EMERGENCY_W")
-@ApiModel
-public class Emergency extends Model<Emergency> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * $column.comments
-     */
-    @TableId(value = "ID", type = IdType.INPUT)
-    @ApiModelProperty(value = "$column.comments")
-    private Long id;
-    /**
-     * 事件编码(按照部门名称加时间生成)
-     */
-    @ApiModelProperty(value = "事件编码(按照部门名称加时间生成)")
-    private String code;
-    /**
-     * 事件名称
-     */
-    @ApiModelProperty(value = "事件名称")
-    private String name;
-    /**
-     * 事件类型 关联表TF_YWPN_EMERGENCY_TYPE_W id
-     */
-    @ApiModelProperty(value = "事件类型 关联表TF_YWPN_EMERGENCY_TYPE_W id")
-    private Long typeId;
-    @TableField(exist = false)
-    private String typeName;
-    /**
-     * 事件地址
-     */
-    @ApiModelProperty(value = "事件地址")
-    private String address;
-    /**
-     * 事件描述
-     */
-    @ApiModelProperty(value = "事件描述")
-    private String note;
-    /**
-     * 发现人员
-     */
-    @ApiModelProperty(value = "发现人员")
-    private Long foundUserId;
-    @TableField(exist = false)
-    private String foundUserName;
-    /**
-     * 发现时间
-     */
-    @ApiModelProperty(value = "发现时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date foundTime;
-    /**
-     * 是否派工(0不派工1派工)
-     */
-    @ApiModelProperty(value = "是否派工(0不派工1派工)")
-    private String isDispatching;
-    @TableField(exist = false)
-    private String isDispatchingName;
-    /**
-     * 联系电话
-     */
-    @ApiModelProperty(value = "联系电话")
-    private String foundPhone;
-    /**
-     * 处理人员
-     */
-    @ApiModelProperty(value = "处理人员")
-    private Long disUserId;
-    @TableField(exist = false)
-    private String disUserName;
-    /**
-     * 协同处理人,多个以,分隔
-     */
-    @ApiModelProperty(value = "协同处理人,多个以,分隔")
-    private String synergyUserIds;
-
-    @TableField(exist = false)
-    private String synergyUserNames;
-    /**
-     * 是否发送短信(0不1是)
-     */
-    @ApiModelProperty(value = "是否发送短信(0不1是)")
-    private String isMessage;
-    @TableField(exist = false)
-    private String isMessageName;
-    /**
-     * 消息内容
-     */
-    @ApiModelProperty(value = "消息内容")
-    private String messageNote;
-    /**
-     * 应急状态(0未上报,1派工上报,2已派工 3待审核 4已完成)
-     */
-    @ApiModelProperty(value = "应急状态(0未上报,1派工上报,2已派工 3待审核 4已完成)")
-    private String state;
-    @TableField(exist = false)
-    private String stateName;
-    /**
-     * 派工人id
-     */
-    @ApiModelProperty(value = "派工人id")
-    private Long dispatchingUserId;
-    @TableField(exist = false)
-    private String dispatchingUserName;
-
-    /**
-     * 派工时间
-     */
-    @ApiModelProperty(value = "派工时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date dispatchingTime;
-
-    @ApiModelProperty(value = "文件id列表,多个以,分隔")
-    private String fileIds;
-    @ApiModelProperty(value = "文件路径列表")
-    @TableField(exist = false)
-    List<String> fileIdsList;
-
-    @ApiModelProperty(value = "经度")
-    private BigDecimal x;
-    /**
-     * 维度
-     */
-    @ApiModelProperty(value = "维度")
-    private BigDecimal y;
-
-    @ApiModelProperty(value = "处理人电话")
-    private String disPhone;
-
-    @ApiModelProperty(value = "应急处理记录列表")
-    @TableField(exist = false)
-    private List<EmergencyDis> emergencyDisList;
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/emergency/EmergencyDis.java

@@ -1,135 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.pojo.emergency;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-
-/**
- * 应急事件处理日志记录表
- *
- * @author admin
- * @date Tue Feb 22 00:00:00 CST 2022
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName(value = "TF_YWPN_EMERGENCY_DIS_W", resultMap = "emergencyDisMap")
-@KeySequence("TF_YWPN_EMERGENCY_DIS_W")
-@ApiModel
-public class EmergencyDis extends Model<EmergencyDis> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * $column.comments
-     */
-    @TableId(value = "ID", type = IdType.INPUT)
-    @ApiModelProperty(value = "$column.comments")
-    private Long id;
-    /**
-     * 应急事件id 关联TF_YWPN_EMERGENCY_W表 id
-     */
-    @ApiModelProperty(value = "应急事件id 关联TF_YWPN_EMERGENCY_W表 id")
-    private Long emergencyId;
-    /**
-     * 处理状态(1已完成 2未完成 3无需处理 )
-     */
-    @ApiModelProperty(value = "处理状态(1已完成 2未完成 3无需处理 )")
-    private String state;
-    @TableField(exist = false)
-    private String stateName;
-    /**
-     * 处理说明
-     */
-    @ApiModelProperty(value = "处理说明")
-    private String note;
-    /**
-     * 前-附件
-     */
-    @ApiModelProperty(value = "前-附件")
-    private String fileIdsOne;
-    /**
-     * 中附件
-     */
-    @ApiModelProperty(value = "中附件")
-    private String fileIdsTow;
-    /**
-     * 后附件
-     */
-    @ApiModelProperty(value = "后附件")
-    private String fileIdsThree;
-    /**
-     * 是否为历史(0否,1是)
-     */
-    @ApiModelProperty(value = "是否为历史(0否,1是)")
-    private String isHis;
-    /**
-     * 处理人员
-     */
-    @ApiModelProperty(value = "处理人员")
-    private Long disUserId;
-    @ApiModelProperty(value = "是否无效(0无效1有效)")
-    private String flag;
-
-    @TableField(exist = false)
-    private String disUserName;
-    /**
-     * 审核状态：0未审批、1已通过、2未通过
-     */
-    @ApiModelProperty(value = "审核状态：0未审批、1已通过、2未通过")
-    private String auditResult;
-
-    @TableField(exist = false)
-    private String auditResultName;
-    /**
-     * 审核说明
-     */
-    @ApiModelProperty(value = "审核说明")
-    private String auditNote;
-    /**
-     * 审核人
-     */
-    @ApiModelProperty(value = "审核人")
-    private Long auditUser;
-    @TableField(exist = false)
-    private String auditUserName;
-    /**
-     * 审核时间
-     */
-    @ApiModelProperty(value = "审核时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date auditTime;
-    /**
-     * 处理时间
-     */
-    @ApiModelProperty(value = "处理时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date disTime;
-    @ApiModelProperty(value = "前文件路径列表")
-    @TableField(exist = false)
-    List<String> filePathOneList;
-    @ApiModelProperty(value = "中文件路径列表")
-    @TableField(exist = false)
-    List<String> filePathTowList;
-    @ApiModelProperty(value = "后文件路径列表")
-    @TableField(exist = false)
-    List<String> filePathThreeList;
-
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/emergency/EmergencyType.java

@@ -1,75 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.pojo.emergency;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-
-/**
- * 事件类型配置表
- *
- * @author admin
- * @date Tue Feb 22 00:00:00 CST 2022
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName(value = "TF_YWPN_EMERGENCY_TYPE_W", resultMap = "emergencyTypeMap")
-@KeySequence("TF_YWPN_EMERGENCY_TYPE_W")
-@ApiModel
-public class EmergencyType extends Model<EmergencyType> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * $column.comments
-     */
-    @TableId(value = "ID", type = IdType.INPUT)
-    @ApiModelProperty(value = "$column.comments")
-    private Long id;
-    /**
-     * 事件类型名称
-     */
-    @ApiModelProperty(value = "事件类型名称")
-    private String name;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    @TableField(value = "CREATE_USER", fill = FieldFill.INSERT)
-    private Long createUser;
-    @ApiModelProperty(hidden = true)
-    @TableField(exist = false)
-    private String createUserName;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "CREATE_TIME", fill = FieldFill.INSERT)
-    private Date createTime;
-    /**
-     * 描述
-     */
-    @ApiModelProperty(value = "描述")
-    private String note;
-
-    @ApiModelProperty(value = "是否无效(0无效1有效)")
-    private String flag;
-
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/maintain/PipeMfContent.java

@@ -1,65 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.pojo.maintain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-
-/**
- * 管网设施维护保养内容情况
- *
- * @author admin
- * @date Tue Oct 26 00:00:00 CST 2021
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName(value = "TF_YMPN_PIPE_MF_CONTENT_W", resultMap = "pipeMfContentMap")
-@KeySequence("TF_YMPN_PIPE_MF_CONTENT_W")
-@ApiModel
-public class PipeMfContent extends Model<PipeMfContent> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * $column.comments
-     */
-    @TableId(value = "ID", type = IdType.INPUT)
-    @ApiModelProperty(value = "$column.comments")
-    private BigDecimal id;
-    /**
-     * 管网设施保养记录id
-     */
-    @ApiModelProperty(value = "管网设施保养记录id")
-    private Long mfId;
-    /**
-     * 保养内容情况序号
-     */
-    @ApiModelProperty(value = "保养内容情况序号")
-    private String mfSerialNumber;
-    /**
-     * 保养内容详情
-     */
-    @ApiModelProperty(value = "保养内容详情")
-    private String mfNode;
-    /**
-     * 内容是否达标
-     */
-    @ApiModelProperty(value = "内容是否达标")
-    private String mfFlag;
-
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/maintain/PipeMfEvaluate.java

@@ -1,67 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.pojo.maintain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-
-/**
- * 管网设施维护保养评价记录
- *
- * @author admin
- * @date Tue Oct 26 00:00:00 CST 2021
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName(value = "TF_YMPN_PIPE_MF_EVALUATE_W", resultMap = "pipeMfEvaluateMap")
-@KeySequence("TF_YMPN_PIPE_MF_EVALUATE_W")
-@ApiModel
-public class PipeMfEvaluate extends Model<PipeMfEvaluate> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * $column.comments
-     */
-    @TableId(value = "ID", type = IdType.INPUT)
-    @ApiModelProperty(value = "$column.comments")
-    private Long id;
-    /**
-     * 管网设施保养记录id
-     */
-    @ApiModelProperty(value = "管网设施保养记录id")
-    private Long mfId;
-    /**
-     * 管网设施维护评价序号
-     */
-    @ApiModelProperty(value = "管网设施维护评价序号")
-    private String mfEvaluateSerialNumber;
-    /**
-     * 管网设施维护评价内容
-     */
-    @ApiModelProperty(value = "管网设施维护评价内容")
-    private String mfEvaluateNode;
-    /**
-     * 是否评价
-     */
-    @ApiModelProperty(value = "是否评价")
-    private String mfEvaluateFlag;
-
-    @ApiModelProperty(value = "管网设施维护评价结果")
-    private String mfEvaluateResult;
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/maintain/PipeMfRecord.java

@@ -1,154 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.pojo.maintain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.tofly.pojo.comm.vo.ImageVo;
-import com.tofly.pojo.maintain.vo.ExcelImageVo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-
-/**
- * 管网设施维护保养记录
- *
- * @author admin
- * @date Tue Oct 26 00:00:00 CST 2021
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName(value = "TF_YMPN_PIPE_MF_RECORD_W", resultMap = "pipeMfRecordMap")
-@KeySequence("TF_YMPN_PIPE_MF_RECORD_W")
-@ApiModel
-public class PipeMfRecord extends Model<PipeMfRecord> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * $column.comments
-     */
-    @TableId(value = "ID", type = IdType.INPUT)
-    @ApiModelProperty(value = "$column.comments")
-    private Long id;
-    /**
-     * 维护部门
-     */
-    @ApiModelProperty(value = "维护部门")
-    private String maintainDept;
-    /**
-     * 维护时间
-     */
-    @ApiModelProperty(value = "维护时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date maintainTime;
-
-    @TableField(exist = false)
-    private String maintainTimeSrt;
-    /**
-     * 阀门位置
-     */
-    @ApiModelProperty(value = "阀门位置")
-    private String valveLocation;
-    @ApiModelProperty(value = "X")
-    private Double x;
-    @ApiModelProperty(value = "Y")
-    private Double y;
-
-    /**
-     * 设施类型
-     */
-    @ApiModelProperty(value = "设施类型")
-    private String facilitiesType;
-    /**
-     * 设施口径
-     */
-    @ApiModelProperty(value = "设施口径")
-    private String facilitiesCaliber;
-    /**
-     * 编号
-     */
-    @ApiModelProperty(value = "编号")
-    private String code;
-    /**
-     * 工单编号
-     */
-    @ApiModelProperty(value = "工单编号")
-    private String orderCode;
-    @ApiModelProperty(value = "工单id")
-    private Long orderId;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "CREATE_TIME", fill = FieldFill.INSERT)
-    private Date createTime;
-    @TableField(exist = false)
-    private String createTimeSrt;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    @TableField(value = "CREATE_USER", fill = FieldFill.INSERT)
-    private Long createUser;
-    @ApiModelProperty(hidden = true)
-    @TableField(exist = false)
-    private String createUserName;
-    /**
-     * 上传附件id，关联表TF_YWPN_FILE _W关键值，多个文件以英文逗号分割
-     */
-    @ApiModelProperty(value = "附件1")
-    private String fileIdsOne;
-    @ApiModelProperty(hidden = true,value = "附件1文件路径")
-    @TableField(exist = false)
-    private List<String> filePathOneList;
-    @ApiModelProperty(value = "附件2")
-    private String fileIdsTow;
-    @ApiModelProperty(hidden = true,value = "附件2文件路径")
-    @TableField(exist = false)
-    private List<String> filePathTowList;
-    @ApiModelProperty(value = "附件3")
-    private String fileIdsThree;
-    @ApiModelProperty(hidden = true,value = "附件3文件路径")
-    @TableField(exist = false)
-    private List<String> filePathThreeList;
-    @TableField(exist = false)
-    @ApiModelProperty("管网设施维护保养内容情况列表")
-    private List<PipeMfContent> pipeMfContentList;
-    @TableField(exist = false)
-    @ApiModelProperty("管网设施维护保养评价记录列表")
-    private List<PipeMfEvaluate> pipeMfEvaluateList;
-
-    @ApiModelProperty(value = "是否有效 0无 1有")
-    private String flag;
-    @ApiModelProperty(value = "个人任务id")
-    private Long repairUserId;
-
-    /**
-     * excel导出 设施是否能启闭 是否评价
-     */
-    @ApiModelProperty(hidden = true)
-    @TableField(exist = false)
-    private String excelISPJ;
-    /**
-     * excel导出 设施维护保养效果 评价内容
-     */
-    @ApiModelProperty(hidden = true)
-    @TableField(exist = false)
-    private String pJconten;
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/maintain/Repairgoods.java

@@ -1,87 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.pojo.maintain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-
-
-/**
- * 抢维修耗材记录表
- *
- * @author admin
- * @date Tue Apr 06 00:00:00 CST 2021
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName(value = "TF_YWPN_REPAIRGOODS_W", resultMap = "repairgoodsMap")
-@KeySequence("TF_YWPN_REPAIRGOODS_W")
-@ApiModel
-public class Repairgoods extends Model<Repairgoods> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * ID
-     */
-    @TableId(value = "ID", type = IdType.INPUT)
-    @ApiModelProperty(value = "ID")
-    private Long id;
-    /**
-     * 上传记录表ID，关联表TF_YWPN_REPAIRRECORD_W关键值
-     */
-    @ApiModelProperty(value = "上传记录表ID，关联表TF_YWPN_REPAIRRECORD_W关键值")
-    private Long recordId;
-    /**
-     * 个人任务id，关联表TF_YWPN_REPAIRUSER_W
-     */
-    @ApiModelProperty(value = "个人任务id，关联表TF_YWPN_REPAIRUSER_W")
-    private Long repairUserid;
-    /**
-     * 材料类型,关联表TF_YWPN_REPAIRMATERIAL_D关键值
-     */
-    @ApiModelProperty(value = "材料类型,关联表TF_YWPN_REPAIRMATERIAL_D关键值")
-    private Long materialType;
-    /**
-     * 材质，字典编码表取，PE、金属等
-     */
-    @ApiModelProperty(value = "材质，字典编码表取，PE、金属等")
-    private String material;
-    /**
-     * 口径（mm）
-     */
-    @ApiModelProperty(value = "口径（mm）")
-    private String bore;
-    /**
-     * 数量
-     */
-    @ApiModelProperty(value = "数量")
-    private Long num;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "CREATE_TIME", fill = FieldFill.INSERT)
-    private Date createTime;
-    /**
-     * 创建用户ID
-     */
-    @ApiModelProperty(value = "创建用户ID")
-    @TableField(value = "CREATE_USER", fill = FieldFill.INSERT)
-    private Long createUser;
-    @ApiModelProperty(hidden = true)
-    private String createUserName;
-
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/maintain/Repairmaterial.java

@@ -1,74 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.pojo.maintain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-
-
-/**
- * 维修材料类型信息表
- *
- * @author admin
- * @date Tue Apr 06 00:00:00 CST 2021
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName(value = "TF_YWPN_REPAIRMATERIAL_D", resultMap = "repairmaterialMap")
-@KeySequence("TF_YWPN_REPAIRMATERIAL_D")
-@ApiModel
-public class Repairmaterial extends Model<Repairmaterial> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * ID
-     */
-    @TableId(value = "ID", type = IdType.INPUT)
-    @ApiModelProperty(value = "ID")
-    private Long id;
-    /**
-     * 类型名称
-     */
-    @ApiModelProperty(value = "类型名称")
-    private String name;
-    /**
-     * 单位
-     */
-    @ApiModelProperty(value = "单位")
-    private String unit;
-    /**
-     * 备注说明
-     */
-    @ApiModelProperty(value = "备注说明")
-    private String notes;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    @TableField(value = "CREATE_USER", fill = FieldFill.INSERT)
-    private Long createUser;
-    @ApiModelProperty(hidden = true)
-    private String createUserName;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "CREATE_TIME", fill = FieldFill.INSERT)
-    private Date createTime;
-
-    @ApiModelProperty(value = "规格型号")
-    private String specification;
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/maintain/Repairorder.java

@@ -1,211 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.pojo.maintain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-
-
-/**
- * 抢维修工单信息表
- *
- * @author admin
- * @date Tue Apr 06 00:00:00 CST 2021
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName(value = "TF_YWPN_REPAIRORDER_W", resultMap = "repairorderMap")
-@KeySequence("TF_YWPN_REPAIRORDER_W")
-@ApiModel
-public class Repairorder extends Model<Repairorder> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 唯一值
-     */
-    @TableId(value = "ID", type = IdType.INPUT)
-    @ApiModelProperty(value = "唯一值")
-    private Long id;
-    /**
-     * 工单编号,以发起部门自定义代码+年月日+4位序号，如管网代码为：GW，生成日期为2021年1月23日，序号0001，整体编号：GW202101230001
-     */
-    @ApiModelProperty(value = "工单编号,以发起部门自定义代码+年月日+4位序号，如管网代码为：GW，生成日期为2021年1月23日，序号0001，整体编号：GW202101230001")
-    private String orderCode;
-    /**
-     * 故障类型,关联编码表id
-     */
-    @ApiModelProperty(value = "故障类型,关联编码表id")
-    private Long faultType;
-    /**
-     * 年度计划id，关联表TF_YWPN_REPAIRPLANDETAIL_W关键值
-     */
-    @ApiModelProperty(value = "年度计划id，关联表TF_YWPN_REPAIRPLANDETAIL_W关键值")
-    private Long yearId;
-    /**
-     * 工单来源，字典编码表，0计划、1自建、2热线
-     */
-    @ApiModelProperty(value = "工单来源，字典编码表，0计划、1自建、2热线")
-    private String orderSource;
-    /**
-     * 联系电话
-     */
-    @ApiModelProperty(value = "联系电话")
-    private String phone;
-    /**
-     * 维修类型,关联表TF_YWPN_REPAIRTYPE_D的关键值
-     */
-    @ApiModelProperty(value = "维修类型,关联表TF_YWPN_REPAIRTYPE_D的关键值")
-    private Long typeId;
-    /**
-     * 月份
-     */
-    @ApiModelProperty(value = "月份")
-    private String month;
-    /**
-     * 开始时间,工单处理开始时间，以派发时间为准，自动生成
-     */
-    @ApiModelProperty(value = "开始时间,工单处理开始时间，以派发时间为准，自动生成")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
-    /**
-     * 结束时间,工单处理结束时间
-     */
-    @ApiModelProperty(value = "结束时间,工单处理结束时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date endTime;
-    /**
-     * 地址描述
-     */
-    @ApiModelProperty(value = "地址描述")
-    private String address;
-    /**
-     * 经度，单位：°
-     */
-    @ApiModelProperty(value = "经度，单位：°")
-    private Double lgtd;
-    /**
-     * 纬度，单位：°
-     */
-    @ApiModelProperty(value = "纬度，单位：°")
-    private Double lttd;
-    /**
-     * 维修数量
-     */
-    @ApiModelProperty(value = "维修数量")
-    private Long num;
-    /**
-     * 单位
-     */
-    @ApiModelProperty(value = "单位")
-    private String unit;
-    /**
-     * 详细说明
-     */
-    @ApiModelProperty(value = "详细说明")
-    private String notes;
-    /**
-     * 是否查收,0未查收,1已查收
-     */
-    @ApiModelProperty(value = "是否查收,0未查收,1已查收")
-    private String isread;
-    /**
-     * 查收时间
-     */
-    @ApiModelProperty(value = "查收时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date confirmTime;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "CREATE_TIME", fill = FieldFill.INSERT)
-    private Date createTime;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    @TableField(value = "CREATE_USER", fill = FieldFill.INSERT)
-    private Long createUser;
-    @ApiModelProperty(hidden = true)
-    private String createUserName;
-    /**
-     * 是否驳回，0未驳回，1驳回
-     */
-    @ApiModelProperty(value = "是否驳回，0未驳回，1驳回")
-    private String isrebut;
-    /**
-     * 是否转发，0未转发，1已转发
-     */
-    @ApiModelProperty(value = "是否转发，0未转发，1已转发")
-    private String isrelay;
-    /**
-     * 工单状态0:未派工,1:处理中, 2:驳回 , 3:审核中 ,4处理完成，5转移申请，6、已转移 7:完成
-     */
-    @ApiModelProperty(value = "工单状态0:未派工,1:未审核, 2:未开始 , 3:正在执行 ,4处理完成，5已开始未执行，6、驳回 7:转移申请 8已转移 9工单过程审核中 ")
-    private String state;
-    /**
-     * 总完成率
-     */
-    @ApiModelProperty(value = "总完成率")
-    private Float percent;
-    /**
-     * 总完成数量
-     */
-    @ApiModelProperty(value = "总完成数量")
-    private Long overNum;
-    /**
-     * 最后一次修改时间
-     */
-    @ApiModelProperty(value = "最后一次修改时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date lastTime;
-    /**
-     * 最后一次修改人
-     */
-    @ApiModelProperty(value = "最后一次修改人")
-    private Long lastUser;
-    @ApiModelProperty(value = "派工人id")
-    private Long dispatchingId;
-    /**
-     * 附件ids，关联公共文件表TF_YWPN_FILE _W，多个附件以英文逗号分隔
-     */
-    @ApiModelProperty(value = "附件ids，关联公共文件表TF_YWPN_FILE _W，多个附件以英文逗号分隔")
-    private String fileIds;
-    /**
-     * 完成时间
-     */
-    @ApiModelProperty(value = "完成时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date overTime;
-
-    @ApiModelProperty(value = "是否自动派工 0未派工 1已派工")
-    private String isDispatching;
-
-    @ApiModelProperty(value = "人工结束 0关闭 1开启")
-    private String artificialEndFlag;
-
-    @ApiModelProperty(value = "是否为养护 0否 1是")
-    private String maintenanceFlag;
-
-    @ApiModelProperty(value = "超时提醒 0未提醒 1已提醒")
-    private String timeoutRemindFlag;
-
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/maintain/Repairplan.java

@@ -1,88 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.pojo.maintain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-
-
-/**
- * 抢维修年度计划记录信息表
- *
- * @author admin
- * @date Tue Apr 06 00:00:00 CST 2021
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName(value = "TF_YWPN_REPAIRPLAN_W", resultMap = "repairplanMap")
-@KeySequence("TF_YWPN_REPAIRPLAN_W")
-@ApiModel
-public class Repairplan extends Model<Repairplan> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * ID
-     */
-    @TableId(value = "ID", type = IdType.INPUT)
-    @ApiModelProperty(value = "ID")
-    private Long id;
-    /**
-     * 年份
-     */
-    @ApiModelProperty(value = "年份")
-    private String year;
-    /**
-     * 上报状态，0未提交、1已提交
-     */
-    @ApiModelProperty(value = "上报状态，0未提交、1已提交")
-    private String issubmit;
-    /**
-     * 上报时间
-     */
-    @ApiModelProperty(value = "上报时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date submitTime;
-    /**
-     * 上报人
-     */
-    @ApiModelProperty(value = "上报人")
-    private Long submitUser;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "CREATE_TIME", fill = FieldFill.INSERT)
-    private Date createTime;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    @TableField(value = "CREATE_USER", fill = FieldFill.INSERT)
-    private Long createUser;
-    @ApiModelProperty(hidden = true)
-    private String createUserName;
-
-    @ApiModelProperty(value = "计划状态(0待审核,1审批拒绝2审批通过)")
-    private String planState;
-
-    @ApiModelProperty(value = "抢维修年计划id")
-    private Long yearId;
-
-    @ApiModelProperty(value = "月份")
-    private String month;
-
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/maintain/Repairplandetail.java

@@ -1,95 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.pojo.maintain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-
-
-/**
- * 抢维修年度计划内容信息表
- *
- * @author admin
- * @date Tue Apr 06 00:00:00 CST 2021
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName(value = "TF_YWPN_REPAIRPLANDETAIL_W", resultMap = "repairplandetailMap")
-@KeySequence("TF_YWPN_REPAIRPLANDETAIL_W")
-@ApiModel
-public class Repairplandetail extends Model<Repairplandetail> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 唯一值ID
-     */
-    @TableId(value = "ID", type = IdType.INPUT)
-    @ApiModelProperty(value = "唯一值ID")
-    private Long id;
-    /**
-     * 年度记录ID，关联表TF_YWPN_REPAIRPLAN_W主键
-     */
-    @ApiModelProperty(value = "年度记录ID，关联表TF_YWPN_REPAIRPLAN_W主键")
-    private Long yearId;
-    /**
-     * 年份
-     */
-    @ApiModelProperty(value = "年份")
-    private String year;
-    /**
-     * 月份
-     */
-    @ApiModelProperty(value = "月份")
-    private String month;
-    /**
-     * 维修类型ID,关联表TF_YWPN_REPAIRTYPE_D关键值
-     */
-    @ApiModelProperty(value = "维修类型ID,关联表TF_YWPN_REPAIRTYPE_D关键值")
-    private Long typeId;
-    /**
-     * 维修数量
-     */
-    @ApiModelProperty(value = "维修数量")
-    private Long num;
-    /**
-     * 任务接收负责人
-     */
-    @ApiModelProperty(value = "任务接收负责人")
-    private Long respUser;
-
-    /**
-     * 详细说明
-     */
-    @ApiModelProperty(value = "详细说明")
-    private String notes;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    @TableField(value = "CREATE_USER", fill = FieldFill.INSERT)
-    private Long createUser;
-    @ApiModelProperty(hidden = true)
-    private String createUserName;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "CREATE_TIME", fill = FieldFill.INSERT)
-    private Date createTime;
-    @ApiModelProperty(value = "单位")
-    private String unit;
-
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/maintain/Repairplanyear.java

@@ -1,113 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.pojo.maintain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.tofly.pojo.comm.vo.AuditVo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-
-/**
- * 抢维修年度计划记录信息表
- *
- * @author admin
- * @date Tue Nov 02 00:00:00 CST 2021
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName(value = "TF_YWPN_REPAIRPLANYEAR_W", resultMap = "repairplanyearMap")
-@KeySequence("TF_YWPN_REPAIRPLANYEAR_W")
-@ApiModel
-public class Repairplanyear extends Model<Repairplanyear> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * $column.comments
-     */
-    @TableId(value = "ID", type = IdType.INPUT)
-    @ApiModelProperty(value = "$column.comments")
-    private Long id;
-    /**
-     * 年份
-     */
-    @ApiModelProperty(value = "年份")
-    private String year;
-    /**
-     * 上报状态；0：未提交；1：已提交
-     */
-    @ApiModelProperty(value = "上报状态；0：未提交；1：已提交")
-    private String issubmit;
-    @TableField(exist = false)
-    @ApiModelProperty(hidden = true,value = "上报状态转义")
-    private String issubmitName;
-    /**
-     * 上报时间
-     */
-    @ApiModelProperty(value = "上报时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date submitTime;
-    /**
-     * 上报人
-     */
-    @ApiModelProperty(value = "上报人")
-    private Long submitUser;
-    @TableField(exist = false)
-    @ApiModelProperty(hidden = true,value = "上报人中文名称")
-    private String submitUserName;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "CREATE_TIME", fill = FieldFill.INSERT)
-    private Date createTime;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    @TableField(value = "CREATE_USER", fill = FieldFill.INSERT)
-    private Long createUser;
-    @TableField(exist = false)
-    @ApiModelProperty(hidden = true,value = "创建人转义")
-    private String createUserName;
-    /**
-     * 计划状态(0待审核,1审批拒绝2审批通过)
-     */
-    @ApiModelProperty(value = "计划状态(0待审核,1审批通过2审批拒绝)")
-    private String planState;
-    @TableField(exist = false)
-    @ApiModelProperty(hidden = true,value = "计划状态转义")
-    private String planStateName;
-
-    @ApiModelProperty(value = "年计划详情数据")
-    @TableField(exist = false)
-    private List<Repairplanyeardetail> details;
-
-    @TableField(exist = false)
-    @ApiModelProperty(value = "审批链")
-    private List<AuditVo> auditVoList;
-
-    @TableField(exist = false)
-    @ApiModelProperty(value = "年份,多个以,分隔")
-    private String years;
-
-    @ApiModelProperty(value = "说明")
-    private String note;
-
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/maintain/Repairplanyeardetail.java

@@ -1,87 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.pojo.maintain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-
-
-
-/**
- * 抢维修年度计划明细信息表
- *
- * @author admin
- * @date Tue Nov 02 00:00:00 CST 2021
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName(value = "TF_YWPN_REPAIRPLANYEARDETAIL_W", resultMap = "repairplanyeardetailMap")
-@KeySequence("TF_YWPN_REPAIRPLANYEARDETAIL_W")
-@ApiModel
-public class Repairplanyeardetail extends Model<Repairplanyeardetail> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * $column.comments
-     */
-    @TableId(value = "ID", type = IdType.INPUT)
-    @ApiModelProperty(value = "$column.comments")
-    private Long id;
-    /**
-     * 年度记录ID，关联TF_YWPN_REPAIRPLANYEAR_W主键
-     */
-    @ApiModelProperty(value = "年度记录ID，关联TF_YWPN_REPAIRPLANYEAR_W主键")
-    private Long yearId;
-    /**
-     * 年份
-     */
-    @ApiModelProperty(value = "年份")
-    private String year;
-    /**
-     * 月份
-     */
-    @ApiModelProperty(value = "月份")
-    private String month;
-    /**
-     * 计划内容
-     */
-    @ApiModelProperty(value = "计划内容")
-    private String planContent;
-
-    @ApiModelProperty(value = "维修类型ID,关联表TF_YWPN_REPAIRTYPE_D关键值")
-    private Long typeId;
-    @ApiModelProperty(value = "类型名称")
-    private String typeName;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "CREATE_TIME", fill = FieldFill.INSERT)
-    private Date createTime;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    @TableField(value = "CREATE_USER", fill = FieldFill.INSERT)
-    private Long createUser;
-    @TableField(exist = false)
-    @ApiModelProperty(hidden = true)
-    private String createUserName;
-
-    @ApiModelProperty(value = "单位")
-    private String unit;
-
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/maintain/Repairrebut.java

@@ -1,72 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.pojo.maintain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-
-
-/**
- * 抢维修工单驳回记录信息表
- *
- * @author admin
- * @date Tue Apr 06 00:00:00 CST 2021
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName(value = "TF_YWPN_REPAIRREBUT_W", resultMap = "repairrebutMap")
-@KeySequence("TF_YWPN_REPAIRREBUT_W")
-@ApiModel
-public class Repairrebut extends Model<Repairrebut> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * ID
-     */
-    @TableId(value = "ID", type = IdType.INPUT)
-    @ApiModelProperty(value = "ID")
-    private Long id;
-    /**
-     * 个人任务id，关联表TF_YWPN_REPAIRUSER_W
-     */
-    @ApiModelProperty(value = "个人任务id，关联表TF_YWPN_REPAIRUSER_W")
-    private Long repairUserid;
-    /**
-     * 驳回原因说明
-     */
-    @ApiModelProperty(value = "驳回原因说明")
-    private String rebutNotes;
-    /**
-     * 维修工单id，关联表TF_YWPN_REPAIRORDER_W关键值
-     */
-    @ApiModelProperty(value = "维修工单id，关联表TF_YWPN_REPAIRORDER_W关键值")
-    private Long repairId;
-    /**
-     * 创建人（驳回人ID）
-     */
-    @ApiModelProperty(value = "创建人（驳回人ID）")
-    @TableField(value = "CREATE_USER", fill = FieldFill.INSERT)
-    private Long createUser;
-    @ApiModelProperty(hidden = true)
-    private String createUserName;
-    /**
-     * 创建时间（驳回时间）
-     */
-    @ApiModelProperty(value = "创建时间（驳回时间）")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "CREATE_TIME", fill = FieldFill.INSERT)
-    private Date createTime;
-
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/maintain/Repairrecord.java

@@ -1,122 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.pojo.maintain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-import java.util.List;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-
-
-/**
- * 抢维修处理记录表
- *
- * @author admin
- * @date Tue Apr 06 00:00:00 CST 2021
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName(value = "TF_YWPN_REPAIRRECORD_W", resultMap = "repairrecordMap")
-@KeySequence("TF_YWPN_REPAIRRECORD_W")
-@ApiModel
-public class Repairrecord extends Model<Repairrecord> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 数据唯一标识
-     */
-    @TableId(value = "ID", type = IdType.INPUT)
-    @ApiModelProperty(value = "数据唯一标识")
-    private Long id;
-    /**
-     * 上报位置经度
-     */
-    @ApiModelProperty(value = "上报位置经度")
-    private Double lgtd;
-    /**
-     * 上报位置纬度
-     */
-    @ApiModelProperty(value = "上报位置纬度")
-    private Double lttd;
-    /**
-     * 个人任务id，关联表TF_YWPN_REPAIRUSER_W
-     */
-    @ApiModelProperty(value = "个人任务id，关联表TF_YWPN_REPAIRUSER_W")
-    private Long repairUserid;
-    /**
-     * 定位网络(gps 1,基站2,wifi 3)
-     */
-    @ApiModelProperty(value = "定位网络(gps 1,基站2,wifi 3)")
-    private String network;
-    /**
-     * 地址描述
-     */
-    @ApiModelProperty(value = "地址描述")
-    private String address;
-    /**
-     * 口径（mm）
-     */
-    @ApiModelProperty(value = "口径（mm）")
-    private String bore;
-    /**
-     * 情况说明
-     */
-    @ApiModelProperty(value = "情况说明")
-    private String notes;
-    /**
-     * 上传附件id，关联表TF_YWPN_FILE _W关键值，多个文件以英文逗号分割
-     */
-    @ApiModelProperty(value = "附件1")
-    private String fileIdsOne;
-
-    @ApiModelProperty(value = "附件2")
-    private String fileIdsTow;
-
-    @ApiModelProperty(value = "附件3")
-    private String fileIdsThree;
-
-    @ApiModelProperty(value = "是否有效 0无 1有")
-    private String flag;
-
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "CREATE_TIME", fill = FieldFill.INSERT)
-    private Date createTime;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    @TableField(value = "CREATE_USER", fill = FieldFill.INSERT)
-    private Long createUser;
-    @ApiModelProperty(hidden = true)
-    private String createUserName;
-    @ApiModelProperty(value = "维修设备编码，关联空间数据编码")
-    private String repairDevice;
-    @ApiModelProperty(value = "设备关联空间数据图层")
-    private String repairLayer;
-
-    @ApiModelProperty(value = "所在片区")
-    private String regionCode;
-
-    @ApiModelProperty(value = "所在片区名称")
-    private String regionName;
-    @ApiModelProperty("状态 0待审核,1审批拒绝2审批通过3未上报")
-    private String state;
-
-    @ApiModelProperty("维修类型 关联表 TF_YWPN_REPAIRTYPE_D")
-    private Long repairType;
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/maintain/Repairreject.java

@@ -1,71 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.pojo.maintain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-
-/**
- * 热线/业务工单驳回抢维修记录
- *
- * @author admin
- * @date Thu Dec 02 00:00:00 CST 2021
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName(value = "TF_YWPN_REPAIRREJECT_W", resultMap = "repairrejectMap")
-@KeySequence("TF_YWPN_REPAIRREJECT_W")
-@ApiModel
-public class Repairreject extends Model<Repairreject> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * $column.comments
-     */
-    @TableId(value = "ID", type = IdType.INPUT)
-    @ApiModelProperty(value = "$column.comments")
-    private Long id;
-    /**
-     * 抢维修id
-     */
-    @ApiModelProperty(value = "抢维修id")
-    private Long repairId;
-    /**
-     * $column.comments
-     */
-    @ApiModelProperty(value = "$column.comments")
-    private String rejectNote;
-    /**
-     * 驳回时间
-     */
-    @ApiModelProperty(value = "驳回时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date rejectTime;
-
-    @TableField(exist = false)
-    private String rejectTimeStr;
-    /**
-     * 驳回人id
-     */
-    @ApiModelProperty(value = "驳回人id")
-    private Long rejectUserId;
-    @TableField(exist = false)
-    private String rejectUserIdName;
-
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/maintain/Repairrelay.java

@@ -1,121 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.pojo.maintain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-
-
-/**
- * 抢维修工单转发记录信息表
- *
- * @author admin
- * @date Tue Apr 06 00:00:00 CST 2021
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName(value = "TF_YWPN_REPAIRRELAY_W", resultMap = "repairrelayMap")
-@KeySequence("TF_YWPN_REPAIRRELAY_W")
-@ApiModel
-public class Repairrelay extends Model<Repairrelay> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * ID
-     */
-    @TableId(value = "ID", type = IdType.INPUT)
-    @ApiModelProperty(value = "ID")
-    private Long id;
-    /**
-     * 个人任务id，关联表TF_YWPN_REPAIRUSER_W
-     */
-    @ApiModelProperty(value = "个人任务id，关联表TF_YWPN_REPAIRUSER_W")
-    private Long repairUserid;
-    /**
-     * 接收处理人
-     */
-    @ApiModelProperty(value = "接收处理人")
-    private Long relayUser;
-    /**
-     * 转发原因说明
-     */
-    @ApiModelProperty(value = "转发原因说明")
-    private String relayNotes;
-    /**
-     * 维修工单id，关联表TF_YWPN_REPAIRORDER_W关键值
-     */
-    @ApiModelProperty(value = "维修工单id，关联表TF_YWPN_REPAIRORDER_W关键值")
-    private Long repairId;
-    /**
-     * 上报状态；0：未提交；1：已提交
-     */
-    @ApiModelProperty(value = "上报状态；0：未提交；1：已提交")
-    private String issubmit;
-    /**
-     * 上报时间
-     */
-    @ApiModelProperty(value = "上报时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date submitTime;
-    /**
-     * 上报人
-     */
-    @ApiModelProperty(value = "上报人")
-    private Long submitUser;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "CREATE_TIME", fill = FieldFill.INSERT)
-    private Date createTime;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    @TableField(value = "CREATE_USER", fill = FieldFill.INSERT)
-    private Long createUser;
-    @ApiModelProperty(hidden = true)
-    private String createUserName;
-    /**
-     * 审核结果；0：未审核；1：通过；2：未通过，
-     */
-    @ApiModelProperty(value = "审核结果；0：未审核；1：通过；2：未通过，")
-    private String auditResult;
-    /**
-     * 审核人
-     */
-    @ApiModelProperty(value = "审核人")
-    private Long auditUser;
-
-    /**
-     * 审核备注
-     */
-    @ApiModelProperty(value = "审核备注")
-    private String auditNotes;
-    /**
-     * 审核时间
-     */
-    @ApiModelProperty(value = "审核时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date audittime;
-    /**
-     * 是否接收查看，0：未查看；1：已查看
-     */
-    @ApiModelProperty(value = "是否接收查看，0：未查看；1：已查看")
-    private String isread;
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/maintain/Repairtype.java

@@ -1,80 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.pojo.maintain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-
-/**
- * 维修类型信息表
- *
- * @author admin
- * @date Tue Apr 06 00:00:00 CST 2021
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName(value = "TF_YWPN_REPAIRTYPE_D", resultMap = "repairtypeMap")
-@KeySequence("TF_YWPN_REPAIRTYPE_D")
-@ApiModel
-public class Repairtype extends Model<Repairtype> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * ID
-     */
-    @TableId(value = "ID", type = IdType.INPUT)
-    @ApiModelProperty(value = "ID")
-    private Long id;
-    /**
-     * 归属类名称
-     */
-    @ApiModelProperty(value = "归属类名称")
-    private String groupName;
-    /**
-     * 类型名称
-     */
-    @ApiModelProperty(value = "类型名称")
-    private String name;
-    /**
-     * 单位
-     */
-    @ApiModelProperty(value = "单位")
-    private String unit;
-    /**
-     * 备注说明
-     */
-    @ApiModelProperty(value = "备注说明")
-    private String notes;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    @TableField(value = "CREATE_USER", fill = FieldFill.INSERT)
-    private Long createUser;
-    @ApiModelProperty(hidden = true)
-    private String createUserName;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "CREATE_TIME", fill = FieldFill.INSERT)
-    private Date createTime;
-
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/maintain/Repairuser.java

@@ -1,154 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.pojo.maintain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-
-
-/**
- * 抢维修工单个人任务信息表
- *
- * @author admin
- * @date Tue Apr 06 00:00:00 CST 2021
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName(value = "TF_YWPN_REPAIRUSER_W", resultMap = "repairuserMap")
-@KeySequence("TF_YWPN_REPAIRUSER_W")
-@ApiModel
-public class Repairuser extends Model<Repairuser> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * ID
-     */
-    @TableId(value = "ID", type = IdType.INPUT)
-    @ApiModelProperty(value = "ID")
-    private Long id;
-    /**
-     * 维修人ID，主要负责人
-     */
-    @ApiModelProperty(value = "维修人ID，主要负责人")
-    private Long respUser;
-    /**
-     * 维修工单id，关联表TF_YWPN_REPAIRORDER_W关键值
-     */
-    @ApiModelProperty(value = "维修工单id，关联表TF_YWPN_REPAIRORDER_W关键值")
-    private Long repairId;
-    /**
-     * 协同处理人ID，多个以英文逗号分隔
-     */
-    @ApiModelProperty(value = "协同处理人ID，多个以英文逗号分隔")
-    private String teamUser;
-    /**
-     * 是否确认，0未查收，1已查收
-     */
-    @ApiModelProperty(value = "是否确认，0未查收，1已查收")
-    private String isread;
-    /**
-     * 是否返工，0未返工，1已返工
-     */
-    @ApiModelProperty(value = "是否返工，0未返工，1已返工")
-    private String isrepeat;
-    /**
-     * 返工次数
-     */
-    @ApiModelProperty(value = "返工次数")
-    private Integer repeatNum;
-    /**
-     * 工单状态0:未派工,1:处理中, 2:驳回 , 3:审核中 ,4处理完成，5转移申请，6、已转移 7:完成
-     */
-    @ApiModelProperty(value = "工单状态0:未派工,1:未审核, 2:未开始 , 3:正在执行 ,4处理完成，5已开始未执行，6、驳回 7:转移申请 8已转移")
-    private String state;
-    /**
-     * 核定用时,单位小时
-     */
-    @ApiModelProperty(value = "核定用时,单位小时")
-    private Double ratifyTime;
-    /**
-     * 系统用时（实际处理用时），单位小时
-     */
-    @ApiModelProperty(value = "系统用时（实际处理用时），单位小时")
-    private Double realTime;
-    /**
-     * 所在片区
-     */
-    @ApiModelProperty(value = "所在片区")
-    private String regionCode;
-
-    /**
-     * 所在片区名称
-     */
-    @ApiModelProperty(value = "所在片区名称")
-    private String regionName;
-    /**
-     * 实际地址描述
-     */
-    @ApiModelProperty(value = "实际地址描述")
-    private String address;
-    /**
-     * 实际位置经度，单位：°
-     */
-    @ApiModelProperty(value = "实际位置经度，单位：°")
-    private Double lgtd;
-    /**
-     * 实际位置纬度，单位：°
-     */
-    @ApiModelProperty(value = "实际位置纬度，单位：°")
-    private Double lttd;
-
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    @TableField(value = "CREATE_USER", fill = FieldFill.INSERT)
-    private Long createUser;
-    @ApiModelProperty(hidden = true)
-    private String createUserName;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "CREATE_TIME", fill = FieldFill.INSERT)
-    private Date createTime;
-    /**
-     * 接收时间
-     */
-    @ApiModelProperty(value = "接收时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date confirmTime;
-    /**
-     * 处理完成上报时间
-     */
-    @ApiModelProperty(value = "处理完成上报时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date overTime;
-
-    @ApiModelProperty(value = "计划完成个数")
-    private Long planNum;
-
-    @ApiModelProperty(value = "实际完成个数")
-    private Long overNum;
-
-    @ApiModelProperty("多个点经纬度存储")
-    private String lngLats;
-
-    @ApiModelProperty("电话")
-    private String phone;
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/maintain/dto/RepairgoodsDto.java

@@ -1,78 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.pojo.maintain.dto;
-
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-
-/**
- * 抢维修耗材记录表
- *
- * @author admin
- * @date Tue Apr 06 00:00:00 CST 2021
- */
-@Data
-@ApiModel
-public class RepairgoodsDto extends Model<RepairgoodsDto> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * ID
-     */
-    @ApiModelProperty(value = "ID")
-    private Long id;
-    /**
-     * 上传记录表ID，关联表TF_YWPN_REPAIRRECORD_W关键值
-     */
-    @ApiModelProperty(value = "上传记录表ID，关联表TF_YWPN_REPAIRRECORD_W关键值")
-    private Long recordId;
-    /**
-     * 个人任务id，关联表TF_YWPN_REPAIRUSER_W
-     */
-    @ApiModelProperty(value = "个人任务id，关联表TF_YWPN_REPAIRUSER_W")
-    private Long repairUserid;
-    /**
-     * 材料类型,关联表TF_YWPN_REPAIRTYPE_D关键值
-     */
-    @ApiModelProperty(value = "材料类型,关联表TF_YWPN_REPAIRTYPE_D关键值")
-    private Long materialType;
-    /**
-     * 材质，字典编码表取，PE、金属等
-     */
-    @ApiModelProperty(value = "材质，字典编码表取，PE、金属等")
-    private String material;
-    /**
-     * 口径（mm）
-     */
-    @ApiModelProperty(value = "口径（mm）")
-    private String bore;
-    /**
-     * 数量
-     */
-    @ApiModelProperty(value = "数量")
-    private Long num;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    /**
-     * 创建用户ID
-     */
-    @ApiModelProperty(value = "创建用户ID")
-    private Long createUser;
-    @ApiModelProperty(hidden = true)
-    private String createUserName;
-
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/maintain/dto/RepairmaterialDto.java

@@ -1,65 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.pojo.maintain.dto;
-
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-
-/**
- * 维修材料类型信息表
- *
- * @author admin
- * @date Tue Apr 06 00:00:00 CST 2021
- */
-@Data
-@ApiModel
-public class RepairmaterialDto extends Model<RepairmaterialDto> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * ID
-     */
-    @ApiModelProperty(value = "ID")
-    private Long id;
-    /**
-     * 类型名称
-     */
-    @ApiModelProperty(value = "类型名称")
-    private String name;
-    /**
-     * 单位
-     */
-    @ApiModelProperty(value = "单位")
-    private String unit;
-    /**
-     * 备注说明
-     */
-    @ApiModelProperty(value = "备注说明")
-    private String notes;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    private Long createUser;
-    @ApiModelProperty(hidden = true)
-    private String createUserName;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
-    @ApiModelProperty(value = "规格型号")
-    private String specification;
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/maintain/dto/RepairorderDto.java

@@ -1,190 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.pojo.maintain.dto;
-
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-import java.util.List;
-
-
-/**
- * 抢维修工单信息表
- *
- * @author admin
- * @date Tue Apr 06 00:00:00 CST 2021
- */
-@Data
-@ApiModel
-public class RepairorderDto extends Model<RepairorderDto> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 唯一值
-     */
-    @ApiModelProperty(value = "唯一值")
-    private Long id;
-    /**
-     * 工单编号,以发起部门自定义代码+年月日+4位序号，如管网代码为：GW，生成日期为2021年1月23日，序号0001，整体编号：GW202101230001
-     */
-    @ApiModelProperty(value = "工单编号,以发起部门自定义代码+年月日+4位序号，如管网代码为：GW，生成日期为2021年1月23日，序号0001，整体编号：GW202101230001")
-    private String orderCode;
-    /**
-     * 故障类型,关联编码表id
-     */
-    @ApiModelProperty(value = "故障类型,关联编码表id")
-    private Long faultType;
-    /**
-     * 年度计划id，关联表TF_YWPN_REPAIRPLANDETAIL_W关键值
-     */
-    @ApiModelProperty(value = "年度计划id，关联表TF_YWPN_REPAIRPLANDETAIL_W关键值")
-    private Long yearId;
-    /**
-     * 工单来源，字典编码表，0计划、1自建、2热线
-     */
-    @ApiModelProperty(value = "工单来源，字典编码表，0计划、1自建、2热线")
-    private String orderSource;
-    /**
-     * 维修类型,关联表TF_YWPN_REPAIRTYPE_D的关键值
-     */
-    @ApiModelProperty(value = "维修类型,关联表TF_YWPN_REPAIRTYPE_D的关键值")
-    private Long typeId;
-    /**
-     * 月份
-     */
-    @ApiModelProperty(value = "月份")
-    private String month;
-    /**
-     * 开始时间,工单处理开始时间，以派发时间为准，自动生成
-     */
-    @ApiModelProperty(value = "开始时间,工单处理开始时间，以派发时间为准，自动生成")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
-    /**
-     * 结束时间,工单处理结束时间
-     */
-    @ApiModelProperty(value = "结束时间,工单处理结束时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date endTime;
-
-    /**
-     * 地址描述
-     */
-    @ApiModelProperty(value = "地址描述")
-    private String address;
-    /**
-     * 经度，单位：°
-     */
-    @ApiModelProperty(value = "经度，单位：°")
-    private Double lgtd;
-    /**
-     * 纬度，单位：°
-     */
-    @ApiModelProperty(value = "纬度，单位：°")
-    private Double lttd;
-
-    /**
-     * 维修数量
-     */
-    @ApiModelProperty(value = "维修数量")
-    private Long num;
-    /**
-     * 单位
-     */
-    @ApiModelProperty(value = "单位")
-    private String unit;
-    /**
-     * 详细说明
-     */
-    @ApiModelProperty(value = "详细说明")
-    private String notes;
-
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    private Long createUser;
-    @ApiModelProperty(hidden = true)
-    private String createUserName;
-    /**
-     * 是否驳回，0未驳回，1驳回
-     */
-    @ApiModelProperty(value = "是否驳回，0未驳回，1驳回")
-    private String isrebut;
-    /**
-     * 是否转发，0未转发，1已转发
-     */
-    @ApiModelProperty(value = "是否转发，0未转发，1已转发")
-    private String isrelay;
-    /**
-     * 工单状态0:未派工,1:处理中, 2:驳回 , 3:审核中 ,4处理完成，5转移申请，6、已转移 7:完成
-     */
-    @ApiModelProperty(value = "工单状态0:未派工,1:未审核, 2:未开始 , 3:正在执行 ,4处理完成，5已开始未执行，6、驳回 7:转移申请 8已转移")
-    private String state;
-    /**
-     * 总完成率
-     */
-    @ApiModelProperty(value = "总完成率")
-    private Float percent;
-    /**
-     * 总完成数量
-     */
-    @ApiModelProperty(value = "总完成数量")
-    private Long overNum;
-    /**
-     * 最后一次修改时间
-     */
-    @ApiModelProperty(value = "最后一次修改时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date lastTime;
-    /**
-     * 最后一次修改人
-     */
-    @ApiModelProperty(value = "最后一次修改人")
-    private Long lastUser;
-    /**
-     * 附件ids，关联公共文件表TF_YWPN_FILE _W，多个附件以英文逗号分隔
-     */
-    @ApiModelProperty(value = "附件ids，关联公共文件表TF_YWPN_FILE _W，多个附件以英文逗号分隔")
-    private String fileIds;
-    /**
-     * 完成时间
-     */
-    @ApiModelProperty(value = "完成时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date overTime;
-    @ApiModelProperty(value = "派工人id")
-    private Long dispatchingId;
-    @ApiModelProperty(value = "是否派工 0不派工 1派工")
-    private String isDispatching;
-
-    @ApiModelProperty(value = "个人计划列表")
-    private List<RepairuserChildDto> repairUserChildDtoList;
-
-    @ApiModelProperty(value = "是否查询当前用户下的工单列表,flag为1 默认不填写")
-    private String flag;
-
-    @ApiModelProperty(value = "人工结束 0关闭 1开启")
-    private String artificialEndFlag;
-
-    @ApiModelProperty(value = "是否为养护 0否 1是")
-    private String maintenanceFlag;
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/maintain/dto/RepairplanDto.java

@@ -1,109 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.pojo.maintain.dto;
-
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.tofly.pojo.maintain.Repairplandetail;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-import java.util.List;
-
-
-/**
- * 抢维修年度计划记录信息表
- *
- * @author admin
- * @date Tue Apr 06 00:00:00 CST 2021
- */
-@Data
-@ApiModel
-public class RepairplanDto extends Model<RepairplanDto> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * ID
-     */
-    @ApiModelProperty(value = "ID")
-    private Long id;
-    /**
-     * 年份
-     */
-    @ApiModelProperty(value = "年份")
-    private String year;
-
-    @ApiModelProperty(value = "年份查询,多个以,分隔")
-    private String years;
-    /**
-     * 上报状态，0未提交、1已提交
-     */
-    @ApiModelProperty(value = "上报状态，0未提交、1已提交")
-    private String issubmit;
-    /**
-     * 上报时间
-     */
-    @ApiModelProperty(value = "上报时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date submitTime;
-    /**
-     * 上报人
-     */
-    @ApiModelProperty(value = "上报人")
-    private Long submitUser;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    private Long createUser;
-    @ApiModelProperty(hidden = true)
-    private String createUserName;
-
-
-    @ApiModelProperty(value = "抢维修年度计划详情列表")
-    private List<Repairplandetail> planyeardetailList;
-    @ApiModelProperty(value = "计划状态(0待审核,1审批拒绝2审批通过)")
-    private String planState;
-
-    @ApiModelProperty(value = "部门审核人id")
-    private Long deptUserId;
-
-    @ApiModelProperty(value = "分管审核人id")
-    private Long chargeUserId;
-
-    @ApiModelProperty(value = "起始上报时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date startSubmitTime;
-
-    @ApiModelProperty(value = "终止上报时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date endSubmitTime;
-
-    @ApiModelProperty(value = "是否查询当前用户下的审核列表,flag为1 默认不填写")
-    private String flag;
-
-    @ApiModelProperty(value = "抢维修年计划id")
-    private Long yearId;
-
-    @ApiModelProperty(value = "月份")
-    private String month;
-    @ApiModelProperty(value = "月份查询,多个以,分隔")
-    private String months;
-    @ApiModelProperty(value = "单位")
-    private String unit;
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/maintain/dto/RepairplandetailDto.java

@@ -1,88 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.pojo.maintain.dto;
-
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import javax.validation.constraints.NotNull;
-import java.util.Date;
-
-
-/**
- * 抢维修年度计划内容信息表
- *
- * @author admin
- * @date Tue Apr 06 00:00:00 CST 2021
- */
-@Data
-@ApiModel
-public class RepairplandetailDto extends Model<RepairplandetailDto> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 唯一值ID
-     */
-    @ApiModelProperty(value = "唯一值ID")
-    private Long id;
-    /**
-     * 年度记录ID，关联表TF_YWPN_REPAIRPLAN_W主键
-     */
-    @ApiModelProperty(value = "年度记录ID，关联表TF_YWPN_REPAIRPLAN_W主键")
-    private Long yearId;
-    /**
-     * 年份
-     */
-    @ApiModelProperty(value = "年份")
-    private String year;
-    /**
-     * 月份
-     */
-    @ApiModelProperty(value = "月份")
-    private String month;
-    /**
-     * 维修类型ID,关联表TF_YWPN_REPAIRTYPE_D关键值
-     */
-    @ApiModelProperty(value = "维修类型ID,关联表TF_YWPN_REPAIRTYPE_D关键值")
-    private Long typeId;
-
-    @ApiModelProperty(value = "维修类型ID多个查询以,分隔")
-    private String typeIds;
-    /**
-     * 维修数量
-     */
-    @ApiModelProperty(value = "维修数量")
-    private Long num;
-    /**
-     * 任务接收负责人
-     */
-    @ApiModelProperty(value = "任务接收负责人")
-    private Long respUser;
-    /**
-     * 详细说明
-     */
-    @ApiModelProperty(value = "详细说明")
-    private String notes;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    private Long createUser;
-    @ApiModelProperty(hidden = true)
-    private String createUserName;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    @ApiModelProperty(value = "单位")
-    private String unit;
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/maintain/dto/RepairplandetailSaveDto.java

@@ -1,16 +0,0 @@
-package com.tofly.pojo.maintain.dto;
-
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel
-public class RepairplandetailSaveDto extends Model<RepairplandetailSaveDto> {
-    private static final long serialVersionUID = 1L;
-
-    private List<RepairplandetailDto> dtoList;
-
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/maintain/dto/RepairrebutDto.java

@@ -1,63 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.pojo.maintain.dto;
-
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-
-/**
- * 抢维修工单驳回记录信息表
- *
- * @author admin
- * @date Tue Apr 06 00:00:00 CST 2021
- */
-@Data
-@ApiModel
-public class RepairrebutDto extends Model<RepairrebutDto> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * ID
-     */
-    @ApiModelProperty(value = "ID")
-    private Long id;
-    /**
-     * 个人任务id，关联表TF_YWPN_REPAIRUSER_W
-     */
-    @ApiModelProperty(value = "个人任务id，关联表TF_YWPN_REPAIRUSER_W")
-    private Long repairUserid;
-    /**
-     * 驳回原因说明
-     */
-    @ApiModelProperty(value = "驳回原因说明")
-    private String rebutNotes;
-    /**
-     * 维修工单id，关联表TF_YWPN_REPAIRORDER_W关键值
-     */
-    @ApiModelProperty(value = "维修工单id，关联表TF_YWPN_REPAIRORDER_W关键值")
-    private Long repairId;
-    /**
-     * 创建人（驳回人ID）
-     */
-    @ApiModelProperty(value = "创建人（驳回人ID）")
-    private Long createUser;
-    @ApiModelProperty(hidden = true)
-    private String createUserName;
-    /**
-     * 创建时间（驳回时间）
-     */
-    @ApiModelProperty(value = "创建时间（驳回时间）")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/maintain/dto/RepairrecordDto.java

@@ -1,113 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.pojo.maintain.dto;
-
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.tofly.pojo.maintain.Repairgoods;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-import java.util.List;
-
-
-/**
- * 抢维修处理记录表
- *
- * @author admin
- * @date Tue Apr 06 00:00:00 CST 2021
- */
-@Data
-@ApiModel
-public class RepairrecordDto extends Model<RepairrecordDto> {
-    private static final long serialVersionUID = 1L;
-
-
-    /**
-     * 数据唯一标识
-     */
-    @ApiModelProperty(value = "数据唯一标识")
-    private Long id;
-    /**
-     * 上报位置经度
-     */
-    @ApiModelProperty(value = "上报位置经度")
-    private Double lgtd;
-    /**
-     * 上报位置纬度
-     */
-    @ApiModelProperty(value = "上报位置纬度")
-    private Double lttd;
-    /**
-     * 个人任务id，关联表TF_YWPN_REPAIRUSER_W
-     */
-    @ApiModelProperty(value = "个人任务id，关联表TF_YWPN_REPAIRUSER_W")
-    private Long repairUserid;
-    /**
-     * 定位网络(gps 1,基站2,wifi 3)
-     */
-    @ApiModelProperty(value = "定位网络(gps 1,基站2,wifi 3)")
-    private String network;
-    /**
-     * 地址描述
-     */
-    @ApiModelProperty(value = "地址描述")
-    private String address;
-    /**
-     * 口径（mm）
-     */
-    @ApiModelProperty(value = "口径（mm）")
-    private String bore;
-    /**
-     * 情况说明
-     */
-    @ApiModelProperty(value = "情况说明")
-    private String notes;
-
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    private Long createUser;
-    @ApiModelProperty(hidden = true)
-    private String createUserName;
-    @ApiModelProperty(value = "附件1")
-    private String fileIdsOne;
-
-    @ApiModelProperty(value = "附件2")
-    private String fileIdsTow;
-
-    @ApiModelProperty(value = "附件3")
-    private String fileIdsThree;
-
-    @ApiModelProperty(value = "是否有效 0无 1有")
-    private String flag;
-    @ApiModelProperty(value = "抢维修耗材记录列表")
-    private List<Repairgoods> goods;
-    @ApiModelProperty(value = "所在片区")
-    private String regionCode;
-    @ApiModelProperty(value = "所在片区名称")
-    private String regionName;
-    @ApiModelProperty(value = "维修设备编码，关联空间数据编码")
-    private String repairDevice;
-    @ApiModelProperty(value = "设备关联空间数据图层")
-    private String repairLayer;
-    @ApiModelProperty("状态 0待审核,1审批拒绝2审批通过3未上报")
-    private String state;
-    @ApiModelProperty("热线工单审核人")
-    private Long hotlineAuditUserId;
-    @ApiModelProperty("维修类型 关联表 TF_YWPN_REPAIRTYPE_D")
-    private Long repairType;
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/maintain/dto/RepairrelayDto.java

@@ -1,112 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.pojo.maintain.dto;
-
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-
-/**
- * 抢维修工单转发记录信息表
- *
- * @author admin
- * @date Tue Apr 06 00:00:00 CST 2021
- */
-@Data
-@ApiModel
-public class RepairrelayDto extends Model<RepairrelayDto> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * ID
-     */
-    @ApiModelProperty(value = "ID")
-    private Long id;
-    /**
-     * 个人任务id，关联表TF_YWPN_REPAIRUSER_W
-     */
-    @ApiModelProperty(value = "个人任务id，关联表TF_YWPN_REPAIRUSER_W")
-    private Long repairUserid;
-    /**
-     * 接收处理人
-     */
-    @ApiModelProperty(value = "接收处理人")
-    private Long relayUser;
-    /**
-     * 转发原因说明
-     */
-    @ApiModelProperty(value = "转发原因说明")
-    private String relayNotes;
-    /**
-     * 维修工单id，关联表TF_YWPN_REPAIRORDER_W关键值
-     */
-    @ApiModelProperty(value = "维修工单id，关联表TF_YWPN_REPAIRORDER_W关键值")
-    private Long repairId;
-    /**
-     * 上报状态；0：未提交；1：已提交
-     */
-    @ApiModelProperty(value = "上报状态；0：未提交；1：已提交")
-    private String issubmit;
-    /**
-     * 上报时间
-     */
-    @ApiModelProperty(value = "上报时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date submitTime;
-    /**
-     * 上报人
-     */
-    @ApiModelProperty(value = "上报人")
-    private Long submitUser;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    private Long createUser;
-    @ApiModelProperty(hidden = true)
-    private String createUserName;
-    /**
-     * 审核结果；0：未审核；1：通过；2：未通过，
-     */
-    @ApiModelProperty(value = "审核结果；0：未审核；1：通过；2：未通过，")
-    private String auditResult;
-    /**
-     * 审核人
-     */
-    @ApiModelProperty(value = "审核人")
-    private Long auditUser;
-
-    /**
-     * 审核备注
-     */
-    @ApiModelProperty(value = "审核备注")
-    private String auditNotes;
-    /**
-     * 审核时间
-     */
-    @ApiModelProperty(value = "审核时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date audittime;
-    /**
-     * 是否接收查看，0：未查看；1：已查看
-     */
-    @ApiModelProperty(value = "是否接收查看，0：未查看；1：已查看")
-    private String isread;
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/maintain/dto/RepairtypeDto.java

@@ -1,68 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.pojo.maintain.dto;
-
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-
-/**
- * 维修类型信息表
- *
- * @author admin
- * @date Tue Apr 06 00:00:00 CST 2021
- */
-@Data
-@ApiModel
-public class RepairtypeDto extends Model<RepairtypeDto> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * ID
-     */
-    @ApiModelProperty(value = "ID")
-    private Long id;
-    /**
-     * 归属类名称
-     */
-    @ApiModelProperty(value = "归属类名称")
-    private String groupName;
-    /**
-     * 类型名称
-     */
-    @ApiModelProperty(value = "类型名称")
-    private String name;
-    /**
-     * 单位
-     */
-    @ApiModelProperty(value = "单位")
-    private String unit;
-    /**
-     * 备注说明
-     */
-    @ApiModelProperty(value = "备注说明")
-    private String notes;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    private Long createUser;
-    @ApiModelProperty(hidden = true)
-    private String createUserName;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/maintain/dto/RepairuserChildDto.java

@@ -1,40 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.pojo.maintain.dto;
-
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-
-/**
- * 抢维修工单个人任务请求对象
- *
- * @author admin
- * @date Tue Apr 06 00:00:00 CST 2021
- */
-@Data
-@ApiModel
-public class RepairuserChildDto extends Model<RepairuserChildDto> {
-    private static final long serialVersionUID = 1L;
-    @ApiModelProperty(value = "维修人ID,主要负责人")
-    private Long respUser;
-
-    @ApiModelProperty(value = "协同处理人ID，多个以英文逗号分隔")
-    private String teamUser;
-
-    @ApiModelProperty(value = "核定用时,单位小时")
-    private Double ratifyTime;
-
-    @ApiModelProperty(value = "计划完成个数")
-    private Long planNum;
-
-    @ApiModelProperty(value = "电话")
-    private String phone;
-
-    @ApiModelProperty("多个点经纬度存储")
-    private String lngLats;
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/maintain/dto/RepairuserDto.java

@@ -1,143 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.pojo.maintain.dto;
-
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-
-/**
- * 抢维修工单个人任务信息表
- *
- * @author admin
- * @date Tue Apr 06 00:00:00 CST 2021
- */
-@Data
-@ApiModel
-public class RepairuserDto extends Model<RepairuserDto> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * ID
-     */
-    @ApiModelProperty(value = "ID")
-    private Long id;
-    /**
-     * 维修人ID，主要负责人
-     */
-    @ApiModelProperty(value = "维修人ID，主要负责人")
-    private Long respUser;
-    /**
-     * 维修工单id，关联表TF_YWPN_REPAIRORDER_W关键值
-     */
-    @ApiModelProperty(value = "维修工单id，关联表TF_YWPN_REPAIRORDER_W关键值")
-    private Long repairId;
-    /**
-     * 协同处理人ID，多个以英文逗号分隔
-     */
-    @ApiModelProperty(value = "协同处理人ID，多个以英文逗号分隔")
-    private String teamUser;
-    /**
-     * 是否确认，0未查收，1已查收
-     */
-    @ApiModelProperty(value = "是否确认，0未查收，1已查收")
-    private String isread;
-    /**
-     * 是否返工，0未返工，1已返工
-     */
-    @ApiModelProperty(value = "是否返工，0未返工，1已返工")
-    private String isrepeat;
-    /**
-     * 返工次数
-     */
-    @ApiModelProperty(value = "返工次数")
-    private Integer repeatNum;
-    /**
-     * 工单状态0:未派工,1:处理中, 2:驳回 , 3:审核中 ,4处理完成，5转移申请，6、已转移 7:完成
-     */
-    @ApiModelProperty(value = "工单状态0:未派工,1:未审核, 2:未开始 , 3:正在执行 ,4处理完成，5已开始未执行，6、驳回 7:转移申请 8已转移")
-    private String state;
-    /**
-     * 核定用时,单位小时
-     */
-    @ApiModelProperty(value = "核定用时,单位小时")
-    private Double ratifyTime;
-    /**
-     * 系统用时（实际处理用时），单位小时
-     */
-    @ApiModelProperty(value = "系统用时（实际处理用时），单位小时")
-    private Double realTime;
-    /**
-     * 所在片区
-     */
-    @ApiModelProperty(value = "所在片区")
-    private String regionCode;
-
-    /**
-     * 所在片区名称
-     */
-    @ApiModelProperty(value = "所在片区名称")
-    private String regionName;
-    /**
-     * 实际地址描述
-     */
-    @ApiModelProperty(value = "实际地址描述")
-    private String address;
-    /**
-     * 实际位置经度，单位：°
-     */
-    @ApiModelProperty(value = "实际位置经度，单位：°")
-    private Double lgtd;
-    /**
-     * 实际位置纬度，单位：°
-     */
-    @ApiModelProperty(value = "实际位置纬度，单位：°")
-    private Double lttd;
-
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    private Long createUser;
-    @ApiModelProperty(hidden = true)
-    private String createUserName;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    /**
-     * 接收时间
-     */
-    @ApiModelProperty(value = "接收时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date confirmTime;
-    /**
-     * 处理完成上报时间
-     */
-    @ApiModelProperty(value = "处理完成上报时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date overTime;
-    @ApiModelProperty(value = "计划完成个数")
-    private Long planNum;
-
-    @ApiModelProperty(value = "实际完成个数")
-    private Long overNum;
-    @ApiModelProperty("多个点经纬度存储")
-    private String lngLats;
-    @ApiModelProperty("电话")
-    private String phone;
-
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/maintain/vo/AuxiliarySingleVo.java

@@ -1,35 +0,0 @@
-package com.tofly.pojo.maintain.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-/**
- * 辅助派单返回对象
- * @author BZ-DJJ
- */
-@Data
-public class AuxiliarySingleVo implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "用户id")
-    private Long userId;
-    @ApiModelProperty(value = "用户名称")
-    private String userName;
-
-    @ApiModelProperty(value = "部门id")
-    private Long deptId;
-    @ApiModelProperty(value = "部门名称")
-    private String deptName;
-    @ApiModelProperty(value = "当前最新位置经度")
-    private BigDecimal lgtd;
-    @ApiModelProperty(value = "当前用户处理的业务工单个数")
-    private Long gdNum;
-
-    @ApiModelProperty(value = "当前最新位置纬度")
-    private BigDecimal lttd;
-    @ApiModelProperty(value = "当前用户上班状态")
-    private String singType;
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/maintain/vo/ExcelExportRepairBasePlan.java

@@ -1,49 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.pojo.maintain.vo;
-
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-import java.util.Map;
-
-
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ApiModel
-public class ExcelExportRepairBasePlan extends Model<ExcelExportRepairBasePlan> {
-    private static final long serialVersionUID = 1L;
-
-    private String year;
-
-    private String month;
-
-    private String note;
-
-    private String createUserName;
-
-    private String submitTime;
-
-    private String auditDeptResult;
-
-    private String auditDeptNote;
-
-    private String auditDeptUser;
-
-    private String auditDeptTime;
-
-    private String auditChargeResult;
-
-    private String auditChargeNote;
-
-    private String auditChargeUser;
-    private String auditChargeTime;
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/maintain/vo/ExcelExportRepairPlan.java

@@ -1,50 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.pojo.maintain.vo;
-
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.List;
-import java.util.Map;
-
-
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ApiModel
-public class ExcelExportRepairPlan extends Model<ExcelExportRepairPlan> {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "类型名称")
-    private String typeName;
-
-    private String one;
-
-    private String two;
-
-    private String three;
-
-    private String four;
-
-    private String five;
-
-    private String six;
-
-    private String seven;
-
-    private String eight;
-
-    private String nine;
-
-    private String ten;
-
-    private String eleven;
-
-    private String twelve;
-
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/maintain/vo/ExcelExportRepairPlanDetail.java

@@ -1,40 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.pojo.maintain.vo;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-
-
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ApiModel
-public class ExcelExportRepairPlanDetail extends Model<ExcelExportRepairPlanDetail> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 月份
-     */
-    @ApiModelProperty(value = "月份")
-    private String month;
-
-    /**
-     * 详细说明
-     */
-    @ApiModelProperty(value = "详细说明")
-    private String planContent;
-
-
-
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/maintain/vo/ExcelImageVo.java

@@ -1,13 +0,0 @@
-package com.tofly.pojo.maintain.vo;
-
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-
-@Data
-@ApiModel
-public class ExcelImageVo extends Model<ExcelImageVo> {
-    private byte[] img;
-
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/maintain/vo/RepairgoodsVo.java

@@ -1,88 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.pojo.maintain.vo;
-
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-
-/**
- * 抢维修耗材记录表
- *
- * @author admin
- * @date Tue Apr 06 00:00:00 CST 2021
- */
-@Data
-@ApiModel
-public class RepairgoodsVo extends Model<RepairgoodsVo> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * ID
-     */
-    @ApiModelProperty(value = "ID")
-    private Long id;
-    /**
-     * 上传记录表ID，关联表TF_YWPN_REPAIRRECORD_W关键值
-     */
-    @ApiModelProperty(value = "上传记录表ID，关联表TF_YWPN_REPAIRRECORD_W关键值")
-    private Long recordId;
-    /**
-     * 个人任务id，关联表TF_YWPN_REPAIRUSER_W
-     */
-    @ApiModelProperty(value = "个人任务id，关联表TF_YWPN_REPAIRUSER_W")
-    private Long repairUserid;
-    /**
-     * 材料类型,关联表TF_YWPN_REPAIRTYPE_D关键值
-     */
-    @ApiModelProperty(value = "材料类型,关联表TF_YWPN_REPAIRTYPE_D关键值")
-    private Long materialType;
-    /**
-     * 材料类型名称
-     */
-    @ApiModelProperty(value = "材料类型名称")
-    private String materialTypeName;
-
-    @ApiModelProperty(value = "规格型号")
-    private String specification;
-    @ApiModelProperty(value = "单位")
-    private String unit;
-    /**
-     * 材质，字典编码表取，PE、金属等
-     */
-    @ApiModelProperty(value = "材质，字典编码表取，PE、金属等")
-    private String material;
-    /**
-     * 口径（mm）
-     */
-    @ApiModelProperty(value = "口径（mm）")
-    private String bore;
-    /**
-     * 数量
-     */
-    @ApiModelProperty(value = "数量")
-    private Long num;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    /**
-     * 创建用户ID
-     */
-    @ApiModelProperty(value = "创建用户ID")
-    private Long createUser;
-    @ApiModelProperty(hidden = true)
-    private String createUserName;
-
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/maintain/vo/RepairmaterialVo.java

@@ -1,65 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.pojo.maintain.vo;
-
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-
-/**
- * 维修材料类型信息表
- *
- * @author admin
- * @date Tue Apr 06 00:00:00 CST 2021
- */
-@Data
-@ApiModel
-public class RepairmaterialVo extends Model<RepairmaterialVo> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * ID
-     */
-    @ApiModelProperty(value = "ID")
-    private Long id;
-    /**
-     * 类型名称
-     */
-    @ApiModelProperty(value = "类型名称")
-    private String name;
-    /**
-     * 单位
-     */
-    @ApiModelProperty(value = "单位")
-    private String unit;
-    /**
-     * 备注说明
-     */
-    @ApiModelProperty(value = "备注说明")
-    private String notes;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    private Long createUser;
-    @ApiModelProperty(hidden = true)
-    private String createUserName;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
-    @ApiModelProperty(value = "规格型号")
-    private String specification;
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/maintain/vo/RepairorderVo.java

@@ -1,230 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.pojo.maintain.vo;
-
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-import java.util.List;
-
-
-/**
- * 抢维修工单信息表
- *
- * @author admin
- * @date Tue Apr 06 00:00:00 CST 2021
- */
-@Data
-@ApiModel
-public class RepairorderVo extends Model<RepairorderVo> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 唯一值
-     */
-    @ApiModelProperty(value = "唯一值")
-    private Long id;
-    /**
-     * 工单编号,以发起部门自定义代码+年月日+4位序号，如管网代码为：GW，生成日期为2021年1月23日，序号0001，整体编号：GW202101230001
-     */
-    @ApiModelProperty(value = "工单编号,以发起部门自定义代码+年月日+4位序号，如管网代码为：GW，生成日期为2021年1月23日，序号0001，整体编号：GW202101230001")
-    private String orderCode;
-    /**
-     * 故障类型,关联编码表id
-     */
-    @ApiModelProperty(value = "故障类型,关联编码表id")
-    private Long faultType;
-    /**
-     * 年度计划id，关联表TF_YWPN_REPAIRPLANDETAIL_W关键值
-     */
-    @ApiModelProperty(value = "年度计划id，关联表TF_YWPN_REPAIRPLANDETAIL_W关键值")
-    private Long yearId;
-    /**
-     * 工单来源，字典编码表，0计划、1自建、2热线
-     */
-    @ApiModelProperty(value = "工单来源，字典编码表，0计划、1自建、2热线")
-    private String orderSource;
-    /**
-     * 联系电话
-     */
-    @ApiModelProperty(value = "联系电话")
-    private String phone;
-    /**
-     * 维修类型,关联表TF_YWPN_REPAIRTYPE_D的关键值
-     */
-    @ApiModelProperty(value = "维修类型,关联表TF_YWPN_REPAIRTYPE_D的关键值")
-    private Long typeId;
-
-    /**
-     * 维修类型名称
-     */
-    @ApiModelProperty(value = "维修类型名称")
-    private String typeName;
-    /**
-     * 月份
-     */
-    @ApiModelProperty(value = "月份")
-    private String month;
-    /**
-     * 开始时间,工单处理开始时间，以派发时间为准，自动生成
-     */
-    @ApiModelProperty(value = "开始时间,工单处理开始时间，以派发时间为准，自动生成")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
-    /**
-     * 结束时间,工单处理结束时间
-     */
-    @ApiModelProperty(value = "结束时间,工单处理结束时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date endTime;
-    /**
-     * 地址描述
-     */
-    @ApiModelProperty(value = "地址描述")
-    private String address;
-    /**
-     * 经度，单位：°
-     */
-    @ApiModelProperty(value = "经度，单位：°")
-    private Double lgtd;
-    /**
-     * 纬度，单位：°
-     */
-    @ApiModelProperty(value = "纬度，单位：°")
-    private Double lttd;
-    /**
-     * 维修数量
-     */
-    @ApiModelProperty(value = "维修数量")
-    private Long num;
-    /**
-     * 单位
-     */
-    @ApiModelProperty(value = "单位")
-    private String unit;
-    /**
-     * 详细说明
-     */
-    @ApiModelProperty(value = "详细说明")
-    private String notes;
-    /**
-     * 是否查收,0未查收,1已查收
-     */
-    @ApiModelProperty(value = "是否查收,0未查收,1已查收")
-    private String isread;
-    /**
-     * 查收时间
-     */
-    @ApiModelProperty(value = "查收时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date confirmTime;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    private Long createUser;
-    @ApiModelProperty(hidden = true)
-    private String createUserName;
-    /**
-     * 是否驳回，0未驳回，1驳回
-     */
-    @ApiModelProperty(value = "是否驳回，0未驳回，1驳回")
-    private String isrebut;
-    /**
-     * 是否转发，0未转发，1已转发
-     */
-    @ApiModelProperty(value = "是否转发，0未转发，1已转发")
-    private String isrelay;
-    /**
-     * 工单状态0:未派工,1:处理中, 2:驳回 , 3:审核中 ,4处理完成，5转移申请，6、已转移 7:完成
-     */
-    @ApiModelProperty(value = "工单状态0:未派工,1:未审核, 2:未开始 , 3:正在执行 ,4处理完成，5已开始未执行，6、驳回 7:转移申请 8已转移")
-    private String state;
-    /**
-     * 总完成率
-     */
-    @ApiModelProperty(value = "总完成率")
-    private Float percent;
-    /**
-     * 总完成数量
-     */
-    @ApiModelProperty(value = "总完成数量")
-    private Long overNum;
-    /**
-     * 最后一次修改时间
-     */
-    @ApiModelProperty(value = "最后一次修改时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date lastTime;
-    /**
-     * 最后一次修改人
-     */
-    @ApiModelProperty(value = "最后一次修改人")
-    private Long lastUser;
-    /**
-     * 附件ids，关联公共文件表TF_YWPN_FILE _W，多个附件以英文逗号分隔
-     */
-    @ApiModelProperty(value = "附件ids，关联公共文件表TF_YWPN_FILE _W，多个附件以英文逗号分隔")
-    private String fileIds;
-    /**
-     * 完成时间
-     */
-    @ApiModelProperty(value = "完成时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date overTime;
-
-    /**
-     * 文件路径列表
-     */
-    @ApiModelProperty(value = "文件路径列表")
-    List<String> filePathList;
-
-    @ApiModelProperty(value = "派工人id")
-    private Long dispatchingId;
-    @ApiModelProperty(value = "是否派工 0不派工 1派工")
-    private String isDispatching;
-
-    @ApiModelProperty(value = "派工人名称")
-    private String dispatchingName;
-
-    @ApiModelProperty(value = "工单审核人")
-    private String auditUserName;
-
-    @ApiModelProperty(value = "工单审核时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date auditTime;
-
-    @ApiModelProperty(value = "工单审核说明")
-    private String auditNote;
-
-    @ApiModelProperty(value = "工单审核意见")
-    private String auditSate;
-
-    @ApiModelProperty(value = "人工结束 0关闭 1开启")
-    private String artificialEndFlag;
-    private String artificialEndFlagName;
-
-    @ApiModelProperty(value = "是否为养护 0否 1是")
-    private String maintenanceFlag;
-    private String maintenanceFlagName;
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/maintain/vo/RepairplanVo.java

@@ -1,97 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.pojo.maintain.vo;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.tofly.pojo.comm.vo.AuditVo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-import java.util.List;
-
-
-/**
- * 抢维修年度计划记录信息表
- *
- * @author admin
- * @date Tue Apr 06 00:00:00 CST 2021
- */
-@Data
-@ApiModel
-public class RepairplanVo extends Model<RepairplanVo> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * ID
-     */
-    @ApiModelProperty(value = "ID")
-    private Long id;
-    /**
-     * 年份
-     */
-    @ApiModelProperty(value = "年份")
-    private String year;
-    /**
-     * 上报状态，0未提交、1已提交
-     */
-    @ApiModelProperty(value = "上报状态，0未提交、1已提交")
-    private String issubmit;
-
-    @TableField(exist = false)
-    private String issubmitName;
-    /**
-     * 上报时间
-     */
-    @ApiModelProperty(value = "上报时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date submitTime;
-    /**
-     * 上报人
-     */
-    @ApiModelProperty(value = "上报人")
-    private Long submitUser;
-
-    /**
-     * 上报人名称
-     */
-    @TableField(exist = false)
-    @ApiModelProperty(value = "上报人名称")
-    private String submitUserName;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    private Long createUser;
-    @TableField(exist = false)
-    @ApiModelProperty(hidden = true)
-    private String createUserName;
-
-    @ApiModelProperty(value = "抢维修月计划详情列表详细")
-    private List<RepairplandetailVo> repairplandetailVoList;
-    @ApiModelProperty(value = "计划状态(0待审核,1审批拒绝2审批通过)")
-    private String planState;
-    @TableField(exist = false)
-    private String planStateName;
-    @ApiModelProperty(value = "审批链")
-    private List<AuditVo> auditVoList;
-    @ApiModelProperty(value = "抢维修年计划id")
-    private Long yearId;
-
-    @ApiModelProperty(value = "月份")
-    private String month;
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/maintain/vo/RepairplandetailVo.java

@@ -1,102 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.pojo.maintain.vo;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-
-/**
- * 抢维修年度计划内容信息表
- *
- * @author admin
- * @date Tue Apr 06 00:00:00 CST 2021
- */
-@Data
-@ApiModel
-public class RepairplandetailVo extends Model<RepairplandetailVo> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 唯一值ID
-     */
-    @ApiModelProperty(value = "唯一值ID")
-    private Long id;
-    /**
-     * 年度记录ID，关联表TF_YWPN_REPAIRPLAN_W主键
-     */
-    @ApiModelProperty(value = "年度记录ID，关联表TF_YWPN_REPAIRPLAN_W主键")
-    private Long yearId;
-    /**
-     * 年份
-     */
-    @ApiModelProperty(value = "年份")
-    private String year;
-    /**
-     * 月份
-     */
-    @ApiModelProperty(value = "月份")
-    private String month;
-    /**
-     * 维修类型ID,关联表TF_YWPN_REPAIRTYPE_D关键值
-     */
-    @ApiModelProperty(value = "维修类型ID,关联表TF_YWPN_REPAIRTYPE_D关键值")
-    private Long typeId;
-    /**
-     * 维修类型名称
-     */
-    @TableField(exist = false)
-    @ApiModelProperty(value = "维修类型名称")
-    private String typeName;
-    /**
-     * 维修数量
-     */
-    @ApiModelProperty(value = "维修数量")
-    private Long num;
-    /**
-     * 任务接收负责人
-     */
-    @ApiModelProperty(value = "任务接收负责人")
-    private Long respUser;
-
-    /**
-     * 任务接收负责人名称
-     */
-    @TableField(exist = false)
-    @ApiModelProperty(value = "任务接收负责人名称")
-    private String respUserName;
-    /**
-     * 详细说明
-     */
-    @ApiModelProperty(value = "详细说明")
-    private String notes;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    private Long createUser;
-    @ApiModelProperty(hidden = true)
-    private String createUserName;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
-    @ApiModelProperty(value = "工单id")
-    private String orderId;
-
-    @ApiModelProperty(value = "单位")
-    private String unit;
-}

zgsw-gps/zgsw-gps-api/src/main/java/com/tofly/pojo/maintain/vo/RepairrebutVo.java

@@ -1,63 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.pojo.maintain.vo;
-
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-
-/**
- * 抢维修工单驳回记录信息表
- *
- * @author admin
- * @date Tue Apr 06 00:00:00 CST 2021
- */
-@Data
-@ApiModel
-public class RepairrebutVo extends Model<RepairrebutVo> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * ID
-     */
-    @ApiModelProperty(value = "ID")
-    private Long id;
-    /**
-     * 个人任务id，关联表TF_YWPN_REPAIRUSER_W
-     */
-    @ApiModelProperty(value = "个人任务id，关联表TF_YWPN_REPAIRUSER_W")
-    private Long repairUserid;
-    /**
-     * 驳回原因说明
-     */
-    @ApiModelProperty(value = "驳回原因说明")
-    private String rebutNotes;
-    /**
-     * 维修工单id，关联表TF_YWPN_REPAIRORDER_W关键值
-     */
-    @ApiModelProperty(value = "维修工单id，关联表TF_YWPN_REPAIRORDER_W关键值")
-    private Long repairId;
-    /**
-     * 创建人（驳回人ID）
-     */
-    @ApiModelProperty(value = "创建人（驳回人ID）")
-    private Long createUser;
-    @ApiModelProperty(hidden = true)
-    private String createUserName;
-    /**
-     * 创建时间（驳回时间）
-     */
-    @ApiModelProperty(value = "创建时间（驳回时间）")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
-}