Преглед на файлове

移除swagger;
增加了 食堂服务人员情况 接口;
增加了公务用车的部分代码

zhanghao преди 2 месеца
родител
ревизия
3821e02f1e
променени са 86 файла, в които са добавени 3071 реда и са изтрити 756 реда
  1. 2 2
      pom.xml
  2. 2 2
      project-admin/pom.xml
  3. 121 121
      project-admin/src/main/java/com/project/web/core/config/SwaggerConfig.java
  4. 2 2
      project-common/pom.xml
  5. 19 21
      project-common/src/main/java/com/project/common/core/domain/entity/BaseUser.java
  6. 5 7
      project-common/src/main/java/com/project/common/core/domain/search/PageKeywordParamVo.java
  7. 3 5
      project-common/src/main/java/com/project/common/core/domain/search/PageParamVo.java
  8. 6 7
      project-common/src/main/java/com/project/common/core/domain/search/PagePositionParamVo.java
  9. 5 7
      project-common/src/main/java/com/project/common/core/page/TableDataInfo.java
  10. 61 0
      project-zcustom/src/main/java/com/project/zcustom/controller/car/PlatCarController.java
  11. 4 6
      project-zcustom/src/main/java/com/project/zcustom/controller/service/PlatBasicsController.java
  12. 10 11
      project-zcustom/src/main/java/com/project/zcustom/controller/service/PlatEmployeeController.java
  13. 10 9
      project-zcustom/src/main/java/com/project/zcustom/controller/service/PlatEmployeeHealthController.java
  14. 26 26
      project-zcustom/src/main/java/com/project/zcustom/controller/service/PlatGreenSmartController.java
  15. 8 16
      project-zcustom/src/main/java/com/project/zcustom/controller/service/PlatPostStationController.java
  16. 7 15
      project-zcustom/src/main/java/com/project/zcustom/controller/service/PlatPropertyController.java
  17. 72 0
      project-zcustom/src/main/java/com/project/zcustom/controller/unit/LargeCarDetailController.java
  18. 69 0
      project-zcustom/src/main/java/com/project/zcustom/controller/unit/LargeCarRankController.java
  19. 58 0
      project-zcustom/src/main/java/com/project/zcustom/controller/unit/LargePublicCarController.java
  20. 69 0
      project-zcustom/src/main/java/com/project/zcustom/controller/unit/LargeUnitRankController.java
  21. 69 0
      project-zcustom/src/main/java/com/project/zcustom/controller/unit/LargeWarnDetailController.java
  22. 4 6
      project-zcustom/src/main/java/com/project/zcustom/controller/video/PlatVideoController.java
  23. 13 15
      project-zcustom/src/main/java/com/project/zcustom/domain/access/PlatAccess.java
  24. 5 7
      project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargeAssetDirs.java
  25. 2 4
      project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargeBuilding.java
  26. 18 20
      project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargeBuildingControl.java
  27. 11 13
      project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargeCamera.java
  28. 196 0
      project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargeCar.java
  29. 74 0
      project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargeCarDetail.java
  30. 36 0
      project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargeCarRank.java
  31. 8 11
      project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargeHousingLand.java
  32. 9 11
      project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargeIssue.java
  33. 25 27
      project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargeLogistics.java
  34. 12 14
      project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargePlan.java
  35. 10 12
      project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargeProject.java
  36. 37 0
      project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargeUnitRank.java
  37. 49 0
      project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargeWarnDetail.java
  38. 6 8
      project-zcustom/src/main/java/com/project/zcustom/domain/basics/PlatAppOrg.java
  39. 12 14
      project-zcustom/src/main/java/com/project/zcustom/domain/basics/PlatBasics.java
  40. 6 8
      project-zcustom/src/main/java/com/project/zcustom/domain/basics/PlatBasicsCompany.java
  41. 6 8
      project-zcustom/src/main/java/com/project/zcustom/domain/basics/PlatBasicsServer.java
  42. 9 11
      project-zcustom/src/main/java/com/project/zcustom/domain/basics/PlatBasicsSystem.java
  43. 11 13
      project-zcustom/src/main/java/com/project/zcustom/domain/build/PlatBuildParams.java
  44. 12 13
      project-zcustom/src/main/java/com/project/zcustom/domain/build/PlatBuildYearTrend.java
  45. 8 10
      project-zcustom/src/main/java/com/project/zcustom/domain/employee/PlatEmployeeHealth.java
  46. 17 19
      project-zcustom/src/main/java/com/project/zcustom/domain/employee/PlatEmployeeHealthChart.java
  47. 6 8
      project-zcustom/src/main/java/com/project/zcustom/domain/employee/PlatEmployeeHealthIllness.java
  48. 19 21
      project-zcustom/src/main/java/com/project/zcustom/domain/employee/PlatEmployeeType.java
  49. 10 12
      project-zcustom/src/main/java/com/project/zcustom/domain/employee/PlatEmployeeTypeFlow.java
  50. 6 8
      project-zcustom/src/main/java/com/project/zcustom/domain/employee/PlatEmployeeTypeIllness.java
  51. 6 8
      project-zcustom/src/main/java/com/project/zcustom/domain/plat/PlatApiRecord.java
  52. 19 21
      project-zcustom/src/main/java/com/project/zcustom/domain/post/PlatPostStation.java
  53. 15 17
      project-zcustom/src/main/java/com/project/zcustom/domain/post/PlatPostStationChart.java
  54. 9 10
      project-zcustom/src/main/java/com/project/zcustom/domain/property/PlatProperty.java
  55. 7 9
      project-zcustom/src/main/java/com/project/zcustom/domain/property/PlatPropertyList.java
  56. 6 8
      project-zcustom/src/main/java/com/project/zcustom/domain/property/PlatPropertyTools.java
  57. 6 8
      project-zcustom/src/main/java/com/project/zcustom/domain/smart/PlatGreenFoods.java
  58. 27 29
      project-zcustom/src/main/java/com/project/zcustom/domain/smart/PlatGreenSmart.java
  59. 9 11
      project-zcustom/src/main/java/com/project/zcustom/domain/smart/PlatGreenSmartDegree.java
  60. 8 10
      project-zcustom/src/main/java/com/project/zcustom/domain/smart/PlatGreenSmartEnergy.java
  61. 23 25
      project-zcustom/src/main/java/com/project/zcustom/domain/smart/PlatGreenSmartOther.java
  62. 7 9
      project-zcustom/src/main/java/com/project/zcustom/domain/smart/PlatGreenSmartRank.java
  63. 13 15
      project-zcustom/src/main/java/com/project/zcustom/domain/smart/PlatGreenSmartSafety.java
  64. 15 17
      project-zcustom/src/main/java/com/project/zcustom/domain/video/ScreenUnifiedVideo.java
  65. 7 9
      project-zcustom/src/main/java/com/project/zcustom/domain/video/ZnhqWebcam.java
  66. 23 0
      project-zcustom/src/main/java/com/project/zcustom/mapper/car/PlatCarMapper.java
  67. 8 0
      project-zcustom/src/main/java/com/project/zcustom/mapper/unit/LargeCarDetailMapper.java
  68. 8 0
      project-zcustom/src/main/java/com/project/zcustom/mapper/unit/LargeCarRankMapper.java
  69. 13 0
      project-zcustom/src/main/java/com/project/zcustom/mapper/unit/LargePublicCarMapper.java
  70. 9 0
      project-zcustom/src/main/java/com/project/zcustom/mapper/unit/LargeUnitRankMapper.java
  71. 7 0
      project-zcustom/src/main/java/com/project/zcustom/mapper/unit/LargeWarnDetailMapper.java
  72. 17 0
      project-zcustom/src/main/java/com/project/zcustom/service/car/ILargePlatCarService.java
  73. 55 0
      project-zcustom/src/main/java/com/project/zcustom/service/car/Impl/LargePlatCarServiceImpl.java
  74. 7 0
      project-zcustom/src/main/java/com/project/zcustom/service/smart/IPlatGreenSmartService.java
  75. 21 0
      project-zcustom/src/main/java/com/project/zcustom/service/smart/impl/PlatGreenSmartServiceImpl.java
  76. 81 0
      project-zcustom/src/main/java/com/project/zcustom/service/unit/ILargeCarDetailService.java
  77. 80 0
      project-zcustom/src/main/java/com/project/zcustom/service/unit/ILargeCarRankService.java
  78. 80 0
      project-zcustom/src/main/java/com/project/zcustom/service/unit/ILargePublicCarService.java
  79. 79 0
      project-zcustom/src/main/java/com/project/zcustom/service/unit/ILargeUnitRankService.java
  80. 80 0
      project-zcustom/src/main/java/com/project/zcustom/service/unit/ILargeWarnDetailService.java
  81. 171 0
      project-zcustom/src/main/java/com/project/zcustom/service/unit/impl/LargeCarDetailServiceImpl.java
  82. 154 0
      project-zcustom/src/main/java/com/project/zcustom/service/unit/impl/LargeCarRankServiceImpl.java
  83. 224 0
      project-zcustom/src/main/java/com/project/zcustom/service/unit/impl/LargePublicCarServiceImpl.java
  84. 154 0
      project-zcustom/src/main/java/com/project/zcustom/service/unit/impl/LargeUnitRankServiceImpl.java
  85. 160 0
      project-zcustom/src/main/java/com/project/zcustom/service/unit/impl/LargeWarnDetailServiceImpl.java
  86. 198 0
      project-zcustom/src/main/resources/mapper/zcustom/car/PlatCarMapper.xml

+ 2 - 2
pom.xml

@@ -98,7 +98,7 @@
             </dependency>
 
             <!-- Swagger3依赖 -->
-            <dependency>
+            <!--<dependency>
                 <groupId>io.springfox</groupId>
                 <artifactId>springfox-boot-starter</artifactId>
                 <version>${swagger.version}</version>
@@ -108,7 +108,7 @@
                         <artifactId>swagger-models</artifactId>
                     </exclusion>
                 </exclusions>
-            </dependency>
+            </dependency>-->
 
             <!-- io常用工具类 -->
             <dependency>

+ 2 - 2
project-admin/pom.xml

@@ -30,10 +30,10 @@
         </dependency>
 
         <!-- swagger3-->
-        <dependency>
+        <!--<dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-boot-starter</artifactId>
-        </dependency>
+        </dependency>-->
 
         <!-- 防止进入swagger页面报类型转换错误,排除3.0.0中的引用,手动增加1.6.2版本 -->
         <!--<dependency>

+ 121 - 121
project-admin/src/main/java/com/project/web/core/config/SwaggerConfig.java

@@ -1,121 +1,121 @@
-package com.project.web.core.config;
-
-import com.project.common.config.ProjectConfig;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.models.auth.In;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import springfox.documentation.builders.ApiInfoBuilder;
-import springfox.documentation.builders.PathSelectors;
-import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.service.*;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spi.service.contexts.SecurityContext;
-import springfox.documentation.spring.web.plugins.Docket;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Swagger2的接口配置
- *
- * @author ruoyi
- */
-//@Configuration
-public class SwaggerConfig {
-    /**
-     * 系统基础配置
-     */
-    @Autowired
-    private ProjectConfig projectConfig;
-
-    /**
-     * 是否开启swagger
-     */
-    @Value("${swagger.enabled}")
-    private boolean enabled;
-
-    /**
-     * 设置请求的统一前缀
-     */
-    @Value("${swagger.pathMapping}")
-    private String pathMapping;
-
-    /**
-     * 创建API
-     */
-    //@Bean
-    public Docket createRestApi() {
-        return new Docket(DocumentationType.OAS_30)
-                // 是否启用Swagger
-                .enable(enabled)
-                // 用来创建该API的基本信息,展示在文档的页面中(自定义展示的信息)
-                .apiInfo(apiInfo())
-                // 设置哪些接口暴露给Swagger展示
-                .select()
-                // 扫描所有有注解的api,用这种方式更灵活
-                .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
-                // 扫描指定包中的swagger注解
-                // .apis(RequestHandlerSelectors.basePackage("com.project.project.tool.swagger"))
-                // 扫描所有 .apis(RequestHandlerSelectors.any())
-                .paths(PathSelectors.any())
-                .build()
-                /* 设置安全模式,swagger可以设置访问token */
-                .securitySchemes(securitySchemes())
-                .securityContexts(securityContexts())
-                .pathMapping(pathMapping);
-    }
-
-    /**
-     * 安全模式,这里指定token通过Authorization头请求头传递
-     */
-    private List<SecurityScheme> securitySchemes() {
-        List<SecurityScheme> apiKeyList = new ArrayList<SecurityScheme>();
-        apiKeyList.add(new ApiKey("Authorization", "Authorization", In.HEADER.toValue()));
-        return apiKeyList;
-    }
-
-    /**
-     * 安全上下文
-     */
-    private List<SecurityContext> securityContexts() {
-        List<SecurityContext> securityContexts = new ArrayList<>();
-        securityContexts.add(
-                SecurityContext.builder()
-                        .securityReferences(defaultAuth())
-                        .operationSelector(o -> o.requestMappingPattern().matches("/.*"))
-                        .build());
-        return securityContexts;
-    }
-
-    /**
-     * 默认的安全上引用
-     */
-    private List<SecurityReference> defaultAuth() {
-        AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything");
-        AuthorizationScope[] authorizationScopes = new AuthorizationScope[1];
-        authorizationScopes[0] = authorizationScope;
-        List<SecurityReference> securityReferences = new ArrayList<>();
-        securityReferences.add(new SecurityReference("Authorization", authorizationScopes));
-        return securityReferences;
-    }
-
-    /**
-     * 添加摘要信息
-     */
-    private ApiInfo apiInfo() {
-        // 用ApiInfoBuilder进行定制
-        return new ApiInfoBuilder()
-                // 设置标题
-                .title("标题:接口文档")
-                // 描述
-                .description("描述:用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...")
-                // 作者信息
-                .contact(new Contact(projectConfig.getName(), null, null))
-                // 版本
-                .version("版本号:" + projectConfig.getVersion())
-                .build();
-    }
-}
+//package com.project.web.core.config;
+//
+//import com.project.common.config.ProjectConfig;
+//import io.swagger.annotations.ApiOperation;
+//import io.swagger.models.auth.In;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.beans.factory.annotation.Value;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import springfox.documentation.builders.ApiInfoBuilder;
+//import springfox.documentation.builders.PathSelectors;
+//import springfox.documentation.builders.RequestHandlerSelectors;
+//import springfox.documentation.service.*;
+//import springfox.documentation.spi.DocumentationType;
+//import springfox.documentation.spi.service.contexts.SecurityContext;
+//import springfox.documentation.spring.web.plugins.Docket;
+//
+//import java.util.ArrayList;
+//import java.util.List;
+//
+///**
+// * Swagger2的接口配置
+// *
+// * @author ruoyi
+// */
+////@Configuration
+//public class SwaggerConfig {
+//    /**
+//     * 系统基础配置
+//     */
+//    @Autowired
+//    private ProjectConfig projectConfig;
+//
+//    /**
+//     * 是否开启swagger
+//     */
+//    @Value("${swagger.enabled}")
+//    private boolean enabled;
+//
+//    /**
+//     * 设置请求的统一前缀
+//     */
+//    @Value("${swagger.pathMapping}")
+//    private String pathMapping;
+//
+//    /**
+//     * 创建API
+//     */
+//    //@Bean
+//    public Docket createRestApi() {
+//        return new Docket(DocumentationType.OAS_30)
+//                // 是否启用Swagger
+//                .enable(enabled)
+//                // 用来创建该API的基本信息,展示在文档的页面中(自定义展示的信息)
+//                .apiInfo(apiInfo())
+//                // 设置哪些接口暴露给Swagger展示
+//                .select()
+//                // 扫描所有有注解的api,用这种方式更灵活
+//                .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
+//                // 扫描指定包中的swagger注解
+//                // .apis(RequestHandlerSelectors.basePackage("com.project.project.tool.swagger"))
+//                // 扫描所有 .apis(RequestHandlerSelectors.any())
+//                .paths(PathSelectors.any())
+//                .build()
+//                /* 设置安全模式,swagger可以设置访问token */
+//                .securitySchemes(securitySchemes())
+//                .securityContexts(securityContexts())
+//                .pathMapping(pathMapping);
+//    }
+//
+//    /**
+//     * 安全模式,这里指定token通过Authorization头请求头传递
+//     */
+//    private List<SecurityScheme> securitySchemes() {
+//        List<SecurityScheme> apiKeyList = new ArrayList<SecurityScheme>();
+//        apiKeyList.add(new ApiKey("Authorization", "Authorization", In.HEADER.toValue()));
+//        return apiKeyList;
+//    }
+//
+//    /**
+//     * 安全上下文
+//     */
+//    private List<SecurityContext> securityContexts() {
+//        List<SecurityContext> securityContexts = new ArrayList<>();
+//        securityContexts.add(
+//                SecurityContext.builder()
+//                        .securityReferences(defaultAuth())
+//                        .operationSelector(o -> o.requestMappingPattern().matches("/.*"))
+//                        .build());
+//        return securityContexts;
+//    }
+//
+//    /**
+//     * 默认的安全上引用
+//     */
+//    private List<SecurityReference> defaultAuth() {
+//        AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything");
+//        AuthorizationScope[] authorizationScopes = new AuthorizationScope[1];
+//        authorizationScopes[0] = authorizationScope;
+//        List<SecurityReference> securityReferences = new ArrayList<>();
+//        securityReferences.add(new SecurityReference("Authorization", authorizationScopes));
+//        return securityReferences;
+//    }
+//
+//    /**
+//     * 添加摘要信息
+//     */
+//    private ApiInfo apiInfo() {
+//        // 用ApiInfoBuilder进行定制
+//        return new ApiInfoBuilder()
+//                // 设置标题
+//                .title("标题:接口文档")
+//                // 描述
+//                .description("描述:用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...")
+//                // 作者信息
+//                .contact(new Contact(projectConfig.getName(), null, null))
+//                // 版本
+//                .version("版本号:" + projectConfig.getVersion())
+//                .build();
+//    }
+//}

+ 2 - 2
project-common/pom.xml

@@ -177,7 +177,7 @@
             <artifactId>javase</artifactId>
         </dependency>-->
         <!-- Swagger3依赖 -->
-        <dependency>
+        <!--<dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-boot-starter</artifactId>
             <exclusions>
@@ -186,7 +186,7 @@
                     <artifactId>swagger-models</artifactId>
                 </exclusion>
             </exclusions>
-        </dependency>
+        </dependency>-->
     </dependencies>
 
 </project>

+ 19 - 21
project-common/src/main/java/com/project/common/core/domain/entity/BaseUser.java

@@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.project.common.annotation.Excel;
 import com.project.common.core.domain.CustomBaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -24,127 +22,127 @@ import java.math.BigDecimal;
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = false)
 @TableName("base_user")
-@ApiModel(value = "base_user实体类")
+
 public class BaseUser extends CustomBaseEntity {
 
     /**
      * 主键id
      */
     @TableId(value = "id")
-    @ApiModelProperty("主键id")
+
     private Long id;
 
     /**
      * 昵称
      */
     @Excel(name = "昵称")
-    @ApiModelProperty("昵称")
+
     private String nickName;
 
     /**
      * 头像
      */
     @Excel(name = "头像")
-    @ApiModelProperty("头像")
+
     private String headImgUrl;
 
     /**
      * 手机号
      */
     @Excel(name = "手机号")
-    @ApiModelProperty("手机号")
+
     private String phone;
 
     /**
      * 登录账号
      */
     @Excel(name = "登录账号")
-    @ApiModelProperty("登录账号")
+
     private String account;
 
     /**
      * 密码
      */
     @Excel(name = "密码")
-    @ApiModelProperty("密码")
+
     private String password;
 
     /**
      * 用户积分
      */
-    @ApiModelProperty("用户当前积分")
+
     private Long points;
     /**
      * 用户积分
      */
-    @ApiModelProperty("用户累计积分")
+
     private Long totalPoints;
 
     /**
      * 用户余额
      */
     @Excel(name = "用户余额")
-    @ApiModelProperty("用户余额")
+
     private BigDecimal balance;
 
     /**
      * 提现中金额
      */
     @Excel(name = "提现中金额")
-    @ApiModelProperty("提现中金额")
+
     private BigDecimal cashBalance;
 
     /**
      * 累计余额
      */
     @Excel(name = "累计余额")
-    @ApiModelProperty("累计余额")
+
     private BigDecimal totalBalance;
 
     /**
      * 经度
      */
     @Excel(name = "经度")
-    @ApiModelProperty("经度")
+
     private String longitude;
 
     /**
      * 纬度
      */
     @Excel(name = "纬度")
-    @ApiModelProperty("纬度")
+
     private String latitude;
 
     /**
      * 经度
      */
     @Excel(name = "最后登录IP")
-    @ApiModelProperty("最后登录IP")
+
     private String loginIp;
 
     /**
      * 纬度
      */
     @Excel(name = "最后登录时间")
-    @ApiModelProperty("最后登录时间")
+
     private String loginDate;
 
     /**
      * 所属街道
      */
     @Excel(name = "所属街道")
-    @ApiModelProperty("所属街道")
+
     private String streetName;
 
     /**
      * 是否是销售  1是 0否
      */
-    @ApiModelProperty("是否是销售  1是 0否")
+
     private Long openSale;
     /**
      * 是否已注销  1是 0否
      */
-    @ApiModelProperty("是否已注销  1是 0否")
+
     private Integer logOff;
 
 }

+ 5 - 7
project-common/src/main/java/com/project/common/core/domain/search/PageKeywordParamVo.java

@@ -1,7 +1,5 @@
 package com.project.common.core.domain.search;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -9,31 +7,31 @@ import lombok.Data;
  *
  * @author
  */
-@ApiModel(value = "分页关键词实体类")
+
 @Data
 public class PageKeywordParamVo {
     /**
      *  分页参数 当前页码
      */
-    @ApiModelProperty("分页参数 当前页码")
+
     private Integer pageNum = 1;
 
     /**
      *  分页参数 单页数量
      */
-    @ApiModelProperty("分页参数 单页数量")
+
     private Integer pageSize = 10;
 
     /**
      *  关键词
      */
-    @ApiModelProperty("关键词")
+
     private String keyword;
 
     /**
      *  分类id
      */
-    @ApiModelProperty("分类id")
+
     private Long categoryId = 0L;
 
 }

+ 3 - 5
project-common/src/main/java/com/project/common/core/domain/search/PageParamVo.java

@@ -1,7 +1,5 @@
 package com.project.common.core.domain.search;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -9,19 +7,19 @@ import lombok.Data;
  *
  * @author
  */
-@ApiModel(value = "分页实体类")
+
 @Data
 public class PageParamVo {
     /**
      *  分页参数 当前页码
      */
-    @ApiModelProperty("分页参数 当前页码")
+
     private Integer pageNum = 1;
 
     /**
      *  分页参数 单页数量
      */
-    @ApiModelProperty("分页参数 单页数量")
+
     private Integer pageSize = 10;
 
 }

+ 6 - 7
project-common/src/main/java/com/project/common/core/domain/search/PagePositionParamVo.java

@@ -1,7 +1,6 @@
 package com.project.common.core.domain.search;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+
 import lombok.Data;
 
 /**
@@ -9,31 +8,31 @@ import lombok.Data;
  *
  * @author
  */
-@ApiModel(value = "定位分页实体类")
+
 @Data
 public class PagePositionParamVo {
     /**
      *  分页参数 当前页码
      */
-    @ApiModelProperty("分页参数 当前页码")
+
     private Integer pageNum = 1;
 
     /**
      *  分页参数 单页数量
      */
-    @ApiModelProperty("分页参数 单页数量")
+
     private Integer pageSize = 10;
 
     /**
      *  经度
      */
-    @ApiModelProperty("经度")
+
     private String longitude;
 
     /**
      *  纬度
      */
-    @ApiModelProperty("纬度")
+
     private String latitude;
 
 }

+ 5 - 7
project-common/src/main/java/com/project/common/core/page/TableDataInfo.java

@@ -1,7 +1,5 @@
 package com.project.common.core.page;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
@@ -18,32 +16,32 @@ import java.util.List;
 @Data
 @NoArgsConstructor
 @Accessors(chain = true)
-@ApiModel("分页响应对象")
+
 public class TableDataInfo<T> implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
      * 总记录数
      */
-    @ApiModelProperty("总记录数")
+
     private long total;
 
     /**
      * 列表数据
      */
-    @ApiModelProperty("列表数据")
+
     private List<T> rows;
 
     /**
      * 消息状态码
      */
-    @ApiModelProperty("消息状态码")
+
     private int code;
 
     /**
      * 消息内容
      */
-    @ApiModelProperty("消息内容")
+
     private String msg;
 
     /**

+ 61 - 0
project-zcustom/src/main/java/com/project/zcustom/controller/car/PlatCarController.java

@@ -0,0 +1,61 @@
+package com.project.zcustom.controller.car;
+
+import com.project.common.core.domain.AjaxResult;
+import com.project.zcustom.service.car.ILargePlatCarService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+public class PlatCarController {
+
+    @Autowired
+    private ILargePlatCarService largePlatCarService;
+
+    /**
+     * 资源台账
+     */
+    @GetMapping("/resource")
+    public AjaxResult getResource(@RequestParam String appOrg) {
+        return AjaxResult.success("查询成功", largePlatCarService.getResource(appOrg));
+    }
+
+    /**
+     * 2025年度公务车车辆明细
+     */
+    @GetMapping("/carDetail")
+    public AjaxResult getCarDetail(@RequestParam String appOrg, @RequestParam Long flag) {
+        return AjaxResult.success("查询成功", largePlatCarService.getCarDetail(appOrg, flag));
+    }
+
+    /**
+     * 监控管理
+     */
+    @GetMapping("/monitor")
+    public AjaxResult getMonitor(@RequestParam String appOrg) {
+        return AjaxResult.success("查询成功", largePlatCarService.getMonitor(appOrg));
+    }
+
+    /**
+     * 公务车预警明细
+     */
+    @GetMapping("/warnDetail")
+    public AjaxResult getWarnDetail(@RequestParam String appOrg) {
+        return AjaxResult.success("查询成功", largePlatCarService.getWarnDetail(appOrg));
+    }
+
+    /**
+     * 运行管理 上
+     */
+    @GetMapping("/operationManageTopHalf")
+    public AjaxResult getOperationManageTopHalf(@RequestParam String appOrg) {
+        return AjaxResult.success("查询成功", largePlatCarService.getOperationManageTopHalf(appOrg));
+    }
+
+    /**
+     * 运行管理 下
+     */
+    @GetMapping("/operationManageLastHalf")
+    public AjaxResult getOperationManageLastHalf(@RequestParam String appOrg) {
+        return AjaxResult.success("查询成功", largePlatCarService.getOperationManageLastHalf(appOrg));
+    }
+}

