代码大量优化

benyun-core/Dockerfile

@@ -1,21 +0,0 @@
-FROM anapsix/alpine-java:8_server-jre_unlimited
-
-MAINTAINER dzk
-
-RUN mkdir -p /data/bailian-biz/logs  \
-    /data/bailian-biz/temp  \
-    /data/bailian-biz/agent
-
-WORKDIR /data/bailian-biz
-
-#ENV SERVER_PORT=9210
-#
-
-ADD ./target/benyun-core-4.8.0.jar ./app.jar
-
-ENTRYPOINT ["java", \
-            "-Djava.security.egd=file:/dev/./urandom", \
-#            "-Dserver.port=${SERVER_PORT}", \
-#            "-Dskywalking.agent.service_name=saas-auth", \
-#            "-javaagent:/ruoyi/skywalking/agent/skywalking-agent.jar", \
-            "-Xms1024m","-Xmx2048m","-jar", "app.jar"]

benyun-core/pom.xml

@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <artifactId>Bailian-Al</artifactId>
-        <groupId>com.ruoyi</groupId>
-        <version>4.8.0</version>
-    </parent>
-    <artifactId>benyun-core</artifactId>
-
-    <description>benyun-core</description>
-<!--    <properties>-->
-<!--        <java.version>1.8</java.version>-->
-<!--        <ruoyi-vue-plus.version>4.8.0</ruoyi-vue-plus.version>-->
-<!--        <spring-boot.version>2.7.13</spring-boot.version>-->
-<!--        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>-->
-<!--        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>-->
-<!--        <java.version>11</java.version>-->
-<!--        <maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>-->
-<!--        <spring-boot.mybatis>2.2.2</spring-boot.mybatis>-->
-<!--        <springdoc.version>1.6.15</springdoc.version>-->
-<!--        <poi.version>5.2.3</poi.version>-->
-<!--        <easyexcel.version>3.3.1</easyexcel.version>-->
-<!--        <velocity.version>2.3</velocity.version>-->
-<!--        <satoken.version>1.35.0.RC</satoken.version>-->
-<!--        <mybatis-plus.version>3.5.3.1</mybatis-plus.version>-->
-<!--        <p6spy.version>3.9.1</p6spy.version>-->
-<!--        <hutool.version>5.8.18</hutool.version>-->
-<!--        <okhttp.version>4.10.0</okhttp.version>-->
-<!--        <spring-boot-admin.version>2.7.10</spring-boot-admin.version>-->
-<!--        <redisson.version>3.20.1</redisson.version>-->
-<!--        <lock4j.version>2.2.3</lock4j.version>-->
-<!--        <dynamic-ds.version>3.5.2</dynamic-ds.version>-->
-<!--        <alibaba-ttl.version>2.14.2</alibaba-ttl.version>-->
-<!--        <xxl-job.version>2.4.0</xxl-job.version>-->
-<!--        <lombok.version>1.18.26</lombok.version>-->
-<!--        <bouncycastle.version>1.72</bouncycastle.version>-->
-<!--        &lt;!&ndash; 离线IP地址定位库 &ndash;&gt;-->
-<!--        <ip2region.version>2.7.0</ip2region.version>-->
-
-<!--        &lt;!&ndash; 临时修复 snakeyaml 漏洞 &ndash;&gt;-->
-<!--        <snakeyaml.version>1.33</snakeyaml.version>-->
-
-<!--        &lt;!&ndash; OSS 配置 &ndash;&gt;-->
-<!--        <aws-java-sdk-s3.version>1.12.400</aws-java-sdk-s3.version>-->
-<!--        &lt;!&ndash; SMS 配置 &ndash;&gt;-->
-<!--        <sms4j.version>2.2.0</sms4j.version>-->
-<!--    </properties>-->
-    <dependencies>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-quartz</artifactId>
-        </dependency>
-
-        <!-- 分页插件 -->
-        <dependency>
-            <groupId>com.github.pagehelper</groupId>
-            <artifactId>pagehelper-spring-boot-starter</artifactId>
-            <version>1.4.2</version>
-        </dependency>
-
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-<!--        <dependency>-->
-<!--            <groupId>redis.clients</groupId>-->
-<!--            <artifactId>jedis</artifactId>-->
-<!--        </dependency>-->
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-redis</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-validation</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-jsr310</artifactId>
-        </dependency>
-
-        <!--mysql驱动-->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>8.0.17</version>
-        </dependency>
-
-        <!-- 通用工具-->
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-common</artifactId>
-        </dependency>
-
-        <!-- fastjson -->
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-            <version>1.2.47</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid</artifactId>
-            <version>1.1.23</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>2.7.13</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-
-</project>

benyun-core/src/main/java/com/ruoyi/benyun/BenyunCoreApplication.java

@@ -1,18 +0,0 @@
-package com.ruoyi.benyun;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-
-@SpringBootApplication
-public class BenyunCoreApplication {
-
-    public static void main(String[] args) {
-        SpringApplication.run(BenyunCoreApplication.class, args);
-    }
-
-
-
-}

benyun-core/src/main/java/com/ruoyi/benyun/config/DataSourceHealthConfig.java

@@ -1,60 +0,0 @@
-//package com.benyun.core.config;
-//
-//import com.zaxxer.hikari.HikariDataSource;
-//import org.springframework.boot.jdbc.metadata.DataSourcePoolMetadata;
-//import org.springframework.boot.jdbc.metadata.DataSourcePoolMetadataProvider;
-//import org.springframework.boot.jdbc.metadata.HikariDataSourcePoolMetadata;
-//import org.springframework.context.annotation.Bean;
-//import org.springframework.context.annotation.Configuration;
-//
-//
-//@Configuration
-//public class DataSourceHealthConfig{
-//
-//    /**
-//     * 解决新版Spring中,集成sharding jdbc 健康检查异常
-//     */
-//    @Bean
-//    DataSourcePoolMetadataProvider dataSourcePoolMetadataProvider() {
-//        return dataSource -> dataSource instanceof HikariDataSource
-//            ? new HikariDataSourcePoolMetadata((HikariDataSource) dataSource)
-//            : new NotAvailableDataSourcePoolMetadata();
-//    }
-//
-//    /**
-//     * 不可用的数据源池元数据.
-//     */
-//    private static class NotAvailableDataSourcePoolMetadata implements DataSourcePoolMetadata {
-//        @Override
-//        public Float getUsage() {
-//            return null;
-//        }
-//
-//        @Override
-//        public Integer getActive() {
-//            return null;
-//        }
-//
-//        @Override
-//        public Integer getMax() {
-//            return null;
-//        }
-//
-//        @Override
-//        public Integer getMin() {
-//            return null;
-//        }
-//
-//        @Override
-//        public String getValidationQuery() {
-//            return "select 1";
-//        }
-//
-//        @Override
-//        public Boolean getDefaultAutoCommit() {
-//            return null;
-//        }
-//    }
-//
-//}
-//

benyun-core/src/main/java/com/ruoyi/benyun/config/QuartzConfig.java

@@ -1,111 +0,0 @@
-package com.ruoyi.benyun.config;
-
-
-import com.ruoyi.benyun.job.AnalyseJob;
-import com.ruoyi.benyun.job.BrandStatsiticsJob;
-import com.ruoyi.benyun.job.WriteRedisJob;
-import lombok.extern.slf4j.Slf4j;
-import org.quartz.*;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import java.time.ZoneId;
-import java.util.TimeZone;
-
-/*
- * 定时器：分析网点数据
- * */
-@Slf4j
-@Configuration
-public class QuartzConfig {
-
-    /**
-     * 给网点打标签
-     * @return
-     */
-    @Bean
-    public JobDetail AnalyseJobDetail() {
-        log.info("AnalyseJobDetail");
-
-        return JobBuilder.newJob(AnalyseJob.class) //newJob方法就是在绑定要运行的Job接口实现。
-            .withIdentity("analyseJobDetail") //给当前JobDetail对象取名字
-            .storeDurably() //及时没有触发器绑定当前JobDetail对象，也不会被删除
-            .build();
-    }
-
-
-    @Bean
-    public Trigger AnalyseTrigger() {
-        //定义Cron表达式
-        CronScheduleBuilder cron = CronScheduleBuilder.cronSchedule("0 0 23 26 * ? ");
-        cron.inTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
-
-        return TriggerBuilder
-            .newTrigger()
-            .forJob(AnalyseJobDetail()) //绑定要运行的JobDetail对象,这是得到的是Spring容器里的JobDetail
-            .withIdentity("analyseTrigger") //给当前Trigger对象起名字，名字任意
-            .withSchedule(cron) //绑定cron表达式
-            .build();
-    }
-
-    /**
-     * 将网点载入redis中
-     * @return
-     */
-    @Bean
-    public JobDetail WriteRedisJobDetail() {
-        log.info("WriteRedisJobDetail");
-
-        return JobBuilder.newJob(WriteRedisJob.class) //newJob方法就是在绑定要运行的Job接口实现。
-            .withIdentity("writeRedisJobDetail") //给当前JobDetail对象取名字
-            .storeDurably() //及时没有触发器绑定当前JobDetail对象，也不会被删除
-            .build();
-    }
-
-
-
-    @Bean
-    public Trigger WriteRedisTrigger(){
-        //定义Cron表达式
-        CronScheduleBuilder cron  = CronScheduleBuilder.cronSchedule("0 0 1 * * ? ");
-
-        cron.inTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
-
-        return TriggerBuilder
-            .newTrigger()
-            .forJob(WriteRedisJobDetail()) //绑定要运行的JobDetail对象,这是得到的是Spring容器里的JobDetail
-            .withIdentity("writeRedisTrigger") //给当前Trigger对象起名字，名字任意
-            .withSchedule(cron) //绑定cron表达式
-            .build();
-    }
-
-    /**
-     * 品牌分析
-     * */
-    @Bean
-    public JobDetail BrandStatsiticsJobDetail() {
-        log.info("BrandStatsiticsJobDetail");
-
-        return JobBuilder.newJob(BrandStatsiticsJob.class) //newJob方法就是在绑定要运行的Job接口实现。
-            .withIdentity("BrandStatsiticsJobDetail") //给当前JobDetail对象取名字
-            .storeDurably() //及时没有触发器绑定当前JobDetail对象，也不会被删除
-            .build();
-    }
-
-    //触发器声明，设置job的运行时机，并放入Spring容器中
-    @Bean
-    public Trigger BrandStatsiticsTrigger() {
-        //定义Cron表达式
-        CronScheduleBuilder cron = CronScheduleBuilder.cronSchedule("0 0 23 30 * ? ");
-        //CronScheduleBuilder cron = CronScheduleBuilder.cronSchedule("0 30 11 16 11 ? ");
-        cron.inTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
-
-        return TriggerBuilder
-            .newTrigger()
-            .forJob(BrandStatsiticsJobDetail()) //绑定要运行的JobDetail对象,这是得到的是Spring容器里的JobDetail
-            .withIdentity("BrandStatsiticsTrigger") //给当前Trigger对象起名字，名字任意
-            .withSchedule(cron) //绑定cron表达式
-            .build();
-    }
-
-}

benyun-core/src/main/java/com/ruoyi/benyun/config/RedisConfiguration.java

