1、删除广告、iot、视频云相关服务

sptg-device/sptg-device-api/src/main/java/com/sptg/device/api/feigns/DeviceFeign.java

@@ -411,9 +411,9 @@ public interface DeviceFeign {
     /**
      * 删除设备广告
      * @param task 下发任务
-     */
+     *//*
     @PostMapping(value = "/device/deleteAdvert")
-    void deleteAdvert(@RequestBody DispatchTask task);
+    void deleteAdvert(@RequestBody DispatchTask task);*/
 
     /**
      * 获取住户可访问的设备列表

sptg-device/sptg-device-api/src/main/java/com/sptg/device/api/feigns/fallback/DeviceFeignFallbackFactory.java

@@ -296,10 +296,10 @@ public class DeviceFeignFallbackFactory implements FallbackFactory<DeviceFeign>
                 log.error(cause.getMessage());
             }
 
-            @Override
+            /*@Override
             public void deleteAdvert(DispatchTask task) {
                 log.error(cause.getMessage());
-            }
+            }*/
 
             @Override
             public List<Device> getListByEstateUser(Long xqId, Long unitId) {

sptg-device/sptg-device-biz/src/main/java/com/sptg/device/biz/DeviceApplication.java

@@ -2,7 +2,6 @@ package com.sptg.device.biz;
 
 import com.codingapi.txlcn.tc.config.EnableDistributedTransaction;
 import com.github.tobato.fastdfs.FdfsClientConfig;
-import com.sptg.ad.api.stream.AdvertTaskCallbackProduceInterface;
 import com.sptg.device.biz.stream.DeviceAddProduceInterface;
 import com.sptg.estate.api.stream.NoticeTaskCallbackProduceInterface;
 import lombok.extern.slf4j.Slf4j;
@@ -34,21 +33,18 @@ import org.springframework.scheduling.annotation.EnableScheduling;
         "com.sptg.permissions.api.feigns",
         "com.sptg.statistics.api.feigns",
         "com.sptg.estate.api.feigns",
-        "com.sptg.third.api.feigns"
 })
 @ComponentScan(basePackages = {
         "com.sptg.device.biz",
         "com.sptg.permissions.api.feigns",
         "com.sptg.statistics.api.feigns",
         "com.sptg.estate.api.feigns",
-        "com.sptg.third.api.feigns"
 })
 @EnableDistributedTransaction
 @Import(FdfsClientConfig.class)
 @EnableMBeanExport(registration = RegistrationPolicy.IGNORE_EXISTING)
 @EnableBinding(value = {
         DeviceAddProduceInterface.class,
-        AdvertTaskCallbackProduceInterface.class,
         NoticeTaskCallbackProduceInterface.class
 })
 public class DeviceApplication {

sptg-device/sptg-device-biz/src/main/java/com/sptg/device/biz/controller/DeviceController.java

@@ -9,7 +9,6 @@ import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.toolkit.IdWorker;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.sptg.ad.api.entity.DeviceAdvert;
 import com.sptg.common.core.beans.PageBean;
 import com.sptg.common.core.beans.ResultBean;
 import com.sptg.common.core.beans.ResultEnum;
@@ -1498,7 +1497,7 @@ public class DeviceController implements DeviceFeign {
         this.msgPublishService.batchPushInstruct(task.getData(),deviceList,Instruct.add_video_call_account,map);
     }
 
-    @Override
+    /*@Override
     @PostMapping(value = "/device/deleteAdvert")
     public void deleteAdvert(@RequestBody DispatchTask task) {
         Assert.notNull(task.getSerialNumber(),"设备序列号不能为空");
@@ -1520,7 +1519,7 @@ public class DeviceController implements DeviceFeign {
             logMap.put("endTime",null);
         }
         this.msgPublishService.asyncPublish(task.getData(),device,Instruct.delete_advert,logMap);
-    }
+    }*/
 
     /**
      * 功能描述: 指令下发

sptg-device/sptg-device-biz/src/main/java/com/sptg/device/biz/receiver/DeviceDeleteReceiver.java

@@ -2,7 +2,6 @@ package com.sptg.device.biz.receiver;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.sptg.common.core.enums.DeviceInstruct;
 import com.sptg.common.core.enums.Instruct;
 import com.sptg.device.api.constant.DeviceConstants;
 import com.sptg.device.api.entity.Device;
@@ -11,9 +10,6 @@ import com.sptg.device.api.entity.MqConf;
 import com.sptg.device.api.stream.DeviceDeleteProduceInterface;
 import com.sptg.device.api.stream.DeviceDeleteReceiverInterface;
 import com.sptg.device.biz.service.*;
-import com.sptg.statistics.api.entity.SysOperationLog;
-import com.sptg.third.api.entity.qinlin.QLinDevice;
-import com.sptg.third.api.feigns.qinlin.QLinFeign;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.stream.annotation.EnableBinding;

sptg-device/sptg-device-biz/src/main/java/com/sptg/device/biz/service/impl/MsgPublishServiceImpl.java

@@ -1,24 +1,20 @@
 package com.sptg.device.biz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.alibaba.druid.support.json.JSONUtils;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.toolkit.IdWorker;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.rabbitmq.client.Channel;
 import com.rabbitmq.client.Connection;
-import com.sptg.ad.api.stream.AdvertTaskCallbackProduceInterface;
 import com.sptg.common.core.entity.PublishTask;
 import com.sptg.common.core.entity.PublishTaskResult;
 import com.sptg.common.core.enums.Instruct;
 import com.sptg.common.core.enums.InstructDH;
 import com.sptg.common.core.util.JsonUtils;
 import com.sptg.device.api.constant.DeviceConstants;
-import com.sptg.device.api.dto.BatchFaceDto;
 import com.sptg.device.api.entity.Device;
 import com.sptg.device.api.entity.InstructPublishLog;
 import com.sptg.device.api.entity.MqConf;
@@ -26,15 +22,10 @@ import com.sptg.device.api.util.RabbitMqConnectionUtil;
 import com.sptg.device.biz.service.*;
 import com.sptg.estate.api.dto.UserInfoDto;
 import com.sptg.estate.api.stream.NoticeTaskCallbackProduceInterface;
-import com.sptg.third.api.entity.qinlin.QLinUser;
-import com.sptg.third.api.entity.qinlin.QLinUserDevice;
-import com.sptg.third.api.feigns.qinlin.QLinFeign;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.util.Asserts;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.BeanWrapper;
 import org.springframework.integration.support.MessageBuilder;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
@@ -62,11 +53,9 @@ public class MsgPublishServiceImpl implements MsgPublishService {
 
     private final DeviceServiceInterface deviceServiceInterface;
     private final MqConfServiceInterface mqConfServiceInterface;
-    private final AdvertTaskCallbackProduceInterface advertTaskCallbackProduceInterface;
     private final NoticeTaskCallbackProduceInterface noticeTaskCallbackProduceInterface;
     private final TimeStrategyTaskDeviceDetailsServiceInterface timeStrategyTaskDeviceDetailsServiceInterface;
     private final InstructPublishLogService instructPublishLogService;
-    private final QLinFeign qLinFeign;
 
     @Override
     @SneakyThrows
@@ -208,7 +197,7 @@ public class MsgPublishServiceImpl implements MsgPublishService {
                     switch (task.getTaskType()){
                         //  1：广告，
                         case 1:
-                            this.advertTaskCallbackProduceInterface.output().send(MessageBuilder.withPayload(taskResult).build());
+//                            this.advertTaskCallbackProduceInterface.output().send(MessageBuilder.withPayload(taskResult).build());
                             break;
                         //  2：策略
                         case 2:
@@ -242,12 +231,12 @@ public class MsgPublishServiceImpl implements MsgPublishService {
     @Async
     @Override
     public void batchPushInstruct(Object obj, List<Device> deviceList, Instruct instruct, Map<String,String> map) {
-        List<Device> qinlinList = deviceList.stream().filter(device -> device.getDeviceFactory().equals("qinlin")).collect(Collectors.toList());
+       /* List<Device> qinlinList = deviceList.stream().filter(device -> device.getDeviceFactory().equals("qinlin")).collect(Collectors.toList());
         List<Device> otherList = deviceList.stream().filter(device -> !(device.getDeviceFactory().equals("qinlin"))).collect(Collectors.toList());
         if(qinlinList != null && qinlinList.size() > 0){
             this.qlPushInstruct(obj, qinlinList, instruct);
-        }
-        otherList.forEach(device -> {
+        }*/
+        deviceList.forEach(device -> {
             try {
                 if(device.getDeviceFactory().equals(DeviceConstants.DEVICE_FACTORY_ZONGHENG)){
                     String isAdd = map.get("isAdd");
@@ -424,7 +413,7 @@ public class MsgPublishServiceImpl implements MsgPublishService {
         }
     }
 
-    private void qlPushInstruct(Object obj, List<Device> deviceList, Instruct instruct) {
+    /*private void qlPushInstruct(Object obj, List<Device> deviceList, Instruct instruct) {
         String code = instruct.getCode();
         switch (code){
             case "add_user_face":
@@ -478,5 +467,5 @@ public class MsgPublishServiceImpl implements MsgPublishService {
 //        publishLog = new InstructPublishLog();
 //        id,device, instruct, data, map
 //        this.instructPublishLogService.insert(publishLog);
-    }
+    }*/
 }

sptg-gateway/sptg-device-gateway/src/main/java/com/sptg/gateway/DeviceGatewayApplication.java

@@ -12,8 +12,6 @@ import org.springframework.context.annotation.Import;
 import org.springframework.jmx.support.RegistrationPolicy;
 
 import com.github.tobato.fastdfs.FdfsClientConfig;
-import com.sptg.ad.api.stream.SyncFaceAdvertDataProduceInterface;
-import com.sptg.ad.api.stream.SyncLeisureAdvertDataProduceInterface;
 import com.sptg.common.core.locale.I18Config;
 import com.sptg.estate.api.stream.SyncNoticeDataDeviceProduceInterface;
 
@@ -30,11 +28,7 @@ import com.sptg.estate.api.stream.SyncNoticeDataDeviceProduceInterface;
         "com.sptg.device.api.feigns",
         "com.sptg.estate.api.feigns",
         "com.sptg.statistics.api.feigns",
-        "com.sptg.ad.api.feigns",
         "com.sptg.permissions.api.feigns",
-        "com.sptg.iot.api.feigns",
-        "com.sptg.third.api.feigns",
-        "com.sptg.video.cloud.api.feigns"
 })
 @EnableEurekaClient
 @ComponentScan(value = {
@@ -42,17 +36,11 @@ import com.sptg.estate.api.stream.SyncNoticeDataDeviceProduceInterface;
         "com.sptg.device.api.feigns",
         "com.sptg.estate.api.feigns",
         "com.sptg.statistics.api.feigns",
-        "com.sptg.ad.api.feigns",
         "com.sptg.permissions.api.feigns",
-        "com.sptg.iot.api.feigns",
-        "com.sptg.third.api.feigns",
-        "com.sptg.video.cloud.api.feigns"
 })
 @SpringCloudApplication
 @Import({FdfsClientConfig.class,I18Config.class})
 @EnableBinding(value = {
-        SyncFaceAdvertDataProduceInterface.class,
-        SyncLeisureAdvertDataProduceInterface.class,
         SyncNoticeDataDeviceProduceInterface.class
 })
 @EnableMBeanExport(registration = RegistrationPolicy.IGNORE_EXISTING)

sptg-gateway/sptg-housekeeper-gateway/src/main/java/com/sptg/gateway/HouseGatewayApplication.java

@@ -32,24 +32,14 @@ import com.sptg.device.api.stream.DeviceUpdateProduceInterface;
         "com.sptg.device.api.feigns",
         "com.sptg.permissions.api.feigns",
         "com.sptg.estate.api.feigns",
-        "com.sptg.ad.api.feigns",
         "com.sptg.statistics.api.feigns",
-        "com.sptg.pay.api.feigns",
-        "com.sptg.video.cloud.api.feigns",
-        "com.sptg.iot.api.feigns",
-        "com.sptg.third.api.feigns"
 })
 @ComponentScan(value = {
         "com.sptg.gateway",
         "com.sptg.permissions.api.feigns",
         "com.sptg.estate.api.feigns",
-        "com.sptg.ad.api.feigns",
         "com.sptg.device.api.feigns",
         "com.sptg.statistics.api.feigns",
-        "com.sptg.pay.api.feigns",
-        "com.sptg.video.cloud.api.feigns",
-        "com.sptg.iot.api.feigns",
-        "com.sptg.third.api.feigns"
 })
 @Import({FdfsClientConfig.class,I18Config.class})
 @EnableEurekaClient

sptg-gateway/sptg-housekeeper-gateway/src/main/java/com/sptg/gateway/controller/HomeController.java

@@ -7,7 +7,6 @@ import java.util.*;
 import javax.servlet.http.HttpServletRequest;
 
 import com.sptg.estate.api.entity.ApplyUser;
-import com.sptg.estate.api.entity.Residential;
 import com.sptg.permissions.api.dto.OrgDto;
 import org.apache.commons.lang.StringUtils;
 import org.apache.ibatis.annotations.Param;
@@ -18,8 +17,6 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
 import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.ad.api.dto.AdTypeDto;
-import com.sptg.ad.api.feigns.AdTypeFeign;
 import com.sptg.common.core.beans.ResultBean;
 import com.sptg.common.core.beans.ResultEnum;
 import com.sptg.common.core.constant.OperationConstant;
@@ -51,15 +48,11 @@ import com.sptg.permissions.api.feigns.DeviceAuthorizeFeign;
 import com.sptg.permissions.api.feigns.OrgFeign;
 import com.sptg.permissions.api.feigns.RoleFeign;
 import com.sptg.statistics.api.dto.AppMemberLoginRecordsDto;
-import com.sptg.statistics.api.dto.StatisticsAdPushDto;
-import com.sptg.statistics.api.dto.StatisticsAdWatchDto;
 import com.sptg.statistics.api.dto.SysDeviceLogDto;
 import com.sptg.statistics.api.dto.SysOperationLogDto;
 import com.sptg.statistics.api.entity.StatisticsCount;
 import com.sptg.statistics.api.entity.SysOperationLog;
 import com.sptg.statistics.api.feigns.AppMemberLoginRecordsFeign;
-import com.sptg.statistics.api.feigns.StatisticsAdPushFeign;
-import com.sptg.statistics.api.feigns.StatisticsAdWatchFeign;
 import com.sptg.statistics.api.feigns.StatisticsCountFeign;
 import com.sptg.statistics.api.feigns.SysDeviceLogFeign;
 import com.sptg.statistics.api.feigns.SysOperationLogFeign;