+ 4 - 6
project-zcustom/src/main/java/com/project/zcustom/controller/service/PlatBasicsController.java

@@ -5,8 +5,6 @@ import com.project.common.core.domain.AjaxResult;
 import com.project.zcustom.service.basics.IPlatBasicsCompanyService;
 import com.project.zcustom.service.basics.IPlatBasicsServerService;
 import com.project.zcustom.service.basics.IPlatBasicsService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -19,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @author change
  * @date 2024-10-21
  */
-@Api(tags = "基础运行数据")
+
 @RestController
 @RequestMapping("/large/basics")
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
@@ -30,20 +28,20 @@ public class PlatBasicsController extends BaseController {
     private final IPlatBasicsServerService platBasicsServerService;
 
 
-    @ApiOperation("数据概况")
+
     @RequestMapping("/getOverviewData")
     public AjaxResult getOverviewData(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", platBasicsService.getOverviewData(appOrg));
     }
 
-    @ApiOperation("获取活跃top10公司")
+
     @RequestMapping("/getTopTenCompany")
     public AjaxResult getTopTenCompany(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", platBasicsCompanyService.getTopTenCompany(appOrg));
     }
 
 
-    @ApiOperation("服务器")
+
     @RequestMapping("/getServerListData")
     public AjaxResult getServerListData(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", platBasicsServerService.selectServerListByAppOrg(appOrg));

+ 10 - 11
project-zcustom/src/main/java/com/project/zcustom/controller/service/PlatEmployeeController.java

@@ -3,13 +3,12 @@ package com.project.zcustom.controller.service;
 import com.project.common.core.controller.BaseController;
 import com.project.common.core.domain.AjaxResult;
 import com.project.zcustom.service.access.IPlatAccessService;
-import com.project.zcustom.service.employee.IPlatEmployeeHealthIllnessService;
 import com.project.zcustom.service.employee.IPlatEmployeeTypeService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 员工概况Controller
@@ -17,7 +16,7 @@ import org.springframework.web.bind.annotation.*;
  * @author change
  * @date 2024-10-21
  */
-@Api(tags = "员工概况")
+
 @RestController
 @RequestMapping("/large/employee")
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
@@ -26,37 +25,37 @@ public class PlatEmployeeController extends BaseController {
     private final IPlatEmployeeTypeService platEmployeeTypeService;
     private final IPlatAccessService iPlatAccessService;
 
-    @ApiOperation("员工类型 饼图")
+
     @RequestMapping("/getEmployeePieData")
     public AjaxResult getEmployeePieData(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", platEmployeeTypeService.getEmployeePieData(appOrg));
     }
 
-    @ApiOperation("入楼情况")
+
     @RequestMapping("/getEnterBuildData")
     public AjaxResult getEnterBuildData(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", platEmployeeTypeService.getEnterBuildData(appOrg));
     }
 
-    @ApiOperation("近一周人流量统计 柱形图")
+
     @RequestMapping("/getPastWeekFlowData" )
     public AjaxResult getPastWeekFlowData(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", platEmployeeTypeService.getChartsFlowData(appOrg));
     }
 
-//    @ApiOperation("员工年龄分布情况 饼图")
+//
 //    @RequestMapping("/getAgePieData")
 //    public AjaxResult getAgePieData(@RequestParam String appOrg) {
 //        return AjaxResult.success("查询成功", platEmployeeTypeService.getAgePieData(appOrg));
 //    }
 
-    @ApiOperation("员工性别情况 柱形图")
+
     @RequestMapping("/getSexChartData")
     public AjaxResult getSexChartData(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", platEmployeeTypeService.getSexChartData(appOrg));
     }
 
-    @ApiOperation("其他数据信息")
+
     @RequestMapping("/getOtherData")
     public AjaxResult getOtherData(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", iPlatAccessService.getOtherData(appOrg));

+ 10 - 9
project-zcustom/src/main/java/com/project/zcustom/controller/service/PlatEmployeeHealthController.java

@@ -2,12 +2,13 @@ package com.project.zcustom.controller.service;
 
 import com.project.common.core.controller.BaseController;
 import com.project.common.core.domain.AjaxResult;
-import com.project.zcustom.service.employee.*;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import com.project.zcustom.service.employee.IPlatEmployeeHealthIllnessService;
+import com.project.zcustom.service.employee.IPlatEmployeeHealthService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 员工概况Controller
@@ -15,7 +16,7 @@ import org.springframework.web.bind.annotation.*;
  * @author change
  * @date 2024-10-21
  */
-@Api(tags = "员工健康")
+
 @RestController
 @RequestMapping("/large/health")
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
@@ -24,13 +25,13 @@ public class PlatEmployeeHealthController extends BaseController {
     private final IPlatEmployeeHealthService platEmployeeHealthService;
     private final IPlatEmployeeHealthIllnessService platEmployeeHealthIllnessService;
 
-    @ApiOperation("健康服务")
+
     @RequestMapping("/getHealthData")
     public AjaxResult getHealthData(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", platEmployeeHealthService.getHealthData(appOrg));
     }
 
-    @ApiOperation("多发疾病排行")
+
     @RequestMapping("/getIllnessChartData")
     public AjaxResult getIllnessChartData(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", platEmployeeHealthIllnessService.getIllnessChartData(appOrg));
@@ -40,13 +41,13 @@ public class PlatEmployeeHealthController extends BaseController {
 
 
 
-//    @ApiOperation("员工健康分布 去除")
+//
 //    @RequestMapping("/getHealthPieData/{appOrg}")
 //    public AjaxResult getHealthPieData(@PathVariable String appOrg) {
 //        return AjaxResult.success("查询成功", platEmployeeHealthService.getHealthPieData(appOrg));
 //    }
 
-//    @ApiOperation("近12月大病发现数量")
+//
 //    @RequestMapping("/getHealthIllnessBrokenData/{appOrg}")
 //    public AjaxResult getHealthIllnessBrokenData(@PathVariable String appOrg) {
 //        return AjaxResult.success("查询成功", platEmployeeHealthChartService.getHealthBrokenData(appOrg,1));

+ 26 - 26
project-zcustom/src/main/java/com/project/zcustom/controller/service/PlatGreenSmartController.java

@@ -1,22 +1,18 @@
 package com.project.zcustom.controller.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.project.common.annotation.Log;
 import com.project.common.core.controller.BaseController;
 import com.project.common.core.domain.AjaxResult;
-import com.project.common.enums.BusinessType;
 import com.project.common.utils.StringUtils;
-import com.project.common.utils.poi.ExcelUtil;
 import com.project.zcustom.domain.smart.PlatGreenSmart;
 import com.project.zcustom.service.smart.*;
-import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 
@@ -38,19 +34,19 @@ public class PlatGreenSmartController extends BaseController {
     private final IPlatGreenSmartSafetyService iPlatGreenSmartSafetyService;
     private final IPlatGreenFoodsService iPlatGreenFoodsService;
 
-    @ApiOperation("食堂概览")
+
     @RequestMapping("/getCanteenData")
     public AjaxResult getCanteenData(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", platGreenSmartService.getCanteenData(appOrg));
     }
 
-    @ApiOperation("食堂安全管理")
+
     @RequestMapping("/getSafetyData")
     public AjaxResult getSafetyData(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", iPlatGreenSmartSafetyService.getSafetyData(appOrg));
     }
 
-    @ApiOperation("获取食堂名称列表")
+
     @RequestMapping("/getCanteenNameList")
     public AjaxResult getCanteenNameList(@RequestParam String appOrg) {
         QueryWrapper<PlatGreenSmart> queryWrapper = new QueryWrapper<>();
@@ -69,91 +65,95 @@ public class PlatGreenSmartController extends BaseController {
         return AjaxResult.success("查询成功", smartList);
     }
 
-    @ApiOperation("食堂服务满意度")
+
     @RequestMapping("/getCanteenScoreData")
     public AjaxResult getCanteenScoreData(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", platGreenSmartService.getCanteenScoreData(appOrg));
     }
 
-//    @ApiOperation("能耗信息")
+//
 //    @RequestMapping("/getPowerData")
 //    public AjaxResult getPowerData(@RequestParam String appOrg) {
 //        return AjaxResult.success("查询成功", iPlatGreenSmartEnergyService.getPowerData(appOrg));
 //    }
 
-//    @ApiOperation("热销菜品排行")
+//
 //    @RequestMapping("/getFoodRankData")
 //    public AjaxResult getFoodRankData(@RequestParam String appOrg) {
 //        return AjaxResult.success("查询成功", iPlatGreenSmartRankService.getRankData(appOrg));
 //    }
 
-    @ApiOperation("各食堂满意度排名")
+    @RequestMapping("/getCanteenStaff")
+    public AjaxResult getCanteenStaff(@RequestParam String appOrg) {
+        return AjaxResult.success("查询成功", platGreenSmartService.getCanteenStaff(appOrg));
+    }
+
     @RequestMapping("/getCanteenDegreeData")
     public AjaxResult getCanteenDegreeData(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", platGreenSmartService.getCanteenDegreeData(appOrg));
     }
 
-//    @ApiOperation("各单位统计排行")
+//
 //    @RequestMapping("/getCanteenTotalRank")
 //    public AjaxResult getCanteenTotalRank(@RequestParam String appOrg) {
 //        return AjaxResult.success("查询成功", platGreenSmartService.getCanteenTotalRank(appOrg));
 //    }
 
-    @ApiOperation("绿智食堂参评食堂情况")
+
     @RequestMapping("/geParticipateData")
     public AjaxResult geParticipateData(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", iPlatGreenSmartOtherService.geParticipateData(appOrg));
     }
 
-    @ApiOperation("就餐情况 饼图")
+
     @RequestMapping("/getDiningPieData")
     public AjaxResult getDiningPieData(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", iPlatGreenSmartOtherService.getDiningPieData(appOrg));
     }
 
-    @ApiOperation("资质证件")
+
     @RequestMapping("/getQualificationData")
     public AjaxResult getLicenceData(@RequestParam String appOrg,@RequestParam String canteenName) {
         return AjaxResult.success("查询成功", platGreenSmartService.getQualificationData(appOrg, canteenName));
     }
 
-    @ApiOperation("智慧食堂")
+
     @RequestMapping("/getSmartCanteenPieData")
     public AjaxResult getSmartCanteenPieData(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", iPlatGreenSmartOtherService.getSmartCanteenPieData(appOrg));
     }
 
-    @ApiOperation("员工服务")
+
     @RequestMapping("/getEmployeePieData")
     public AjaxResult getEmployeePieData(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", iPlatGreenSmartOtherService.getEmployeePieData(appOrg));
     }
 
-    @ApiOperation("菜品信息")
+
     @RequestMapping("/getFoodData")
     public AjaxResult getFoodData(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", iPlatGreenSmartOtherService.getFoodData(appOrg));
     }
 
-    @ApiOperation("其他数据信息")
+
     @RequestMapping("/getOtherData")
     public AjaxResult getOtherData(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", iPlatGreenSmartOtherService.getOtherData(appOrg));
     }
 
-    @ApiOperation("电子餐券")
+
     @RequestMapping("/getElectronicVouchersData")
     public AjaxResult getElectronicVouchersData(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", iPlatGreenSmartOtherService.getElectronicVouchersData(appOrg));
     }
 
-    @ApiOperation("菜谱列表")
+
     @RequestMapping("/getFoodsList")
     public AjaxResult getFoodsList(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", iPlatGreenFoodsService.getPlatGreenFoodsByField("app_org",appOrg));
     }
 
-    @ApiOperation("菜品种类数量")
+
     @RequestMapping("/getFoodsTypeNum")
     public AjaxResult getFoodsTypeNum(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", iPlatGreenFoodsService.getFoodsTypeNum(appOrg));

+ 8 - 16
project-zcustom/src/main/java/com/project/zcustom/controller/service/PlatPostStationController.java

@@ -1,23 +1,15 @@
 package com.project.zcustom.controller.service;
 
-import com.project.common.annotation.Log;
 import com.project.common.core.controller.BaseController;
 import com.project.common.core.domain.AjaxResult;
-import com.project.common.enums.BusinessType;
-import com.project.common.utils.poi.ExcelUtil;
-import com.project.zcustom.domain.post.PlatPostStation;
 import com.project.zcustom.service.access.IPlatAccessService;
 import com.project.zcustom.service.post.IPlatPostStationChartService;
 import com.project.zcustom.service.post.IPlatPostStationService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-import java.util.Arrays;
-import java.util.List;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 物业服务Controller
@@ -25,7 +17,7 @@ import java.util.List;
  * @author change
  * @date 2024-10-21
  */
-@Api(tags = "物业服务")
+
 @RestController
 @RequestMapping("/large/post")
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
@@ -35,25 +27,25 @@ public class PlatPostStationController extends BaseController {
     private final IPlatPostStationChartService iPlatPostStationChartService;
     private final IPlatAccessService iPlatAccessService;
 
-    @ApiOperation("数据概况")
+
     @RequestMapping("/getOverviewData")
     public AjaxResult getOverviewData(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", platPostStationService.getOverviewData(appOrg));
     }
 
-    @ApiOperation("近一个月报修分类占比")
+
     @RequestMapping("/getPastMonthPieData")
     public AjaxResult getPastMonthPieData(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", platPostStationService.getPastMonthPieData(appOrg));
     }
 
-    @ApiOperation("近六个月报修订单分类")
+
     @RequestMapping("/getPastSixMonthChartsData")
     public AjaxResult getPastSixMonthChartsData(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", iPlatPostStationChartService.getPastSixMonthChartsData(appOrg));
     }
 
-    @ApiOperation("近一周车流量统计")
+
     @RequestMapping("/getCarFlowData")
     public AjaxResult getCarFlowData(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", iPlatAccessService.getCarFlowData(appOrg));

+ 7 - 15
project-zcustom/src/main/java/com/project/zcustom/controller/service/PlatPropertyController.java

@@ -1,23 +1,15 @@
 package com.project.zcustom.controller.service;
 
-import com.project.common.annotation.Log;
 import com.project.common.core.controller.BaseController;
 import com.project.common.core.domain.AjaxResult;
-import com.project.common.enums.BusinessType;
-import com.project.common.utils.poi.ExcelUtil;
-import com.project.zcustom.domain.property.PlatProperty;
 import com.project.zcustom.service.property.IPlatPropertyListService;
 import com.project.zcustom.service.property.IPlatPropertyService;
 import com.project.zcustom.service.property.IPlatPropertyToolsService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-import java.util.Arrays;
-import java.util.List;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 共享驿站Controller
@@ -25,7 +17,7 @@ import java.util.List;
  * @author change
  * @date 2024-10-21
  */
-@Api(tags = "共享驿站")
+
 @RestController
 @RequestMapping("/large/property")
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
@@ -35,19 +27,19 @@ public class PlatPropertyController extends BaseController {
     private final IPlatPropertyListService platPropertyListService;
     private final IPlatPropertyToolsService platPropertyToolsService;
 
-    @ApiOperation("建设完成达标率")
+
     @RequestMapping("/getOverviewData")
     public AjaxResult getOverviewData(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", platPropertyService.getOverviewData(appOrg));
     }
 
-    @ApiOperation("单位列表")
+
     @RequestMapping("/getPropertyList")
     public AjaxResult getPropertyList(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", platPropertyListService.selectServerListByAppOrg(appOrg));
     }
 
-    @ApiOperation("健康自测&远程问诊")
+
     @RequestMapping("/getSelfTestAndConsultation")
     public AjaxResult getSelfTestAndConsultation(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", platPropertyToolsService.getToolsChartsList(appOrg));

+ 72 - 0
project-zcustom/src/main/java/com/project/zcustom/controller/unit/LargeCarDetailController.java

@@ -0,0 +1,72 @@
+package com.project.zcustom.controller.unit;
+
+import com.project.common.annotation.Log;
+import com.project.common.core.controller.BaseController;
+import com.project.common.core.domain.AjaxResult;
+import com.project.common.enums.BusinessType;
+import com.project.common.utils.poi.ExcelUtil;
+import com.project.zcustom.domain.addional.LargeCar;
+import com.project.zcustom.domain.addional.LargeCarDetail;
+import com.project.zcustom.service.unit.ILargeCarDetailService;
+import com.project.zcustom.service.unit.ILargePublicCarService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
+
+@RestController
+@RequestMapping("/zcustom/carDetail")
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+public class LargeCarDetailController extends BaseController {
+
+    private final ILargeCarDetailService largeCarDetailService;
+
+    @GetMapping("/list")
+    public AjaxResult list(LargeCarDetail entity) {
+        return AjaxResult.success("查询成功", largeCarDetailService.pagingLargeCarDetailList(entity));
+    }
+
+    @GetMapping("/listAll")
+    public AjaxResult listAll(LargeCarDetail entity) {
+        return AjaxResult.success("查询成功", largeCarDetailService.selectLargeCarDetailList(entity));
+    }
+
+    @Log(title = "公务用车年度增加减少", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, LargeCarDetail entity) {
+        List<LargeCarDetail> list = largeCarDetailService.selectLargeCarDetailList(entity);
+        ExcelUtil<LargeCarDetail> util = new ExcelUtil<>(LargeCarDetail.class);
+        util.exportExcel(response, list, "公务用车年度增加减少数据");
+    }
+
+    @GetMapping(value = "/getInfo/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return AjaxResult.success("查询成功", largeCarDetailService.getById(id));
+    }
+
+    @PreAuthorize("@ss.hasPermi('zcustom:platPublicCarChangeDetail:add')")
+    @Log(title = "公务用车年度增加减少", businessType = BusinessType.INSERT)
+    @PostMapping("add")
+    public AjaxResult add(@RequestBody LargeCarDetail entity) {
+        return toAjax(largeCarDetailService.save(entity));
+    }
+
+    @PreAuthorize("@ss.hasPermi('zcustom:platPublicCarChangeDetail:edit')")
+    @Log(title = "公务用车年度增加减少", businessType = BusinessType.UPDATE)
+    @PostMapping("edit")
+    public AjaxResult edit(@RequestBody LargeCarDetail entity) {
+        return toAjax(largeCarDetailService.updateById(entity));
+    }
+
+    @PreAuthorize("@ss.hasPermi('zcustom:platPublicCarChangeDetail:remove')")
+    @Log(title = "公务用车年度增加减少", businessType = BusinessType.DELETE)
+    @GetMapping("/remove/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(largeCarDetailService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+    }
+}
+

+ 69 - 0
project-zcustom/src/main/java/com/project/zcustom/controller/unit/LargeCarRankController.java

@@ -0,0 +1,69 @@
+package com.project.zcustom.controller.unit;
+
+import com.project.common.annotation.Log;
+import com.project.common.core.controller.BaseController;
+import com.project.common.core.domain.AjaxResult;
+import com.project.common.enums.BusinessType;
+import com.project.common.utils.poi.ExcelUtil;
+import com.project.zcustom.domain.addional.LargeCarRank;
+import com.project.zcustom.service.unit.ILargeCarRankService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
+
+@RestController
+@RequestMapping("/zcustom/carRank")
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+public class LargeCarRankController extends BaseController {
+
+    private final ILargeCarRankService largeCarRankService;
+
+    @GetMapping("/list")
+    public AjaxResult list(LargeCarRank entity) {
+        return AjaxResult.success("查询成功", largeCarRankService.pagingLargeCarRankList(entity));
+    }
+
+    @GetMapping("/listAll")
+    public AjaxResult listAll(LargeCarRank entity) {
+        return AjaxResult.success("查询成功", largeCarRankService.selectLargeCarRankList(entity));
+    }
+
+    @Log(title = "公务用车", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, LargeCarRank entity) {
+        List<LargeCarRank> list = largeCarRankService.selectLargeCarRankList(entity);
+        ExcelUtil<LargeCarRank> util = new ExcelUtil<>(LargeCarRank.class);
+        util.exportExcel(response, list, "公务用车数据");
+    }
+
+    @GetMapping(value = "/getInfo/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return AjaxResult.success("查询成功", largeCarRankService.getById(id));
+    }
+
+    @PreAuthorize("@ss.hasPermi('zcustom:platPublicCarRankPerson:add')")
+    @Log(title = "公务用车", businessType = BusinessType.INSERT)
+    @PostMapping("add")
+    public AjaxResult add(@RequestBody LargeCarRank entity) {
+        return toAjax(largeCarRankService.save(entity));
+    }
+
+    @PreAuthorize("@ss.hasPermi('zcustom:platPublicCarRankPerson:edit')")
+    @Log(title = "公务用车", businessType = BusinessType.UPDATE)
+    @PostMapping("edit")
+    public AjaxResult edit(@RequestBody LargeCarRank entity) {
+        return toAjax(largeCarRankService.updateById(entity));
+    }
+
+    @PreAuthorize("@ss.hasPermi('zcustom:platPublicCarRankPerson:remove')")
+    @Log(title = "公务用车", businessType = BusinessType.DELETE)
+    @GetMapping("/remove/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(largeCarRankService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+    }
+}

+ 58 - 0
project-zcustom/src/main/java/com/project/zcustom/controller/unit/LargePublicCarController.java

@@ -0,0 +1,58 @@
+package com.project.zcustom.controller.unit;
+
+import com.project.common.annotation.Log;
+import com.project.common.core.controller.BaseController;
+import com.project.common.core.domain.AjaxResult;
+import com.project.common.enums.BusinessType;
+import com.project.zcustom.domain.addional.LargeCar;
+import com.project.zcustom.service.unit.ILargePublicCarService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+@RestController
+@RequestMapping("/zcustom/public")
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+public class LargePublicCarController extends BaseController {
+
+    private final ILargePublicCarService largePlatPublicCarService;
+
+    @GetMapping("/list")
+    public AjaxResult list(LargeCar entity) {
+        return AjaxResult.success("查询成功", largePlatPublicCarService.pagingLargeCarList(entity));
+    }
+
+    @GetMapping("/listAll")
+    public AjaxResult listAll(LargeCar entity) {
+        return AjaxResult.success("查询成功", largePlatPublicCarService.selectLargeCarList(entity));
+    }
+
+
+    @GetMapping(value = "/getInfo/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return AjaxResult.success("查询成功", largePlatPublicCarService.getById(id));
+    }
+
+    @PreAuthorize("@ss.hasPermi('zcustom:platPublicCar:add')")
+    @Log(title = "公务用车", businessType = BusinessType.INSERT)
+    @PostMapping("add")
+    public AjaxResult add(@RequestBody LargeCar entity) {
+        return toAjax(largePlatPublicCarService.save(entity));
+    }
+
+    @PreAuthorize("@ss.hasPermi('zcustom:platPublicCar:edit')")
+    @Log(title = "公务用车", businessType = BusinessType.UPDATE)
+    @PostMapping("edit")
+    public AjaxResult edit(@RequestBody LargeCar entity) {
+        return toAjax(largePlatPublicCarService.updateById(entity));
+    }
+
+    @PreAuthorize("@ss.hasPermi('zcustom:platPublicCar:remove')")
+    @Log(title = "公务用车", businessType = BusinessType.DELETE)
+    @GetMapping("/remove/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(largePlatPublicCarService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+    }
+}

+ 69 - 0
project-zcustom/src/main/java/com/project/zcustom/controller/unit/LargeUnitRankController.java

@@ -0,0 +1,69 @@
+package com.project.zcustom.controller.unit;
+
+import com.project.common.annotation.Log;
+import com.project.common.core.controller.BaseController;
+import com.project.common.core.domain.AjaxResult;
+import com.project.common.enums.BusinessType;
+import com.project.common.utils.poi.ExcelUtil;
+import com.project.zcustom.domain.addional.LargeUnitRank;
+import com.project.zcustom.service.unit.ILargeUnitRankService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
+
+@RestController
+@RequestMapping("/zcustom/unitRank")
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+public class LargeUnitRankController extends BaseController {
+
+    private final ILargeUnitRankService largeUnitRankService;
+
+    @GetMapping("/list")
+    public AjaxResult list(LargeUnitRank entity) {
+        return AjaxResult.success("查询成功", largeUnitRankService.pagingLargeUnitRankList(entity));
+    }
+
+    @GetMapping("/listAll")
+    public AjaxResult listAll(LargeUnitRank entity) {
+        return AjaxResult.success("查询成功", largeUnitRankService.selectLargeUnitRankList(entity));
+    }
+
+    @Log(title = "公务用车", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, LargeUnitRank entity) {
+        List<LargeUnitRank> list = largeUnitRankService.selectLargeUnitRankList(entity);
+        ExcelUtil<LargeUnitRank> util = new ExcelUtil<>(LargeUnitRank.class);
+        util.exportExcel(response, list, "公务用车数据");
+    }
+
+    @GetMapping(value = "/getInfo/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return AjaxResult.success("查询成功", largeUnitRankService.getById(id));
+    }
+
+    @PreAuthorize("@ss.hasPermi('zcustom:platPublicCarRankUnit:add')")
+    @Log(title = "公务用车", businessType = BusinessType.INSERT)
+    @PostMapping("add")
+    public AjaxResult add(@RequestBody LargeUnitRank entity) {
+        return toAjax(largeUnitRankService.save(entity));
+    }
+
+    @PreAuthorize("@ss.hasPermi('zcustom:platPublicCarRankUnit:edit')")
+    @Log(title = "公务用车", businessType = BusinessType.UPDATE)
+    @PostMapping("edit")
+    public AjaxResult edit(@RequestBody LargeUnitRank entity) {
+        return toAjax(largeUnitRankService.updateById(entity));
+    }
+
+    @PreAuthorize("@ss.hasPermi('zcustom:platPublicCarRankUnit:remove')")
+    @Log(title = "公务用车", businessType = BusinessType.DELETE)
+    @GetMapping("/remove/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(largeUnitRankService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+    }
+}

+ 69 - 0
project-zcustom/src/main/java/com/project/zcustom/controller/unit/LargeWarnDetailController.java

@@ -0,0 +1,69 @@
+package com.project.zcustom.controller.unit;
+
+import com.project.common.annotation.Log;
+import com.project.common.core.controller.BaseController;
+import com.project.common.core.domain.AjaxResult;
+import com.project.common.enums.BusinessType;
+import com.project.common.utils.poi.ExcelUtil;
+import com.project.zcustom.domain.addional.LargeWarnDetail;
+import com.project.zcustom.service.unit.ILargeWarnDetailService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
+
+@RestController
+@RequestMapping("/zcustom/warnDetail")
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+public class LargeWarnDetailController extends BaseController {
+
+    private final ILargeWarnDetailService largeWarnDetailService;
+
+    @GetMapping("/list")
+    public AjaxResult list(LargeWarnDetail entity) {
+        return AjaxResult.success("查询成功", largeWarnDetailService.pagingLargeWarnDetailList(entity));
+    }
+
+    @GetMapping("/listAll")
+    public AjaxResult listAll(LargeWarnDetail entity) {
+        return AjaxResult.success("查询成功", largeWarnDetailService.selectLargeWarnDetailList(entity));
+    }
+
+    @Log(title = "公务用车预警明细", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, LargeWarnDetail entity) {
+        List<LargeWarnDetail> list = largeWarnDetailService.selectLargeWarnDetailList(entity);
+        ExcelUtil<LargeWarnDetail> util = new ExcelUtil<>(LargeWarnDetail.class);
+        util.exportExcel(response, list, "公务用车预警明细数据");
+    }
+
+    @GetMapping(value = "/getInfo/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return AjaxResult.success("查询成功", largeWarnDetailService.getById(id));
+    }
+
+    @PreAuthorize("@ss.hasPermi('zcustom:platPublicCarWarnDetail:add')")
+    @Log(title = "公务用车预警明细", businessType = BusinessType.INSERT)
+    @PostMapping("add")
+    public AjaxResult add(@RequestBody LargeWarnDetail entity) {
+        return toAjax(largeWarnDetailService.save(entity));
+    }
+
+    @PreAuthorize("@ss.hasPermi('zcustom:platPublicCarWarnDetail:edit')")
+    @Log(title = "公务用车预警明细", businessType = BusinessType.UPDATE)
+    @PostMapping("edit")
+    public AjaxResult edit(@RequestBody LargeWarnDetail entity) {
+        return toAjax(largeWarnDetailService.updateById(entity));
+    }
+
+    @PreAuthorize("@ss.hasPermi('zcustom:platPublicCarWarnDetail:remove')")
+    @Log(title = "公务用车预警明细", businessType = BusinessType.DELETE)
+    @GetMapping("/remove/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(largeWarnDetailService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+    }
+}

+ 4 - 6
project-zcustom/src/main/java/com/project/zcustom/controller/video/PlatVideoController.java

@@ -9,8 +9,6 @@ import com.project.zcustom.service.video.IScreenUnifiedVideoService;
 import com.project.zcustom.service.video.IZnhqWebcamService;
 import com.project.zcustom.tools.ProcessCache;
 import com.project.zcustom.tools.ProcessConstant;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -34,7 +32,7 @@ import java.util.Set;
  * @author change
  * @date 2024-10-21
  */
-@Api(tags = "视频")
+
 @RestController
 @RequestMapping("/large/video")
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
@@ -54,19 +52,19 @@ public class PlatVideoController extends BaseController {
     private final IZnhqWebcamService znhqWebcamService;
     private final IScreenUnifiedVideoService iScreenUnifiedVideoService;
 
-    @ApiOperation("视频流列表 各公司出入口监控 放在各单位监控信息")
+
     @RequestMapping("/monitorList")
     public AjaxResult monitorList(@RequestParam String code) {
         return AjaxResult.success("查询成功", znhqWebcamService.selectVideoList(code));
     }
 
-    @ApiOperation("统一视频(工程现场监控) /psbims_znhq/screenunifiedvideo/list")
+
     @RequestMapping("/videoList")
     public AjaxResult videoList(@RequestParam String code) {
         return AjaxResult.success("查询成功", iScreenUnifiedVideoService.selectVideoList(code));
     }
 
-    @ApiOperation("拉取视频流接口")
+
     //@RequestMapping("/openCamera")
     public AjaxResult openCamera(@RequestParam("videoCode") String videoCode) {
         try {

+ 13 - 15
project-zcustom/src/main/java/com/project/zcustom/domain/access/PlatAccess.java

@@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.project.common.annotation.Excel;
 import com.project.common.core.domain.CustomBaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -22,91 +20,91 @@ import lombok.experimental.Accessors;
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = false)
 @TableName("large_plat_access")
-@ApiModel(value = "large_plat_access实体类")
+
 public class PlatAccess extends CustomBaseEntity {
 
     /**
      * 主键id
      */
     @TableId(value = "id")
-    @ApiModelProperty("主键id")
+
     private Long id;
 
     /**
      * 地区编码
      */
     @Excel(name = "地区编码")
-    @ApiModelProperty("地区编码")
+
     private String appOrg;
 
     /**
      * 车证数量
      */
     @Excel(name = "车证数量")
-    @ApiModelProperty("车证数量")
+
     private Long carLicenseNum;
 
     /**
      * 门禁卡数量
      */
     @Excel(name = "门禁卡数量")
-    @ApiModelProperty("门禁卡数量")
+
     private Long guardCardNum;
 
     /**
      * 黑名单数量
      */
     @Excel(name = "黑名单数量")
-    @ApiModelProperty("黑名单数量")
+
     private Long blackListsNum;
 
     /**
      * 前一天车数量
      */
     @Excel(name = "前一天车数量")
-    @ApiModelProperty("前一天车数量")
+
     private Long beforeCarNum;
 
     /**
      * 前两天车数量
      */
     @Excel(name = "前两天车数量")
-    @ApiModelProperty("前两天车数量")
+
     private Long twoDaysCarNum;
 
     /**
      * 前三天车数量
      */
     @Excel(name = "前三天车数量")
-    @ApiModelProperty("前三天车数量")
+
     private Long threeDaysCarNum;
 
     /**
      * 前四天车数量
      */
     @Excel(name = "前四天车数量")
-    @ApiModelProperty("前四天车数量")
+
     private Long fourDaysCarNum;
 
     /**
      * 前五天车数量
      */
     @Excel(name = "前五天车数量")
-    @ApiModelProperty("前五天车数量")
+
     private Long fiveDaysCarNum;
 
     /**
      * 前六天车数量
      */
     @Excel(name = "前六天车数量")
-    @ApiModelProperty("前六天车数量")
+
     private Long sixDaysCarNum;
 
     /**
      * 前七天车数量
      */
     @Excel(name = "当天车数量")
-    @ApiModelProperty("当天车数量")
+
     private Long intraCarNum;
 
 }

+ 5 - 7
project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargeAssetDirs.java

@@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.project.common.annotation.Excel;
 import com.project.common.core.domain.CustomBaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -15,33 +13,33 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "large_plat_logistics实体小类")
+
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class LargeAssetDirs extends CustomBaseEntity {
     /**
      * id
      */
     @TableId(value = "id")
-    @ApiModelProperty("id")
+
     private Long id;
 
     /**
      * 地区编码(后勤资产)
      */
     @Excel(name = "地区编码")
-    @ApiModelProperty("地区编码(后勤资产)")
+
     private String appCode;
 
     /**
      * 小类名称
      */
-    @ApiModelProperty("小类名称")
+
     private String categoryName;
 
     /**
      * 小类资产数量
      */
-    @ApiModelProperty("小类资产数量")
+
     private Long assetNum;
 
 }

+ 2 - 4
project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargeBuilding.java

@@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.project.common.core.domain.CustomBaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -16,14 +14,14 @@ import lombok.experimental.Accessors;
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = false)
 @TableName("large_plat_building")
-@ApiModel(value = "large_plat_building实体类")
+
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class LargeBuilding extends CustomBaseEntity {
     /**
      * 楼宇数据id
      */
     @TableId(value = "楼宇数据id")
-    @ApiModelProperty("楼宇数据id")
+
     private Long id;
 
     private String jsonFrequency;

+ 18 - 20
project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargeBuildingControl.java

@@ -3,8 +3,6 @@ package com.project.zcustom.domain.addional;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -15,110 +13,110 @@ import lombok.experimental.Accessors;
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = false)
 @TableName("large_plat_building_control")
-@ApiModel(value = "large_plat_building_control实体类")
+
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class LargeBuildingControl {
     /**
      * id
      */
     @TableId(value = "id")
-    @ApiModelProperty("id")
+
     private Long id;
 
     /**
      * 分类用电初始化数据json(楼宇本周用电量)
      */
-    @ApiModelProperty("分类用电初始化数据json(楼宇本周用电量)")
+
     private String weekElectricity;
 
     /**
      * 机房总用电量二级分类json(楼宇本周用电量)
      */
-    @ApiModelProperty("机房总用电量二级分类json(楼宇本周用电量)")
+
     private String roomElectricity;
 
     /**
      * 楼宇今日用电量json
      */
-    @ApiModelProperty("楼宇今日用电量json")
+
     private String todayElectricity;
 
     /**
      * 楼宇每月用电量json (配电室1)
      */
-    @ApiModelProperty("楼宇每月用电量json (配电室1)")
+
     private String monthElectricityOne;
 
     /**
      * 楼宇每月用电量json (配电室2)
      */
-    @ApiModelProperty("楼宇每月用电量json (配电室2)")
+
     private String monthElectricityTwo;
 
     /**
      * 楼宇每月用电量json (配电室3)
      */
-    @ApiModelProperty("楼宇每月用电量json (配电室3)")
+
     private String monthElectricityThree;
 
     /**
      * 配电室重要回路负荷情况json (配电室1)
      */
-    @ApiModelProperty("配电室重要回路负荷情况json (配电室1)")
+
     private String roomLoadOne;
 
     /**
      * 配电室重要回路负荷情况json (配电室2)
      */
-    @ApiModelProperty("配电室重要回路负荷情况json (配电室2)")
+
     private String roomLoadTwo;
 
     /**
      * 配电室重要回路负荷情况json (配电室3)
      */
-    @ApiModelProperty("配电室重要回路负荷情况json (配电室3)")
+
     private String roomLoadThree;
 
     /**
      * 楼宇中当前告警的设备json
      */
-    @ApiModelProperty("楼宇中当前告警的设备json")
+
     private String warnDevice;
 
     /**
      * 空调水浸总数
      */
-    @ApiModelProperty("空调水浸总数")
+
     private Long waterDeviceAirNum;
 
     /**
      * 中控水浸正常数
      */
-    @ApiModelProperty("中控水浸正常数")
+
     private Long waterControlNormalNum;
 
     /**
      * 中控水浸异常数
      */
-    @ApiModelProperty("中控水浸异常数")
+
     private Long waterControlAbnormalNum;
 
     /**
      * 告警事件的历史统计json
      */
-    @ApiModelProperty("告警事件的历史统计json")
+
     private String warnEventStatistics;
 
     /**
      * 水箱水位情况json(23层)
      */
-    @ApiModelProperty("水箱水位情况json(23层)")
+
     private String waterStateOne;
 
     /**
      * 水箱水位情况json(-2层)
      */
-    @ApiModelProperty("水箱水位情况json(-2层)")
+
     private String waterStateTwo;
 
 

+ 11 - 13
project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargeCamera.java

@@ -1,16 +1,14 @@
 package com.project.zcustom.domain.addional;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.project.common.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.project.common.annotation.Excel;
 import com.project.common.core.domain.CustomBaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 /**
  * 摄像头对象 large_plat_camera
@@ -23,7 +21,7 @@ import io.swagger.annotations.ApiModelProperty;
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = false)
 @TableName("large_plat_camera")
-@ApiModel(value = "large_plat_camera实体类")
+
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class LargeCamera extends CustomBaseEntity {
 
@@ -31,56 +29,56 @@ public class LargeCamera extends CustomBaseEntity {
      * 摄像头id
      */
     @TableId(value = "id")
-    @ApiModelProperty("摄像头id")
+
     private Long id;
 
     /**
      * 摄像头名称
      */
     @Excel(name = "摄像头名称")
-    @ApiModelProperty("摄像头名称")
+
     private String cameraName;
 
     /**
      * 摄像头编码
      */
     @Excel(name = "摄像头编码")
-    @ApiModelProperty("摄像头编码")
+
     private String cameraCode;
 
     /**
      * 所属项目id
      */
     @Excel(name = "所属项目id")
-    @ApiModelProperty("所属项目id")
+
     private Long projectId;
 
     /**
      * 摄像头类型(0代表'',1代表'', 2代表'')
      */
     @Excel(name = "摄像头类型", readConverterExp = "0=代表'',1代表'',,2=代表''")
-    @ApiModelProperty("摄像头类型(0代表'',1代表'', 2代表'')")
+
     private String type;
 
     /**
      * 摄像头状态(0代表启用  2代表禁用)
      */
     @Excel(name = "摄像头状态", readConverterExp = "0=代表启用,2=代表禁用")
-    @ApiModelProperty("摄像头状态(0代表启用  2代表禁用)")
+
     private String status;
 
     /**
      * 在线标志(0代表在线 2代表不在线)
      */
     @Excel(name = "在线标志", readConverterExp = "0=代表在线,2=代表不在线")
-    @ApiModelProperty("在线标志(0代表在线 2代表不在线)")
+
     private String onlineFlag;
 
     /**
      * 接入标志(0代表接入 2代表未接入)
      */
     @Excel(name = "接入标志", readConverterExp = "0=代表接入,2=代表未接入")
-    @ApiModelProperty("接入标志(0代表接入 2代表未接入)")
+
     private String connectFlag;
 
 }

+ 196 - 0
project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargeCar.java

@@ -0,0 +1,196 @@
+package com.project.zcustom.domain.addional;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.project.common.annotation.Excel;
+import com.project.common.core.domain.CustomBaseEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@TableName("large_plat_public_car")
+public class LargeCar extends CustomBaseEntity {
+
+    /**
+     * 所属单位
+     */
+    @Excel(name = "所属单位")
+
+    private String appEncode;
+
+    /**
+     * 公务车实有总数
+     */
+    @Excel(name = "公务车实有总数")
+
+    private Long totalCarNum;
+
+    /**
+     * 商务车数量
+     */
+    @Excel(name = "商务车数量")
+
+    private Long carNumOne;
+
+    /**
+     * 越野车数量
+     */
+    @Excel(name = "越野车数量")
+
+    private Long carNumTwo;
+
+    /**
+     * 小轿车数量
+     */
+    @Excel(name = "小轿车数量")
+
+    private Long carNumThree;
+
+    /**
+     * 小型客车数量
+     */
+    @Excel(name = "小型客车数量")
+
+    private Long carNumFour;
+
+    /**
+     * 大型客车数量
+     */
+    @Excel(name = "大型客车数量")
+
+    private Long carNumFive;
+
+    /**
+     * 企业用车数量
+     */
+    @Excel(name = "企业用车数量")
+
+    private Long enterpriseCarNum;
+
+    /**
+     * 企业负责人用车数量
+     */
+    @Excel(name = "企业负责人用车数量")
+
+    private Long headCarNum;
+
+    /**
+     * 燃油车数量
+     */
+    @Excel(name = "燃油车数量")
+
+    private Long oilCarNum;
+
+    /**
+     * 新能源车数量
+     */
+    @Excel(name = "新能源车数量")
+
+    private Long newPowerCarNum;
+
+    /**
+     * 公务车缺编率
+     */
+    @Excel(name = "公务车缺编率")
+
+    private BigDecimal lackRate;
+
+    /**
+     * 公务车占编率
+     */
+    @Excel(name = "公务车占编率")
+
+    private BigDecimal possesRate;
+
+    /**
+     * 公务车编制数
+     */
+    @Excel(name = "公务车编制数")
+
+    private Long establishmentsCarNum;
+
+    /**
+     * 公务车年度增加数
+     */
+    @Excel(name = "公务车年度增加数")
+
+    private Long yearAddNum;
+
+    /**
+     * 公务车年度减少数
+     */
+    @Excel(name = "公务车年度减少数")
+
+    private Long yearReduceNum;
+
+    /**
+     * 公务车终端安装率
+     */
+    @Excel(name = "公务车终端安装率")
+
+    private BigDecimal terminalInstallRate;
+
+    /**
+     * 公务车终端在线率
+     */
+    @Excel(name = "公务车终端在线率")
+
+    private BigDecimal terminalOnlineRate;
+
+    /**
+     * 处置未归档数量
+     */
+    @Excel(name = "处置未归档数量")
+
+    private Long notArchivedNum;
+
+    /**
+     * 未带工单数
+     */
+    @Excel(name = "未带工单数")
+
+    private Long noPidNum;
+
+    /**
+     * 超速预警数
+     */
+    @Excel(name = "超速预警数")
+
+    private Long overSpeedNum;
+
+    /**
+     * 节假日预警数
+     */
+    @Excel(name = "节假日预警数")
+
+    private Long holidayNum;
+
+    /**
+     * 派车单总数
+     */
+    @Excel(name = "派车单总数")
+
+    private String pcdNum;
+
+    /**
+     * 均车派车单数
+     */
+    @Excel(name = "均车派车单数")
+
+    private String avgPcdNum;
+
+    /**
+     * 公务车行驶总里程
+     */
+    @Excel(name = "公务车行驶总里程")
+
+    private String mileCount;
+
+    /**
+     * 均车里程
+     */
+    @Excel(name = "均车里程")
+
+    private String avgMile;
+}

+ 74 - 0
project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargeCarDetail.java

@@ -0,0 +1,74 @@
+package com.project.zcustom.domain.addional;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.project.common.annotation.Excel;
+import com.project.common.core.domain.CustomBaseEntity;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class LargeCarDetail extends CustomBaseEntity {
+    /**
+     * 单位名称
+     */
+    private String appName;
+
+    /**
+     * 所属单位编码
+     */
+    @Excel(name = "所属单位")
+
+    private String appEncode;
+
+    /**
+     * 车牌号
+     */
+    @Excel(name = "车牌号")
+
+    private Integer vehicleNum;
+
+    /**
+     * 车辆用途
+     */
+    @Excel(name = "车辆用途")
+
+    private String useProperty;
+
+    /**
+     * 资产卡号
+     */
+    @Excel(name = "资产卡号")
+
+    private String assetsCard;
+
+    /**
+     * 配置日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "配置日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+
+    private Date orgDate;
+
+    /**
+     * 处置日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "处置日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+
+    private Date handleDate;
+
+    /**
+     * 处置原因
+     */
+    @Excel(name = "处置原因")
+
+    private String handleReason;
+
+    /**
+     * 类别(0:增加; 1:减少)
+     */
+    @Excel(name = "类别", readConverterExp = "0=:增加;,1=:减少")
+
+    private Integer flag;
+}

+ 36 - 0
project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargeCarRank.java

@@ -0,0 +1,36 @@
+package com.project.zcustom.domain.addional;
+
+import com.project.common.annotation.Excel;
+import com.project.common.core.domain.CustomBaseEntity;
+import lombok.Data;
+
+@Data
+public class LargeCarRank extends CustomBaseEntity {
+
+    /**
+     * 单位名称
+     */
+    private String appName;
+
+    /**
+     * 派车单总数
+     */
+    @Excel(name = "派车单总数")
+
+    private Long pcdCount;
+
+    /**
+     * 车牌号
+     */
+    @Excel(name = "车牌号")
+
+    private String vechileNum;
+
+    /**
+     * 单位编码
+     */
+    @Excel(name = "单位编码")
+
+    private String appEncode;
+
+}

+ 8 - 11
project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargeHousingLand.java

@@ -5,10 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.project.common.annotation.Excel;
 import com.project.common.core.domain.CustomBaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -22,7 +19,7 @@ import java.util.Date;
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = false)
 @TableName("large_plat_housing_land")
-@ApiModel(value = "large_plat_housing_land实体类")
+
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class LargeHousingLand extends CustomBaseEntity {
 
@@ -30,28 +27,28 @@ public class LargeHousingLand extends CustomBaseEntity {
      * id
      */
     @TableId(value = "id")
-    @ApiModelProperty("id")
+
     private Long id;
 
     /**
      * 房产名称
      */
 
-    @ApiModelProperty("房产名称")
+
     private String housing;
 
     /**
      * 房产面积
      */
 
-    @ApiModelProperty("房产面积")
+
     private BigDecimal acreage;
 
     /**
      * 房产类型
      */
 
-    @ApiModelProperty("房产类型")
+
     private Long type;
 
     /**
@@ -59,21 +56,21 @@ public class LargeHousingLand extends CustomBaseEntity {
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 
-    @ApiModelProperty("施工时间")
+
     private Date constructionTime;
 
     /**
      * 是否拥有所有权(0否;1是)
      */
 
-    @ApiModelProperty("是否拥有所有权(0否;1是)")
+
     private Integer ownershipFlag;
 
     /**
      * 是否为投资计划(0否;1是)
      */
 
-    @ApiModelProperty("是否为投资计划(0否;1是)")
+
     private Integer investmentPlanFlag;
 
     @TableField(exist = false)

+ 9 - 11
project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargeIssue.java

@@ -1,16 +1,14 @@
 package com.project.zcustom.domain.addional;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.project.common.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.project.common.annotation.Excel;
 import com.project.common.core.domain.CustomBaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 /**
  * 上报问题对象 large_plat_issue
@@ -23,7 +21,7 @@ import io.swagger.annotations.ApiModelProperty;
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = false)
 @TableName("large_plat_issue")
-@ApiModel(value = "large_plat_issue实体类")
+
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class LargeIssue extends CustomBaseEntity {
 
@@ -31,33 +29,33 @@ public class LargeIssue extends CustomBaseEntity {
      * 问题id
      */
     @TableId(value = "id")
-    @ApiModelProperty("问题id")
+
     private Long id;
 
     /**
      * 问题标题
      */
-    @ApiModelProperty("问题标题")
+
     private String title;
 
     /**
      * 问题描述
      */
     @Excel(name = "问题描述")
-    @ApiModelProperty("问题描述")
+
     private String description;
 
     /**
      * 整改要求
      */
-    @ApiModelProperty("整改要求")
+
     private String need;
 
     /**
      * 所属项目id
      */
     @Excel(name = "所属项目id")
-    @ApiModelProperty("所属项目id")
+
     private Integer projectId;
 
     private String projectName;
@@ -66,7 +64,7 @@ public class LargeIssue extends CustomBaseEntity {
      * 问题状态(0代表已解决  2代表待解决)
      */
     @Excel(name = "问题状态", readConverterExp = "0=代表已解决,2=代表待解决")
-    @ApiModelProperty("问题状态(0代表已解决  2代表待解决)")
+
     private String status;
 
 }

+ 25 - 27
project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargeLogistics.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.project.common.annotation.Excel;
 import com.project.common.core.domain.CustomBaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -26,7 +24,7 @@ import java.util.List;
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = false)
 @TableName("large_plat_logistics")
-@ApiModel(value = "large_plat_logistics实体类")
+
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class LargeLogistics extends CustomBaseEntity {
 
@@ -34,131 +32,131 @@ public class LargeLogistics extends CustomBaseEntity {
      * id
      */
     @TableId(value = "id")
-    @ApiModelProperty("id")
+
     private Long id;
 
     /**
      * 地区编码(后勤资产)
      */
-    @ApiModelProperty("地区编码(后勤资产)")
+
     private String orgId;
 
     /**
      * 地区名称(后勤资产)
      */
-    @ApiModelProperty("地区编码(后勤资产)")
+
     private String appName;
 
     /**
      * 父地区编码(后勤资产)
      */
     @Excel(name = "父地区编码")
-    @ApiModelProperty("父地区编码(后勤资产)")
+
     private String parentOrgId;
 
     /**
      * 已赋码台账数
      */
     @Excel(name = "已赋码台账数")
-    @ApiModelProperty("已赋码台账数")
+
     private Long codedNum;
 
     /**
      * 已贴签台账数
      */
     @Excel(name = "已贴签台账数")
-    @ApiModelProperty("已贴签台账数")
+
     private Long labelNum;
 
     /**
      * 台账总数
      */
     @Excel(name = "台账总数")
-    @ApiModelProperty("台账总数")
+
     private Long assetNum;
 
     /**
      * 办公资产数
      */
     @Excel(name = "办公资产数")
-    @ApiModelProperty("办公资产数")
+
     private Long officeAssetNum;
 
     /**
      * 存量办公资产数
      */
     @Excel(name = "存量办公资产数")
-    @ApiModelProperty("存量办公资产数")
+
     private Long stockOfficeAssetNum;
 
     /**
      * 新增办公资产数
      */
     @Excel(name = "新增办公资产数")
-    @ApiModelProperty("新增办公资产数")
+
     private Long newOfficeAssetNum;
 
     /**
      * 报废办公资产数
      */
     @Excel(name = "报废办公资产数")
-    @ApiModelProperty("报废办公资产数")
+
     private Long scrapOfficeAssetNum;
 
     /**
      * 楼宇设备数
      */
     @Excel(name = "楼宇设备数")
-    @ApiModelProperty("楼宇设备数")
+
     private Long buildingAssetNum;
 
     /**
      * 存量楼宇设备数
      */
     @Excel(name = "存量楼宇设备数")
-    @ApiModelProperty("存量楼宇设备数")
+
     private Long stockBuildingAssetNum;
 
     /**
      * 新增楼宇设备数
      */
     @Excel(name = "新增楼宇设备数")
-    @ApiModelProperty("新增楼宇设备数")
+
     private Long newBuildingAssetNum;
 
     /**
      * 报废楼宇设备数
      */
     @Excel(name = "报废楼宇设备数")
-    @ApiModelProperty("报废楼宇设备数")
+
     private Long scrapBuildingAssetNum;
 
     /**
      * 服务设备数
      */
     @Excel(name = "服务设备数")
-    @ApiModelProperty("服务设备数")
+
     private Long serviceAssetNum;
 
     /**
      * 存量服务设备数
      */
     @Excel(name = "存量服务设备数")
-    @ApiModelProperty("存量服务设备数")
+
     private Long stockServiceAssetNum;
 
     /**
      * 新增服务设备数
      */
     @Excel(name = "新增服务设备数")
-    @ApiModelProperty("新增服务设备数")
+
     private Long newServiceAssetNum;
 
     /**
      * 报废服务设备数
      */
     @Excel(name = "报废服务设备数")
-    @ApiModelProperty("报废服务设备数")
+
     private Long scrapServiceAssetNum;
 
     /**
@@ -190,31 +188,31 @@ public class LargeLogistics extends CustomBaseEntity {
      * 检修记录数
      */
     @Excel(name = "检修记录数")
-    @ApiModelProperty("检修记录数")
+
     private Long repairRecordNum;
 
     /**
      * 维保记录数
      */
     @Excel(name = "维保记录数")
-    @ApiModelProperty("维保记录数")
+
     private Long maintenanceRecordNum;
 
     /**
      * 办公资产分布列表
      */
-    @ApiModelProperty("办公资产分布列表")
+
     private List<LargeAssetDirs> officeAssetList;
 
     /**
      * 楼宇设备分布列表
      */
-    @ApiModelProperty("楼宇设备分布列表")
+
     private List<LargeAssetDirs> buildingAssetList;
 
     /**
      * 服务设备分布列表
      */
-    @ApiModelProperty("服务设备分布列表")
+
     private List<LargeAssetDirs> serviceAssetList;
 }

+ 12 - 14
project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargePlan.java

@@ -1,20 +1,18 @@
 package com.project.zcustom.domain.addional;
 
-import java.util.Date;
-
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.project.common.annotation.Excel;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.project.common.core.domain.CustomBaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
 
 /**
  * 工程计划对象 large_plat_plan
@@ -27,7 +25,7 @@ import io.swagger.annotations.ApiModelProperty;
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = false)
 @TableName("large_plat_plan")
-@ApiModel(value = "large_plat_plan实体类")
+
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class LargePlan extends CustomBaseEntity {
 
@@ -35,35 +33,35 @@ public class LargePlan extends CustomBaseEntity {
      * 计划id
      */
     @TableId(value = "id")
-    @ApiModelProperty("计划id")
+
     private Long id;
 
     /**
      * 所属项目id
      */
     @Excel(name = "所属项目id")
-    @ApiModelProperty("所属项目id")
+
     private Long projectId;
 
     /**
      * 计划类型(0 检查   1施工)
      */
     @Excel(name = "计划类型", readConverterExp = "0=,检=查,1=施工")
-    @ApiModelProperty("计划类型(0 检查   1施工)")
+
     private String type;
 
     /**
      * 负责人
      */
     @Excel(name = "负责人")
-    @ApiModelProperty("负责人")
+
     private String head;
 
     /**
      * 具体内容
      */
     @Excel(name = "具体内容")
-    @ApiModelProperty("具体内容")
+
     private String content;
 
     /**
@@ -71,7 +69,7 @@ public class LargePlan extends CustomBaseEntity {
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "开始日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty("开始日期")
+
     private Date startTime;
 
     /**
@@ -79,7 +77,7 @@ public class LargePlan extends CustomBaseEntity {
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "结束日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty("结束日期")
+
     private Date endTime;
 
     @TableField(exist = false)

+ 10 - 12
project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargeProject.java

@@ -1,17 +1,15 @@
 package com.project.zcustom.domain.addional;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.project.common.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.project.common.annotation.Excel;
 import com.project.common.core.domain.CustomBaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.math.BigDecimal;
 
@@ -26,7 +24,7 @@ import java.math.BigDecimal;
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = false)
 @TableName("large_plat_project")
-@ApiModel(value = "large_plat_project实体类")
+
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class LargeProject extends CustomBaseEntity {
 
@@ -34,33 +32,33 @@ public class LargeProject extends CustomBaseEntity {
      * 项目id
      */
     @TableId(value = "id")
-    @ApiModelProperty("项目id")
+
     private Long id;
 
     /**
      * 项目名称
      */
     @Excel(name = "项目名称")
-    @ApiModelProperty("项目名称")
+
     private String projectName;
 
     /**
      * 横坐标
      */
-    @ApiModelProperty("横坐标")
+
     private BigDecimal abscissa;
 
     /**
      * 纵坐标
      */
-    @ApiModelProperty("纵坐标")
+
     private BigDecimal ordinate;
 
     /**
      * 所属单位编码
      */
     @Excel(name = "所属单位编码")
-    @ApiModelProperty("所属单位编码")
+
     private String appOrg;
 
     /**
@@ -73,14 +71,14 @@ public class LargeProject extends CustomBaseEntity {
      * 项目类型
      */
     @Excel(name = "项目类型")
-    @ApiModelProperty("项目类型")
+
     private String type;
 
     /**
      * 接入标志(0代表接入 2代表未接入)
      */
     @Excel(name = "接入标志", readConverterExp = "0=代表接入,2=代表未接入")
-    @ApiModelProperty("接入标志(0代表接入 2代表未接入)")
+
     private String connectFlag;
 
     @TableField(exist = false)

+ 37 - 0
project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargeUnitRank.java

@@ -0,0 +1,37 @@
+package com.project.zcustom.domain.addional;
+
+import com.project.common.annotation.Excel;
+import com.project.common.core.domain.CustomBaseEntity;
+import lombok.Data;
+
+@Data
+public class LargeUnitRank extends CustomBaseEntity {
+
+    /**
+     * 单位名称
+     */
+    private String appName;
+
+
+    /**
+     * 单位编码
+     */
+    @Excel(name = "单位编码")
+
+    private String appEncode;
+
+
+    /**
+     * 公务车总数
+     */
+    @Excel(name = "公务车总数")
+
+    private Long gwcCount;
+
+    /**
+     * 公务车派车次数
+     */
+    @Excel(name = "公务车派车次数")
+
+    private Long gwcPcd;
+}

+ 49 - 0
project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargeWarnDetail.java

@@ -0,0 +1,49 @@
+package com.project.zcustom.domain.addional;
+
+import com.project.common.annotation.Excel;
+import com.project.common.core.domain.CustomBaseEntity;
+import lombok.Data;
+
+@Data
+public class LargeWarnDetail extends CustomBaseEntity {
+    /**
+     * 单位名称
+     */
+    private String appName;
+
+    /**
+     * 所属单位编码
+     */
+    @Excel(name = "所属单位")
+
+    private String appEncode;
+
+    /**
+     * 车牌号
+     */
+    @Excel(name = "车牌号")
+
+    private Integer vehicleNum;
+
+    /**
+     * 预警类型
+     */
+    @Excel(name = "预警类型")
+
+    private Integer alertType;
+
+    /**
+     * 预警开始时间
+     */
+    @Excel(name = "预警开始时间")
+
+    private Long startTime;
+
+    /**
+     * 预警结束时间
+     */
+    @Excel(name = "预警结束时间")
+
+    private Integer endTime;
+
+}

+ 6 - 8
project-zcustom/src/main/java/com/project/zcustom/domain/basics/PlatAppOrg.java

@@ -10,8 +10,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.util.List;
 
@@ -26,7 +24,7 @@ import java.util.List;
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = false)
 @TableName("large_plat_app_org")
-@ApiModel(value = "large_plat_app_org实体类")
+
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class PlatAppOrg extends CustomBaseEntity {
 
@@ -34,13 +32,13 @@ public class PlatAppOrg extends CustomBaseEntity {
      * 主键id
      */
     @TableId(value = "id")
-    @ApiModelProperty("主键id")
+
     private Long id;
 
     /**
      * 地区编码
      */
-    @ApiModelProperty("地区编码")
+
     private String appOrg;
 
     /**
@@ -56,19 +54,19 @@ public class PlatAppOrg extends CustomBaseEntity {
     /**
      * 父地区编码
      */
-    @ApiModelProperty("父地区编码")
+
     private String appParentOrg;
 
     /**
      * 地区名称
      */
-    @ApiModelProperty("地区名称")
+
     private String appName;
 
     /**
      * 接入标志
      */
-    @ApiModelProperty("接入标志")
+
     private String connectFlag;
 
     @TableField(exist = false)

+ 12 - 14
project-zcustom/src/main/java/com/project/zcustom/domain/basics/PlatBasics.java

@@ -1,18 +1,16 @@
 package com.project.zcustom.domain.basics;
 
-import java.math.BigDecimal;
-
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.project.common.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.project.common.annotation.Excel;
 import com.project.common.core.domain.CustomBaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
 
 /**
  * 基础运行数据对象 plat_basics
@@ -25,56 +23,56 @@ import io.swagger.annotations.ApiModelProperty;
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = false)
 @TableName("large_plat_basics")
-@ApiModel(value = "large_plat_basics实体类")
+
 public class PlatBasics extends CustomBaseEntity {
 
     /**
      * 主键id
      */
     @TableId(value = "id")
-    @ApiModelProperty("主键id")
+
     private Long id;
 
     /**
      * 地区编码
      */
     @Excel(name = "地区编码")
-    @ApiModelProperty("地区编码")
+
     private String appOrg;
 
     /**
      * 基础运行数据--注册用户数
      */
     @Excel(name = "基础运行数据--注册用户数")
-    @ApiModelProperty("基础运行数据--注册用户数")
+
     private Long registerNum;
 
     /**
      * 基础运行数据--订单数量
      */
     @Excel(name = "基础运行数据--订单数量")
-    @ApiModelProperty("基础运行数据--订单数量")
+
     private Long orderNum;
 
     /**
      * 系统运行报警信息--cpu过载
      */
     @Excel(name = "系统运行报警信息--cpu过载")
-    @ApiModelProperty("系统运行报警信息--cpu过载")
+
     private Long cpuOverloadNum;
 
     /**
      * 系统运行报警信息--磁盘过载
      */
     @Excel(name = "系统运行报警信息--磁盘过载")
-    @ApiModelProperty("系统运行报警信息--磁盘过载")
+
     private Long diskOverloadNum;
 
     /**
      * 系统运行报警信息--内存过载
      */
     @Excel(name = "系统运行报警信息--内存过载")
-    @ApiModelProperty("系统运行报警信息--内存过载")
+
     private Long memoryOverloadNum;
 
     /**
@@ -87,7 +85,7 @@ public class PlatBasics extends CustomBaseEntity {
      * 系统运行报警信息--流量不足
      */
     @Excel(name = "系统运行报警信息--流量不足")
-    @ApiModelProperty("系统运行报警信息--流量不足")
+
     private Long insufficientNum;
 
 }

+ 6 - 8
project-zcustom/src/main/java/com/project/zcustom/domain/basics/PlatBasicsCompany.java

@@ -1,15 +1,13 @@
 package com.project.zcustom.domain.basics;
 
-import com.project.common.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.project.common.annotation.Excel;
 import com.project.common.core.domain.CustomBaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 /**
  * 公司活跃人数对象 plat_basics_company
@@ -22,35 +20,35 @@ import io.swagger.annotations.ApiModelProperty;
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = false)
 @TableName("large_plat_basics_company")
-@ApiModel(value = "large_plat_basics_company实体类")
+
 public class PlatBasicsCompany extends CustomBaseEntity {
 
     /**
      * 主键id
      */
     @TableId(value = "id")
-    @ApiModelProperty("主键id")
+
     private Long id;
 
     /**
      * 地区编码
      */
     @Excel(name = "地区编码")
-    @ApiModelProperty("地区编码")
+
     private String appOrg;
 
     /**
      * 公司名称
      */
     @Excel(name = "公司名称")
-    @ApiModelProperty("公司名称")
+
     private String companyName;
 
     /**
      * 活跃人数
      */
     @Excel(name = "活跃人数")
-    @ApiModelProperty("活跃人数")
+
     private Long activeUserNum;
 
 }

+ 6 - 8
project-zcustom/src/main/java/com/project/zcustom/domain/basics/PlatBasicsServer.java

@@ -1,15 +1,13 @@
 package com.project.zcustom.domain.basics;
 
-import com.project.common.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.project.common.annotation.Excel;
 import com.project.common.core.domain.CustomBaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 /**
  * 服务信息对象 plat_basics_server
@@ -22,35 +20,35 @@ import io.swagger.annotations.ApiModelProperty;
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = false)
 @TableName("large_plat_basics_server")
-@ApiModel(value = "large_plat_basics_server实体类")
+
 public class PlatBasicsServer extends CustomBaseEntity {
 
     /**
      * 主键id
      */
     @TableId(value = "id")
-    @ApiModelProperty("主键id")
+
     private Long id;
 
     /**
      * 地区编码
      */
     @Excel(name = "地区编码")
-    @ApiModelProperty("地区编码")
+
     private String appOrg;
 
     /**
      * 服务器名称
      */
     @Excel(name = "服务器名称")
-    @ApiModelProperty("服务器名称")
+
     private String serverName;
 
     /**
      * 服务器数量
      */
     @Excel(name = "服务器数量")
-    @ApiModelProperty("服务器数量")
+
     private Long serverNum;
 
 }

+ 9 - 11
project-zcustom/src/main/java/com/project/zcustom/domain/basics/PlatBasicsSystem.java

@@ -1,15 +1,13 @@
 package com.project.zcustom.domain.basics;
 
-import com.project.common.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.project.common.annotation.Excel;
 import com.project.common.core.domain.CustomBaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 /**
  * 系统运行峰值情况分析对象 plat_basics_system
@@ -22,56 +20,56 @@ import io.swagger.annotations.ApiModelProperty;
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = false)
 @TableName("large_plat_basics_system")
-@ApiModel(value = "large_plat_basics_system实体类")
+
 public class PlatBasicsSystem extends CustomBaseEntity {
 
     /**
      * 主键id
      */
     @TableId(value = "id")
-    @ApiModelProperty("主键id")
+
     private Long id;
 
     /**
      * 地区编码
      */
     @Excel(name = "地区编码")
-    @ApiModelProperty("地区编码")
+
     private String appOrg;
 
     /**
      * 0cpu使用率 1内存使用率 2磁盘使用率 3网络流量
      */
     @Excel(name = "0cpu使用率 1内存使用率 2磁盘使用率 3网络流量")
-    @ApiModelProperty("0cpu使用率 1内存使用率 2磁盘使用率 3网络流量")
+
     private Integer sysType;
 
     /**
      * 0点-6点使用率
      */
     @Excel(name = "0点-6点使用率")
-    @ApiModelProperty("0点-6点使用率")
+
     private Long between6Num;
 
     /**
      * 6点-12点使用率
      */
     @Excel(name = "6点-12点使用率")
-    @ApiModelProperty("6点-12点使用率")
+
     private Long between12Num;
 
     /**
      * 12点-18点使用率
      */
     @Excel(name = "12点-18点使用率")
-    @ApiModelProperty("12点-18点使用率")
+
     private Long between18Num;
 
     /**
      * 18点-24点使用率
      */
     @Excel(name = "18点-24点使用率")
-    @ApiModelProperty("18点-24点使用率")
+
     private Long between24Num;
 
 }

+ 11 - 13
project-zcustom/src/main/java/com/project/zcustom/domain/build/PlatBuildParams.java

@@ -1,15 +1,13 @@
 package com.project.zcustom.domain.build;
 
-import com.project.common.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.project.common.annotation.Excel;
 import com.project.common.core.domain.CustomBaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.math.BigDecimal;
 
@@ -24,70 +22,70 @@ import java.math.BigDecimal;
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = false)
 @TableName("large_plat_build_params")
-@ApiModel(value = "large_plat_build_params实体类")
+
 public class PlatBuildParams extends CustomBaseEntity {
 
     /**
      * 主键id
      */
     @TableId(value = "id")
-    @ApiModelProperty("主键id")
+
     private Long id;
 
     /**
      * 地区编码
      */
     @Excel(name = "地区编码")
-    @ApiModelProperty("地区编码")
+
     private String appOrg;
 
     /**
      * 0 年度综合能耗 1 年度用电 2 年度累计水耗 3 年度累计非供暖能 4 月用电量信息 5 楼宇月用水电热信息 6 数据中心机房信息 7 供暖能耗信息 8 燃气用量信息 9 资源信息 10 可再生电力信息 11 办公碳排放情况 12 各单位年度累计办公碳排放量
      */
     @Excel(name = "0 年度综合能耗 1 年度用电 2 年度累计水耗 3 年度累计非供暖能 4 月用电量信息 5 楼宇月用水电热信息 6 数据中心机房信息 7 供暖能耗信息 8 燃气用量信息 9 资源信息 10 可再生电力信息 11 办公碳排放情况 12 各单位年度累计办公碳排放量")
-    @ApiModelProperty("0 年度综合能耗 1 年度用电 2 年度累计水耗 3 年度累计非供暖能 4 月用电量信息 5 楼宇月用水电热信息 6 数据中心机房信息 7 供暖能耗信息 8 燃气用量信息 9 资源信息 10 可再生电力信息 11 办公碳排放情况 12 各单位年度累计办公碳排放量")
+
     private Integer type;
 
     /**
      * 参数名称
      */
     @Excel(name = "参数名称")
-    @ApiModelProperty("参数名称")
+
     private String paramName;
 
     /**
      * 参数key
      */
     @Excel(name = "参数key")
-    @ApiModelProperty("参数key")
+
     private String paramKey;
 
     /**
      * 参数值1
      */
     @Excel(name = "参数值1")
-    @ApiModelProperty("参数值1")
+
     private BigDecimal paramsValue;
 
     /**
      * 参数值2
      */
     @Excel(name = "参数值2")
-    @ApiModelProperty("参数值2")
+
     private BigDecimal paramsValue2;
 
     /**
      * 参数值3
      */
     @Excel(name = "参数值3")
-    @ApiModelProperty("参数值3")
+
     private BigDecimal paramsValue3;
 
     /**
      * 参数值4
      */
     @Excel(name = "参数值4")
-    @ApiModelProperty("参数值4")
+
     private BigDecimal paramsValue4;
 
 }

+ 12 - 13
project-zcustom/src/main/java/com/project/zcustom/domain/build/PlatBuildYearTrend.java

@@ -1,16 +1,15 @@
 package com.project.zcustom.domain.build;
 
-import java.math.BigDecimal;
-import com.project.common.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.project.common.annotation.Excel;
 import com.project.common.core.domain.CustomBaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
 
 /**
  * 年度趋势变化数据对象 plat_build_year_trend
@@ -23,63 +22,63 @@ import io.swagger.annotations.ApiModelProperty;
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = false)
 @TableName("large_plat_build_year_trend")
-@ApiModel(value = "large_plat_build_year_trend实体类")
+
 public class PlatBuildYearTrend extends CustomBaseEntity {
 
     /**
      * 主键id
      */
     @TableId(value = "id")
-    @ApiModelProperty("主键id")
+
     private Long id;
 
     /**
      * 地区编码
      */
     @Excel(name = "地区编码")
-    @ApiModelProperty("地区编码")
+
     private String appOrg;
 
     /**
      * 月份
      */
     @Excel(name = "月份")
-    @ApiModelProperty("月份")
+
     private String monthString;
 
     /**
      * 当年值
      */
     @Excel(name = "当年值")
-    @ApiModelProperty("当年值")
+
     private BigDecimal currentValue;
 
     /**
      * 去年值
      */
     @Excel(name = "去年值")
-    @ApiModelProperty("去年值")
+
     private BigDecimal lastYearValue;
 
     /**
      * 当年年份
      */
     @Excel(name = "当年年份")
-    @ApiModelProperty("当年年份")
+
     private String currentYear;
 
     /**
      * 去年年份
      */
     @Excel(name = "去年年份")
-    @ApiModelProperty("去年年份")
+
     private String lastYear;
 
     /**
      * 0 碳排放量月度变化趋势1 年度综合能耗变化趋势图 2 年度电耗变化趋势图 3 年度水耗趋势接口 4 年度非供暖能耗趋势
      */
     @Excel(name = "0 碳排放量月度变化趋势1 年度综合能耗变化趋势图 2 年度电耗变化趋势图 3 年度水耗趋势接口 4 年度非供暖能耗趋势")
-    @ApiModelProperty("0 碳排放量月度变化趋势1 年度综合能耗变化趋势图 2 年度电耗变化趋势图 3 年度水耗趋势接口 4 年度非供暖能耗趋势")
+
     private Integer type;
 
 }

+ 8 - 10
project-zcustom/src/main/java/com/project/zcustom/domain/employee/PlatEmployeeHealth.java

@@ -9,8 +9,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 /**
  * 员工健康对象 plat_employee_health
@@ -23,56 +21,56 @@ import io.swagger.annotations.ApiModelProperty;
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = false)
 @TableName("large_plat_employee_health")
-@ApiModel(value = "large_plat_employee_health实体类")
+
 public class PlatEmployeeHealth extends CustomBaseEntity {
 
     /**
      * 主键id
      */
     @TableId(value = "id")
-    @ApiModelProperty("主键id")
+
     private Long id;
 
     /**
      * 地区编码
      */
     @Excel(name = "地区编码")
-    @ApiModelProperty("地区编码")
+
     private String appOrg;
 
     /**
      * 员工健康分布--健康人数
      */
     @Excel(name = "员工健康分布--健康人数")
-    @ApiModelProperty("员工健康分布--健康人数")
+
     private Long healthyNum;
 
     /**
      * 员工健康分布--亚健康人数
      */
     @Excel(name = "员工健康分布--亚健康人数")
-    @ApiModelProperty("员工健康分布--亚健康人数")
+
     private Long subHealthyNum;
 
     /**
      * 健康服务--应参检人数
      */
     @Excel(name = "健康服务--应参检人数")
-    @ApiModelProperty("健康服务--应参检人数")
+
     private Long participateNum;
 
     /**
      * 健康服务--实际参检人数
      */
     @Excel(name = "健康服务--实际参检人数")
-    @ApiModelProperty("健康服务--实际参检人数")
+
     private Long actualParticipateNum;
 
     /**
      * 健康服务--检查人数占比
      */
     @Excel(name = "健康服务--检查人数占比")
-    @ApiModelProperty("健康服务--检查人数占比")
+
     private BigDecimal participateProportionRate;
 
 }

+ 17 - 19
project-zcustom/src/main/java/com/project/zcustom/domain/employee/PlatEmployeeHealthChart.java

@@ -1,15 +1,13 @@
 package com.project.zcustom.domain.employee;
 
-import com.project.common.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.project.common.annotation.Excel;
 import com.project.common.core.domain.CustomBaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 /**
  * 员工健康图数据对象 plat_employee_health_chart
@@ -22,112 +20,112 @@ import io.swagger.annotations.ApiModelProperty;
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = false)
 @TableName("large_plat_employee_health_chart")
-@ApiModel(value = "large_plat_employee_health_chart实体类")
+
 public class PlatEmployeeHealthChart extends CustomBaseEntity {
 
     /**
      * 主键id
      */
     @TableId(value = "id")
-    @ApiModelProperty("主键id")
+
     private Long id;
 
     /**
      * 地区编码
      */
     @Excel(name = "地区编码")
-    @ApiModelProperty("地区编码")
+
     private String appOrg;
 
     /**
      * 0 健康指标趋势 1 甲状腺结节发现及时率趋势
      */
     @Excel(name = "0 健康指标趋势 1 甲状腺结节发现及时率趋势")
-    @ApiModelProperty("0 健康指标趋势 1 甲状腺结节发现及时率趋势")
+
     private Integer type;
 
     /**
      * 一月
      */
     @Excel(name = "一月")
-    @ApiModelProperty("一月")
+
     private Long januaryNum;
 
     /**
      * 二月
      */
     @Excel(name = "二月")
-    @ApiModelProperty("二月")
+
     private Long februaryNum;
 
     /**
      * 三月
      */
     @Excel(name = "三月")
-    @ApiModelProperty("三月")
+
     private Long marchNum;
 
     /**
      * 四月
      */
     @Excel(name = "四月")
-    @ApiModelProperty("四月")
+
     private Long aprilNum;
 
     /**
      * 五月
      */
     @Excel(name = "五月")
-    @ApiModelProperty("五月")
+
     private Long mayNum;
 
     /**
      * 六月
      */
     @Excel(name = "六月")
-    @ApiModelProperty("六月")
+
     private Long juneNum;
 
     /**
      * 七月
      */
     @Excel(name = "七月")
-    @ApiModelProperty("七月")
+
     private Long julyNum;
 
     /**
      * 八月
      */
     @Excel(name = "八月")
-    @ApiModelProperty("八月")
+
     private Long augustNum;
 
     /**
      * 九月
      */
     @Excel(name = "九月")
-    @ApiModelProperty("九月")
+
     private Long septemberNum;
 
     /**
      * 十月
      */
     @Excel(name = "十月")
-    @ApiModelProperty("十月")
+
     private Long octoberNum;
 
     /**
      * 十一月
      */
     @Excel(name = "十一月")
-    @ApiModelProperty("十一月")
+
     private Long novemberNum;
 
     /**
      * 十二月
      */
     @Excel(name = "十二月")
-    @ApiModelProperty("十二月")
+
     private Long decemberNum;
 
 }

+ 6 - 8
project-zcustom/src/main/java/com/project/zcustom/domain/employee/PlatEmployeeHealthIllness.java

@@ -1,15 +1,13 @@
 package com.project.zcustom.domain.employee;
 
-import com.project.common.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.project.common.annotation.Excel;
 import com.project.common.core.domain.CustomBaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 /**
  * 多发疾病排行对象 plat_employee_type_illness
@@ -22,35 +20,35 @@ import io.swagger.annotations.ApiModelProperty;
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = false)
 @TableName("large_plat_employee_health_illness")
-@ApiModel(value = "large_plat_employee_health_illness类")
+
 public class PlatEmployeeHealthIllness extends CustomBaseEntity {
 
     /**
      * 主键id
      */
     @TableId(value = "id")
-    @ApiModelProperty("主键id")
+
     private Long id;
 
     /**
      * 地区编码
      */
     @Excel(name = "地区编码")
-    @ApiModelProperty("地区编码")
+
     private String appOrg;
 
     /**
      * 参数名称
      */
     @Excel(name = "参数名称")
-    @ApiModelProperty("参数名称")
+
     private String paramsName;
 
     /**
      * 参数值
      */
     @Excel(name = "参数值")
-    @ApiModelProperty("参数值")
+
     private Long paramsValue;
 
 }

+ 19 - 21
project-zcustom/src/main/java/com/project/zcustom/domain/employee/PlatEmployeeType.java

@@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.project.common.annotation.Excel;
 import com.project.common.core.domain.CustomBaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -22,133 +20,133 @@ import lombok.experimental.Accessors;
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = false)
 @TableName("large_plat_employee_type")
-@ApiModel(value = "large_plat_employee_type实体类")
+
 public class PlatEmployeeType extends CustomBaseEntity {
 
     /**
      * 主键id
      */
     @TableId(value = "id")
-    @ApiModelProperty("主键id")
+
     private Long id;
 
     /**
      * 地区编码
      */
     @Excel(name = "地区编码")
-    @ApiModelProperty("地区编码")
+
     private String appOrg;
 
     /**
      * 员工类型--内部员工数量
      */
     @Excel(name = "员工类型--内部员工数量")
-    @ApiModelProperty("员工类型--内部员工数量")
+
     private Long insideNum;
 
     /**
      * 员工类型--借调人员数量
      */
     @Excel(name = "员工类型--借调人员数量")
-    @ApiModelProperty("员工类型--借调人员数量")
+
     private Long loanNum;
 
     /**
      * 员工类型--外协人员数量
      */
     @Excel(name = "员工类型--外协人员数量")
-    @ApiModelProperty("员工类型--外协人员数量")
+
     private Long associationNum;
 
     /**
      * 员工类型--物业人员数量
      */
     @Excel(name = "员工类型--物业人员数量")
-    @ApiModelProperty("员工类型--物业人员数量")
+
     private Long propertyNum;
 
     /**
      * 入楼情况--内部员工
      */
     @Excel(name = "入楼情况--内部员工")
-    @ApiModelProperty("入楼情况--内部员工")
+
     private Long entryInternalNum;
 
     /**
      * 入楼情况--借调人员
      */
     @Excel(name = "入楼情况--借调人员")
-    @ApiModelProperty("入楼情况--借调人员")
+
     private Long entryToLoanNum;
 
     /**
      * 入楼情况--外协人员
      */
     @Excel(name = "入楼情况--外协人员")
-    @ApiModelProperty("入楼情况--外协人员")
+
     private Long entryAssistNum;
 
     /**
      * 入楼情况--物业人员
      */
     @Excel(name = "入楼情况--物业人员")
-    @ApiModelProperty("入楼情况--物业人员")
+
     private Long entryPropertyNum;
 
     /**
      * 入楼情况--访客
      */
     @Excel(name = "入楼情况--访客")
-    @ApiModelProperty("入楼情况--访客")
+
     private Long visitorNum;
 
     /**
      * 入楼情况--共计人员数量
      */
     @Excel(name = "入楼情况--共计人员数量")
-    @ApiModelProperty("入楼情况--共计人员数量")
+
     private Long grossNum;
 
     /**
      * 员工年龄分布--20-30岁
      */
     @Excel(name = "员工年龄分布--20-30岁")
-    @ApiModelProperty("员工年龄分布--20-30岁")
+
     private Long between2030Num;
 
     /**
      * 员工年龄分布--30-40岁
      */
     @Excel(name = "员工年龄分布--30-40岁")
-    @ApiModelProperty("员工年龄分布--30-40岁")
+
     private Long between3040Num;
 
     /**
      * 员工年龄分布--40-50岁
      */
     @Excel(name = "员工年龄分布--40-50岁")
-    @ApiModelProperty("员工年龄分布--40-50岁")
+
     private Long between4050Num;
 
     /**
      * 员工年龄分布--50岁以上
      */
     @Excel(name = "员工年龄分布--50岁以上")
-    @ApiModelProperty("员工年龄分布--50岁以上")
+
     private Long exceed50Num;
 
     /**
      * 员工性别情况--男性数
      */
     @Excel(name = "员工性别情况--男性数")
-    @ApiModelProperty("员工性别情况--男性数")
+
     private Long manNum;
 
     /**
      * 员工性别情况--女性数
      */
     @Excel(name = "员工性别情况--女性数")
-    @ApiModelProperty("员工性别情况--女性数")
+
     private Long womenNum;
 
 }

+ 10 - 12
project-zcustom/src/main/java/com/project/zcustom/domain/employee/PlatEmployeeTypeFlow.java

@@ -1,15 +1,13 @@
 package com.project.zcustom.domain.employee;
 
-import com.project.common.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.project.common.annotation.Excel;
 import com.project.common.core.domain.CustomBaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 /**
  * 近一周人流量统计对象 plat_employee_type_flow
@@ -22,56 +20,56 @@ import io.swagger.annotations.ApiModelProperty;
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = false)
 @TableName("large_plat_employee_type_flow")
-@ApiModel(value = "large_plat_employee_type_flow实体类")
+
 public class PlatEmployeeTypeFlow extends CustomBaseEntity {
 
     /**
      * 主键id
      */
     @TableId(value = "id")
-    @ApiModelProperty("主键id")
+
     private Long id;
 
     /**
      * 地区编码
      */
     @Excel(name = "地区编码")
-    @ApiModelProperty("地区编码")
+
     private String appOrg;
 
     /**
      * 员工类型--内部员工数量
      */
     @Excel(name = "员工类型--内部员工数量")
-    @ApiModelProperty("员工类型--内部员工数量")
+
     private Long insideNum;
 
     /**
      * 员工类型--借调人员数量
      */
     @Excel(name = "员工类型--借调人员数量")
-    @ApiModelProperty("员工类型--借调人员数量")
+
     private Long loanNum;
 
     /**
      * 员工类型--外协人员数量
      */
     @Excel(name = "员工类型--外协人员数量")
-    @ApiModelProperty("员工类型--外协人员数量")
+
     private Long associationNum;
 
     /**
      * 员工类型--物业人员数量
      */
     @Excel(name = "员工类型--物业人员数量")
-    @ApiModelProperty("员工类型--物业人员数量")
+
     private Long propertyNum;
 
     /**
      * 员工类型--物业人员数量
      */
     @Excel(name = "员工类型--访客数量")
-    @ApiModelProperty("员工类型--访客数量")
+
     private Long visitNum;
 
 
@@ -79,7 +77,7 @@ public class PlatEmployeeTypeFlow extends CustomBaseEntity {
      * 时间标识
      */
     @Excel(name = "时间标识")
-    @ApiModelProperty("时间标识 1-7")
+
     private Integer timeSign;
 
 }

+ 6 - 8
project-zcustom/src/main/java/com/project/zcustom/domain/employee/PlatEmployeeTypeIllness.java

@@ -1,15 +1,13 @@
 package com.project.zcustom.domain.employee;
 
-import com.project.common.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.project.common.annotation.Excel;
 import com.project.common.core.domain.CustomBaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 /**
  * 多发疾病排行对象 plat_employee_type_illness
@@ -22,35 +20,35 @@ import io.swagger.annotations.ApiModelProperty;
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = false)
 @TableName("large_plat_employee_type_illness")
-@ApiModel(value = "large_plat_employee_type_illness实体类")
+
 public class PlatEmployeeTypeIllness extends CustomBaseEntity {
 
     /**
      * 主键id
      */
     @TableId(value = "id")
-    @ApiModelProperty("主键id")
+
     private Long id;
 
     /**
      * 地区编码
      */
     @Excel(name = "地区编码")
-    @ApiModelProperty("地区编码")
+
     private String appOrg;
 
     /**
      * 参数名称
      */
     @Excel(name = "参数名称")
-    @ApiModelProperty("参数名称")
+
     private String paramsName;
 
     /**
      * 参数值
      */
     @Excel(name = "参数值")
-    @ApiModelProperty("参数值")
+
     private Long paramsValue;
 
 }

+ 6 - 8
project-zcustom/src/main/java/com/project/zcustom/domain/plat/PlatApiRecord.java

@@ -1,15 +1,13 @@
 package com.project.zcustom.domain.plat;
 
-import com.project.common.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.project.common.annotation.Excel;
 import com.project.common.core.domain.CustomBaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 /**
  * 接口请求记录对象 plat_api_record
@@ -22,35 +20,35 @@ import io.swagger.annotations.ApiModelProperty;
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = false)
 @TableName("large_plat_api_record")
-@ApiModel(value = "large_plat_api_record实体类")
+
 public class PlatApiRecord extends CustomBaseEntity {
 
     /**
      * 主键id
      */
     @TableId(value = "id")
-    @ApiModelProperty("主键id")
+
     private Long id;
 
     /**
      * 请求地址
      */
     @Excel(name = "请求地址")
-    @ApiModelProperty("请求地址")
+
     private String apiUrl;
 
     /**
      * 请求地址
      */
     @Excel(name = "地区编码")
-    @ApiModelProperty("地区编码")
+
     private String appOrg;
 
     /**
      * 接口返回数据
      */
     @Excel(name = "接口返回数据")
-    @ApiModelProperty("接口返回数据")
+
     private String apiResult;
 
 }

+ 19 - 21
project-zcustom/src/main/java/com/project/zcustom/domain/post/PlatPostStation.java

@@ -1,15 +1,13 @@
 package com.project.zcustom.domain.post;
 
-import com.project.common.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.project.common.annotation.Excel;
 import com.project.common.core.domain.CustomBaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 /**
  * 物业服务对象 plat_post_station
@@ -22,126 +20,126 @@ import io.swagger.annotations.ApiModelProperty;
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = false)
 @TableName("large_plat_post_station")
-@ApiModel(value = "large_plat_post_station实体类")
+
 public class PlatPostStation extends CustomBaseEntity {
 
     /**
      * 主键id
      */
     @TableId(value = "id")
-    @ApiModelProperty("主键id")
+
     private Long id;
 
     /**
      * 地区编码
      */
     @Excel(name = "地区编码")
-    @ApiModelProperty("地区编码")
+
     private String appOrg;
 
     /**
      * 物业服务--故障保修订单数
      */
     @Excel(name = "物业服务--故障保修订单数")
-    @ApiModelProperty("物业服务--故障保修订单数")
+
     private Long faultWarrantyNum;
 
     /**
      * 物业服务--派单数量
      */
     @Excel(name = "物业服务--派单数量")
-    @ApiModelProperty("物业服务--派单数量")
+
     private Long dispatchedNum;
 
     /**
      * 物业服务--建议订单数量
      */
     @Excel(name = "物业服务--建议订单数量")
-    @ApiModelProperty("物业服务--建议订单数量")
+
     private Long suggestedNum;
 
     /**
      * 物业服务--维修订单数量
      */
     @Excel(name = "物业服务--维修订单数量")
-    @ApiModelProperty("物业服务--维修订单数量")
+
     private Long repairOrdersNum;
 
     /**
      * 物业服务--调查问卷数量
      */
     @Excel(name = "物业服务--调查问卷数量")
-    @ApiModelProperty("物业服务--调查问卷数量")
+
     private Long questionnairesNum;
 
     /**
      * 近一个月报修分类占比--办公家具报修
      */
     @Excel(name = "近一个月报修分类占比--办公家具报修")
-    @ApiModelProperty("近一个月报修分类占比--办公家具报修")
+
     private Long furniture;
 
     /**
      * 近一个月报修分类占比--冷热水故障
      */
     @Excel(name = "近一个月报修分类占比--冷热水故障")
-    @ApiModelProperty("近一个月报修分类占比--冷热水故障")
+
     private Long hotColdWater;
 
     /**
      * 近一个月报修分类占比--门禁故障
      */
     @Excel(name = "近一个月报修分类占比--门禁故障")
-    @ApiModelProperty("近一个月报修分类占比--门禁故障")
+
     private Long accessControl;
 
     /**
      * 近一个月报修分类占比--其他报修故障
      */
     @Excel(name = "近一个月报修分类占比--其他报修故障")
-    @ApiModelProperty("近一个月报修分类占比--其他报修故障")
+
     private Long other;
 
     /**
      * 近一个月报修分类占比--墙类/地类报修
      */
     @Excel(name = "近一个月报修分类占比--墙类/地类报修")
-    @ApiModelProperty("近一个月报修分类占比--墙类/地类报修")
+
     private Long wall;
 
     /**
      * 近一个月报修分类占比--电气故障报修
      */
     @Excel(name = "近一个月报修分类占比--电气故障报修")
-    @ApiModelProperty("近一个月报修分类占比--电气故障报修")
+
     private Long electrical;
 
     /**
      * 近一个月报修分类占比--电梯故障
      */
     @Excel(name = "近一个月报修分类占比--电梯故障")
-    @ApiModelProperty("近一个月报修分类占比--电梯故障")
+
     private Long elevator;
 
     /**
      * 近一个月报修分类占比--消防设施设备故障
      */
     @Excel(name = "近一个月报修分类占比--消防设施设备故障")
-    @ApiModelProperty("近一个月报修分类占比--消防设施设备故障")
+
     private Long fireControl;
 
     /**
      * 近一个月报修分类占比--保洁服务
      */
     @Excel(name = "近一个月报修分类占比--保洁服务")
-    @ApiModelProperty("近一个月报修分类占比--保洁服务")
+
     private Long cleaning;
 
     /**
      * 近一个月报修分类占比--空调故障
      */
     @Excel(name = "近一个月报修分类占比--空调故障")
-    @ApiModelProperty("近一个月报修分类占比--空调故障")
+
     private Long airConditioning;
 
 }

+ 15 - 17
project-zcustom/src/main/java/com/project/zcustom/domain/post/PlatPostStationChart.java

@@ -1,15 +1,13 @@
 package com.project.zcustom.domain.post;
 
-import com.project.common.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.project.common.annotation.Excel;
 import com.project.common.core.domain.CustomBaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 /**
  * 近六个月报修分类占比对象 plat_post_station_chart
@@ -22,98 +20,98 @@ import io.swagger.annotations.ApiModelProperty;
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = false)
 @TableName("large_plat_post_station_chart")
-@ApiModel(value = "large_plat_post_station_chart实体类")
+
 public class PlatPostStationChart extends CustomBaseEntity {
 
     /**
      * 主键id
      */
     @TableId(value = "id")
-    @ApiModelProperty("主键id")
+
     private Long id;
 
     /**
      * 地区编码
      */
     @Excel(name = "地区编码")
-    @ApiModelProperty("地区编码")
+
     private String appOrg;
 
     /**
      * 近六个月报修分类占比 取值1-6
      */
     @Excel(name = "近六个月报修分类占比 取值1-6")
-    @ApiModelProperty("近六个月报修分类占比 取值1-6")
+
     private Long appMonth;
 
     /**
      * 消防
      */
     @Excel(name = "办公家具")
-    @ApiModelProperty("办公家具")
+
     private Long colNum;
 
     /**
      * 电梯
      */
     @Excel(name = "空调")
-    @ApiModelProperty("空调")
+
     private Long elevatorNum;
 
     /**
      * 照明灯具
      */
     @Excel(name = "照明灯具")
-    @ApiModelProperty("冷热水故障")
+
     private Long laNum;
 
     /**
      * 安防
      */
     @Excel(name = "安防")
-    @ApiModelProperty("门禁")
+
     private Long seNum;
 
     /**
      * 卫生间
      */
     @Excel(name = "卫生间")
-    @ApiModelProperty("其他报修故障")
+
     private Long toNum;
 
     /**
      * 公区
      */
     @Excel(name = "公区")
-    @ApiModelProperty("墙类/地类报修")
+
     private Long arNum;
 
     /**
      * 空调
      */
     @Excel(name = "空调")
-    @ApiModelProperty("电气故障报修")
+
     private Long diNum;
 
     /**
      * 其它维修
      */
     @Excel(name = "电梯故障")
-    @ApiModelProperty("电梯故障")
+
     private Long otNum;
 
     /**
      * 会议保障
      */
     @Excel(name = "消防设施设备故障")
-    @ApiModelProperty("消防设施设备故障")
+
     private Long meNum;
 
     /**
      * 办公室
      */
     @Excel(name = "保洁服务")
-    @ApiModelProperty("保洁服务")
+
     private Long ofNum;
 
 }

+ 9 - 10
project-zcustom/src/main/java/com/project/zcustom/domain/property/PlatProperty.java

@@ -1,16 +1,15 @@
 package com.project.zcustom.domain.property;
 
-import java.math.BigDecimal;
-import com.project.common.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.project.common.annotation.Excel;
 import com.project.common.core.domain.CustomBaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
 
 /**
  * 共享驿站对象 plat_property
@@ -23,42 +22,42 @@ import io.swagger.annotations.ApiModelProperty;
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = false)
 @TableName("large_plat_property")
-@ApiModel(value = "large_plat_property实体类")
+
 public class PlatProperty extends CustomBaseEntity {
 
     /**
      * 主键id
      */
     @TableId(value = "id")
-    @ApiModelProperty("主键id")
+
     private Long id;
 
     /**
      * 地区编码
      */
     @Excel(name = "地区编码")
-    @ApiModelProperty("地区编码")
+
     private String appOrg;
 
     /**
      * 计划建设数量
      */
     @Excel(name = "计划建设数量")
-    @ApiModelProperty("计划建设数量")
+
     private Long constructionQuantityNum;
 
     /**
      * 已完成建设数量
      */
     @Excel(name = "已完成建设数量")
-    @ApiModelProperty("已完成建设数量")
+
     private Long completedNum;
 
     /**
      * 完成达标率
      */
     @Excel(name = "完成达标率")
-    @ApiModelProperty("完成达标率")
+
     private BigDecimal participateProportionRate;
 
 }

+ 7 - 9
project-zcustom/src/main/java/com/project/zcustom/domain/property/PlatPropertyList.java

@@ -1,15 +1,13 @@
 package com.project.zcustom.domain.property;
 
-import com.project.common.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.project.common.annotation.Excel;
 import com.project.common.core.domain.CustomBaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 /**
  * 驿站列对象 plat_property_list
@@ -22,42 +20,42 @@ import io.swagger.annotations.ApiModelProperty;
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = false)
 @TableName("large_plat_property_list")
-@ApiModel(value = "large_plat_property_list实体类")
+
 public class PlatPropertyList extends CustomBaseEntity {
 
     /**
      * 主键id
      */
     @TableId(value = "id")
-    @ApiModelProperty("主键id")
+
     private Long id;
 
     /**
      * 地区编码
      */
     @Excel(name = "地区编码")
-    @ApiModelProperty("地区编码")
+
     private String appOrg;
 
     /**
      * 驿站名称
      */
     @Excel(name = "驿站名称")
-    @ApiModelProperty("驿站名称")
+
     private String stationName;
 
     /**
      * 驿站地址
      */
     @Excel(name = "驿站地址")
-    @ApiModelProperty("驿站地址")
+
     private String stationAddress;
 
     /**
      * 服务次数
      */
     @Excel(name = "服务次数")
-    @ApiModelProperty("服务次数")
+
     private Long stationNum;
 
 }

+ 6 - 8
project-zcustom/src/main/java/com/project/zcustom/domain/property/PlatPropertyTools.java

@@ -1,15 +1,13 @@
 package com.project.zcustom.domain.property;
 
-import com.project.common.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.project.common.annotation.Excel;
 import com.project.common.core.domain.CustomBaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 /**
  * 工具列对象 plat_property_tools
@@ -22,35 +20,35 @@ import io.swagger.annotations.ApiModelProperty;
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = false)
 @TableName("large_plat_property_tools")
-@ApiModel(value = "large_plat_property_tools实体类")
+
 public class PlatPropertyTools extends CustomBaseEntity {
 
     /**
      * 主键id
      */
     @TableId(value = "id")
-    @ApiModelProperty("主键id")
+
     private Long id;
 
     /**
      * 地区编码
      */
     @Excel(name = "地区编码")
-    @ApiModelProperty("地区编码")
+
     private String appOrg;
 
     /**
      * 健康自测
      */
     @Excel(name = "健康自测")
-    @ApiModelProperty("健康自测")
+
     private Long selfTest;
 
     /**
      * 远程问诊
      */
     @Excel(name = "远程问诊")
-    @ApiModelProperty("远程问诊")
+
     private Long consultation;
 
 }

+ 6 - 8
project-zcustom/src/main/java/com/project/zcustom/domain/smart/PlatGreenFoods.java

@@ -1,15 +1,13 @@
 package com.project.zcustom.domain.smart;
 
-import com.project.common.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.project.common.annotation.Excel;
 import com.project.common.core.domain.CustomBaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 /**
  * 菜谱数据对象 plat_green_foods
@@ -22,35 +20,35 @@ import io.swagger.annotations.ApiModelProperty;
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = false)
 @TableName("large_plat_green_foods")
-@ApiModel(value = "large_plat_green_foods实体类")
+
 public class PlatGreenFoods extends CustomBaseEntity {
 
     /**
      * 主键id
      */
     @TableId(value = "id")
-    @ApiModelProperty("主键id")
+
     private Long id;
 
     /**
      * 地区编码
      */
     @Excel(name = "地区编码")
-    @ApiModelProperty("地区编码")
+
     private String appOrg;
 
     /**
      * 地区名称
      */
     @Excel(name = "地区名称")
-    @ApiModelProperty("地区名称")
+
     private String appName;
 
     /**
      * 菜品信息
      */
     @Excel(name = "菜品信息")
-    @ApiModelProperty("菜品信息")
+
     private String foodInfo;
 
 }

+ 27 - 29
project-zcustom/src/main/java/com/project/zcustom/domain/smart/PlatGreenSmart.java

@@ -1,17 +1,15 @@
 package com.project.zcustom.domain.smart;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.project.common.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.project.common.annotation.Excel;
 import com.project.common.core.domain.CustomBaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 /**
  * 绿智食堂对象 plat_green_smart
@@ -24,7 +22,7 @@ import io.swagger.annotations.ApiModelProperty;
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = false)
 @TableName("large_plat_green_smart")
-@ApiModel(value = "large_plat_green_smart实体类")
+
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class PlatGreenSmart extends CustomBaseEntity {
 
@@ -32,70 +30,70 @@ public class PlatGreenSmart extends CustomBaseEntity {
      * 主键id
      */
     @TableId(value = "id")
-    @ApiModelProperty("主键id")
+
     private Long id;
 
     /**
      * 地区编码
      */
     @Excel(name = "地区编码")
-    @ApiModelProperty("地区编码")
+
     private String appOrg;
 
     /**
      * 食堂名称
      */
     @Excel(name = "食堂名称")
-    @ApiModelProperty("食堂名称")
+
     private String canteenNum;
 
     /**
      * 食堂类型
      */
     @Excel(name = "食堂类型")
-    @ApiModelProperty("食堂类型")
+
     private String canteenType;
 
     /**
      * 食堂面积 平方米
      */
     @Excel(name = "食堂面积 平方米")
-    @ApiModelProperty("食堂面积 平方米")
+
     private Long areaNum;
 
     /**
      * 座位数量
      */
     @Excel(name = "座位数量")
-    @ApiModelProperty("座位数量")
+
     private Long seatsNum;
 
     /**
      * 管理人员
      */
     @Excel(name = "管理人员")
-    @ApiModelProperty("管理人员")
+
     private Long managementNum;
 
     /**
      * 厨师人数
      */
     @Excel(name = "厨师人数")
-    @ApiModelProperty("厨师人数")
+
     private Long chefsNum;
 
     /**
      * 服务人员
      */
     @Excel(name = "服务人员")
-    @ApiModelProperty("服务人员")
+
     private Long serviceNum;
 
     /**
      * 厨师服务员总数
      */
     @Excel(name = "厨师服务员总数")
-    @ApiModelProperty("厨师服务员总数")
+
     @TableField(exist = false)
     private Long totalPersonNum;
 
@@ -103,77 +101,77 @@ public class PlatGreenSmart extends CustomBaseEntity {
      * 健康证数量
      */
     @Excel(name = "健康证数量")
-    @ApiModelProperty("健康证数量")
+
     private Long healthNum;
 
     /**
      * 许可证数量
      */
     @Excel(name = "许可证数量")
-    @ApiModelProperty("许可证数量")
+
     private Long licenceNum;
 
     /**
      * 菜品卫生 评分
      */
     @Excel(name = "菜品卫生 评分")
-    @ApiModelProperty("菜品卫生 评分")
+
     private Integer dishHygieneScore;
 
     /**
      * 菜品口味 评分
      */
     @Excel(name = "菜品口味 评分")
-    @ApiModelProperty("菜品口味 评分")
+
     private Integer tasteDishesScore;
 
     /**
      * 服务态度 评分
      */
     @Excel(name = "服务态度 评分")
-    @ApiModelProperty("服务态度 评分")
+
     private Integer attitudeScore;
 
     /**
      * 餐具卫生 评分
      */
     @Excel(name = "餐具卫生 评分")
-    @ApiModelProperty("餐具卫生 评分")
+
     private Integer tablewareScore;
 
     /**
      * 菜品种类 评分
      */
     @Excel(name = "菜品种类 评分")
-    @ApiModelProperty("菜品种类 评分")
+
     private Integer typesDishesScore;
 
     /**
      * 就餐体验 评分
      */
     @Excel(name = "就餐体验 评分")
-    @ApiModelProperty("就餐体验 评分")
+
     private Integer diningScore;
 
     /**
      * 其它人员
      */
     @Excel(name = "其它人员")
-    @ApiModelProperty("其它人员")
+
     private Long personnelNum;
 
     /**
      * 服务就餐人数
      */
     @Excel(name = "服务就餐人数")
-    @ApiModelProperty("服务就餐人数")
+
     private Long serviceDinersNum;
 
     /**
      * 平均分
      */
     @Excel(name = "平均分")
-    @ApiModelProperty("平均分")
+
     @TableField(exist = false)
     private Long totalScore;
 
@@ -181,7 +179,7 @@ public class PlatGreenSmart extends CustomBaseEntity {
      * 食堂数量
      */
     @Excel(name = "食堂数量")
-    @ApiModelProperty("食堂数量")
+
     @TableField(exist = false)
     private String canteenTotalNumber;
 
@@ -189,7 +187,7 @@ public class PlatGreenSmart extends CustomBaseEntity {
      * 食堂数量
      */
     @Excel(name = "自建食堂数量")
-    @ApiModelProperty("自建食堂数量")
+
     @TableField(exist = false)
     private String selfCanteenNumber;
 
@@ -197,7 +195,7 @@ public class PlatGreenSmart extends CustomBaseEntity {
      * 食堂数量
      */
     @Excel(name = "外包食堂数量")
-    @ApiModelProperty("外包食堂数量")
+
     @TableField(exist = false)
     private String outsourceCanteenNumber;
 }

+ 9 - 11
project-zcustom/src/main/java/com/project/zcustom/domain/smart/PlatGreenSmartDegree.java

@@ -1,15 +1,13 @@
 package com.project.zcustom.domain.smart;
 
-import com.project.common.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.project.common.annotation.Excel;
 import com.project.common.core.domain.CustomBaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 /**
  * 食堂服务满意度对象 plat_green_smart_degree
@@ -22,56 +20,56 @@ import io.swagger.annotations.ApiModelProperty;
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = false)
 @TableName("plat_green_smart_degree")
-@ApiModel(value = "plat_green_smart_degree实体类")
+
 public class PlatGreenSmartDegree extends CustomBaseEntity {
 
     /**
      * 主键id
      */
     @TableId(value = "id")
-    @ApiModelProperty("主键id")
+
     private Long id;
 
     /**
      * 地区编码
      */
     @Excel(name = "地区编码")
-    @ApiModelProperty("地区编码")
+
     private String appOrg;
 
     /**
      * 非常满意
      */
     @Excel(name = "非常满意")
-    @ApiModelProperty("非常满意")
+
     private Long veryNum;
 
     /**
      * 满意
      */
     @Excel(name = "满意")
-    @ApiModelProperty("满意")
+
     private Long satisfyNum;
 
     /**
      * 一般
      */
     @Excel(name = "一般")
-    @ApiModelProperty("一般")
+
     private Long sameNum;
 
     /**
      * 不满意
      */
     @Excel(name = "不满意")
-    @ApiModelProperty("不满意")
+
     private Long unsatisfiedNum;
 
     /**
      * 0菜品卫生 1菜品口味 2服务态度 3餐具卫生 4菜品种类 5就餐体验
      */
     @Excel(name = "0菜品卫生 1菜品口味 2服务态度 3餐具卫生 4菜品种类 5就餐体验")
-    @ApiModelProperty("0菜品卫生 1菜品口味 2服务态度 3餐具卫生 4菜品种类 5就餐体验")
+
     private Integer type;
 
 }

+ 8 - 10
project-zcustom/src/main/java/com/project/zcustom/domain/smart/PlatGreenSmartEnergy.java

@@ -1,15 +1,13 @@
 package com.project.zcustom.domain.smart;
 
-import com.project.common.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.project.common.annotation.Excel;
 import com.project.common.core.domain.CustomBaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 /**
  * 能耗信息对象 plat_green_smart_energy
@@ -22,49 +20,49 @@ import io.swagger.annotations.ApiModelProperty;
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = false)
 @TableName("large_plat_green_smart_energy")
-@ApiModel(value = "large_plat_green_smart_energy实体类")
+
 public class PlatGreenSmartEnergy extends CustomBaseEntity {
 
     /**
      * 主键id
      */
     @TableId(value = "id")
-    @ApiModelProperty("主键id")
+
     private Long id;
 
     /**
      * 地区编码
      */
     @Excel(name = "地区编码")
-    @ApiModelProperty("地区编码")
+
     private String appOrg;
 
     /**
      * 食堂名称
      */
     @Excel(name = "食堂名称")
-    @ApiModelProperty("食堂名称")
+
     private String canteenName;
 
     /**
      * 食堂用水量
      */
     @Excel(name = "食堂用水量")
-    @ApiModelProperty("食堂用水量")
+
     private Long waterConsumptionNum;
 
     /**
      * 食堂用热量
      */
     @Excel(name = "食堂用热量")
-    @ApiModelProperty("食堂用热量")
+
     private Long quantityHeatNum;
 
     /**
      * 食堂用气量
      */
     @Excel(name = "食堂用气量")
-    @ApiModelProperty("食堂用气量")
+
     private Long gasVolumeNum;
 
 }

+ 23 - 25
project-zcustom/src/main/java/com/project/zcustom/domain/smart/PlatGreenSmartOther.java

@@ -1,15 +1,13 @@
 package com.project.zcustom.domain.smart;
 
-import com.project.common.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.project.common.annotation.Excel;
 import com.project.common.core.domain.CustomBaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 /**
  * 绿智食堂 其他参数对象 plat_green_smart_other
@@ -22,154 +20,154 @@ import io.swagger.annotations.ApiModelProperty;
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = false)
 @TableName("large_plat_green_smart_other")
-@ApiModel(value = "large_plat_green_smart_other实体类")
+
 public class PlatGreenSmartOther extends CustomBaseEntity {
 
     /**
      * 主键id
      */
     @TableId(value = "id")
-    @ApiModelProperty("主键id")
+
     private Long id;
 
     /**
      * 地区编码
      */
     @Excel(name = "地区编码")
-    @ApiModelProperty("地区编码")
+
     private String appOrg;
 
     /**
      * 绿智食堂参评食堂情况--参评绿智食堂
      */
     @Excel(name = "绿智食堂参评食堂情况--参评绿智食堂")
-    @ApiModelProperty("绿智食堂参评食堂情况--参评绿智食堂")
+
     private Long participateNum;
 
     /**
      * 绿智食堂参评食堂情况--已完成单位
      */
     @Excel(name = "绿智食堂参评食堂情况--已完成单位")
-    @ApiModelProperty("绿智食堂参评食堂情况--已完成单位")
+
     private Long completedNum;
 
     /**
      * 就餐情况--早餐
      */
     @Excel(name = "就餐情况--早餐")
-    @ApiModelProperty("就餐情况--早餐")
+
     private Long actualDiningNum;
 
     /**
      * 就餐情况--午餐
      */
     @Excel(name = "就餐情况--午餐")
-    @ApiModelProperty("就餐情况--午餐")
+
     private Long lunchNum;
 
     /**
      * 就餐情况--晚餐
      */
     @Excel(name = "就餐情况--晚餐")
-    @ApiModelProperty("就餐情况--晚餐")
+
     private Long dinnerNum;
 
     /**
      * 电子餐券--早
      */
     @Excel(name = "电子餐券--早")
-    @ApiModelProperty("电子餐券--早")
+
     private Long morningNum;
 
     /**
      * 电子餐券--中
      */
     @Excel(name = "电子餐券--中")
-    @ApiModelProperty("电子餐券--中")
+
     private Long noonNum;
 
     /**
      * 电子餐券--晚
      */
     @Excel(name = "电子餐券--晚")
-    @ApiModelProperty("电子餐券--晚")
+
     private Long nightNum;
 
     /**
      * 菜品信息--每日菜谱
      */
     @Excel(name = "菜品信息--每日菜谱")
-    @ApiModelProperty("菜品信息--每日菜谱")
+
     private Long dailyMenuNum;
 
     /**
      * 菜品信息--周菜食谱
      */
     @Excel(name = "菜品信息--周菜食谱")
-    @ApiModelProperty("菜品信息--周菜食谱")
+
     private Long weeklyCuisineNum;
 
     /**
      * 其它数据信息--菜品投票参与人数
      */
     @Excel(name = "其它数据信息--菜品投票参与人数")
-    @ApiModelProperty("其它数据信息--菜品投票参与人数")
+
     private Long foodVotingNum;
 
     /**
      * 其它数据信息--光盘行动参与人数
      */
     @Excel(name = "其它数据信息--光盘行动参与人数")
-    @ApiModelProperty("其它数据信息--光盘行动参与人数")
+
     private Long clearPlateNum;
 
     /**
      * 其它数据信息--厨艺交流上传数量
      */
     @Excel(name = "其它数据信息--厨艺交流上传数量")
-    @ApiModelProperty("其它数据信息--厨艺交流上传数量")
+
     private Long culinaryExchangeNum;
 
     /**
      * 智慧食堂--外卖
      */
     @Excel(name = "智慧食堂--外卖")
-    @ApiModelProperty("智慧食堂--外卖")
+
     private Long takeOutFoodNum;
 
     /**
      * 智慧食堂--自选食品
      */
     @Excel(name = "智慧食堂--自选食品")
-    @ApiModelProperty("智慧食堂--自选食品")
+
     private Long selfFoodNum;
 
     /**
      * 智慧食堂--节日特供
      */
     @Excel(name = "智慧食堂--节日特供")
-    @ApiModelProperty("智慧食堂--节日特供")
+
     private Long holidaySpecialNum;
 
     /**
      * 员工服务--茶歇服务
      */
     @Excel(name = "员工服务--茶歇服务")
-    @ApiModelProperty("员工服务--茶歇服务")
+
     private Long breakServiceNum;
 
     /**
      * 员工服务--洗衣服务
      */
     @Excel(name = "员工服务--洗衣服务")
-    @ApiModelProperty("员工服务--洗衣服务")
+
     private Long laundryServiceNum;
 
     /**
      * 员工服务--理发服务
      */
     @Excel(name = "员工服务--理发服务")
-    @ApiModelProperty("员工服务--理发服务")
+
     private Long barberServiceNum;
 
 }

+ 7 - 9
project-zcustom/src/main/java/com/project/zcustom/domain/smart/PlatGreenSmartRank.java

@@ -1,15 +1,13 @@
 package com.project.zcustom.domain.smart;
 
-import com.project.common.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.project.common.annotation.Excel;
 import com.project.common.core.domain.CustomBaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 /**
  * 绿智食堂 排名对象 plat_green_smart_rank
@@ -22,42 +20,42 @@ import io.swagger.annotations.ApiModelProperty;
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = false)
 @TableName("large_plat_green_smart_rank")
-@ApiModel(value = "large_plat_green_smart_rank实体类")
+
 public class PlatGreenSmartRank extends CustomBaseEntity {
 
     /**
      * 主键id
      */
     @TableId(value = "id")
-    @ApiModelProperty("主键id")
+
     private Long id;
 
     /**
      * 地区编码
      */
     @Excel(name = "地区编码")
-    @ApiModelProperty("地区编码")
+
     private String appOrg;
 
     /**
      * 类型 0 热销菜品
      */
     @Excel(name = "类型 0 热销菜品")
-    @ApiModelProperty("类型 0 热销菜品")
+
     private Integer type;
 
     /**
      * 参数名称
      */
     @Excel(name = "参数名称")
-    @ApiModelProperty("参数名称")
+
     private String paramsName;
 
     /**
      * 参数值
      */
     @Excel(name = "参数值")
-    @ApiModelProperty("参数值")
+
     private Long paramsValue;
 
 }

+ 13 - 15
project-zcustom/src/main/java/com/project/zcustom/domain/smart/PlatGreenSmartSafety.java

@@ -1,18 +1,16 @@
 package com.project.zcustom.domain.smart;
 
-import java.math.BigDecimal;
-
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.project.common.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.project.common.annotation.Excel;
 import com.project.common.core.domain.CustomBaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
 
 /**
  * 食堂安全管理对象 plat_green_smart_safety
@@ -25,21 +23,21 @@ import io.swagger.annotations.ApiModelProperty;
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = false)
 @TableName("large_plat_green_smart_safety")
-@ApiModel(value = "large_plat_green_smart_safety实体类")
+
 public class PlatGreenSmartSafety extends CustomBaseEntity {
 
     /**
      * 主键id
      */
     @TableId(value = "id")
-    @ApiModelProperty("主键id")
+
     private Long id;
 
     /**
      * 食堂数量
      */
     @Excel(name = "食堂数量")
-    @ApiModelProperty("食堂数量")
+
     @TableField(exist = false)
     private Long canteenCount;
 
@@ -47,49 +45,49 @@ public class PlatGreenSmartSafety extends CustomBaseEntity {
      * 地区编码
      */
     @Excel(name = "地区编码")
-    @ApiModelProperty("地区编码")
+
     private String appOrg;
 
     /**
      * 食堂名称
      */
     @Excel(name = "食堂名称")
-    @ApiModelProperty("食堂名称")
+
     private String canteenName;
 
     /**
      * 食品留样数量
      */
     @Excel(name = "食品留样数量")
-    @ApiModelProperty("食品留样数量")
+
     private Long sampleNum;
 
     /**
      * 食材抽检结果阳性
      */
     @Excel(name = "食材抽检结果阳性")
-    @ApiModelProperty("食材抽检结果阳性")
+
     private Long positiveNum;
 
     /**
      * 食材抽检结果阴性
      */
     @Excel(name = "食材抽检结果阴性")
-    @ApiModelProperty("食材抽检结果阴性")
+
     private Long negativeNum;
 
     /**
      * 食材抽检合格率
      */
     @Excel(name = "食材抽检合格率")
-    @ApiModelProperty("食材抽检合格率")
+
     private BigDecimal ingredientsRate;
 
     /**
      * 食品留样合格率
      */
     @Excel(name = "食品留样合格率")
-    @ApiModelProperty("食品留样合格率")
+
     private BigDecimal leaveSampleRate;
 
 }

+ 15 - 17
project-zcustom/src/main/java/com/project/zcustom/domain/video/ScreenUnifiedVideo.java

@@ -4,103 +4,101 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
 
 
-@ApiModel(value = "统一视频监控平台列表", description = "统一视频监控平台列表")
+
 @Data
 @TableName("screen_unified_video")
 public class ScreenUnifiedVideo implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "主键")
+
     @TableId(value = "id", type = IdType.ASSIGN_UUID)
     private String id;
 
     /**
      * 设备名称
      */
-    @ApiModelProperty("设备名称")
+
     private String name;
 
     /**
      * 设备编码
      */
-    @ApiModelProperty("设备编码")
+
     private String code;
 
     /**
      * 码流
      */
-    @ApiModelProperty("码流")
+
     private String bitstream;
 
     /**
      * 设备简称
      */
-    @ApiModelProperty("设备简称")
+
     private String abbreviation;
 
     /**
      * 设备说明
      */
-    @ApiModelProperty("设备说明")
+
     private String deviceDescribe;
 
     /**
      * 设备状态(1在线,2离线,3故障,4旁路)
      */
-    @ApiModelProperty("设备状态(1在线,2离线,3故障,4旁路)")
+
     private Integer status;
 
     /**
      * 是否启用(1是,2否)
      */
-    @ApiModelProperty("是否启用(1是,2否)")
+
     private Integer enableFlag;
 
     /**
      * 安装时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty("安装时间")
+
     private Date installTime;
 
     /**
      * 废弃时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty("废弃时间")
+
     private Date discardTime;
 
     /**
      * 创建人
      */
-    @ApiModelProperty("创建人")
+
     private String createId;
 
     /**
      * 修改人
      */
-    @ApiModelProperty("修改人")
+
     private String updateId;
 
     /**
      * 是否删除
      */
-    @ApiModelProperty("是否删除")
+
     private Integer isDelete;
 
     /**
      * 乐观锁
      */
-    @ApiModelProperty("乐观锁")
+
     private Integer optimisticLockVersion;
 
 

+ 7 - 9
project-zcustom/src/main/java/com/project/zcustom/domain/video/ZnhqWebcam.java

@@ -3,37 +3,35 @@ package com.project.zcustom.domain.video;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
 
 
-@ApiModel(value = "智能后勤摄像头直播对象", description = "智能后勤摄像头直播对象")
+
 @Data
 @TableName("znhq_webcam")
 public class ZnhqWebcam implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "主键")
