Merge branch 'develop' of http://git.ycjcjy.com/marketing/services into develop

pom.xml

@@ -145,7 +145,6 @@
             <artifactId>spring-boot-starter-aop</artifactId>
         </dependency>
 
-
 		<dependency>
 			<groupId>fadada</groupId>
 			<artifactId>fadada_api_sdk</artifactId>

src/main/java/com/yunzhi/marketing/base/BaseController.java

@@ -1,17 +1,23 @@
 package com.yunzhi.marketing.base;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yunzhi.marketing.center.taUser.entity.TaUser;
 import com.yunzhi.marketing.center.taUser.service.ITaUserService;
 import com.yunzhi.marketing.common.JWTUtils;
+import com.yunzhi.marketing.entity.TaBuilding;
 import com.yunzhi.marketing.entity.TaPersonBuilding;
+import com.yunzhi.marketing.service.ITaBuildingService;
 import com.yunzhi.marketing.service.ITaPersonBuildingService;
+import com.yunzhi.marketing.xlk.entity.Institution;
+import com.yunzhi.marketing.xlk.service.IInstitutionService;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @author FXF
@@ -24,6 +30,12 @@ public class BaseController {
     @Autowired
     private ITaPersonBuildingService taPersonBuildingService;
 
+    @Autowired
+    private ITaBuildingService taBuildingService;
+
+    @Autowired
+    public IInstitutionService iInstitutionService;
+
     /**
      * 获取orgId
      *
@@ -32,12 +44,12 @@ public class BaseController {
      */
     public Integer getOrgId(HttpServletRequest request) {
 
-        Map map = JWTUtils.getUserIdAndOrgId(request);
-        if (null != map && null != map.get("orgId")) {
-            return Integer.valueOf(map.get("orgId").toString());
-        }
+//        Map map = JWTUtils.getUserIdAndOrgId(request);
+//        if (null != map && null != map.get("orgId")) {
+//            return Integer.valueOf(map.get("orgId").toString());
+//        }
 
-        return null;
+        return 1;
     }
 
     public Integer getChannelId(HttpServletRequest request) {
@@ -131,9 +143,27 @@ public class BaseController {
         if (taUser == null) {
             return null;
         }
-        QueryWrapper<TaPersonBuilding> taPersonBuildingQueryWrapper = new QueryWrapper<>();
-        taPersonBuildingQueryWrapper.eq("user_id", taUser.getUserId());
-        List<TaPersonBuilding> taPersonBuildingList = taPersonBuildingService.list(taPersonBuildingQueryWrapper);
+//        // 个人授权条件
+//        QueryWrapper<TaPersonBuilding> taPersonBuildingQueryWrapper = new QueryWrapper<>();
+//        taPersonBuildingQueryWrapper.eq("user_id", taUser.getUserId());
+//        List<TaPersonBuilding> taPersonBuildingList = taPersonBuildingService.list(taPersonBuildingQueryWrapper);
+        List<TaPersonBuilding> taPersonBuildingList = new ArrayList<>();
+        // 获取当前人员的所有有权访问的组织机构
+        Institution institution = iInstitutionService.getById(taUser.getInstitutionId());
+        LambdaQueryWrapper<Institution> institutionLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        institutionLambdaQueryWrapper.likeRight(Institution::getInstitutionCode,institution.getInstitutionCode());
+        List<Institution> institutionList = iInstitutionService.list(institutionLambdaQueryWrapper);
+        // 新的过滤条件组织机构
+        LambdaQueryWrapper<TaBuilding> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.in(TaBuilding::getInstitutionId,institutionList.stream().map(Institution::getInstitutionId).collect(Collectors.toList()));
+        List<TaBuilding> list = taBuildingService.list(lambdaQueryWrapper);
+        for (TaBuilding taBuilding: list) {
+            TaPersonBuilding taPersonBuilding = new TaPersonBuilding();
+            taPersonBuilding.setBuildingId(taBuilding.getBuildingId());
+            taPersonBuilding.setUserId(taUser.getUserId());
+            taPersonBuildingList.add(taPersonBuilding);
+        }
+
         if (null != taUser.getIsAdmin() && taUser.getIsAdmin()) {
             taPersonBuildingList = new ArrayList<>();
         }

src/main/java/com/yunzhi/marketing/center/taUser/controller/TaUserController.java

@@ -16,9 +16,12 @@ import com.yunzhi.marketing.center.taUser.service.*;
 import com.yunzhi.marketing.common.CommConstant;
 import com.yunzhi.marketing.common.JWTUtils;
 import com.yunzhi.marketing.common.MD5Utils;
+import com.yunzhi.marketing.common.StringUtils;
 import com.yunzhi.marketing.mapper.TaRoleMapper;
 import com.yunzhi.marketing.entity.*;
 import com.yunzhi.marketing.service.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,6 +45,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/api")
+@Api(value = "用户登录相关", tags = "用户登录相关")
 public class TaUserController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaUserController.class);
@@ -328,6 +332,7 @@ public class TaUserController extends BaseController {
      * @return
      */
     @PostMapping("/admin/taUser/signin")
+    @ApiOperation(value = "admin端登录", notes = "admin端登录")
     public ResponseBean signin(@RequestBody String paramStr) {
         JSONObject params = JSONObject.parseObject(paramStr);
         if (params == null) {
@@ -407,9 +412,12 @@ public class TaUserController extends BaseController {
                                    @RequestParam(value ="isConsultant",required = false) Integer isConsultant,
                                    @RequestParam(value ="miniStatus",required = false) Integer miniStatus,
                                    @RequestParam(value ="buildingId",required = false) String buildingId,
+                                   @RequestParam(value ="jobNumber",required = false) String jobNumber,
                                    HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
+            Integer userId = getUserId(request);
+            TaUser currentUser = iTaUserService.getById(userId);
             //使用分页插件
             IPage pg = new Page<>(pageNum, pageSize);
             TaUser taUser = new TaUser();
@@ -418,12 +426,14 @@ public class TaUserController extends BaseController {
             taUser.setPhone(phone);
             taUser.setStatus(status);
             taUser.setBuildingId(buildingId);
+            taUser.setInstitutionId(currentUser.getInstitutionId());
             if(null != isConsultant && isConsultant == 1){
                 taUser.setIsConsultant(true);
             }else if (null != isConsultant && isConsultant == 0){
                 taUser.setIsConsultant(false);
             }
             taUser.setMiniStatus(miniStatus);
+            taUser.setJobNumber(jobNumber);
 
             IPage<TaUser> result = iTaUserService.seleUserList(pg,taUser,getTaPersonBuildingListByUserId(request));
             List<TaUser> taUserList = result.getRecords();
@@ -512,6 +522,9 @@ public class TaUserController extends BaseController {
     public ResponseBean adminUserAdd(@RequestBody TaUser taUser,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
+            if (StringUtils.isEmpty(taUser.getInstitutionId())){
+                return ResponseBean.error("组织机构必填", ResponseBean.ERROR_ILLEGAL_PARAMS);
+            }
             taUser.setOrgId(getOrgId(request));
             responseBean.addSuccess(iTaUserService.addAdminUser(taUser));
         }catch (Exception e){

src/main/java/com/yunzhi/marketing/center/taUser/entity/TaUser.java

@@ -114,6 +114,16 @@ public class TaUser implements Serializable {
     private String photo;
     private String description;
 
+    /**
+     * 工号
+     */
+    private String jobNumber;
+
+    /**
+     * 组织机构编号
+     */
+    private String institutionId;
+
     /**
      * 权重
      */

src/main/java/com/yunzhi/marketing/center/taUser/service/impl/TaUserServiceImpl.java

@@ -482,18 +482,20 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
             taPersonBuilding.setUserId(taUser.getUserId());
             taPersonBuilding.setCreateDate(LocalDateTime.now());
             taPersonBuildingMapper.insert(taPersonBuilding);
-        } else {
-            //非置业顾问可授权多个项目
-            List<String> buildingIdList = taUser.getBuildingIds();
-            LocalDateTime nowTime = LocalDateTime.now();
-            buildingIdList.forEach(e -> {
-                TaPersonBuilding taPersonBuilding = new TaPersonBuilding();
-                taPersonBuilding.setBuildingId(e);
-                taPersonBuilding.setUserId(taUser.getUserId());
-                taPersonBuilding.setCreateDate(nowTime);
-                taPersonBuildingMapper.insert(taPersonBuilding);
-            });
         }
+//        // 这个版本取消非置业顾问授权
+//        else {
+//            //非置业顾问可授权多个项目
+//            List<String> buildingIdList = taUser.getBuildingIds();
+//            LocalDateTime nowTime = LocalDateTime.now();
+//            buildingIdList.forEach(e -> {
+//                TaPersonBuilding taPersonBuilding = new TaPersonBuilding();
+//                taPersonBuilding.setBuildingId(e);
+//                taPersonBuilding.setUserId(taUser.getUserId());
+//                taPersonBuilding.setCreateDate(nowTime);
+//                taPersonBuildingMapper.insert(taPersonBuilding);
+//            });
+//        }
 
         return taUser;
     }

src/main/java/com/yunzhi/marketing/common/JWTUtils.java

@@ -24,14 +24,11 @@ public class JWTUtils {
      * @return
      */
     public static String getSubject(HttpServletRequest request) {
-        String jwtHeader = request.getHeader("authorization");
-        if (null == jwtHeader || "".equals(jwtHeader.trim())) return null;
-
-        String[] jwtAuths = jwtHeader.split("Bearer ");
-        if (null == jwtAuths || jwtAuths.length < 2) return null;
+        String token = getToken(request);
+        if (StringUtils.isEmpty(token)) return null;
 
         try {
-            return Jwts.parser().setSigningKey(key).parseClaimsJws(jwtAuths[1]).getBody().getSubject();
+            return Jwts.parser().setSigningKey(key).parseClaimsJws(token).getBody().getSubject();
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -45,14 +42,11 @@ public class JWTUtils {
      * @return
      */
     public static Map getUserIdAndOrgId(HttpServletRequest request) {
-        String jwtHeader = request.getHeader("authorization");
-        if (null == jwtHeader || "".equals(jwtHeader.trim())) return null;
-        
-        String[] jwtAuths = jwtHeader.split("Bearer ");
-        if (null == jwtAuths || jwtAuths.length < 2) return null;
+        String token = getToken(request);
+        if (StringUtils.isEmpty(token)) return null;
         
         try {
-            return Jwts.parser().setSigningKey(key).parseClaimsJws(jwtAuths[1]).getBody();
+            return Jwts.parser().setSigningKey(key).parseClaimsJws(token).getBody();
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -70,13 +64,14 @@ public class JWTUtils {
         if (null == jwtHeader || "".equals(jwtHeader.trim())) {
             return null;
         }
-        
+
         String[] jwtAuths = jwtHeader.split("Bearer ");
         if (null == jwtAuths || jwtAuths.length < 2) {
             return null;
         }
-        
-        
+
+        if (StringUtils.isEmpty(jwtAuths[1])) return null;
+
         return jwtAuths[1];
     }
 

src/main/java/com/yunzhi/marketing/common/VideoThreadDownLoad.java

@@ -0,0 +1,183 @@
+package com.yunzhi.marketing.common;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.RandomAccessFile;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.LinkedBlockingDeque;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.ReentrantLock;
+
+public class VideoThreadDownLoad {
+    public static final Logger LOG = LoggerFactory.getLogger(VideoThreadDownLoad.class);
+    /**
+     * 线程下载成功标志
+     */
+    private static int flag = 0;
+
+    /**
+     * 本地文件
+     */
+    private MultipartFile uploadFile;
+
+    /**
+     * 本地路径
+     */
+    private String localPath;
+
+    /**
+     * 线程计数同步辅助
+     */
+    private CountDownLatch latch;
+
+    private final int THREAD_POOL_CORE_SIZE= 10;
+    private final int THREAD_POOL_MAX_CORE_SIZE=30;
+    private final int THREAD_POOL_KEEP_ALIVE_TIME=60;
+
+    // 定长线程池
+    private ThreadPoolExecutor threadPool = new ThreadPoolExecutor(THREAD_POOL_CORE_SIZE,THREAD_POOL_MAX_CORE_SIZE,THREAD_POOL_KEEP_ALIVE_TIME, TimeUnit.SECONDS,new LinkedBlockingDeque<>());
+
+    public VideoThreadDownLoad(MultipartFile uploadFile, String localPath) {
+        this.uploadFile = uploadFile;
+        this.localPath = localPath;
+    }
+
+    public synchronized static void downLoad(MultipartFile uploadFile, String localPath) {
+        LOG.info("文件开始下载，下载位置为{}",localPath);
+        ReentrantLock lock = new ReentrantLock();
+        lock.lock();
+        VideoThreadDownLoad videoThreadDownLoad = new VideoThreadDownLoad(uploadFile,localPath);
+        long startTime = System.currentTimeMillis();
+        boolean flag = false;
+        try {
+            flag = videoThreadDownLoad.executeDownLoad();
+            long endTime = System.currentTimeMillis();
+            if (flag) {
+                LOG.info("文件下载成功,共耗时" + (endTime - startTime) / 1000 + "s");
+            }
+        } catch (Exception ex) {
+            LOG.error(ex.getMessage());
+        } finally {
+            VideoThreadDownLoad.flag = 0; // 重置 下载状态
+            if (!flag) {
+                LOG.info("文件下载失败,本地文件已经删除。");
+                File file = new File(localPath);
+                file.delete();
+            }
+            lock.unlock();
+        }
+    }
+
+    /**
+     * 下载操作
+     * @return
+     */
+    public boolean executeDownLoad() {
+        try {
+            //服务器返回的数据的长度，实际上就是文件的长度,单位是字节
+            long length = uploadFile.getSize();
+
+            LOG.info("文件总长度:" + length + "字节(B)");
+            RandomAccessFile raf = new RandomAccessFile(localPath, "rwd");
+            //指定创建的文件的长度
+            raf.setLength(length);
+            raf.close();
+            //分割文件
+            int partCount = getPartCount(length);
+            int partSize = (int)(length / partCount);
+            latch = new CountDownLatch(partCount);
+            for (int threadId = 1; threadId <= partCount; threadId++) {
+                // 每一个线程下载的开始位置
+                long startIndex = (threadId - 1) * partSize;
+                // 每一个线程下载的开始位置
+                long endIndex = startIndex + partSize - 1;
+                if (threadId == partCount) {
+                    //最后一个线程下载的长度稍微长一点
+                    endIndex = length;
+                }
+                LOG.info("线程" + threadId + "下载:" + startIndex + "字节~" + endIndex + "字节");
+                threadPool.execute(new DownLoadThread(threadId, startIndex, endIndex, latch));
+            }
+            latch.await();
+            if(flag == 0){
+                return true;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            LOG.error("文件下载失败,失败原因：{}", e.getMessage());
+        }
+        return false;
+    }
+
+    /**
+     * 计算分割多少文件比较合适
+     * @param length
+     * @return
+     */
+    private int getPartCount(long length) {
+        // 十兆划分文件
+        int size = (int) (length / 10485760);
+        return size + 1;
+    }
+
+    /**
+     * 内部类用于实现下载
+     */
+    public class DownLoadThread implements Runnable {
+
+        /**
+         * 线程ID
+         */
+        private int threadId;
+        /**
+         * 下载起始位置
+         */
+        private long startIndex;
+        /**
+         * 下载结束位置
+         */
+        private long endIndex;
+
+        private CountDownLatch latch;
+
+        public DownLoadThread(int threadId, long startIndex, long endIndex, CountDownLatch latch) {
+            this.threadId = threadId;
+            this.startIndex = startIndex;
+            this.endIndex = endIndex;
+            this.latch = latch;
+        }
+
+        @Override
+        public void run() {
+            try {
+                LOG.info("线程" + threadId + "开始下载中:" + startIndex + "字节~" + endIndex + "字节");
+                InputStream is = uploadFile.getInputStream();//返回资源
+                RandomAccessFile raf = new RandomAccessFile(localPath, "rwd");
+                raf.seek(startIndex);//定位文件
+                int len = 0;
+                byte[] buffer = new byte[1024];
+                while ((len = is.read(buffer)) != -1) {
+                    raf.write(buffer, 0, len);
+                }
+                is.close();
+                raf.close();
+            } catch (Exception e) {
+                //线程下载出错
+                VideoThreadDownLoad.flag = 1;
+                LOG.error(e.getMessage());
+            } finally {
+                //计数值减一
+                latch.countDown();
+            }
+
+        }
+    }
+}

src/main/java/com/yunzhi/marketing/config/CorsConfig.java

@@ -0,0 +1,28 @@
+//package com.yunzhi.marketing.config;
+//
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.web.cors.CorsConfiguration;
+//import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+//import org.springframework.web.filter.CorsFilter;
+//
+///**
+// * 解决跨域问题
+// */
+//@Configuration
+//public class CorsConfig {
+//    private CorsConfiguration buildConfig() {
+//        CorsConfiguration corsConfiguration = new CorsConfiguration();
+//        corsConfiguration.addAllowedOrigin("*"); // 1 允许任何域名使用
+//        corsConfiguration.addAllowedHeader("*"); // 2 允许任何头
+//        corsConfiguration.addAllowedMethod("*"); // 3 允许任何方法（post、get等）
+//        return corsConfiguration;
+//    }
+//
+//    @Bean
+//    public CorsFilter corsFilter() {
+//        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+//        source.registerCorsConfiguration("/**", buildConfig()); // 4
+//        return new CorsFilter(source);
+//    }
+//}

src/main/java/com/yunzhi/marketing/config/WebMvcConfigurer.java

@@ -0,0 +1,19 @@
+package com.yunzhi.marketing.config;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+
+@Configuration
+public class WebMvcConfigurer extends WebMvcConfigurerAdapter {
+
+    @Value("${file.path}")
+    private String FILE_PATH;
+
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        registry.addResourceHandler("/file/**").addResourceLocations("file:"+FILE_PATH);
+        super.addResourceHandlers(registry);
+    }
+}

src/main/java/com/yunzhi/marketing/controller/CommonController.java

@@ -8,21 +8,30 @@ import com.yunzhi.marketing.common.AliOSSUtils;
 import com.yunzhi.marketing.common.CommConstant;
 import com.yunzhi.marketing.common.SMSUtils;
 import com.yunzhi.marketing.common.StringUtils;
+import com.yunzhi.marketing.common.VideoThreadDownLoad;
 import com.yunzhi.marketing.service.IMiniAppService;
 import com.yunzhi.marketing.service.ITdMiniappTemplateTypeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import java.io.File;
 import java.io.IOException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.UUID;
 
 
 @RestController
 @RequestMapping("/api")
+@Api(value = "文件上传", tags = "文件上传")
 public class CommonController extends BaseController {
     @Autowired
     SMSUtils smsUtils;
@@ -33,21 +42,68 @@ public class CommonController extends BaseController {
     @Autowired
     IMiniAppService iMiniAppService;
 
+    @Value("${file.path}")
+    private String FILE_PATH;
+
+    SimpleDateFormat sdf = new SimpleDateFormat("yyyMMdd/");
+
     /**
      * 图片
      * @param multipartFile
      * @return
      */
+    @ApiOperation(value = "图片/视频上传", notes = "图片/视频上传")
     @PostMapping("/{plat}/image")
-    public ResponseBean uploadImage(@RequestParam("file") MultipartFile multipartFile) {
+    public ResponseBean uploadImage(@PathVariable String plat, @RequestParam("file") MultipartFile multipartFile) {
         try {
-            String img = AliOSSUtils.putObject(multipartFile, CommConstant.ALIOSS_DEFAULT_UPLOAD);
-            return ResponseBean.success(img);
+            // 本地保存的文件夹
+            String format = sdf.format(new Date());
+            File folder = new File(FILE_PATH + format);
+            if(!folder.isDirectory()) {
+                folder.mkdirs();
+            }
+            // 新文件夹
+            String oldName = multipartFile.getOriginalFilename();
+            String newName = UUID.randomUUID().toString() +
+                    oldName.substring(oldName.lastIndexOf("."));
+
+            // 文件保存操作
+            multipartFile.transferTo(new File(folder, newName));
+            return ResponseBean.success("/file/"+ format + newName);
         } catch (IOException e) {
             return ResponseBean.error("上传图片失败: " + e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
+
+//    /**
+//     * 图片
+//     * @param multipartFile
+//     * @return
+//     */
+//    @ApiOperation(value = "视频上传", notes = "视频上传")
+//    @PostMapping("/admin/upload/video")
+//    public ResponseBean uploadVideo(@RequestParam("file") MultipartFile multipartFile) {
+//        try {
+//            // 本地保存的文件夹
+//            String format = sdf.format(new Date());
+//            File folder = new File(FILE_PATH + format);
+//            if(!folder.isDirectory()) {
+//                folder.mkdirs();
+//            }
+//            // 新文件夹
+//            String oldName = multipartFile.getOriginalFilename();
+//            String newName = UUID.randomUUID().toString() +
+//                    oldName.substring(oldName.lastIndexOf("."));
+//
+//            //多线程下载文件
+//            VideoThreadDownLoad.downLoad(multipartFile,FILE_PATH + format + newName);
+//            return ResponseBean.success(FILE_DOMAIN+"/file/"+ format + newName);
+//        } catch (Exception e) {
+//            return ResponseBean.error("上传图片失败: " + e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+
     @PostMapping("/admin/qrcode")
     public ResponseBean createQrCode(@RequestBody String jsonStr, HttpServletRequest request) {
         Integer orgId = getOrgId(request);
@@ -96,8 +152,20 @@ public class CommonController extends BaseController {
         Map<String, String> result = new HashMap<>();
 
         try {
-            String img = AliOSSUtils.putObject(multipartFile, CommConstant.ALIOSS_DEFAULT_UPLOAD);
+            // 本地保存的文件夹
+            String format = sdf.format(new Date());
+            File folder = new File(FILE_PATH + format);
+            if(!folder.isDirectory()) {
+                folder.mkdirs();
+            }
+            // 新文件夹
+            String oldName = multipartFile.getOriginalFilename();
+            String newName = UUID.randomUUID().toString() +
+                    oldName.substring(oldName.lastIndexOf("."));
 
+            // 文件保存操作
+            multipartFile.transferTo(new File(folder, newName));
+            String img = "/file/"+ format + newName;
             result.put("name", StringUtils.ifNull(multipartFile.getOriginalFilename(), multipartFile.getName()));
             result.put("status", "done");
             result.put("thumbUrl", img + "?x-oss-process=style/thumbnail");

src/main/java/com/yunzhi/marketing/controller/MiniAppController.java

@@ -430,10 +430,10 @@ public class MiniAppController extends BaseController {
     @PostMapping("/signup")
     public ResponseBean info(@RequestBody String paramStr, HttpServletRequest request) {
         String appid = request.getHeader("appid");
+        String openid = getOpenId(request);
         TaPerson person = null;
         TaMiniapp miniapp = taMiniappService.getById(appid);
         if (null == paramStr || "".equals(paramStr.trim()) || "{}".equals(paramStr.trim())) {
-            String openid = getOpenId(request);
             List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
             if (null == taPersons || taPersons.size() != 1) {
                 return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
@@ -459,6 +459,9 @@ public class MiniAppController extends BaseController {
 
             // 解密用户信息
             WxMaUserInfo userInfo = miniAppService.getUserInfo(sessionKey, encryptedData, iv, appid);
+            if (userInfo.getOpenId() == null) {
+                userInfo.setOpenId(openid);
+            }
 
             // 更新或保存用户信息
             person = taPersonService.mergePersonWxInfo(userInfo);

src/main/java/com/yunzhi/marketing/controller/TaChannelController.java

@@ -92,12 +92,12 @@ public class TaChannelController extends BaseController {
                 }
             });
 
-            HashMap hashMap  = new HashMap<>();
-            hashMap.put("result",result);
-            // 下拉列表的数据 all
-            List<TaChannel> taChannelList = taChannelMapper.selectChannelList(orgId);
-            hashMap.put("channelNmae",taChannelList);
-            responseBean.addSuccess(hashMap);
+//            HashMap hashMap  = new HashMap<>();
+//            hashMap.put("result",result);
+//            // 下拉列表的数据 all
+//            List<TaChannel> taChannelList = taChannelMapper.selectChannelList(orgId);
+//            hashMap.put("channelNmae",taChannelList);
+            responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();
             logger.error("channelList -=- {}",e.toString());

src/main/java/com/yunzhi/marketing/controller/TaLiveActivityController.java

@@ -8,9 +8,12 @@ import com.yunzhi.marketing.common.CommConstant;
 import com.yunzhi.marketing.common.StringUtils;
 import com.yunzhi.marketing.entity.ExtendContent;
 import com.yunzhi.marketing.entity.TaLiveActivity;
+import com.yunzhi.marketing.po.LiveAndVideoVO;
 import com.yunzhi.marketing.reportCustomerAop.ReportCustomer;
 import com.yunzhi.marketing.service.IExtendContentService;
 import com.yunzhi.marketing.service.ITaLiveActivityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,6 +33,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/api")
+@Api(value = "直播活动", tags = "xlk-直播活动")
 public class TaLiveActivityController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaLiveActivityController.class);
@@ -254,6 +258,7 @@ public class TaLiveActivityController extends BaseController {
      * @param request
      * @return
      */
+    @ApiOperation(value = "wx-视频直播列表", notes = "admin-视频直播列表")
     @RequestMapping(value = "/wx/taLiveActivity", method = RequestMethod.GET)
     public ResponseBean taLiveActivityListForMiniApp(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                                      @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
@@ -262,13 +267,14 @@ public class TaLiveActivityController extends BaseController {
                                                      String buildingId,
                                                      Integer status,
                                                      @RequestParam(value = "source", defaultValue = "1") Integer source,
+                                                     @RequestParam(value = "name", required = false) String name,
                                                      HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             status = status == null ? 1 : status;
             Integer orgId = getOrgId(request);
-            IPage<TaLiveActivity> result = iTaLiveActivityService.listLiveActivityByCondition(pageNum, pageSize, orgId,
-                    liveActivityTitle, cityId, buildingId, status, null, null, source);
+            IPage<LiveAndVideoVO> result = iTaLiveActivityService.getWxLiveActivityAndVideo(pageNum, pageSize, orgId,
+                    liveActivityTitle, cityId, buildingId, status, name, source);
             responseBean.addSuccess(result);
 
         } catch (Exception e) {

src/main/java/com/yunzhi/marketing/controller/TaPersonController.java

@@ -12,6 +12,7 @@ import com.yunzhi.marketing.center.taUser.service.ITaUserService;
 import com.yunzhi.marketing.common.CommConstant;
 import com.yunzhi.marketing.common.SMSUtils;
 import com.yunzhi.marketing.common.StringUtils;
+import com.yunzhi.marketing.dto.PersonMarketingDTO;
 import com.yunzhi.marketing.entity.TaChannel;
 import com.yunzhi.marketing.entity.TaChannelPerson;
 import com.yunzhi.marketing.entity.TaPerson;
@@ -22,6 +23,8 @@ import com.yunzhi.marketing.service.TaChannelPersonService;
 import com.yunzhi.marketing.service.TaChannelService;
 import com.yunzhi.marketing.third.entity.TaThirdPartyMiniappConfig;
 import com.yunzhi.marketing.third.service.ITaThirdPartyMiniappConfigService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.RestTemplate;
@@ -43,6 +46,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/api")
+@Api(value = "微信用户表", tags = "xlk-微信用户表")
 public class TaPersonController extends BaseController {
     @Autowired
     ITaPersonService taPersonService;
@@ -377,6 +381,17 @@ public class TaPersonController extends BaseController {
         return null;
     }
 
+    /**
+     * 成为驻场顾问
+     *
+     */
+    @ApiOperation(value = "wx-成为驻场顾问", notes = "admin-成为驻场顾问")
+    @PostMapping("/wx/marketing")
+    public ResponseBean marketing(@RequestBody PersonMarketingDTO marketingDTO, HttpServletRequest request) {
+        // 当前人员
+        String openid = getOpenId(request);
+        return taPersonService.marketing(marketingDTO,openid);
+    }
 
     /**
      *

src/main/java/com/yunzhi/marketing/dto/PersonMarketingDTO.java

@@ -0,0 +1,9 @@
+package com.yunzhi.marketing.dto;
+
+import lombok.Data;
+
+@Data
+public class PersonMarketingDTO {
+
+    private String marketingCode;
+}

src/main/java/com/yunzhi/marketing/entity/TaActivityDynamicEnlist.java

@@ -67,6 +67,11 @@ public class TaActivityDynamicEnlist implements Serializable {
      */
     private Integer isCheckin;
 
+    /**
+     * 组织结构id
+     */
+    private String institutionId;
+
     /**
      * 分享人
      */

src/main/java/com/yunzhi/marketing/entity/TaBuilding.java

@@ -10,6 +10,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.marketing.xlk.entity.BuildingSpecialRoom;
+import com.yunzhi.marketing.xlk.entity.Trend;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -215,6 +217,16 @@ public class TaBuilding implements Serializable {
      */
     private String recordName;
 
+    /**
+     * 品牌id
+     */
+    private String brandId;
+
+    /**
+     * 品牌商名称
+     */
+    private String brandName;
+
     /**
      * 地图数据
      */
@@ -343,6 +355,23 @@ public class TaBuilding implements Serializable {
      */
     private String highlightsType;
 
+    /**
+     * 组织结构id
+     */
+    private String institutionId;
+
+    /** 供水 */
+    private String waterSupply ;
+    /** 供电 */
+    private String powerSupply ;
+    /** 供暖 */
+    private String heatingSupply ;
+
+    /**
+     * 驻场code
+     */
+    private String marketingCode;
+
     /**
      * 项目亮点封面
      */
@@ -354,4 +383,10 @@ public class TaBuilding implements Serializable {
 
     @TableField(exist = false)
     private List<ExtendContent> extendContent;
+
+    @TableField(exist = false)
+    private List<BuildingSpecialRoom> specialRoomList;
+
+    @TableField(exist = false)
+    private List<Trend> trendList;
 }

src/main/java/com/yunzhi/marketing/entity/TaBuildingApartment.java

@@ -65,7 +65,7 @@ public class TaBuildingApartment implements Serializable {
     /**
      * 销售状态
      */
-    private Integer marketStatus;
+    private String marketStatus;
 
     private Double insideArea;
 

src/main/java/com/yunzhi/marketing/entity/TaBuildingDynamic.java

@@ -122,6 +122,11 @@ public class TaBuildingDynamic implements Serializable {
      */
     private Integer home;
 
+    /**
+     * 组织结构id
+     */
+    private String institutionId;
+
     /**
      * 活动的当前状态1:进行中，2:未开始,3:结束
      */

src/main/java/com/yunzhi/marketing/entity/TaBuildingIntention.java

@@ -69,5 +69,10 @@ public class TaBuildingIntention implements Serializable {
      */
     private String buildingId;
 
+    /**
+     * 组织结构id
+     */
+    private String institutionId;
+
 
 }

src/main/java/com/yunzhi/marketing/entity/TaBuildingPanorama.java

@@ -75,5 +75,9 @@ public class TaBuildingPanorama implements Serializable {
      */
     private Integer status;
 
+    /**
+     * 组织结构id
+     */
+    private String institutionId;
 
 }

src/main/java/com/yunzhi/marketing/entity/TaBuildingReport.java

@@ -49,5 +49,9 @@ public class TaBuildingReport implements Serializable {
      */
     private String buildingId;
 
+    /**
+     * 组织结构id
+     */
+    private String institutionId;
 
 }

src/main/java/com/yunzhi/marketing/entity/TaChannel.java

@@ -79,6 +79,11 @@ public class TaChannel implements Serializable {
      */
     private LocalDateTime createDate;
 
+    /**
+     * 组织结构id
+     */
+    private String institutionId;
+
     /**
      * 公司id
      */

src/main/java/com/yunzhi/marketing/entity/TaChat.java

@@ -84,5 +84,10 @@ public class TaChat implements Serializable {
      */
     private Integer orgId;
 
+    /**
+     * 组织结构id
+     */
+    private String institutionId;
+
 
 }

src/main/java/com/yunzhi/marketing/entity/TaCheckin.java

@@ -69,4 +69,9 @@ public class TaCheckin implements Serializable {
      */
     private Integer orgId;
 
+    /**
+     * 组织结构id
+     */
+    private String institutionId;
+
 }

src/main/java/com/yunzhi/marketing/entity/TaCustomerMessage.java

@@ -70,5 +70,9 @@ public class TaCustomerMessage implements Serializable {
      */
     private Integer status;
 
+    /**
+     * 组织结构id
+     */
+    private String institutionId;
 
 }

src/main/java/com/yunzhi/marketing/entity/TaExtendContent.java

@@ -86,4 +86,10 @@ public class TaExtendContent implements Serializable {
     private String buildingId;
 
     private Integer cityId;
+
+
+    /**
+     * 组织结构id
+     */
+    private String institutionId;
 }

src/main/java/com/yunzhi/marketing/entity/TaLiveActivity.java

@@ -131,6 +131,11 @@ public class TaLiveActivity implements Serializable {
      */
     private String updateUser;
 
+    /**
+     * 组织结构id
+     */
+    private String institutionId;
+
     /**
      * 权重
      */

src/main/java/com/yunzhi/marketing/entity/TaNews.java

@@ -112,6 +112,11 @@ public class TaNews implements Serializable {
      */
     private Integer weight;
 
+    /**
+     * 组织结构id
+     */
+    private String institutionId;
+
     /**
      * 类型
      */

src/main/java/com/yunzhi/marketing/entity/TaNewsType.java

@@ -60,5 +60,10 @@ public class TaNewsType implements Serializable {
      */
     private Integer status;
 
+    /**
+     * 组织结构id
+     */
+    private String institutionId;
+
 
 }

src/main/java/com/yunzhi/marketing/entity/TaPerson.java

@@ -193,6 +193,7 @@ public class TaPerson implements Serializable {
      * 项目id
      */
     private String buildingId;
+
     /**
      * 授权手机号时间
      */

src/main/java/com/yunzhi/marketing/entity/TaPersonFromRecord.java

@@ -90,4 +90,9 @@ public class TaPersonFromRecord implements Serializable {
      * 微信来源类型
      */
     private String sceneType;
+
+    /**
+     * 组织结构id
+     */
+    private String institutionId;
 }

src/main/java/com/yunzhi/marketing/entity/TaPersonIntentionRecord.java

@@ -85,6 +85,11 @@ public class TaPersonIntentionRecord implements Serializable {
      */
     private Integer orgId;
 
+    /**
+     * 组织结构id
+     */
+    private String institutionId;
+
     /**
      * 手机号
      */

src/main/java/com/yunzhi/marketing/entity/TaPersonVisitRecord.java

@@ -81,6 +81,11 @@ public class TaPersonVisitRecord implements Serializable {
      */
     private String consultantId;
 
+    /**
+     * 组织结构id
+     */
+    private String institutionId;
+
     /**
      * 场景值id
      */

src/main/java/com/yunzhi/marketing/entity/TaPolicy.java

@@ -29,6 +29,8 @@ public class TaPolicy implements Serializable {
     @TableId(value = "policy_id", type = IdType.AUTO)
     private Integer policyId;
 
+    private String policyTypeId;
+
     /**
      * 政策标题
      */

src/main/java/com/yunzhi/marketing/entity/TaRecommendCustomer.java

@@ -151,6 +151,11 @@ public class TaRecommendCustomer implements Serializable {
 
     private LocalDateTime verifyDate;
 
+    /**
+     * 组织结构id
+     */
+    private String institutionId;
+
     @DateTimeFormat("yyyy年MM月dd日")
     private LocalDateTime createDate;
 

src/main/java/com/yunzhi/marketing/entity/TaSave.java

@@ -72,5 +72,9 @@ public class TaSave implements Serializable {
      */
     private String buildingId;
 
+    /**
+     * 组织结构id
+     */
+    private String institutionId;
 
 }

src/main/java/com/yunzhi/marketing/entity/TaSharePersonFrom.java

@@ -71,6 +71,11 @@ public class TaSharePersonFrom implements Serializable {
      */
     private Integer orgId;
 
+    /**
+     * 组织结构id
+     */
+    private String institutionId;
+
     /**
      * 楼盘id
      */

src/main/java/com/yunzhi/marketing/entity/TdBuildingType.java

@@ -54,5 +54,9 @@ public class TdBuildingType implements Serializable {
      */
     private String buildingId;
 
+    /**
+     * 组织结构id
+     */
+    private String institutionId;
 
 }

src/main/java/com/yunzhi/marketing/entity/TsActivityDaily.java

@@ -100,6 +100,11 @@ public class TsActivityDaily implements Serializable {
      */
     private Integer channelId;
 
+    /**
+     * 组织结构id
+     */
+    private String institutionId;
+
     /**
      * 统计类型
      */

src/main/java/com/yunzhi/marketing/entity/TsConsultantKpi.java

@@ -109,6 +109,11 @@ public class TsConsultantKpi implements Serializable {
      */
     private Integer favorNum;
 
+    /**
+     * 组织结构id
+     */
+    private String institutionId;
+
     /**
      * 客户总计
      */

src/main/java/com/yunzhi/marketing/excel/ActivityStatistics/TsChannelDaily.java

@@ -55,4 +55,8 @@ public class TsChannelDaily {
     @ExcelIgnore
     private String targetId;
 
+    /**
+     * 组织结构id
+     */
+    private String institutionId;
 }

src/main/java/com/yunzhi/marketing/interceptor/AccessInterceptor.java

@@ -77,6 +77,7 @@ public class AccessInterceptor implements HandlerInterceptor {
             "/api/fadd/",//所有的法大大回调放过
             "/api/third",
             "/api/third/redirect/",
+            "/file/",
             "/api/official/" // 官网接口
     };
 
@@ -142,7 +143,7 @@ public class AccessInterceptor implements HandlerInterceptor {
         }
 
         String[] jwtAuths = jwtHeader.split("Bearer ");
-        if (null == jwtAuths || jwtAuths.length < 2) {
+        if (null == jwtAuths || jwtAuths.length < 2 || StringUtils.isEmpty(jwtAuths[1])) {
             ResponseBean resp = ResponseBean.error("权限验证非法, 数据格式不正确", ResponseBean.ERROR_AUTH_FAIL);
 
             response.addHeader("Content-type", "application/json");
@@ -179,14 +180,14 @@ public class AccessInterceptor implements HandlerInterceptor {
         }
 
 //        按钮权限校验
-        boolean state = checkButtonRole(request);
-        if (!state){
-            ResponseBean resp = ResponseBean.error("权限验证非法" , ResponseBean.ERROR_AUTH_FAIL);
-
-            response.addHeader("Content-type", "application/json");
-            response.getOutputStream().write(JSONObject.toJSONBytes(resp));
-            return false;
-        }
+//        boolean state = checkButtonRole(request);
+//        if (!state){
+//            ResponseBean resp = ResponseBean.error("权限验证非法" , ResponseBean.ERROR_AUTH_FAIL);
+//
+//            response.addHeader("Content-type", "application/json");
+//            response.getOutputStream().write(JSONObject.toJSONBytes(resp));
+//            return false;
+//        }
         
         return true;
     }

src/main/java/com/yunzhi/marketing/job/CustomerStatisticTimeJob.java

@@ -50,7 +50,7 @@ public class CustomerStatisticTimeJob extends BaseController {
      *
      * 开启定时任务，每天23:50执行
      */
-    @Scheduled(cron = "59 50 23 * * ?")
+//    @Scheduled(cron = "59 50 23 * * ?")
 //    @Scheduled(cron = "* 0/1 * * * ?")
     private void configureTasks() {
         LocalDateTime nowDate = LocalDateTime.now();

src/main/java/com/yunzhi/marketing/job/JudglActivityTimeJob.java

@@ -54,7 +54,7 @@ public class JudglActivityTimeJob extends BaseController {
     /**
      * 开启定时任务，每天12：30执行
      */
-    @Scheduled(cron = "* 0/5 * * * ?")
+//    @Scheduled(cron = "* 0/5 * * * ?")
     private void configureTasks() {
         String time = DateUtils.cutSecond(LocalDateTime.now());
 

src/main/java/com/yunzhi/marketing/mapper/TaLiveActivityMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.marketing.entity.TaLiveActivity;
 import com.yunzhi.marketing.entity.TaPersonBuilding;
+import com.yunzhi.marketing.po.LiveAndVideoVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
@@ -48,4 +49,13 @@ public interface TaLiveActivityMapper extends BaseMapper<TaLiveActivity> {
     void updateLiveActivityStatus(@Param("orgId") Integer orgId, @Param("taLiveActivityList") List<TaLiveActivity> taLiveActivityList);
 
     TaLiveActivity getDetailById(@Param("id")Integer id);
+
+    IPage<LiveAndVideoVO> getWxLiveActivityAndVideo(IPage<LiveAndVideoVO> pg,
+                                                    @Param("liveActivityTitle")  String liveActivityTitle,
+                                                    @Param("cityId") String cityId,
+                                                    @Param("buildingId") String buildingId,
+                                                    @Param("status") Integer status,
+                                                    @Param("orgId") Integer orgId,
+                                                    @Param("name") String name,
+                                                    @Param("source") Integer source);
 }

src/main/java/com/yunzhi/marketing/po/LiveAndVideoVO.java

@@ -0,0 +1,25 @@
+package com.yunzhi.marketing.po;
+
+import lombok.Data;
+
+import java.time.LocalDate;
+
+@Data
+public class LiveAndVideoVO {
+
+    private String title;
+
+    private LocalDate startTime;
+
+    private LocalDate endTime;
+
+    private String buildingName;
+
+    private String cityName;
+
+    private String type;
+
+    private String kind;
+
+    private String images;
+}

src/main/java/com/yunzhi/marketing/service/ITaLiveActivityService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.entity.TaLiveActivity;
 import com.yunzhi.marketing.entity.TaPersonBuilding;
+import com.yunzhi.marketing.po.LiveAndVideoVO;
 
 import java.util.List;
 
@@ -63,4 +64,19 @@ public interface ITaLiveActivityService extends IService<TaLiveActivity> {
     ResponseBean delLiveActivityList(Integer orgId, List<TaLiveActivity> liveActivityList);
 
     ResponseBean getDetailById(Integer id);
+
+    /**
+     * 微信小程序查询直播列表
+     * @param pageNum
+     * @param pageSize
+     * @param orgId
+     * @param liveActivityTitle
+     * @param cityId
+     * @param buildingId
+     * @param status
+     * @param name
+     * @param source
+     * @return
+     */
+    IPage<LiveAndVideoVO> getWxLiveActivityAndVideo(Integer pageNum, Integer pageSize, Integer orgId, String liveActivityTitle, String cityId, String buildingId, Integer status, String name, Integer source);
 }

src/main/java/com/yunzhi/marketing/service/ITaPersonService.java

@@ -4,6 +4,7 @@ import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.center.taUser.entity.TaUser;
+import com.yunzhi.marketing.dto.PersonMarketingDTO;
 import com.yunzhi.marketing.entity.TaCustomerFrom;
 import com.yunzhi.marketing.entity.TaPerson;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -121,4 +122,12 @@ public interface ITaPersonService extends IService<TaPerson> {
                    TaCustomerFrom customerFrom) throws Exception;
 
     ResponseBean updateUserPhoto(String photoUrl, String openId);
+
+    /**
+     * 成为驻场顾问
+     * @param marketingDTO
+     * @param openid
+     * @return
+     */
+    ResponseBean marketing(PersonMarketingDTO marketingDTO, String openid);
 }

src/main/java/com/yunzhi/marketing/service/impl/TaBuildingServiceImpl.java

@@ -2,6 +2,7 @@ package com.yunzhi.marketing.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -15,6 +16,10 @@ import com.yunzhi.marketing.common.StringUtils;
 import com.yunzhi.marketing.entity.*;
 import com.yunzhi.marketing.mapper.*;
 import com.yunzhi.marketing.service.*;
+import com.yunzhi.marketing.xlk.entity.BuildingSpecialRoom;
+import com.yunzhi.marketing.xlk.entity.Trend;
+import com.yunzhi.marketing.xlk.mapper.BuildingSpecialRoomMapper;
+import com.yunzhi.marketing.xlk.mapper.TrendMapper;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -126,6 +131,13 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     @Autowired
     private IExtendContentService iExtendContentService;
 
+    @Autowired
+    private BuildingSpecialRoomMapper buildingSpecialRoomMapper;
+
+    @Autowired
+    private TrendMapper trendMapper;
+
+    private String MARKETING_CODE;
     @Override
     public ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain, Integer orgId, List<TaPersonBuilding> taPersonBuildingList) {
         Page<TaBuilding> page = new Page<>();
@@ -356,6 +368,19 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         List<ExtendContent> taExtendContents = iExtendContentService.list(taExtendContentQueryWrapper);
         building.setExtendContent(taExtendContents);
 
+        // 添加楼盘特价房源
+        LambdaQueryWrapper<BuildingSpecialRoom> specialRoomLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        specialRoomLambdaQueryWrapper.eq(BuildingSpecialRoom::getBuildingId,id);
+        specialRoomLambdaQueryWrapper.orderByDesc(BuildingSpecialRoom::getCreateDate);
+        List<BuildingSpecialRoom> buildingSpecialRooms = buildingSpecialRoomMapper.selectList(specialRoomLambdaQueryWrapper);
+        building.setSpecialRoomList(buildingSpecialRooms);
+
+        // 添加楼盘项目动态
+        LambdaQueryWrapper<Trend> lambdaQueryWrapper =new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(Trend::getBuildingId,id);
+        lambdaQueryWrapper.orderByDesc(Trend::getCreateDate);
+        List<Trend> trends = trendMapper.selectList(lambdaQueryWrapper);
+        building.setTrendList(trends);
 
         List<TaSalesBatch> resultSalesBatchList = new ArrayList<>();
         taSalesBatch.stream().forEach(record -> {
@@ -574,6 +599,9 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         building.setStatus(2);
         building.setOrgId(orgId);
         building.setName(building.getBuildingName());
+        // 生成楼盘驻场码
+        getMyMarktingCode();
+        building.setMarketingCode(MARKETING_CODE);
         if (taBuildingMapper.insert(building) < 1) {
             return ResponseBean.error("添加项目楼栋失败", ResponseBean.ERROR_UNAVAILABLE);
         }
@@ -681,6 +709,22 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         return ResponseBean.success("");
     }
 
+    /**
+     * 生成六位推荐码 重复重新生成
+     * @return
+     */
+    private void getMyMarktingCode() {
+        String code = String.valueOf((int) ((Math.random() * 9 + 1) * Math.pow(10, 5)));
+        // 查询这个code 在库里存不存在
+        LambdaQueryWrapper<TaBuilding> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(TaBuilding::getMarketingCode,code);
+        List<TaBuilding> userInfos = taBuildingMapper.selectList(queryWrapper);
+        if (userInfos.size() > 0){
+            getMyMarktingCode();
+        }
+        MARKETING_CODE = code;
+    }
+
     @Override
     public ResponseBean buildingdelete(String id, Integer orgId) {
         TaBuilding building = new TaBuilding();

src/main/java/com/yunzhi/marketing/service/impl/TaLiveActivityServiceImpl.java

@@ -10,6 +10,7 @@ import com.yunzhi.marketing.common.CommConstant;
 import com.yunzhi.marketing.mapper.TaLiveActivityMapper;
 import com.yunzhi.marketing.mapper.TdLiveDictMapper;
 import com.yunzhi.marketing.entity.*;
+import com.yunzhi.marketing.po.LiveAndVideoVO;
 import com.yunzhi.marketing.service.IMiniAppService;
 import com.yunzhi.marketing.service.ITaLiveActivityService;
 import com.yunzhi.marketing.service.ITaMiniappService;
@@ -21,6 +22,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
@@ -196,4 +198,38 @@ public class TaLiveActivityServiceImpl extends ServiceImpl<TaLiveActivityMapper,
         responseBean.addSuccess(taLiveActivityMapper.getDetailById(id));
         return responseBean;
     }
+
+    /**
+     * 微信小程序查询直播列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param orgId
+     * @param liveActivityTitle
+     * @param cityId
+     * @param buildingId
+     * @param status
+     * @param name
+     * @param source
+     * @return
+     */
+    @Override
+    public IPage<LiveAndVideoVO> getWxLiveActivityAndVideo(Integer pageNum, Integer pageSize, Integer orgId, String liveActivityTitle, String cityId, String buildingId, Integer status, String name, Integer source) {
+        IPage<LiveAndVideoVO> pg = new Page<>(pageNum, pageSize);
+        IPage<LiveAndVideoVO> wxLiveActivityAndVideo = taLiveActivityMapper.getWxLiveActivityAndVideo(pg, liveActivityTitle, cityId, buildingId, status, orgId, name, source);
+        List<LiveAndVideoVO> records = wxLiveActivityAndVideo.getRecords();
+        records.forEach(e -> {
+            if ("live".equals(e.getType())){
+                LocalDate now = LocalDate.now();
+                if (e.getStartTime().isBefore(now)){
+                    e.setKind("notice");
+                }else if (e.getStartTime().isBefore(now) && e.getEndTime().isAfter(now)){
+                    e.setKind("live");
+                }else {
+                    e.setKind("end");
+                }
+            }
+        });
+        return wxLiveActivityAndVideo;
+    }
 }

src/main/java/com/yunzhi/marketing/service/impl/TaPersonServiceImpl.java

@@ -2,6 +2,7 @@ package com.yunzhi.marketing.service.impl;
 
 import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -14,6 +15,7 @@ import com.yunzhi.marketing.common.CommConstant;
 import com.yunzhi.marketing.common.DateUtils;
 import com.yunzhi.marketing.common.MD5Utils;
 import com.yunzhi.marketing.common.StringUtils;
+import com.yunzhi.marketing.dto.PersonMarketingDTO;
 import com.yunzhi.marketing.event.EventBus;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yunzhi.marketing.entity.*;
@@ -1292,4 +1294,40 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         responseBean.addSuccess("修改成功");
         return responseBean;
     }
+
+    /**
+     * 成为驻场顾问
+     *
+     * @param marketingDTO
+     * @param openid
+     * @return
+     */
+    @Override
+    public ResponseBean marketing(PersonMarketingDTO marketingDTO, String openid) {
+        List<TaPerson> taPersons = getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        TaPerson taPerson = taPersons.get(0);
+
+        // 校验marketingCode 是否正确
+        LambdaQueryWrapper<TaBuilding> taBuildingLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        taBuildingLambdaQueryWrapper.eq(TaBuilding::getMarketingCode,marketingDTO.getMarketingCode());
+        TaBuilding taBuilding = taBuildingMapper.selectOne(taBuildingLambdaQueryWrapper);
+        if (null == taBuilding){
+            return ResponseBean.error("不合法的驻场码", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        // 成为驻场顾问并绑定楼盘
+        taPerson.setPersonType("marketing");
+        taPersonMapper.updateById(taPerson);
+
+        TaPersonBuilding taPersonBuilding = new TaPersonBuilding();
+        taPersonBuilding.setBuildingId(taBuilding.getBuildingId());
+        taPersonBuilding.setPersonId(taPerson.getPersonId());
+        taPersonBuilding.setCreateDate(LocalDateTime.now());
+        taPersonBuildingMapper.insert(taPersonBuilding);
+
+        return ResponseBean.success("绑定成功");
+    }
 }

src/main/java/com/yunzhi/marketing/statistic/entity/TaCustomerFollowUpRecord.java

@@ -64,4 +64,9 @@ public class TaCustomerFollowUpRecord implements Serializable {
      * 客户性别
      */
     private Integer customerSex;
+
+    /**
+     * 组织结构id
+     */
+    private String institutionId;
 }

src/main/java/com/yunzhi/marketing/xlk/controller/BrandController.java

@@ -0,0 +1,199 @@
+package com.yunzhi.marketing.xlk.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yunzhi.marketing.base.BaseController;
+import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.common.StringUtils;
+import com.yunzhi.marketing.entity.TaBuilding;
+import com.yunzhi.marketing.service.ITaBuildingService;
+import com.yunzhi.marketing.xlk.dto.BrandDTO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.yunzhi.marketing.xlk.service.IBrandService;
+import com.yunzhi.marketing.xlk.entity.Brand;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+    * 品牌开发商表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2021-05-13
+ */
+@RestController
+@RequestMapping("/api")
+@Api(value = "品牌开发商表", tags = "xlk-品牌开发商表")
+public class BrandController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(BrandController.class);
+
+    @Autowired
+    public IBrandService iBrandService;
+
+    @Autowired
+    private ITaBuildingService taBuildingService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @ApiOperation(value = "admin-品牌开发商表列表", notes = "admin-品牌开发商表列表")
+    @RequestMapping(value="/admin/brand",method= RequestMethod.GET)
+    public ResponseBean brandList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                  @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                  @RequestParam(value ="brandName",required = false) String brandName,
+                                  @RequestHeader("authorization") String token,HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<Brand> pg = new Page<>(pageNum, pageSize);
+            LambdaQueryWrapper<Brand> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(Brand::getOrgId,getOrgId(request));
+            queryWrapper.like(!StringUtils.isEmpty(brandName),Brand::getBrandName,brandName);
+            queryWrapper.orderByDesc(Brand::getCreatedTime);
+
+            IPage<Brand> result = iBrandService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("brandList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param brandDTO 实体对象
+     * @return
+     */
+    @ApiOperation(value = "admin-添加品牌开发商表", notes = "admin-添加品牌开发商表")
+    @RequestMapping(value="/admin/brand",method= RequestMethod.POST)
+    public ResponseBean brandAdd(@RequestBody BrandDTO brandDTO, @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            Brand brand = new Brand();
+            BeanUtils.copyProperties(brandDTO,brand);
+            brand.setCreatedTime(LocalDateTime.now());
+            brand.setCreatedBy(getUserId(request));
+            brand.setOrgId(getOrgId(request));
+            if (iBrandService.save(brand)){
+                responseBean.addSuccess(brand);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("brandAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ApiOperation(value = "admin-删除品牌开发商表", notes = "admin-删除品牌开发商表")
+    @RequestMapping(value="/admin/brand/{id}", method= RequestMethod.DELETE)
+    public ResponseBean brandDelete(@PathVariable String id, @RequestHeader("authorization") String token){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iBrandService.removeById(id)){
+                // 同时更新项目里面的品牌商id和name为空
+                LambdaQueryWrapper<TaBuilding> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.eq(TaBuilding::getBrandId,id);
+                List<TaBuilding> list = taBuildingService.list(queryWrapper);
+                list.forEach(e -> {
+                    e.setBrandId(null);
+                    e.setBrandName(null);
+                    taBuildingService.updateById(e);
+                });
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("brandDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param brandDTO 实体对象
+     * @return
+     */
+    @ApiOperation(value = "admin-修改品牌开发商表", notes = "admin-修改品牌开发商表")
+    @RequestMapping(value="/admin/brand/{id}",method= RequestMethod.PUT)
+    public ResponseBean brandUpdate(@PathVariable("id") String id,@RequestBody BrandDTO brandDTO,@RequestHeader("authorization") String token,HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            Brand brand = new Brand();
+            BeanUtils.copyProperties(brandDTO,brand);
+            brand.setBrandId(id);
+            brand.setUpdatedBy(getUserId(request));
+            brand.setUpdatedTime(LocalDateTime.now());
+            if (iBrandService.updateById(brand)){
+                // 同时更新项目里面的品牌商id和name为更新后的名称
+                LambdaQueryWrapper<TaBuilding> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.eq(TaBuilding::getBrandId,brand.getBrandId());
+                List<TaBuilding> list = taBuildingService.list(queryWrapper);
+                list.forEach(e -> {
+                    e.setBrandName(brand.getBrandName());
+                    taBuildingService.updateById(e);
+                });
+                responseBean.addSuccess(brand);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("brandUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @ApiOperation(value = "admin-获取品牌开发商表详情数据", notes = "admin-获取品牌开发商表详情数据")
+    @RequestMapping(value="/admin/brand/{id}",method= RequestMethod.GET)
+    public ResponseBean brandGet(@PathVariable String id, @RequestHeader("authorization") String token){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iBrandService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("brandDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/yunzhi/marketing/xlk/controller/BuildingSpecialRoomController.java

@@ -0,0 +1,177 @@
+package com.yunzhi.marketing.xlk.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yunzhi.marketing.base.BaseController;
+import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.xlk.dto.BuildingSpecialRoomDTO;
+import com.yunzhi.marketing.xlk.entity.BuildingSpecialRoom;
+import com.yunzhi.marketing.xlk.service.IBuildingSpecialRoomService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+    * 特价房源表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2021-07-12
+ */
+@RestController
+@RequestMapping("/api")
+@Api(value = "特价房源表", tags = "xlk-特价房源表")
+public class BuildingSpecialRoomController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(BuildingSpecialRoomController.class);
+
+    @Autowired
+    public IBuildingSpecialRoomService iBuildingSpecialRoomService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @ApiOperation(value = "admin-查询特价房源列表", notes = "admin-查询特价房源列表")
+    @RequestMapping(value="/{plat}/buildingSpecialRoom",method= RequestMethod.GET)
+    public ResponseBean buildingSpecialRoomList(@PathVariable("plat") String plat,
+                                                @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                                @RequestParam(value ="buildingId") String buildingId,
+                                                @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<BuildingSpecialRoom> pg = new Page<>(pageNum, pageSize);
+            LambdaQueryWrapper<BuildingSpecialRoom> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(BuildingSpecialRoom::getOrgId,getOrgId(request));
+            queryWrapper.eq(BuildingSpecialRoom::getBuildingId,buildingId);
+            queryWrapper.gt("wx".equals(plat), BuildingSpecialRoom::getEndTime, LocalDateTime.now());
+            queryWrapper.orderByDesc(BuildingSpecialRoom::getCreateDate);
+
+            IPage<BuildingSpecialRoom> result = iBuildingSpecialRoomService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("buildingSpecialRoomList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param buildingSpecialRoomDTO 实体对象
+     * @return
+     */
+    @ApiOperation(value = "admin-保存特价房源", notes = "admin-保存特价房源")
+    @RequestMapping(value="/buildingSpecialRoom",method= RequestMethod.POST)
+    public ResponseBean buildingSpecialRoomAdd(@RequestBody BuildingSpecialRoomDTO buildingSpecialRoomDTO, @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            Integer orgId = getOrgId(request);
+            BuildingSpecialRoom buildingSpecialRoom = new BuildingSpecialRoom();
+            BeanUtils.copyProperties(buildingSpecialRoomDTO,buildingSpecialRoom);
+            buildingSpecialRoom.setOrgId(orgId);
+            buildingSpecialRoom.setCreateDate(LocalDateTime.now());
+            if (iBuildingSpecialRoomService.save(buildingSpecialRoom)){
+                responseBean.addSuccess(buildingSpecialRoom);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("buildingSpecialRoomAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ApiOperation(value = "admin-删除特价房源", notes = "admin-删除特价房源")
+    @ResponseBody
+    @RequestMapping(value="/buildingSpecialRoom/{id}", method= RequestMethod.DELETE)
+    public ResponseBean buildingSpecialRoomDelete(@PathVariable String id, @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iBuildingSpecialRoomService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("buildingSpecialRoomDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param buildingSpecialRoomDTO 实体对象
+     * @return
+     */
+    @ApiOperation(value = "admin-修改特价房源", notes = "admin-修改特价房源")
+    @RequestMapping(value="/buildingSpecialRoom/{id}",method= RequestMethod.PUT)
+    public ResponseBean buildingSpecialRoomUpdate(@PathVariable String id,
+                                                  @RequestBody BuildingSpecialRoomDTO buildingSpecialRoomDTO, @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            BuildingSpecialRoom buildingSpecialRoom = new BuildingSpecialRoom();
+            BeanUtils.copyProperties(buildingSpecialRoomDTO,buildingSpecialRoom);
+            buildingSpecialRoom.setSpecialRoomId(id);
+            if (iBuildingSpecialRoomService.updateById(buildingSpecialRoom)){
+                responseBean.addSuccess(buildingSpecialRoom);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("buildingSpecialRoomUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @ApiOperation(value = "admin-获取特价房源详情", notes = "admin-获取特价房源详情")
+    @RequestMapping(value="/buildingSpecialRoom/{id}",method= RequestMethod.GET)
+    public ResponseBean buildingSpecialRoomGet(@PathVariable String id, @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iBuildingSpecialRoomService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("buildingSpecialRoomDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/yunzhi/marketing/xlk/controller/CurriculumController.java

@@ -0,0 +1,256 @@
+package com.yunzhi.marketing.xlk.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yunzhi.marketing.base.BaseController;
+import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.common.StringUtils;
+import com.yunzhi.marketing.entity.TaPerson;
+import com.yunzhi.marketing.service.ITaPersonService;
+import com.yunzhi.marketing.xlk.dto.CurriculumDTO;
+import com.yunzhi.marketing.xlk.entity.Brand;
+import com.yunzhi.marketing.xlk.entity.Video;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.yunzhi.marketing.xlk.service.ICurriculumService;
+import com.yunzhi.marketing.xlk.entity.Curriculum;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+    * 课程表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2021-05-18
+ */
+@RestController
+@RequestMapping("/api")
+@Api(value = "课程表", tags = "xlk-课程表")
+public class CurriculumController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(CurriculumController.class);
+
+    @Autowired
+    public ICurriculumService iCurriculumService;
+
+    @Autowired
+    public ITaPersonService taPersonService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @ApiOperation(value = "admin-查询课程表列表", notes = "admin-查询课程表列表")
+    @RequestMapping(value="/admin/curriculum",method= RequestMethod.GET)
+    public ResponseBean curriculumList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                       @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                       @RequestParam(value ="name",required = false) String name,
+                                       @RequestParam(value ="roleId",required = false) Integer roleId,
+                                       @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<Curriculum> pg = new Page<>(pageNum, pageSize);
+            LambdaQueryWrapper<Curriculum> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(Curriculum::getOrgId,getOrgId(request));
+            queryWrapper.eq(!StringUtils.isEmpty(name),Curriculum::getName,name);
+            queryWrapper.eq(null != roleId,Curriculum::getRoleId,roleId);
+            queryWrapper.orderByDesc(Curriculum::getWeight);
+            queryWrapper.orderByDesc(Curriculum::getCreatedTime);
+
+            IPage<Curriculum> result = iCurriculumService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("curriculumList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param curriculumDTO 实体对象
+     * @return
+     */
+    @ApiOperation(value = "admin-新增课程表", notes = "admin-新增课程表")
+    @RequestMapping(value="/admin/curriculum",method= RequestMethod.POST)
+    public ResponseBean curriculumAdd(@RequestBody CurriculumDTO curriculumDTO,
+                                      @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            Curriculum curriculum = new Curriculum();
+            BeanUtils.copyProperties(curriculumDTO,curriculum);
+            curriculum.setCreatedTime(LocalDateTime.now());
+            curriculum.setCreatedBy(getUserId(request));
+            curriculum.setOrgId(getOrgId(request));
+            if (iCurriculumService.save(curriculum)){
+                responseBean.addSuccess(curriculum);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("curriculumAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ApiOperation(value = "admin-根据id删除课程表", notes = "admin-根据id删除课程表")
+    @ResponseBody
+    @RequestMapping(value="/admin/curriculum/{id}", method= RequestMethod.DELETE)
+    public ResponseBean curriculumDelete(@PathVariable String id,
+                                         @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iCurriculumService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("curriculumDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param curriculumDTO 实体对象
+     * @return
+     */
+    @ApiOperation(value = "admin-根据id修改课程表", notes = "admin-根据id修改课程表")
+    @RequestMapping(value="/admin/curriculum/{id}",method= RequestMethod.PUT)
+    public ResponseBean curriculumUpdate(@PathVariable String id,
+                                        @RequestBody CurriculumDTO curriculumDTO,
+                                         @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            Curriculum curriculum = new Curriculum();
+            BeanUtils.copyProperties(curriculumDTO,curriculum);
+            curriculum.setCurriculumId(id);
+            if (iCurriculumService.updateById(curriculum)){
+                responseBean.addSuccess(curriculum);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("curriculumUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @ApiOperation(value = "admin-根据id查询课程表详情", notes = "admin-根据id查询课程表详情")
+    @RequestMapping(value="/admin/curriculum/{id}",method= RequestMethod.GET)
+    public ResponseBean curriculumGet(@PathVariable String id,
+                                      @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iCurriculumService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("curriculumDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @ApiOperation(value = "wx-查询课程表列表", notes = "wx-查询课程表列表")
+    @RequestMapping(value="/wx/curriculum",method= RequestMethod.GET)
+    public ResponseBean wxCurriculumList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                       @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                       @RequestParam(value ="name",required = false) String name,
+                                       @RequestParam(value ="roleId",required = false) Integer roleId,
+                                       @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage<Curriculum> pg = new Page<>(pageNum, pageSize);
+            LambdaQueryWrapper<Curriculum> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(Curriculum::getOrgId,getOrgId(request));
+            queryWrapper.eq(!StringUtils.isEmpty(name),Curriculum::getName,name);
+            queryWrapper.eq(null != roleId,Curriculum::getRoleId,roleId);
+            queryWrapper.orderByDesc(Curriculum::getWeight);
+            queryWrapper.orderByDesc(Curriculum::getCreatedTime);
+
+            IPage<Curriculum> result = iCurriculumService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("curriculumList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @ApiOperation(value = "wx-查询我收藏的课程表列表", notes = "wx-查询我收藏的课程表列表")
+    @RequestMapping(value="/wx/curriculum/save",method= RequestMethod.GET)
+    public ResponseBean saveCurriculumList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                         @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                         @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+
+            String openid = getOpenId(request);
+            List<TaPerson> persons = taPersonService.getPersonsByOpenId(openid);
+            if (null == persons || persons.size() == 0) {
+                return ResponseBean.error("当前账户信息异常, 清除缓存重试", ResponseBean.ERROR_UNAVAILABLE);
+            }
+            TaPerson person = persons.get(0);
+            IPage<Curriculum> result = iCurriculumService.selectMySaveList(pageNum,pageSize,person);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("curriculumList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/yunzhi/marketing/xlk/controller/HousePropertyController.java

@@ -0,0 +1,126 @@
+package com.yunzhi.marketing.xlk.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yunzhi.marketing.base.BaseController;
+import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.xlk.entity.HouseProperty;
+import com.yunzhi.marketing.xlk.service.IHousePropertyService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+    * 帮我找房基本属性表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2021-06-15
+ */
+@RestController
+@RequestMapping("/api")
+@Api(value = "帮我找房问卷问题表", tags = "xlk-帮我找房问卷问题表")
+public class HousePropertyController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(HousePropertyController.class);
+
+    @Autowired
+    public IHousePropertyService iHousePropertyService;
+
+
+    @ApiOperation(value = "wx-获取帮我找房问卷问题表", notes = "admin-获取帮我找房问卷问题表")
+    @RequestMapping(value="/wx/houseProperty",method= RequestMethod.GET)
+    public ResponseBean housePropertyList(){
+        return ResponseBean.success(iHousePropertyService.list());
+    }
+
+    /**
+     * 保存对象
+     * @param houseProperty 实体对象
+     * @return
+     */
+    @RequestMapping(value="/houseProperty",method= RequestMethod.POST)
+    public ResponseBean housePropertyAdd(@RequestBody HouseProperty houseProperty){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iHousePropertyService.save(houseProperty)){
+                responseBean.addSuccess(houseProperty);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("housePropertyAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/houseProperty/{id}", method= RequestMethod.DELETE)
+    public ResponseBean housePropertyDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iHousePropertyService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("housePropertyDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param houseProperty 实体对象
+     * @return
+     */
+    @RequestMapping(value="/houseProperty/{id}",method= RequestMethod.PUT)
+    public ResponseBean housePropertyUpdate(@PathVariable Integer id,
+                                        @RequestBody HouseProperty houseProperty){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iHousePropertyService.updateById(houseProperty)){
+                responseBean.addSuccess(houseProperty);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("housePropertyUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/houseProperty/{id}",method= RequestMethod.GET)
+    public ResponseBean housePropertyGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iHousePropertyService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("housePropertyDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/yunzhi/marketing/xlk/controller/InstitutionController.java

@@ -0,0 +1,169 @@
+package com.yunzhi.marketing.xlk.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yunzhi.marketing.base.BaseController;
+import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.common.StringUtils;
+import com.yunzhi.marketing.xlk.dto.InstitutionDTO;
+import com.yunzhi.marketing.xlk.entity.Institution;
+import com.yunzhi.marketing.xlk.service.IInstitutionService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+    * 组织结构表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2021-06-22
+ */
+@RestController
+@RequestMapping("/api")
+@Api(value = "xlk-组织结构相关接口", tags = "xlk-组织结构相关接口")
+public class InstitutionController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(InstitutionController.class);
+
+    @Autowired
+    public IInstitutionService iInstitutionService;
+
+
+    /**
+     * 分页查询列表
+     * @param institutionCode
+     * @return
+     */
+    @ApiOperation(value = "admin-组织机构列表查询", notes = "admin-组织机构列表查询")
+    @RequestMapping(value="/admin/institution/list",method= RequestMethod.GET)
+    public ResponseBean institutionList(@RequestParam(value ="institutionCode",required = false) String institutionCode,
+                                        @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            LambdaQueryWrapper<Institution> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(Institution::getOrgId,getOrgId(request));
+            if (StringUtils.isEmpty(institutionCode)){
+                queryWrapper.eq(Institution::getType,1);
+            }else {
+                Institution institution = iInstitutionService.getById(institutionCode);
+                queryWrapper.eq(Institution::getType,institution.getType() + 1);
+                queryWrapper.likeRight(Institution::getInstitutionCode,institution.getInstitutionCode());
+            }
+            queryWrapper.orderByDesc(Institution::getCreateDate);
+
+            List<Institution> list = iInstitutionService.list(queryWrapper);
+            responseBean.addSuccess(list);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("institutionList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param institutionDTO 实体对象
+     * @return
+     */
+    @ApiOperation(value = "admin-组织机构列表查询", notes = "admin-组织机构列表查询")
+    @RequestMapping(value="/institution/save",method= RequestMethod.POST)
+    public ResponseBean institutionAdd(@RequestBody @Valid InstitutionDTO institutionDTO, @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            Integer orgId = getOrgId(request);
+            Institution institution = new Institution();
+            BeanUtils.copyProperties(institutionDTO,institution);
+            institution.setOrgId(orgId);
+            institution.setCreateDate(LocalDateTime.now());
+            responseBean = iInstitutionService.saveInstitution(institution);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("institutionAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ApiOperation(value = "admin-组织机构列表删除", notes = "admin-组织机构列表删除")
+    @ResponseBody
+    @RequestMapping(value="/institution/{id}", method= RequestMethod.DELETE)
+    public ResponseBean institutionDelete(@PathVariable String id, @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iInstitutionService.deleteByinstitutionCode(id);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("institutionDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param institutionDTO 实体对象
+     * @return
+     */
+    @ApiOperation(value = "admin-组织机构列表修改", notes = "admin-组织机构列表修改")
+    @RequestMapping(value="/institution/{id}",method= RequestMethod.PUT)
+    public ResponseBean institutionUpdate(@PathVariable String id,
+                                          @RequestBody InstitutionDTO institutionDTO, @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            Integer orgId = getOrgId(request);
+            Institution institution = new Institution();
+            BeanUtils.copyProperties(institutionDTO,institution);
+            institution.setOrgId(orgId);
+            institution.setInstitutionCode(id);
+             responseBean = iInstitutionService.updateInstitution(institution);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("institutionUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @ApiOperation(value = "admin-组织机构列表查询详细", notes = "组织机构列表查询详细")
+    @RequestMapping(value="/institution/{id}",method= RequestMethod.GET)
+    public ResponseBean institutionGet(@PathVariable String id, @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iInstitutionService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("institutionDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/yunzhi/marketing/xlk/controller/SearchHouseController.java

@@ -0,0 +1,214 @@
+package com.yunzhi.marketing.xlk.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yunzhi.marketing.base.BaseController;
+import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.common.StringUtils;
+import com.yunzhi.marketing.entity.TaBuilding;
+import com.yunzhi.marketing.entity.TaPerson;
+import com.yunzhi.marketing.service.ITaBuildingService;
+import com.yunzhi.marketing.service.ITaPersonService;
+import com.yunzhi.marketing.xlk.dto.SearchHouseDTO;
+import com.yunzhi.marketing.xlk.dto.SearchHouseReplayDTO;
+import com.yunzhi.marketing.xlk.entity.Curriculum;
+import com.yunzhi.marketing.xlk.entity.SearchHouse;
+import com.yunzhi.marketing.xlk.service.ISearchHouseService;
+import com.yunzhi.marketing.xlk.vo.SearchHouseVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+    * 帮我找房  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2021-05-19
+ */
+@RestController
+@RequestMapping("/api")
+@Api(value = "帮我找房", tags = "xlk-帮我找房")
+public class SearchHouseController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(SearchHouseController.class);
+
+    @Autowired
+    public ISearchHouseService iSearchHouseService;
+
+    @Autowired
+    public ITaPersonService taPersonService;
+
+    @Autowired
+    private ITaBuildingService taBuildingService;
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @ApiOperation(value = "admin-获取帮我找房列表", notes = "admin-获取帮我找房列表")
+    @RequestMapping(value="/admin/searchHouse",method= RequestMethod.GET)
+    public ResponseBean searchHouseList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                        @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            SearchHouse searchHouse = new SearchHouse();
+            searchHouse.setOrgId(getOrgId(request));
+            //使用分页插件
+            IPage<SearchHouseVO> pg = new Page<>(pageNum, pageSize);
+            responseBean = iSearchHouseService.selectSearchHouseList(pg,searchHouse);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("searchHouseList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param searchHouseDTO 实体对象
+     * @return
+     */
+    @ApiOperation(value = "wx-保存帮我找房需求", notes = "wx-保存帮我找房需求")
+    @RequestMapping(value="/wx/searchHouse",method= RequestMethod.POST)
+    public ResponseBean searchHouseAdd(@RequestBody SearchHouseDTO searchHouseDTO, @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        String openid = getOpenId(request);
+        Integer orgId = getOrgId(request);
+        List<TaPerson> persons = taPersonService.getPersonsByOpenId(openid);
+        if (null == persons || persons.size() == 0) {
+            return ResponseBean.error("当前账户信息异常, 清除缓存重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = persons.get(0);
+        try {
+            SearchHouse searchHouse = new SearchHouse();
+            BeanUtils.copyProperties(searchHouseDTO,searchHouse);
+            searchHouse.setPersonId(person.getPersonId());
+            searchHouse.setOrgId(orgId);
+            searchHouse.setCreatedTime(LocalDateTime.now());
+            if (iSearchHouseService.save(searchHouse)){
+                SearchHouseVO searchHouseVO = new SearchHouseVO();
+                BeanUtils.copyProperties(searchHouse,searchHouseVO);
+                // 获取价格相近的楼盘
+                LambdaQueryWrapper<TaBuilding> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+                lambdaQueryWrapper.eq(!StringUtils.isEmpty(searchHouseDTO.getIntentArea()),TaBuilding::getBuildingArea,searchHouseDTO.getIntentArea());
+                lambdaQueryWrapper.between(TaBuilding::getPrice,searchHouseDTO.getMinPrice(),searchHouseDTO.getMaxPrice());
+                lambdaQueryWrapper.ne(TaBuilding::getStatus,-1);
+                lambdaQueryWrapper.last(" limit 2");
+                List<TaBuilding> list = taBuildingService.list(lambdaQueryWrapper);
+                if (list.size() < 1){
+                    lambdaQueryWrapper = new LambdaQueryWrapper<>();
+                    lambdaQueryWrapper.eq(!StringUtils.isEmpty(searchHouseDTO.getIntentArea()),TaBuilding::getBuildingArea,searchHouseDTO.getIntentArea());
+                    lambdaQueryWrapper.ne(TaBuilding::getStatus,-1);
+                    lambdaQueryWrapper.last(" limit 2");
+                    list = taBuildingService.list(lambdaQueryWrapper);
+                }
+                searchHouseVO.setTaBuildingList(list);
+                responseBean.addSuccess(searchHouseVO);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("searchHouseAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param searchHouse 实体对象
+     * @return
+     */
+    @ApiOperation(value = "admin-修改帮我找房需求", notes = "admin-修改帮我找房需求")
+    @RequestMapping(value="/admin/searchHouse/{id}",method= RequestMethod.PUT)
+    public ResponseBean searchHouseUpdate(@PathVariable String id,
+                                          @RequestBody SearchHouse searchHouse, @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            searchHouse.setId(id);
+            if (iSearchHouseService.updateById(searchHouse)){
+                responseBean.addSuccess(searchHouse);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("searchHouseUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @ApiOperation(value = "admin-根据id查询帮我找房需求详情", notes = "admin-根据id查询帮我找房需求详情")
+    @RequestMapping(value="/admin/searchHouse/{id}",method= RequestMethod.GET)
+    public ResponseBean searchHouseGet(@PathVariable String id, @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iSearchHouseService.selectSearchHouseDetail(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("searchHouseDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+
+    /**
+     * 帮我找房回访接口
+     * @param id  实体ID
+     * @param searchHouseReplayDTO 实体对象
+     * @return
+     */
+    @ApiOperation(value = "admin-帮我找房回访接口", notes = "admin-帮我找房回访接口")
+    @RequestMapping(value="/admin/reply/{id}",method= RequestMethod.PUT)
+    public ResponseBean searchHouseReply(@PathVariable String id,
+                                         @RequestBody SearchHouseReplayDTO searchHouseReplayDTO, @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            SearchHouse searchHouse = new SearchHouse();
+            searchHouse.setId(id);
+            searchHouse.setAuditRemark(searchHouseReplayDTO.getAuditRemark());
+            searchHouse.setStatus(searchHouseReplayDTO.getStatus());
+            searchHouse.setUpdatedTime(LocalDateTime.now());
+            if (iSearchHouseService.updateById(searchHouse)){
+                responseBean.addSuccess(searchHouse);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("searchHouseUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/yunzhi/marketing/xlk/controller/TaPolicyTypeController.java

@@ -0,0 +1,166 @@
+package com.yunzhi.marketing.xlk.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yunzhi.marketing.base.BaseController;
+import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.xlk.entity.TaPolicyType;
+import com.yunzhi.marketing.xlk.service.ITaPolicyTypeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+    * 购房政策类型表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2021-06-16
+ */
+@RestController
+@RequestMapping("/api")
+@Api(value = "购房政策类型表", tags = "xlk-购房政策类型表")
+public class TaPolicyTypeController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaPolicyTypeController.class);
+
+    @Autowired
+    public ITaPolicyTypeService iTaPolicyTypeService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @ApiOperation(value = "admin-购房政策类型列表", notes = "admin-购房政策类型列表")
+    @RequestMapping(value="/taPolicyType",method= RequestMethod.GET)
+    public ResponseBean taPolicyTypeList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                         @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                         @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaPolicyType> pg = new Page<>(pageNum, pageSize);
+            LambdaQueryWrapper<TaPolicyType> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(TaPolicyType::getOrgId,getOrgId(request));
+            queryWrapper.orderByDesc(TaPolicyType::getCreateDate);
+
+            IPage<TaPolicyType> result = iTaPolicyTypeService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taPolicyTypeList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taPolicyType 实体对象
+     * @return
+     */
+    @ApiOperation(value = "admin-购房政策类型新增", notes = "admin-购房政策类型新增")
+    @RequestMapping(value="/taPolicyType",method= RequestMethod.POST)
+    public ResponseBean taPolicyTypeAdd(@RequestBody TaPolicyType taPolicyType, @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            taPolicyType.setOrgId(getOrgId(request));
+            taPolicyType.setCreateDate(LocalDateTime.now());
+            if (iTaPolicyTypeService.save(taPolicyType)){
+                responseBean.addSuccess(taPolicyType);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taPolicyTypeAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ApiOperation(value = "admin-购房政策类型删除", notes = "admin-购房政策类型删除")
+    @ResponseBody
+    @RequestMapping(value="/taPolicyType/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taPolicyTypeDelete(@PathVariable String id, @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaPolicyTypeService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taPolicyTypeDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taPolicyType 实体对象
+     * @return
+     */
+    @ApiOperation(value = "admin-购房政策类型修改", notes = "admin-购房政策类型修改")
+    @RequestMapping(value="/taPolicyType/{id}",method= RequestMethod.PUT)
+    public ResponseBean taPolicyTypeUpdate(@PathVariable String id,
+                                           @RequestBody TaPolicyType taPolicyType, @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaPolicyTypeService.updateById(taPolicyType)){
+                responseBean.addSuccess(taPolicyType);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taPolicyTypeUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @ApiOperation(value = "admin-购房政策类型详情", notes = "admin-购房政策类型详情")
+    @RequestMapping(value="/taPolicyType/{id}",method= RequestMethod.GET)
+    public ResponseBean taPolicyTypeGet(@PathVariable String id, @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaPolicyTypeService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taPolicyTypeDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/yunzhi/marketing/xlk/controller/TrendController.java

@@ -0,0 +1,174 @@
+package com.yunzhi.marketing.xlk.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yunzhi.marketing.base.BaseController;
+import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.xlk.dto.TrendDTO;
+import com.yunzhi.marketing.xlk.entity.Trend;
+import com.yunzhi.marketing.xlk.service.ITrendService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+    * 项目动态表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2021-07-12
+ */
+@RestController
+@RequestMapping("/api")
+@Api(value = "项目动态表", tags = "xlk-项目动态表")
+public class TrendController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TrendController.class);
+
+    @Autowired
+    public ITrendService iTrendService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @ApiOperation(value = "admin-查询项目动态列表", notes = "admin-查询项目动态列表")
+    @RequestMapping(value="/trend",method= RequestMethod.GET)
+    public ResponseBean trendList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                  @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                  @RequestParam(value ="buildingId") String buildingId,
+                                  @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<Trend> pg = new Page<>(pageNum, pageSize);
+            LambdaQueryWrapper<Trend> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(Trend::getOrgId,getOrgId(request));
+            queryWrapper.eq(Trend::getBuildingId,buildingId);
+            queryWrapper.orderByDesc(Trend::getCreateDate);
+
+            IPage<Trend> result = iTrendService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("trendList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param trendDTO 实体对象
+     * @return
+     */
+    @ApiOperation(value = "admin-保存项目动态表", notes = "admin-保存项目动态表")
+    @RequestMapping(value="/trend",method= RequestMethod.POST)
+    public ResponseBean trendAdd(@RequestBody TrendDTO trendDTO, @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            Trend trend = new Trend();
+            BeanUtils.copyProperties(trendDTO,trend);
+            trend.setOrgId(getOrgId(request));
+            trend.setCreateDate(LocalDateTime.now());
+            if (iTrendService.save(trend)){
+                responseBean.addSuccess(trend);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("trendAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ApiOperation(value = "admin-删除项目动态", notes = "admin-删除项目动态")
+    @ResponseBody
+    @RequestMapping(value="/trend/{id}", method= RequestMethod.DELETE)
+    public ResponseBean trendDelete(@PathVariable String id, @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTrendService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("trendDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param trendDTO 实体对象
+     * @return
+     */
+    @ApiOperation(value = "admin-修改项目动态", notes = "admin-修改项目动态")
+    @RequestMapping(value="/trend/{id}",method= RequestMethod.PUT)
+    public ResponseBean trendUpdate(@PathVariable String id,
+                                    @RequestBody TrendDTO trendDTO, @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            Trend trend = new Trend();
+            BeanUtils.copyProperties(trendDTO,trend);
+            trend.setTrendId(id);
+            if (iTrendService.updateById(trend)){
+                responseBean.addSuccess(trend);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("trendUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @ApiOperation(value = "admin-查询项目动态详情", notes = "admin-查询项目动态详情")
+    @RequestMapping(value="/trend/{id}",method= RequestMethod.GET)
+    public ResponseBean trendGet(@PathVariable String id, @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTrendService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("trendDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/yunzhi/marketing/xlk/controller/VideoController.java

@@ -0,0 +1,229 @@
+package com.yunzhi.marketing.xlk.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yunzhi.marketing.base.BaseController;
+import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.common.StringUtils;
+import com.yunzhi.marketing.entity.TaPerson;
+import com.yunzhi.marketing.xlk.dto.SearchHouseDTO;
+import com.yunzhi.marketing.xlk.dto.VideoDTO;
+import com.yunzhi.marketing.xlk.entity.Brand;
+import com.yunzhi.marketing.xlk.entity.SearchHouse;
+import com.yunzhi.marketing.xlk.entity.Video;
+import com.yunzhi.marketing.xlk.service.IVideoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+    * 视频表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2021-05-18
+ */
+@RestController
+@RequestMapping("/api")
+@Api(value = "视频表", tags = "xlk-视频表")
+public class VideoController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(VideoController.class);
+
+    @Autowired
+    public IVideoService iVideoService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @ApiOperation(value = "admin-视频列表", notes = "admin-视频列表")
+    @RequestMapping(value="/admin/video",method= RequestMethod.GET)
+    public ResponseBean videoList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                  @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                  @RequestParam(value ="name",required = false) String name,
+                                  @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<Video> pg = new Page<>(pageNum, pageSize);
+            LambdaQueryWrapper<Video> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(!StringUtils.isEmpty(name),Video::getName,name);
+            queryWrapper.eq(Video::getOrgId,getOrgId(request));
+            queryWrapper.orderByDesc(Video::getWeight);
+            queryWrapper.orderByDesc(Video::getCreatedTime);
+
+            IPage<Video> result = iVideoService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("videoList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param videoDTO 实体对象
+     * @return
+     */
+    @ApiOperation(value = "admin-添加视频", notes = "admin-添加视频")
+    @RequestMapping(value="/admin/video",method= RequestMethod.POST)
+    public ResponseBean videoAdd(@RequestBody VideoDTO videoDTO, @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            Video video = new Video();
+            BeanUtils.copyProperties(videoDTO,video);
+            video.setCreatedTime(LocalDateTime.now());
+            video.setCreatedBy(getUserId(request));
+            video.setOrgId(getOrgId(request));
+            if (iVideoService.save(video)){
+                responseBean.addSuccess(video);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("videoAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ApiOperation(value = "admin-根据id删除视频", notes = "admin-根据id删除视频")
+    @ResponseBody
+    @RequestMapping(value="/admin/video/{id}", method= RequestMethod.DELETE)
+    public ResponseBean videoDelete(@PathVariable String id,@RequestHeader("authorization") String token){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iVideoService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("videoDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param videoDTO 实体对象
+     * @return
+     */
+    @ApiOperation(value = "admin-根据id修改视频", notes = "admin-根据id修改视频")
+    @RequestMapping(value="/admin/video/{id}",method= RequestMethod.PUT)
+    public ResponseBean videoUpdate(@PathVariable String id,
+                                        @RequestBody VideoDTO videoDTO,@RequestHeader("authorization") String token){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            Video video = new Video();
+            BeanUtils.copyProperties(videoDTO,video);
+            video.setVideoId(id);
+            if (iVideoService.updateById(video)){
+                responseBean.addSuccess(video);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("videoUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @ApiOperation(value = "admin-根据id查询详情", notes = "admin-根据id查询详情")
+    @RequestMapping(value="/admin/video/{id}",method= RequestMethod.GET)
+    public ResponseBean videoGet(@PathVariable String id,@RequestHeader("authorization") String token){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iVideoService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("videoDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @return
+     */
+    @ApiOperation(value = "admin-根据id发布或取消发布视频", notes = "admin-根据id发布或取消发布视频")
+    @RequestMapping(value="/admin/publish/{id}",method= RequestMethod.PUT)
+    public ResponseBean publishVideo(@PathVariable String id,@RequestHeader("authorization") String token){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            Video video = iVideoService.getById(id);
+            video.setIsPublish(!video.getIsPublish());
+            if (iVideoService.updateById(video)){
+                responseBean.addSuccess(video);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("videoUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+
+    /**
+     * 保存对象
+     * @param
+     * @return
+     */
+    @ApiOperation(value = "wx-查询视频详情", notes = "wx-查询视频详情")
+    @GetMapping(value="/wx/detail/{id}")
+    public ResponseBean searchHouseAdd(@PathVariable String id, @RequestHeader("authorization") String token, HttpServletRequest request){
+        Video video = iVideoService.getById(id);
+        if (null == video.getLookNum()){
+            video.setLookNum(1);
+        }else {
+            video.setLookNum(video.getLookNum() + 1);
+        }
+        iVideoService.updateById(video);
+        return ResponseBean.success(video);
+    }
+
+}

src/main/java/com/yunzhi/marketing/xlk/dto/BrandDTO.java

@@ -0,0 +1,45 @@
+package com.yunzhi.marketing.xlk.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 品牌开发商表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-05-13
+ */
+@Data
+public class BrandDTO implements Serializable {
+
+    /**
+     * 索引字母
+     */
+    @TableField("Index_letter")
+    private String indexLetter;
+
+    /**
+     * 品牌商名称
+     */
+    private String brandName;
+
+    /**
+     * 品牌商宣传图
+     */
+    private String brandImg;
+
+    /**
+     * 品牌商简介
+     */
+    private String brandRemark;
+}

src/main/java/com/yunzhi/marketing/xlk/dto/BuildingSpecialRoomDTO.java

@@ -0,0 +1,73 @@
+package com.yunzhi.marketing.xlk.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 特价房源表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-07-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("xlk_building_special_room")
+public class BuildingSpecialRoomDTO implements Serializable {
+
+    /**
+     * 房源名称
+     */
+    private String roomName;
+
+    /**
+     * 户型
+     */
+    private String unitType;
+
+    /**
+     * 面积
+     */
+    private String area;
+
+    /**
+     * 开始时间
+     */
+    private LocalDateTime startTime;
+
+    /**
+     * 结束时间
+     */
+    private LocalDateTime endTime;
+
+    /**
+     * 原始价格
+     */
+    private String originalPrice;
+
+    /**
+     * 现价格
+     */
+    private String currentPrice;
+
+    /**
+     * 节省价格
+     */
+    private String thriftPrice;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+
+}

src/main/java/com/yunzhi/marketing/xlk/dto/CurriculumDTO.java

@@ -0,0 +1,72 @@
+package com.yunzhi.marketing.xlk.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 课程表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-05-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("xlk_curriculum")
+public class CurriculumDTO implements java.io.Serializable {
+
+    /**
+     * 参与对象
+     */
+    private String roleId;
+
+    /**
+     * 主图
+     */
+    private String curriculumImg;
+
+    /**
+     * 标题
+     */
+    private String name;
+
+    /**
+     * 简介
+     */
+    private String remark;
+
+    /**
+     * 详情类型：0富文本或者1视频
+     */
+    private Integer type;
+
+    /**
+     * 视频地址
+     */
+    private String curriculumUrl;
+
+    /**
+     * 富文本内容
+     */
+    private String content;
+
+    /**
+     * 权重
+     */
+    @TableField("WEIGHT")
+    private Integer weight;
+
+    /**
+     * 是否发布
+     */
+    private Integer isPublish;
+}

src/main/java/com/yunzhi/marketing/xlk/dto/InstitutionDTO.java

@@ -0,0 +1,38 @@
+package com.yunzhi.marketing.xlk.dto;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 组织结构表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-06-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("xlk_institution")
+public class InstitutionDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 组织名称
+     */
+    private String institutionName;
+
+    /**
+     * 组织代码
+     */
+    @NotBlank(message = "组织代码不能为空")
+    private String institutionId;
+}

src/main/java/com/yunzhi/marketing/xlk/dto/SearchHouseDTO.java

@@ -0,0 +1,69 @@
+package com.yunzhi.marketing.xlk.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 帮我找房 
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-05-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("xlk_search_house")
+public class SearchHouseDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 意向区域
+     */
+    private String intentArea;
+
+    /**
+     * 总预算范围最小价格
+     */
+    private String minPrice;
+
+    /**
+     * 总预算范围最大价格
+     */
+    private String maxPrice;
+    /**
+     * 0待回访，1已回访，2无效
+     */
+    private String status;
+
+    /**
+     * 审核结果
+     */
+    private String auditRemark;
+
+    /**
+     * 帮我找房类型 1买房2租房3海外置业4增值服务
+     */
+    private Integer type;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 问卷json字符串
+     */
+    private String questionnaire;
+
+}

src/main/java/com/yunzhi/marketing/xlk/dto/SearchHouseReplayDTO.java

@@ -0,0 +1,37 @@
+package com.yunzhi.marketing.xlk.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 帮我找房 
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-06-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("xlk_search_house")
+public class SearchHouseReplayDTO implements Serializable {
+
+    /**
+     * 0待回访，1已回访，2无效
+     */
+    private String status;
+
+    /**
+     * 审核结果
+     */
+    private String auditRemark;
+}

src/main/java/com/yunzhi/marketing/xlk/dto/TrendDTO.java

@@ -0,0 +1,48 @@
+package com.yunzhi.marketing.xlk.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 项目动态表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-07-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("xlk_trend")
+public class TrendDTO implements Serializable {
+
+    /**
+     * 动态时间
+     */
+    private LocalDateTime trendTime;
+
+    /**
+     * 动态标题
+     */
+    private String trendTitle;
+
+    /**
+     * 动态内容
+     */
+    private String trendContent;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+
+}

src/main/java/com/yunzhi/marketing/xlk/dto/VideoDTO.java

@@ -0,0 +1,63 @@
+package com.yunzhi.marketing.xlk.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 视频表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-05-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("xlk_video")
+public class VideoDTO implements Serializable {
+    /**
+     * 所属城市
+     */
+    @TableField("CITY_ID")
+    private Integer cityId;
+
+    /**
+     * 所属楼盘
+     */
+    @TableField("BUILDING_ID")
+    private String buildingId;
+
+    /**
+     * 主图
+     */
+    private String videImg;
+
+    /**
+     * 视频标题
+     */
+    private String name;
+
+    /**
+     * 视频简介
+     */
+    private String remark;
+
+    /**
+     * 视频地址
+     */
+    private String videoUrl;
+
+    /**
+     * 权重
+     */
+    @TableField("WEIGHT")
+    private Integer weight;
+
+}

src/main/java/com/yunzhi/marketing/xlk/entity/Brand.java

@@ -0,0 +1,84 @@
+package com.yunzhi.marketing.xlk.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 品牌开发商表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-05-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("xlk_brand")
+public class Brand implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 品牌id
+     */
+    @TableId(type = IdType.UUID)
+    private String brandId;
+
+    /**
+     * 索引字母
+     */
+    @TableField("Index_letter")
+    private String indexLetter;
+
+    /**
+     * 品牌商名称
+     */
+    private String brandName;
+
+    /**
+     * 品牌商宣传图
+     */
+    private String brandImg;
+
+    /**
+     * 品牌商简介
+     */
+    private String brandRemark;
+
+    /**
+     * 创建人
+     */
+    @TableField("CREATED_BY")
+    private Integer createdBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField("CREATED_TIME")
+    private LocalDateTime createdTime;
+
+    /**
+     * 更新人
+     */
+    @TableField("UPDATED_BY")
+    private Integer updatedBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField("UPDATED_TIME")
+    private LocalDateTime updatedTime;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+}

src/main/java/com/yunzhi/marketing/xlk/entity/BuildingSpecialRoom.java

@@ -0,0 +1,91 @@
+package com.yunzhi.marketing.xlk.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 特价房源表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-07-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("xlk_building_special_room")
+public class BuildingSpecialRoom implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 特价房源id
+     */
+    @TableId(type = IdType.UUID)
+    private String specialRoomId;
+
+    /**
+     * 房源名称
+     */
+    private String roomName;
+
+    /**
+     * 户型
+     */
+    private String unitType;
+
+    /**
+     * 面积
+     */
+    private String area;
+
+    /**
+     * 开始时间
+     */
+    private LocalDateTime startTime;
+
+    /**
+     * 结束时间
+     */
+    private LocalDateTime endTime;
+
+    /**
+     * 原始价格
+     */
+    private String originalPrice;
+
+    /**
+     * 现价格
+     */
+    private String currentPrice;
+
+    /**
+     * 节省价格
+     */
+    private String thriftPrice;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+
+}

src/main/java/com/yunzhi/marketing/xlk/entity/Curriculum.java

@@ -0,0 +1,117 @@
+package com.yunzhi.marketing.xlk.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 课程表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-05-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("xlk_curriculum")
+public class Curriculum implements java.io.Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.UUID)
+    private String curriculumId;
+
+    /**
+     * 创建人
+     */
+    @TableField("CREATED_BY")
+    private Integer createdBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField("CREATED_TIME")
+    private LocalDateTime createdTime;
+
+    /**
+     * 更新人
+     */
+    @TableField("UPDATED_BY")
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField("UPDATED_TIME")
+    private LocalDateTime updatedTime;
+
+    /**
+     * 公司id
+     */
+    @TableField("ORG_ID")
+    private Integer orgId;
+
+    /**
+     * 参与对象
+     */
+    private String roleId;
+
+    /**
+     * 主图
+     */
+    private String curriculumImg;
+
+    /**
+     * 标题
+     */
+    private String name;
+
+    /**
+     * 简介
+     */
+    private String remark;
+
+    /**
+     * 详情类型：0富文本或者1视频
+     */
+    private Integer type;
+
+    /**
+     * 视频地址
+     */
+    private String curriculumUrl;
+
+    /**
+     * 富文本内容
+     */
+    private String content;
+
+    /**
+     * 权重
+     */
+    @TableField("WEIGHT")
+    private Integer weight;
+
+    /**
+     * 阅读人数
+     */
+    private Integer lookNum;
+
+    /**
+     * 是否发布
+     */
+    private Integer isPublish;
+
+
+}

src/main/java/com/yunzhi/marketing/xlk/entity/HouseProperty.java

@@ -0,0 +1,42 @@
+package com.yunzhi.marketing.xlk.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 帮我找房基本属性表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-06-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("xlk_house_property")
+public class HouseProperty implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 属性
+     */
+    private String kind;
+
+    /**
+     * 属性值
+     */
+    private String propertyValue;
+
+    /**
+     * 属性名称
+     */
+    private String propertyName;
+
+
+}

src/main/java/com/yunzhi/marketing/xlk/entity/Institution.java

@@ -0,0 +1,62 @@
+package com.yunzhi.marketing.xlk.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 组织结构表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-06-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("xlk_institution")
+public class Institution implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 组织结构id
+     */
+    @TableId(type = IdType.UUID)
+    private String institutionId;
+
+    /**
+     * 组织代码
+     */
+    private String institutionCode;
+
+    /**
+     * 组织名称
+     */
+    private String institutionName;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 1是集团，2是区域子公司 3，是城市子公司
+     */
+    private Integer type;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+
+}

src/main/java/com/yunzhi/marketing/xlk/entity/SearchHouse.java

@@ -0,0 +1,100 @@
+package com.yunzhi.marketing.xlk.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 帮我找房 
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-06-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("xlk_search_house")
+public class SearchHouse implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.UUID)
+    private String id;
+
+    /**
+     * 创建人小程序人员
+     */
+    private String personId;
+
+    /**
+     * 创建时间
+     */
+    @TableField("CREATED_TIME")
+    private LocalDateTime createdTime;
+
+    /**
+     * 更新人
+     */
+    @TableField("UPDATED_BY")
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField("UPDATED_TIME")
+    private LocalDateTime updatedTime;
+
+    /**
+     * 公司id
+     */
+    @TableField("ORG_ID")
+    private Integer orgId;
+
+    /**
+     * 意向区域
+     */
+    private String intentArea;
+
+    /**
+     * 总预算范围最小价格
+     */
+    private String minPrice;
+
+    /**
+     * 总预算范围最大价格
+     */
+    private String maxPrice;
+
+
+    /**
+     * 0待回访，1已回访，2无效
+     */
+    private String status;
+
+    /**
+     * 审核结果
+     */
+    private String auditRemark;
+
+    /**
+     * 帮我找房类型 1买房2租房3海外置业4增值服务
+     */
+    private Integer type;
+
+    /**
+     * 备注
+     */
+    private String remark;
+}

src/main/java/com/yunzhi/marketing/xlk/entity/TaPolicyType.java

@@ -0,0 +1,59 @@
+package com.yunzhi.marketing.xlk.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 购房政策类型表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-06-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaPolicyType implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 购房政策类型id
+     */
+    @TableId(type = IdType.UUID)
+    private String policyTypeId;
+
+    /**
+     * 购房政策类型名称
+     */
+    private String policyTypeName;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /** 父id */
+    private String parentPolicyTypeId ;
+    /** 徽章 */
+    private String badge ;
+    /** 图标 */
+    private String icon ;
+    /** 排序 */
+    private Integer sort ;
+    /** 颜色 */
+    private String color ;
+
+}

src/main/java/com/yunzhi/marketing/xlk/entity/Trend.java

@@ -0,0 +1,66 @@
+package com.yunzhi.marketing.xlk.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 项目动态表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-07-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("xlk_trend")
+public class Trend implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 动态id
+     */
+    @TableId(type = IdType.UUID)
+    private String trendId;
+
+    /**
+     * 动态时间
+     */
+    private LocalDateTime trendTime;
+
+    /**
+     * 动态标题
+     */
+    private String trendTitle;
+
+    /**
+     * 动态内容
+     */
+    private String trendContent;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+
+}

src/main/java/com/yunzhi/marketing/xlk/entity/Video.java

@@ -0,0 +1,115 @@
+package com.yunzhi.marketing.xlk.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.models.auth.In;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 视频表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-05-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("xlk_video")
+public class Video implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.UUID)
+    private String videoId;
+
+    /**
+     * 创建人
+     */
+    @TableField("CREATED_BY")
+    private Integer createdBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField("CREATED_TIME")
+    private LocalDateTime createdTime;
+
+    /**
+     * 更新人
+     */
+    @TableField("UPDATED_BY")
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField("UPDATED_TIME")
+    private LocalDateTime updatedTime;
+
+    /**
+     * 公司id
+     */
+    @TableField("ORG_ID")
+    private Integer orgId;
+
+    /**
+     * 所属城市
+     */
+    @TableField("CITY_ID")
+    private Integer cityId;
+
+    /**
+     * 所属楼盘
+     */
+    @TableField("BUILDING_ID")
+    private String buildingId;
+
+    /**
+     * 主图
+     */
+    private String videImg;
+
+    /**
+     * 视频标题
+     */
+    private String name;
+
+    /**
+     * 视频简介
+     */
+    private String remark;
+
+    /**
+     * 视频地址
+     */
+    private String videoUrl;
+
+    /**
+     * 权重
+     */
+    @TableField("WEIGHT")
+    private Integer weight;
+
+    /**
+     * 阅读人数
+     */
+    private Integer lookNum;
+
+    /**
+     * 是否发布
+     */
+    private Boolean isPublish;
+
+}

src/main/java/com/yunzhi/marketing/xlk/mapper/BrandMapper.java

@@ -0,0 +1,18 @@
+package com.yunzhi.marketing.xlk.mapper;
+
+import com.yunzhi.marketing.xlk.entity.Brand;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 品牌开发商表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-05-13
+ */
+@Mapper
+public interface BrandMapper extends BaseMapper<Brand> {
+
+}

src/main/java/com/yunzhi/marketing/xlk/mapper/BuildingSpecialRoomMapper.java

@@ -0,0 +1,18 @@
+package com.yunzhi.marketing.xlk.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yunzhi.marketing.xlk.entity.BuildingSpecialRoom;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 特价房源表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-07-12
+ */
+@Mapper
+public interface BuildingSpecialRoomMapper extends BaseMapper<BuildingSpecialRoom> {
+
+}

src/main/java/com/yunzhi/marketing/xlk/mapper/CurriculumMapper.java

@@ -0,0 +1,21 @@
+package com.yunzhi.marketing.xlk.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.marketing.xlk.entity.Curriculum;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 课程表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-05-18
+ */
+@Mapper
+public interface CurriculumMapper extends BaseMapper<Curriculum> {
+
+    IPage<Curriculum> selectMySaveList(IPage<Curriculum> pg,@Param("personId") String personId);
+}

src/main/java/com/yunzhi/marketing/xlk/mapper/HousePropertyMapper.java

@@ -0,0 +1,18 @@
+package com.yunzhi.marketing.xlk.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yunzhi.marketing.xlk.entity.HouseProperty;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 帮我找房基本属性表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-06-15
+ */
+@Mapper
+public interface HousePropertyMapper extends BaseMapper<HouseProperty> {
+
+}

src/main/java/com/yunzhi/marketing/xlk/mapper/InstitutionMapper.java

@@ -0,0 +1,18 @@
+package com.yunzhi.marketing.xlk.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yunzhi.marketing.xlk.entity.Institution;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 组织结构表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-06-22
+ */
+@Mapper
+public interface InstitutionMapper extends BaseMapper<Institution> {
+
+}

src/main/java/com/yunzhi/marketing/xlk/mapper/SearchHouseMapper.java

@@ -0,0 +1,24 @@
+package com.yunzhi.marketing.xlk.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.marketing.xlk.entity.SearchHouse;
+import com.yunzhi.marketing.xlk.vo.SearchHouseVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 帮我找房  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-05-19
+ */
+@Mapper
+public interface SearchHouseMapper extends BaseMapper<SearchHouse> {
+
+    IPage<SearchHouseVO> selectSearchHouseList(IPage<SearchHouseVO> pg,@Param("params") SearchHouse searchHouse);
+
+    SearchHouseVO selectSearchHouseDetail(String id);
+}

src/main/java/com/yunzhi/marketing/xlk/mapper/TaPolicyTypeMapper.java

@@ -0,0 +1,18 @@
+package com.yunzhi.marketing.xlk.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yunzhi.marketing.xlk.entity.TaPolicyType;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 购房政策类型表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-06-16
+ */
+@Mapper
+public interface TaPolicyTypeMapper extends BaseMapper<TaPolicyType> {
+
+}

src/main/java/com/yunzhi/marketing/xlk/mapper/TrendMapper.java

@@ -0,0 +1,18 @@
+package com.yunzhi.marketing.xlk.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yunzhi.marketing.xlk.entity.Trend;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 项目动态表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-07-12
+ */
+@Mapper
+public interface TrendMapper extends BaseMapper<Trend> {
+
+}

src/main/java/com/yunzhi/marketing/xlk/mapper/VideoMapper.java

@@ -0,0 +1,18 @@
+package com.yunzhi.marketing.xlk.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yunzhi.marketing.xlk.entity.Video;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 视频表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-05-18
+ */
+@Mapper
+public interface VideoMapper extends BaseMapper<Video> {
+
+}

src/main/java/com/yunzhi/marketing/xlk/service/IBrandService.java

@@ -0,0 +1,16 @@
+package com.yunzhi.marketing.xlk.service;
+
+import com.yunzhi.marketing.xlk.entity.Brand;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 品牌开发商表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-05-13
+ */
+public interface IBrandService extends IService<Brand> {
+
+}

src/main/java/com/yunzhi/marketing/xlk/service/IBuildingSpecialRoomService.java

@@ -0,0 +1,16 @@
+package com.yunzhi.marketing.xlk.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yunzhi.marketing.xlk.entity.BuildingSpecialRoom;
+
+/**
+ * <p>
+ * 特价房源表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-07-12
+ */
+public interface IBuildingSpecialRoomService extends IService<BuildingSpecialRoom> {
+
+}

src/main/java/com/yunzhi/marketing/xlk/service/ICurriculumService.java

@@ -0,0 +1,27 @@
+package com.yunzhi.marketing.xlk.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.marketing.entity.TaPerson;
+import com.yunzhi.marketing.xlk.entity.Curriculum;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 课程表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-05-18
+ */
+public interface ICurriculumService extends IService<Curriculum> {
+
+    /**
+     * 获取我的收藏列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param person
+     * @return
+     */
+    IPage<Curriculum> selectMySaveList(Integer pageNum, Integer pageSize, TaPerson person);
+}

src/main/java/com/yunzhi/marketing/xlk/service/IHousePropertyService.java

@@ -0,0 +1,16 @@
+package com.yunzhi.marketing.xlk.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yunzhi.marketing.xlk.entity.HouseProperty;
+
+/**
+ * <p>
+ * 帮我找房基本属性表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-06-15
+ */
+public interface IHousePropertyService extends IService<HouseProperty> {
+
+}

src/main/java/com/yunzhi/marketing/xlk/service/IInstitutionService.java

@@ -0,0 +1,37 @@
+package com.yunzhi.marketing.xlk.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.xlk.entity.Institution;
+
+/**
+ * <p>
+ * 组织结构表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-06-22
+ */
+public interface IInstitutionService extends IService<Institution> {
+
+    /**
+     * 添加组织机构
+     * @param institution
+     * @return
+     */
+    ResponseBean saveInstitution(Institution institution);
+
+    /**
+     * 删除组织机构
+     * @param id
+     * @return
+     */
+    ResponseBean deleteByinstitutionCode(String id);
+
+    /**
+     * 修改组织机构
+     * @param institution
+     * @return
+     */
+    ResponseBean updateInstitution(Institution institution);
+}

src/main/java/com/yunzhi/marketing/xlk/service/ISearchHouseService.java

@@ -0,0 +1,29 @@
+package com.yunzhi.marketing.xlk.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.xlk.entity.SearchHouse;
+import com.yunzhi.marketing.xlk.vo.SearchHouseVO;
+
+/**
+ * <p>
+ * 帮我找房  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-05-19
+ */
+public interface ISearchHouseService extends IService<SearchHouse> {
+
+    /**
+     * 查询我的找房需求列表
+     *
+     * @param pg
+     * @param searchHouse
+     * @return
+     */
+    ResponseBean selectSearchHouseList(IPage<SearchHouseVO> pg, SearchHouse searchHouse);
+
+    SearchHouseVO selectSearchHouseDetail(String id);
+}

src/main/java/com/yunzhi/marketing/xlk/service/ITaPolicyTypeService.java

@@ -0,0 +1,16 @@
+package com.yunzhi.marketing.xlk.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yunzhi.marketing.xlk.entity.TaPolicyType;
+
+/**
+ * <p>
+ * 购房政策类型表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-06-16
+ */
+public interface ITaPolicyTypeService extends IService<TaPolicyType> {
+
+}

src/main/java/com/yunzhi/marketing/xlk/service/ITrendService.java

@@ -0,0 +1,16 @@
+package com.yunzhi.marketing.xlk.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yunzhi.marketing.xlk.entity.Trend;
+
+/**
+ * <p>
+ * 项目动态表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-07-12
+ */
+public interface ITrendService extends IService<Trend> {
+
+}

src/main/java/com/yunzhi/marketing/xlk/service/IVideoService.java

@@ -0,0 +1,16 @@
+package com.yunzhi.marketing.xlk.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yunzhi.marketing.xlk.entity.Video;
+
+/**
+ * <p>
+ * 视频表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-05-18
+ */
+public interface IVideoService extends IService<Video> {
+
+}

src/main/java/com/yunzhi/marketing/xlk/service/impl/BrandServiceImpl.java

@@ -0,0 +1,20 @@
+package com.yunzhi.marketing.xlk.service.impl;
+
+import com.yunzhi.marketing.xlk.entity.Brand;
+import com.yunzhi.marketing.xlk.mapper.BrandMapper;
+import com.yunzhi.marketing.xlk.service.IBrandService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 品牌开发商表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-05-13
+ */
+@Service
+public class BrandServiceImpl extends ServiceImpl<BrandMapper, Brand> implements IBrandService {
+
+}

src/main/java/com/yunzhi/marketing/xlk/service/impl/BuildingSpecialRoomServiceImpl.java

@@ -0,0 +1,20 @@
+package com.yunzhi.marketing.xlk.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yunzhi.marketing.xlk.entity.BuildingSpecialRoom;
+import com.yunzhi.marketing.xlk.mapper.BuildingSpecialRoomMapper;
+import com.yunzhi.marketing.xlk.service.IBuildingSpecialRoomService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 特价房源表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-07-12
+ */
+@Service
+public class BuildingSpecialRoomServiceImpl extends ServiceImpl<BuildingSpecialRoomMapper, BuildingSpecialRoom> implements IBuildingSpecialRoomService {
+
+}