同步ldm数据

src/main/java/com/caimei/config/CmDataSourceConfig.java

@@ -0,0 +1,52 @@
+package com.caimei.config;
+
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.SqlSessionFactoryBean;
+import org.mybatis.spring.SqlSessionTemplate;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.jdbc.DataSourceBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+
+import javax.sql.DataSource;
+
+/**
+ * @author Aslee
+ */
+@Configuration
+@MapperScan(basePackages = "com.caimei.mapper.cmMapper,com.caimei.module", sqlSessionTemplateRef = "cmSqlSessionTemplate")
+public class CmDataSourceConfig {
+
+    @Bean(name = "cmDataSource")
+    @ConfigurationProperties(prefix = "spring.datasource.cmdatasource")
+    @Primary
+    public DataSource cmDataSource() {
+        return DataSourceBuilder.create().build();
+    }
+
+    @Bean(name = "cmSqlSessionFactory")
+    @Primary
+    public SqlSessionFactory cmSqlSessionFactory(@Qualifier("cmDataSource") DataSource dataSource) throws Exception {
+        SqlSessionFactoryBean bean = new SqlSessionFactoryBean();
+        bean.setDataSource(dataSource);
+        bean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath:mapper/*.xml"));
+        return bean.getObject();
+    }
+
+    @Bean(name = "cmTransactionManager")
+    @Primary
+    public DataSourceTransactionManager cmTransactionManager(@Qualifier("cmDataSource") DataSource dataSource) {
+        return new DataSourceTransactionManager(dataSource);
+    }
+
+    @Bean(name = "cmSqlSessionTemplate")
+    @Primary
+    public SqlSessionTemplate cmSqlSessionTemplate(@Qualifier("cmSqlSessionFactory") SqlSessionFactory sqlSessionFactory) throws Exception {
+        return new SqlSessionTemplate(sqlSessionFactory);
+    }
+}

src/main/java/com/caimei/config/LdmDataSourceConfig.java

@@ -0,0 +1,45 @@
+package com.caimei.config;
+
+
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.SqlSessionFactoryBean;
+import org.mybatis.spring.SqlSessionTemplate;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.jdbc.DataSourceBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+
+import javax.sql.DataSource;
+
+@Configuration
+@MapperScan(basePackages = "com.caimei.mapper.ldmMapper", sqlSessionTemplateRef = "ldmSqlSessionTemplate")
+public class LdmDataSourceConfig {
+
+    @Bean(name = "ldmDataSource")
+    @ConfigurationProperties(prefix = "spring.datasource.ldmdatasource")
+    public DataSource testDataSource() {
+        return DataSourceBuilder.create().build();
+    }
+
+    @Bean(name = "ldmSqlSessionFactory")
+    public SqlSessionFactory testSqlSessionFactory(@Qualifier("ldmDataSource") DataSource dataSource) throws Exception {
+        SqlSessionFactoryBean bean = new SqlSessionFactoryBean();
+        bean.setDataSource(dataSource);
+        bean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath:mapper/*.xml"));
+        return bean.getObject();
+    }
+
+    @Bean(name = "ldmTransactionManager")
+    public DataSourceTransactionManager testTransactionManager(@Qualifier("ldmDataSource") DataSource dataSource) {
+        return new DataSourceTransactionManager(dataSource);
+    }
+
+    @Bean(name = "ldmSqlSessionTemplate")
+    public SqlSessionTemplate testSqlSessionTemplate(@Qualifier("ldmSqlSessionFactory") SqlSessionFactory sqlSessionFactory) throws Exception {
+        return new SqlSessionTemplate(sqlSessionFactory);
+    }
+}

src/main/java/com/caimei/config/WxApiInterceptor.java

@@ -1,8 +1,8 @@
 package com.caimei.config;
 
 import com.caimei.components.RedisService;
-import com.caimei.mapper.ClubMapper;
-import com.caimei.mapper.LoginMapper;
+import com.caimei.mapper.cmMapper.ClubMapper;
+import com.caimei.mapper.cmMapper.LoginMapper;
 import com.caimei.model.vo.WxClubUserVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;

src/main/java/com/caimei/mapper/AddressMapper.java → src/main/java/com/caimei/mapper/cmMapper/AddressMapper.java

@@ -1,4 +1,4 @@
-package com.caimei.mapper;
+package com.caimei.mapper.cmMapper;
 
 import com.caimei.model.vo.AddressSelectVo;
 import com.caimei.module.base.entity.vo.AddressVo;

src/main/java/com/caimei/mapper/ArticleMapper.java → src/main/java/com/caimei/mapper/cmMapper/ArticleMapper.java

@@ -1,4 +1,4 @@
-package com.caimei.mapper;
+package com.caimei.mapper.cmMapper;
 
 import com.caimei.model.po.ArticlePo;
 import com.caimei.model.vo.ArticleFormVo;

src/main/java/com/caimei/mapper/AuthMapper.java → src/main/java/com/caimei/mapper/cmMapper/AuthMapper.java

@@ -1,4 +1,4 @@
-package com.caimei.mapper;
+package com.caimei.mapper.cmMapper;
 
 import com.caimei.model.po.CmBrandAuthPo;
 import com.caimei.model.po.LdmDataPo;
@@ -53,4 +53,8 @@ public interface AuthMapper {
     Integer getCityId(String regId1);
 
     Integer getTownId(String regId1);
+
+    Integer getLdmLatestClubId();
+
+    void updateLdmLatestClubId(Integer ldmLatestClubId);
 }

src/main/java/com/caimei/mapper/AuthProductMapper.java → src/main/java/com/caimei/mapper/cmMapper/AuthProductMapper.java

@@ -1,4 +1,4 @@
-package com.caimei.mapper;
+package com.caimei.mapper.cmMapper;
 
 import com.caimei.model.po.ProductParamPo;
 import com.caimei.model.po.ProductPo;

src/main/java/com/caimei/mapper/ClubMapper.java → src/main/java/com/caimei/mapper/cmMapper/ClubMapper.java

@@ -1,4 +1,4 @@
-package com.caimei.mapper;
+package com.caimei.mapper.cmMapper;
 
 import com.caimei.model.po.ClubUserPo;
 import com.caimei.model.vo.*;

src/main/java/com/caimei/mapper/DoctorMapper.java → src/main/java/com/caimei/mapper/cmMapper/DoctorMapper.java

@@ -1,4 +1,4 @@
-package com.caimei.mapper;
+package com.caimei.mapper.cmMapper;
 
 import com.caimei.model.po.CmBrandDoctorPo;
 import com.caimei.model.vo.DoctorEquipmentVo;

src/main/java/com/caimei/mapper/FileMapper.java → src/main/java/com/caimei/mapper/cmMapper/FileMapper.java

@@ -1,4 +1,4 @@
-package com.caimei.mapper;
+package com.caimei.mapper.cmMapper;
 
 import com.caimei.model.po.CourseFilePo;
 import com.caimei.model.po.ProductImagePo;

src/main/java/com/caimei/mapper/ImageMapper.java → src/main/java/com/caimei/mapper/cmMapper/ImageMapper.java

@@ -1,4 +1,4 @@
-package com.caimei.mapper;
+package com.caimei.mapper.cmMapper;
 
 import com.caimei.model.po.ImagePo;
 import com.caimei.model.vo.ImageFormVo;

src/main/java/com/caimei/mapper/LoginMapper.java → src/main/java/com/caimei/mapper/cmMapper/LoginMapper.java

@@ -1,4 +1,4 @@
-package com.caimei.mapper;
+package com.caimei.mapper.cmMapper;
 
 import com.caimei.model.po.ClubUserPo;
 import com.caimei.model.vo.UserLoginVo;

src/main/java/com/caimei/mapper/ShopMapper.java → src/main/java/com/caimei/mapper/cmMapper/ShopMapper.java

@@ -1,4 +1,4 @@
-package com.caimei.mapper;
+package com.caimei.mapper.cmMapper;
 
 import com.caimei.model.dto.ShopInfoDto;
 import com.caimei.model.po.CmBrandAuthFilePo;

src/main/java/com/caimei/mapper/SystemMapper.java → src/main/java/com/caimei/mapper/cmMapper/SystemMapper.java

@@ -1,4 +1,4 @@
-package com.caimei.mapper;
+package com.caimei.mapper.cmMapper;
 
 
 import com.caimei.model.po.*;

src/main/java/com/caimei/mapper/UserMapper.java → src/main/java/com/caimei/mapper/cmMapper/UserMapper.java

@@ -1,4 +1,4 @@
-package com.caimei.mapper;
+package com.caimei.mapper.cmMapper;
 
 import com.caimei.model.dto.PackageDto;
 import com.caimei.model.po.VipHistoryPo;

src/main/java/com/caimei/mapper/VideoMapper.java → src/main/java/com/caimei/mapper/cmMapper/VideoMapper.java

@@ -1,4 +1,4 @@
-package com.caimei.mapper;
+package com.caimei.mapper.cmMapper;
 
 import com.caimei.model.po.VideoPo;
 import com.caimei.model.vo.VideoListVo;

src/main/java/com/caimei/mapper/VipMapper.java → src/main/java/com/caimei/mapper/cmMapper/VipMapper.java

@@ -1,4 +1,4 @@
-package com.caimei.mapper;
+package com.caimei.mapper.cmMapper;
 
 import com.caimei.model.dto.PackageDto;
 import com.caimei.model.po.AuthVipPo;

src/main/java/com/caimei/mapper/ldmMapper/LdmMapper.java

@@ -0,0 +1,19 @@
+package com.caimei.mapper.ldmMapper;
+
+import com.caimei.model.po.LdmDataPo;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * Description
+ *
+ * @author : Aslee
+ * @date : 2021/5/11
+ */
+@Mapper
+public interface LdmMapper {
+
+
+    List<LdmDataPo> getLdmClubData(Integer ldmLatestClubId);
+}

src/main/java/com/caimei/service/auth/impl/AddressServiceImpl.java

@@ -1,6 +1,6 @@
 package com.caimei.service.auth.impl;
 
-import com.caimei.mapper.AddressMapper;
+import com.caimei.mapper.cmMapper.AddressMapper;
 import com.caimei.model.ResponseJson;
 import com.caimei.model.vo.AddressSelectVo;
 import com.caimei.service.auth.AddressService;

src/main/java/com/caimei/service/auth/impl/ArticleServiceImpl.java

@@ -1,6 +1,6 @@
 package com.caimei.service.auth.impl;
 
-import com.caimei.mapper.ArticleMapper;
+import com.caimei.mapper.cmMapper.ArticleMapper;
 import com.caimei.model.ResponseJson;
 import com.caimei.model.po.ArticlePo;
 import com.caimei.model.vo.ArticleFormVo;

src/main/java/com/caimei/service/auth/impl/AuthClubServiceImpl.java

@@ -1,9 +1,9 @@
 package com.caimei.service.auth.impl;
 
-import com.caimei.mapper.AuthMapper;
-import com.caimei.mapper.AuthProductMapper;
-import com.caimei.mapper.ClubMapper;
-import com.caimei.mapper.ShopMapper;
+import com.caimei.mapper.cmMapper.AuthMapper;
+import com.caimei.mapper.cmMapper.AuthProductMapper;
+import com.caimei.mapper.cmMapper.ClubMapper;
+import com.caimei.mapper.cmMapper.ShopMapper;
 import com.caimei.model.ResponseJson;
 import com.caimei.model.po.ClubUserPo;
 import com.caimei.model.vo.*;
@@ -16,7 +16,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.math.BigDecimal;
 import java.util.*;
 
 /**

src/main/java/com/caimei/service/auth/impl/AuthProductServiceImpl.java

@@ -2,8 +2,7 @@ package com.caimei.service.auth.impl;
 
 import com.aliyun.oss.OSS;
 import com.aliyun.oss.OSSClientBuilder;
-import com.caimei.config.FastDfsClient;
-import com.caimei.mapper.AuthProductMapper;
+import com.caimei.mapper.cmMapper.AuthProductMapper;
 import com.caimei.model.ResponseJson;
 import com.caimei.model.dto.ProductSaveDto;
 import com.caimei.model.po.ProductParamPo;

src/main/java/com/caimei/service/auth/impl/AuthServiceImpl.java

@@ -1,8 +1,8 @@
 package com.caimei.service.auth.impl;
 
 import com.caimei.config.FastDfsClient;
-import com.caimei.mapper.AuthMapper;
-import com.caimei.mapper.AuthProductMapper;
+import com.caimei.mapper.cmMapper.AuthMapper;
+import com.caimei.mapper.cmMapper.AuthProductMapper;
 import com.caimei.model.ResponseJson;
 import com.caimei.model.dto.ProductSaveDto;
 import com.caimei.model.po.AuthImportPo;
@@ -19,10 +19,8 @@ import com.caimei.service.auth.UploadService;
 import com.caimei.utils.ExcelOperateUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.github.tobato.fastdfs.domain.StorePath;
 import com.github.tobato.fastdfs.service.FastFileStorageClient;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.*;
 import org.apache.poi.ss.usermodel.*;
@@ -346,7 +344,7 @@ public class AuthServiceImpl implements AuthService {
     public ResponseJson exportDataByExcel(Integer authUserId, HttpServletResponse response) {
         try {
             // 导出表格名
-            String fileName = new String("机构商品数据.xlsx".getBytes("UTF-8"),"iso-8859-1");
+            String fileName = new String("机构商品数据.xls".getBytes("UTF-8"),"iso-8859-1");
             // 机构数据
             List<CmBrandAuthPo> authPartyList = authMapper.getAuthPartyList(authUserId);
             authPartyList.forEach(authParty->{
@@ -369,7 +367,7 @@ public class AuthServiceImpl implements AuthService {
             response.reset();
             response.setHeader("Content-disposition",
                     "attachment; filename="+fileName);
-            response.setContentType("application/msexcel");
+            response.setContentType("application/vnd.ms-excel");
             return exportData(authPartyList, outputStream);
         } catch (Exception e) {
             e.printStackTrace();

src/main/java/com/caimei/service/auth/impl/DoctorServiceImpl.java

@@ -1,6 +1,6 @@
 package com.caimei.service.auth.impl;
 
-import com.caimei.mapper.DoctorMapper;
+import com.caimei.mapper.cmMapper.DoctorMapper;
 import com.caimei.model.ResponseJson;
 import com.caimei.model.po.CmBrandDoctorPo;
 import com.caimei.model.vo.*;

src/main/java/com/caimei/service/auth/impl/DownloadServiceImpl.java

@@ -1,6 +1,6 @@
 package com.caimei.service.auth.impl;
 
-import com.caimei.mapper.FileMapper;
+import com.caimei.mapper.cmMapper.FileMapper;
 import com.caimei.model.en.QrCodeSize;
 import com.caimei.model.po.ProductImagePo;
 import com.caimei.model.po.UploadFilePo;

src/main/java/com/caimei/service/auth/impl/ShopServiceImpl.java

@@ -1,8 +1,8 @@
 package com.caimei.service.auth.impl;
 
 import com.caimei.components.RedisService;
-import com.caimei.mapper.ShopMapper;
-import com.caimei.mapper.UserMapper;
+import com.caimei.mapper.cmMapper.ShopMapper;
+import com.caimei.mapper.cmMapper.UserMapper;
 import com.caimei.model.ResponseJson;
 import com.caimei.model.dto.ShopInfoDto;
 import com.caimei.model.po.CmBrandAuthFilePo;

src/main/java/com/caimei/service/auth/impl/UserServiceImpl.java

@@ -1,7 +1,7 @@
 package com.caimei.service.auth.impl;
 
 import com.caimei.components.RedisService;
-import com.caimei.mapper.UserMapper;
+import com.caimei.mapper.cmMapper.UserMapper;
 import com.caimei.model.ResponseJson;
 import com.caimei.model.dto.PasswordDto;
 import com.caimei.model.vo.UserLoginVo;
@@ -16,9 +16,6 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
 
 /**
  * Description

src/main/java/com/caimei/service/data/impl/FileServiceImpl.java

@@ -1,6 +1,6 @@
 package com.caimei.service.data.impl;
 
-import com.caimei.mapper.FileMapper;
+import com.caimei.mapper.cmMapper.FileMapper;
 import com.caimei.model.ResponseJson;
 import com.caimei.model.po.CourseFilePo;
 import com.caimei.model.po.ProductImagePo;

src/main/java/com/caimei/service/data/impl/ImageServiceImpl.java

@@ -1,7 +1,7 @@
 package com.caimei.service.data.impl;
 
 import com.alibaba.fastjson.JSONArray;
-import com.caimei.mapper.ImageMapper;
+import com.caimei.mapper.cmMapper.ImageMapper;
 import com.caimei.model.ResponseJson;
 import com.caimei.model.po.ImagePo;
 import com.caimei.model.vo.ImageFormVo;

src/main/java/com/caimei/service/data/impl/VideoServiceImpl.java

@@ -1,6 +1,6 @@
 package com.caimei.service.data.impl;
 
-import com.caimei.mapper.VideoMapper;
+import com.caimei.mapper.cmMapper.VideoMapper;
 import com.caimei.model.ResponseJson;
 import com.caimei.model.po.VideoPo;
 import com.caimei.model.vo.VideoListVo;

src/main/java/com/caimei/service/sys/impl/SysMenuServiceImpl.java

@@ -2,7 +2,7 @@ package com.caimei.service.sys.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.caimei.mapper.SystemMapper;
+import com.caimei.mapper.cmMapper.SystemMapper;
 import com.caimei.model.ResponseJson;
 import com.caimei.model.po.SysMenu;
 import com.caimei.model.po.SysMenuTree;

src/main/java/com/caimei/service/sys/impl/SysRoleServiceImpl.java

@@ -1,6 +1,6 @@
 package com.caimei.service.sys.impl;
 
-import com.caimei.mapper.SystemMapper;
+import com.caimei.mapper.cmMapper.SystemMapper;
 import com.caimei.model.ResponseJson;
 import com.caimei.model.po.SysRole;
 import com.caimei.service.sys.SysRoleService;

src/main/java/com/caimei/service/sys/impl/SysUserServiceImpl.java

@@ -1,8 +1,8 @@
 package com.caimei.service.sys.impl;
 
 import com.caimei.components.RedisService;
-import com.caimei.mapper.SystemMapper;
-import com.caimei.mapper.VipMapper;
+import com.caimei.mapper.cmMapper.SystemMapper;
+import com.caimei.mapper.cmMapper.VipMapper;
 import com.caimei.model.ResponseJson;
 import com.caimei.model.po.SysMenu;
 import com.caimei.model.po.SysRole;

src/main/java/com/caimei/service/vip/impl/VipServiceImpl.java

@@ -1,13 +1,12 @@
 package com.caimei.service.vip.impl;
 
-import com.caimei.mapper.SystemMapper;
-import com.caimei.mapper.VipMapper;
+import com.caimei.mapper.cmMapper.SystemMapper;
+import com.caimei.mapper.cmMapper.VipMapper;
 import com.caimei.model.ResponseJson;
 import com.caimei.model.dto.PackageDto;
 import com.caimei.model.po.*;
 import com.caimei.model.vo.*;
 import com.caimei.service.sys.SysMenuService;
-import com.caimei.service.sys.SysRoleService;
 import com.caimei.service.sys.SysUserService;
 import com.caimei.service.vip.VipService;
 import com.github.pagehelper.PageHelper;

src/main/java/com/caimei/service/wechat/impl/LoginServiceImpl.java

@@ -1,10 +1,10 @@
 package com.caimei.service.wechat.impl;
 
 import com.caimei.components.RedisService;
-import com.caimei.mapper.AuthMapper;
-import com.caimei.mapper.ClubMapper;
-import com.caimei.mapper.LoginMapper;
-import com.caimei.mapper.ShopMapper;
+import com.caimei.mapper.cmMapper.AuthMapper;
+import com.caimei.mapper.cmMapper.ClubMapper;
+import com.caimei.mapper.cmMapper.LoginMapper;
+import com.caimei.mapper.cmMapper.ShopMapper;
 import com.caimei.model.ResponseJson;
 import com.caimei.model.po.ClubUserPo;
 import com.caimei.model.po.CmBrandAuthPo;

src/main/java/com/caimei/service/wechat/impl/SDKServiceImpl.java

@@ -1,7 +1,7 @@
 package com.caimei.service.wechat.impl;
 
 import com.caimei.components.RedisService;
-import com.caimei.mapper.ShopMapper;
+import com.caimei.mapper.cmMapper.ShopMapper;
 import com.caimei.model.ResponseJson;
 import com.caimei.service.wechat.SDKService;
 import com.caimei.utils.CodeUtil;

src/main/java/com/caimei/task/LdmTask.java

@@ -0,0 +1,118 @@
+package com.caimei.task;
+
+import com.caimei.mapper.cmMapper.AuthMapper;
+import com.caimei.mapper.ldmMapper.LdmMapper;
+import com.caimei.model.po.CmBrandAuthPo;
+import com.caimei.model.po.LdmDataPo;
+import com.caimei.service.auth.ShopService;
+import com.caimei.service.auth.UploadService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
+
+/**
+ * @author Aslee
+ */
+@Slf4j
+@Configuration
+@EnableScheduling
+@RequiredArgsConstructor
+public class LdmTask {
+    @Resource
+    private AuthMapper authMapper;
+    @Resource
+    private LdmMapper ldmMapper;
+
+    private UploadService uploadService;
+
+    @Autowired
+    public void setUploadService(UploadService uploadService) {
+        this.uploadService = uploadService;
+    }
+
+    /**
+     * 定时读取ldm数据库机构数据，存入采美数据库中
+     */
+    @Scheduled(cron = "0 0/5 * * * ?")
+    public void readLdmData() {
+        AtomicReference<Integer> ldmLatestClubId = new AtomicReference<>(authMapper.getLdmLatestClubId());
+        List<LdmDataPo> ldmDataList = ldmMapper.getLdmClubData(ldmLatestClubId.get());
+        ldmDataList.forEach(ldmData->{
+            ldmLatestClubId.set(ldmData.getId());
+            String lngAndLat = ldmData.getLngAndLat();
+            if (StringUtils.isNotEmpty(lngAndLat)) {
+                String[] split = lngAndLat.split(",");
+                BigDecimal lat = new BigDecimal(split[0]);
+                BigDecimal lng = new BigDecimal(split[1]);
+                ldmData.setLng(lng);
+                ldmData.setLat(lat);
+            }
+
+            String regId1 = ldmData.getRegId1();
+            if (StringUtils.isNotEmpty(regId1)) {
+                Integer provinceId = authMapper.getProvinceId(regId1);
+                ldmData.setProvinceId(provinceId);
+            }
+            String regId2 = ldmData.getRegId2();
+            if (StringUtils.isNotEmpty(regId2)) {
+                Integer cityId = authMapper.getCityId(regId2);
+                ldmData.setCityId(cityId);
+            }
+            String regId3 = ldmData.getRegId3();
+            if (StringUtils.isNotEmpty(regId3)) {
+                Integer townId = authMapper.getTownId(regId3);
+                ldmData.setTownId(townId);
+            }
+            String pic1 = ldmData.getPic1();
+            String pic2 = ldmData.getPic2();
+            String pic3 = ldmData.getPic3();
+            String pic4 = ldmData.getPic4();
+            String pic5 = ldmData.getPic5();
+            List<String> picList = new ArrayList<>();
+            picList.add(pic1);
+            picList.add(pic2);
+            picList.add(pic3);
+            picList.add(pic4);
+            picList.add(pic5);
+            String logo = null;
+            List<String> addPicList = new ArrayList<>();
+            for (String pic : picList) {
+                if (StringUtils.isNotEmpty(pic)) {
+                    try {
+                        String imagePath = "https://wangdian.skinovachina.com" + pic;
+                        String fileName = imagePath.substring(imagePath.lastIndexOf("/") + 1);
+                        String imageUrl = uploadService.saveFileByUrl(imagePath, fileName);
+                        addPicList.add(imageUrl);
+                        if (null == logo) {
+                            logo = imageUrl;
+                        }
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+            CmBrandAuthPo authPo = new CmBrandAuthPo();
+            BeanUtils.copyProperties(ldmData, authPo);
+            authPo.setAuthUserId(10);
+            authPo.setCreateBy(10);
+            authPo.setLogo(logo);
+            authMapper.insertAuth(authPo);
+            // 保存轮播图
+            if (addPicList.size() > 0) {
+                addPicList.forEach(banner -> authMapper.insertBanner(authPo.getId(), banner));
+            }
+        });
+        authMapper.updateLdmLatestClubId(ldmLatestClubId.get());
+    }
+}

src/main/resources/config/dev/application-dev.yml

@@ -1,11 +1,18 @@
 spring:
   #数据源连接--start
   datasource:
-    #driverClassName: com.mysql.jdbc.Driver
-    url: jdbc:mysql://192.168.2.100:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
-    username: developer
-    password: 05bZ/OxTB:X+yd%1
-    type: com.zaxxer.hikari.HikariDataSource
+    cmdatasource:
+      driver-class-name: com.mysql.jdbc.Driver
+      jdbc-url: jdbc:mysql://192.168.2.100:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
+      username: developer
+      password: 05bZ/OxTB:X+yd%1
+      type: com.zaxxer.hikari.HikariDataSource
+    ldmdatasource:
+      driver-class-name: com.mysql.jdbc.Driver
+      jdbc-url: jdbc:mysql://1.12.254.245:3306/aimili?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
+      username: developer
+      password: vF9r3quHItQeVH82
+      type: com.zaxxer.hikari.HikariDataSource
     hikari:
       minimum-idle: 5
       maximum-pool-size: 15

src/main/resources/mapper/AddressMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.caimei.mapper.AddressMapper">
+<mapper namespace="com.caimei.mapper.cmMapper.AddressMapper">
     <select id="getAllProvinceList" resultType="com.caimei.model.vo.AddressSelectVo">
         SELECT provinceID AS id, name
         FROM province WHERE validFlag = '1'

src/main/resources/mapper/ArticleMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.caimei.mapper.ArticleMapper">
+<mapper namespace="com.caimei.mapper.cmMapper.ArticleMapper">
     <insert id="insertArticle">
         insert into cm_brand_article(authUserId, title, image, content, auditStatus, status, createTime)
         values (#{authUserId}, #{title}, #{image}, #{content}, #{auditStatus}, #{status}, #{createTime})

src/main/resources/mapper/AuthMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.caimei.mapper.AuthMapper">
+<mapper namespace="com.caimei.mapper.cmMapper.AuthMapper">
     <insert id="insertAuth" keyColumn="id" keyProperty="id" useGeneratedKeys="true" parameterType="com.caimei.model.po.CmBrandAuthPo">
         insert into cm_brand_auth (authUserId, authParty, provinceId, cityId, townId, address, lng, lat,
                                    mobile, logo, status, createTime, createBy, auditStatus, delFlag)
@@ -43,6 +43,9 @@
     <update id="deleteAuthByAuthId">
         update cm_brand_auth set delFlag = 1 where id = #{authId}
     </update>
+    <update id="updateLdmLatestClubId">
+        update ldm_latest_club_id set ldmClubId = #{ldmLatestClubId} where id = 1;
+    </update>
     <delete id="deleteBanner">
         delete from cm_brand_auth_banner where authId = #{authId}
     </delete>
@@ -153,4 +156,7 @@
         where name like
               concat('%', (select nissan_base_region1.name from nissan_base_region1 where code = #{regId1} limit 1), '%') limit 1;
     </select>
+    <select id="getLdmLatestClubId" resultType="java.lang.Integer">
+        select ldmClubId from ldm_latest_club_id where id = 1;
+    </select>
 </mapper>

src/main/resources/mapper/AuthProductMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.caimei.mapper.AuthProductMapper">
+<mapper namespace="com.caimei.mapper.cmMapper.AuthProductMapper">
     <insert id="insertProduct" keyColumn="id" keyProperty="productId" useGeneratedKeys="true" parameterType="com.caimei.model.po.ProductPo">
         insert into cm_brand_auth_product(`authId`, `brandId`, `name`, `snCode`, `image`,`pcImage`,`appletsImage`,
                                           `originalCertificateImage`,`certificateImage`,`pcCertificateImage`,

src/main/resources/mapper/ClubMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.caimei.mapper.ClubMapper">
+<mapper namespace="com.caimei.mapper.cmMapper.ClubMapper">
     <insert id="insertClubUser">
         insert into cm_brand_club_user (authId, invitationCode, status, addTime, updateTime, invitationCodeTime,
                                         delFlag)

src/main/resources/mapper/DoctorMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.caimei.mapper.DoctorMapper">
+<mapper namespace="com.caimei.mapper.cmMapper.DoctorMapper">
     <insert id="insertDoctor" keyColumn="id" keyProperty="id" useGeneratedKeys="true" parameterType="com.caimei.model.po.CmBrandDoctorPo">
         insert into cm_brand_doctor (authUserId, name, certificateNo, clubName, image, status, createTime, createBy,
                                      auditStatus)

src/main/resources/mapper/FileMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.caimei.mapper.FileMapper">
+<mapper namespace="com.caimei.mapper.cmMapper.FileMapper">
     <insert id="insertFile" keyColumn="id" keyProperty="id" parameterType="com.caimei.model.po.FilePo" useGeneratedKeys="true">
         insert into cm_brand_file(authUserId, title, name, previewUrl, downloadUrl, auditStatus, status, createTime)
         values (#{authUserId}, #{title}, #{name}, #{previewUrl}, #{downloadUrl}, #{auditStatus}, #{status},

src/main/resources/mapper/ImageMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.caimei.mapper.ImageMapper">
+<mapper namespace="com.caimei.mapper.cmMapper.ImageMapper">
     <insert id="insertImage" keyColumn="id" keyProperty="id" parameterType="com.caimei.model.po.ImagePo" useGeneratedKeys="true">
         insert into cm_brand_image(authUserId, title, zipUrl, auditStatus, status, createTime)
         values (#{authUserId}, #{title}, #{zipUrl}, #{auditStatus}, #{status}, #{createTime})

src/main/resources/mapper/LdmMapper.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.caimei.mapper.ldmMapper.LdmMapper">
+
+    <select id="getLdmClubData" resultType="com.caimei.model.po.LdmDataPo">
+        select id,name as authParty,if(status = 1,1,0) as status,if(status = 1,1,0) as auditStatus,
+               tel as mobile,addr as address,pic1,pic2,pic3,pic4,pic5,du as lngAndLat,
+               if(deleted_at is null,0,1) as delFlag,regId1,regId2,regId3
+        from nissan_ht_alcohol where id > #{ldmLatestClubId};
+    </select>
+</mapper>

src/main/resources/mapper/LoginMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.caimei.mapper.LoginMapper">
+<mapper namespace="com.caimei.mapper.cmMapper.LoginMapper">
     <update id="bindClubUser">
         update cm_brand_club_user
         set status   = 1,

src/main/resources/mapper/ShopMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.caimei.mapper.ShopMapper">
+<mapper namespace="com.caimei.mapper.cmMapper.ShopMapper">
     <insert id="insertStatementFile" keyColumn="id" keyProperty="id" useGeneratedKeys="true" parameterType="com.caimei.model.po.CmBrandAuthFilePo">
         insert into cm_brand_auth_file (`authUserId`, `brandId`, `name`, `ossName`, `md5Hex`, `uploadTime`)
         values (#{authUserId}, #{brandId}, #{name}, #{ossName}, #{md5Hex}, #{uploadTime})

src/main/resources/mapper/SystemMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.caimei.mapper.SystemMapper">
+<mapper namespace="com.caimei.mapper.cmMapper.SystemMapper">
     <!--<select id="findByUsername" resultType="com.caimei.model.po.SysUser">
         SELECT id, username, PASSWORD, avatar, fullName, phone, login_flag AS loginFlag, del_flag AS delFlag
         FROM auth_user WHERE login_flag=0 AND username=#{username}

src/main/resources/mapper/UserMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.caimei.mapper.UserMapper">
+<mapper namespace="com.caimei.mapper.cmMapper.UserMapper">
     <update id="updatePasswordByUserId">
         update cm_brand_auth_user
         set password = #{newPassword}

src/main/resources/mapper/VideoMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.caimei.mapper.VideoMapper">
+<mapper namespace="com.caimei.mapper.cmMapper.VideoMapper">
     <insert id="insertVideo" keyColumn="id" keyProperty="id" parameterType="com.caimei.model.po.VideoPo" useGeneratedKeys="true">
         insert into cm_brand_video(authUserId, title, name, previewUrl, downloadUrl, auditStatus, status, createTime)
         values (#{authUserId}, #{title}, #{name}, #{previewUrl}, #{downloadUrl}, #{auditStatus}, #{status},

src/main/resources/mapper/VipMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.caimei.mapper.VipMapper">
+<mapper namespace="com.caimei.mapper.cmMapper.VipMapper">
     <insert id="insertVipPackage">
         insert into auth_vip_package(originalPrice, price, duration, unit, addTime)
         VALUES (#{originalPrice}, #{price}, #{duration}, #{unit}, NOW());