+
     @TableId(value = "id", type = IdType.ASSIGN_UUID)
     private String id;
 
-    @ApiModelProperty(value = "摄像头RTSP流地址")
+
     private String url;
 
-    @ApiModelProperty(value = "摄像头编码")
+
     private String videoCode;
 
-    @ApiModelProperty(value = "1海康")
+
     private Integer type;
 
-    @ApiModelProperty(value = "分辨率")
+
     private String resolution;
 
-    @ApiModelProperty(value = "名称")
+
     private String name;
 
 

+ 23 - 0
project-zcustom/src/main/java/com/project/zcustom/mapper/car/PlatCarMapper.java

@@ -0,0 +1,23 @@
+package com.project.zcustom.mapper.car;
+
+import com.project.zcustom.domain.addional.*;
+
+import java.util.List;
+
+public interface PlatCarMapper {
+    LargeCar getResource(String appOrg);
+
+    List<LargeCarDetail> getCarDetail(String appOrg, Long flag);
+
+    LargeCar getMonitor(String appOrg);
+
+    List<LargeWarnDetail> getWarnDetail(String appOrg);
+
+    LargeCar getOperationManageTopHalf(String appOrg);
+
+    List<LargeUnitRank> getUnitRankTop(String appOrg);
+
+    List<LargeUnitRank> getUnitRankLast(String appOrg);
+
+    List<LargeCarRank> getCarRank(String appOrg);
+}