@@ -88,11 +81,8 @@ public class HomeController {
     private final ResidentialFeign residentialFeign;
     private final UnitFeign unitFeign;
     private final UserFeign userFeign;
-    private final StatisticsAdPushFeign statisticsAdPushFeign;
     private final MemberFeign memberFeign;
     private final SysDeviceLogFeign sysDeviceLogFeign;
-    private final StatisticsAdWatchFeign statisticsAdWatchFeign;
-    private final AdTypeFeign adTypeFeign;
     private final StatisticsCountFeign statisticsCountFeign;
     private final GuestAuthorizeFeign guestAuthorizeFeign;
     private final AccessRecordsFeign accessRecordsFeign;
@@ -240,14 +230,14 @@ public class HomeController {
      *
      *
      */
-    @GetMapping("/getAdPushAccount")
+    /*@GetMapping("/getAdPushAccount")
     @Security(format = DataFormatEnum.JSON)
     public ResultBean<Map<String,Long>> getAdPushAccount(HttpServletRequest request){
         Account onLineUser = (Account)request.getAttribute("onLineUser");
         StatisticsAdPushDto statisticsAdPushDto = new StatisticsAdPushDto();
         statisticsAdPushDto.setOrgPosition(onLineUser.getOrgPosition());
         return this.statisticsAdPushFeign.getAdPushAccount(statisticsAdPushDto);
-    }
+    }*/
 
     /**
      * 功能描述:会员总数量/本月新增数量（小程序及APP）
@@ -293,13 +283,13 @@ public class HomeController {
      *
      *
      */
-    @PostMapping("/getAdWatchCountList")
+    /*@PostMapping("/getAdWatchCountList")
     @Security(format = DataFormatEnum.JSON)
     public ResultBean<List<Map<String,Object>>> getAdWatchCountList(HttpServletRequest request, StatisticsAdWatchDto statisticsAdWatchDto){
         Account onLineUser = (Account)request.getAttribute("onLineUser");
         statisticsAdWatchDto.setOrgPosition(onLineUser.getOrgPosition());
         return this.statisticsAdWatchFeign.getAdWatchCountList(statisticsAdWatchDto);
-    }
+    }*/
 
     /**
      * 功能描述:设备故障省份排名
@@ -326,7 +316,7 @@ public class HomeController {
      *
      *
      */
-    @PostMapping("/adWatchRankForArea")
+    /*@PostMapping("/adWatchRankForArea")
     @Security(format = DataFormatEnum.JSON)
     public ResultBean<List<Map<String, Object>>> adWatchRankForArea(StatisticsAdWatchDto dto,HttpServletRequest request){
         Account onLineUser = (Account)request.getAttribute("onLineUser");
@@ -337,7 +327,7 @@ public class HomeController {
         dto.setPage(page);
         List<Map<String, Object>> maps = statisticsAdWatchFeign.statisticsAdWatchRankForArea(dto);
         return new ResultBean<List<Map<String, Object>>>(ResultEnum.SUCCESS,maps);
-    }
+    }*/
 
     /**
      * 功能描述:用户活跃
@@ -356,7 +346,7 @@ public class HomeController {
 
     /**
      * 功能描述:小区统计
-     * @param ResidentialDto
+//     * @param ResidentialDto
      * @return ResultBean<List<Residential>>
      *
      *
@@ -454,7 +444,7 @@ public class HomeController {
      *
      *
      */
-    @PostMapping("/adWatchProportionForAdType")
+   /* @PostMapping("/adWatchProportionForAdType")
     public   ResultBean<Map<String, Object>> adWatchProportionForAdType(StatisticsAdWatchDto dto,HttpServletRequest request) {
         Map<String, Object> resultMap=new HashMap<>(OperationConstant.TWO);
         //登录用户
@@ -494,7 +484,7 @@ public class HomeController {
         }
         resultMap.put("adWatchCountList",maps);
         return  new ResultBean<>(ResultEnum.SUCCESS,resultMap);
-    }
+    }*/
 
     /**
      * 功能描述:会员占比（根据会员类型）
@@ -516,7 +506,7 @@ public class HomeController {
      *
      *
      */
-    @PostMapping("/getAdHomeDataCount")
+    /*@PostMapping("/getAdHomeDataCount")
     public ResultBean<Map<String,Object>> getAdHomeDataCount(HttpServletRequest request){
         Map<String,Object> resultMap=new HashMap<String,Object>(6);
         Account onLineUser = (Account)request.getAttribute("onLineUser");
@@ -560,7 +550,7 @@ public class HomeController {
         resultMap.put("adWatchCount",adWatchCount);
         resultMap.put("currentMonthAdWatchCount",currentMonthAdWatchCount);
         return new ResultBean<>(ResultEnum.SUCCESS,resultMap);
-    }
+    }*/
 
     /**
      * 功能描述:观看排行
@@ -570,7 +560,7 @@ public class HomeController {
      *
      *
      */
-    @PostMapping("/adWatchRankForAdType")
+    /*@PostMapping("/adWatchRankForAdType")
     public  ResultBean<List<Map<String, Object>>> adWatchRankForAdType(StatisticsAdWatchDto dto,HttpServletRequest request) {
         //登录用户
         Account onLineUser = (Account)request.getAttribute("onLineUser");
@@ -583,7 +573,7 @@ public class HomeController {
         //统计观看类别
         List<Map<String, Object>> maps = statisticsAdWatchFeign.statisticsAdWatchRankForAdType(dto);
         return  new ResultBean<List<Map<String, Object>>>(ResultEnum.SUCCESS,maps);
-    }
+    }*/
 
     /**
      * 功能描述:访客数量

sptg-gateway/sptg-housekeeper-gateway/src/main/java/com/sptg/gateway/controller/common/FileManageController.java

@@ -9,38 +9,28 @@ import com.sptg.common.core.constant.OperationConstant;
 import com.sptg.common.core.util.Base64DecodeMultipartFileUtils;
 import com.sptg.common.core.util.JsonUtils;
 import com.sptg.estate.api.dto.ThirdUserDto;
-import com.sptg.estate.api.dto.UserDto;
 import com.sptg.estate.api.entity.ThirdUser;
-import com.sptg.estate.api.entity.User;
 import com.sptg.estate.api.feigns.ThirdUserFeign;
 import com.sptg.estate.api.feigns.UserFeign;
-import com.sptg.permissions.api.entity.Conf;
 import com.sptg.permissions.api.feigns.ConfFeign;
-import it.sauronsoftware.jave.Encoder;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.io.FilenameUtils;
-import org.apache.http.entity.ContentType;
 import org.apache.poi.util.IOUtils;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.imageio.ImageIO;
-import javax.xml.transform.Result;
 import java.awt.image.BufferedImage;
 import java.io.*;
 import java.util.*;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
 /**
  * title: UploadFileController
  * package: com.sptg.gateway.controller.common
@@ -96,7 +86,7 @@ public class FileManageController {
         return new ResultBean<>(ResultEnum.SUCCESS,storePath);
     }
 
-    @PostMapping(value = "/uploadMaterialFile")
+   /* @PostMapping(value = "/uploadMaterialFile")
     public ResultBean<StorePath> uploadMaterialFile(@RequestParam("file") MultipartFile multipartFile,Boolean isNeedMd5)throws Exception{
         Assert.notNull(multipartFile,"参数异常");
         if(multipartFile.getContentType().contains("video")){
@@ -141,7 +131,7 @@ public class FileManageController {
             storePath.setMd5(md5Hex);
         }
         return new ResultBean<>(ResultEnum.SUCCESS,storePath);
-    }
+    }*/
 
     @PostMapping(value = "/uploadImageZip")
     public ResultBean<String> uploadImageZip(@RequestParam("file") MultipartFile multipartFile)throws Exception{

sptg-gateway/sptg-housekeeper-gateway/src/main/java/com/sptg/gateway/controller/common/excel/ExcelController.java

@@ -285,12 +285,12 @@ public class ExcelController {
             case "4":
                 this.exportExcelController.exportUser(response,onLineUser);
                 break;
-            case "5":
-                this.exportExcelController.exportAdWatch(response,onLineUser);
-                break;
-            case "6":
-                this.exportExcelController.exportAdWatchRank(response,onLineUser);
-                break;
+//            case "5":
+//                this.exportExcelController.exportAdWatch(response,onLineUser);
+//                break;
+//            case "6":
+//                this.exportExcelController.exportAdWatchRank(response,onLineUser);
+//                break;
             case "7":
                 this.exportExcelController.exportStatisticsUser(response,onLineUser);
                 break;

sptg-gateway/sptg-housekeeper-gateway/src/main/java/com/sptg/gateway/controller/common/excel/ExportExcelController.java

@@ -7,8 +7,6 @@ import com.alibaba.excel.support.ExcelTypeEnum;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Lists;
-import com.sptg.ad.api.entity.AdType;
-import com.sptg.ad.api.feigns.AdTypeFeign;
 import com.sptg.common.core.beans.ResultBean;
 import com.sptg.common.core.constant.OperationConstant;
 import com.sptg.common.core.module.*;
@@ -18,9 +16,6 @@ import com.sptg.estate.api.feigns.*;
 import com.sptg.gateway.controller.common.excel.tool.ExcelTool;
 import com.sptg.gateway.controller.common.excel.tool.ReflectUtils;
 import com.sptg.permissions.api.entity.Account;
-import com.sptg.statistics.api.dto.StatisticsAdWatchDto;
-import com.sptg.statistics.api.entity.StatisticsAdWatch;
-import com.sptg.statistics.api.feigns.StatisticsAdWatchFeign;
 import lombok.RequiredArgsConstructor;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddressList;
@@ -52,8 +47,6 @@ public class ExportExcelController {
     private final UnitFeign unitFeign;
     private final RoomFeign roomFeign;
     private final UserFeign userFeign;
-    private final StatisticsAdWatchFeign statisticsAdWatchFeign;
-    private final AdTypeFeign adTypeFeign;
     private final AccessCardFeign accessCardFeign;
     private final ProjectFeign projectFeign;
     private final ProjectBookFeign projectBookFeign;
@@ -359,7 +352,7 @@ public class ExportExcelController {
      *
      * @param httpServletResponse
      * @param onLineUser
-     */
+     *//*
     public void exportAdWatch(HttpServletResponse httpServletResponse, Account onLineUser) {
         StatisticsAdWatchDto statisticsAdWatchDto = new StatisticsAdWatchDto();
         statisticsAdWatchDto.setOrgPosition(onLineUser.getOrgPosition());
@@ -384,7 +377,7 @@ public class ExportExcelController {
             }
         }
         writeExcel(httpServletResponse, list, "广告观看统计记录", null, new AdWatchExportModule());
-    }
+    }*/
 
     /**
      * 功能描述:导出广告观看排行
@@ -392,7 +385,7 @@ public class ExportExcelController {
      * @param httpServletResponse
      * @param onLineUser
      */
-    public void exportAdWatchRank(HttpServletResponse httpServletResponse, Account onLineUser) {
+    /*public void exportAdWatchRank(HttpServletResponse httpServletResponse, Account onLineUser) {
         StatisticsAdWatchDto statisticsAdWatchRankDto = new StatisticsAdWatchDto();
         statisticsAdWatchRankDto.setOrgPosition(onLineUser.getOrgPosition());
         List<StatisticsAdWatch> adWatchRankList = this.statisticsAdWatchFeign.getAdWatchRankList(statisticsAdWatchRankDto);
@@ -411,7 +404,7 @@ public class ExportExcelController {
             }
         }
         writeExcel(httpServletResponse, list, "广告观看统计排行记录", null, new AdWatchRankExportModule());
-    }
+    }*/
 
     /**
      * 功能描述:导出住户统计

sptg-gateway/sptg-housekeeper-gateway/src/main/java/com/sptg/gateway/controller/device/DeviceController.java

@@ -35,9 +35,6 @@ import com.sptg.permissions.api.feigns.OrgFeign;
 import com.sptg.statistics.api.constant.SysLogMenuConstant;
 import com.sptg.statistics.api.entity.SysOperationLog;
 import com.sptg.statistics.api.feigns.SysOperationLogFeign;
-import com.sptg.third.api.entity.qinlin.QLinUserDevice;
-import com.sptg.third.api.feigns.grid.GridDoorDeviceFeign;
-import com.sptg.third.api.feigns.qinlin.QLinFeign;
 import feign.Param;
 import lombok.AllArgsConstructor;
 import org.apache.http.util.Asserts;
@@ -74,9 +71,6 @@ public class DeviceController {
     private final DeviceOptionsFeign deviceOptionsFeign;
     private final AccessCardFeign accessCardFeign;
     private final MsgPublishFeign msgPublishFeign;
-    private final QLinFeign qLinFeign;
-    private final GridDoorDeviceFeign gridDoorDeviceFeign;
-    private final RedisTemplate<String, String> redisTemplate;
 
     @PostMapping(value = "/device/instruct/pagingQuery")
     @Security(token = DeviceSecurityToken.DEVICE_INFO_MANAGE, format = DataFormatEnum.JSON)
@@ -219,16 +213,16 @@ public class DeviceController {
 
             /*---------------------------------------------------推送门禁设备到网格--------------------------------------------------------*/
 
-            ResultBean<String> stringResultBean = this.gridDoorDeviceFeign.gridDevicePush(dto);
-            if(stringResultBean != null&&stringResultBean.getData().equals("操作成功")){
-                SysOperationLog sysOperationLog1=new SysOperationLog("推送门禁到网格成功", SysLogConstant.ADD_EVENT,
-                        WebUtils.getIp(),resultBean.getData(),onLineUser,resultBean.getData());
-                sysOperationLogFeign.info(sysOperationLog1);
-            }else{
+//            ResultBean<String> stringResultBean = this.gridDoorDeviceFeign.gridDevicePush(dto);
+//            if(stringResultBean != null&&stringResultBean.getData().equals("操作成功")){
+//                SysOperationLog sysOperationLog1=new SysOperationLog("推送门禁到网格成功", SysLogConstant.ADD_EVENT,
+//                        WebUtils.getIp(),resultBean.getData(),onLineUser,resultBean.getData());
+//                sysOperationLogFeign.info(sysOperationLog1);
+//            }else{
                 SysOperationLog sysOperationLog1=new SysOperationLog("推送门禁数据到网格失败", SysLogConstant.ADD_EVENT,
                         WebUtils.getIp(),resultBean.getData(),onLineUser,resultBean.getData());
                 sysOperationLogFeign.info(sysOperationLog1);
-            }
+//            }
             /*-------------------------------------------------------------------------------------------------------------------*/
         }
         return resultBean;
@@ -581,15 +575,15 @@ public class DeviceController {
         device.setOrgPosition(onLineUser.getOrgPosition());
         device.setUserId(UserFlagConstant.ADMIN_USER_NUMBER_FLAG + onLineUser.getId());
         if(device.getDeviceFactory().equals(DeviceConstants.DEVICE_FACTORY_QINLIN)){
-            QLinUserDevice qLinUserDevice = new QLinUserDevice();
-            qLinUserDevice.setUserId(UserFlagConstant.ADMIN_USER_NUMBER_FLAG + onLineUser.getId());
-            qLinUserDevice.setDeviceId(device.getSerialNumber());
-            ResultBean<String> resultBean = this.qLinFeign.remoteOpenDoor(qLinUserDevice);
-            if(resultBean.getCode().equals("200")){
+//            QLinUserDevice qLinUserDevice = new QLinUserDevice();
+//            qLinUserDevice.setUserId(UserFlagConstant.ADMIN_USER_NUMBER_FLAG + onLineUser.getId());
+//            qLinUserDevice.setDeviceId(device.getSerialNumber());
+//            ResultBean<String> resultBean = this.qLinFeign.remoteOpenDoor(qLinUserDevice);
+//            if(resultBean.getCode().equals("200")){
                 return new ResultBean<>(ResultEnum.SUCCESS);
-            }else{
-                return new ResultBean<>(ResultEnum.FAILURE);
-            }
+//            }else{
+//                return new ResultBean<>(ResultEnum.FAILURE);
+//            }
         }else{
             return this.deviceFeign.openDoor(device);
         }

sptg-gateway/sptg-housekeeper-gateway/src/main/java/com/sptg/gateway/controller/estate/AgencyController.java

@@ -25,14 +25,11 @@ import com.sptg.permissions.api.feigns.OrgFeign;
 import com.sptg.statistics.api.constant.SysLogMenuConstant;
 import com.sptg.statistics.api.entity.SysOperationLog;
 import com.sptg.statistics.api.feigns.SysOperationLogFeign;
-import com.sptg.third.api.feigns.grid.GridEstateFeign;
-import com.sun.org.apache.xpath.internal.operations.Bool;
 import lombok.RequiredArgsConstructor;
 import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
-import java.util.List;
 
 /**
  * title: AgencyController
@@ -51,7 +48,6 @@ public class AgencyController {
     private final OrgFeign orgFeign;
     private final SysOperationLogFeign sysOperationLogFeign;
     private final AgencyFeign agencyFeign;
-    private final GridEstateFeign gridEstateFeign;
     private final ResidentialFeign residentialFeign;
 
     /**
@@ -186,16 +182,16 @@ public class AgencyController {
             sysOperationLogFeign.info(sysOperationLog);
             /*------------------------------------------------------------------------------------------------------------------*/
             /*---------------------------------------------------推送数据到网格--------------------------------------------------------*/
-            ResultBean<String> stringResultBean = this.gridEstateFeign.gridAgencyPush(resultBean.getData());
-            if(stringResultBean.getData() != null && stringResultBean.getData().equals("操作成功")){
-                SysOperationLog sysOperationLog1=new SysOperationLog("推送社区成功", SysLogConstant.ADD_EVENT,
-                        WebUtils.getIp(),dto,onLineUser,dto);
-                sysOperationLogFeign.info(sysOperationLog1);
-            }else{
+//            ResultBean<String> stringResultBean = this.gridEstateFeign.gridAgencyPush(resultBean.getData());
+//            if(stringResultBean.getData() != null && stringResultBean.getData().equals("操作成功")){
+//                SysOperationLog sysOperationLog1=new SysOperationLog("推送社区成功", SysLogConstant.ADD_EVENT,
+//                        WebUtils.getIp(),dto,onLineUser,dto);
+//                sysOperationLogFeign.info(sysOperationLog1);
+//            }else{
                 SysOperationLog sysOperationLog1=new SysOperationLog("推送社区失败", SysLogConstant.ADD_EVENT,
                         WebUtils.getIp(),dto,onLineUser,dto);
                 sysOperationLogFeign.info(sysOperationLog1);
-            }
+//            }
 
             /*------------------------------------------------------------------------------------------------------------------*/
 

sptg-gateway/sptg-housekeeper-gateway/src/main/java/com/sptg/gateway/controller/estate/ApplyPayRefundController.java

@@ -1,102 +0,0 @@
-package com.sptg.gateway.controller.estate;
-
-import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.common.core.beans.ResultEnum;
-import com.sptg.common.core.constant.OperationConstant;
-import com.sptg.common.security.annotation.Security;
-import com.sptg.common.security.enums.DataFormatEnum;
-import com.sptg.estate.api.constant.EstateSecurityToken;
-import com.sptg.estate.api.dto.ApplyPayRefundDto;
-import com.sptg.estate.api.entity.ApplyPayRefund;
-import com.sptg.estate.api.feigns.ApplyPayRefundFeign;
-import com.sptg.pay.api.feigns.WxPayFeign;
-import lombok.RequiredArgsConstructor;
-import org.springframework.cglib.beans.BeanMap;
-import org.springframework.util.Assert;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
-
-import java.io.FileNotFoundException;
-import java.util.Map;
-
-/**
- * @author xuanyan
- * @date 2020/6/23 17:01
- */
-
-@RestController
-@RequestMapping("/estate/applyPayRefund")
-@RequiredArgsConstructor
-public class ApplyPayRefundController {
-
-    private final ApplyPayRefundFeign applyPayRefundFeign;
-    private final WxPayFeign wxPayFeign;
-
-    public final static String WXPAY = "wxPay";
-
-    /**
-     * 功能描述:退款申请管理页面
-     *
-     * @return ModelAndView
-     */
-    @GetMapping("/index")
-    @Security(token = EstateSecurityToken.ESTATE_APPLY_PAY_REFUND_MANAGE)
-    public ModelAndView index() {
-        return new ModelAndView("estate/apply-pay-refund-manage");
-    }
-
-    @GetMapping(value = "/showApplyPayRefundPage")
-    public ResultBean<Page<ApplyPayRefund>> showApplyPayRefundPage(ApplyPayRefundDto dto, Page<ApplyPayRefund> page) {
-        dto.setPage(page);
-        return this.applyPayRefundFeign.showApplyPayRefundPage(dto);
-    }
-
-    /**
-     * 查看详情
-     * @param id
-     * @return
-     */
-    @GetMapping("/detail/{id}")
-    @Security(token = EstateSecurityToken.ESTATE_APPLY_PAY_REFUND_MANAGE,format = DataFormatEnum.VIEW)
-    public ModelAndView detail(@PathVariable(value = "id") Long id) {
-        ApplyPayRefund applyPayRefund = this.applyPayRefundFeign.findApplyPayRefundById(id);
-        return new ModelAndView("estate/apply-pay-refund-detail").addObject("applyPayRefund",applyPayRefund);
-    }
-
-    /**
-     * 审核申请
-     * @param id
-     * @return
-     */
-    @GetMapping("/check/{id}")
-    @Security(token = EstateSecurityToken.ESTATE_APPLY_PAY_REFUND_MANAGE,format = DataFormatEnum.VIEW)
-    public ModelAndView check(@PathVariable(value = "id") Long id) {
-        ApplyPayRefund applyPayRefund = this.applyPayRefundFeign.findApplyPayRefundById(id);
-        return new ModelAndView("estate/apply-pay-refund-check").addObject("applyPayRefund",applyPayRefund);
-    }
-
-    /**
-     * 审核
-     * @param applyPayRefundDto{
-     *                         id               主键
-     *                         checkStatus      审核状态：0：申请待审核，1：申请审核通过，2：申请审核拒绝
-     *                          }
-     * @return
-     */
-    @PostMapping("/updateCheckState")
-    @Security(token = EstateSecurityToken.ESTATE_APPLY_PAY_REFUND_CHECK,format = DataFormatEnum.JSON)
-    public ResultBean<Boolean> updateCheckState(ApplyPayRefundDto applyPayRefundDto) throws FileNotFoundException {
-        Integer checkStatus = applyPayRefundDto.getCheckStatus();
-        Assert.isTrue(checkStatus.equals(OperationConstant.ONE), "支付申请未通过，不能发起退款申请");
-        ApplyPayRefund applyPayRefund = this.applyPayRefundFeign.findApplyPayRefundById(applyPayRefundDto.getId());
-        if(WXPAY.equals(applyPayRefund.getPayType())){
-            BeanMap beanMap = BeanMap.create(applyPayRefund);
-            Map refundResult = wxPayFeign.refund(beanMap);
-            String third_refund_apply = (String)refundResult.get("third_refund_apply");
-            applyPayRefundDto.setThirdRefundApply(third_refund_apply);
-            return this.applyPayRefundFeign.auditApplyPayRefund(applyPayRefundDto);
-        }
-        return new ResultBean<>(ResultEnum.SUCCESS, true);
-    }
-}

sptg-gateway/sptg-housekeeper-gateway/src/main/java/com/sptg/gateway/controller/estate/ApplyUserController.java

@@ -26,10 +26,8 @@ import com.sptg.permissions.api.feigns.SysApiLogFeign;
 import com.sptg.statistics.api.constant.SysLogMenuConstant;
 import com.sptg.statistics.api.entity.SysOperationLog;
 import com.sptg.statistics.api.feigns.SysOperationLogFeign;
-import com.sptg.third.api.feigns.grid.GridEstateFeign;
 import lombok.RequiredArgsConstructor;
 import org.apache.ibatis.annotations.Param;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 import java.util.List;
@@ -57,7 +55,6 @@ public class ApplyUserController {
     private final RoomFeign roomFeign;
     private final ResidentialFeign residentialFeign;
     private final DictFeign dictFeign;
-    private final GridEstateFeign gridEstateFeign;
     private final SysApiLogFeign sysApiLogFeign;
     /**
      * 功能描述:住户认证管理页面
@@ -198,19 +195,6 @@ public class ApplyUserController {
             /*---------------------------------------------------人脸下发到设备----------------------------------------------------*/
 
             /*------------------------------------------------------------------------------------------------------------------*/
-            /*---------------------------------------------------推送到网格--------------------------------------------------------*/
-            ApplyUser newObj = this.applyUserFeign.getApplyUserById(applyUser.getId());
-            ResultBean<String> stringResultBean = this.gridEstateFeign.gridUserPush(newObj);
-
-            if(stringResultBean !=null &&stringResultBean.getData()!=null&&stringResultBean.getData().equals("操作成功")){
-                SysOperationLog sysOperationLog1=new SysOperationLog("推送住户审核数据到网格成功", SysLogConstant.ADD_EVENT,
-                        WebUtils.getIp(),applyUser,onLineUser,newObj,applyUser);
-                sysOperationLogFeign.info(sysOperationLog1);
-            }else{
-                SysOperationLog sysOperationLog1=new SysOperationLog("推送住户审核数据到网格失败", SysLogConstant.ADD_EVENT,
-                        WebUtils.getIp(),applyUser,onLineUser,applyUser);
-                sysOperationLogFeign.info(sysOperationLog1);
-            }
             return new ResultBean<>(ResultEnum.SUCCESS);
             /*------------------------------------------------------------------------------------------------------------------*/
         }

sptg-gateway/sptg-housekeeper-gateway/src/main/java/com/sptg/gateway/controller/estate/BuildingController.java

@@ -19,7 +19,6 @@ import com.sptg.permissions.api.feigns.OrgFeign;
 import com.sptg.statistics.api.constant.SysLogMenuConstant;
 import com.sptg.statistics.api.entity.SysOperationLog;
 import com.sptg.statistics.api.feigns.SysOperationLogFeign;
-import com.sptg.third.api.feigns.grid.GridEstateFeign;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.util.Assert;
@@ -49,7 +48,6 @@ public class BuildingController {
     private final OrgFeign orgFeign;
     private final ResidentialFeign residentialFeign;
     private final SysOperationLogFeign sysOperationLogFeign;
-    private final GridEstateFeign gridEstateFeign;
     private final RoomFeign roomFeign;
     private final FloorFeign floorFeign;
     private final UnitFeign unitFeign;
@@ -217,16 +215,6 @@ public class BuildingController {
             /*------------------------------------------------------------------------------------------------------------------*/
 
             /*---------------------------------------------------推送楼栋到网格--------------------------------------------------------*/
-            ResultBean<String> stringResultBean = this.gridEstateFeign.gridBuildingPush(bean.getData());
-            if(stringResultBean.getData().equals("操作成功")){
-                SysOperationLog sysOperationLog1=new SysOperationLog("推送楼栋数据到网格成功", SysLogConstant.ADD_EVENT,
-                        WebUtils.getIp(),buildingDto,onLineUser,buildingDto);
-                sysOperationLogFeign.info(sysOperationLog1);
-            }else{
-                SysOperationLog sysOperationLog1=new SysOperationLog("推送楼栋数据到网格失败", SysLogConstant.ADD_EVENT,
-                        WebUtils.getIp(),buildingDto,onLineUser,buildingDto);
-                sysOperationLogFeign.info(sysOperationLog1);
-            }
             return new ResultBean<>(ResultEnum.SUCCESS);
             /*------------------------------------------------------------------------------------------------------------------*/
         }else {

sptg-gateway/sptg-housekeeper-gateway/src/main/java/com/sptg/gateway/controller/estate/EstateRepairController.java

@@ -19,14 +19,11 @@ import com.sptg.permissions.api.feigns.ConfFeign;
 import com.sptg.statistics.api.constant.SysLogMenuConstant;
 import com.sptg.statistics.api.entity.SysOperationLog;
 import com.sptg.statistics.api.feigns.SysOperationLogFeign;
-import com.sptg.third.api.feigns.grid.GridEstateFeign;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 /**
  * title: EstateRepairController
@@ -45,7 +42,6 @@ public class EstateRepairController {
     private final SecurityServiceInterface<Account> securityServiceInterface;
     private final EstateRepairFeign estateRepairFeign;
     private final SysOperationLogFeign sysOperationLogFeign;
-    private final GridEstateFeign gridEstateFeign;
     private final UserFeign userFeign;
 
     /**
@@ -164,16 +160,16 @@ public class EstateRepairController {
                 result.setUserName(user.getName());
             }
 
-            ResultBean<String> stringResultBean = this.gridEstateFeign.gridEstateRepairPush(result);
-            if(stringResultBean.getData().equals("操作成功")){
-                SysOperationLog sysOperationLog1=new SysOperationLog("推送物业报修数据到网格成功", SysLogConstant.ADD_EVENT,
-                        WebUtils.getIp(),result,null,result);
-                sysOperationLogFeign.info(sysOperationLog1);
-            }else{
-                SysOperationLog sysOperationLog1=new SysOperationLog("推送物业报修数据到网格失败", SysLogConstant.ADD_EVENT,
-                        WebUtils.getIp(),result,null,result);
-                sysOperationLogFeign.info(sysOperationLog1);
-            }
+//            ResultBean<String> stringResultBean = this.gridEstateFeign.gridEstateRepairPush(result);
+//            if(stringResultBean.getData().equals("操作成功")){
+//                SysOperationLog sysOperationLog1=new SysOperationLog("推送物业报修数据到网格成功", SysLogConstant.ADD_EVENT,
+//                        WebUtils.getIp(),result,null,result);
+//                sysOperationLogFeign.info(sysOperationLog1);
+//            }else{
+//                SysOperationLog sysOperationLog1=new SysOperationLog("推送物业报修数据到网格失败", SysLogConstant.ADD_EVENT,
+//                        WebUtils.getIp(),result,null,result);
+//                sysOperationLogFeign.info(sysOperationLog1);
+//            }
             return new ResultBean<>(ResultEnum.SUCCESS);
             /*------------------------------------------------------------------------------------------------------------------*/
         }
@@ -289,7 +285,7 @@ public class EstateRepairController {
             if(user != null){
                 estateRepair.setUserName(user.getName());
             }
-            this.gridEstateFeign.gridEstateRepairPush(estateRepair);
+//            this.gridEstateFeign.gridEstateRepairPush(estateRepair);
         }
         return  null;
     }

sptg-gateway/sptg-housekeeper-gateway/src/main/java/com/sptg/gateway/controller/estate/FloorController.java

@@ -5,9 +5,7 @@ import com.baomidou.mybatisplus.plugins.Page;
 import com.sptg.common.core.beans.ResultBean;
 import com.sptg.common.core.beans.ResultEnum;
 import com.sptg.common.core.constant.OperationConstant;
-import com.sptg.common.core.constant.SymbolConstant;
 import com.sptg.common.core.constant.SysLogConstant;
-import com.sptg.common.core.util.CommonUtil;
 import com.sptg.common.core.util.WebUtils;
 import com.sptg.common.security.annotation.Security;
 import com.sptg.common.security.enums.DataFormatEnum;
@@ -24,8 +22,6 @@ import com.sptg.permissions.api.feigns.OrgFeign;
 import com.sptg.statistics.api.constant.SysLogMenuConstant;
 import com.sptg.statistics.api.entity.SysOperationLog;
 import com.sptg.statistics.api.feigns.SysOperationLogFeign;
-import com.sptg.third.api.feigns.grid.GridEstateFeign;
-import com.sptg.third.api.feigns.qinlin.QLinAuthFeign;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.core.ParameterizedTypeReference;
@@ -39,8 +35,6 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.servlet.ModelAndView;
 
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -65,10 +59,8 @@ public class FloorController {
     private final OrgFeign orgFeign;
     private final ResidentialFeign residentialFeign;
     private final SysOperationLogFeign sysOperationLogFeign;
-    private final GridEstateFeign gridEstateFeign;
     private final UnitFeign unitFeign;
     private final BuildingFeign buildingFeign;
-    private final QLinAuthFeign qLinAuthFeign;
     private final RoomFeign roomFeign;
     /**
      * 功能描述:楼层页面初始化
@@ -213,16 +205,16 @@ public class FloorController {
             /*------------------------------------------------------------------------------------------------------------------*/
 
             /*---------------------------------------------------推送楼层到网格--------------------------------------------------------*/
-            ResultBean<String> stringResultBean = this.gridEstateFeign.gridFloorPush(floorDto1);
-            if(stringResultBean.getData() != null &&stringResultBean.getData().equals("操作成功")){
-                SysOperationLog sysOperationLog1=new SysOperationLog("推送楼层数据到网格成功", SysLogConstant.ADD_EVENT,
-                        WebUtils.getIp(),floorDto,onLineUser,floorDto);
-                sysOperationLogFeign.info(sysOperationLog1);
-            }else{
+//            ResultBean<String> stringResultBean = this.gridEstateFeign.gridFloorPush(floorDto1);
+//            if(stringResultBean.getData() != null &&stringResultBean.getData().equals("操作成功")){
+//                SysOperationLog sysOperationLog1=new SysOperationLog("推送楼层数据到网格成功", SysLogConstant.ADD_EVENT,
+//                        WebUtils.getIp(),floorDto,onLineUser,floorDto);
+//                sysOperationLogFeign.info(sysOperationLog1);
+//            }else{
                 SysOperationLog sysOperationLog1=new SysOperationLog("推送楼层数据到网格失败", SysLogConstant.ADD_EVENT,
                         WebUtils.getIp(),floorDto,onLineUser,floorDto);
                 sysOperationLogFeign.info(sysOperationLog1);
-            }
+//            }
             /*------------------------------------------------------------------------------------------------------------------*/
             return new ResultBean<>(ResultEnum.SUCCESS);
         }else {
@@ -513,10 +505,10 @@ public class FloorController {
             HttpEntity requestEntity = new HttpEntity<>(JSONUtil.toJsonStr(map), headers);
             ParameterizedTypeReference<Object> reference = new ParameterizedTypeReference<Object>() {
             };
-            String sessionId = this.qLinAuthFeign.qLinAuth();
-            String url = "https://qiotapi.qinlinkeji.com/admin/building/house/findChildList?sessionId="+sessionId;
-            URI uri = URI.create(url);
-            responseEntity = restTemplate.exchange(uri, HttpMethod.POST, requestEntity, reference);
+//            String sessionId = this.qLinAuthFeign.qLinAuth();
+//            String url = "https://qiotapi.qinlinkeji.com/admin/building/house/findChildList?sessionId="+sessionId;
+//            URI uri = URI.create(url);
+//            responseEntity = restTemplate.exchange(uri, HttpMethod.POST, requestEntity, reference);
 
 
             Map map1 = (Map) responseEntity.getBody();

sptg-gateway/sptg-housekeeper-gateway/src/main/java/com/sptg/gateway/controller/estate/PayCertificateController.java

@@ -1,44 +0,0 @@
-package com.sptg.gateway.controller.estate;
-
-import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.common.security.annotation.Security;
-import com.sptg.estate.api.constant.EstateSecurityToken;
-import com.sptg.pay.api.dto.PayCertificateDto;
-import com.sptg.pay.api.entity.PayCertificate;
-import com.sptg.pay.api.feigns.PayCertificateFeign;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.servlet.ModelAndView;
-
-/**
- * @author xuanyan
- * @date 2020/6/22 18:20
- */
-@RestController
-@RequestMapping("/estate/payCertificate")
-@RequiredArgsConstructor
-public class PayCertificateController {
-
-    private final PayCertificateFeign payCertificateFeign;
-
-    /**
-     * 功能描述:支付凭证管理页面
-     * @return ModelAndView
-     *
-     *
-     */
-    @GetMapping("/index")
-    @Security(token = EstateSecurityToken.ESTATE_PAY_CERTIFICATE_MANAGE)
-    public ModelAndView index(){
-        return new ModelAndView("estate/pay-certificate-manage");
-    }
-
-    @GetMapping(value = "/showPayCertificatePage")
-    public ResultBean<Page<PayCertificate>> showPayCertificatePage(PayCertificateDto dto, Page<PayCertificate> page){
-        dto.setPage(page);
-        return this.payCertificateFeign.showPayCertificatePage(dto);
-    }
-}

sptg-gateway/sptg-housekeeper-gateway/src/main/java/com/sptg/gateway/controller/estate/ResidentialController.java

@@ -34,26 +34,15 @@ import com.sptg.permissions.api.feigns.RegionAuthorizeFeign;
 import com.sptg.statistics.api.constant.SysLogMenuConstant;
 import com.sptg.statistics.api.entity.SysOperationLog;
 import com.sptg.statistics.api.feigns.SysOperationLogFeign;
-import com.sptg.third.api.entity.qinlin.QLinCommunityDevices;
-import com.sptg.third.api.feigns.grid.GridEstateFeign;
-import com.sptg.third.api.feigns.qinlin.QLinAuthFeign;
-import com.sptg.third.api.feigns.qinlin.QLinFeign;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
-import org.springframework.core.ParameterizedTypeReference;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.ResponseEntity;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.client.RestTemplate;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.net.URI;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -62,8 +51,8 @@ import java.util.stream.Collectors;
  * package: com.sptg.gateway.controller.estate
  * description: 小区 网关控制器
  *
- *             
- *                
+ *
+ *
  */
 @RestController
 @RequestMapping("/estate/residential")
@@ -83,11 +72,8 @@ public class ResidentialController {
     private final RegionAuthorizeFeign regionAuthorizeFeign;
     private final ConfFeign confFeign;
     private final AgencyFeign agencyFeign;
-    private final GridEstateFeign gridEstateFeign;
-    private final QLinAuthFeign qLinAuthFeign;
     private final BuildingFeign buildingFeign;
     private final FloorFeign floorFeign;
-    private final QLinFeign qLinFeign;
     private final AccountFeign accountFeign;
     private final AccessRecordsFeign accessRecordsFeign;
     private final ApplyUserFeign applyUserFeign;
@@ -98,8 +84,8 @@ public class ResidentialController {
     /**
      * 功能描述:小区页面初始化
      * @return ModelAndView
-     *             
-     *                      
+     *
+     *
      */
     @GetMapping("/index")
     @Security(token = EstateSecurityToken.ESTATE_RESIDENTIAL_MANAGE,format = DataFormatEnum.VIEW)
@@ -213,8 +199,8 @@ public class ResidentialController {
      * @param residentialDto 小区业务对象（含查询条件）
      * @param page 分页条件
      * @return ResultBean<Page<Residential>>
-     *             
-     *                      
+     *
+     *
      */
     @GetMapping(value = "/showResidentialList")
     @Security(token = EstateSecurityToken.ESTATE_RESIDENTIAL_MANAGE,format = DataFormatEnum.JSON)
@@ -384,8 +370,8 @@ public class ResidentialController {
      * @param dto 区域权限对象
      * @param pageBean 分页条件
      * @return List<Residential>
-     *                
-     *                      
+     *
+     *
      */
     @GetMapping(value = "/pagingQueryAuthorizeOrg")
     @Security(format = DataFormatEnum.JSON)
@@ -407,8 +393,8 @@ public class ResidentialController {
     /**
      * 功能描述: 新增页面初始化
      * @return ModelAndView
-     *             
-     *                      
+     *
+     *
      */
     @GetMapping(value = "/add")
     @Security(token = EstateSecurityToken.ESTATE_RESIDENTIAL_ADD,format = DataFormatEnum.VIEW)
@@ -432,7 +418,7 @@ public class ResidentialController {
         return new ResultBean<>(ResultEnum.SUCCESS,residential);
     }
 
-    @GetMapping(value = "/registerQinLinResidential/{id}")
+    /*@GetMapping(value = "/registerQinLinResidential/{id}")
     @Security(token = EstateSecurityToken.ESTATE_RESIDENTIAL_MANAGE,format = DataFormatEnum.JSON)
     public ResultBean<String> registerQinlinResidential(@PathVariable(value = "id") Long id){
         Residential residential = this.residentialFeign.findResidentialById(id);
@@ -443,9 +429,9 @@ public class ResidentialController {
         qLinCommunityDevices.setCommunityName(communityName);
         ResultBean<String> resultBean = this.qLinFeign.addCommunity(qLinCommunityDevices);
         return resultBean;
-    }
+    }*/
 
-    @PostMapping(value = "/registerQinLinDevices")
+    /*@PostMapping(value = "/registerQinLinDevices")
     @Security(token = EstateSecurityToken.ESTATE_RESIDENTIAL_MANAGE,format = DataFormatEnum.JSON)
     public ResultBean<String> registerQinLinDevice(QLinCommunityDevices qLinCommunityDevices){
 
@@ -460,14 +446,14 @@ public class ResidentialController {
 
         ResultBean<String> resultBean = this.qLinFeign.addDevices(qLinCommunityDevices);
         return resultBean;
-    }
+    }*/
 
     /**
      * 注册该小区的设备
      * @param residentialId
      * @return
      */
-    @GetMapping(value = "/registerQinLinDevices/{residentialId}")
+   /* @GetMapping(value = "/registerQinLinDevices/{residentialId}")
     @Security(token = EstateSecurityToken.ESTATE_RESIDENTIAL_MANAGE,format = DataFormatEnum.JSON)
     public ResultBean<Map> registerQinLinDevice(@PathVariable(value = "residentialId") Long residentialId){
         Residential residential = this.residentialFeign.findResidentialById(residentialId);
@@ -516,14 +502,14 @@ public class ResidentialController {
         }
 
         return new ResultBean(ResultEnum.SUCCESS, map);
-    }
+    }*/
 
     /**
      * 功能描述:批量注册小区设备
      * @param ids 选中的id集合
      * @return ResultBean<Boolean>
      */
-    @PostMapping(value = "/batchRegisterDevice")
+    /*@PostMapping(value = "/batchRegisterDevice")
     @Security(token = EstateSecurityToken.ESTATE_RESIDENTIAL_REGISTER_BATCHDEVICE,format = DataFormatEnum.JSON)
     public ResultBean<Boolean> batchRegisterDevice(@RequestBody List<String> ids){
         if (null == ids || ids.size() <=0){
@@ -585,14 +571,14 @@ public class ResidentialController {
         }
 
         return new ResultBean(ResultEnum.SUCCESS, map);
-    }
+    }*/
 
     /**
      * 功能描述:新增小区
      * @param residentialDto 小区业务对象
      * @return ResultBean<Boolean>
-     *             
-     *                      
+     *
+     *
      */
     @PostMapping(value = "/addResidential")
     @Security(token = EstateSecurityToken.ESTATE_RESIDENTIAL_ADD,format = DataFormatEnum.JSON)
@@ -630,18 +616,6 @@ public class ResidentialController {
             sysOperationLogFeign.info(sysOperationLog);
             /*------------------------------------------------------------------------------------------------------------------*/
 
-            /*---------------------------------------------------推送数据到网格--------------------------------------------------------*/
-
-            ResultBean<String> stringResultBean = this.gridEstateFeign.gridResidentialPush(resultBean.getData());
-            if(stringResultBean != null&&stringResultBean.getData()!=null&&stringResultBean.getData().equals("操作成功")){
-                SysOperationLog sysOperationLog1=new SysOperationLog("推送小区数据到网格成功", SysLogConstant.ADD_EVENT,
-                        WebUtils.getIp(),resultBean.getData(),onLineUser,resultBean.getData());
-                sysOperationLogFeign.info(sysOperationLog1);
-            }else{
-                SysOperationLog sysOperationLog1=new SysOperationLog("推送小区数据到网格失败", SysLogConstant.ADD_EVENT,
-                        WebUtils.getIp(),resultBean.getData(),onLineUser,resultBean.getData());
-                sysOperationLogFeign.info(sysOperationLog1);
-            }
 
             /*------------------------------------------------------------------------------------------------------------------*/
             return new ResultBean<>(ResultEnum.SUCCESS);
@@ -653,8 +627,8 @@ public class ResidentialController {
      * 功能描述: 编辑页面初始化
      * @param id 必填
      * @return ModelAndView
-     *             
-     *                      
+     *
+     *
      */
     @GetMapping(value = "/edit/{id}")
     @Security(token = EstateSecurityToken.ESTATE_RESIDENTIAL_UPDATE,format = DataFormatEnum.VIEW)
@@ -727,8 +701,8 @@ public class ResidentialController {
      * 功能描述:编辑小区
      * @param residentialDto 小区业务对象
      * @return ResultBean<Boolean>
-     *             
-     *                      
+     *
+     *
      */
     @PostMapping(value = "/updateResidential")
     @Security(token = EstateSecurityToken.ESTATE_RESIDENTIAL_UPDATE,format = DataFormatEnum.JSON)
@@ -1033,7 +1007,7 @@ public class ResidentialController {
         modelAndView.addObject("flag",flag);
         return modelAndView;
     }
-    
+
     /**
      * 功能描述:导出小区
      * @param response
@@ -1230,13 +1204,12 @@ public class ResidentialController {
         if(null == residential) {
             return new ResultBean(ResultEnum.ERROR);
         }
-       getBuildingListByResidentialId(residential);
 
         return new ResultBean(ResultEnum.SUCCESS);
     }
 
     //通过亲邻的小区id亲邻楼栋
-    private List<BuildingDto> getBuildingListByResidentialId(Residential residential){
+    /*private List<BuildingDto> getBuildingListByResidentialId(Residential residential){
         List<BuildingDto> buildingDtos = new ArrayList<>();
         String sessionId = this.qLinAuthFeign.qLinAuth();
         int addBuildingResult = 0;
@@ -1293,7 +1266,7 @@ public class ResidentialController {
         System.out.println("updateBuildingResult:"+updateBuildingResult+"   "+"addBuilding:"+addBuildingResult);
         return buildingDtos;
 
-    }
+    }*/
 
     @PostMapping("/clearBuilding/{residentialId}")
     @Security(token = "estate:residential:delete")

sptg-gateway/sptg-housekeeper-gateway/src/main/java/com/sptg/gateway/controller/estate/RoomController.java

@@ -1,6 +1,5 @@
 package com.sptg.gateway.controller.estate;
 
-import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.sptg.common.core.beans.ResultBean;
 import com.sptg.common.core.beans.ResultEnum;
@@ -11,8 +10,6 @@ import com.sptg.common.security.annotation.Security;
 import com.sptg.common.security.enums.DataFormatEnum;
 import com.sptg.common.security.service.SecurityServiceInterface;
 import com.sptg.estate.api.constant.EstateSecurityToken;
-import com.sptg.estate.api.dto.BuildingDto;
-import com.sptg.estate.api.dto.ResidentialDto;
 import com.sptg.estate.api.dto.RoomDto;
 import com.sptg.estate.api.entity.*;
 import com.sptg.estate.api.feigns.*;
@@ -22,33 +19,22 @@ import com.sptg.permissions.api.feigns.OrgFeign;
 import com.sptg.statistics.api.constant.SysLogMenuConstant;
 import com.sptg.statistics.api.entity.SysOperationLog;
 import com.sptg.statistics.api.feigns.SysOperationLogFeign;
-import com.sptg.third.api.feigns.grid.GridEstateFeign;
-import com.sptg.third.api.feigns.qinlin.QLinAuthFeign;
 import lombok.RequiredArgsConstructor;
-import org.springframework.core.ParameterizedTypeReference;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.ResponseEntity;
 import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.client.RestTemplate;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.net.URI;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * title: RoomController
  * package: com.sptg.gateway.controller.estate
  * description: 房间 网关控制器
  *
- *             
- *                 
+ *
+ *
  */
 @RestController
 @RequestMapping("/estate/room")
@@ -61,16 +47,12 @@ public class RoomController {
     private final OrgFeign orgFeign;
     private final ResidentialFeign residentialFeign;
     private final SysOperationLogFeign sysOperationLogFeign;
-    private final GridEstateFeign gridEstateFeign;
-    private final FloorFeign floorFeign;
-    private final BuildingFeign buildingFeign;
-    private final QLinAuthFeign qLinAuthFeign;
 
     /**
      * 功能描述:房间页面初始化
      * @return ModelAndView
-     *             
-     *                       
+     *
+     *
      */
     @GetMapping("/index/{floorId}")
     @Security(token = EstateSecurityToken.ESTATE_ROOM_MANAGE,format = DataFormatEnum.VIEW)
@@ -103,8 +85,8 @@ public class RoomController {
      * @param roomDto 房间业务对象（含查询条件）
      * @param page 分页条件
      * @return ResultBean<Page<Room>>
-     *             
-     *                       
+     *
+     *
      */
     @GetMapping(value = "/showRoomList")
     @Security(token = EstateSecurityToken.ESTATE_ROOM_MANAGE,format = DataFormatEnum.JSON)
@@ -163,8 +145,8 @@ public class RoomController {
     /**
      * 功能描述:新增页面初始化
      * @return ModelAndView
-     *             
-     *                       
+     *
+     *
      */
     @GetMapping(value = "/add")
     @Security(token = EstateSecurityToken.ESTATE_ROOM_ADD,format = DataFormatEnum.VIEW)
@@ -193,8 +175,8 @@ public class RoomController {
      * 功能描述:新增房间
      * @param roomDto 房间业务对象
      * @return ResultBean<Boolean>
-     *             
-     *                       
+     *
+     *
      */
     @PostMapping(value = "/addRoom")
     @Security(token = EstateSecurityToken.ESTATE_ROOM_ADD,format = DataFormatEnum.JSON)
@@ -209,18 +191,6 @@ public class RoomController {
                     WebUtils.getIp(),roomDto,onLineUser,roomDto);
             sysOperationLogFeign.info(sysOperationLog);
             /*------------------------------------------------------------------------------------------------------------------*/
-
-            /*---------------------------------------------------推送房间到网格--------------------------------------------------------*/
-            ResultBean<String> stringResultBean = this.gridEstateFeign.gridRoomPush(room);
-            if(stringResultBean.getData() != null &&stringResultBean.getData().equals("操作成功")){
-                SysOperationLog sysOperationLog1=new SysOperationLog("推送房间数据到网格成功", SysLogConstant.ADD_EVENT,
-                        WebUtils.getIp(),room,onLineUser,room);
-                sysOperationLogFeign.info(sysOperationLog1);
-            }else{
-                SysOperationLog sysOperationLog1=new SysOperationLog("推送房间数据到网格失败", SysLogConstant.ADD_EVENT,
-                        WebUtils.getIp(),room,onLineUser,room);
-                sysOperationLogFeign.info(sysOperationLog1);
-            }
             return new ResultBean<>(ResultEnum.SUCCESS);
             /*------------------------------------------------------------------------------------------------------------------*/
         }
@@ -231,8 +201,8 @@ public class RoomController {
      * 功能描述: 编辑页面初始化
      * @param id 必填
      * @return ModelAndView
-     *             
-     *                       
+     *
+     *
      */
     @GetMapping(value = "/edit/{id}")
     @Security(token = EstateSecurityToken.ESTATE_ROOM_UPDATE,format = DataFormatEnum.VIEW)
@@ -251,8 +221,8 @@ public class RoomController {
      * 功能描述:编辑房间
      * @param roomDto 房间业务对象
      * @return ResultBean<Boolean>
-     *             
-     *                       
+     *
+     *
      */
     @PostMapping(value = "/updateRoom")
     @Security(token = EstateSecurityToken.ESTATE_ROOM_UPDATE,format = DataFormatEnum.JSON)
@@ -279,8 +249,8 @@ public class RoomController {
      * 功能描述:删除房间
      * @param roomDto 房间业务对象
      * @return ResultBean<Boolean>
-     *             
-     *                       
+     *
+     *
      */
     @PostMapping(value = "/deleteRoom")
     @Security(token = EstateSecurityToken.ESTATE_ROOM_DELETE,format = DataFormatEnum.JSON)
@@ -302,13 +272,13 @@ public class RoomController {
         }
         return resultBean;
     }
-    
+
     /**
      * 功能描述:批量删除房间
      * @param ids 选中的id集合
      * @return ResultBean<Boolean>
-     *             
-     *                      
+     *
+     *
      */
     @PostMapping(value = "/deleteRoomList")
     @Security(token = EstateSecurityToken.ESTATE_ROOM_DELETE,format = DataFormatEnum.JSON)
@@ -330,13 +300,13 @@ public class RoomController {
         }
         return resultBean;
     }
-    
+
     /**
      * 功能描述:导入房间
      * @param flag 3 房间
      * @return ModelAndView
-     *             
-     *                      
+     *
+     *
      */
     @RequestMapping(value = "/indexImportExcel/{flag}")
     @Security(token = EstateSecurityToken.ESTATE_ROOM_IMPORT,format = DataFormatEnum.VIEW)
@@ -349,8 +319,8 @@ public class RoomController {
     /**
      * 功能描述:导出房间
      * @param response
-     *             
-     *                      
+     *
+     *
      */
     @RequestMapping(value = "/exportRoom")
     @Security(token = EstateSecurityToken.ESTATE_ROOM_EXPORT)
@@ -369,8 +339,8 @@ public class RoomController {
      * 功能描述:根据父节点查找房间
      * @param roomDto 房间业务对象
      * @return ResultBean<Room>
-     *             
-     *                       
+     *
+     *
      */
     @GetMapping(value = "/findListByPid")
     @Security(format = DataFormatEnum.JSON)
@@ -386,8 +356,8 @@ public class RoomController {
      * 功能描述:根据位置查询的所有房间
      * @param roomDto 房间业务对象
      * @return ResultBean<Residential>
-     *             
-     *                      
+     *
+     *
      */
     @GetMapping(value = "/findListByPosition")
     @Security(format = DataFormatEnum.JSON)
@@ -450,7 +420,7 @@ public class RoomController {
      * @param residentialId
      * @return
      */
-    @PostMapping(value = "/syncRoom/{id}")
+   /* @PostMapping(value = "/syncRoom/{id}")
     @Security(token = "estate:residential:sync")
     public ResultBean sync(@PathVariable(value = "id") Long residentialId) {
 
@@ -548,5 +518,5 @@ public class RoomController {
             System.out.println("楼层id为"+floor.getOldId()+"的房间列表："+list);
         }
         System.out.println("addResult"+addResult+" "+"update"+updateResult);
-    }
+    }*/
 }

sptg-gateway/sptg-housekeeper-gateway/src/main/java/com/sptg/gateway/controller/estate/UnitController.java

@@ -22,8 +22,6 @@ import com.sptg.permissions.api.feigns.OrgFeign;
 import com.sptg.statistics.api.constant.SysLogMenuConstant;
 import com.sptg.statistics.api.entity.SysOperationLog;
 import com.sptg.statistics.api.feigns.SysOperationLogFeign;
-import com.sptg.third.api.feigns.grid.GridEstateFeign;
-import com.sptg.third.api.feigns.qinlin.QLinAuthFeign;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.core.ParameterizedTypeReference;
@@ -64,8 +62,6 @@ public class UnitController {
     private final OrgFeign orgFeign;
     private final ResidentialFeign residentialFeign;
     private final SysOperationLogFeign sysOperationLogFeign;
-    private final GridEstateFeign gridEstateFeign;
-    private final QLinAuthFeign qLinAuthFeign;
     private final RoomFeign roomFeign;
     private final FloorFeign floorFeign;
 
@@ -215,16 +211,16 @@ public class UnitController {
             /*------------------------------------------------------------------------------------------------------------------*/
 
             /*---------------------------------------------------推送单元到网格--------------------------------------------------------*/
-            ResultBean<String> stringResultBean = this.gridEstateFeign.gridUnitPush(unitDto);
-            if (stringResultBean.getData() != null && stringResultBean.getData().equals("操作成功")) {
-                SysOperationLog sysOperationLog1 = new SysOperationLog("推送单元数据到网格成功", SysLogConstant.ADD_EVENT,
-                        WebUtils.getIp(), unitDto, onLineUser, unitDto);
-                sysOperationLogFeign.info(sysOperationLog1);
-            } else {
-                SysOperationLog sysOperationLog1 = new SysOperationLog("推送单元数据到网格失败", SysLogConstant.ADD_EVENT,
-                        WebUtils.getIp(), unitDto, onLineUser, unitDto);
-                sysOperationLogFeign.info(sysOperationLog1);
-            }
+//            ResultBean<String> stringResultBean = this.gridEstateFeign.gridUnitPush(unitDto);
+//            if (stringResultBean.getData() != null && stringResultBean.getData().equals("操作成功")) {
+//                SysOperationLog sysOperationLog1 = new SysOperationLog("推送单元数据到网格成功", SysLogConstant.ADD_EVENT,
+//                        WebUtils.getIp(), unitDto, onLineUser, unitDto);
+//                sysOperationLogFeign.info(sysOperationLog1);
+//            } else {
+//                SysOperationLog sysOperationLog1 = new SysOperationLog("推送单元数据到网格失败", SysLogConstant.ADD_EVENT,
+//                        WebUtils.getIp(), unitDto, onLineUser, unitDto);
+//                sysOperationLogFeign.info(sysOperationLog1);
+//            }
             return new ResultBean<>(ResultEnum.SUCCESS);
             /*------------------------------------------------------------------------------------------------------------------*/
         } else {
@@ -488,11 +484,11 @@ public class UnitController {
         BuildingDto buildingDto = new BuildingDto();
         buildingDto.setResidentialId(residentialId);
         List<Building> buildingList = this.buildingFeign.getListByCondition(buildingDto);
-        this.syncUnit(residential,buildingList);
+//        this.syncUnit(residential,buildingList);
         return new ResultBean(ResultEnum.SUCCESS);
     }
 
-    private void syncUnit(Residential residential,List<Building> buildingList){
+    /*private void syncUnit(Residential residential,List<Building> buildingList){
         int addResult = 0;
         int updateResult = 0;
 
@@ -556,7 +552,7 @@ public class UnitController {
 
         }
         System.out.println("单元：" + "   add:" + addResult + "      update:" + updateResult);
-    }
+    }*/
 
     @PostMapping("/clearFloor/{unitId}")
     @Security(token = EstateSecurityToken.ESTATE_UNIT_DELETE)
@@ -618,4 +614,4 @@ public class UnitController {
         }
         return new ResultBean(ResultEnum.SUCCESS, b);
     }
-}
+}

sptg-gateway/sptg-housekeeper-gateway/src/main/java/com/sptg/gateway/controller/estate/UserOrderController.java

@@ -1,30 +1,20 @@
 package com.sptg.gateway.controller.estate;
 
-import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.common.core.beans.ResultBean;
 import com.sptg.common.security.annotation.Security;
 import com.sptg.estate.api.constant.EstateSecurityToken;
-import com.sptg.estate.api.entity.User;
 import com.sptg.estate.api.feigns.UserFeign;
-import com.sptg.pay.api.dto.UserOrderDto;
-import com.sptg.pay.api.entity.UserOrder;
-import com.sptg.pay.api.feigns.UserOrderFeign;
 import com.sptg.permissions.api.feigns.ConfFeign;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
-import java.util.List;
-
 @RestController
 @RequestMapping("/estate/userOrder")
 @RequiredArgsConstructor
 public class UserOrderController {
 
-    private final UserOrderFeign userOrderFeign;
     private final ConfFeign confFeign;
     private final UserFeign userFeign;
 
@@ -42,7 +32,7 @@ public class UserOrderController {
         return modelAndView;
     }
 
-    @GetMapping(value = "/showUserOrderPage")
+    /*@GetMapping(value = "/showUserOrderPage")
     public ResultBean<Page<UserOrder>> showUserOrderPage(UserOrderDto dto,Page<UserOrder> page){
         dto.setPage(page);
         ResultBean<Page<UserOrder>> bean = this.userOrderFeign.showUserOrderPage(dto);
@@ -65,5 +55,5 @@ public class UserOrderController {
     @PostMapping(value = "/orderQuery")
     public ResultBean<Boolean> orderQuery(UserOrderDto dto){
         return this.userOrderFeign.orderQuery(dto);
-    }
+    }*/
 }

sptg-gateway/sptg-housekeeper-gateway/src/main/java/com/sptg/gateway/controller/statistics/DataCockpitController.java

@@ -1,10 +1,6 @@
 package com.sptg.gateway.controller.statistics;
 
 import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.ad.api.dto.AdTypeDto;
-import com.sptg.ad.api.entity.AdType;
-import com.sptg.ad.api.feigns.AdOfflinePushRecordFeign;
-import com.sptg.ad.api.feigns.AdTypeFeign;
 import com.sptg.common.core.beans.ResultBean;
 import com.sptg.common.core.beans.ResultEnum;
 import com.sptg.common.core.constant.OperationConstant;
@@ -25,12 +21,7 @@ import com.sptg.permissions.api.feigns.AreaFeign;
 import com.sptg.permissions.api.feigns.DeviceAuthorizeFeign;
 import com.sptg.permissions.api.feigns.OrgFeign;
 import com.sptg.statistics.api.constant.StatisticsSecurityToken;
-import com.sptg.statistics.api.dto.StatisticsAdPushDto;
-import com.sptg.statistics.api.dto.StatisticsAdWatchDto;
-import com.sptg.statistics.api.entity.StatisticsAdWatch;
 import com.sptg.statistics.api.entity.StatisticsCount;
-import com.sptg.statistics.api.feigns.StatisticsAdPushFeign;
-import com.sptg.statistics.api.feigns.StatisticsAdWatchFeign;
 import com.sptg.statistics.api.feigns.StatisticsCountFeign;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -51,20 +42,17 @@ import java.util.*;
  * package: com.sptg.gateway.controller.statistics
  * description: 数据驾驶舱-网关控制器
  *
- *                
- *                
+ *
+ *
  */
 @RestController
 @RequestMapping(value = "/statistics/data/cockpit")
 @AllArgsConstructor
 @Slf4j
 public class DataCockpitController {
-    private final StatisticsAdPushFeign statisticsAdPushFeign;
-    private final StatisticsAdWatchFeign statisticsAdWatchFeign;
     private final StatisticsCountFeign statisticsCountFeign;
     private final SecurityServiceInterface<Account> securityServiceInterface;
     private final AreaFeign areaFeign;
-    private final AdTypeFeign adTypeFeign;
     private final OrgFeign orgFeign;
     private final DeviceAuthorizeFeign deviceAuthorizeFeign;
     private final ResidentialFeign residentialFeign;
@@ -75,13 +63,12 @@ public class DataCockpitController {
     private final UserFeign userFeign;
     private final ServerUserFeign serverUserFeign;
     private final MemberFeign memberFeign;
-    private final AdOfflinePushRecordFeign adOfflinePushRecordFeign;
 
     /**
      * 功能描述:广告数据驾驶舱
      * @return ModelAndView
-     *                
-     *                      
+     *
+     *
      */
     @GetMapping("/adDataCockpit")
     @Security(token = StatisticsSecurityToken.STATISTICS_AD_SKY_EYE_MONITORING_MANAGE)
@@ -94,10 +81,10 @@ public class DataCockpitController {
      * 功能描述:广告数据驾驶舱统计数量
      * @param regionProvince
      * @return ResultBean<Map<String,Object>>
-     *                
-     *                      
+     *
+     *
      */
-    @PostMapping("/adDataCockpitCount")
+   /* @PostMapping("/adDataCockpitCount")
     @Security(token = StatisticsSecurityToken.STATISTICS_AD_SKY_EYE_MONITORING_MANAGE,format = DataFormatEnum.JSON)
     public ResultBean<Map<String,Object>> adDataCockpitCount(String regionProvince){
         Map<String,Object> resultMap=new HashMap<>(OperationConstant.FIVE);
@@ -158,16 +145,16 @@ public class DataCockpitController {
         resultMap.put("adWatchCountDayOfLastWeek",adWatchCountDayOfLastWeek);
 
         return  new ResultBean<>(ResultEnum.SUCCESS,resultMap);
-    }
+    }*/
 
     /**
      * 功能描述:广告观看量TOP10城市
      * @param dto
      * @return ResultBean<List<Map<String, Object>>>
-     *                
-     *                      
+     *
+     *
      */
-    @PostMapping("/statisticsAdWatchRankForArea")
+   /* @PostMapping("/statisticsAdWatchRankForArea")
     @Security(token = StatisticsSecurityToken.STATISTICS_AD_SKY_EYE_MONITORING_MANAGE,format = DataFormatEnum.JSON)
     public ResultBean<List<Map<String, Object>>> statisticsAdWatchRankForArea(StatisticsAdWatchDto dto){
         //登录用户
@@ -178,16 +165,16 @@ public class DataCockpitController {
         dto.setPage(page);
         List<Map<String, Object>> maps = statisticsAdWatchFeign.statisticsAdWatchRankForArea(dto);
         return new ResultBean<List<Map<String, Object>>>(ResultEnum.SUCCESS,maps);
-    }
+    }*/
 
     /**
      * 功能描述:广告分布区域
      * @param dto
      * @return ResultBean<List<Map<String, Object>>>
-     *                
-     *                      
+     *
+     *
      */
-    @PostMapping("/statisticsAdPushAndExposureByArea")
+   /* @PostMapping("/statisticsAdPushAndExposureByArea")
     @Security(token = StatisticsSecurityToken.STATISTICS_AD_SKY_EYE_MONITORING_MANAGE,format = DataFormatEnum.JSON)
     public ResultBean<List<Map<String, Object>>> statisticsAdPushAndExposureByArea(StatisticsAdPushDto dto){
         //登录用户
@@ -215,7 +202,7 @@ public class DataCockpitController {
             return new ResultBean<List<Map<String, Object>>>(ResultEnum.SUCCESS,resultList);
         }
         return  new ResultBean<List<Map<String, Object>>>(ResultEnum.SUCCESS);
-    }
+    }*/
 
     /**
      * 功能描述:广告区域线上线下分布
@@ -223,7 +210,7 @@ public class DataCockpitController {
      * @param dto
      * @return ResultBean<List < Map < String, Object>>>
      */
-    @PostMapping("/statisticsAdPushAndExposureByAreaAndOffline")
+    /*@PostMapping("/statisticsAdPushAndExposureByAreaAndOffline")
     @Security(token = StatisticsSecurityToken.STATISTICS_AD_SKY_EYE_MONITORING_MANAGE, format = DataFormatEnum.JSON)
     public ResultBean<List<Map<String, Object>>> statisticsAdPushAndExposureByAreaAndOffline(StatisticsAdPushDto dto) {
         Account onLineUser = securityServiceInterface.getOnLineUser();
@@ -254,7 +241,7 @@ public class DataCockpitController {
             return new ResultBean<List<Map<String, Object>>>(ResultEnum.SUCCESS, resultList);
         }
         return new ResultBean<List<Map<String, Object>>>(ResultEnum.SUCCESS);
-    }
+    }*/
 /**
      * 功能描述:广告月度(每日)观看趋势
      *
@@ -262,7 +249,7 @@ public class DataCockpitController {
      * @return ResultBean<List < Map < String, Object>>>
      */
 
-    @PostMapping("/statisticsAdWatchCountChartByDateType")
+    /*@PostMapping("/statisticsAdWatchCountChartByDateType")
     @Security(token = StatisticsSecurityToken.STATISTICS_AD_SKY_EYE_MONITORING_MANAGE,format = DataFormatEnum.JSON)
     public ResultBean<List<Map<String, Object>>> statisticsAdWatchCountChartByDateType(StatisticsAdWatchDto dto){
         //登录用户
@@ -272,7 +259,7 @@ public class DataCockpitController {
 
         List<Map<String, Object>> maps = statisticsAdWatchFeign.statisticsAdWatchCountChartByDateType(dto);
         return new ResultBean<List<Map<String, Object>>>(ResultEnum.SUCCESS,maps);
-    }
+    }*/
 
    /**
      * 功能描述:广告月度线上线下投放折线图
@@ -280,7 +267,7 @@ public class DataCockpitController {
      * @param year
      * @return ResultBean<List < Map < String, Object>>>
      */
-    @PostMapping("/statisticsAdCountByDateType")
+    /*@PostMapping("/statisticsAdCountByDateType")
     @Security(token = StatisticsSecurityToken.STATISTICS_AD_SKY_EYE_MONITORING_MANAGE, format = DataFormatEnum.JSON)
     public ResultBean<List<Map<String, Object>>> statisticsAdCountByDateType(String year,String month) {
         Account onLineUser = securityServiceInterface.getOnLineUser();
@@ -297,7 +284,7 @@ public class DataCockpitController {
             }
         }
         return new ResultBean<List<Map<String, Object>>>(ResultEnum.SUCCESS, maps);
-    }
+    }*/
 /**
      * 功能描述:广告观看明细
      *
@@ -305,7 +292,7 @@ public class DataCockpitController {
      * @return ResultBean<List < StatisticsAdWatch>>
      */
 
-    @PostMapping("/statisticsAdWatchRank")
+    /*@PostMapping("/statisticsAdWatchRank")
     @Security(token = StatisticsSecurityToken.STATISTICS_AD_SKY_EYE_MONITORING_MANAGE,format = DataFormatEnum.JSON)
     public ResultBean<List<StatisticsAdWatch>> statisticsAdWatchRank(StatisticsAdWatchDto dto){
         //登录用户
@@ -331,16 +318,16 @@ public class DataCockpitController {
             return new ResultBean<List<StatisticsAdWatch>>(ResultEnum.SUCCESS,page2.getRecords());
         }
         return  new ResultBean<List<StatisticsAdWatch>>(ResultEnum.SUCCESS);
-    }
+    }*/
 
     /**
      * 功能描述:广告类别观看分布
      * @param dto
      * @return ResultBean<List<Map<String, Object>>>
-     *                
-     *                      
+     *
+     *
      */
-    @PostMapping("/statisticsAdWatchRankForAdType")
+   /* @PostMapping("/statisticsAdWatchRankForAdType")
     @Security(token = StatisticsSecurityToken.STATISTICS_AD_SKY_EYE_MONITORING_MANAGE,format = DataFormatEnum.JSON)
     public  ResultBean<List<Map<String, Object>>> statisticsAdWatchRankForAdType(StatisticsAdWatchDto dto) {
         //登录用户
@@ -353,14 +340,14 @@ public class DataCockpitController {
         dto.setPage(page);
         List<Map<String, Object>> maps = statisticsAdWatchFeign.statisticsAdWatchRankForAdType(dto);
         return  new ResultBean<List<Map<String, Object>>>(ResultEnum.SUCCESS,maps);
-    }
+    }*/
 
     /**--------------------------------------------首页数据驾驶舱---------------------------------------------------**/
     /**
      * 功能描述:首页数据驾驶舱
      * @return ModelAndView
-     *                
-     *                      
+     *
+     *
      */
     @GetMapping("/homeDataCockpit")
     @Security(token = StatisticsSecurityToken.STATISTICS_HOME_SKY_EYE_MONITORING_MANAGE)
@@ -372,10 +359,10 @@ public class DataCockpitController {
     /**
      * 功能描述:首页数据驾驶舱广告统计数量
      * @return ResultBean<Map<String,Object>>
-     *                
-     *                      
+     *
+     *
      */
-    @PostMapping("/homeAdDataCockpitCount")
+    /*@PostMapping("/homeAdDataCockpitCount")
     @Security(token = StatisticsSecurityToken.STATISTICS_HOME_SKY_EYE_MONITORING_MANAGE,format = DataFormatEnum.JSON)
     public ResultBean<Map<String,Object>> homeAdDataCockpitCount(){
         Map<String,Object> resultMap=new HashMap<>(OperationConstant.THREE);
@@ -408,14 +395,14 @@ public class DataCockpitController {
         resultMap.put("adExposureCount",adExposureCount);
         resultMap.put("adWatchCount",adWatchCount);
         return  new ResultBean<Map<String,Object>>(ResultEnum.SUCCESS,resultMap);
-    }
+    }*/
 
     /**
      * 功能描述:首页数据驾驶舱物业统计数量
      * @param
      * @return ResultBean<Map<String,Object>>
-     *                
-     *                      
+     *
+     *
      */
     @PostMapping("/homeEstateDataCockpitCount")
     @Security(token = StatisticsSecurityToken.STATISTICS_HOME_SKY_EYE_MONITORING_MANAGE,format = DataFormatEnum.JSON)
@@ -466,10 +453,10 @@ public class DataCockpitController {
     /**
      * 功能描述:广告每日观看趋势(广告观看次数，设备开门次数)
      * @return ResultBean<Map<String,Object>>
-     *                
-     *                      
+     *
+     *
      */
-    @PostMapping("/homeAdWatchDay")
+    /*@PostMapping("/homeAdWatchDay")
     @Security(token = StatisticsSecurityToken.STATISTICS_HOME_SKY_EYE_MONITORING_MANAGE,format = DataFormatEnum.JSON)
     public ResultBean<Map<String,Object>> homeAdWatchDay(){
         //用户
@@ -489,13 +476,13 @@ public class DataCockpitController {
         List<Map<String, Object>> accessCountForDay = this.accessRecordsFeign.accessCountListForGroupType(accessRecordsDto);
         resultMap.put("accessCountForDay",accessCountForDay);
         return  new ResultBean<>(ResultEnum.SUCCESS,resultMap);
-    }
+    }*/
 
     /**
      * 功能描述:设备分布区域
      * @return ResultBean<List<Map<String,Object>>>
-     *                
-     *                      
+     *
+     *
      */
     @PostMapping("/homeDeviceCountDistribution")
     @Security(token = StatisticsSecurityToken.STATISTICS_HOME_SKY_EYE_MONITORING_MANAGE,format = DataFormatEnum.JSON)
@@ -526,8 +513,8 @@ public class DataCockpitController {
     /**
      * 功能描述:城市物业明细
      * @return ResultBean<List<Map<String,Object>>>
-     *                
-     *                      
+     *
+     *
      */
     @PostMapping("/homeCityEstateDetail")
     @Security(token = StatisticsSecurityToken.STATISTICS_HOME_SKY_EYE_MONITORING_MANAGE,format = DataFormatEnum.JSON)
@@ -558,8 +545,8 @@ public class DataCockpitController {
     /**
      * 功能描述:开门方式
      * @return  ResultBean<Map<String,Object>>
-     *                
-     *                     
+     *
+     *
      */
     @PostMapping("/homeOpenWay")
     @Security(token = StatisticsSecurityToken.STATISTICS_HOME_SKY_EYE_MONITORING_MANAGE,format = DataFormatEnum.JSON)
@@ -594,8 +581,8 @@ public class DataCockpitController {
     /**
      * 功能描述:住户认证
      * @return ResultBean<Map<String,Object>>
-     *                
-     *                     
+     *
+     *
      */
     @PostMapping("/homeAuthWay")
     @Security(token = StatisticsSecurityToken.STATISTICS_HOME_SKY_EYE_MONITORING_MANAGE,format = DataFormatEnum.JSON)
@@ -611,8 +598,8 @@ public class DataCockpitController {
     /**
      * 功能描述:用户类型
      * @return ResultBean<Map<String,Object>>
-     *                
-     *                     
+     *
+     *
      */
     @PostMapping("/homeUserType")
     @Security(token = StatisticsSecurityToken.STATISTICS_HOME_SKY_EYE_MONITORING_MANAGE,format = DataFormatEnum.JSON)
@@ -637,8 +624,8 @@ public class DataCockpitController {
     /**
      * 功能描述:移动端用户
      * @return Map<String,Object>
-     *                
-     *                     
+     *
+     *
      */
     @PostMapping("/homeMobileUser")
     @Security(token = StatisticsSecurityToken.STATISTICS_HOME_SKY_EYE_MONITORING_MANAGE,format = DataFormatEnum.JSON)
@@ -655,8 +642,8 @@ public class DataCockpitController {
     /**
      * 功能描述:物业数据驾驶舱
      * @return ModelAndView
-     *                
-     *                      
+     *
+     *
      */
     @GetMapping("/estateDataCockpit")
     @Security(token = StatisticsSecurityToken.STATISTICS_ESTATE_SKY_EYE_MONITORING_MANAGE)
@@ -668,8 +655,8 @@ public class DataCockpitController {
     /**
      * 功能描述:物业数据驾驶舱数量统计
      * @return ResultBean<Map<String,Object>>
-     *                
-     *                      
+     *
+     *
      */
     @PostMapping("/estateDataCockpitCount")
     @Security(token = StatisticsSecurityToken.STATISTICS_ESTATE_SKY_EYE_MONITORING_MANAGE,format = DataFormatEnum.JSON)
@@ -719,8 +706,8 @@ public class DataCockpitController {
      * 功能描述:开门方式
      * @param selectDateType 查询时间类型   0 按天 1 按周 2 按月 3 按年
      * @return  ResultBean<Map<String,Object>>
-     *                
-     *                     
+     *
+     *
      */
     @PostMapping("/estateOpenWay")
     @Security(token = StatisticsSecurityToken.STATISTICS_ESTATE_SKY_EYE_MONITORING_MANAGE,format = DataFormatEnum.JSON)
@@ -771,8 +758,8 @@ public class DataCockpitController {
      * 功能描述:开门数据统计图
      * @param groupType 数据分组类型  0 按时  1按日 2按周  3按月
      * @return ResultBean<List<Map<String, Object>>>
-     *                
-     *                      
+     *
+     *
      */
     @PostMapping("/estateOpenCountLineChart")
     @Security(token = StatisticsSecurityToken.STATISTICS_ESTATE_SKY_EYE_MONITORING_MANAGE,format = DataFormatEnum.JSON)
@@ -791,8 +778,8 @@ public class DataCockpitController {
      * 功能描述:查询所有设备开门次数
      * @param selectDateType 查询时间类型   0 按天 1 按周 2 按月 3 按年
      * @return ResultBean<List<Map<String, Object>>>
-     *                
-     *                      
+     *
+     *
      */
     @PostMapping("/getDeviceOpenCountList")
     @Security(token = StatisticsSecurityToken.STATISTICS_ESTATE_SKY_EYE_MONITORING_MANAGE,format = DataFormatEnum.JSON)
@@ -817,8 +804,8 @@ public class DataCockpitController {
      * 功能描述:获取最新开门记录
      * @param beginDate 查询时间
      * @return ResultBean<List<AccessRecords>>
-     *                
-     *                      
+     *
+     *
      */
     @PostMapping("/getNewAccessRecordsList")
     @Security(token = StatisticsSecurityToken.STATISTICS_ESTATE_SKY_EYE_MONITORING_MANAGE,format = DataFormatEnum.JSON)

sptg-gateway/sptg-housekeeper-gateway/src/main/java/com/sptg/gateway/service/impl/PayCertificateCsvServiceImpl.java

@@ -1,128 +0,0 @@
-package com.sptg.gateway.service.impl;
-
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.common.core.beans.ResultEnum;
-import com.sptg.gateway.service.CsvService;
-import com.sptg.pay.api.dto.PayCertificateDto;
-import com.sptg.pay.api.entity.PayCertificate;
-import com.sptg.pay.api.feigns.PayCertificateFeign;
-import lombok.RequiredArgsConstructor;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.stereotype.Service;
-
-import java.math.BigDecimal;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * @author xuanyan
- * @date 2020/7/10 10:56
- */
-@Service
-@RequiredArgsConstructor
-public class PayCertificateCsvServiceImpl implements CsvService {
-    @Override
-    public String getFlag() {
-        return "csv_pay_certificate";
-    }
-
-    @Override
-    public String getTemplateName() {
-        return "支付凭证导入模板";
-    }
-
-    private final PayCertificateFeign payCertificateFeign;
-
-    @Override
-    public ResultBean<?> save(Object data) {
-        PayCertificate payCertificate = payCertificateFeign.addPayCertificateByImport((PayCertificateDto) data);
-        if (null != payCertificate){
-            return ResultBean.ok();
-        }
-        return new ResultBean<>(ResultEnum.ERROR);
-    }
-
-    @Override
-    public Object arrToObj(String[] array) throws ParseException {
-        PayCertificateDto payCertificateDto = new PayCertificateDto();
-        SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        //原始数据id(必填)
-        String oldId = array[0];
-        payCertificateDto.setOldId(Long.valueOf(oldId));
-        //原始数据订单id(必填)
-        String oldOrderId = array[1];
-        payCertificateDto.setOldOrderId(oldOrderId);
-        //支付渠道(必填)
-        String channelCode = array[2];
-        payCertificateDto.setChannelCode(channelCode);
-        //支付凭证(选填)
-        String certificate = array[3];
-        if (StringUtils.isNotEmpty(certificate)){
-            payCertificateDto.setCertificate(certificate);
-        }
-        //凭证失效时间(选填)
-        String expireTime = array[4];
-        if (StringUtils.isNotEmpty(expireTime)){
-            payCertificateDto.setExpireTime(ft.parse(expireTime));
-        }
-        //付款状态(必填)
-        String payStatus = array[5];
-        payCertificateDto.setPayStatus(Integer.valueOf(payStatus));
-        //支付时间(选填)
-        String payTime = array[6];
-        if (StringUtils.isNotEmpty(payTime)){
-            payCertificateDto.setPayTime(ft.parse(payTime));
-        }
-        //支付回调信息(选填)
-        String notify = array[7];
-        if (StringUtils.isNotEmpty(notify)){
-            payCertificateDto.setNotify(notify);
-        }
-        //是否退款(选填)
-        String refund = array[8];
-        if (StringUtils.isNotEmpty(refund)){
-            payCertificateDto.setRefund(Integer.valueOf(refund));
-        }
-        //支付金额(必填)
-        String payment = array[9];
-        payCertificateDto.setPayment(new BigDecimal(payment));
-        //原始数据用户id(必填)
-        String oldUserId = array[10];
-        payCertificateDto.setOldUserId(oldUserId);
-        //是否能退款(选填)
-        String canRefund = array[11];
-        if (StringUtils.isNotEmpty(canRefund)){
-            payCertificateDto.setCanRefund(Integer.valueOf(canRefund));
-        }
-        //是否已发起退款申请(选填)
-        String applyRefund = array[12];
-        if (StringUtils.isNotEmpty(applyRefund)){
-            payCertificateDto.setApplyRefund(Integer.valueOf(applyRefund));
-        }
-        return payCertificateDto;
-    }
-
-    private final static List<String> HEADER_LIST = new ArrayList<>(Arrays.asList(
-            "原始数据id(必填)",
-            "原始数据订单id(必填)",
-            "支付渠道(必填)",
-            "支付凭证(选填)",
-            "凭证失效时间(选填)",
-            "付款状态(必填)",
-            "支付时间(选填)",
-            "支付回调信息(选填)",
-            "是否退款(选填)",
-            "支付金额(必填)",
-            "原始数据用户id(必填)",
-            "是否能退款(选填)",
-            "是否已发起退款申请(选填)"
-    ));
-
-    @Override
-    public List<String> getHeaderList() {
-        return HEADER_LIST;
-    }
-}

sptg-gateway/sptg-housekeeper-gateway/src/main/java/com/sptg/gateway/service/impl/UserOrderCsvServiceImpl.java

@@ -1,213 +0,0 @@
-package com.sptg.gateway.service.impl;
-
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.common.core.beans.ResultEnum;
-import com.sptg.gateway.service.CsvService;
-import com.sptg.pay.api.dto.UserOrderDto;
-import com.sptg.pay.api.entity.UserOrder;
-import com.sptg.pay.api.feigns.UserOrderFeign;
-import lombok.RequiredArgsConstructor;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.stereotype.Service;
-
-import java.math.BigDecimal;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * @author xuanyan
- * @date 2020/7/9 14:54
- */
-@Service
-@RequiredArgsConstructor
-public class UserOrderCsvServiceImpl implements CsvService {
-    @Override
-    public String getFlag() {
-        return "csv_user_order";
-    }
-
-    @Override
-    public String getTemplateName() {
-        return "订单导入模板";
-    }
-
-    private final UserOrderFeign userOrderFeign;
-
-    @Override
-    public ResultBean<?> save(Object data) {
-        UserOrder userOrder = userOrderFeign.addUserOrderByImport((UserOrderDto) data);
-        if (null != userOrder){
-            return ResultBean.ok();
-        }
-        return new ResultBean<>(ResultEnum.ERROR);
-    }
-
-    @Override
-    public Object arrToObj(String[] array) throws ParseException {
-        UserOrderDto userOrderDto = new UserOrderDto();
-        SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        //订单号(必填)
-        String orderNo = array[0];
-        if (StringUtils.isNotEmpty(orderNo)){
-            userOrderDto.setBizOrderNo(orderNo);
-        }
-
-        //订单类型(必填)
-        String orderType = array[1];
-        if (StringUtils.isNotEmpty(orderType)){
-            userOrderDto.setOrderType(orderType);
-        }
-
-        //应付款(必填)
-        String shouldPayAmount = array[3];
-        if (StringUtils.isNotEmpty(shouldPayAmount)){
-            userOrderDto.setShouldPayAmount(new BigDecimal(shouldPayAmount));
-        }
-
-        //实际付款(必填)
-        String actualPayAmount = array[4];
-        if (StringUtils.isNotEmpty(actualPayAmount)){
-            userOrderDto.setActualPayAmount(new BigDecimal(actualPayAmount));
-        }
-
-        //支付状态(必填)1 未支付 2 已支付
-        String payStatus = array[6];
-        if (StringUtils.isNotEmpty(payStatus)){
-            userOrderDto.setPayStatus(Integer.valueOf(payStatus));
-        }
-
-        //支付方式(必填)
-        String payType = array[7];
-        if (StringUtils.isNotEmpty(payType)){
-            userOrderDto.setPayType(payType);
-        }
-
-        //支付时间(必填)
-        String payTime = array[8];
-        if (StringUtils.isNotEmpty(payTime)){
-            userOrderDto.setPayTime(ft.parse(payTime));
-        }
-
-        //订单原始数据id(必填)
-        String oldId = array[18];
-        userOrderDto.setOldId(oldId);
-
-        //用户原始数据id(必填) 通过id找user表得用户name等
-        String oldUserId = array[19];
-        userOrderDto.setOldUserId(oldUserId);
-
-        //商品原始数据id(必填)
-        String oldGoodsId = array[20];
-        userOrderDto.setOldGoodsId(oldGoodsId);
-
-        //小区原始数据id(必填) 通过id找name
-        String oldResidentialId = array[21];
-        if (StringUtils.isNotEmpty(oldResidentialId)){
-            userOrderDto.setOldResidentialId(oldResidentialId);
-        }
-
-        //单元原始数据id(必填) 通过id找name
-        String oldUnitId = array[22];
-        if (StringUtils.isNotEmpty(oldUnitId)){
-            userOrderDto.setOldUnitId(oldUnitId);
-        }
-
-        //房间原始数据id(必填) 通过id找name
-        String oldRoomId = array[23];
-        if (StringUtils.isNotEmpty(oldRoomId)){
-            userOrderDto.setOldRoomId(oldRoomId);
-        }
-
-        //订单描述(选填)
-        String description = array[2];
-        if (StringUtils.isNotEmpty(description)){
-            userOrderDto.setDescription(description);
-        }
-        //抵扣金额(选填)
-        String offsetAmount = array[5];
-        if (StringUtils.isNotEmpty(offsetAmount)){
-            userOrderDto.setOffsetAmount(new BigDecimal(offsetAmount));
-        }
-        //是否收费(选填)
-        String isCharge = array[9];
-        if (StringUtils.isNotEmpty(isCharge)){
-            userOrderDto.setIsCharge(Integer.valueOf(isCharge));
-        }
-        //第三方订单号(选填)
-        String transactionId = array[10];
-        if (StringUtils.isNotEmpty(transactionId)){
-            userOrderDto.setTransactionId(transactionId);
-        }
-        //是否退款(选填)
-        String refund = array[11];
-        if (StringUtils.isNotEmpty(refund)){
-            userOrderDto.setRefund(Integer.valueOf(refund));
-        }
-        //退款金额(选填)
-        String refundFee = array[12];
-        if (StringUtils.isNotEmpty(refundFee)){
-            userOrderDto.setRefundFee(new BigDecimal(refundFee));
-        }
-        //退款时间(选填)
-        String refundDate = array[13];
-        if (StringUtils.isNotEmpty(refundDate)){
-            userOrderDto.setRefundDate(ft.parse(refundDate));
-        }
-        //手机型号(选填)
-        String phoneType = array[14];
-        if (StringUtils.isNotEmpty(phoneType)){
-            userOrderDto.setPhoneType(phoneType);
-        }
-        //费用类型(选填)
-        String feeType = array[15];
-        if (StringUtils.isNotEmpty(feeType)){
-            userOrderDto.setFeeType(feeType);
-        }
-        //费用规则(选填)
-        String feeRule = array[16];
-        if (StringUtils.isNotEmpty(feeRule)){
-            userOrderDto.setFeeRule(feeRule);
-        }
-        //地点(选填)
-        String address = array[17];
-        if (StringUtils.isNotEmpty(address)){
-            userOrderDto.setAddress(address);
-        }
-        return userOrderDto;
-    }
-
-    private final static List<String> HEADER_LIST = new ArrayList<>(Arrays.asList(
-            "订单号(必填)",
-            "订单类型(必填)",
-            "订单描述(选填)",
-            "应付款(必填)",
-            "实际付款(必填)",
-            "抵扣金额(选填)",
-            "支付状态(必填)",
-            "支付方式(必填)",
-            "支付时间(必填)",
-            "是否收费(选填)",
-            "第三方订单号(选填)",
-            "是否退款(选填)",
-            "退款金额(选填)",
-            "退款时间(选填)",
-            "手机型号(选填)",
-            "费用类型(选填)",
-            "费用规则(选填)",
-            "地点(选填)",
-            "订单原始数据id(必填)",
-            "用户原始数据id(必填)",
-            "人脸商品原始数据id(必填)",
-            "小区原始数据id(必填)",
-            "单元原始数据id(必填)",
-            "房间原始数据id(必填)"
-    ));
-
-    @Override
-    public List<String> getHeaderList() {
-        return HEADER_LIST;
-    }
-}

sptg-permissions/sptg-permissions-biz/src/main/java/com/sptg/permissions/biz/PermissionsApplication.java

@@ -30,13 +30,11 @@ import com.sptg.permissions.biz.stream.SyncAccountProduceInterface;
 @EnableFeignClients(basePackages = {
         "com.sptg.device.api.feigns",
         "com.sptg.estate.api.feigns",
-        "com.sptg.third.api.feigns"
 })
 @ComponentScan(basePackages = {
         "com.sptg.permissions.biz",
         "com.sptg.device.api.feigns",
         "com.sptg.estate.api.feigns",
-        "com.sptg.third.api.feigns"
 })
 @EnableBinding(value = { SyncAccountProduceInterface.class, AccountDisableProduceInterface.class, DeviceUpdateProduceInterface.class})
 public class PermissionsApplication {

sptg-permissions/sptg-permissions-biz/src/main/java/com/sptg/permissions/biz/controller/AccountController.java

@@ -1,8 +1,5 @@
 package com.sptg.permissions.biz.controller;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.json.JSON;
-import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.plugins.Page;
@@ -10,42 +7,27 @@ import com.sptg.common.core.beans.PageBean;
 import com.sptg.common.core.beans.ResultBean;
 import com.sptg.common.core.beans.ResultEnum;
 import com.sptg.common.core.constant.OperationConstant;
-import com.sptg.common.core.constant.UserFlagConstant;
-import com.sptg.common.core.util.CommonUtil;
-import com.sptg.device.api.entity.Device;
-import com.sptg.device.api.feigns.DeviceFeign;
-import com.sptg.device.api.vo.DeviceVO;
-import com.sptg.permissions.api.constant.ConfTokenName;
 import com.sptg.permissions.api.dto.AccountDto;
 import com.sptg.permissions.api.dto.AccountRoleDto;
 import com.sptg.permissions.api.dto.OrgDto;
 import com.sptg.permissions.api.entity.Account;
-import com.sptg.permissions.api.entity.AccountRole;
-import com.sptg.permissions.api.entity.Conf;
 import com.sptg.permissions.api.entity.Organization;
 import com.sptg.permissions.api.enums.PermissionsEnum;
 import com.sptg.permissions.api.feigns.AccountFeign;
 import com.sptg.permissions.api.feigns.OrgFeign;
 import com.sptg.permissions.biz.service.AccountRoleServiceInterface;
 import com.sptg.permissions.biz.service.AccountServiceInterface;
-import com.sptg.permissions.biz.service.ConfServiceInterface;
 import com.sptg.permissions.biz.service.OrgServiceInterface;
 import com.sptg.permissions.biz.stream.AccountDisableProduceInterface;
-import com.sptg.third.api.entity.qinlin.QLinUser;
-import com.sptg.third.api.feigns.qinlin.QLinFeign;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.support.MessageBuilder;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.*;
 
-import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.concurrent.locks.Condition;
-import java.util.stream.Collectors;
 
 /**
  * title: AccountController
@@ -60,9 +42,6 @@ public class AccountController implements AccountFeign {
     private final OrgServiceInterface orgServiceInterface;
     private final AccountDisableProduceInterface accountDisableProduceInterface;
     private final OrgFeign orgFeign;
-    private final QLinFeign qLinFeign;
-    private final ConfServiceInterface confServiceInterface;
-    private final DeviceFeign deviceFeign;
     private final AccountRoleServiceInterface accountRoleServiceInterface;
 
     @Override
@@ -86,7 +65,7 @@ public class AccountController implements AccountFeign {
         //  账号归属机构设置
         this.accountOrganizationSetUp(dto, organization);
         ResultBean<Account> resultBean = this.accountServiceInterface.addEntity(dto);
-        //检查是否有亲邻设备，有则添加用户到亲邻设备上，不然无法在后台远程开门
+        /*//检查是否有亲邻设备，有则添加用户到亲邻设备上，不然无法在后台远程开门
         DeviceVO deviceVO = new DeviceVO();
         deviceVO.setOrgPosition(dto.getOrgPosition());
         List<Device> deviceList = this.deviceFeign.getListByOrgPosition(deviceVO);
@@ -111,7 +90,7 @@ public class AccountController implements AccountFeign {
             qLinUser.setDeviceIds(String.join(",", deviceIds));
             System.out.println(JSONUtil.toJsonStr(qLinUser));
             this.qLinFeign.addUser(qLinUser);
-        }
+        }*/
         return resultBean;
     }
 

sptg-statistics/sptg-statistics-api/src/main/java/com/sptg/statistics/api/feigns/fallback/StatisticsAdPushCountFeignFallbackFactory.java

@@ -1,53 +0,0 @@
-package com.sptg.statistics.api.feigns.fallback;
-
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.common.core.beans.ResultEnum;
-import com.sptg.statistics.api.dto.StatisticsAdPushCountDto;
-import com.sptg.statistics.api.entity.StatisticsAdPushCount;
-import com.sptg.statistics.api.feigns.StatisticsAdPushCountFeign;
-import feign.hystrix.FallbackFactory;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-/**
- * title: StatisticsFeignFallbackFactory
- * package: com.sptg.statistics.api.feigns.fallback
- * description: 统计广告发布数量-服务容错处理
- *
- *                
- *                
- */
-@Component
-@Slf4j
-public class StatisticsAdPushCountFeignFallbackFactory implements FallbackFactory<StatisticsAdPushCountFeign> {
-
-    @Override
-    public StatisticsAdPushCountFeign create(Throwable cause) {
-        return new StatisticsAdPushCountFeign(){
-
-            @Override
-            public StatisticsAdPushCount getStatisticsAdPushCountByTaskId(StatisticsAdPushCountDto statisticsAdPushCountDto) {
-                log.error(cause.getMessage(),cause);
-                return null;
-            }
-
-            @Override
-            public ResultBean<Boolean> addAdPushCount(StatisticsAdPushCountDto statisticsAdPushCountDto) {
-                log.error(cause.getMessage(),cause);
-                return new ResultBean<>(ResultEnum.ERROR,false);
-            }
-
-            @Override
-            public ResultBean<Long> getAdPushCount(StatisticsAdPushCountDto statisticsAdPushCountDto) {
-                log.error(cause.getMessage(),cause);
-                return new ResultBean<>(ResultEnum.ERROR,0L);
-            }
-
-            @Override
-            public ResultBean<Boolean> updateAdPushState(StatisticsAdPushCountDto statisticsAdPushCountDto) {
-                log.error(cause.getMessage(),cause);
-                return new ResultBean<>(ResultEnum.ERROR,false);
-            }
-        };
-    }
-}

sptg-statistics/sptg-statistics-api/src/main/java/com/sptg/statistics/api/feigns/fallback/StatisticsAdPushFeignFallbackFactory.java

@@ -1,81 +0,0 @@
-package com.sptg.statistics.api.feigns.fallback;
-
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.common.core.beans.ResultEnum;
-import com.sptg.common.core.constant.OperationConstant;
-import com.sptg.statistics.api.dto.StatisticsAdPushDto;
-import com.sptg.statistics.api.entity.StatisticsAdPush;
-import com.sptg.statistics.api.feigns.StatisticsAdPushFeign;
-import feign.hystrix.FallbackFactory;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * title: StatisticsFeignFallbackFactory
- * package: com.sptg.statistics.api.feigns.fallback
- * description: 广告发布统计服务容错处理
- *
- *                
- *                 
- */
-@Component
-@Slf4j
-public class StatisticsAdPushFeignFallbackFactory implements FallbackFactory<StatisticsAdPushFeign> {
-
-    @Override
-    public StatisticsAdPushFeign create(Throwable cause) {
-        return new StatisticsAdPushFeign(){
-            @Override
-            public ResultBean<Boolean> addAdPush(StatisticsAdPush statisticsAdPush) {
-                log.error(cause.getMessage(),cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public ResultBean<Boolean> addAdPushList(List<StatisticsAdPush> statisticsAdPushList) {
-                log.error(cause.getMessage(),cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public ResultBean<Map<String, Object>> statisticsAdPushTotal(StatisticsAdPushDto statisticsAdPushDto) {
-                log.error(cause.getMessage(),cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public ResultBean<Map<String, Object>> statisticsCurrentMonthAdPushTotal(StatisticsAdPushDto statisticsAdPushDto) {
-                log.error(cause.getMessage(),cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public ResultBean<List<Map<String, Object>>> statisticsAdPushAndExposure(StatisticsAdPushDto statisticsAdPushDto) {
-                log.error(cause.getMessage(),cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-
-            @Override
-            public List<Map<String, Object>> statisticsAdPushAndExposureByArea(StatisticsAdPushDto statisticsAdPushDto) {
-                log.error(cause.getMessage(),cause);
-                return new ArrayList<>(OperationConstant.ZERO);
-            }
-
-            @Override
-            public Long statisticsAdPushCount(StatisticsAdPushDto statisticsAdPushDto) {
-                log.error(cause.getMessage(),cause);
-                return 0L;
-            }
-
-            @Override
-            public ResultBean<Map<String, Long>> getAdPushAccount(StatisticsAdPushDto statisticsAdPushDto) {
-                return null;
-            }
-        };
-    }
-}

sptg-statistics/sptg-statistics-api/src/main/java/com/sptg/statistics/api/feigns/fallback/StatisticsAdWatchFeignFallBackFactory.java

@@ -1,143 +0,0 @@
-package com.sptg.statistics.api.feigns.fallback;
-
-import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.common.core.beans.PageBean;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.common.core.beans.ResultEnum;
-import com.sptg.common.core.constant.OperationConstant;
-import com.sptg.statistics.api.dto.StatisticsAdClickMobileDto;
-import com.sptg.statistics.api.dto.StatisticsAdPlayFreeTimeDto;
-import com.sptg.statistics.api.dto.StatisticsAdWatchDto;
-import com.sptg.statistics.api.entity.StatisticsAdClickMobile;
-import com.sptg.statistics.api.entity.StatisticsAdPlayFreeTime;
-import com.sptg.statistics.api.entity.StatisticsAdWatch;
-import com.sptg.statistics.api.feigns.StatisticsAdWatchFeign;
-import feign.hystrix.FallbackFactory;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * title: VisitorFeignFallBackFactory
- * package: com.sptg.statistics.api.feigns.fallback
- * description: 广告观看统计容错处理
- *
- *                
- *                 
- */
-@Component
-@Slf4j
-public class StatisticsAdWatchFeignFallBackFactory implements FallbackFactory<StatisticsAdWatchFeign> {
-    @Override
-    public StatisticsAdWatchFeign create(Throwable cause) {
-        return new StatisticsAdWatchFeign() {
-            @Override
-            public ResultBean<Page<StatisticsAdWatch>> showStatisticsAdWatchList(StatisticsAdWatchDto statisticsAdWatchDto) {
-                log.error(cause.getMessage(),cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-            @Override
-            public ResultBean<Boolean> addAdWatch(StatisticsAdWatch statisticsAdWatch) {
-                log.error(cause.getMessage(),cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-            @Override
-            public ResultBean<Page<StatisticsAdWatch>> showStatisticsAdWatchRankList(StatisticsAdWatchDto statisticsAdWatchDto) {
-                log.error(cause.getMessage(),cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-            @Override
-            public ResultBean<Map<String, Object>> statisticsAdWatchCount(StatisticsAdWatchDto statisticsAdWatchDto) {
-                log.error(cause.getMessage(),cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public ResultBean<Long> statisticsAdWatchVisitorCount(StatisticsAdWatchDto statisticsAdWatchDto) {
-                log.error(cause.getMessage(),cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public ResultBean<List<Map<String, Object>>> statisticsAdWatchForChart(StatisticsAdWatchDto statisticsAdWatchDto) {
-                log.error(cause.getMessage(),cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public List<StatisticsAdWatch> getAdWatchList(StatisticsAdWatchDto statisticsAdWatchDto) {
-                log.error(cause.getMessage(),cause);
-                return new ArrayList<>(OperationConstant.ZERO);
-            }
-
-            @Override
-            public List<StatisticsAdWatch> getAdWatchRankList(StatisticsAdWatchDto statisticsAdWatchDto) {
-                log.error(cause.getMessage(),cause);
-                return  new ArrayList<>(OperationConstant.ZERO);
-            }
-
-            @Override
-            public List<Map<String, Object>> statisticsAdWatchRankForArea(StatisticsAdWatchDto statisticsAdWatchDto) {
-                log.error(cause.getMessage(),cause);
-                return new ArrayList<>(OperationConstant.ZERO);
-            }
-
-            @Override
-            public Long getAdWatchCount(StatisticsAdWatchDto statisticsAdWatchDto) {
-                log.error(cause.getMessage(),cause);
-                return 0L;
-            }
-
-            @Override
-            public List<Map<String, Object>> statisticsAdWatchCountChartByDateType(StatisticsAdWatchDto statisticsAdWatchDto) {
-                log.error(cause.getMessage(),cause);
-                return new ArrayList<>(OperationConstant.ZERO);
-            }
-
-            @Override
-            public List<Map<String, Object>> statisticsAdWatchRankForAdType(StatisticsAdWatchDto statisticsAdWatchDto) {
-                log.error(cause.getMessage(),cause);
-                return new ArrayList<>(OperationConstant.ZERO);
-            }
-
-            @Override
-            public List<Map<String, Object>> statisticsAdWatchPersonForDay(StatisticsAdWatchDto statisticsAdWatchDto) {
-                log.error(cause.getMessage(),cause);
-                return new ArrayList<>(OperationConstant.ZERO);
-            }
-
-            @Override
-            public ResultBean<List<Map<String, Object>>> getAdWatchCountList(StatisticsAdWatchDto statisticsAdWatchDto) {
-                log.error(cause.getMessage(),cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public ResultBean<Page<StatisticsAdPlayFreeTime>> showAdPlayFreeTimeRankList(PageBean<StatisticsAdPlayFreeTime, StatisticsAdPlayFreeTimeDto> pageBean) {
-                log.error(cause.getMessage(),cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public ResultBean<Page<StatisticsAdClickMobile>> showAdClickMobileRankList(PageBean<StatisticsAdClickMobile, StatisticsAdClickMobileDto> pageBean) {
-                log.error(cause.getMessage(),cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public ResultBean<Boolean> addAdClickMobile(StatisticsAdClickMobile statisticsAdClickMobile) {
-                log.error(cause.getMessage(),cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public Long getAdPlayCount(StatisticsAdPlayFreeTimeDto dto) {
-                log.error(cause.getMessage(),cause);
-                return null;
-            }
-        };
-    }
-}

sptg-statistics/sptg-statistics-biz/src/main/java/com/sptg/statistics/biz/StatisticsApplication.java

@@ -15,8 +15,8 @@ import org.springframework.scheduling.annotation.EnableAsync;
  * package: com.sptg.statistics.biz
  * description: 统计模块启动类
  *
- *                  
- *                 
+ *
+ *
  */
 @Slf4j
 @SpringBootApplication
@@ -26,12 +26,10 @@ import org.springframework.scheduling.annotation.EnableAsync;
 @EnableDistributedTransaction
 @EnableFeignClients(basePackages = {
         "com.sptg.permissions.api.feigns",
-        "com.sptg.ad.api.feigns"
 })
 @ComponentScan(value = {
         "com.sptg.statistics.biz",
         "com.sptg.permissions.api.feigns",
-        "com.sptg.ad.api.feigns"
 })
 public class StatisticsApplication {
 

sptg-statistics/sptg-statistics-biz/src/main/java/com/sptg/statistics/biz/mapper/StatisticsAdClickMobileMapper.java

@@ -1,45 +0,0 @@
-package com.sptg.statistics.biz.mapper;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.pagination.Pagination;
-import com.sptg.statistics.api.entity.StatisticsAdClickMobile;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.Update;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * title: StatisticsAdWatchMapper
- * package: com.sptg.statistics.biz.mapper
- * description:移动端广告点击-DAO接口
- *
- *                
- *               
- */
-public interface StatisticsAdClickMobileMapper extends BaseMapper<StatisticsAdClickMobile> {
-    /**
-     * 功能描述:更新记录机构位置
-     * @param oldPosition 旧机构位置
-     * @param newPosition 新机构位置
-     * @return int
-     *                
-     *                     
-     */
-    @Update("update  statistics_ad_click_mobile set   s_org_position=#{newPosition}  where s_org_position=#{oldPosition}")
-    public int updateOrgPosition(@Param(value = "oldPosition") String oldPosition, @Param(value = "newPosition") String newPosition);
-
-    /**
-     * 功能描述:获取广告类别观看数量
-     * @param page 分页
-     * @param wrapper
-     * @return  List<Map<String, Object>>
-     *                
-     *                     
-     */
-    @Select("select COUNT(1) AS adWatchCount,adw.l_ad_type_id AS adTypeId,adw.s_ad_type_name AS adTypeName,at.s_name AS adTypeName FROM " +
-            "sptg_statistics.statistics_ad_click_mobile adw,sptg_ad.ad_type at   WHERE adw.l_ad_type_id=at.l_id ${ew.sqlSegment}")
-    public List<Map<String, Object>> getAdWatchRankForAdTypeList(Pagination page, @Param(value = "ew") Wrapper<StatisticsAdClickMobile> wrapper);
-}

sptg-statistics/sptg-statistics-biz/src/main/java/com/sptg/statistics/biz/mapper/StatisticsAdPlayFreeTimeMapper.java

@@ -1,45 +0,0 @@
-package com.sptg.statistics.biz.mapper;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.pagination.Pagination;
-import com.sptg.statistics.api.entity.StatisticsAdPlayFreeTime;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.Update;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * title: StatisticsAdWatchMapper
- * package: com.sptg.statistics.biz.mapper
- * description:统计闲时广告播放-DAO接口
- *
- *                
- *               
- */
-public interface StatisticsAdPlayFreeTimeMapper extends BaseMapper<StatisticsAdPlayFreeTime> {
-    /**
-     * 功能描述:更新记录机构位置
-     * @param oldPosition 旧机构位置
-     * @param newPosition 新机构位置
-     * @return int
-     *                
-     *                     
-     */
-    @Update("update  statistics_ad_play_free_time set   s_org_position=#{newPosition}  where s_org_position=#{oldPosition}")
-    public int updateOrgPosition(@Param(value = "oldPosition") String oldPosition, @Param(value = "newPosition") String newPosition);
-
-    /**
-     * 功能描述:获取广告类别观看数量
-     * @param page
-     * @param wrapper
-     * @return  List<Map<String, Object>>
-     *                
-     *                     
-     */
-    @Select("select COUNT(1) AS adWatchCount,adw.l_ad_type_id AS adTypeId,adw.s_ad_type_name AS adTypeName,at.s_name AS adTypeName FROM " +
-            "sptg_statistics.statistics_ad_play_free_time adw,sptg_ad.ad_type at   WHERE adw.l_ad_type_id=at.l_id ${ew.sqlSegment}")
-    public List<Map<String, Object>> getAdWatchRankForAdTypeList(Pagination page, @Param(value = "ew") Wrapper<StatisticsAdPlayFreeTime> wrapper);
-}

sptg-statistics/sptg-statistics-biz/src/main/java/com/sptg/statistics/biz/mapper/StatisticsAdPushCountMapper.java

@@ -1,38 +0,0 @@
-package com.sptg.statistics.biz.mapper;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.sptg.statistics.api.entity.StatisticsAdPushCount;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Update;
-
-/**
- * title: StatisticsAdPushCountMapper
- * package: com.sptg.statistics.biz.mapper
- * description: 统计广告发布数量-DAO接口
- *
- *                
- *                
- */
-public interface StatisticsAdPushCountMapper extends BaseMapper<StatisticsAdPushCount> {
-    /**
-     * 功能描述:更新记录机构位置
-     * @param oldPosition 旧机构位置
-     * @param newPosition 新机构位置
-     * @return int
-     *                
-     *                      
-     */
-    @Update("update  statistics_ad_push_count set   s_org_position=#{newPosition}  where s_org_position=#{oldPosition}")
-    public int updateOrgPosition(@Param(value = "oldPosition") String oldPosition, @Param(value = "newPosition") String newPosition);
-
-    /**
-     * 功能描述:更新推送状态
-     * @param adPushTaskId 发布广告任务id
-     * @param pushState 推送状态 0推送中 1推送成功
-     * @return int
-     *                
-     *                      
-     */
-    @Update("update  statistics_ad_push_count set   i_push_state=#{pushState}  where l_ad_push_task_id=#{adPushTaskId}")
-    public int updatePushStateByTaskId(@Param(value = "adPushTaskId") long adPushTaskId, @Param(value = "pushState") int pushState);
-}

sptg-statistics/sptg-statistics-biz/src/main/java/com/sptg/statistics/biz/mapper/StatisticsAdPushMapper.java

@@ -1,28 +0,0 @@
-package com.sptg.statistics.biz.mapper;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.sptg.statistics.api.entity.StatisticsAdPush;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Update;
-
-/**
- * title: StatisticsMapper
- * package: com.sptg.statistics.biz.mapper
- * description: 广告发布统计-DAO接口
- *
- *                
- *                 
- */
-public interface StatisticsAdPushMapper extends BaseMapper<StatisticsAdPush> {
-
-    /**
-     * 功能描述:更新记录机构位置
-     * @param oldPosition 旧机构位置
-     * @param newPosition 新机构位置
-     * @return int
-     *                
-     *                       
-     */
-    @Update("update  statistics_ad_push set   s_org_position=#{newPosition}  where s_org_position=#{oldPosition}")
-    public int updateOrgPosition(@Param(value = "oldPosition")String oldPosition, @Param(value = "newPosition") String newPosition);
-}

sptg-statistics/sptg-statistics-biz/src/main/java/com/sptg/statistics/biz/mapper/StatisticsAdWatchMapper.java

@@ -1,45 +0,0 @@
-package com.sptg.statistics.biz.mapper;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.pagination.Pagination;
-import com.sptg.statistics.api.entity.StatisticsAdWatch;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.Update;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * title: StatisticsAdWatchMapper
- * package: com.sptg.statistics.biz.mapper
- * description:统计广告观看-DAO接口
- *
- *                
- *                
- */
-public interface StatisticsAdWatchMapper extends BaseMapper<StatisticsAdWatch> {
-    /**
-     * 功能描述:更新记录机构位置
-     * @param oldPosition 旧机构位置
-     * @param newPosition 新机构位置
-     * @return int
-     *                
-     *                       
-     */
-    @Update("update  statistics_ad_watch set   s_org_position=#{newPosition}  where s_org_position=#{oldPosition}")
-    public int updateOrgPosition(@Param(value = "oldPosition")String oldPosition, @Param(value = "newPosition") String newPosition);
-
-    /**
-     * 功能描述:获取广告类别观看数量
-     * @param page
-     * @param wrapper
-     * @return  List<Map<String, Object>>
-     *                
-     *                     
-     */
-    @Select("select COUNT(1) AS adWatchCount,adw.l_ad_type_id AS adTypeId,adw.s_ad_type_name AS adTypeName FROM " +
-            "sptg_statistics.statistics_ad_watch adw,sptg_ad.ad_type at   WHERE adw.l_ad_type_id=at.l_id ${ew.sqlSegment}")
-    public List<Map<String, Object>> getAdWatchRankForAdTypeList(Pagination page, @Param(value = "ew") Wrapper<StatisticsAdWatch> wrapper);
-}

sptg-statistics/sptg-statistics-biz/src/main/java/com/sptg/statistics/biz/receiver/OrgDeleteReceiver.java

@@ -17,8 +17,8 @@ import org.springframework.stereotype.Component;
  * title: OrgDeleteConsume
  * description: 机构删除消费者
  *
- *                  
- *            
+ *
+ *
  */
 @Component
 @Slf4j
@@ -26,9 +26,6 @@ import org.springframework.stereotype.Component;
 @EnableBinding(value = { OrgDeleteReceiverInterface.class})
 public class OrgDeleteReceiver {
 
-    private final StatisticsAdPushServiceInterface statisticsAdPushServiceInterface;
-    private final StatisticsAdPushCountServiceInterface statisticsAdPushCountServiceInterface;
-    private final StatisticsAdWatchServiceInterface statisticsAdWatchServiceInterface;
     private final AppMemberLoginRecordsServiceInterface appMemberLoginRecordsServiceInterface;
     private final StatisticsCountServiceInterface statisticsCountServiceInterface;
     private final SysDeviceLogServiceInterface sysDeviceLogServiceInterface;
@@ -37,17 +34,17 @@ public class OrgDeleteReceiver {
     @StreamListener(value = OrgDeleteReceiverInterface.INPUT)
     public void input(Organization org){
         //删除广告投放
-        Wrapper<StatisticsAdPush> adPushWrapper=new EntityWrapper<>();
-        adPushWrapper.like("s_org_position",org.getPosition(),SqlLike.RIGHT);
-        this.statisticsAdPushServiceInterface.delete(adPushWrapper);
-        //删除广告发布条数记录
-        Wrapper<StatisticsAdPushCount> adPushCountWrapper=new EntityWrapper<>();
-        adPushCountWrapper.like("s_org_position",org.getPosition(),SqlLike.RIGHT);
-        this.statisticsAdPushCountServiceInterface.delete(adPushCountWrapper);
-        //删除广告观看记录
-        Wrapper<StatisticsAdWatch> adWatchWrapper=new EntityWrapper<>();
-        adWatchWrapper.like("s_org_position",org.getPosition(),SqlLike.RIGHT);
-        this.statisticsAdWatchServiceInterface.delete(adWatchWrapper);
+//        Wrapper<StatisticsAdPush> adPushWrapper=new EntityWrapper<>();
+//        adPushWrapper.like("s_org_position",org.getPosition(),SqlLike.RIGHT);
+//        this.statisticsAdPushServiceInterface.delete(adPushWrapper);
+//        //删除广告发布条数记录
+//        Wrapper<StatisticsAdPushCount> adPushCountWrapper=new EntityWrapper<>();
+//        adPushCountWrapper.like("s_org_position",org.getPosition(),SqlLike.RIGHT);
+//        this.statisticsAdPushCountServiceInterface.delete(adPushCountWrapper);
+//        //删除广告观看记录
+//        Wrapper<StatisticsAdWatch> adWatchWrapper=new EntityWrapper<>();
+//        adWatchWrapper.like("s_org_position",org.getPosition(),SqlLike.RIGHT);
+//        this.statisticsAdWatchServiceInterface.delete(adWatchWrapper);
         //删除app会员登录记录
         Wrapper<AppMemberLoginRecords> appMemberLoginRecordsWrapper=new EntityWrapper<>();
         appMemberLoginRecordsWrapper.like("s_org_position",org.getPosition(),SqlLike.RIGHT);

sptg-statistics/sptg-statistics-biz/src/main/java/com/sptg/statistics/biz/receiver/OrgTransferReceiver.java

@@ -13,8 +13,8 @@ import org.springframework.stereotype.Component;
  * title: OrgTransferReceiver
  * description:
  *
- *                  
- *            
+ *
+ *
  */
 @Component
 @Slf4j
@@ -22,11 +22,8 @@ import org.springframework.stereotype.Component;
 @EnableBinding(value = { OrgTransferReceiverInterface.class})
 public class OrgTransferReceiver {
 
-    private final StatisticsAdPushServiceInterface statisticsAdPushServiceInterface;
-    private final StatisticsAdWatchServiceInterface statisticsAdWatchServiceInterface;
     private final SysDeviceLogServiceInterface sysDeviceLogServiceInterface;
     private final SysOperationServiceInterface sysOperationServiceInterface;
-    private final StatisticsAdPushCountServiceInterface statisticsAdPushCountServiceInterface;
     private final StatisticsCountServiceInterface statisticsCountServiceInterface;
 
     @StreamListener(value = OrgTransferReceiverInterface.INPUT)
@@ -40,11 +37,11 @@ public class OrgTransferReceiver {
         String newPosition = dto.getPosition();
 
         //更新机构位置
-        this.statisticsAdPushServiceInterface.updateOrgPosition(oldPosition,newPosition);
-        this.statisticsAdWatchServiceInterface.updateOrgPosition(oldPosition,newPosition);
+//        this.statisticsAdPushServiceInterface.updateOrgPosition(oldPosition,newPosition);
+//        this.statisticsAdWatchServiceInterface.updateOrgPosition(oldPosition,newPosition);
         this.sysDeviceLogServiceInterface.updateOrgPosition(oldPosition,newPosition);
         this.sysOperationServiceInterface.updateOrgPosition(oldPosition,newPosition);
-        this.statisticsAdPushCountServiceInterface.updateOrgPosition(oldPosition,newPosition);
+//        this.statisticsAdPushCountServiceInterface.updateOrgPosition(oldPosition,newPosition);
         this.statisticsCountServiceInterface.updateOrgPosition(oldPosition,newPosition);
 
     }