@@ -1,78 +0,0 @@
-package com.ruoyi.benyun.config;
-
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.PropertyAccessor;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
-import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
-import org.springframework.data.redis.serializer.RedisSerializer;
-import org.springframework.data.redis.serializer.StringRedisSerializer;
-
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-
-@Configuration
-@Slf4j
-public class RedisConfiguration {
-    // @Bean 把方法的返回值对象放到IOC容器中
-    @Bean
-    public RedisTemplate<Object,Object> redisTemplate(RedisConnectionFactory redisConnectionFactory) {
-        RedisTemplate<Object,Object>  redisTemplate = new RedisTemplate();
-
-        redisTemplate.setConnectionFactory(redisConnectionFactory);
-
-        // 设置Redis的key使用字符串序列化器，解决key可读性差的问题。
-        redisTemplate.setKeySerializer(new StringRedisSerializer());
-        redisTemplate.setHashKeySerializer(new StringRedisSerializer());
-
-        //redis和Springboot直接交互的序列化器
-        redisTemplate.setDefaultSerializer(valueSerializer());
-
-        // 设置Redis的value使用JSON序列化器，解决value可读性差的问题。
-        redisTemplate.setValueSerializer(valueSerializer());
-        redisTemplate.setHashValueSerializer(valueSerializer());
-
-        return redisTemplate;
-    }
-
-    /**
-     * 值采用JSON序列化
-     * @return
-     */
-    private RedisSerializer<Object> valueSerializer() {
-        Jackson2JsonRedisSerializer jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer(Object.class);
-        ObjectMapper om = new ObjectMapper();
-        om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
-        om.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL);
-
-        //LocalDate、LocalDateTime序列化器
-        JavaTimeModule timeModule = new JavaTimeModule();
-        timeModule.addDeserializer(LocalDate.class,
-            new LocalDateDeserializer(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
-        timeModule.addDeserializer(LocalDateTime.class,
-            new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-        timeModule.addSerializer(LocalDate.class,
-            new LocalDateSerializer(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
-        timeModule.addSerializer(LocalDateTime.class,
-            new LocalDateTimeSerializer(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-
-        om.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
-        om.registerModule(timeModule);
-
-        jackson2JsonRedisSerializer.setObjectMapper(om);
-        return jackson2JsonRedisSerializer;
-    }
-
-}

benyun-core/src/main/java/com/ruoyi/benyun/constant/ChannelMapContant.java

@@ -1,6 +0,0 @@
-package com.ruoyi.benyun.constant;
-
-public class ChannelMapContant {
-    public static String[] FULL_PROVINCE = new String[]{"110000000000", "120000000000", "130000000000", "140000000000", "150000000000", "210000000000", "220000000000", "230000000000", "310000000000", "320000000000", "330000000000", "340000000000", "350000000000", "360000000000", "370000000000", "410000000000", "420000000000", "430000000000", "440000000000", "450000000000", "460000000000", "500000000000", "510000000000", "520000000000", "530000000000", "540000000000", "610000000000", "620000000000", "630000000000", "640000000000", "650000000000"};
-    public static String[] FULL_CHANNEL = new String[]{"0","1","2","3","4","5"};
-}

benyun-core/src/main/java/com/ruoyi/benyun/constant/RedisContant.java

@@ -1,61 +0,0 @@
-package com.ruoyi.benyun.constant;
-
-public class RedisContant {
-    public static String CHANNEL_MAP_AREA = "channel_area";  //保存渠道地图area数据的Hash名
-    public static int CHANNEL_MAP_AREA_TIME = 60*8;  //渠道地图area数据的超时时间
-    public static String CHANNEL_MAP_LIST = "channel_list";  //保存渠道地图list数据的Hash名
-
-    public static int CHANNEL_MAP_LIST_TIME = 60*8;  //渠道地图list数据的超时时间
-    public static String CHANNEL_MAP_POINT = "channel_point"; //保存渠道地图point数据的Hash名
-
-    public static int CHANNEL_MAP_POINT_TIME = 60*8;  //渠道地图point数据的超时时间
-
-
-    public static String TOPOLOGICAL_STORE_WD_LIST = "topological_store_wd_list";
-
-    public static int TOPOLOGICAL_STORE_WD_LIST_TIME = 60*8;
-
-    public static String TOPOLOGICAL_STORE_WD_CATEGORY = "topological_store_wd_category";
-
-    public static int TOPOLOGICAL_STORE_WD_CATEGORY_TIME = 60*8;
-
-    public static String TOPOLOGICAL_BUILD_WD_LIST = "topological_build_wd_list";
-    public static int TOPOLOGICAL_BUILD_WD_LIST_TIME = 60*8;
-    public static String TOPOLOGICAL_BUILD_WD_CATEGORY= "topological_build_wd_category";
-    public static int TOPOLOGICAL_BUILD_WD_CATEGORY_TIME = 60*8;
-
-    public static String TOPOLOGICAL_ENTERPRISE_WD_LIST = "topological_enterprise_wd_list";
-    public static int TOPOLOGICAL_ENTERPRISE_WD_LIST_TIME = 60*8;
-    public static String TOPOLOGICAL_HOUSE_WD_LIST = "topological_house_wd_list";
-    public static int TOPOLOGICAL_HOUSE_WD_LIST_TIME = 60*8;
-    public static String TOPOLOGICAL_HOUSE_WD_INFO = "topological_house_wd_info";
-    public static int TOPOLOGICAL_HOUSE_WD_INFO_TIME = 60*8;
-
-    public static String CHANNEL_ANALYSE_CITYTIER = "channel_analyse_cityiter";
-    public static int CHANNEL_ANALYSE_CITYTIER_TIME = 60*8;
-
-    public static String CHANNEL_ANALYSE_TAG_ANLYSE = "channel_analyse_tag_anlyse";
-
-    public static int CHANNEL_ANALYSE_TAG_ANLYSE_TIME = 60*8;
-
-    public static String TOPOLOGICAL_COMMON_MAP = "topological_common_map";
-    public static int TOPOLOGICAL_COMMON_MAP_TIME = 60*8;
-
-    public static String CHANNEL_ANALYSE_BRANDLIST = "channel_analyse_brandList";
-    public static int CHANNEL_ANALYSE_BRANDLIST_TIME = 60*8;
-
-    public static String CHANNEL_MAP_TAG_STOREAGE = "channel_map_tag_storeage";
-
-    public static int CHANNEL_MAP_TAG_STOREAGE_TIME = 60*8;
-    public static String WD_TAG = "wd_tag";
-    public static int WD_TAG_TIME = 60*8;
-
-
-    public static String BRAND_GEOLABEL = "brand_geolabel";
-    public static int BRAND_GEOLABEL_TIME = 60*8;
-
-    public static String CITY_TIER_MAP = "cityTierMap";
-
-    public int CITY_TIER_MAP_time = 60*8;
-
-}

benyun-core/src/main/java/com/ruoyi/benyun/constant/RedisInitContant.java

@@ -1,12 +0,0 @@
-package com.ruoyi.benyun.constant;
-
-public class RedisInitContant {
-    public static String INIT_CITY_TIER_MAP = "initCityTierMap";
-    public static String INIT_CITY_TIER_LIST_MAP= "initCityTierListMap";
-
-    public static String INIT_MANAGE_TYPE = "initManageType";
-
-    public static String INIT_ADDR_CODE_MAP = "initAddrCodeMap";
-
-    public static String INIT_TYPE_BY_MAP = "initTypeByMap";
-}

benyun-core/src/main/java/com/ruoyi/benyun/controller/BrandController.java

@@ -1,159 +0,0 @@
-package com.ruoyi.benyun.controller;
-
-import com.ruoyi.benyun.entity.vo.BrandEvolveVo;
-import com.ruoyi.benyun.entity.vo.BrandOpcloseVo;
-import com.ruoyi.benyun.entity.vo.ListQueryBody;
-import com.ruoyi.benyun.service.BrandService;
-import com.ruoyi.benyun.constant.RedisContant;
-import com.ruoyi.benyun.entity.bo.BrandGeoLabelBo;
-import com.ruoyi.benyun.entity.bo.BrandOpcloseBo;
-import com.ruoyi.benyun.entity.bo.BrandSearch;
-import com.ruoyi.benyun.utils.HashUtil;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.R;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.time.LocalDateTime;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-@Validated
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/brand")
-public class BrandController extends BaseController {
-    @Autowired
-    private BrandService brandService;
-    @Autowired
-    RedisTemplate redisTemplate;
-
-//    获取品牌信息列表
-    @GetMapping("/search")
-    public R search(String text){
-        List<BrandSearch> list = brandService.searchByLikeName(text);
-        return R.ok(list);
-    }
-
-//    获取品牌信息列表
-    @PostMapping("/list")
-    public R list(ListQueryBody body){
-        String userId = "1";
-        return R.ok(brandService.searchListByMulti(body,userId));
-    }
-
-//    获取品牌详细信息
-    @GetMapping("/info")
-    public R info(String brandId){
-        String userId = "1";
-        return R.ok(brandService.searchByBrandId(brandId,userId));
-    }
-
-//    获取品牌物业信息
-    @GetMapping("/property")
-    public R property(String brandId){
-        return R.ok(brandService.searchPropertyByBrandId(brandId));
-    }
-
-//    获取品牌城市分布词云
-    @GetMapping("/distribution")
-    public R distribution(String brandId){
-        return R.ok(brandService.searchDisCloudByBrandId(brandId));
-    }
-
-//    获取相似品牌
-    @GetMapping("/similar")
-    public R similar(String brandId){
-        return R.ok(brandService.searchSimilarByBrandId(brandId));
-    }
-
-//    获取品牌网点营业状态分布
-    @GetMapping("/status")
-    public R statusDistribution(String brandId){
-        return R.ok(brandService.searchStatusByBrandId(brandId));
-    }
-
-//    获取品牌网点地图信息
-    @GetMapping("/area")
-    public R area(String brandId){
-        return R.ok(brandService.searchProvinceByBrandId(brandId));
-    }
-
-//    获取品牌网点数量及其城市数量分布
-    @GetMapping("/shopCount")
-    public R shopCount(String brandId){
-        return R.ok(brandService.searchDistributionByBrandId(brandId));
-    }
-
-//    品牌网点数量对比
-    @GetMapping("/total")
-    public R total(Integer pageSize){
-        return R.ok(brandService.searchTotal(pageSize));
-    }
-
-//    获取品牌均分分布
-//    已废弃
-//    @GetMapping("/average")
-//    public R average(String brandId){
-//        return R.ok(brandService.searchAvgScoreByBrandId(brandId));
-//    }
-
-//    获取各地区品牌网点数量分布情况
-//    已废弃
-//    @PostMapping("/countDistribution")
-//    public R categoryDis(ListQueryBody body){
-//        List<String> addrCode = body.getAddrCode();
-//        return R.ok(brandService.searchAddrDistribution(addrCode));
-//    }
-
-//    获取品牌地理位置标签分布
-    @GetMapping("/geolabel")
-    public R geolabel(String brandId){
-        String md5 = HashUtil.hash(brandId,"MD5");
-        List<BrandGeoLabelBo> bos = (List<BrandGeoLabelBo>) redisTemplate.boundHashOps(RedisContant.BRAND_GEOLABEL).get(md5);
-        if (bos != null)
-            return R.ok(bos);
-
-        List<BrandGeoLabelBo> brandGeoLabelBos = brandService.searchGeoLabel(brandId);
-
-        redisTemplate.boundHashOps(RedisContant.BRAND_GEOLABEL).put(md5,brandGeoLabelBos);
-        redisTemplate.expire(RedisContant.BRAND_GEOLABEL, RedisContant.BRAND_GEOLABEL_TIME, TimeUnit.MINUTES);
-
-        return R.ok(brandGeoLabelBos);
-    }
-
-//    行业连锁品牌发展情况
-    @PostMapping("/evolve")
-    public R develop(@RequestBody ListQueryBody body){
-        List<String> addrCode = body.getAddrCode();
-        List<String> typeCode = body.getTypeCode(); // 网点分类（犇云）
-        List<String> brandId = body.getBrandId();
-        if (brandId == null || brandId.size() == 0)
-            return R.fail("brandId不允许为空");
-        List<BrandEvolveVo> vos = brandService.searchEvolveByMulti(addrCode, typeCode, brandId);
-        return R.ok(vos);
-    }
-
-//    连锁品牌近期开关店情况（开点量）
-    @PostMapping("/open")
-    public R open(@RequestBody BrandOpcloseBo bo){
-        List<String> typeCodes = bo.getTypeCodes(); // 网点类型（犇云）
-        LocalDateTime startTime = bo.getStartTime();
-        LocalDateTime endTime = bo.getEndTime();
-        List<BrandOpcloseVo> vos = brandService.searchOpenByMulti(typeCodes, startTime, endTime);
-        return R.ok(vos);
-    }
-
-//    连锁品牌近期开关店情况（关店量）
-    @PostMapping("/close")
-    public R close(@RequestBody BrandOpcloseBo bo){
-        List<String> typeCodes = bo.getTypeCodes(); // 网点类型（犇云）
-        LocalDateTime startTime = bo.getStartTime();
-        LocalDateTime endTime = bo.getEndTime();
-        List<BrandOpcloseVo> vos = brandService.searchCloseByMulti(typeCodes, startTime, endTime);
-        return R.ok(vos);
-    }
-}

benyun-core/src/main/java/com/ruoyi/benyun/controller/BrandRecycleController.java

@@ -1,42 +0,0 @@
-package com.ruoyi.benyun.controller;
-
-import com.ruoyi.benyun.entity.vo.BrandVo;
-import com.ruoyi.benyun.service.BrandRecycleService;
-import com.ruoyi.benyun.entity.Brand;
-import com.github.pagehelper.PageInfo;
-import com.ruoyi.common.core.domain.R;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.HashMap;
-
-@RestController
-@RequestMapping("/recycle/brand")
-public class BrandRecycleController {
-    @Autowired
-    BrandRecycleService brandRecycleService;
-
-    @GetMapping("/list")
-    public R list(BrandVo brandVo){
-        PageInfo<Brand> list = brandRecycleService.list(brandVo);
-        return R.ok(list);
-    }
-
-    //移除
-    @DeleteMapping("/deleteBrand/{brandId}")
-    public R deleteBrand(@PathVariable("brandId") String brandId){
-        brandRecycleService.deleteBrand(brandId);
-        return R.ok();
-    }
-
-    //恢复
-    @PutMapping("/recoverBrand")
-    public R recoverBrand(@RequestBody HashMap<String,String> hashMap){
-        if(hashMap.get("brandId") == null)
-            return R.fail(400,"brandId不能为空");
-
-        brandRecycleService.recoverBrand(hashMap.get("brandId"));
-        return R.ok();
-    }
-
-}

benyun-core/src/main/java/com/ruoyi/benyun/controller/CategoryCotroller.java

@@ -1,41 +0,0 @@
-package com.ruoyi.benyun.controller;
-
-import com.ruoyi.benyun.service.CategoryService;
-import com.ruoyi.common.core.domain.R;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@Validated
-@RequiredArgsConstructor
-@RestController
-public class CategoryCotroller {
-    @Autowired
-    CategoryService categoryService;
-
-//    获取地区信息
-    @GetMapping("/getAddrCategory")
-    public R getAddrCategory(){
-        return R.ok(categoryService.getAddrCategory());
-    }
-
-//    获取经营分类
-    @GetMapping("/getManageCategory")
-    public R getManageCategory(){
-        return R.ok(categoryService.getManageCategory());
-    }
-
-//    获取网点分类
-    @GetMapping("/getTypeByCategory")
-    public R getTypeByCategoryTest(){
-        return R.ok(categoryService.getTypeByCategory());
-    }
-
-//    获取网点类型
-    @GetMapping("/getWdTypeCategory")
-    public R getWdTypeCategory(){
-        return R.ok(categoryService.getWdTypeCategory());
-    }
-}

benyun-core/src/main/java/com/ruoyi/benyun/controller/ChannelAnalyseController.java

@@ -1,106 +0,0 @@
-package com.ruoyi.benyun.controller;
-
-import com.ruoyi.benyun.entity.bo.StoreWdCategoryCount;
-import com.ruoyi.benyun.entity.vo.ChannelAnalyseAceeptVo;
-import com.ruoyi.benyun.entity.vo.ChannelMapAceeptVo;
-import com.ruoyi.benyun.entity.vo.TagAnalyse;
-import com.ruoyi.benyun.service.ChannelAnalyseService;
-import com.ruoyi.benyun.constant.RedisContant;
-import com.ruoyi.benyun.entity.Brand;
-import com.github.pagehelper.PageInfo;
-import com.ruoyi.common.core.domain.R;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-@RestController
-@RequestMapping("/channelAnalyse")
-public class ChannelAnalyseController {
-
-    @Autowired
-    ChannelAnalyseService channelAnalyseService;
-    @Autowired
-    RedisTemplate redisTemplate;
-
-    @RequestMapping("/cityTier")
-    public R cityTier(ChannelMapAceeptVo channelMapAceeptVo){
-        String md5 = channelMapAceeptVo.getHash();
-
-        //2.查看redis中是否存在有缓存
-        HashMap wdCount = (HashMap) redisTemplate.boundHashOps(RedisContant.CHANNEL_ANALYSE_CITYTIER).get(md5);
-        if (wdCount != null) {
-            return R.ok(wdCount);
-        }
-
-        HashMap hashMap = channelAnalyseService.cityTier(channelMapAceeptVo);
-
-        //4.保存到redis中
-        redisTemplate.boundHashOps(RedisContant.CHANNEL_ANALYSE_CITYTIER).put(md5,hashMap);
-        redisTemplate.expire(RedisContant.CHANNEL_ANALYSE_CITYTIER,RedisContant.CHANNEL_ANALYSE_CITYTIER_TIME, TimeUnit.MINUTES); //30分钟
-        return R.ok(hashMap);
-    }
-
-    @RequestMapping("/category")
-    public R category(ChannelMapAceeptVo channelMapAceeptVo){
-
-        List<StoreWdCategoryCount> category = channelAnalyseService.category(channelMapAceeptVo);
-
-        return R.ok(category);
-    }
-
-    @RequestMapping("/brandList")
-    public R brandList(ChannelAnalyseAceeptVo channelAnalyseAceeptVo){
-        String md5 = channelAnalyseAceeptVo.getHash();
-
-        //2.查看redis中是否存在有缓存
-        PageInfo<Brand> wdCount = (PageInfo<Brand>) redisTemplate.boundHashOps(RedisContant.CHANNEL_ANALYSE_BRANDLIST).get(md5);
-        if (wdCount != null) {
-            return R.ok(wdCount);
-        }
-
-        PageInfo<Brand> brandPageInfo = channelAnalyseService.brandList(channelAnalyseAceeptVo);
-
-        //4.保存到redis中
-        redisTemplate.boundHashOps(RedisContant.CHANNEL_ANALYSE_BRANDLIST).put(md5,brandPageInfo);
-        redisTemplate.expire(RedisContant.CHANNEL_ANALYSE_BRANDLIST,RedisContant.CHANNEL_ANALYSE_BRANDLIST_TIME, TimeUnit.MINUTES); //30分钟
-        return R.ok(brandPageInfo);
-    }
-
-    @RequestMapping("/tagAnalyse")
-    public R tagAnalyse(ChannelMapAceeptVo channelMapAceeptVo){
-        int page = channelMapAceeptVo.getPageNum();
-        channelMapAceeptVo.setPageNum(0);
-        String md5 = channelMapAceeptVo.getHash();
-
-        //2.查看redis中是否存在有缓存
-        HashMap<String, Object> result = new HashMap<>();
-        HashMap<String,Object> wdCount = (HashMap<String,Object>) redisTemplate.boundHashOps(RedisContant.CHANNEL_ANALYSE_TAG_ANLYSE).get(md5);
-        if (wdCount != null) {
-            result.put("data",(List<TagAnalyse>) wdCount.get(page + ""));
-            result.put("pages",(int)wdCount.get("pages"));
-            result.put("total",(int)wdCount.get("total"));
-            return R.ok(result);
-        }
-        HashMap<String, Object> hashMap = channelAnalyseService.tagAnalyse(channelMapAceeptVo);
-
-        //4.保存到redis中
-        redisTemplate.boundHashOps(RedisContant.CHANNEL_ANALYSE_TAG_ANLYSE).put(md5,hashMap);
-        redisTemplate.expire(RedisContant.CHANNEL_ANALYSE_TAG_ANLYSE,RedisContant.CHANNEL_ANALYSE_TAG_ANLYSE_TIME, TimeUnit.MINUTES); //30分钟
-
-        result.put("data",(List<TagAnalyse>) hashMap.get(page + ""));
-        result.put("pages",(int)hashMap.get("pages"));
-        result.put("total",(int)hashMap.get("total"));
-        return R.ok(result);
-    }
-
-//    @RequestMapping("/businessAnalyse")
-//    public R businessAnalyse(ChannelMapAceeptVo channelMapAceeptVo){
-//        channelAnalyseService.businessAnalyse(channelMapAceeptVo);
-//        return R.ok();
-//    }
-}

benyun-core/src/main/java/com/ruoyi/benyun/controller/ChannelMapController.java

@@ -1,153 +0,0 @@
-package com.ruoyi.benyun.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.ruoyi.benyun.entity.bo.*;
-import com.ruoyi.benyun.entity.vo.ChannelMapAceeptVo;
-import com.ruoyi.benyun.service.ChannelMapService;
-import com.ruoyi.benyun.valida.ChannelAreaGroup;
-import com.ruoyi.benyun.valida.ChannelListGroup;
-import com.ruoyi.benyun.valida.ChannelPointGroup;
-import com.ruoyi.benyun.constant.RedisContant;
-import com.ruoyi.benyun.entity.AttentionPool;
-import com.ruoyi.benyun.entity.WdInfo;
-import com.ruoyi.benyun.mapper.AttentionPoolDao;
-import com.github.pagehelper.PageInfo;
-import com.ruoyi.common.core.domain.R;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
-
-@RestController
-@RequestMapping("/channelMap")
-
-public class ChannelMapController {
-    @Autowired
-    private ChannelMapService channelMapService;
-
-    @Autowired
-    private RedisTemplate redisTemplate;
-
-    @Autowired
-    AttentionPoolDao attentionPoolDao;
-
-
-    @RequestMapping("/getArea")
-    public R area(@Validated(value={ChannelAreaGroup.class}) ChannelMapAceeptVo channel) {
-        String md5 = channel.getHash();
-
-        //2.查看redis中是否存在有缓存
-        WdCount wdCount = (WdCount) redisTemplate.boundHashOps(RedisContant.CHANNEL_MAP_AREA).get(md5);
-        if (wdCount != null) {
-            return R.ok(wdCount);
-        }
-
-        //3.redis中没有，直接请求
-        WdCount area = channelMapService.area(channel);
-        if(area == null)
-            return R.fail("请求参数错误");
-
-        //4.保存到redis中
-        redisTemplate.boundHashOps(RedisContant.CHANNEL_MAP_AREA).put(md5,area);
-        redisTemplate.expire(RedisContant.CHANNEL_MAP_AREA,RedisContant.CHANNEL_MAP_AREA_TIME, TimeUnit.MINUTES); //30分钟
-        return R.ok(area);
-    }
-
-
-    @RequestMapping("/list")
-    public R list(@Validated(value={ChannelListGroup.class}) ChannelMapAceeptVo channel){
-
-        String md5 = channel.getHash();
-//        HashMap pageInfo = (HashMap) redisTemplate.boundHashOps(RedisContant.CHANNEL_MAP_LIST).get(md5);
-//        if(pageInfo != null){
-//            List<WdTopologicalInfoBo> data = (List<WdTopologicalInfoBo>) pageInfo.get("data");
-//            attention(data);
-//            pageInfo.put("data",data);
-//            return R.ok(pageInfo);
-//        }
-
-        HashMap hashMap = channelMapService.list(channel);
-        if(hashMap == null)
-            return R.fail("请求参数错误");
-
-        //4.保存到redis中
-        List<WdTopologicalInfoBo> data = (List<WdTopologicalInfoBo>) hashMap.get("data");
-        attention(data);
-        hashMap.put("data",data);
-        redisTemplate.boundHashOps(RedisContant.CHANNEL_MAP_LIST).put(md5,hashMap);
-        redisTemplate.expire(RedisContant.CHANNEL_MAP_LIST,RedisContant.CHANNEL_MAP_LIST_TIME, TimeUnit.MINUTES); //30分钟
-        return R.ok(hashMap);
-    }
-
-    @RequestMapping("/point")
-    public R point(@Validated(value={ChannelPointGroup.class}) ChannelMapAceeptVo channel){
-        String md5 = channel.getHash();
-        PageInfo<WdInfo> pageInfo = (PageInfo<WdInfo>) redisTemplate.boundHashOps(RedisContant.CHANNEL_MAP_POINT).get(md5);
-        if(pageInfo != null){
-            return R.ok(pageInfo);
-        }
-
-        PageInfo<WdInfo> point = channelMapService.point(channel.getChannel(), channel.getSearchText(), channel.getAddrCode(), channel.getPageNum(), channel.getPageSize());
-        if(point == null)
-            return R.fail("请求参数错误");
-
-        //4.保存到redis中
-        redisTemplate.boundHashOps(RedisContant.CHANNEL_MAP_POINT).put(md5,point);
-        redisTemplate.expire(RedisContant.CHANNEL_MAP_POINT,RedisContant.CHANNEL_MAP_POINT_TIME, TimeUnit.MINUTES); //30分钟
-        return R.ok(point);
-    }
-
-    //Todo 标记网点关注
-    public void attention(List<WdTopologicalInfoBo> wdTopologicalInfoBos){
-        List<String> collect = wdTopologicalInfoBos.stream().map(wdTopologicalInfoBo -> {
-            return wdTopologicalInfoBo.getWdId();
-        }).collect(Collectors.toList());
-
-        //标志是否关注
-        QueryWrapper<AttentionPool> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.select("wd_id");
-        queryWrapper1.in("wd_id",collect);
-        if(collect.size() > 0){
-            List<AttentionPool> attentionPools = attentionPoolDao.selectList(queryWrapper1);
-            List<String> collect1 = attentionPools.stream().map(attentionPool -> {
-                return attentionPool.getWdId();
-            }).collect(Collectors.toList());
-
-            for (WdTopologicalInfoBo wdTopologicalInfoBo : wdTopologicalInfoBos) {
-                boolean contains = collect1.contains(wdTopologicalInfoBo.getWdId());
-                if (contains)
-                    wdTopologicalInfoBo.setAttention(1);
-                else
-                    wdTopologicalInfoBo.setAttention(0);
-            }
-        }
-    }
-
-    @GetMapping("/getWdInfo")
-    public R getWdInfo(String wdId){
-        WdInfo wdInfo = channelMapService.getWdInfo(wdId);
-        if(wdInfo == null)
-            return R.ok(null);
-        if("1".equals(wdInfo.getWdTypeCode())){
-            return R.ok((StoreWdInfoBo)wdInfo);
-        }else if("2".equals(wdInfo.getWdTypeCode())){
-            return R.ok((HouseWdInfoBo)wdInfo);
-        }else if("3".equals(wdInfo.getWdTypeCode())){
-            return R.ok((BuildWdInfoBo)wdInfo);
-        }else if("4".equals(wdInfo.getWdTypeCode())){
-            return R.ok((TrafficWdInfoBo)wdInfo);
-        }else if("5".equals(wdInfo.getWdTypeCode())){
-            return R.ok((EnterpriseWdInfoBo)wdInfo);
-        }
-        return R.ok(wdInfo);
-    }
-
-}

benyun-core/src/main/java/com/ruoyi/benyun/controller/CommonController.java

@@ -1,32 +0,0 @@
-package com.ruoyi.benyun.controller;
-
-import com.ruoyi.benyun.entity.vo.AddrCategoryBody;
-import com.ruoyi.benyun.entity.vo.TypeByBody;
-import com.ruoyi.benyun.service.CommonService;
-import com.ruoyi.common.core.domain.R;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-@RestController
-@RequestMapping("/common")
-public class CommonController {
-    @Autowired
-    CommonService commonService;
-    //获取网点标签
-    @GetMapping("/tag")
-    public R tag(){
-        List<TypeByBody> tag = commonService.tag();
-        return R.ok(tag);
-    }
-
-    //获取网点标签
-    @GetMapping("/addrCodeMap")
-    public R addrCodeMap(){
-        List<AddrCategoryBody> addrCategoryBodies = commonService.addrCodeMap();
-        return R.ok(addrCategoryBodies);
-    }
-}

benyun-core/src/main/java/com/ruoyi/benyun/controller/TopologicalBuildWdController.java

@@ -1,61 +0,0 @@
-package com.ruoyi.benyun.controller;
-
-import com.ruoyi.benyun.entity.vo.TopologicalWdAceeptVo;
-import com.ruoyi.benyun.service.TopologicalBuildWdSerevice;
-import com.ruoyi.benyun.valida.TopologicalWdListGroup;
-import com.ruoyi.benyun.constant.RedisContant;
-import com.ruoyi.benyun.entity.TopologicalBuildingWd;
-import com.ruoyi.benyun.entity.bo.BuildWdCategoryCount;
-import com.ruoyi.common.core.domain.R;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-@RestController
-@RequestMapping("/poi/topologicalBuildWd")
-public class TopologicalBuildWdController {
-    @Autowired
-    TopologicalBuildWdSerevice topologicalBuildWdSerevice;
-
-    @Autowired
-    RedisTemplate redisTemplate;
-
-    @RequestMapping("/buildingLevel")
-    public R buildingLevel(@Validated(value = {TopologicalWdListGroup.class}) TopologicalWdAceeptVo topologicalWdAceeptVo){
-        String md5 = topologicalWdAceeptVo.getHash();
-        //2.查看redis中是否存在有缓存
-        List<BuildWdCategoryCount> wdCount = (List<BuildWdCategoryCount>) redisTemplate.boundHashOps(RedisContant.TOPOLOGICAL_BUILD_WD_CATEGORY).get(md5);
-        if (wdCount != null) {
-            return R.ok(wdCount);
-        }
-
-        List<BuildWdCategoryCount> list = topologicalBuildWdSerevice.buildingLevel(topologicalWdAceeptVo);
-
-        redisTemplate.boundHashOps(RedisContant.TOPOLOGICAL_BUILD_WD_CATEGORY).put(md5,list);
-        redisTemplate.expire(RedisContant.TOPOLOGICAL_BUILD_WD_CATEGORY,RedisContant.TOPOLOGICAL_BUILD_WD_CATEGORY_TIME, TimeUnit.MINUTES); //30分钟
-
-        return R.ok(list);
-    }
-
-    @RequestMapping("/list")
-    public R list(@Validated(value = {TopologicalWdListGroup.class}) TopologicalWdAceeptVo topologicalWdAceeptVo){
-        String md5 = topologicalWdAceeptVo.getHash();
-        //2.查看redis中是否存在有缓存
-        List<TopologicalBuildingWd> wdCount = (List<TopologicalBuildingWd>)redisTemplate.boundHashOps(RedisContant.TOPOLOGICAL_BUILD_WD_LIST).get(md5);
-        if (wdCount != null) {
-            return R.ok(wdCount);
-        }
-
-        List<TopologicalBuildingWd> list = topologicalBuildWdSerevice.list(topologicalWdAceeptVo);
-
-        redisTemplate.boundHashOps(RedisContant.TOPOLOGICAL_BUILD_WD_LIST).put(md5,list);
-        redisTemplate.expire(RedisContant.TOPOLOGICAL_BUILD_WD_LIST,RedisContant.TOPOLOGICAL_BUILD_WD_LIST_TIME, TimeUnit.MINUTES); //30分钟
-
-        return R.ok(list);
-    }
-}

benyun-core/src/main/java/com/ruoyi/benyun/controller/TopologicalCommonController.java

@@ -1,61 +0,0 @@
-package com.ruoyi.benyun.controller;
-
-import com.ruoyi.benyun.entity.vo.TopologicalWdAceeptVo;
-import com.ruoyi.benyun.service.TopologicalCommonService;
-import com.ruoyi.benyun.service.WdInfoService;
-import com.ruoyi.benyun.constant.RedisContant;
-import com.ruoyi.benyun.entity.WdInfo;
-import com.ruoyi.common.core.domain.R;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-@RestController
-@RequestMapping("/poi/common")
-public class TopologicalCommonController {
-    @Autowired
-    TopologicalCommonService topologicalCommonService;
-
-    @Autowired
-    WdInfoService wdInfoService;
-
-
-    @Autowired
-    RedisTemplate redisTemplate;
-
-    @RequestMapping("/prefixSearch")
-    public R prefixSearch(String searchText){
-        List<WdInfo> wdInfos = topologicalCommonService.prefixSearch(searchText);
-        return R.ok(wdInfos);
-    }
-    @RequestMapping("/range")
-    public R range(){
-        HashMap hashMap = new HashMap<>();
-        hashMap.put("500m",500);
-        hashMap.put("1km",1000);
-        hashMap.put("2km",2000);
-        return R.ok(hashMap);
-    }
-
-    @RequestMapping("/map")
-    public R map(TopologicalWdAceeptVo topologicalWdAceeptVo){
-        String md5 = topologicalWdAceeptVo.getHash();
-        //2.查看redis中是否存在有缓存
-        List<WdInfo> wdCount = (List<WdInfo>) redisTemplate.boundHashOps(RedisContant.TOPOLOGICAL_COMMON_MAP).get(md5);
-        if (wdCount != null) {
-            return R.ok(wdCount);
-        }
-
-        List<WdInfo> map = topologicalCommonService.map(topologicalWdAceeptVo);
-        redisTemplate.boundHashOps(RedisContant.TOPOLOGICAL_COMMON_MAP).put(md5,map);
-        redisTemplate.expire(RedisContant.TOPOLOGICAL_COMMON_MAP,RedisContant.TOPOLOGICAL_COMMON_MAP_TIME, TimeUnit.MINUTES); //30分钟
-
-        return R.ok(map);
-    }
-
-}

benyun-core/src/main/java/com/ruoyi/benyun/controller/TopologicalEnterpriseWdController.java

@@ -1,43 +0,0 @@
-package com.ruoyi.benyun.controller;
-
-import com.ruoyi.benyun.entity.vo.TopologicalWdAceeptVo;
-import com.ruoyi.benyun.service.TopologicalEnterpriseWdService;
-import com.ruoyi.benyun.valida.TopologicalWdListGroup;
-import com.ruoyi.benyun.constant.RedisContant;
-import com.ruoyi.benyun.entity.TopologicalEnterpriseWd;
-import com.ruoyi.common.core.domain.R;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-@RestController
-@RequestMapping("/poi/topologicalEnterpriseWd")
-public class TopologicalEnterpriseWdController {
-    @Autowired
-    TopologicalEnterpriseWdService topologicalEnterpriseWdService;
-
-    @Autowired
-    RedisTemplate redisTemplate;
-
-    @RequestMapping("/list")
-    public R list(@Validated(value = {TopologicalWdListGroup.class}) TopologicalWdAceeptVo topologicalWdAceeptVo){
-        String md5 = topologicalWdAceeptVo.getHash();
-        //2.查看redis中是否存在有缓存
-        List<TopologicalEnterpriseWd> wdCount = (List<TopologicalEnterpriseWd>) redisTemplate.boundHashOps(RedisContant.TOPOLOGICAL_ENTERPRISE_WD_LIST).get(md5);
-        if (wdCount != null) {
-            return R.ok(wdCount);
-        }
-
-        List<TopologicalEnterpriseWd> list = topologicalEnterpriseWdService.list(topologicalWdAceeptVo);
-
-        redisTemplate.boundHashOps(RedisContant.TOPOLOGICAL_ENTERPRISE_WD_LIST).put(md5,list);
-        redisTemplate.expire(RedisContant.TOPOLOGICAL_ENTERPRISE_WD_LIST,RedisContant.TOPOLOGICAL_ENTERPRISE_WD_LIST_TIME, TimeUnit.MINUTES); //30分钟
-
-        return R.ok(list);
-    }
-}

benyun-core/src/main/java/com/ruoyi/benyun/controller/TopologicalHouseWdController.java

@@ -1,64 +0,0 @@
-package com.ruoyi.benyun.controller;
-
-import com.ruoyi.benyun.entity.vo.TopologicalWdAceeptVo;
-import com.ruoyi.benyun.service.TopologicalHouseWdService;
-import com.ruoyi.benyun.valida.TopologicalWdGroup;
-import com.ruoyi.benyun.valida.TopologicalWdListGroup;
-import com.ruoyi.benyun.constant.RedisContant;
-import com.ruoyi.benyun.entity.TopologicalHouseWd;
-import com.ruoyi.benyun.entity.TopologicalHouseWdStatisticsData;
-import com.ruoyi.common.core.domain.R;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-@RestController
-@RequestMapping("/poi/topologicalHouseWd")
-public class TopologicalHouseWdController {
-    @Autowired
-    TopologicalHouseWdService topologicalHouseWdService;
-
-    @Autowired
-    RedisTemplate redisTemplate;
-
-    @RequestMapping("/info")
-    public R info(@Validated(value = {TopologicalWdGroup.class}) TopologicalWdAceeptVo topologicalWdAceeptVo){
-        String md5 = topologicalWdAceeptVo.getHash();
-        //2.查看redis中是否存在有缓存
-        TopologicalHouseWdStatisticsData wdCount = (TopologicalHouseWdStatisticsData) redisTemplate.boundHashOps(RedisContant.TOPOLOGICAL_HOUSE_WD_INFO).get(md5);
-        if (wdCount != null) {
-            return R.ok(wdCount);
-        }
-
-
-        TopologicalHouseWdStatisticsData info = topologicalHouseWdService.info(topologicalWdAceeptVo);
-
-        redisTemplate.boundHashOps(RedisContant.TOPOLOGICAL_HOUSE_WD_INFO).put(md5,info);
-        redisTemplate.expire(RedisContant.TOPOLOGICAL_HOUSE_WD_INFO,RedisContant.TOPOLOGICAL_HOUSE_WD_INFO_TIME, TimeUnit.MINUTES); //30分钟
-
-
-        return R.ok(info);
-    }
-
-    @RequestMapping("/list")
-    public R list(@Validated(value = {TopologicalWdListGroup.class}) TopologicalWdAceeptVo topologicalWdAceeptVo){
-        String md5 = topologicalWdAceeptVo.getHash();
-        //2.查看redis中是否存在有缓存
-        List<TopologicalHouseWd> wdCount = (List<TopologicalHouseWd>) redisTemplate.boundHashOps(RedisContant.TOPOLOGICAL_HOUSE_WD_LIST).get(md5);
-        if (wdCount != null) {
-            return R.ok(wdCount);
-        }
-
-        List<TopologicalHouseWd> list = topologicalHouseWdService.list(topologicalWdAceeptVo);
-
-        redisTemplate.boundHashOps(RedisContant.TOPOLOGICAL_HOUSE_WD_LIST).put(md5,list);
-        redisTemplate.expire(RedisContant.TOPOLOGICAL_HOUSE_WD_LIST,RedisContant.TOPOLOGICAL_HOUSE_WD_LIST_TIME, TimeUnit.MINUTES); //30分钟
-
-        return R.ok(list);
-    }
-}

benyun-core/src/main/java/com/ruoyi/benyun/controller/TopologicalStoreWdController.java

@@ -1,64 +0,0 @@
-package com.ruoyi.benyun.controller;
-
-import com.ruoyi.benyun.entity.vo.TopologicalWdAceeptVo;
-import com.ruoyi.benyun.service.TopologicalStoreWdService;
-import com.ruoyi.benyun.valida.TopologicalWdGroup;
-import com.ruoyi.benyun.valida.TopologicalWdListGroup;
-import com.ruoyi.benyun.constant.RedisContant;
-import com.ruoyi.benyun.entity.TopologicalStoreWd;
-import com.ruoyi.benyun.entity.bo.StoreWdCategoryCount;
-import com.ruoyi.common.core.domain.R;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-@RestController
-@RequestMapping("/poi/topologicalStoreWd")
-public class TopologicalStoreWdController {
-
-    @Autowired
-    TopologicalStoreWdService topologicalStoreWdService;
-
-    @Autowired
-    RedisTemplate redisTemplate;
-
-    @RequestMapping("/category")
-    public R category(@Validated(value = {TopologicalWdGroup.class}) TopologicalWdAceeptVo topologicalWdAceeptVo){
-        String md5 = topologicalWdAceeptVo.getHash();
-        //2.查看redis中是否存在有缓存
-        List<StoreWdCategoryCount>wdCount = (List<StoreWdCategoryCount>) redisTemplate.boundHashOps(RedisContant.TOPOLOGICAL_STORE_WD_CATEGORY).get(md5);
-        if (wdCount != null) {
-            return R.ok(wdCount);
-        }
-
-        List<StoreWdCategoryCount> category = topologicalStoreWdService.category(topologicalWdAceeptVo);
-
-        redisTemplate.boundHashOps(RedisContant.TOPOLOGICAL_STORE_WD_CATEGORY).put(md5,category);
-        redisTemplate.expire(RedisContant.TOPOLOGICAL_STORE_WD_CATEGORY,RedisContant.TOPOLOGICAL_STORE_WD_CATEGORY_TIME, TimeUnit.MINUTES); //30分钟
-
-        return R.ok(category);
-    }
-
-    @RequestMapping("/list")
-    public R list(@Validated(value = {TopologicalWdListGroup.class}) TopologicalWdAceeptVo topologicalWdAceeptVo){
-        String md5 = topologicalWdAceeptVo.getHash();
-        //2.查看redis中是否存在有缓存
-        List<TopologicalStoreWd> wdCount = (List<TopologicalStoreWd>) redisTemplate.boundHashOps(RedisContant.TOPOLOGICAL_STORE_WD_LIST).get(md5);
-        if (wdCount != null) {
-            return R.ok(wdCount);
-        }
-
-
-        List<TopologicalStoreWd> list = topologicalStoreWdService.list(topologicalWdAceeptVo);
-
-        redisTemplate.boundHashOps(RedisContant.TOPOLOGICAL_STORE_WD_LIST).put(md5,list);
-        redisTemplate.expire(RedisContant.TOPOLOGICAL_STORE_WD_LIST,RedisContant.TOPOLOGICAL_STORE_WD_LIST_TIME, TimeUnit.MINUTES); //30分钟
-
-        return R.ok(list);
-    }
-}

benyun-core/src/main/java/com/ruoyi/benyun/controller/WdInfoController.java

@@ -1,65 +0,0 @@
-package com.ruoyi.benyun.controller;
-
-import com.ruoyi.benyun.entity.vo.AddStatusVo;
-import com.ruoyi.benyun.entity.vo.ListQueryBody;
-import com.ruoyi.benyun.entity.vo.WdOpcloseVo;
-import com.ruoyi.benyun.service.WdInfoService;
-import com.ruoyi.common.core.domain.R;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-@Validated
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/WdInfo")
-public class WdInfoController {
-    @Autowired
-    WdInfoService wdInfoService;
-
-//    获取各地区网点分类分布情况
-//    已废弃
-//    @PostMapping("/categoryDistribution")
-//    public R categoryDistribution(ListQueryBody body){
-//        List<String> addrCodes = body.getAddrCode();
-//        List<String> typeCodes = body.getTypeCode();
-//        return R.ok(wdInfoService.searchAddrTypeDistribution(addrCodes,typeCodes));
-//    }
-
-//    获取各地区网点类型分布情况
-//    已废弃
-//    @PostMapping("/wdTypeDistribution")
-//    public R wdTypeDistribution(ListQueryBody body){
-//        List<String> addrCodes = body.getAddrCode();
-//        List<String> typeCodes = body.getTypeCode();
-//        return R.ok(wdInfoService.searchWdTypeDistribution(addrCodes,typeCodes));
-//    }
-
-//    获取所有网点类型网点数量(降序)
-//    已废弃
-//    @GetMapping("/total")
-//    public R total(){
-//        return R.ok(wdInfoService.searchWdTotal());
-//    }
-
-    //    网点数量新增情况
-    @PostMapping("/addStatus")
-    public R addStatus(ListQueryBody body){
-        List<String> addrCode = body.getAddrCode();
-        List<String> typeCode = body.getTypeCode(); // 网点类型
-        List<AddStatusVo> addStatusVos = wdInfoService.searchAddStatus(addrCode, typeCode);
-        return R.ok(addStatusVos);
-    }
-
-    //    近期各地区网点开关数量变化情况
-    @PostMapping("/opclose")
-    public R opclose(@RequestBody ListQueryBody body){
-        List<String> addrCode = body.getAddrCode();
-        List<String> wdTypeCode = body.getTypeCode(); // 网点类型
-        List<WdOpcloseVo> wdOpcloseVos = wdInfoService.searchWdOpcloses(addrCode, wdTypeCode);
-        return R.ok(wdOpcloseVos);
-    }
-}

benyun-core/src/main/java/com/ruoyi/benyun/controller/WdRecycleController.java

@@ -1,97 +0,0 @@
-package com.ruoyi.benyun.controller;
-
-import com.ruoyi.benyun.entity.*;
-import com.ruoyi.benyun.entity.vo.WdInfoVo;
-import com.ruoyi.benyun.service.*;
-import com.ruoyi.common.core.domain.R;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.HashMap;
-
-@RestController
-@RequestMapping("/recycle/wd")
-public class WdRecycleController {
-
-
-    @Autowired
-    WdRecycleService wdRecycleService;
-
-    @Autowired
-    StoreWdService storeWdService;
-
-    @Autowired
-    HouseWdService houseWdService;
-
-    @Autowired
-    BuildWdService buildWdService;
-
-    @Autowired
-    TrafficWdService trafficWdService;
-
-    @Autowired
-    EnterpriseWdService enterpriseWdService;
-
-
-    //获取网点回收站列表
-    @GetMapping("/list")
-    public R list(WdInfoVo wdInfoVo){
-        HashMap<String, Object> list = wdRecycleService.list(wdInfoVo);
-        return R.ok(list);
-    }
-
-    //获取门店网点类型明细
-    @GetMapping("/storeWdInfo")
-    public R storeWdInfo(String wdId){
-        StoreWd storeWd = storeWdService.storeWdInfo(wdId);
-        return R.ok(storeWd);
-    }
-
-    //获取小区网点类型明细
-    @GetMapping("/houseWdInfo")
-    public R houseWddInfo(String wdId){
-        HouseWd houseWd = houseWdService.houseWddInfo(wdId);
-        return R.ok(houseWd);
-    }
-
-    //获取楼宇网点类型明细
-    @GetMapping("/buildWdInfo")
-    public R buildWdInfo(String wdId){
-        BuildWd buildWd = buildWdService.buildWdInfo(wdId);
-        return R.ok(buildWd);
-    }
-
-    //获取交通设施网点类型明细
-    @GetMapping("/trafficWdInfo")
-    public R trafficWdInfo(String wdId){
-        TrafficWd trafficWd = trafficWdService.trafficWdInfo(wdId);
-        return R.ok(trafficWd);
-    }
-
-    //获取公司网点类型明细
-    @GetMapping("/enterpriseWdInfo")
-    public R enterpriseWdInfo(String wdId){
-        EnterpriseWd enterpriseWd = enterpriseWdService.enterpriseWdInfo(wdId);
-        return R.ok(enterpriseWd);
-    }
-
-    //移除
-    @DeleteMapping("/deleteWd/{wdId}")
-    public R deleteWd(@PathVariable("wdId") String wdId){
-        wdRecycleService.deleteWd(wdId);
-        return R.ok();
-    }
-
-    //恢复
-    @PutMapping("/recoverWd")
-    public R recoverWd(@RequestBody HashMap<String,String> hashMap){
-        if (hashMap.get("wdId") == null)
-            return R.fail(400,"wdId不能为空");
-
-        wdRecycleService.recoverWd(hashMap.get("wdId"));
-        return R.ok();
-    }
-
-
-
-}

benyun-core/src/main/java/com/ruoyi/benyun/controller/WorkTableController.java

@@ -1,187 +0,0 @@
-package com.ruoyi.benyun.controller;
-
-import com.ruoyi.benyun.entity.vo.AddFollowRecordVo;
-import com.ruoyi.benyun.entity.vo.TurnBusinessOpportunitiesVo;
-import com.ruoyi.benyun.entity.vo.WorkTableSearchVo;
-import com.ruoyi.benyun.service.AttentionPoolService;
-import com.ruoyi.benyun.service.BusinessOpportunitiesService;
-import com.ruoyi.benyun.service.DatabackService;
-import com.ruoyi.benyun.entity.bo.AttentionPoolBo;
-import com.ruoyi.benyun.entity.bo.AttentionPoolStatisticsBo;
-import com.github.pagehelper.PageInfo;
-import com.ruoyi.common.core.domain.R;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-@Validated
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/work")
-public class WorkTableController {
-    @Autowired
-    DatabackService databackService;
-    @Autowired
-    AttentionPoolService attentionPoolService;
-    @Autowired
-    BusinessOpportunitiesService businessOpportunitiesService;
-
-//    获取数据概览
-    @GetMapping("/databack/about")
-    public R about(){
-        // 获取用户id
-        String userId = "1";
-        if (userId == null || userId.equals(""))
-            return R.fail("请登录");
-        AttentionPoolStatisticsBo bo = databackService.searchAbout(userId);
-        return R.ok(bo);
-    }
-
-//    获取客户数量变化趋势
-    @GetMapping("/databack/trend")
-    public R trend(){
-        // 获取用户id
-        String userId = "1";
-        if (userId == null || userId.equals(""))
-            return R.fail("请登录");
-        List<AttentionPoolStatisticsBo> bos = databackService.searchTrand(userId);
-        return R.ok(bos);
-    }
-
-//    分页获取潜客列表
-    @PostMapping("/pool/list")
-    public R poolList(WorkTableSearchVo workTableSearchVo){
-        // 获取用户id
-        String userId = "1";
-        if (userId == null || userId.equals(""))
-            return R.fail("请登录");
-        PageInfo<List<AttentionPoolBo>> listPageInfo = attentionPoolService.searchList(workTableSearchVo, userId);
-        return R.ok(listPageInfo);
-    }
-
-//    取消关注
-    @DeleteMapping("/pool")
-    public R cancel(String attentionId){
-        // 获取用户id
-        String userId = "1";
-        if (userId == null || userId.equals(""))
-            return R.fail("请登录");
-        if (attentionId == null || attentionId.equals(""))
-            return R.fail("attentionId不能为空");
-        int flag = attentionPoolService.cancelAttention(attentionId, userId);
-        if (flag == 1)
-            return R.ok("取消关注成功！");
-        return R.fail("取消关注失败。");
-    }
-
-//    转化商机
-    @PostMapping("/pool")
-    public R turn(TurnBusinessOpportunitiesVo turnVo){
-        // 获取用户id
-        String userId = "1";
-        if (userId == null || userId.equals(""))
-            return R.fail("请登录");
-        int flag = attentionPoolService.turnBusinessOpportunities(turnVo, userId);
-        if (flag == 1)
-            return R.ok("转化成功！");
-        if (flag == 2)
-            return R.ok("已转化。");
-        return R.fail("转化失败。");
-    }
-
-//    分页获取线索列表
-    @PostMapping("/clue/list")
-    public R clueList(WorkTableSearchVo vo){
-        // 获取用户id
-        String userId = "1";
-        if (userId == null || userId.equals(""))
-            return R.fail("请登录");
-        return R.ok(businessOpportunitiesService.searchList(vo,userId));
-    }
-
-//    分页获取跟进记录
-    @PostMapping("/follow/list")
-    public R followList(WorkTableSearchVo vo){
-        // 获取用户id
-        String userId = "1";
-        if (userId == null || userId.equals(""))
-            return R.fail("请登录");
-        return R.ok(businessOpportunitiesService.searchFollowList(vo,userId));
-    }
-
-//    添加跟进记录
-    @PostMapping("/follow")
-    public R followAdd(AddFollowRecordVo addVo){
-        // 获取用户id
-        String userId = "1";
-        if (userId == null || userId.equals(""))
-            return R.fail("请登录");
-        int flag = businessOpportunitiesService.addFollow(addVo, userId);
-        if (flag == 1)
-            return R.ok("添加成功！");
-        return R.fail("添加失败");
-    }
-
-    //    品牌关注
-    @PostMapping("/brand")
-    public R brandAttention(String brandId){
-        String userId = "1";
-        if (userId == null || userId.equals(""))
-            return R.fail("请登录");
-        int flag = attentionPoolService.attentionBrand(brandId, userId);
-        if (flag == 1){
-            return R.ok("关注成功！");
-        }else if (flag == 2){
-            return R.fail("重复关注。");
-        }else if (flag == 3){
-            return R.fail("未知品牌");
-        }
-        return R.fail("关注失败。");
-    }
-
-    //    品牌取消关注
-    @DeleteMapping("/brand")
-    public R brandCancel(String brandId){
-        String userId = "1";
-        if (userId == null || userId.equals(""))
-            return R.fail("请登录");
-        int flag = attentionPoolService.cancelBrand(brandId, userId);
-        if (flag == 1){
-            return R.ok("取消关注成功！");
-        }
-        return R.fail("取消关注失败。");
-    }
-
-//    网点关注
-    @PostMapping("/wdInfo")
-    public R wdInfoAttention(String wdId){
-        String userId = "1";
-        if (userId == null || userId.equals(""))
-            return R.fail("请登录");
-        int flag = attentionPoolService.attentionWdInfo(wdId,userId);
-        if (flag == 1){
-            return R.ok("关注成功！");
-        }else if (flag == 2){
-            return R.fail("重复关注。");
-        }else if (flag == 3){
-            return R.fail("未知网点");
-        }
-        return R.fail("关注失败。");
-    }
-
-//    网点取消关注
-    @DeleteMapping("/wdInfo")
-    public R wdInfoCancel(String wdId){
-        String userId = "1";
-        if (userId == null || userId.equals(""))
-            return R.fail("请登录");
-        int flag = attentionPoolService.cancelWdInfo(wdId, userId);
-        if (flag == 1){
-            return R.ok("取消关注成功！");
-        }
-        return R.fail("取消关注失败。");
-    }
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/AddrCategory.java

@@ -1,29 +0,0 @@
-package com.ruoyi.benyun.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-@Data
-@TableName("ddt_addr_category")
-public class AddrCategory {
-    @TableField("addr_code")
-    private String addrCode;
-    @TableField("province")
-    private String province;
-    @TableField("city")
-    private String city;
-    @TableField("district")
-    private String district;
-    @TableField("addr_info")
-    private String addrInfo;
-    @TableField("lat_gd")
-    private BigDecimal latGd;
-    @TableField("lng_gd")
-    private BigDecimal lngGd;
-
-    @TableField("city_tier")
-    private String cityTier;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/AttentionPool.java

@@ -1,40 +0,0 @@
-package com.ruoyi.benyun.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-@TableName("bl_attention_pool")
-public class AttentionPool{
-    @TableField("attention_id")
-    private String attentionId;
-    @TableField("contact")
-    private String contact;
-    @TableField("telephone")
-    private String telephone;
-    @TableField("wd_id")
-    private String wdId;
-    @TableField("wd_name")
-    private String wdName;
-    @TableField("wd_addr_info")
-    private String wdAddrInfo;
-    @TableField("brand_id")
-    private String brandId;
-    @TableField("brand_name")
-    private String brandName;
-    @TableField("user_id")
-    private String userId;
-    @TableField("attention_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime attentionTime;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/AttentionPoolStatistics.java

@@ -1,34 +0,0 @@
-package com.ruoyi.benyun.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-@TableName("bl_attention_pool_statistics")
-public class AttentionPoolStatistics {
-    @TableField("stat_id")
-    private String statId;
-    @TableField("attention_count")
-    private Integer attentionCount;
-    @TableField("clue_count")
-    private Integer clueCount;
-    @TableField("online_count")
-    private Integer onlineCount;
-    @TableField("offline_count")
-    private Integer offlineCount;
-    @TableField("user_id")
-    private String userId;
-    @TableField("stat_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime statTime;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/Brand.java

@@ -1,80 +0,0 @@
-package com.ruoyi.benyun.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-@Data
-@TableName("ddt_brand")
-public class Brand {
-    @TableId("brand_id")
-    private String brandId;
-    @TableField("brand_img")
-    private String brandImg;
-
-    @TableField("brand_name")
-    private String brandName;
-
-    @TableField("industry_code")
-    private String industryCode;
-
-    @TableField("enterprise_usci")
-    private String enterpriseUsci;
-
-    @TableField("per_capita_consumption")
-    private Float perCapitaConsumption;
-    @TableField("comment_count")
-    private Long commentCount;
-    @TableField("score")
-    private Float score;
-    @TableField("menu_info")
-    private String menuInfo;
-    @TableField("index_score")
-    private Float indexScore;
-    @TableField("contact")
-    private String contact;
-    @TableField("telephone")
-    private String telephone;
-    @TableField("create_date")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime createDate;
-    @TableField("audit")
-    private Long audit;
-    @TableField("collect_user_id")
-    private String collectUserId;
-    @TableField("collect_person")
-    private String collectPerson;
-    @TableField("collect_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime collectTime;
-    @TableField("enter_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime enterTime;
-    @TableField("hash")
-    private String hash;
-    @TableField("update_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime updateTime;
-
-    @TableLogic
-    @TableField("show_delete")
-    private int showDelete;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/BrandBusiness.java

@@ -1,21 +0,0 @@
-package com.ruoyi.benyun.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-@Data
-@TableName("bl_brand_business_statistics")
-public class BrandBusiness {
-    @TableField("brand_id")
-    private String brandId;
-
-    @TableField("brand_name")
-    private String brandName;
-
-    @TableField("business_status")
-    private String businessStatus;
-
-    @TableField("count")
-    private Integer count;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/BrandCity.java

@@ -1,44 +0,0 @@
-package com.ruoyi.benyun.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-@Data
-@TableName("bl_brand_city_distribution")
-public class BrandCity {
-    @TableField("dis_id")
-    private String disId;
-
-    @TableField("brand_id")
-    private String brandId;
-
-    @TableField("addr_code")
-    private String addrCode;
-
-    @TableField("city")
-    private String city;
-
-    @TableField("lat")
-    private BigDecimal lat;
-
-    @TableField("lng")
-    private BigDecimal lng;
-
-    @TableField("dis_count")
-    private Integer disCount;
-
-    @TableField("update_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime updateTime;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/BrandEvolve.java

@@ -1,40 +0,0 @@
-package com.ruoyi.benyun.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-@TableName("bl_brand_evolve_statistics")
-public class BrandEvolve {
-    @TableField("stat_id")
-    private String statId;
-
-    @TableField("brand_id")
-    private String brandId;
-
-    @TableField("brand_name")
-    private String brandName;
-
-    @TableField("addr_code")
-    private String addrCode;
-
-    @TableField("type_code_by")
-    private String typeCodeBy;
-
-    @TableField("count")
-    private Integer count;
-
-    @TableField("stat_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime statTime;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/BrandProvince.java

@@ -1,44 +0,0 @@
-package com.ruoyi.benyun.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-@Data
-@TableName("bl_brand_province_distribution")
-public class BrandProvince {
-    @TableField("dis_id")
-    private String disId;
-
-    @TableField("brand_id")
-    private String brandId;
-
-    @TableField("addr_code")
-    private String addrCode;
-
-    @TableField("province")
-    private String province;
-
-    @TableField("lat")
-    private BigDecimal lat;
-
-    @TableField("lng")
-    private BigDecimal lng;
-
-    @TableField("dis_count")
-    private Integer disCount;
-
-    @TableField("update_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime updateTime;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/BrandStatistics.java

@@ -1,52 +0,0 @@
-package com.ruoyi.benyun.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-@TableName("bl_brand_statistics")
-public class BrandStatistics {
-    @TableField("stat_id")
-    private String statId;
-
-    @TableField("brand_id")
-    private String brandId;
-
-    @TableField("brand_name")
-    private String brandName;
-
-    @TableField("cover_province_count")
-    private int coverProvinceCount;
-
-    @TableField("cover_city_count")
-    private int coverCityCount;
-
-    @TableField("cover_zone_count")
-    private int coverZoneCount;
-
-    @TableField("business_count")
-    private Integer businessCount;
-
-    @TableField("pause_business_count")
-    private Integer pauseBusinessCount;
-
-    @TableField("no_business_count")
-    private Integer noBusinessCount;
-
-    @TableField("total")
-    private Integer total;
-
-    @TableField("update_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime updateTime;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/BrandStoreOpclose.java

@@ -1,41 +0,0 @@
-package com.ruoyi.benyun.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-@TableName("bl_brand_store_opclose_statistics")
-public class BrandStoreOpclose {
-    @TableField("stat_id")
-    private String statId;
-
-    @TableField("brand_id")
-    private String brandId;
-
-    @TableField("brand_name")
-    private String brandName;
-
-    @TableField("addr_code")
-    private String addrCode;
-
-    @TableField("type_code_by")
-    private String typeCodeBy;
-
-    @TableField("open_count")
-    private Integer openCount;
-
-    @TableField("close_count")
-    private Integer closeCount;
-
-    @TableField("stat_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime statTime;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/BrandZone.java

@@ -1,56 +0,0 @@
-package com.ruoyi.benyun.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-@Data
-@TableName("bl_brand_zone_distribution")
-public class BrandZone {
-    @TableField("dis_id")
-    private String disId;
-
-    @TableField("brand_id")
-    private String brandId;
-
-    @TableField("brand_name")
-    private String brandName;
-
-    @TableField("addr_code")
-    private String addrCode;
-
-    @TableField("province")
-    private String province;
-
-    @TableField("city")
-    private String city;
-
-    @TableField("zone")
-    private String zone;
-
-    @TableField("lat")
-    private BigDecimal lat;
-
-    @TableField("lng")
-    private BigDecimal lng;
-
-    @TableField("dis_count")
-    private Integer disCount;
-
-    @TableField("avg_score")
-    private BigDecimal avgScore;
-
-    @TableField("update_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime updateTime;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/BuildWd.java

@@ -1,24 +0,0 @@
-package com.ruoyi.benyun.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-@Data
-@TableName("ddt_build_wd")
-public class BuildWd {
-    @TableId("wd_id")
-    private String wdId;
-    @TableField("property_type")
-    private String propertyType;
-
-    @TableField("build_type")
-    private String buildType;
-
-    @TableField("households")
-    private int households;
-
-    @TableField("people_count")
-    private int peopleCount;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/BusinessOpportunitiesClue.java

@@ -1,34 +0,0 @@
-package com.ruoyi.benyun.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-@TableName("bl_business_opportunities_clue")
-public class BusinessOpportunitiesClue {
-    @TableField("clue_id")
-    private String clueId;
-    @TableField("attention_id")
-    private String attentionId;
-    @TableField("contact")
-    private String contact;
-    @TableField("telephone")
-    private String telephone;
-    @TableField("follow_up_count")
-    private Integer followUpCount;
-    @TableField("user_id")
-    private String userId;
-    @TableField("create_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime createTime;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/Category.java

@@ -1,13 +0,0 @@
-package com.ruoyi.benyun.entity;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class Category {
-    private String code;
-    private String name;
-    private String type;
-    private List<Category> children;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/CityTierBody.java

@@ -1,9 +0,0 @@
-package com.ruoyi.benyun.entity;
-
-import lombok.Data;
-
-@Data
-public class CityTierBody {
-    private String name;
-    private long count;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/Enterprise.java

@@ -1,86 +0,0 @@
-package com.ruoyi.benyun.entity;
-
-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.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-
-@Data
-@TableName("ddt_enterprise")
-public class Enterprise {
-    @TableId("enterprise_usci")
-    private String enterpriseUsci;
-    @TableField("enterprise_img")
-    private String enterpriseImg;
-    @TableField("enterprise_name")
-    private String enterpriseName;
-    @TableField("enterprise_name_short")
-    private String enterpriseNameShort;
-    @TableField("addr_info")
-    private String addrInfo;
-    @TableField("addr_code")
-    private String addrCode;
-    @TableField("enterprise_info")
-    private String enterpriseInfo;
-    @TableField("manage_range_info")
-    private String manageRangeInfo;
-    @TableField("enterprise_scale")
-    private String enterpriseScale;
-    @TableField("registered_capital")
-    private BigDecimal registeredCapital;
-    @TableField("linkmen_id")
-    private String linkmenId;
-    @TableField("linkmen_name")
-    private String linkmenName;
-    @TableField("create_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDate createTime;
-    @TableField("enterprise_itin")
-    private String enterpriseItin;
-    @TableField("business_status")
-    private String businessStatus;
-    @TableField("industry_code")
-    private String industryCode;
-    @TableField("enterprise_type")
-    private String enterpriseType;
-    @TableField("credit_score")
-    private int creditScore;
-    @TableField("audit")
-    private int audit;
-    @TableField("collect_user_id")
-    private String collectUserId;
-    @TableField("collect_person")
-    private String collectPerson;
-    @TableField("collect_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime collectTime;
-    @TableField("enter_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime enterTime;
-    @TableField("update_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime updateTime;
-    @TableField("hash")
-    private String hash;
-//    @TableField("telephone")
-//    private String telephone;
-//    @TableField("website")
-//    private String website;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/EnterpriseWd.java

@@ -1,17 +0,0 @@
-package com.ruoyi.benyun.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-@Data
-@TableName("ddt_enterprise_wd")
-public class EnterpriseWd {
-    @TableId("wd_id")
-    private String wdId;
-    @TableField("enterprise_usci")
-    private String enterpriseUsci;
-
-
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/FollowUpRecord.java

@@ -1,34 +0,0 @@
-package com.ruoyi.benyun.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-@TableName("bl_follow_up_record")
-public class FollowUpRecord {
-    @TableField("record_id")
-    private String recordId;
-    @TableField("clue_id")
-    private String clueId;
-    @TableField("follow_way")
-    private String followWay;
-    @TableField("follow_content")
-    private String followContent;
-    @TableField("follow_person")
-    private String followPerson;
-    @TableField("user_id")
-    private String userId;
-    @TableField("follow_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime followTime;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/HouseWd.java

@@ -1,21 +0,0 @@
-package com.ruoyi.benyun.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-@Data
-@TableName("ddt_house_wd")
-public class HouseWd {
-    @TableId("wd_id")
-    private String wdId;
-    @TableField("property_type")
-    private String propertyType;
-
-    @TableField("households")
-    private int households;
-
-    @TableField("people_count")
-    private int peopleCount;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/ManageType.java

@@ -1,20 +0,0 @@
-package com.ruoyi.benyun.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-@Data
-@TableName("ddt_manage_type")
-public class ManageType {
-    @TableField("manage_type_code")
-    private String manageTypeCode;
-    @TableField("big_category")
-    private String bigCategory;
-    @TableField("mid_category")
-    private String midCategory;
-    @TableField("sub_category")
-    private String subCategory;
-    @TableField("full_info")
-    private String fullInfo;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/StoreWd.java

@@ -1,43 +0,0 @@
-package com.ruoyi.benyun.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-@Data
-@TableName("ddt_store_wd")
-public class StoreWd {
-    @TableId("wd_id")
-    private String wdId;
-    @TableField("brand_id")
-    private String brandId;
-
-    @TableField("brand_name")
-    private String brandName;
-    @TableField("per_capita_consumption")
-    private String perCapitaConsumption;
-    @TableField("manage_type_code")
-    private String manageTypeCode;
-    @TableField("industry_code")
-    private String industryCode;
-    @TableField("organization_code")
-    private String organizationCode;
-    @TableField("comment_count")
-    private int commentCount;
-    @TableField("score")
-    private Double score;
-    @TableField("buy_info")
-    private String buyInfo;
-    @TableField("index_score")
-    private double indexScore;
-    @TableField("business_status")
-    private String businessStatus;
-    @TableField("business_time")
-    private String businessTime;
-    @TableField("telephone")
-    private String telephone;
-
-    @TableField("contact")
-    private String contact;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/StoreWdOpclose.java

@@ -1,33 +0,0 @@
-package com.ruoyi.benyun.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-@Data
-@TableName("bl_store_wd_opclose")
-public class StoreWdOpclose {
-    @TableField("wd_id")
-    private String wdId;
-
-    @TableField("addr_code")
-    private String addrCode;
-
-    @TableField("type_code_by")
-    private String typeCodeBy;
-
-    @TableField("brand_id")
-    private String brandId;
-
-    @TableField("brand_name")
-    private String brandName;
-
-    @TableField("business_time")
-    private String businessTime;
-
-    @TableField("start_time")
-    private String startTime;
-
-    @TableField("end_time")
-    private String endTime;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/TopologicalBuildWdStatisticsCategory.java

@@ -1,22 +0,0 @@
-package com.ruoyi.benyun.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-@TableName("bl_topological_build_wd_statistics_category")
-public class TopologicalBuildWdStatisticsCategory {
-
-    @TableField("center_wd_id")
-    private String centerWdId;
-    @TableField("radius")
-    private int radius;
-    @TableField("property_type_statistics")
-    private String propertyTypeStatistics;
-
-    @TableField("analyse_time")
-    private LocalDateTime analyseTime;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/TopologicalBuildingWd.java

@@ -1,46 +0,0 @@
-package com.ruoyi.benyun.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-@TableName("bl_topological_building_wd_list")
-public class TopologicalBuildingWd {
-
-    @TableField("around_wd_id")
-    private String aroundWdId;
-    @TableField("around_wd_name")
-    private String aroundWdName;
-    @TableField("around_wd_type_code")
-    private String aroundWdTypeCode;
-    @TableField("distance")
-    private double distance;
-    @TableField("addr_code")
-    private String addrCode;
-    @TableField("addr_code_info")
-    private String addrCodeInfo;
-    @TableField("addr_info")
-    private String addrInfo;
-    @TableField("rent")
-    private double rent;
-    @TableField("build_type")
-    private String buildType;
-    @TableField("property_type")
-    private String propertyType;
-    @TableField("analyse_time")
-    private LocalDateTime analyseTime;
-
-    public TopologicalBuildingWd(WdInfo wdInfo) {
-        this.aroundWdId = wdInfo.getWdId();
-        this.aroundWdName = wdInfo.getWdName();
-        this.aroundWdTypeCode = wdInfo.getWdTypeCode();
-        this.addrCode = wdInfo.getAddrCode();
-        this.addrInfo = wdInfo.getAddrInfo();
-    }
-
-    public TopologicalBuildingWd() {
-    }
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/TopologicalEnterpriseWd.java

@@ -1,48 +0,0 @@
-package com.ruoyi.benyun.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-@Data
-@TableName("bl_topological_enterprise_wd_list")
-public class TopologicalEnterpriseWd {
-    @TableField("around_wd_id")
-    private String aroundWdId;
-    @TableField("around_wd_name")
-    private String aroundWdName;
-    @TableField("around_wd_type_code")
-    private String aroundWdTypeCode;
-    @TableField("distance")
-    private double distance;
-    @TableField("addr_code")
-    private String addrCode;
-    @TableField("addr_code_info")
-    private String addrCodeInfo;
-    @TableField("addr_info")
-    private String addrInfo;
-
-    @TableField("industry_code")
-    private String industryCode;
-    @TableField("registered_capital")
-    private BigDecimal registeredCapital;
-    @TableField("enterprise_scale")
-    private String enterpriseScale;
-
-    @TableField("analyse_time")
-    private LocalDateTime analyseTime;
-
-    public TopologicalEnterpriseWd(WdInfo wdInfo) {
-        this.aroundWdId = wdInfo.getWdId();
-        this.aroundWdName = wdInfo.getWdName();
-        this.aroundWdTypeCode = wdInfo.getWdTypeCode();
-        this.addrCode = wdInfo.getAddrCode();
-        this.addrInfo = wdInfo.getAddrInfo();
-    }
-
-    public TopologicalEnterpriseWd() {
-    }
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/TopologicalHouseWd.java

@@ -1,57 +0,0 @@
-package com.ruoyi.benyun.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-@TableName("bl_topological_house_wd_list")
-public class TopologicalHouseWd {
-
-    @TableField("around_wd_id")
-    public String aroundWdId;
-    @TableField("around_wd_name")
-    public String aroundWdName;
-    @TableField("around_wd_type_code")
-    public String aroundWdTypeCode;
-    @TableField("distance")
-    public double distance;
-
-    @TableField("addr_code")
-    public String addrCode;
-
-    @TableField("addr_code_info")
-    public String addrCodeInfo;
-
-    @TableField("addr_info")
-    public String addrInfo;
-
-    @TableField("rent")
-    public double rent;
-
-    @TableField("property_type")
-    public String propertyType;
-
-    @TableField("households")
-    public int households;
-
-    @TableField("people_count")
-    public int peopleCount;
-
-    @TableField("analyse_time")
-    private LocalDateTime analyseTime;
-
-    public TopologicalHouseWd(WdInfo wdInfo) {
-        this.aroundWdId = wdInfo.getWdId();
-        this.aroundWdName = wdInfo.getWdName();
-        this.aroundWdTypeCode = wdInfo.getWdTypeCode();
-        this.addrCode = wdInfo.getAddrCode();
-        this.addrInfo = wdInfo.getAddrInfo();
-    }
-
-    public TopologicalHouseWd() {
-
-    }
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/TopologicalHouseWdStatisticsData.java

@@ -1,32 +0,0 @@
-package com.ruoyi.benyun.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-public class TopologicalHouseWdStatisticsData {
-
-    @TableField("center_wd_id")
-    private String centerWdId;
-
-    @TableField("radius")
-    private int radius;
-
-    @TableField("house_wd_count")
-    private int houseWdCount;
-
-    @TableField("total_households")
-    private int totalHouseholds;
-
-    @TableField("total_people_count")
-    private int totalPeopleCount;
-
-    @TableField("average_rent")
-    private double averageRent;
-
-    @TableField("analyse_time")
-    private LocalDateTime analyseTime;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/TopologicalStoreWd.java

@@ -1,50 +0,0 @@
-package com.ruoyi.benyun.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-public class TopologicalStoreWd {
-    @TableField("around_wd_id")
-    private String aroundWdId;
-    @TableField("around_wd_name")
-    private String aroundWdName;
-    @TableField("around_wd_type_code")
-    private String aroundWdTypeCode;
-    @TableField("distance")
-    private double distance;
-
-    @TableField("addr_code")
-    private String addrCode;
-
-    @TableField("addr_code_info")
-    private String addrCodeInfo;
-
-    @TableField("addr_info")
-    private String addrInfo;
-
-    @TableField("industry_code")
-    private String industryCode;
-
-    @TableField("manage_type_code")
-    private String manageTypeCode;
-
-    @TableField("analyse_time")
-    private LocalDateTime analyseTime;
-
-    @TableField("brand_id")
-    private String brandId;
-
-    public TopologicalStoreWd(WdInfo wdInfo) {
-        this.aroundWdId = wdInfo.getWdId();
-        this.aroundWdName = wdInfo.getWdName();
-        this.aroundWdTypeCode = wdInfo.getWdTypeCode();
-        this.addrCode = wdInfo.getAddrCode();
-        this.addrInfo = wdInfo.getAddrInfo();
-    }
-
-    public TopologicalStoreWd() {
-    }
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/TopologicalStoreWdStatisticsCategory.java

@@ -1,30 +0,0 @@
-package com.ruoyi.benyun.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-@TableName("bl_topological_store_wd_statistics_category")
-public class TopologicalStoreWdStatisticsCategory {
-
-    @TableField("center_wd_id")
-    private String centerWdId;
-
-    @TableField("radius")
-    private int radius;
-
-    @TableField("big_manage_type_code")
-    private String bigManageTypeCode;
-
-    @TableField("mid_manage_type_code")
-    private String midManageTypeCode;
-
-    @TableField("sub_category_code_statistics")
-    private String subCategoryCodeStatistics;
-
-    @TableField("analyse_time")
-    private LocalDateTime analyseTime;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/TrafficWd.java

@@ -1,17 +0,0 @@
-package com.ruoyi.benyun.entity;
-
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-@Data
-@TableName("ddt_traffic_wd")
-public class TrafficWd {
-    @TableId(value = "wd_id")
-    private String wdId;
-
-    @TableField("cars")
-    String cars;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/TypeBy.java

@@ -1,20 +0,0 @@
-package com.ruoyi.benyun.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-@Data
-@TableName("ddt_type_by")
-public class TypeBy {
-    @TableField("type_code_by")
-    private String typeCodeBy;
-    @TableField("big_category")
-    private String bigCategory;
-    @TableField("mid_category")
-    private String midCategory;
-    @TableField("sub_category")
-    private String subCategory;
-    @TableField("full_info")
-    private String fullInfo;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/WdInfo.java

@@ -1,87 +0,0 @@
-package com.ruoyi.benyun.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-
-@Data
-@TableName("ddt_wd_info")
-public class WdInfo {
-    @TableId("wd_id")
-    private String wdId;
-    @TableField("wd_img")
-    private String wdImg;
-    @TableField("wd_name")
-    private String wdName;
-    @TableField("create_date")
-    @JsonSerialize(using = LocalDateSerializer.class)
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDate createDate;
-    @TableField("addr_info")
-    private String addrInfo;
-    @TableField("addr_code")
-    private String addrCode;
-    @TableField("lat")
-    private BigDecimal lat;
-    @TableField("lng")
-    private BigDecimal lng;
-    @TableField("type_code_tx")
-    private String typeCodeTx;
-    @TableField("type_name_tx")
-    private String typeNameTx;
-    @TableField("type_code_gd")
-    private String typeCodeGd;
-    @TableField("type_name_gd")
-    private String typeNameGd;
-    @TableField("type_code_by")
-    private String typeCodeBy;
-    @TableField("type_name_by")
-    private String typeNameBy;
-    @TableField("rent")
-    private Double rent;
-    @TableField("audit")
-    private int audit;
-    @TableField("wd_type_code")
-    private String wdTypeCode;
-    @TableField("enter_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime enterTime;
-    @TableField("update_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime updateTime;
-    @TableField("collect_user_id")
-    private String collectUserId;
-    @TableField("collect_person")
-    private String collectPerson;
-    @TableField("collect_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime collectTime;
-    @TableField("hash")
-    private String hash;
-    @TableField("geo_hash")
-    private String geoHash;
-
-    @TableField("show_delete")
-    @TableLogic
-    private int showDelete;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/WdOpclose.java

@@ -1,37 +0,0 @@
-package com.ruoyi.benyun.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-@TableName("bl_wd_opclose_statistics")
-public class WdOpclose {
-    @TableField("stat_id")
-    private String statId;
-
-    @TableField("addr_code")
-    private String addrCode;
-
-    @TableField("wd_type_code")
-    private String wdTypeCode;
-
-    @TableField("open_count")
-    private Integer openCount;
-
-    @TableField("close_count")
-    private Integer closeCount;
-
-    @TableField("stat_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime statTime;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/WdToologicalItem.java

@@ -1,20 +0,0 @@
-package com.ruoyi.benyun.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-@Data
-public class WdToologicalItem {
-    private String aroundWdId;
-    private String aroundWdName;
-    private String aroundWdTypeCode;
-    private String aroundTypeCodeBy;
-    private String addrCode;
-    private String addrCodeInfo;
-    private String addrInfo;
-    private BigDecimal lat;
-    private BigDecimal lng;
-    private double distance;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/WdTopological.java

@@ -1,24 +0,0 @@
-package com.ruoyi.benyun.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-@Data
-@TableName("bl_wd_topological")
-public class WdTopological {
-    @TableField("center_wd_id")
-    private String centerWdId;
-    @TableField("center_wd_name")
-    private String centerWdName;
-    @TableField("radius")
-    private int radius;
-    @TableField("aroun_wd_info")
-    private String aroundWdInfo;
-    @TableField("analyse_time")
-    private LocalDateTime analyseTime;
-
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/WdTopologicalInfo.java

@@ -1,42 +0,0 @@
-package com.ruoyi.benyun.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-@Data
-@TableName("bl_wd_topological_info")
-public class WdTopologicalInfo {
-    @TableField("center_wd_id")
-    private String centerWdId;
-    @TableField("center_wd_name")
-    private String centerWdName;
-    @TableField("center_wd_type_code")
-    private String centerWdTypeCode;
-
-    @TableField("type_code_by")
-    private String typeCodeBy;
-
-    @TableField("radius")
-    private int radius;
-    @TableField("addr_code")
-    private String addrCode;
-    @TableField("addr_code_info")
-    private String addrCodeInfo;
-    @TableField("addr_info")
-    private String addrInfo;
-    @TableField("lat")
-    private BigDecimal lat;
-    @TableField("lng")
-    private BigDecimal lng;
-    @TableField("geo_hash")
-    private String geoHash;
-    @TableField("tag")
-    private String tag;
-
-    @TableField("analyse_time")
-    private LocalDateTime analyseTime;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/bo/AttentionPoolBo.java

@@ -1,24 +0,0 @@
-package com.ruoyi.benyun.entity.bo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-public class AttentionPoolBo {
-    private String attentionId;
-    private String contact;
-    private String telephone;
-    private String wdName;
-    private String wdAddrInfo;
-    private String brandName;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime attentionTime;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/bo/AttentionPoolStatisticsBo.java

@@ -1,22 +0,0 @@
-package com.ruoyi.benyun.entity.bo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-public class AttentionPoolStatisticsBo {
-    private Integer attentionCount;
-    private Integer clueCount;
-    private Integer onlineCount;
-    private Integer offlineCount;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime time;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/bo/BStoreData.java

@@ -1,13 +0,0 @@
-package com.ruoyi.benyun.entity.bo;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class BStoreData {
-    private String brandName;
-    private String status;
-    private String industryCode;
-    private List<Info> info;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/bo/BrandAddrDistribution.java

@@ -1,10 +0,0 @@
-package com.ruoyi.benyun.entity.bo;
-
-import lombok.Data;
-
-@Data
-public class BrandAddrDistribution {
-    private String addrCode;
-    private String addrName;
-    private Integer count;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/bo/BrandDisCloud.java

@@ -1,11 +0,0 @@
-package com.ruoyi.benyun.entity.bo;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class BrandDisCloud {
-    private List<BrandDisItem> zoneDistribution;
-    private List<BrandDisItem> cityDistribution;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/bo/BrandDisItem.java

@@ -1,10 +0,0 @@
-package com.ruoyi.benyun.entity.bo;
-
-import lombok.Data;
-
-@Data
-public class BrandDisItem {
-    private String code;
-    private String name;
-    private Integer count;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/bo/BrandDistribution.java

@@ -1,14 +0,0 @@
-package com.ruoyi.benyun.entity.bo;
-
-import lombok.Data;
-
-@Data
-public class BrandDistribution {
-    private Integer total;
-    private Integer coverProvinceCount;
-    private String coverProvinceRatio;
-    private Integer coverCityCount;
-    private String coverCityRatio;
-    private Integer coverZoneCount;
-    private String coverZoneRatio;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/bo/BrandGeoLabelBo.java

@@ -1,11 +0,0 @@
-package com.ruoyi.benyun.entity.bo;
-
-import lombok.Data;
-
-@Data
-public class BrandGeoLabelBo {
-    private String code;
-    private String name;
-    private Integer total;
-    private String ratio;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/bo/BrandInfo.java

@@ -1,30 +0,0 @@
-package com.ruoyi.benyun.entity.bo;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-@TableName("ddt_origin_brand")
-public class BrandInfo {
-    private String brandId;
-    private String brandName;
-    private String brandImg;
-    private Float indexScore;
-    private String enterpriseUsci;
-    private String enterpriseName;
-    private String addrInfo;
-    private String addrCode;
-    private String telephone;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime updateTime;
-    private Integer attention;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/bo/BrandOpcloseBo.java

@@ -1,26 +0,0 @@
-package com.ruoyi.benyun.entity.bo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-import java.util.List;
-
-@Data
-public class BrandOpcloseBo {
-    private List<String> typeCodes; // 网点分类（犇云）
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime startTime;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime endTime;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/bo/BrandProperty.java

@@ -1,13 +0,0 @@
-package com.ruoyi.benyun.entity.bo;
-
-import lombok.Data;
-
-@Data
-public class BrandProperty {
-    private String industryCode;
-    private String industryName;
-    private Float perCapitaConsumption;
-    private Long commentCount;
-    private Float score;
-    private String activeRatio;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/bo/BrandProvinceBo.java

@@ -1,24 +0,0 @@
-package com.ruoyi.benyun.entity.bo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-public class BrandProvinceBo {
-    private String brandId;
-    private String code;
-    private String name;
-    private String location;
-    private Integer count;
-    private String ratio;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime updateTime;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/bo/BrandSearch.java

@@ -1,26 +0,0 @@
-package com.ruoyi.benyun.entity.bo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-public class BrandSearch {
-    private String brandId;
-    private String brandName;
-    private String brandImg;
-    private Float indexScore;
-    private String enterpriseName;
-    private Integer coverCityCount;
-    private Integer total;
-    private Integer attention;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime updateTime;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/bo/BrandSimilar.java

@@ -1,23 +0,0 @@
-package com.ruoyi.benyun.entity.bo;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-@TableName("ddt_origin_brand")
-public class BrandSimilar {
-    private String brandId;
-    private String brandName;
-    private String brandImg;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime updateTime;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/bo/BrandStatus.java

@@ -1,9 +0,0 @@
-package com.ruoyi.benyun.entity.bo;
-
-import lombok.Data;
-
-@Data
-public class BrandStatus {
-    private String businessStatus;
-    private Integer count;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/bo/BrandTotal.java

@@ -1,21 +0,0 @@
-package com.ruoyi.benyun.entity.bo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-public class BrandTotal {
-    private String brandId;
-    private String brandName;
-    private int total;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime updateTime;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/bo/BuildWdCategoryCount.java

@@ -1,10 +0,0 @@
-package com.ruoyi.benyun.entity.bo;
-
-import lombok.Data;
-
-@Data
-public class BuildWdCategoryCount {
-    private String name;
-    private int count;
-    private double radio;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/bo/BuildWdInfoBo.java

@@ -1,39 +0,0 @@
-package com.ruoyi.benyun.entity.bo;
-
-import com.ruoyi.benyun.entity.WdInfo;
-import com.ruoyi.benyun.entity.BuildWd;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class BuildWdInfoBo extends WdInfo {
-    private BuildWd buildWd;
-
-    private List<String> tags;
-
-    public BuildWdInfoBo(WdInfo wdInfo) {
-        setWdId(wdInfo.getWdId());
-        setAddrInfo(wdInfo.getAddrInfo());
-        setAudit(wdInfo.getAudit());
-        setTypeNameBy(wdInfo.getTypeNameBy());
-        setAddrCode(wdInfo.getAddrCode());
-        setCollectPerson(wdInfo.getCollectPerson());
-        setTypeNameBy(wdInfo.getTypeNameBy());
-        setCollectTime(wdInfo.getCollectTime());
-        setCollectUserId(wdInfo.getCollectUserId());
-        setCreateDate(wdInfo.getCreateDate());
-        setEnterTime(wdInfo.getEnterTime());
-        setLat(wdInfo.getLat());
-        setLng(wdInfo.getLng());
-        setRent(wdInfo.getRent());
-        setTypeCodeBy(wdInfo.getTypeCodeBy());
-        setWdImg(wdInfo.getWdImg());
-        setWdName(wdInfo.getWdName());
-        setWdTypeCode(wdInfo.getWdTypeCode());
-    }
-
-    public BuildWdInfoBo() {
-
-    }
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/bo/BusinessOpportunitiesClueBo.java

@@ -1,23 +0,0 @@
-package com.ruoyi.benyun.entity.bo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-public class BusinessOpportunitiesClueBo {
-    private String clueId;
-    private String attentionId;
-    private String contact;
-    private String telephone;
-    private Integer followUpCount;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime createTime;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/bo/EnterpriseWdInfoBo.java

@@ -1,39 +0,0 @@
-package com.ruoyi.benyun.entity.bo;
-
-import com.ruoyi.benyun.entity.EnterpriseWd;
-import com.ruoyi.benyun.entity.WdInfo;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class EnterpriseWdInfoBo extends WdInfo {
-    private EnterpriseWd enterpriseWd;
-
-    private List<String> tags;
-
-    public EnterpriseWdInfoBo(WdInfo wdInfo) {
-        setWdId(wdInfo.getWdId());
-        setAddrInfo(wdInfo.getAddrInfo());
-        setAudit(wdInfo.getAudit());
-        setTypeNameBy(wdInfo.getTypeNameBy());
-        setAddrCode(wdInfo.getAddrCode());
-        setCollectPerson(wdInfo.getCollectPerson());
-        setTypeNameBy(wdInfo.getTypeNameBy());
-        setCollectTime(wdInfo.getCollectTime());
-        setCollectUserId(wdInfo.getCollectUserId());
-        setCreateDate(wdInfo.getCreateDate());
-        setEnterTime(wdInfo.getEnterTime());
-        setLat(wdInfo.getLat());
-        setLng(wdInfo.getLng());
-        setRent(wdInfo.getRent());
-        setTypeCodeBy(wdInfo.getTypeCodeBy());
-        setWdImg(wdInfo.getWdImg());
-        setWdName(wdInfo.getWdName());
-        setWdTypeCode(wdInfo.getWdTypeCode());
-    }
-
-    public EnterpriseWdInfoBo() {
-
-    }
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/bo/FollowUpRecordBo.java

@@ -1,22 +0,0 @@
-package com.ruoyi.benyun.entity.bo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-public class FollowUpRecordBo {
-    private String recordId;
-    private String way;
-    private String content;
-    private String person;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime followTime;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/bo/HouseWdInfoBo.java

@@ -1,38 +0,0 @@
-package com.ruoyi.benyun.entity.bo;
-
-import com.ruoyi.benyun.entity.HouseWd;
-import com.ruoyi.benyun.entity.WdInfo;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class HouseWdInfoBo extends WdInfo {
-    private HouseWd houseWd;
-
-    private List<String> tags;
-    public HouseWdInfoBo(WdInfo wdInfo) {
-        setWdId(wdInfo.getWdId());
-        setAddrInfo(wdInfo.getAddrInfo());
-        setAudit(wdInfo.getAudit());
-        setTypeNameBy(wdInfo.getTypeNameBy());
-        setAddrCode(wdInfo.getAddrCode());
-        setCollectPerson(wdInfo.getCollectPerson());
-        setTypeNameBy(wdInfo.getTypeNameBy());
-        setCollectTime(wdInfo.getCollectTime());
-        setCollectUserId(wdInfo.getCollectUserId());
-        setCreateDate(wdInfo.getCreateDate());
-        setEnterTime(wdInfo.getEnterTime());
-        setLat(wdInfo.getLat());
-        setLng(wdInfo.getLng());
-        setRent(wdInfo.getRent());
-        setTypeCodeBy(wdInfo.getTypeCodeBy());
-        setWdImg(wdInfo.getWdImg());
-        setWdName(wdInfo.getWdName());
-        setWdTypeCode(wdInfo.getWdTypeCode());
-    }
-
-    public HouseWdInfoBo() {
-
-    }
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/bo/Info.java

@@ -1,22 +0,0 @@
-package com.ruoyi.benyun.entity.bo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-public class Info {
-    private String addrCode;
-    private String addrName;
-    private Float avgScore;
-    private Integer count;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime time;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/bo/StoreWdCategoryCount.java

@@ -1,16 +0,0 @@
-package com.ruoyi.benyun.entity.bo;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class StoreWdCategoryCount {
-    private String manageTypeCode;
-
-    private String name;
-    private List<StoreWdCategoryCountBody> storeWdCategoryCountBodyList;
-
-    private int count;
-    private double radio;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/bo/StoreWdCategoryCountBody.java

@@ -1,12 +0,0 @@
-package com.ruoyi.benyun.entity.bo;
-
-import lombok.Data;
-
-@Data
-public class StoreWdCategoryCountBody {
-
-    private String manageTypeCode;
-    private String name;
-    private int count;
-    private double radio;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/bo/StoreWdInfoBo.java

@@ -1,40 +0,0 @@
-package com.ruoyi.benyun.entity.bo;
-
-import com.ruoyi.benyun.entity.StoreWd;
-import com.ruoyi.benyun.entity.WdInfo;
-import lombok.Data;
-
-import java.util.List;
-
-
-@Data
-public class StoreWdInfoBo extends WdInfo {
-    private StoreWd storeWd;
-
-    private List<String> tags;
-
-    public StoreWdInfoBo(WdInfo wdInfo) {
-        setWdId(wdInfo.getWdId());
-        setAddrInfo(wdInfo.getAddrInfo());
-        setAudit(wdInfo.getAudit());
-        setTypeNameBy(wdInfo.getTypeNameBy());
-        setAddrCode(wdInfo.getAddrCode());
-        setCollectPerson(wdInfo.getCollectPerson());
-        setTypeNameBy(wdInfo.getTypeNameBy());
-        setCollectTime(wdInfo.getCollectTime());
-        setCollectUserId(wdInfo.getCollectUserId());
-        setCreateDate(wdInfo.getCreateDate());
-        setEnterTime(wdInfo.getEnterTime());
-        setLat(wdInfo.getLat());
-        setLng(wdInfo.getLng());
-        setRent(wdInfo.getRent());
-        setTypeCodeBy(wdInfo.getTypeCodeBy());
-        setWdImg(wdInfo.getWdImg());
-        setWdName(wdInfo.getWdName());
-        setWdTypeCode(wdInfo.getWdTypeCode());
-    }
-
-    public StoreWdInfoBo() {
-
-    }
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/bo/TrafficWdInfoBo.java

@@ -1,39 +0,0 @@
-package com.ruoyi.benyun.entity.bo;
-
-import com.ruoyi.benyun.entity.TrafficWd;
-import com.ruoyi.benyun.entity.WdInfo;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class TrafficWdInfoBo extends WdInfo {
-    private TrafficWd trafficWd;
-
-    private List<String> tags;
-
-    public TrafficWdInfoBo(WdInfo wdInfo) {
-        setWdId(wdInfo.getWdId());
-        setAddrInfo(wdInfo.getAddrInfo());
-        setAudit(wdInfo.getAudit());
-        setTypeNameBy(wdInfo.getTypeNameBy());
-        setAddrCode(wdInfo.getAddrCode());
-        setCollectPerson(wdInfo.getCollectPerson());
-        setTypeNameBy(wdInfo.getTypeNameBy());
-        setCollectTime(wdInfo.getCollectTime());
-        setCollectUserId(wdInfo.getCollectUserId());
-        setCreateDate(wdInfo.getCreateDate());
-        setEnterTime(wdInfo.getEnterTime());
-        setLat(wdInfo.getLat());
-        setLng(wdInfo.getLng());
-        setRent(wdInfo.getRent());
-        setTypeCodeBy(wdInfo.getTypeCodeBy());
-        setWdImg(wdInfo.getWdImg());
-        setWdName(wdInfo.getWdName());
-        setWdTypeCode(wdInfo.getWdTypeCode());
-    }
-
-    public TrafficWdInfoBo() {
-
-    }
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/bo/WdAddrTypeDistribution.java

@@ -1,12 +0,0 @@
-package com.ruoyi.benyun.entity.bo;
-
-import lombok.Data;
-
-@Data
-public class WdAddrTypeDistribution {
-    private String typeCode;
-    private String typeName;
-    private String addrCode;
-    private String addrName;
-    private Integer count;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/bo/WdCount.java

@@ -1,13 +0,0 @@
-package com.ruoyi.benyun.entity.bo;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.List;
-
-@Data
-public class WdCount implements Serializable {
-    List<WdCountBody> wdCountBodyList;
-    long total;
-
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/bo/WdCountBody.java

@@ -1,16 +0,0 @@
-package com.ruoyi.benyun.entity.bo;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-@Data
-public class WdCountBody implements Serializable {
-    private String name;
-    private BigDecimal lat;
-    private BigDecimal lng;
-    private String addrCode;
-    private int count;
-    private float radio;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/bo/WdTopologicalInfoBo.java

@@ -1,64 +0,0 @@
-package com.ruoyi.benyun.entity.bo;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.ruoyi.benyun.entity.WdInfo;
-import com.ruoyi.benyun.entity.WdTopologicalInfo;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.List;
-
-@Data
-@TableName("bl_wd_topological_info")
-public class WdTopologicalInfoBo {
-    private String wdId;
-    private String wdName;
-    private String wdTypeCode;
-
-    private String typeCodeBy;
-
-    private int radius;
-    private String addrCode;
-    private String addrCodeInfo;
-    private String addrInfo;
-    private BigDecimal lat;
-    private BigDecimal lng;
-    private String geoHash;
-    private List<String> tag;
-
-    private int attention;
-
-    @TableField("analyse_time")
-    private LocalDateTime analyseTime;
-
-    public WdTopologicalInfoBo(WdInfo wdInfo) {
-        this.wdId = wdInfo.getWdId();
-        this.wdName = wdInfo.getWdName();
-        this.wdTypeCode = wdInfo.getWdTypeCode();
-        this.typeCodeBy = wdInfo.getTypeCodeBy();
-        this.addrCode = wdInfo.getAddrCode();
-        this.addrInfo = wdInfo.getAddrInfo();
-        this.lat = wdInfo.getLat();
-        this.lng = wdInfo.getLng();
-        this.geoHash = wdInfo.getGeoHash();
-        this.radius = 1000;
-    }
-
-    public WdTopologicalInfoBo() {
-    }
-
-    public WdTopologicalInfoBo(WdTopologicalInfo wdInfo) {
-        this.wdId = wdInfo.getCenterWdId();
-        this.wdName = wdInfo.getCenterWdName();
-        this.wdTypeCode = wdInfo.getCenterWdTypeCode();
-        this.typeCodeBy = wdInfo.getTypeCodeBy();
-        this.addrCode = wdInfo.getAddrCode();
-        this.addrInfo = wdInfo.getAddrInfo();
-        this.lat = wdInfo.getLat();
-        this.lng = wdInfo.getLng();
-        this.geoHash = wdInfo.getGeoHash();
-        this.radius = 1000;
-    }
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/vo/AddFollowRecordVo.java

@@ -1,17 +0,0 @@
-package com.ruoyi.benyun.entity.vo;
-
-import lombok.Data;
-
-import javax.validation.constraints.NotEmpty;
-
-@Data
-public class AddFollowRecordVo {
-    @NotEmpty(message = "clueId不能为空")
-    String clueId;
-    @NotEmpty(message = "way不能为空")
-    String way;
-    @NotEmpty(message = "content不能为空")
-    String content;
-    @NotEmpty(message = "person不能为空")
-    String person;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/vo/AddStatusVo.java

@@ -1,11 +0,0 @@
-package com.ruoyi.benyun.entity.vo;
-
-import lombok.Data;
-
-@Data
-public class AddStatusVo {
-    private String typeCode;
-    private String typeName;
-    private Integer count;
-    private String time;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/vo/AddrCategoryBody.java

@@ -1,12 +0,0 @@
-package com.ruoyi.benyun.entity.vo;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class AddrCategoryBody {
-    private String addrCore;
-    private String addrCoreName;
-    private List<AddrCategoryBody> addrCategoryes;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/vo/BrandDisItem.java

@@ -1,10 +0,0 @@
-package com.ruoyi.benyun.entity.vo;
-
-import lombok.Data;
-
-@Data
-public class BrandDisItem {
-    private String code;
-    private String name;
-    private Integer count;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/vo/BrandEvolveVo.java

@@ -1,11 +0,0 @@
-package com.ruoyi.benyun.entity.vo;
-
-import lombok.Data;
-
-@Data
-public class BrandEvolveVo {
-    private String brandId;
-    private String brandName;
-    private Integer total;
-    private String time;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/vo/BrandOpcloseVo.java

@@ -1,14 +0,0 @@
-package com.ruoyi.benyun.entity.vo;
-
-import lombok.Data;
-
-@Data
-public class BrandOpcloseVo {
-    private String brandId;
-
-    private String brandName;
-
-    private Integer count;
-
-    private String ratio;
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/vo/BrandVo.java

@@ -1,55 +0,0 @@
-package com.ruoyi.benyun.entity.vo;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-public class BrandVo {
-    private String brandId;
-    private String brandImg;
-    private String brandName;
-    private String industryCode;
-    private String enterpriseUsci;
-    private Float perCapitaConsumption;
-    private Long commentCount;
-    private Float score;
-    private String menuInfo;
-    private Float indexScore;
-    private String contact;
-    private String telephone;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime createDate;
-    private Long audit;
-    private String collectPerson;
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime collectTime;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime enterTime;
-    private String hash;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime updateTime;
-
-    private int showDelete = -1;
-
-    private int pageNum = 1;
-
-    private int pageSize = 10;
-
-    private String orderBy = "collect_time";
-
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/vo/ChannelAnalyseAceeptVo.java

@@ -1,45 +0,0 @@
-package com.ruoyi.benyun.entity.vo;
-
-import com.ruoyi.benyun.constant.ChannelMapContant;
-import com.ruoyi.benyun.utils.HashUtil;
-import lombok.Data;
-
-@Data
-public class ChannelAnalyseAceeptVo {
-    String[] channel;
-
-    String searchText;
-
-    /*
-     * 分页字段（list、point接口）
-     * */
-    int pageNum = 1;
-    int pageSize = 10;
-
-    public String[] getChannel() {
-        if(this.channel == null || this.channel.length == 0){
-            return channel = ChannelMapContant.FULL_CHANNEL;
-        }
-        return channel;
-    }
-
-    public String getHash(){
-        StringBuilder stringBuilder = new StringBuilder();
-
-        //搜索渠道
-        for (String s : getChannel()) {
-            stringBuilder.append(s);
-        }
-        //搜索文本
-        stringBuilder.append(this.searchText);
-
-        stringBuilder.append(pageNum);
-        stringBuilder.append(pageSize);
-
-        //生成Hash
-        String s = stringBuilder.toString();
-        String md5 = HashUtil.hash(s, "MD5");
-
-        return md5;
-    }
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/vo/ChannelMapAceeptVo.java

@@ -1,105 +0,0 @@
-package com.ruoyi.benyun.entity.vo;
-
-import com.ruoyi.benyun.valida.ChannelAreaGroup;
-import com.ruoyi.benyun.valida.ChannelListGroup;
-import com.ruoyi.benyun.valida.ChannelPointGroup;
-import com.ruoyi.benyun.constant.ChannelMapContant;
-import com.ruoyi.benyun.utils.HashUtil;
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
-
-@Data
-public class ChannelMapAceeptVo {
-
-    /*
-    * 搜索字段
-    * */
-    String searchText;  //网点关键字
-    String brandName; //品牌名称
-
-    /*
-    * 分类字段
-    * */
-    String[] channel;  //渠道分类（0：基础设施网点、1：门店网点、2：小区网点、3：楼宇网点、4：交通设施网点、5：公司网点）
-
-    @NotBlank(groups = { ChannelAreaGroup.class, ChannelListGroup.class},message = "rankType不能为空")
-    String rankType; //搜索等级（province：搜索省、city：搜素市、zone：搜素区）
-
-    /*
-    * 地区编码code
-    * 当 rankType = province,city 需要提交省区码编码
-    * 当 rankType = zone 需要提交市区码编码
-    * */
-    @NotEmpty(groups = {ChannelPointGroup.class},message = "地区码为空")
-    String[] addrCode; //地区Code
-
-    String[] cityTier; //["一线"，"新一线"、"二线"、"三线"、"四线"、"五线"]
-
-    String orderby = ""; //排序字段，(list接口)
-
-    int size = 15; //tag分析时候用
-
-    /*
-    * 分页字段（list、point接口）
-    * */
-    int pageNum = 1;
-    int pageSize = 10;
-
-
-    public String[] getChannel() {
-        if(this.channel == null || this.channel.length == 0){
-            return channel = ChannelMapContant.FULL_CHANNEL;
-        }
-        return channel;
-    }
-
-    public String[] getAddrCode() {
-        if(this.addrCode == null || this.addrCode.length == 0){
-            this.addrCode = ChannelMapContant.FULL_PROVINCE;
-        }
-        return addrCode;
-    }
-
-    public String getHash(){
-        StringBuilder stringBuilder = new StringBuilder();
-
-        //搜索文本
-        stringBuilder.append(this.searchText);
-        //搜索品牌
-        stringBuilder.append(this.brandName);
-
-        //搜索渠道
-        for (String s : getChannel()) {
-            stringBuilder.append(s);
-        }
-
-        //搜索等级
-        stringBuilder.append(this.rankType);
-
-
-        //搜索地区
-        for (String s : getAddrCode()) {
-            stringBuilder.append(s);
-        }
-
-        //城市等级
-        if(this.cityTier != null && this.cityTier.length > 0){
-            for (String s : this.cityTier) {
-                stringBuilder.append(s);
-            }
-        }
-
-        stringBuilder.append(orderby);
-        stringBuilder.append(size);
-        stringBuilder.append(pageNum);
-        stringBuilder.append(pageSize);
-
-        //生成Hash
-        String s = stringBuilder.toString();
-        String md5 = HashUtil.hash(s, "MD5");
-
-        return md5;
-    }
-}

benyun-core/src/main/java/com/ruoyi/benyun/entity/vo/Info.java

@@ -1,14 +0,0 @@
-package com.ruoyi.benyun.entity.vo;
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-@Data
-public class Info {
-    private String addrCode;
-    private BigDecimal avgScore;
-    private Integer count;
-    private LocalDateTime time;
-}