+ 8 - 0
project-zcustom/src/main/java/com/project/zcustom/mapper/unit/LargeCarDetailMapper.java

@@ -0,0 +1,8 @@
+package com.project.zcustom.mapper.unit;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.project.zcustom.domain.addional.LargeCar;
+import com.project.zcustom.domain.addional.LargeCarDetail;
+
+public interface LargeCarDetailMapper extends BaseMapper<LargeCarDetail> {
+}

+ 8 - 0
project-zcustom/src/main/java/com/project/zcustom/mapper/unit/LargeCarRankMapper.java

@@ -0,0 +1,8 @@
+package com.project.zcustom.mapper.unit;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.project.zcustom.domain.addional.LargeCarRank;
+
+public interface LargeCarRankMapper extends BaseMapper<LargeCarRank>{
+
+}

+ 13 - 0
project-zcustom/src/main/java/com/project/zcustom/mapper/unit/LargePublicCarMapper.java

@@ -0,0 +1,13 @@
+package com.project.zcustom.mapper.unit;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.project.zcustom.domain.addional.LargeCar;
+
+import java.util.List;
+
+public interface LargePublicCarMapper extends BaseMapper<LargeCar>
+{
+
+}

+ 9 - 0
project-zcustom/src/main/java/com/project/zcustom/mapper/unit/LargeUnitRankMapper.java

@@ -0,0 +1,9 @@
+package com.project.zcustom.mapper.unit;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.project.zcustom.domain.addional.LargeUnitRank;
+
+public interface LargeUnitRankMapper extends BaseMapper<LargeUnitRank>
+{
+
+}

+ 7 - 0
project-zcustom/src/main/java/com/project/zcustom/mapper/unit/LargeWarnDetailMapper.java

@@ -0,0 +1,7 @@
+package com.project.zcustom.mapper.unit;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.project.zcustom.domain.addional.LargeWarnDetail;
+
+public interface LargeWarnDetailMapper extends BaseMapper<LargeWarnDetail> {
+}

+ 17 - 0
project-zcustom/src/main/java/com/project/zcustom/service/car/ILargePlatCarService.java

@@ -0,0 +1,17 @@
+package com.project.zcustom.service.car;
+
+import com.project.zcustom.domain.addional.LargeCar;
+import com.project.zcustom.domain.addional.LargeCarDetail;
+import com.project.zcustom.domain.addional.LargeWarnDetail;
+
+import java.util.List;
+import java.util.Map;
+
+public interface ILargePlatCarService {
+    LargeCar getResource(String appOrg);
+    List<LargeCarDetail> getCarDetail(String appOrg, Long flag);
+    LargeCar getMonitor(String appOrg);
+    List<LargeWarnDetail> getWarnDetail(String appOrg);
+    LargeCar getOperationManageTopHalf(String appOrg);
+    Map<String, Object> getOperationManageLastHalf(String appOrg);
+}

+ 55 - 0
project-zcustom/src/main/java/com/project/zcustom/service/car/Impl/LargePlatCarServiceImpl.java

@@ -0,0 +1,55 @@
+package com.project.zcustom.service.car.Impl;
+
+import com.project.zcustom.domain.addional.*;
+import com.project.zcustom.mapper.car.PlatCarMapper;
+import com.project.zcustom.service.car.ILargePlatCarService;
+import com.project.zcustom.service.logistics.ILargeHousingLandService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Service
+public class LargePlatCarServiceImpl implements ILargePlatCarService {
+
+    @Autowired
+    private PlatCarMapper platCarMapper;
+
+    public LargeCar getResource(String appOrg){
+        return platCarMapper.getResource(appOrg);
+    }
+
+    public List<LargeCarDetail> getCarDetail(String appOrg, Long flag){
+        return platCarMapper.getCarDetail(appOrg, flag);
+    }
+
+    public LargeCar getMonitor(String appOrg){
+        return platCarMapper.getMonitor(appOrg);
+    }
+
+    public List<LargeWarnDetail> getWarnDetail(String appOrg){
+        return platCarMapper.getWarnDetail(appOrg);
+    }
+
+    public LargeCar getOperationManageTopHalf(String appOrg){
+        return platCarMapper.getOperationManageTopHalf(appOrg);
+    }
+
+    public Map<String, Object> getOperationManageLastHalf(String appOrg){
+        Map<String, Object> map = new HashMap<>();
+        List<LargeUnitRank> list1 = platCarMapper.getUnitRankTop(appOrg);
+        map.put("x1", list1.stream().map(LargeUnitRank::getGwcCount).collect(Collectors.toList()));
+        map.put("y1", list1.stream().map(LargeUnitRank::getGwcPcd).collect(Collectors.toList()));
+        map.put("z1", list1.stream().map(LargeUnitRank::getAppName).collect(Collectors.toList()));
+        List<LargeUnitRank> list2 = platCarMapper.getUnitRankLast(appOrg);
+        map.put("x2", list2.stream().map(LargeUnitRank::getGwcCount).collect(Collectors.toList()));
+        map.put("y2", list2.stream().map(LargeUnitRank::getGwcPcd).collect(Collectors.toList()));
+        map.put("z2", list2.stream().map(LargeUnitRank::getAppName).collect(Collectors.toList()));
+        map.put("list", platCarMapper.getCarRank(appOrg));
+        return map;
+    }
+}

+ 7 - 0
project-zcustom/src/main/java/com/project/zcustom/service/smart/IPlatGreenSmartService.java

@@ -125,6 +125,13 @@ public interface IPlatGreenSmartService extends IService<PlatGreenSmart> {
     public Map<String, Object> getCanteenDegreeData(String appOrg);
 
     /**
+     * 食堂服务人员情况
+     * @param appOrg
+     * @return
+     */
+    public List<Map<String, Object>> getCanteenStaff(String appOrg);
+
+    /**
      * 各单位统计排行
      * @param appOrg
      * @return

+ 21 - 0
project-zcustom/src/main/java/com/project/zcustom/service/smart/impl/PlatGreenSmartServiceImpl.java

@@ -378,6 +378,27 @@ public class PlatGreenSmartServiceImpl extends ServiceImpl<PlatGreenSmartMapper,
         return tempMap;
     }
 
+    public List<Map<String, Object>> getCanteenStaff(String appOrg){
+        QueryWrapper<PlatGreenSmart> queryWrapper = new QueryWrapper<>();
+        if(!Objects.equals(appOrg,"0000")){
+            queryWrapper.eq("app_org",appOrg);
+        }
+        List<PlatGreenSmart> smartInfo = this.list(queryWrapper);
+        List<Map<String, Object>> list = new ArrayList<>();
+        for (PlatGreenSmart it : smartInfo){
+            Map<String, Object> tempMap = new HashMap<>();
+            if (StringUtils.isNull(it)) {
+                StringUtils.getMapData("厨师人数", "chefs", 0, tempMap);
+                StringUtils.getMapData("服务人员", "service", 0, tempMap);
+            }else{
+                StringUtils.getMapData("厨师人数", "chefs", it.getChefsNum(), tempMap);
+                StringUtils.getMapData("服务人员", "service", it.getServiceNum(), tempMap);
+            }
+            list.add(tempMap);
+        }
+        return list;
+    }
+
     /**
      * 各单位统计排行
      * @param appOrg

+ 81 - 0
project-zcustom/src/main/java/com/project/zcustom/service/unit/ILargeCarDetailService.java

@@ -0,0 +1,81 @@
+package com.project.zcustom.service.unit;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.project.common.core.domain.search.PageParamVo;
+import com.project.zcustom.domain.addional.LargeCar;
+import com.project.zcustom.domain.addional.LargeCarDetail;
+
+import java.util.List;
+
+public interface ILargeCarDetailService extends IService<LargeCarDetail> {
+
+    /**
+     * 分页查询公务用车年度增加减少列表
+     *
+     * @param largeCarDetail 公务用车年度增加减少
+     * @return 公务用车年度增加减少集合
+     */
+    public IPage<LargeCarDetail> pagingLargeCarDetailList(LargeCarDetail largeCarDetail);
+
+    /**
+     * 分页查询公务用车年度增加减少列表
+     *
+     * @param lqw
+     * @return 公务用车年度增加减少集合
+     */
+    public IPage<LargeCarDetail> pagingLargeCarDetailList(PageParamVo pageParamVo, LambdaQueryWrapper<LargeCarDetail> lqw);
+
+    /**
+     * 查询公务用车年度增加减少列表
+     *
+     * @param largeCarDetail 公务用车年度增加减少
+     * @return 公务用车年度增加减少集合
+     */
+    public List<LargeCarDetail> selectLargeCarDetailList(LargeCarDetail largeCarDetail);
+
+    /**
+     * 查询公务用车年度增加减少列表
+     *
+     * @param largeCarDetail 公务用车年度增加减少
+     * @return 公务用车年度增加减少集合
+     */
+    public List<LargeCarDetail> selectLargeCarDetailList(LargeCarDetail largeCarDetail,Long limitNum);
+
+    /**
+     * 根据指定字段查询信息
+     *
+     * @param field 字段名称
+     * @param filedValue 字段值
+     * @return 公务用车年度增加减少
+     */
+    public LargeCarDetail getLargeCarDetailByField(String field, String filedValue);
+
+    /**
+     * 根据指定字段查询信息列表
+     *
+     * @param field 字段名称
+     * @param filedValue 字段值
+     * @return 公务用车年度增加减少
+     */
+    public List<LargeCarDetail> selectLargeCarDetailListByField(String field, String filedValue);
+
+    /**
+     * 根据指定字段查询信息列表
+     *
+     * @param field 字段名称
+     * @param filedValue 字段值
+     * @return 公务用车年度增加减少
+     */
+    public List<LargeCarDetail> selectLargeCarDetailListByField(String field, String filedValue,Long limitNum);
+
+    /**
+     *判断指定字段值是否存在
+     *
+     * @param field 字段名称
+     * @param filedValue 字段值
+     */
+    public void checkFieldExist(String field, String filedValue,String tips,Long id);
+
+}

+ 80 - 0
project-zcustom/src/main/java/com/project/zcustom/service/unit/ILargeCarRankService.java

@@ -0,0 +1,80 @@
+package com.project.zcustom.service.unit;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.project.common.core.domain.search.PageParamVo;
+import com.project.zcustom.domain.addional.LargeCarRank;
+
+import java.util.List;
+
+public interface ILargeCarRankService extends IService<LargeCarRank> {
+
+    /**
+     * 分页查询公务用车列表
+     *
+     * @param largeCarRank 公务用车
+     * @return 公务用车集合
+     */
+    public IPage<LargeCarRank> pagingLargeCarRankList(LargeCarRank largeCarRank);
+
+    /**
+     * 分页查询公务用车列表
+     *
+     * @param lqw
+     * @return 公务用车集合
+     */
+    public IPage<LargeCarRank> pagingLargeCarRankList(PageParamVo pageParamVo, LambdaQueryWrapper<LargeCarRank> lqw);
+
+    /**
+     * 查询公务用车列表
+     *
+     * @param largeCarRank 公务用车
+     * @return 公务用车集合
+     */
+    public List<LargeCarRank> selectLargeCarRankList(LargeCarRank largeCarRank);
+
+    /**
+     * 查询公务用车列表
+     *
+     * @param largeCarRank 公务用车
+     * @return 公务用车集合
+     */
+    public List<LargeCarRank> selectLargeCarRankList(LargeCarRank largeCarRank,Long limitNum);
+
+    /**
+     * 根据指定字段查询信息
+     *
+     * @param field 字段名称
+     * @param filedValue 字段值
+     * @return 公务用车
+     */
+    public LargeCarRank getLargeCarRankByField(String field, String filedValue);
+
+    /**
+     * 根据指定字段查询信息列表
+     *
+     * @param field 字段名称
+     * @param filedValue 字段值
+     * @return 公务用车
+     */
+    public List<LargeCarRank> selectLargeCarRankListByField(String field, String filedValue);
+
+    /**
+     * 根据指定字段查询信息列表
+     *
+     * @param field 字段名称
+     * @param filedValue 字段值
+     * @return 公务用车
+     */
+    public List<LargeCarRank> selectLargeCarRankListByField(String field, String filedValue, Long limitNum);
+
+    /**
+     *判断指定字段值是否存在
+     *
+     * @param field 字段名称
+     * @param filedValue 字段值
+     */
+    public void checkFieldExist(String field, String filedValue,String tips,Long id);
+
+}

+ 80 - 0
project-zcustom/src/main/java/com/project/zcustom/service/unit/ILargePublicCarService.java

@@ -0,0 +1,80 @@
+package com.project.zcustom.service.unit;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.project.common.core.domain.search.PageParamVo;
+import com.project.zcustom.domain.addional.LargeCar;
+
+import java.util.List;
+
+public interface ILargePublicCarService extends IService<LargeCar> {
+
+    /**
+     * 分页查询公务用车列表
+     *
+     * @param largeCar 公务用车
+     * @return 公务用车集合
+     */
+    public IPage<LargeCar> pagingLargeCarList(LargeCar largeCar);
+
+    /**
+     * 分页查询公务用车列表
+     *
+     * @param lqw
+     * @return 公务用车集合
+     */
+    public IPage<LargeCar> pagingLargeCarList(PageParamVo pageParamVo, LambdaQueryWrapper<LargeCar> lqw);
+
+    /**
+     * 查询公务用车列表
+     *
+     * @param largeCar 公务用车
+     * @return 公务用车集合
+     */
+    public List<LargeCar> selectLargeCarList(LargeCar largeCar);
+
+    /**
+     * 查询公务用车列表
+     *
+     * @param largeCar 公务用车
+     * @return 公务用车集合
+     */
+    public List<LargeCar> selectLargeCarList(LargeCar largeCar,Long limitNum);
+
+    /**
+     * 根据指定字段查询信息
+     *
+     * @param field 字段名称
+     * @param filedValue 字段值
+     * @return 公务用车
+     */
+    public LargeCar getLargeCarByField(String field, String filedValue);
+
+    /**
+     * 根据指定字段查询信息列表
+     *
+     * @param field 字段名称
+     * @param filedValue 字段值
+     * @return 公务用车
+     */
+    public List<LargeCar> selectLargeCarListByField(String field, String filedValue);
+
+    /**
+     * 根据指定字段查询信息列表
+     *
+     * @param field 字段名称
+     * @param filedValue 字段值
+     * @return 公务用车
+     */
+    public List<LargeCar> selectLargeCarListByField(String field, String filedValue,Long limitNum);
+
+    /**
+     *判断指定字段值是否存在
+     *
+     * @param field 字段名称
+     * @param filedValue 字段值
+     */
+    public void checkFieldExist(String field, String filedValue,String tips,Long id);
+
+}

+ 79 - 0
project-zcustom/src/main/java/com/project/zcustom/service/unit/ILargeUnitRankService.java

@@ -0,0 +1,79 @@
+package com.project.zcustom.service.unit;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.project.common.core.domain.search.PageParamVo;
+import com.project.zcustom.domain.addional.LargeUnitRank;
+
+import java.util.List;
+
+public interface ILargeUnitRankService extends IService<LargeUnitRank> {
+
+    /**
+     * 分页查询公务用车列表
+     *
+     * @param largeUnitRank 公务用车
+     * @return 公务用车集合
+     */
+    public IPage<LargeUnitRank> pagingLargeUnitRankList(LargeUnitRank largeUnitRank);
+
+    /**
+     * 分页查询公务用车列表
+     *
+     * @param lqw
+     * @return 公务用车集合
+     */
+    public IPage<LargeUnitRank> pagingLargeUnitRankList(PageParamVo pageParamVo, LambdaQueryWrapper<LargeUnitRank> lqw);
+
+    /**
+     * 查询公务用车列表
+     *
+     * @param largeUnitRank 公务用车
+     * @return 公务用车集合
+     */
+    public List<LargeUnitRank> selectLargeUnitRankList(LargeUnitRank largeUnitRank);
+
+    /**
+     * 查询公务用车列表
+     *
+     * @param largeUnitRank 公务用车
+     * @return 公务用车集合
+     */
+    public List<LargeUnitRank> selectLargeUnitRankList(LargeUnitRank largeUnitRank,Long limitNum);
+
+    /**
+     * 根据指定字段查询信息
+     *
+     * @param field 字段名称
+     * @param filedValue 字段值
+     * @return 公务用车
+     */
+    public LargeUnitRank getLargeUnitRankByField(String field, String filedValue);
+
+    /**
+     * 根据指定字段查询信息列表
+     *
+     * @param field 字段名称
+     * @param filedValue 字段值
+     * @return 公务用车
+     */
+    public List<LargeUnitRank> selectLargeUnitRankListByField(String field, String filedValue);
+
+    /**
+     * 根据指定字段查询信息列表
+     *
+     * @param field 字段名称
+     * @param filedValue 字段值
+     * @return 公务用车
+     */
+    public List<LargeUnitRank> selectLargeUnitRankListByField(String field, String filedValue, Long limitNum);
+
+    /**
+     *判断指定字段值是否存在
+     *
+     * @param field 字段名称
+     * @param filedValue 字段值
+     */
+    public void checkFieldExist(String field, String filedValue,String tips,Long id);
+}

+ 80 - 0
project-zcustom/src/main/java/com/project/zcustom/service/unit/ILargeWarnDetailService.java

@@ -0,0 +1,80 @@
+package com.project.zcustom.service.unit;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.project.common.core.domain.search.PageParamVo;
+import com.project.zcustom.domain.addional.LargeWarnDetail;
+
+import java.util.List;
+
+public interface ILargeWarnDetailService extends IService<LargeWarnDetail> {
+
+    /**
+     * 分页查询公务用车预警明细列表
+     *
+     * @param largeWarnDetail 公务用车预警明细
+     * @return 公务用车预警明细集合
+     */
+    public IPage<LargeWarnDetail> pagingLargeWarnDetailList(LargeWarnDetail largeWarnDetail);
+
+    /**
+     * 分页查询公务用车预警明细列表
+     *
+     * @param lqw
+     * @return 公务用车预警明细集合
+     */
+    public IPage<LargeWarnDetail> pagingLargeWarnDetailList(PageParamVo pageParamVo, LambdaQueryWrapper<LargeWarnDetail> lqw);
+
+    /**
+     * 查询公务用车预警明细列表
+     *
+     * @param largeWarnDetail 公务用车预警明细
+     * @return 公务用车预警明细集合
+     */
+    public List<LargeWarnDetail> selectLargeWarnDetailList(LargeWarnDetail largeWarnDetail);
+
+    /**
+     * 查询公务用车预警明细列表
+     *
+     * @param largeWarnDetail 公务用车预警明细
+     * @return 公务用车预警明细集合
+     */
+    public List<LargeWarnDetail> selectLargeWarnDetailList(LargeWarnDetail largeWarnDetail, Long limitNum);
+
+    /**
+     * 根据指定字段查询信息
+     *
+     * @param field      字段名称
+     * @param filedValue 字段值
+     * @return 公务用车预警明细
+     */
+    public LargeWarnDetail getLargeWarnDetailByField(String field, String filedValue);
+
+    /**
+     * 根据指定字段查询信息列表
+     *
+     * @param field      字段名称
+     * @param filedValue 字段值
+     * @return 公务用车预警明细
+     */
+    public List<LargeWarnDetail> selectLargeWarnDetailListByField(String field, String filedValue);
+
+    /**
+     * 根据指定字段查询信息列表
+     *
+     * @param field      字段名称
+     * @param filedValue 字段值
+     * @return 公务用车预警明细
+     */
+    public List<LargeWarnDetail> selectLargeWarnDetailListByField(String field, String filedValue, Long limitNum);
+
+    /**
+     * 判断指定字段值是否存在
+     *
+     * @param field      字段名称
+     * @param filedValue 字段值
+     */
+    public void checkFieldExist(String field, String filedValue, String tips, Long id);
+}
+

+ 171 - 0
project-zcustom/src/main/java/com/project/zcustom/service/unit/impl/LargeCarDetailServiceImpl.java

@@ -0,0 +1,171 @@
+package com.project.zcustom.service.unit.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.project.common.core.domain.search.PageParamVo;
+import com.project.common.utils.StringUtils;
+import com.project.zcustom.domain.addional.LargeCar;
+import com.project.zcustom.domain.addional.LargeCarDetail;
+import com.project.zcustom.mapper.unit.LargeCarDetailMapper;
+import com.project.zcustom.mapper.unit.LargePublicCarMapper;
+import com.project.zcustom.service.unit.ILargeCarDetailService;
+import com.project.zcustom.service.unit.ILargePublicCarService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class LargeCarDetailServiceImpl extends ServiceImpl<LargeCarDetailMapper, LargeCarDetail> implements ILargeCarDetailService {
+    /**
+     * 组装查询条件
+     */
+    private LambdaQueryWrapper<LargeCarDetail> getLambdaQueryWrapper(LargeCarDetail largeCarDetail) {
+        LambdaQueryWrapper<LargeCarDetail> lqw = new LambdaQueryWrapper<LargeCarDetail>();
+        if (StringUtils.isNotBlank(largeCarDetail.getAppEncode())){
+            lqw.eq(LargeCarDetail::getAppEncode ,largeCarDetail.getAppEncode());
+        }
+        if (StringUtils.isNotNull(largeCarDetail.getVehicleNum())){
+            lqw.eq(LargeCarDetail::getVehicleNum ,largeCarDetail.getVehicleNum());
+        }
+        if (StringUtils.isNotBlank(largeCarDetail.getUseProperty())){
+            lqw.eq(LargeCarDetail::getUseProperty ,largeCarDetail.getUseProperty());
+        }
+        if (StringUtils.isNotBlank(largeCarDetail.getAssetsCard())){
+            lqw.eq(LargeCarDetail::getAssetsCard ,largeCarDetail.getAssetsCard());
+        }
+        if (StringUtils.isNotNull(largeCarDetail.getOrgDate())){
+            lqw.eq(LargeCarDetail::getOrgDate ,largeCarDetail.getOrgDate());
+        }
+        if (StringUtils.isNotNull(largeCarDetail.getHandleDate())){
+            lqw.eq(LargeCarDetail::getHandleDate ,largeCarDetail.getHandleDate());
+        }
+        if (StringUtils.isNotBlank(largeCarDetail.getHandleReason())){
+            lqw.eq(LargeCarDetail::getHandleReason ,largeCarDetail.getHandleReason());
+        }
+        if (StringUtils.isNotNull(largeCarDetail.getFlag())){
+            lqw.eq(LargeCarDetail::getFlag ,largeCarDetail.getFlag());
+        }
+        return lqw;
+    }
+
+    /**
+     * 分页查询公务用车年度增加减少列表
+     *
+     * @param largeCarDetail 公务用车年度增加减少
+     * @return 公务用车年度增加减少集合
+     */
+    @Override
+    public IPage<LargeCarDetail> pagingLargeCarDetailList(LargeCarDetail largeCarDetail) {
+        IPage<LargeCarDetail> page = new Page<>(largeCarDetail.getPageNum(), largeCarDetail.getPageSize());
+        LambdaQueryWrapper<LargeCarDetail> lqw = getLambdaQueryWrapper(largeCarDetail);
+        // 排序 默认时间倒序
+        lqw.orderByDesc(LargeCarDetail::getCreateTime);
+        return baseMapper.selectPage(page, lqw);
+    }
+
+    /**
+     * 分页查询公务用车年度增加减少列表
+     *
+     * @param lqw
+     * @return 公务用车年度增加减少集合
+     */
+    @Override
+    public IPage<LargeCarDetail> pagingLargeCarDetailList(PageParamVo pageParamVo, LambdaQueryWrapper<LargeCarDetail> lqw) {
+        IPage<LargeCarDetail> page = new Page<>(pageParamVo.getPageNum(), pageParamVo.getPageSize());
+        // 排序 默认时间倒序
+        lqw.orderByDesc(LargeCarDetail::getCreateTime);
+        return baseMapper.selectPage(page, lqw);
+    }
+
+    /**
+     * 查询公务用车年度增加减少列表
+     *
+     * @param largeCarDetail 公务用车年度增加减少
+     * @return 公务用车年度增加减少
+     */
+    @Override
+    public List<LargeCarDetail> selectLargeCarDetailList(LargeCarDetail largeCarDetail) {
+        LambdaQueryWrapper<LargeCarDetail> lqw = getLambdaQueryWrapper(largeCarDetail);
+        // 排序 默认时间倒序
+        lqw.orderByDesc(LargeCarDetail::getCreateTime);
+        return baseMapper.selectList(lqw);
+    }
+
+    /**
+     * 查询公务用车年度增加减少列表
+     *
+     * @param largeCarDetail 公务用车年度增加减少
+     * @return 公务用车年度增加减少
+     */
+    @Override
+    public List<LargeCarDetail> selectLargeCarDetailList(LargeCarDetail largeCarDetail,Long limitNum) {
+        LambdaQueryWrapper<LargeCarDetail> lqw = getLambdaQueryWrapper(largeCarDetail);
+        // 排序 默认时间倒序
+        lqw.orderByDesc(LargeCarDetail::getCreateTime);
+        lqw.last("limit "+limitNum);
+        return baseMapper.selectList(lqw);
+    }
+
+    /**
+     * 根据指定字段查询信息
+     *
+     * @param field 字段名称
+     * @param filedValue 字段值
+     * @return 公务用车年度增加减少
+     */
+    @Override
+    public LargeCarDetail getLargeCarDetailByField(String field, String filedValue) {
+        QueryWrapper<LargeCarDetail> lqw = new QueryWrapper<LargeCarDetail>();
+        lqw.eq(field, filedValue);
+        lqw.last("limit 1");
+        return this.getOne(lqw, false);
+    }
+
+    /**
+     * 根据指定字段查询信息列表
+     *
+     * @param field 字段名称
+     * @param filedValue 字段值
+     * @return 公务用车年度增加减少
+     */
+    @Override
+    public List<LargeCarDetail> selectLargeCarDetailListByField(String field, String filedValue,Long limitNum) {
+        QueryWrapper<LargeCarDetail> lqw = new QueryWrapper<LargeCarDetail>();
+        lqw.eq(field, filedValue);
+        lqw.last("limit "+limitNum);
+        return this.list(lqw);
+    }
+
+    /**
+     * 根据指定字段查询信息列表
+     *
+     * @param field 字段名称
+     * @param filedValue 字段值
+     * @return 公务用车年度增加减少
+     */
+    @Override
+    public List<LargeCarDetail> selectLargeCarDetailListByField(String field, String filedValue) {
+        QueryWrapper<LargeCarDetail> lqw = new QueryWrapper<LargeCarDetail>();
+        lqw.eq(field, filedValue);
+        return this.list(lqw);
+    }
+
+    /**
+     * 判断指定字段值是否存在
+     *
+     * @param field 字段名称
+     * @param filedValue 字段值
+     */
+    @Override
+    public void checkFieldExist(String field, String filedValue,String tips, Long id){
+        QueryWrapper<LargeCarDetail> lqw = new QueryWrapper<LargeCarDetail>();
+        lqw.eq(field, filedValue);
+        lqw.ne("id", id);
+        if(this.getOne(lqw,false) != null){
+            throw new RuntimeException(tips + "已存在");
+        }
+    }
+}

+ 154 - 0
project-zcustom/src/main/java/com/project/zcustom/service/unit/impl/LargeCarRankServiceImpl.java

@@ -0,0 +1,154 @@
+package com.project.zcustom.service.unit.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.project.common.core.domain.search.PageParamVo;
+import com.project.common.utils.StringUtils;
+import com.project.zcustom.domain.addional.LargeCarRank;
+import com.project.zcustom.mapper.unit.LargeCarRankMapper;
+import com.project.zcustom.service.unit.ILargeCarRankService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class LargeCarRankServiceImpl extends ServiceImpl<LargeCarRankMapper, LargeCarRank> implements ILargeCarRankService {
+
+    /**
+     * 组装查询条件
+     */
+    private LambdaQueryWrapper<LargeCarRank> getLambdaQueryWrapper(LargeCarRank largeCarRank) {
+        LambdaQueryWrapper<LargeCarRank> lqw = new LambdaQueryWrapper<LargeCarRank>();
+        if (StringUtils.isNotNull(largeCarRank.getPcdCount())){
+            lqw.eq(LargeCarRank::getPcdCount ,largeCarRank.getPcdCount());
+        }
+        if (StringUtils.isNotBlank(largeCarRank.getVechileNum())){
+            lqw.eq(LargeCarRank::getVechileNum ,largeCarRank.getVechileNum());
+        }
+        if (StringUtils.isNotBlank(largeCarRank.getAppEncode())){
+            lqw.eq(LargeCarRank::getAppEncode ,largeCarRank.getAppEncode());
+        }
+        return lqw;
+    }
+
+    /**
+     * 分页查询公务用车列表
+     *
+     * @param largeCarRank 公务用车
+     * @return 公务用车集合
+     */
+    @Override
+    public IPage<LargeCarRank> pagingLargeCarRankList(LargeCarRank largeCarRank) {
+        IPage<LargeCarRank> page = new Page<>(largeCarRank.getPageNum(), largeCarRank.getPageSize());
+        LambdaQueryWrapper<LargeCarRank> lqw = getLambdaQueryWrapper(largeCarRank);
+        // 排序 默认时间倒序
+        lqw.orderByDesc(LargeCarRank::getCreateTime);
+        return baseMapper.selectPage(page, lqw);
+    }
+
+    /**
+     * 分页查询公务用车列表
+     *
+     * @param lqw
+     * @return 公务用车集合
+     */
+    @Override
+    public IPage<LargeCarRank> pagingLargeCarRankList(PageParamVo pageParamVo, LambdaQueryWrapper<LargeCarRank> lqw) {
+        IPage<LargeCarRank> page = new Page<>(pageParamVo.getPageNum(), pageParamVo.getPageSize());
+        // 排序 默认时间倒序
+        lqw.orderByDesc(LargeCarRank::getCreateTime);
+        return baseMapper.selectPage(page, lqw);
+    }
+
+    /**
+     * 查询公务用车列表
+     *
+     * @param largeCarRank 公务用车
+     * @return 公务用车
+     */
+    @Override
+    public List<LargeCarRank> selectLargeCarRankList(LargeCarRank largeCarRank) {
+        LambdaQueryWrapper<LargeCarRank> lqw = getLambdaQueryWrapper(largeCarRank);
+        // 排序 默认时间倒序
+        lqw.orderByDesc(LargeCarRank::getCreateTime);
+        return baseMapper.selectList(lqw);
+    }
+
+    /**
+     * 查询公务用车列表
+     *
+     * @param largeCarRank 公务用车
+     * @return 公务用车
+     */
+    @Override
+    public List<LargeCarRank> selectLargeCarRankList(LargeCarRank largeCarRank,Long limitNum) {
+        LambdaQueryWrapper<LargeCarRank> lqw = getLambdaQueryWrapper(largeCarRank);
+        // 排序 默认时间倒序
+        lqw.orderByDesc(LargeCarRank::getCreateTime);
+        lqw.last("limit "+limitNum);
+        return baseMapper.selectList(lqw);
+    }
+
+    /**
+     * 根据指定字段查询信息
+     *
+     * @param field 字段名称
+     * @param filedValue 字段值
+     * @return 公务用车
+     */
+    @Override
+    public LargeCarRank getLargeCarRankByField(String field, String filedValue) {
+        QueryWrapper<LargeCarRank> lqw = new QueryWrapper<LargeCarRank>();
+        lqw.eq(field, filedValue);
+        lqw.last("limit 1");
+        return this.getOne(lqw, false);
+    }
+
+    /**
+     * 根据指定字段查询信息列表
+     *
+     * @param field 字段名称
+     * @param filedValue 字段值
+     * @return 公务用车
+     */
+    @Override
+    public List<LargeCarRank> selectLargeCarRankListByField(String field, String filedValue,Long limitNum) {
+        QueryWrapper<LargeCarRank> lqw = new QueryWrapper<LargeCarRank>();
+        lqw.eq(field, filedValue);
+        lqw.last("limit "+limitNum);
+        return this.list(lqw);
+    }
+
+    /**
+     * 根据指定字段查询信息列表
+     *
+     * @param field 字段名称
+     * @param filedValue 字段值
+     * @return 公务用车
+     */
+    @Override
+    public List<LargeCarRank> selectLargeCarRankListByField(String field, String filedValue) {
+        QueryWrapper<LargeCarRank> lqw = new QueryWrapper<LargeCarRank>();
+        lqw.eq(field, filedValue);
+        return this.list(lqw);
+    }
+
+    /**
+     * 判断指定字段值是否存在
+     *
+     * @param field 字段名称
+     * @param filedValue 字段值
+     */
+    @Override
+    public void checkFieldExist(String field, String filedValue,String tips, Long id){
+        QueryWrapper<LargeCarRank> lqw = new QueryWrapper<LargeCarRank>();
+        lqw.eq(field, filedValue);
+        lqw.ne("id", id);
+        if(this.getOne(lqw,false) != null){
+            throw new RuntimeException(tips + "已存在");
+        }
+    }
+}

+ 224 - 0
project-zcustom/src/main/java/com/project/zcustom/service/unit/impl/LargePublicCarServiceImpl.java

@@ -0,0 +1,224 @@
+package com.project.zcustom.service.unit.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.project.common.core.domain.search.PageParamVo;
+import com.project.common.utils.StringUtils;
+import com.project.zcustom.domain.addional.LargeCar;
+import com.project.zcustom.mapper.unit.LargePublicCarMapper;
+import com.project.zcustom.service.unit.ILargePublicCarService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class LargePublicCarServiceImpl extends ServiceImpl<LargePublicCarMapper, LargeCar> implements ILargePublicCarService {
+
+    /**
+     * 组装查询条件
+     */
+    private LambdaQueryWrapper<LargeCar> getLambdaQueryWrapper(LargeCar largeCar) {
+        LambdaQueryWrapper<LargeCar> lqw = new LambdaQueryWrapper<LargeCar>();
+        if (StringUtils.isNotBlank(largeCar.getAppEncode())){
+            lqw.eq(LargeCar::getAppEncode ,largeCar.getAppEncode());
+        }
+        if (StringUtils.isNotNull(largeCar.getTotalCarNum())){
+            lqw.eq(LargeCar::getTotalCarNum ,largeCar.getTotalCarNum());
+        }
+        if (StringUtils.isNotNull(largeCar.getCarNumOne())){
+            lqw.eq(LargeCar::getCarNumOne ,largeCar.getCarNumOne());
+        }
+        if (StringUtils.isNotNull(largeCar.getCarNumTwo())){
+            lqw.eq(LargeCar::getCarNumTwo ,largeCar.getCarNumTwo());
+        }
+        if (StringUtils.isNotNull(largeCar.getCarNumThree())){
+            lqw.eq(LargeCar::getCarNumThree ,largeCar.getCarNumThree());
+        }
+        if (StringUtils.isNotNull(largeCar.getCarNumFour())){
+            lqw.eq(LargeCar::getCarNumFour ,largeCar.getCarNumFour());
+        }
+        if (StringUtils.isNotNull(largeCar.getCarNumFive())){
+            lqw.eq(LargeCar::getCarNumFive ,largeCar.getCarNumFive());
+        }
+        if (StringUtils.isNotNull(largeCar.getEnterpriseCarNum())){
+            lqw.eq(LargeCar::getEnterpriseCarNum ,largeCar.getEnterpriseCarNum());
+        }
+        if (StringUtils.isNotNull(largeCar.getHeadCarNum())){
+            lqw.eq(LargeCar::getHeadCarNum ,largeCar.getHeadCarNum());
+        }
+        if (StringUtils.isNotNull(largeCar.getOilCarNum())){
+            lqw.eq(LargeCar::getOilCarNum ,largeCar.getOilCarNum());
+        }
+        if (StringUtils.isNotNull(largeCar.getNewPowerCarNum())){
+            lqw.eq(LargeCar::getNewPowerCarNum ,largeCar.getNewPowerCarNum());
+        }
+        if (StringUtils.isNotNull(largeCar.getLackRate())){
+            lqw.eq(LargeCar::getLackRate ,largeCar.getLackRate());
+        }
+        if (StringUtils.isNotNull(largeCar.getPossesRate())){
+            lqw.eq(LargeCar::getPossesRate ,largeCar.getPossesRate());
+        }
+        if (StringUtils.isNotNull(largeCar.getEstablishmentsCarNum())){
+            lqw.eq(LargeCar::getEstablishmentsCarNum ,largeCar.getEstablishmentsCarNum());
+        }
+        if (StringUtils.isNotNull(largeCar.getYearAddNum())){
+            lqw.eq(LargeCar::getYearAddNum ,largeCar.getYearAddNum());
+        }
+        if (StringUtils.isNotNull(largeCar.getYearReduceNum())){
+            lqw.eq(LargeCar::getYearReduceNum ,largeCar.getYearReduceNum());
+        }
+        if (StringUtils.isNotNull(largeCar.getTerminalInstallRate())){
+            lqw.eq(LargeCar::getTerminalInstallRate ,largeCar.getTerminalInstallRate());
+        }
+        if (StringUtils.isNotNull(largeCar.getTerminalOnlineRate())){
+            lqw.eq(LargeCar::getTerminalOnlineRate ,largeCar.getTerminalOnlineRate());
+        }
+        if (StringUtils.isNotNull(largeCar.getNotArchivedNum())){
+            lqw.eq(LargeCar::getNotArchivedNum ,largeCar.getNotArchivedNum());
+        }
+        if (StringUtils.isNotNull(largeCar.getNoPidNum())){
+            lqw.eq(LargeCar::getNoPidNum ,largeCar.getNoPidNum());
+        }
+        if (StringUtils.isNotNull(largeCar.getOverSpeedNum())){
+            lqw.eq(LargeCar::getOverSpeedNum ,largeCar.getOverSpeedNum());
+        }
+        if (StringUtils.isNotNull(largeCar.getHolidayNum())){
+            lqw.eq(LargeCar::getHolidayNum ,largeCar.getHolidayNum());
+        }
+        if (StringUtils.isNotBlank(largeCar.getPcdNum())){
+            lqw.eq(LargeCar::getPcdNum ,largeCar.getPcdNum());
+        }
+        if (StringUtils.isNotBlank(largeCar.getAvgPcdNum())){
+            lqw.eq(LargeCar::getAvgPcdNum ,largeCar.getAvgPcdNum());
+        }
+        if (StringUtils.isNotBlank(largeCar.getMileCount())){
+            lqw.eq(LargeCar::getMileCount ,largeCar.getMileCount());
+        }
+        if (StringUtils.isNotBlank(largeCar.getAvgMile())){
+            lqw.eq(LargeCar::getAvgMile ,largeCar.getAvgMile());
+        }
+        return lqw;
+    }
+
+    /**
+     * 分页查询公务用车列表
+     *
+     * @param largeCar 公务用车
+     * @return 公务用车集合
+     */
+    @Override
+    public IPage<LargeCar> pagingLargeCarList(LargeCar largeCar) {
+        IPage<LargeCar> page = new Page<>(largeCar.getPageNum(), largeCar.getPageSize());
+        LambdaQueryWrapper<LargeCar> lqw = getLambdaQueryWrapper(largeCar);
+        // 排序 默认时间倒序
+        lqw.orderByDesc(LargeCar::getCreateTime);
+        return baseMapper.selectPage(page, lqw);
+    }
+
+    /**
+     * 分页查询公务用车列表
+     *
+     * @param lqw
+     * @return 公务用车集合
+     */
+    @Override
+    public IPage<LargeCar> pagingLargeCarList(PageParamVo pageParamVo, LambdaQueryWrapper<LargeCar> lqw) {
+        IPage<LargeCar> page = new Page<>(pageParamVo.getPageNum(), pageParamVo.getPageSize());
+        // 排序 默认时间倒序
+        lqw.orderByDesc(LargeCar::getCreateTime);
+        return baseMapper.selectPage(page, lqw);
+    }
+
+    /**
+     * 查询公务用车列表
+     *
+     * @param largeCar 公务用车
+     * @return 公务用车
+     */
+    @Override
+    public List<LargeCar> selectLargeCarList(LargeCar largeCar) {
+        LambdaQueryWrapper<LargeCar> lqw = getLambdaQueryWrapper(largeCar);
+        // 排序 默认时间倒序
+        lqw.orderByDesc(LargeCar::getCreateTime);
+        return baseMapper.selectList(lqw);
+    }
+
+    /**
+     * 查询公务用车列表
+     *
+     * @param largeCar 公务用车
+     * @return 公务用车
+     */
+    @Override
+    public List<LargeCar> selectLargeCarList(LargeCar largeCar,Long limitNum) {
+        LambdaQueryWrapper<LargeCar> lqw = getLambdaQueryWrapper(largeCar);
+        // 排序 默认时间倒序
+        lqw.orderByDesc(LargeCar::getCreateTime);
+        lqw.last("limit "+limitNum);
+        return baseMapper.selectList(lqw);
+    }
+
+    /**
+     * 根据指定字段查询信息
+     *
+     * @param field 字段名称
+     * @param filedValue 字段值
+     * @return 公务用车
+     */
+    @Override
+    public LargeCar getLargeCarByField(String field, String filedValue) {
+        QueryWrapper<LargeCar> lqw = new QueryWrapper<LargeCar>();
+        lqw.eq(field, filedValue);
+        lqw.last("limit 1");
+        return this.getOne(lqw, false);
+    }
+
+    /**
+     * 根据指定字段查询信息列表
+     *
+     * @param field 字段名称
+     * @param filedValue 字段值
+     * @return 公务用车
+     */
+    @Override
+    public List<LargeCar> selectLargeCarListByField(String field, String filedValue,Long limitNum) {
+        QueryWrapper<LargeCar> lqw = new QueryWrapper<LargeCar>();
+        lqw.eq(field, filedValue);
+        lqw.last("limit "+limitNum);
+        return this.list(lqw);
+    }
+
+    /**
+     * 根据指定字段查询信息列表
+     *
+     * @param field 字段名称
+     * @param filedValue 字段值
+     * @return 公务用车
+     */
+    @Override
+    public List<LargeCar> selectLargeCarListByField(String field, String filedValue) {
+        QueryWrapper<LargeCar> lqw = new QueryWrapper<LargeCar>();
+        lqw.eq(field, filedValue);
+        return this.list(lqw);
+    }
+
+    /**
+     * 判断指定字段值是否存在
+     *
+     * @param field 字段名称
+     * @param filedValue 字段值
+     */
+    @Override
+    public void checkFieldExist(String field, String filedValue,String tips, Long id){
+        QueryWrapper<LargeCar> lqw = new QueryWrapper<LargeCar>();
+        lqw.eq(field, filedValue);
+        lqw.ne("id", id);
+        if(this.getOne(lqw,false) != null){
+            throw new RuntimeException(tips + "已存在");
+        }
+    }
+
+}

+ 154 - 0
project-zcustom/src/main/java/com/project/zcustom/service/unit/impl/LargeUnitRankServiceImpl.java

@@ -0,0 +1,154 @@
+package com.project.zcustom.service.unit.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.project.common.core.domain.search.PageParamVo;
+import com.project.common.utils.StringUtils;
+import com.project.zcustom.domain.addional.LargeUnitRank;
+import com.project.zcustom.mapper.unit.LargeUnitRankMapper;
+import com.project.zcustom.service.unit.ILargeUnitRankService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class LargeUnitRankServiceImpl extends ServiceImpl<LargeUnitRankMapper, LargeUnitRank> implements ILargeUnitRankService {
+
+    /**
+     * 组装查询条件
+     */
+    private LambdaQueryWrapper<LargeUnitRank> getLambdaQueryWrapper(LargeUnitRank largeUnitRank) {
+        LambdaQueryWrapper<LargeUnitRank> lqw = new LambdaQueryWrapper<LargeUnitRank>();
+        if (StringUtils.isNotNull(largeUnitRank.getGwcCount())){
+            lqw.eq(LargeUnitRank::getGwcCount ,largeUnitRank.getGwcCount());
+        }
+        if (StringUtils.isNotNull(largeUnitRank.getGwcPcd())){
+            lqw.eq(LargeUnitRank::getGwcPcd ,largeUnitRank.getGwcPcd());
+        }
+        if (StringUtils.isNotBlank(largeUnitRank.getAppEncode())){
+            lqw.eq(LargeUnitRank::getAppEncode ,largeUnitRank.getAppEncode());
+        }
+        return lqw;
+    }
+
+    /**
+     * 分页查询公务用车列表
+     *
+     * @param largeUnitRank 公务用车
+     * @return 公务用车集合
+     */
+    @Override
+    public IPage<LargeUnitRank> pagingLargeUnitRankList(LargeUnitRank largeUnitRank) {
+        IPage<LargeUnitRank> page = new Page<>(largeUnitRank.getPageNum(), largeUnitRank.getPageSize());
+        LambdaQueryWrapper<LargeUnitRank> lqw = getLambdaQueryWrapper(largeUnitRank);
+        // 排序 默认时间倒序
+        lqw.orderByDesc(LargeUnitRank::getCreateTime);
+        return baseMapper.selectPage(page, lqw);
+    }
+
+    /**
+     * 分页查询公务用车列表
+     *
+     * @param lqw
+     * @return 公务用车集合
+     */
+    @Override
+    public IPage<LargeUnitRank> pagingLargeUnitRankList(PageParamVo pageParamVo, LambdaQueryWrapper<LargeUnitRank> lqw) {
+        IPage<LargeUnitRank> page = new Page<>(pageParamVo.getPageNum(), pageParamVo.getPageSize());
+        // 排序 默认时间倒序
+        lqw.orderByDesc(LargeUnitRank::getCreateTime);
+        return baseMapper.selectPage(page, lqw);
+    }
+
+    /**
+     * 查询公务用车列表
+     *
+     * @param largeUnitRank 公务用车
+     * @return 公务用车
+     */
+    @Override
+    public List<LargeUnitRank> selectLargeUnitRankList(LargeUnitRank largeUnitRank) {
+        LambdaQueryWrapper<LargeUnitRank> lqw = getLambdaQueryWrapper(largeUnitRank);
+        // 排序 默认时间倒序
+        lqw.orderByDesc(LargeUnitRank::getCreateTime);
+        return baseMapper.selectList(lqw);
+    }
+
+    /**
+     * 查询公务用车列表
+     *
+     * @param largeUnitRank 公务用车
+     * @return 公务用车
+     */
+    @Override
+    public List<LargeUnitRank> selectLargeUnitRankList(LargeUnitRank largeUnitRank,Long limitNum) {
+        LambdaQueryWrapper<LargeUnitRank> lqw = getLambdaQueryWrapper(largeUnitRank);
+        // 排序 默认时间倒序
+        lqw.orderByDesc(LargeUnitRank::getCreateTime);
+        lqw.last("limit "+limitNum);
+        return baseMapper.selectList(lqw);
+    }
+
+    /**
+     * 根据指定字段查询信息
+     *
+     * @param field 字段名称
+     * @param filedValue 字段值
+     * @return 公务用车
+     */
+    @Override
+    public LargeUnitRank getLargeUnitRankByField(String field, String filedValue) {
+        QueryWrapper<LargeUnitRank> lqw = new QueryWrapper<LargeUnitRank>();
+        lqw.eq(field, filedValue);
+        lqw.last("limit 1");
+        return this.getOne(lqw, false);
+    }
+
+    /**
+     * 根据指定字段查询信息列表
+     *
+     * @param field 字段名称
+     * @param filedValue 字段值
+     * @return 公务用车
+     */
+    @Override
+    public List<LargeUnitRank> selectLargeUnitRankListByField(String field, String filedValue,Long limitNum) {
+        QueryWrapper<LargeUnitRank> lqw = new QueryWrapper<LargeUnitRank>();
+        lqw.eq(field, filedValue);
+        lqw.last("limit "+limitNum);
+        return this.list(lqw);
+    }
+
+    /**
+     * 根据指定字段查询信息列表
+     *
+     * @param field 字段名称
+     * @param filedValue 字段值
+     * @return 公务用车
+     */
+    @Override
+    public List<LargeUnitRank> selectLargeUnitRankListByField(String field, String filedValue) {
+        QueryWrapper<LargeUnitRank> lqw = new QueryWrapper<LargeUnitRank>();
+        lqw.eq(field, filedValue);
+        return this.list(lqw);
+    }
+
+    /**
+     * 判断指定字段值是否存在
+     *
+     * @param field 字段名称
+     * @param filedValue 字段值
+     */
+    @Override
+    public void checkFieldExist(String field, String filedValue,String tips, Long id){
+        QueryWrapper<LargeUnitRank> lqw = new QueryWrapper<LargeUnitRank>();
+        lqw.eq(field, filedValue);
+        lqw.ne("id", id);
+        if(this.getOne(lqw,false) != null){
+            throw new RuntimeException(tips + "已存在");
+        }
+    }
+}

+ 160 - 0
project-zcustom/src/main/java/com/project/zcustom/service/unit/impl/LargeWarnDetailServiceImpl.java

@@ -0,0 +1,160 @@
+package com.project.zcustom.service.unit.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.project.common.core.domain.search.PageParamVo;
+import com.project.common.utils.StringUtils;
+import com.project.zcustom.domain.addional.LargeWarnDetail;
+import com.project.zcustom.mapper.unit.LargeWarnDetailMapper;
+import com.project.zcustom.service.unit.ILargeWarnDetailService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class LargeWarnDetailServiceImpl extends ServiceImpl<LargeWarnDetailMapper, LargeWarnDetail> implements ILargeWarnDetailService {
+
+    /**
+     * 组装查询条件
+     */
+    private LambdaQueryWrapper<LargeWarnDetail> getLambdaQueryWrapper(LargeWarnDetail largeWarnDetail) {
+        LambdaQueryWrapper<LargeWarnDetail> lqw = new LambdaQueryWrapper<LargeWarnDetail>();
+        if (StringUtils.isNotBlank(largeWarnDetail.getAppEncode())){
+            lqw.eq(LargeWarnDetail::getAppEncode ,largeWarnDetail.getAppEncode());
+        }
+        if (StringUtils.isNotNull(largeWarnDetail.getVehicleNum())){
+            lqw.eq(LargeWarnDetail::getVehicleNum ,largeWarnDetail.getVehicleNum());
+        }
+        if (StringUtils.isNotNull(largeWarnDetail.getAlertType())){
+            lqw.eq(LargeWarnDetail::getAlertType ,largeWarnDetail.getAlertType());
+        }
+        if (StringUtils.isNotNull(largeWarnDetail.getStartTime())){
+            lqw.eq(LargeWarnDetail::getStartTime ,largeWarnDetail.getStartTime());
+        }
+        if (StringUtils.isNotNull(largeWarnDetail.getEndTime())){
+            lqw.eq(LargeWarnDetail::getEndTime ,largeWarnDetail.getEndTime());
+        }
+        return lqw;
+    }
+
+    /**
+     * 分页查询公务用车预警明细列表
+     *
+     * @param largeWarnDetail 公务用车预警明细
+     * @return 公务用车预警明细集合
+     */
+    @Override
+    public IPage<LargeWarnDetail> pagingLargeWarnDetailList(LargeWarnDetail largeWarnDetail) {
+        IPage<LargeWarnDetail> page = new Page<>(largeWarnDetail.getPageNum(), largeWarnDetail.getPageSize());
+        LambdaQueryWrapper<LargeWarnDetail> lqw = getLambdaQueryWrapper(largeWarnDetail);
+        // 排序 默认时间倒序
+        lqw.orderByDesc(LargeWarnDetail::getCreateTime);
+        return baseMapper.selectPage(page, lqw);
+    }
+
+    /**
+     * 分页查询公务用车预警明细列表
+     *
+     * @param lqw
+     * @return 公务用车预警明细集合
+     */
+    @Override
+    public IPage<LargeWarnDetail> pagingLargeWarnDetailList(PageParamVo pageParamVo, LambdaQueryWrapper<LargeWarnDetail> lqw) {
+        IPage<LargeWarnDetail> page = new Page<>(pageParamVo.getPageNum(), pageParamVo.getPageSize());
+        // 排序 默认时间倒序
+        lqw.orderByDesc(LargeWarnDetail::getCreateTime);
+        return baseMapper.selectPage(page, lqw);
+    }
+
+    /**
+     * 查询公务用车预警明细列表
+     *
+     * @param largeWarnDetail 公务用车预警明细
+     * @return 公务用车预警明细
+     */
+    @Override
+    public List<LargeWarnDetail> selectLargeWarnDetailList(LargeWarnDetail largeWarnDetail) {
+        LambdaQueryWrapper<LargeWarnDetail> lqw = getLambdaQueryWrapper(largeWarnDetail);
+        // 排序 默认时间倒序
+        lqw.orderByDesc(LargeWarnDetail::getCreateTime);
+        return baseMapper.selectList(lqw);
+    }
+
+    /**
+     * 查询公务用车预警明细列表
+     *
+     * @param largeWarnDetail 公务用车预警明细
+     * @return 公务用车预警明细
+     */
+    @Override
+    public List<LargeWarnDetail> selectLargeWarnDetailList(LargeWarnDetail largeWarnDetail,Long limitNum) {
+        LambdaQueryWrapper<LargeWarnDetail> lqw = getLambdaQueryWrapper(largeWarnDetail);
+        // 排序 默认时间倒序
+        lqw.orderByDesc(LargeWarnDetail::getCreateTime);
+        lqw.last("limit "+limitNum);
+        return baseMapper.selectList(lqw);
+    }
+
+    /**
+     * 根据指定字段查询信息
+     *
+     * @param field 字段名称
+     * @param filedValue 字段值
+     * @return 公务用车预警明细
+     */
+    @Override
+    public LargeWarnDetail getLargeWarnDetailByField(String field, String filedValue) {
+        QueryWrapper<LargeWarnDetail> lqw = new QueryWrapper<LargeWarnDetail>();
+        lqw.eq(field, filedValue);
+        lqw.last("limit 1");
+        return this.getOne(lqw, false);
+    }
+
+    /**
+     * 根据指定字段查询信息列表
+     *
+     * @param field 字段名称
+     * @param filedValue 字段值
+     * @return 公务用车预警明细
+     */
+    @Override
+    public List<LargeWarnDetail> selectLargeWarnDetailListByField(String field, String filedValue, Long limitNum) {
+        QueryWrapper<LargeWarnDetail> lqw = new QueryWrapper<LargeWarnDetail>();
+        lqw.eq(field, filedValue);
+        lqw.last("limit "+limitNum);
+        return this.list(lqw);
+    }
+
+    /**
+     * 根据指定字段查询信息列表
+     *
+     * @param field 字段名称
+     * @param filedValue 字段值
+     * @return 公务用车预警明细
+     */
+    @Override
+    public List<LargeWarnDetail> selectLargeWarnDetailListByField(String field, String filedValue) {
+        QueryWrapper<LargeWarnDetail> lqw = new QueryWrapper<LargeWarnDetail>();
+        lqw.eq(field, filedValue);
+        return this.list(lqw);
+    }
+
+    /**
+     * 判断指定字段值是否存在
+     *
+     * @param field 字段名称
+     * @param filedValue 字段值
+     */
+    @Override
+    public void checkFieldExist(String field, String filedValue,String tips, Long id){
+        QueryWrapper<LargeWarnDetail> lqw = new QueryWrapper<LargeWarnDetail>();
+        lqw.eq(field, filedValue);
+        lqw.ne("id", id);
+        if(this.getOne(lqw,false) != null){
+            throw new RuntimeException(tips + "已存在");
+        }
+    }
+}

+ 198 - 0
project-zcustom/src/main/resources/mapper/zcustom/car/PlatCarMapper.xml

@@ -0,0 +1,198 @@
+<?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.project.zcustom.mapper.car.PlatCarMapper">
+    <resultMap type="com.project.zcustom.domain.addional.LargeCar" id="LargePlatPublicCarResult">
+        <result property="appEncode"    column="app_encode"    />
+        <result property="totalCarNum"    column="total_car_num"    />
+        <result property="carNumOne"    column="car_num_one"    />
+        <result property="carNumTwo"    column="car_num_two"    />
+        <result property="carNumThree"    column="car_num_three"    />
+        <result property="carNumFour"    column="car_num_four"    />
+        <result property="carNumFive"    column="car_num_five"    />
+        <result property="enterpriseCarNum"    column="enterprise_car_num"    />
+        <result property="headCarNum"    column="head_car_num"    />
+        <result property="oilCarNum"    column="oil_car_num"    />
+        <result property="newPowerCarNum"    column="new_power_car_num"    />
+        <result property="lackRate"    column="lack_rate"    />
+        <result property="possesRate"    column="posses_rate"    />
+        <result property="establishmentsCarNum"    column="establishments_car_num"    />
+        <result property="yearAddNum"    column="year_add_num"    />
+        <result property="yearReduceNum"    column="year_reduce_num"    />
+        <result property="terminalInstallRate"    column="terminal_install_rate"    />
+        <result property="terminalOnlineRate"    column="terminal_online_rate"    />
+        <result property="notArchivedNum"    column="not_archived_num"    />
+        <result property="noPidNum"    column="no_pid_num"    />
+        <result property="overSpeedNum"    column="over_speed_num"    />
+        <result property="holidayNum"    column="holiday_num"    />
+        <result property="pcdNum"    column="pcd_num"    />
+        <result property="avgPcdNum"    column="avg_pcd_num"    />
+        <result property="mileCount"    column="mile_count"    />
+        <result property="avgMile"    column="avg_mile"    />
+    </resultMap>
+
+    <resultMap type="com.project.zcustom.domain.addional.LargeCarDetail" id="LargePlatPublicCarChangeDetailResult">
+        <result property="appName"    column="app_name"    />
+        <result property="appEncode"    column="app_encode"    />
+        <result property="vehicleNum"    column="vehicle_num"    />
+        <result property="useProperty"    column="use_property"    />
+        <result property="assetsCard"    column="assets_card"    />
+        <result property="orgDate"    column="org_date"    />
+        <result property="handleDate"    column="handle_date"    />
+        <result property="handleReason"    column="handle_reason"    />
+        <result property="flag"    column="flag"    />
+    </resultMap>
+
+    <resultMap type="com.project.zcustom.domain.addional.LargeWarnDetail" id="LargePlatPublicCarWarnDetailResult">
+        <result property="appName"    column="app_name"    />
+        <result property="appEncode"    column="app_encode"    />
+        <result property="vehicleNum"    column="vehicle_num"    />
+        <result property="alertType"    column="alert_type"    />
+        <result property="startTime"    column="start_time"    />
+        <result property="endTime"    column="end_time"    />
+    </resultMap>
+
+    <resultMap type="com.project.zcustom.domain.addional.LargeCarRank" id="LargeCarRankResult">
+        <result property="appName"    column="app_name"    />
+        <result property="appEncode"    column="app_encode"    />
+        <result property="pcdCount"    column="pcd_count"    />
+        <result property="vechileNum"    column="vechile_num"    />
+    </resultMap>
+
+    <resultMap type="com.project.zcustom.domain.addional.LargeUnitRank" id="LargeUnitRankResult">
+        <result property="appName"    column="app_name"    />
+        <result property="gwcCount"    column="gwc_count"    />
+        <result property="gwcPcd"    column="gwc_pcd"    />
+        <result property="appEncode"    column="app_encode"    />
+    </resultMap>
+
+
+    <select id="getResource" parameterType="String" resultMap="LargePlatPublicCarResult">
+        SELECT
+            total_car_num,
+            car_num_one,
+            car_num_two,
+            car_num_three,
+            car_num_four,
+            car_num_five,
+            enterprise_car_num,
+            head_car_num,
+            oil_car_num,
+            new_power_car_num,
+            lack_rate,
+            posses_rate,
+            establishments_car_num,
+            year_add_num,
+            year_reduce_num
+        FROM
+            large_plat_public_car a
+                LEFT JOIN large_plat_app_org b ON a.app_encode = b.app_encode
+        WHERE
+            b.app_org = #{appOrg}
+    </select>
+
+    <select id="getCarDetail" resultMap="LargePlatPublicCarChangeDetailResult">
+        SELECT
+            app_name,
+            vehicle_num,
+            use_property,
+            assets_card,
+            org_date,
+            handle_date,
+            handle_reason
+        FROM
+            large_plat_public_car_change_detail a
+                LEFT JOIN large_plat_app_org b ON a.app_encode = b.app_encode
+        WHERE
+            b.app_org = #{arg0} AND flag = #{arg1}
+    </select>
+
+    <select id="getMonitor" parameterType="String" resultMap="LargePlatPublicCarResult">
+        SELECT
+            terminal_install_rate,
+            terminal_online_rate,
+            not_archived_num,
+            no_pid_num,
+            over_speed_num,
+            holiday_num
+        FROM
+            large_plat_public_car a
+                LEFT JOIN large_plat_app_org b ON a.app_encode = b.app_encode
+        WHERE
+            b.app_org = #{appOrg}
+    </select>
+
+    <select id="getWarnDetail" parameterType="String" resultMap="LargePlatPublicCarWarnDetailResult">
+        SELECT
+            app_name,
+            vehicle_num,
+            alert_type,
+            start_time,
+            end_time
+        FROM
+            large_plat_public_car_warn_detail a
+                LEFT JOIN large_plat_app_org b ON a.app_encode = b.app_encode
+        WHERE
+            b.app_org = #{appOrg}
+    </select>
+
+    <select id="getOperationManageTopHalf" parameterType="String" resultMap="LargePlatPublicCarResult">
+        SELECT
+            avg_mile,
+            mile_count,
+            avg_pcd_num,
+            pcd_num
+        FROM
+            large_plat_public_car a
+                LEFT JOIN large_plat_app_org b ON a.app_encode = b.app_encode
+        WHERE
+            b.app_org = #{appOrg}
+    </select>
+
+    <select id="getUnitRankTop" parameterType="String" resultMap="LargeUnitRankResult">
+        SELECT
+            app_name,
+            gwc_pcd,
+            gwc_count
+        FROM
+            large_plat_public_car_rank_unit a
+                LEFT JOIN large_plat_app_org b ON a.app_encode = b.app_encode
+        WHERE
+            b.app_org = #{appOrg}
+        ORDER BY
+            a.id
+            LIMIT 3
+    </select>
+
+    <select id="getUnitRankLast" parameterType="String" resultMap="LargeUnitRankResult">
+        SELECT
+            app_name,
+            gwc_pcd,
+            gwc_count
+        FROM
+            large_plat_public_car_rank_unit a
+                LEFT JOIN large_plat_app_org b ON a.app_encode = b.app_encode
+        WHERE
+            b.app_org = #{appOrg}
+        ORDER BY
+            a.id DESC
+            LIMIT 3
+    </select>
+
+    <select id="getCarRank" parameterType="String" resultMap="LargeCarRankResult">
+        SELECT
+            app_name,
+            vechile_num,
+            pcd_count
+        FROM
+            large_plat_public_car_rank_person a
+                LEFT JOIN large_plat_app_org b ON a.app_encode = b.app_encode
+        WHERE
+            b.app_org = #{appOrg}
+        ORDER BY
+            pcd_count
+            LIMIT 10
+    </select>
+
+</mapper>