1、删除模块

sptg-common/sptg-common-core/src/main/java/com/sptg/common/core/module/ThirdUserImportModule.java

@@ -1,52 +0,0 @@
-package com.sptg.common.core.module;
-
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.alibaba.excel.metadata.BaseRowModel;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * title: UserImportModule
- * package: com.sptg.common.core.module
- * description: 住户导入模板
- *
- *
- *
- */
-@Getter
-@Setter
-public class ThirdUserImportModule extends BaseRowModel {
-
-    @ExcelProperty(value = "姓名",index = 0)
-    private String name;
-
-    @ExcelProperty(value = "性别" ,index = 1)
-    private String sex;
-
-    @ExcelProperty(value = "主键",index = 2)
-    private String key;
-
-    @ExcelProperty(value = "社区",index = 3)
-    private String agencyName;
-
-    @ExcelProperty(value = "小区",index = 4)
-    private String residentialName;
-
-    @ExcelProperty(value = "楼栋-单元-房",index = 5)
-    private String houseInfo;
-
-    @ExcelProperty(value = "照片地址",index = 6)
-    private String imageName;
-
-    @ExcelProperty(value = "证件",index = 7)
-    private String idcard;
-
-    @ExcelProperty(value = "手机", index = 8)
-    private String tel;
-
-    /**
-     * 导入住户时导致错误的错误信息
-     */
-    @ExcelProperty(value = "",index = 10)
-    private String importErrorMsg;
-}

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

@@ -5,4 +5,18 @@ spring:
 
 logging:
   level:
-    root: warn
+    root: warn
+
+# actuator 指令配置
+management:
+  endpoints:
+    web:
+      exposure:
+        #        include:
+        #          - refresh
+        #          - restart
+        #          - shutdown
+        #          - bus-refresh
+        #          - health
+        #          - info
+        exclude: "*"

sptg-config/src/main/resources/bootstrap.yml

@@ -24,6 +24,19 @@ eureka:
     prefer-ip-address: true
     #定义服务续约任务（心跳）的调用间隔，单位：秒
     #lease-renewal-interval-in-seconds: 5
+# actuator 指令配置
+management:
+  endpoints:
+    web:
+      exposure:
+        #        include:
+        #          - refresh
+        #          - restart
+        #          - shutdown
+        #          - bus-refresh
+        #          - health
+        #          - info
+        exclude: "*"
 
 
 #---

sptg-config/src/main/resources/conf/application.yml

@@ -186,3 +186,17 @@ fdfs:
 tx-lcn:
   client:
     manager-address: smart-house-lcn:8070
+
+# actuator 指令配置
+management:
+  endpoints:
+    web:
+      exposure:
+        #        include:
+        #          - refresh
+        #          - restart
+        #          - shutdown
+        #          - bus-refresh
+        #          - health
+        #          - info
+        exclude: "*"

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

@@ -13,7 +13,6 @@ 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.entity.DispatchTask;
 import com.sptg.common.core.enums.Instruct;
 import com.sptg.common.core.enums.InstructDH;
@@ -67,8 +66,6 @@ public class DeviceController implements DeviceFeign {
     private final DeviceServiceInterface deviceServiceInterface;
     private final ResidentialFeign residentialFeign;
     private final DeviceAddProduceInterface deviceAddProduceInterface;
-    private final AccessCardPushRecordsFeign accessCardPushRecordsFeign;
-    private final AccessFacePushRecordsFeign accessFacePushRecordsFeign;
     private final ConfFeign confFeign;
     private final RedisTemplate<String, String> redisTemplate;
 
@@ -807,41 +804,13 @@ public class DeviceController implements DeviceFeign {
             map.put("imgSrc",null);
         }
         if(operType.equals(OperationConstant.ONE)){
-            //  获取设备列表
-//            deviceList = this.deviceServiceInterface.getListByPathUse(task.getXqId(), task.getUnitId(), DeviceConstants.DEVICE_ACCESS_TYPE_UNIVERSAL);
             // 新增下发
             map.put("isAdd", "true");
             this.msgPublishService.batchPushInstruct(task.getData(),deviceList,Instruct.add_user_face,map);
-        }else if(operType.equals(OperationConstant.TWO)){ //更新人脸,只更新已经下发过的设备
-            String id = userInfoDto.getId();
-            Long userId = Long.parseLong(id.substring(OperationConstant.TWO));
-            Integer accessUserType = OperationConstant.ZERO;
-            if(id.startsWith(UserFlagConstant.SERVER_USER_NUMBER_FLAG)){
-                accessUserType = OperationConstant.FOUR;
-            }else if(id.startsWith(UserFlagConstant.USER_NUMBER_FLAG)){
-
-            }
-            ResultBean<AccessFacePushRecords> resultBean = this.accessFacePushRecordsFeign.getListByUserId(userId, accessUserType, OperationConstant.TWO);
-            List<AccessFacePushRecords> pushRecords = resultBean.getList();
-            if(pushRecords != null && pushRecords.size() > 0){
-                List<Long> deviceIdList = new ArrayList<>();
-                pushRecords.forEach(push -> {
-                    deviceIdList.add(push.getDeviceId());
-                });
-                Wrapper<Device> wrapper = new EntityWrapper<>();
-                wrapper.in("l_id", deviceIdList);
-                List<Device> specialDeviceList = this.deviceServiceInterface.selectList(wrapper);
-                deviceList.addAll(specialDeviceList);
-            }
-            map.put("isAdd", "false");
-            this.msgPublishService.batchPushInstruct(task.getData(),deviceList,Instruct.add_user_face,map);
+        }else if(operType.equals(OperationConstant.TWO)){
+            //更新人脸
+            this.msgPublishService.batchPushInstruct(task.getData(),deviceList,Instruct.update_user_face,map);
         }
-
-        /*--------------------------------------------------记录用户人脸授权下发设备记录------------------------------------------*/
-        //获取用户
-//        User user = this.userFeign.findUserById(Long.parseLong(userInfoDto.getId().substring(OperationConstant.TWO)));
-//        this.editAccessFacePushRecords(userInfoDto, operType, deviceList,user.getFaceBeginDate(),user.getFaceEndDate());
-        /*---------------------------------------------------------------------------------------------------------------------*/
         return new ResultBean<>(ResultEnum.SUCCESS,true);
     }
 
@@ -880,36 +849,7 @@ public class DeviceController implements DeviceFeign {
         }else {
             map.put("imgSrc",null);
         }
-
-        String id = userInfoDto.getId();
-        Long userId = Long.parseLong(id.substring(OperationConstant.TWO));
-        Integer accessUserType = OperationConstant.ZERO;
-        if(id.startsWith(UserFlagConstant.SERVER_USER_FLAG)){
-            accessUserType = OperationConstant.FOUR;
-        }else if(id.startsWith(UserFlagConstant.USER_FLAG)){
-
-        }
-        ResultBean<AccessFacePushRecords> resultBean = this.accessFacePushRecordsFeign.getListByUserId(userId, accessUserType, OperationConstant.TWO);
-        List<AccessFacePushRecords> pushRecords = resultBean.getList();
-        if(pushRecords != null && pushRecords.size() > 0){
-            List<Long> deviceIdList = new ArrayList<>();
-            pushRecords.forEach(push -> {
-                deviceIdList.add(push.getDeviceId());
-            });
-            Wrapper<Device> wrapper = new EntityWrapper<>();
-            wrapper.in("l_id", deviceIdList);
-            List<Device> specialDeviceList = this.deviceServiceInterface.selectList(wrapper);
-            deviceList.addAll(specialDeviceList);
-            this.msgPublishService.batchPushInstruct(task.getData(), deviceList, Instruct.delete_user_face,map);
-        }else{
-            this.msgPublishService.batchPushInstruct(task.getData(), deviceList, Instruct.delete_user_face,map);
-        }
-
-        /*--------------------------------------------------记录用户人脸授权下发设备记录------------------------------------------*/
-        //获取用户
-//        User user = this.userFeign.findUserById(Long.parseLong(userInfoDto.getId().substring(OperationConstant.TWO)));
-//        this.editAccessFacePushRecords(userInfoDto, operType, deviceList,user.getFaceBeginDate(),user.getFaceEndDate());
-        /*---------------------------------------------------------------------------------------------------------------------*/
+        this.msgPublishService.batchPushInstruct(task.getData(), deviceList, Instruct.delete_user_face,map);
         return new ResultBean<>(ResultEnum.SUCCESS,true);
     }
 
@@ -933,87 +873,9 @@ public class DeviceController implements DeviceFeign {
         }else{
             this.msgPublishService.batchPushInstruct(task.getData(),deviceList,Instruct.add_user_face,map);
         }
-        /*--------------------------------------------------记录用户人脸授权下发设备记录------------------------------------------*/
-        ObjectMapper objectMapper = new ObjectMapper();
-        UserInfoDto userInfoDto = objectMapper.convertValue(task.getData(), UserInfoDto.class);
-        if(task.getOperType() != null){
-            this.editAccessFacePushRecords(userInfoDto, task.getOperType(), deviceList, task.getBeginDate(), task.getEndDate());
-        }
-        /*---------------------------------------------------------------------------------------------------------------------*/
         return new ResultBean<>(ResultEnum.SUCCESS,true);
     }
 
-    /**
-     * 编辑用户人脸下发到特殊设备记录
-     * @param dto
-     * @param operType
-     * @param deviceList
-     */
-    private void editAccessFacePushRecords(UserInfoDto dto, Integer operType, List<Device> deviceList, Date beginDate, Date endDate){
-        String id = dto.getId(); //u_120000，s_12000等，表示用户ID，前缀表示用户类型
-        AccessFacePushRecordsDto recordsDto = new AccessFacePushRecordsDto();
-        Long userId = Long.parseLong(id.substring(OperationConstant.TWO));
-        recordsDto.setUserId(Long.parseLong(id.substring(OperationConstant.TWO)));
-        //设置人脸有效期 如果是禁用，则不改变有效时间
-        recordsDto.setBeginDate(beginDate);
-        recordsDto.setEndDate(endDate);
-
-        Map<String, Object> face = null;
-        if(!operType.equals(OperationConstant.THREE)){
-            face = dto.getFaceCodeList().get(0);
-            recordsDto.setFaceUri((String)face.get("imgSrc"));
-        }
-        Integer accessUserType = OperationConstant.ZERO;
-        if(id.startsWith(UserFlagConstant.SERVER_USER_FLAG)){
-            recordsDto.setAccessUserType(OperationConstant.FOUR); //服务人员
-            accessUserType = OperationConstant.FOUR;
-        }else if(id.startsWith(UserFlagConstant.USER_FLAG)){
-            recordsDto.setAccessUserType(OperationConstant.ZERO); //住户
-        }
-        if(operType.equals(OperationConstant.ONE)){ //新增门禁卡到设备
-            List<Long> deviceIdList = new ArrayList<>();
-            deviceList.forEach(device -> {
-                deviceIdList.add(device.getId());
-            });
-            recordsDto.setDeviceIdList(deviceIdList);
-            recordsDto.setEnable(OperationConstant.ONE);
-            recordsDto.setSendDeviceType(OperationConstant.TWO);
-            this.accessFacePushRecordsFeign.addAccessFacePushRecordsByDevices(recordsDto);
-        }else if(operType.equals(OperationConstant.TWO)){ //更新门禁卡到设备
-//            List<Long> addDeviceIdList = new ArrayList<>();
-//            ResultBean<AccessFacePushRecords> resultBean = accessFacePushRecordsFeign.getListByUserId(userId, accessUserType, null);
-//            List<AccessFacePushRecords> pushRecords = resultBean.getList();
-//            if(pushRecords != null && pushRecords.size() > 0){
-//
-//            }
-//            List<Long> hadPushDeviceIdList = new ArrayList<>();
-//            resultBean.getList().forEach(push -> {
-//                hadPushDeviceIdList.add(push.getDeviceId());
-//            });
-//            List<Long> deviceIdList = new ArrayList<>();
-//            deviceList.forEach(device -> {
-//                deviceIdList.add(device.getId());
-//            });
-//            deviceIdList.forEach(deviceId ->{
-//                if(hadPushDeviceIdList.contains(deviceId)){
-//
-//                }else{
-//                    addDeviceIdList.add(deviceId);
-//                }
-//            } );
-//            recordsDto.setEnable(OperationConstant.ONE);
-//            this.accessFacePushRecordsFeign.updateAccessFacePushRecords(recordsDto);
-//            if(addDeviceIdList.size() > 0){
-//                recordsDto.setDeviceIdList(addDeviceIdList);
-//                this.accessFacePushRecordsFeign.addAccessFacePushRecordsByDevices(recordsDto);
-//            }
-        }else if(operType.equals(OperationConstant.THREE)){ //删除或者禁用了
-//            recordsDto.setEnable(OperationConstant.TWO);
-            this.accessFacePushRecordsFeign.deleteAccessFacePushRecords(recordsDto);
-//            this.accessFacePushRecordsFeign.updateAccessFacePushRecords(recordsDto);
-        }
-    }
-
     @Override
     @PostMapping(value = "/device/manualPushUserCardToDevices")
     public ResultBean<Boolean> manualPushUserCardToDevices(@RequestBody ManualPushDevicesTask task) {
@@ -1029,13 +891,6 @@ public class DeviceController implements DeviceFeign {
         }else{
             this.msgPublishService.batchPushInstruct(task.getData(),deviceList,Instruct.del_open_door_card,map);
         }
-        /*--------------------------------------------------记录用户门禁卡授权下发设备记录------------------------------------------*/
-        ObjectMapper objectMapper = new ObjectMapper();
-        AccessCardDto accessCardDto = objectMapper.convertValue(task.getData(), AccessCardDto.class);
-        if(task.getOperType() != null){
-            this.editAccessCardPushRecords(accessCardDto, task.getOperType(), deviceList,task.getBeginDate(),task.getEndDate());
-        }
-        /*---------------------------------------------------------------------------------------------------------------------*/
         return new ResultBean<>(ResultEnum.SUCCESS,true);
     }
 
@@ -1238,30 +1093,9 @@ public class DeviceController implements DeviceFeign {
         }
         if(operType.equals(OperationConstant.ONE)){ //新增下发门禁卡到通用设备
             this.msgPublishService.batchPushInstruct(task.getData(),deviceList,Instruct.add_open_door_card,map);
-        }else if(operType.equals(OperationConstant.TWO)){ //更新下发门禁卡到以下发过的设备
-            //是否有下发过特殊设备
-            ResultBean<AccessCardPushRecords> resultBean = this.accessCardPushRecordsFeign.getListByUserId(Long.parseLong(accessCardDto.getUserId()), accessCardDto.getType(), OperationConstant.TWO);
-            List<AccessCardPushRecords> pushRecords = resultBean.getList();
-            if(pushRecords != null && pushRecords.size() > 0){
-                List<Long> deviceIdList = new ArrayList<>();
-                pushRecords.forEach(push -> {
-                    deviceIdList.add(push.getDeviceId());
-                });
-                Wrapper<Device> wrapper = new EntityWrapper<>();
-                wrapper.in("l_id", deviceIdList);
-                List<Device> specialDeviceList = this.deviceServiceInterface.selectList(wrapper);
-                //如果有特殊设备则增加特殊设备
-                if (specialDeviceList != null && specialDeviceList.size() >0){
-                    deviceList.addAll(specialDeviceList);
-                }
-            }
+        }else if(operType.equals(OperationConstant.TWO)){ //更新下发门禁卡到通用设备
             this.msgPublishService.batchPushInstruct(task.getData(),deviceList,Instruct.add_open_door_card,map);
         }
-        /*--------------------------------------------------记录用户门禁卡授权下发设备记录------------------------------------------*/
-        /*if(StringUtils.hasText(accessCardDto.getUserId())){ //如果是不记名门禁卡下发，就不记录用户下发门禁卡记录了
-            this.editAccessCardPushRecords(accessCardDto, operType, deviceList,accessCardDto.getBeginDate(),accessCardDto.getEndDate());
-        }*/
-        /*---------------------------------------------------------------------------------------------------------------------*/
         return new ResultBean<>(ResultEnum.SUCCESS,true);
     }
 
@@ -1277,59 +1111,6 @@ public class DeviceController implements DeviceFeign {
         return resultBean;
     }
 
-    private void editAccessCardPushRecords(AccessCardDto accessCardDto, Integer operType, List<Device> deviceList,Date beginDate, Date endDate){
-        AccessCardPushRecordsDto recordsDto = new AccessCardPushRecordsDto();
-        Long userId = Long.parseLong(accessCardDto.getUserId());
-        recordsDto.setUserId(userId);
-        recordsDto.setCardNo(accessCardDto.getCardNo());
-        recordsDto.setBeginDate(beginDate);
-        recordsDto.setEndDate(endDate);
-        Integer accessUserType = OperationConstant.ZERO;
-        if(accessCardDto.getType().equals(OperationConstant.FOUR)){
-            recordsDto.setAccessUserType(OperationConstant.FOUR); //服务人员
-            accessUserType = OperationConstant.FOUR;
-        }else if(accessCardDto.getType().equals(OperationConstant.ZERO)){
-            recordsDto.setAccessUserType(OperationConstant.ZERO); //住户
-        }
-        if(operType.equals(OperationConstant.ONE)){ //新增门禁卡到设备
-            List<Long> deviceIdList = new ArrayList<>();
-            deviceList.forEach(device -> {
-                deviceIdList.add(device.getId());
-            });
-            recordsDto.setDeviceIdList(deviceIdList);
-            recordsDto.setEnable(OperationConstant.ONE);
-            recordsDto.setSendDeviceType(OperationConstant.TWO);
-            this.accessCardPushRecordsFeign.addAccessCardPushRecordsByDevices(recordsDto);
-        }else if(operType.equals(OperationConstant.TWO)){ //更新门禁卡到设备
-//            List<Long> addDeviceIdList = new ArrayList<>();
-//            ResultBean<AccessCardPushRecords> resultBean = accessCardPushRecordsFeign.getListByUserId(userId, accessUserType, null);
-//            List<Long> hadPushDeviceIdList = new ArrayList<>();
-//            resultBean.getList().forEach(push -> {
-//                hadPushDeviceIdList.add(push.getDeviceId());
-//            });
-//            List<Long> deviceIdList = new ArrayList<>();
-//            deviceList.forEach(device -> {
-//                deviceIdList.add(device.getId());
-//            });
-//            deviceIdList.forEach(deviceId ->{
-//                if(hadPushDeviceIdList.contains(deviceId)){
-//
-//                }else{
-//                    addDeviceIdList.add(deviceId);
-//                }
-//            } );
-//            recordsDto.setEnable(OperationConstant.ONE);
-//            this.accessCardPushRecordsFeign.updateAccessCardPushRecords(recordsDto);
-//            if(addDeviceIdList.size() > 0){
-//                recordsDto.setDeviceIdList(addDeviceIdList);
-//                this.accessCardPushRecordsFeign.addAccessCardPushRecordsByDevices(recordsDto);
-//            }
-        }else if(operType.equals(OperationConstant.THREE)){ //删除或者禁用门禁卡了，仅设置禁用状态
-//            recordsDto.setEnable(OperationConstant.TWO);
-            this.accessCardPushRecordsFeign.deleteAccessCardPushRecords(recordsDto);
-//            this.accessCardPushRecordsFeign.updateAccessCardPushRecords(recordsDto);
-        }
-    }
     @Override
     @PostMapping(value = "/device/removeCard")
     public ResultBean<Boolean> removeCard(@RequestBody DispatchTask task) {
@@ -1396,28 +1177,8 @@ public class DeviceController implements DeviceFeign {
             map.put("endTime",null);
         }
         if(accessCardDto.getUserId() != null){
-            ResultBean<AccessCardPushRecords> pushResult = this.accessCardPushRecordsFeign.getListByUserId(Long.parseLong(accessCardDto.getUserId()), accessCardDto.getType(), null);
-            List<AccessCardPushRecords> list = pushResult.getList();
-            List<Device> hadPushDevices = null;
-            if(list != null && list.size() > 0){ //如果有下发记录，就按照下发的记录进行删除或者禁用
-                List<Long> deviceIdList = new ArrayList<>();
-                list.forEach(push -> {
-                    deviceIdList.add(push.getDeviceId());
-                });
-                hadPushDevices = this.deviceServiceInterface.selectBatchIds(deviceIdList);
-                if(hadPushDevices != null && hadPushDevices.size() > 0){
-                    deviceList.addAll(hadPushDevices);
-                }
-                this.msgPublishService.batchPushInstruct(task.getData(),deviceList,Instruct.del_open_door_card,map);
-                AccessCardPushRecordsDto recordsDto = new AccessCardPushRecordsDto();
-                recordsDto.setUserId(Long.parseLong(accessCardDto.getUserId()));
-                recordsDto.setAccessUserType(accessCardDto.getType());
-                this.accessCardPushRecordsFeign.deleteAccessCardPushRecords(recordsDto);
-                return new ResultBean<>(ResultEnum.SUCCESS,true);
-            }else{ //否则全部删除或者禁用
-                this.msgPublishService.batchPushInstruct(task.getData(),deviceList,Instruct.del_open_door_card,map);
-                return new ResultBean<>(ResultEnum.SUCCESS,true);
-            }
+            this.msgPublishService.batchPushInstruct(task.getData(),deviceList,Instruct.del_open_door_card,map);
+            return new ResultBean<>(ResultEnum.SUCCESS,true);
         }else{
             this.msgPublishService.batchPushInstruct(task.getData(),deviceList,Instruct.del_open_door_card,map);
             return new ResultBean<>(ResultEnum.SUCCESS,true);

sptg-estate/sptg-estate-api/src/main/java/com/sptg/estate/api/dto/AcceptanceDto.java

@@ -1,32 +0,0 @@
-package com.sptg.estate.api.dto;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.estate.api.entity.Acceptance;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * title: AcceptanceDto
- * package: com.sptg.estate.biz.service
- * description: 竣工验收 业务传输对象
- *
- *               
- *                      
- */
-@Setter
-@Getter
-//@ApiModel(value = "AcceptanceDto",description = "竣工验收 业务传输对象")
-public class AcceptanceDto extends Acceptance {
-
-    /**
-     * 分页条件
-     */
-    @TableField(exist = false)
-    private Page<Acceptance> page;
-    /**
-     * 所选树节点Id
-     */
-    @TableField(exist = false)
-    private Long selectTreeId;
-}

sptg-estate/sptg-estate-api/src/main/java/com/sptg/estate/api/dto/AccessBlackCardDto.java

@@ -1,23 +0,0 @@
-package com.sptg.estate.api.dto;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.estate.api.entity.AccessBlackCard;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 门禁卡黑名单 业务传输对象
- * @author xuanyan
- * @date 2020/7/8 10:00
- */
-@Setter
-@Getter
-public class AccessBlackCardDto extends AccessBlackCard {
-
-    /**
-     * 分页条件
-     */
-    @TableField(exist = false)
-    private Page<AccessBlackCard> page;
-}

sptg-estate/sptg-estate-api/src/main/java/com/sptg/estate/api/dto/AccessCardPushRecordsDto.java

@@ -1,49 +0,0 @@
-package com.sptg.estate.api.dto;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.estate.api.entity.AccessCardPushRecords;
-import lombok.Getter;
-import lombok.Setter;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * title: AccessCardPushRecordsDto
- * package: com.sptg.estate.api.dto
- * description: 授权下发记录 业务传输对象
- *
- *
- *
- */
-@Setter
-@Getter
-public class AccessCardPushRecordsDto extends AccessCardPushRecords {
-
-    /**
-     * 分页条件
-     */
-    @TableField(exist = false)
-    private Page<AccessCardPushRecords> page;
-
-    /**
-     * 查询条件：开始时间
-     */
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @TableField(exist = false)
-    private Date selectBeginDate;
-
-    /**
-     * 查询条件：截止时间
-     */
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @TableField(exist = false)
-    private Date selectEndDate;
-
-    /**
-     * 设备ID列表
-     */
-    private List<Long> deviceIdList;
-}

sptg-estate/sptg-estate-api/src/main/java/com/sptg/estate/api/dto/AccessFacePushRecordsDto.java

@@ -1,49 +0,0 @@
-package com.sptg.estate.api.dto;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.estate.api.entity.AccessFacePushRecords;
-import lombok.Getter;
-import lombok.Setter;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * title: AccessFacePushRecordsDto
- * package: com.sptg.estate.api.dto
- * description: 授权下发记录 业务传输对象
- *
- *
- *
- */
-@Setter
-@Getter
-public class AccessFacePushRecordsDto extends AccessFacePushRecords {
-
-    /**
-     * 分页条件
-     */
-    @TableField(exist = false)
-    private Page<AccessFacePushRecords> page;
-
-    /**
-     * 查询条件：开始时间
-     */
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @TableField(exist = false)
-    private Date beginDate;
-
-    /**
-     * 查询条件：截止时间
-     */
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @TableField(exist = false)
-    private Date endDate;
-
-    /**
-     * 设备ID列表
-     */
-    private List<Long> deviceIdList;
-}

sptg-estate/sptg-estate-api/src/main/java/com/sptg/estate/api/dto/ApplyPayRefundDto.java

@@ -1,56 +0,0 @@
-package com.sptg.estate.api.dto;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.sptg.estate.api.entity.ApplyPayRefund;
-import lombok.Getter;
-import lombok.Setter;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * title: ApplyUserDto
- * package: com.sptg.estate.biz.security
- * description: 支付退款申请数据传输类
- *
- *
- *
- */
-@Getter
-@Setter
-public class ApplyPayRefundDto extends ApplyPayRefund {
-    /**
-     * 分页条件
-     */
-    @TableField(exist = false)
-    private Page<ApplyPayRefund> page;
-
-    /**
-     * 排序条件
-     */
-    @TableField(exist = false)
-    private String sortField;
-
-    /**
-     * 排序顺序
-     */
-    @TableField(exist = false)
-    private String sortOrder;
-
-    /**
-     * 开始查询时间条件
-     */
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    @TableField(exist=false)
-    private Date startDateCondition;
-    /**
-     * 结束查询时间条件
-     */
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    @TableField(exist=false)
-    private Date endDateCondition;
-}

sptg-estate/sptg-estate-api/src/main/java/com/sptg/estate/api/dto/BillsDto.java

@@ -1,68 +0,0 @@
-package com.sptg.estate.api.dto;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.estate.api.entity.Bills;
-import lombok.Getter;
-import lombok.Setter;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * title: BillsDto
- * package: com.sptg.estate.api.dto
- * description: 物业账单
- *
- *
- *
- */
-
-@Getter
-@Setter
-public class BillsDto extends Bills {
-
-    /**
-     * 分页条件
-     */
-    @TableField(exist = false)
-    private Page<Bills> page;
-
-    /**
-     * 排序条件
-     */
-    @TableField(exist = false)
-    private String sortField;
-
-    /**
-     * 排序顺序
-     */
-    @TableField(exist = false)
-    private String sortOrder;
-
-    /**
-     * 批量删除所选id集合
-     */
-    @TableField(exist = false)
-    private List<String> ids;
-
-    /**
-     * 查询条件：开始时间
-     */
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @TableField(exist = false)
-    private Date beginDate;
-
-    /**
-     * 查询条件：截止时间
-     */
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @TableField(exist = false)
-    private Date endDate;
-
-    //bills_item表字段
-    private String itemName;
-    private String itemDesc;
-    private Double itemFee;
-}

sptg-estate/sptg-estate-api/src/main/java/com/sptg/estate/api/dto/FaceChargeProjectDto.java

@@ -1,26 +0,0 @@
-package com.sptg.estate.api.dto;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.estate.api.entity.FaceChargeProject;
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-public class FaceChargeProjectDto extends FaceChargeProject {
-
-    /**
-     * 分页条件
-     */
-    @TableField(exist = false)
-    private Page<FaceChargeProject> page;
-
-    /**
-     * 新增或者修改
-     * 1：新增
-     * 2：修改
-     */
-    @TableField(exist = false)
-    private Integer addOrUpdate;
-}

sptg-estate/sptg-estate-api/src/main/java/com/sptg/estate/api/dto/FaceChargeProjectResidentialUserDto.java

@@ -1,7 +0,0 @@
-package com.sptg.estate.api.dto;
-
-import com.sptg.estate.api.entity.FaceChargeProjectResidentialUser;
-
-public class FaceChargeProjectResidentialUserDto extends FaceChargeProjectResidentialUser {
-
-}

sptg-estate/sptg-estate-api/src/main/java/com/sptg/estate/api/dto/ProjectDto.java

@@ -1,32 +0,0 @@
-package com.sptg.estate.api.dto;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.estate.api.entity.Contract;
-import com.sptg.estate.api.entity.Project;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * title: ProjectDto
- * package: com.sptg.estate.biz.security
- * description: 实施项目数据传输类
- *
- *               
- *                     
- */
-@Getter
-@Setter
-public class ProjectDto extends Project {
-    /**
-     * 分页条件
-     */
-    @TableField(exist = false)
-    private Page<Project> page;
-
-    /**
-     * 数据传输
-     */
-    @TableField(exist = false)
-    private Contract contract;
-}

sptg-estate/sptg-estate-api/src/main/java/com/sptg/estate/api/dto/ThirdUserDto.java

@@ -1,200 +0,0 @@
-package com.sptg.estate.api.dto;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.estate.api.entity.ThirdUser;
-import com.sptg.estate.api.entity.User;
-import com.sptg.estate.api.vo.DevicesAccessPushVO;
-import lombok.Getter;
-import lombok.Setter;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-/**
- * title: UserDto
- * package: com.sptg.estate.api.dto
- * description: 住户 业务传输对象
- *
- *
- *
- */
-
-@Getter
-@Setter
-public class ThirdUserDto extends ThirdUser {
-
-    /**
-     * 分页条件
-     */
-    @TableField(exist = false)
-    private Page<User> page;
-
-    /**
-     * 排序条件
-     */
-    @TableField(exist = false)
-    private String sortField;
-
-    /**
-     * 排序顺序
-     */
-    @TableField(exist = false)
-    private String sortOrder;
-
-    /**
-     * 所选树节点Id
-     */
-    @TableField(exist = false)
-    private Long selectTreeId;
-
-    /**
-     * 所选树节点类型 1 机构 2 小区 3社区机构  4 单元 5 房间
-     */
-    @TableField(value = "i_type")
-    private Integer selectTreeType;
-
-    /**
-     * 批量删除所选id集合
-     */
-    @TableField(exist = false)
-    private List<String> ids;
-
-    /**
-     * 房间ids
-     */
-    @TableField(exist = false)
-    private List<Long> roomIds;
-
-    /**
-     * 统计时间条件
-     */
-    @TableField(exist = false)
-    private Date statisticsDate;
-
-    /**
-     * 首页数据加载状态
-     * 1 ：全部
-     * 2 ：当月
-     */
-    @TableField(exist = false)
-    private Integer isAllType;
-
-    /**
-     * 会员id
-     */
-    @TableField(exist = false)
-    private Long memberId;
-
-    /**
-     * 导入对象集合
-     */
-    @TableField(exist = false)
-    private List<User> list;
-
-    /**
-     * 导入对象集合中（新增）
-     */
-    @TableField(exist = false)
-    private List<User> addList;
-
-    /**
-     * 对应小区导入的对应住户数量
-     */
-    @TableField(exist = false)
-    private Map<Long,Integer> residentialMap;
-
-    /**
-     * 对应单元导入的对应住户数量
-     */
-    @TableField(exist = false)
-    private Map<Long,Integer> unitMap;
-
-    /**
-     * 对应房间导入的对应住户数量
-     */
-    @TableField(exist = false)
-    private Map<Long,Integer> roomMap;
-
-    /**
-     * 查询条件 --根据用户查询公告接口用到
-     */
-    @TableField(exist = false)
-    private String pushTarget;
-
-    /**
-     * 是否设置人脸 --实施接口用到
-     * 0 未设置
-     * 1 已设置
-     */
-    @TableField(exist = false)
-    private Integer isSetFace;
-
-    @TableField(exist = false)
-    private Integer cardEnable;
-
-    @TableField(exist = false)
-    private DevicesAccessPushVO devicesAccessPushVO;
-
-    /**
-     * 在下发用户人脸的时候用到
-     * 下发设备授权类型
-     * 10：通用设备
-     * 11：特殊设备
-     */
-    @TableField(exist = false)
-    private Integer deviceAccessType;
-
-    /**
-     * 查询条件：开始时间
-     */
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @TableField(exist = false)
-    private Date beginDate;
-
-    /**
-     * 查询条件：截止时间
-     */
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @TableField(exist = false)
-    private Date endDate;
-    /**
-     * 查询条件：卡号开始时间
-     */
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @TableField(exist = false)
-    private Date cardBeginDate;
-
-    /**
-     * 查询条件：卡号截止时间
-     */
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @TableField(exist = false)
-    private Date cardEndDate;
-
-    /**
-     * 导入住户时导致错误的错误信息
-     */
-    @TableField(exist = false)
-    private String importErrorMsg;
-
-    /**
-     * 小区编号
-     */
-    @TableField(exist = false)
-    private String residentialNumber;
-
-    /**
-     * 单元编号
-     */
-    @TableField(exist = false)
-    private String unitNumber;
-
-    /**
-     * 房间编号
-     */
-    @TableField(exist = false)
-    private String houseNumber;
-}

sptg-estate/sptg-estate-api/src/main/java/com/sptg/estate/api/entity/Acceptance.java

@@ -1,176 +0,0 @@
-package com.sptg.estate.api.entity;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.Date;
-
-/**
- * title: Acceptance
- * package: com.sptg.estate.biz.service
- * description: 项目竣工验收
- *
- *               
- *                     
- */
-@Setter
-@Getter
-@TableName(value = "implement_acceptance")
-
-public class Acceptance {
-    /**
-     * 主键
-     */
-    @TableId(value = "l_id",type = IdType.AUTO)
-
-    private Long id;
-    /**
-     * 项目id
-     */
-    @TableField(value = "l_project_id")
-    private Long projectId;
-    /**
-     *  小区id
-     */
-    @TableField(value = "l_residential_id")
-    private Long residentialId;
-    /**
-     * 楼盘名字--项目名称
-     */
-    @TableField(value = "s_residential_name")
-    private String residentialName;
-    /**
-     * 地区（广东省广州市天河区）
-     */
-    @TableField(value = "s_region")
-    private String region;
-    /**
-     * 立柱机数量
-     */
-    @TableField(value = "i_pillar")
-    private Integer pillar;
-    /**
-     * 壁挂机数量
-     */
-    @TableField(value = "i_wall_hung")
-    private Integer wallHung;
-    /**
-     * 雨罩壁挂机数量
-     */
-    @TableField(value = "i_rain_cover")
-    private Integer rainCover;
-    /**
-     * 设备安装数量 是否正常  0-是  1-否
-     */
-    @TableField(value = "i_is_installation_number")
-    private Integer isInstallationNumber;
-    /**
-     * 项目安装位置确认表 是否正常  0-是  1-否
-     */
-    @TableField(value = "i_is_position_number")
-    private Integer isPositionNumber;
-
-    /**
-     * 名仕通智汇管家设备序列号登记表 是否正常  0-是  1-否
-     */
-    @TableField(value = "i_is_serial_number")
-    private Integer isSerialNumber;
-
-    /**
-     * 工程验收标准 是否正常  0-是  1-否
-     */
-    @TableField(value = "i_is_project_number")
-    private Integer isProjectNumber;
-
-    /**
-     * 后台住户信息录入条数 是否正常  0-是  1-否
-     */
-    @TableField(value = "i_is_user_number")
-    private Integer isUserNumber;
-
-    /**
-     * 进场派工单
-     */
-    @TableField(value = "s_enter_img_uri")
-    private String enterImgUri;
-
-    /**
-     * 项目竣工验收单
-     */
-    @TableField(value = "s_complete_img_uri")
-    private String completeImgUri;
-
-    /**
-     * 名仕通门禁工程质量竣工验收记录
-     */
-    @TableField(value = "s_acceptance_img_uri")
-    private String acceptanceImgUri;
-
-    /**
-     * 创建人id-提交人
-     */
-    @TableField(value = "l_create_account_id")
-    private Long createAccountId;
-    /**
-     * 提交人-userName
-     */
-    @TableField(value = "s_create_name")
-    private String createName;
-    /**
-     * 提交时间
-     */
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    @TableField(value = "t_create_date")
-    private Date createDate;
-
-    /**
-     * 审核状态：0-待审核 1-审核通过 2-审核不通过
-     */
-    @TableField(value = "i_check_state")
-    private Integer checkState;
-    /**
-     *  审核不通过原因，当checkState = 2有值
-     */
-    @TableField(value = "s_check_opinion")
-    private String checkOpinion;
-    /**
-     * 审核人id
-     */
-    @TableField(value = "l_check_account_id")
-    private Long checkAccountId;
-    /**
-     * 审核人-userName
-     */
-    @TableField(value = "s_check_name")
-    private String checkName;
-
-    /**
-     * 审核时间
-     */
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    @TableField(value = "t_check_date")
-    private Date checkDate;
-
-    /**
-     * 所属机构id
-     */
-    @TableField(value = "l_org_id")
-    private Long orgId;
-    /**
-     * 根机构id
-     */
-    @TableField(value = "l_root_org_id")
-    private Long rootOrgId;
-    /**
-     * 存储位置（通过该字段快速查询，所有的子节点）
-     */
-    @TableField(value = "s_org_position")
-    private String orgPosition;
-
-}

sptg-estate/sptg-estate-api/src/main/java/com/sptg/estate/api/entity/AccessBlackCard.java

@@ -1,53 +0,0 @@
-package com.sptg.estate.api.entity;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.Date;
-
-/**
- * 门禁卡黑名单实体类
- * @author xuanyan
- * @date 2020/7/8 9:53
- */
-@Setter
-@Getter
-@TableName(value = "estate_access_black_card")
-public class AccessBlackCard {
-
-    /**
-     * 主键
-     */
-    @TableId(value = "l_id",type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 门禁卡id
-     */
-    @TableField(value = "l_card_id")
-    private Long cardId;
-
-    /**
-     * 卡号
-     */
-    @TableField(value = "s_card_no")
-    private String cardNo;
-
-    /**
-     * 创建时间
-     */
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    @TableField(value = "t_create_date")
-    private Date createDate;
-
-    /**
-     * 描述
-     */
-    @TableField(value = "s_describe")
-    private String describe;
-}

sptg-estate/sptg-estate-api/src/main/java/com/sptg/estate/api/entity/AccessCardPushRecords.java

@@ -1,104 +0,0 @@
-package com.sptg.estate.api.entity;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Getter;
-import lombok.Setter;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * title: AccessCardPushRecords
- * package: com.sptg.estate.api.entity
- * description: 授权卡片下发设备记录 实体类
- * 用于记录用于下发门禁卡到设备的记录。
- * 用户与设备的关联
- *
- *
- *
- */
-@Setter
-@Getter
-@TableName(value = "estate_access_card_push_records")
-public class AccessCardPushRecords {
-
-    /**
-     * 主键
-     */
-    @TableId(value = "l_id",type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 用户类型
-     * 住户：0
-     * 服务人员：4
-     */
-    @TableField(value = "i_access_user_type")
-    private Integer accessUserType;
-
-    /**
-     * 设备Id
-     */
-    @TableField(value = "l_device_id")
-    private Long deviceId;
-
-    /**
-     * 开门用户的id
-     */
-    @TableField(value = "l_user_id")
-    private Long userId;
-
-    /**
-     * 下发卡号
-     */
-    @TableField(value = "s_card_no")
-    private String cardNo;
-
-    /**
-     * 卡有效开始时间
-     */
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "t_begin_date")
-    private Date beginDate;
-
-    /**
-     * 卡有效结束时间
-     */
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "t_end_date")
-    private Date endDate;
-
-    /**
-     * 启用禁用标记：{ 1：已启用，2：已禁用 }
-     */
-    @TableField(value = "i_enable")
-    private Integer enable;
-
-    /**
-     * 下发到的设备类型：{1：一般设备，2：特殊设备}
-     */
-    @TableField(value = "i_send_device_type")
-    private Integer sendDeviceType;
-
-    /**
-     * 下发时间
-     */
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    @TableField(value = "t_access_date")
-    private Date accessDate;
-
-    /**
-     * 创建时间
-     */
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    @TableField(value = "t_create_date")
-    private Date createDate;
-
-}

sptg-estate/sptg-estate-api/src/main/java/com/sptg/estate/api/entity/AccessFacePushRecords.java

@@ -1,104 +0,0 @@
-package com.sptg.estate.api.entity;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Getter;
-import lombok.Setter;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * title: AccessFacePushRecords
- * package: com.sptg.estate.api.entity
- * description: 授权人脸下发设备记录 实体类
- * 用于记录用于下发人脸到设备的记录。
- * 用户与设备的关联
- *
- *
- *
- */
-@Setter
-@Getter
-@TableName(value = "estate_access_face_push_records")
-public class AccessFacePushRecords {
-
-    /**
-     * 主键
-     */
-    @TableId(value = "l_id",type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 用户类型
-     * 住户：0
-     * 服务人员：4
-     */
-    @TableField(value = "i_access_user_type")
-    private Integer accessUserType;
-
-    /**
-     * 设备Id
-     */
-    @TableField(value = "l_device_id")
-    private Long deviceId;
-
-    /**
-     * 开门用户的id
-     */
-    @TableField(value = "l_user_id")
-    private Long userId;
-
-    /**
-     * 下发人脸信息
-     */
-    @TableField(value = "s_face_uri")
-    private String faceUri;
-
-    /**
-     * 人脸有效开始时间
-     */
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "t_begin_date")
-    private Date beginDate;
-
-    /**
-     * 人脸有效结束时间
-     */
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "t_end_date")
-    private Date endDate;
-
-    /**
-     * 下发时间
-     */
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    @TableField(value = "t_access_date")
-    private Date accessDate;
-
-    /**
-     * 启用禁用标记：{ 1：已启用，2：已禁用 }
-     */
-    @TableField(value = "i_enable")
-    private Integer enable;
-
-    /**
-     * 下发到的设备类型：{1：一般设备，2：特殊设备}
-     */
-    @TableField(value = "i_send_device_type")
-    private Integer sendDeviceType;
-
-    /**
-     * 创建时间
-     */
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    @TableField(value = "t_create_date")
-    private Date createDate;
-
-}

sptg-estate/sptg-estate-api/src/main/java/com/sptg/estate/api/entity/ApplyPayRefund.java

@@ -1,182 +0,0 @@
-package com.sptg.estate.api.entity;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * title: ApplyPayRefund
- * package: com.sptg.estate.api.entity
- * description: 支付退款申请
- *
- *
- *
- */
-@Setter
-@Getter
-@TableName(value = "estate_pay_refund_apply")
-public class ApplyPayRefund {
-
-    /**
-     * 主键
-     */
-    @TableId(value = "l_id",type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 支付凭证ID
-     */
-    @TableField(value = "l_pay_certificate_id")
-    private Long payCertificateId;
-
-    /**
-     * 订单ID
-     */
-    @TableField(value = "l_order_id")
-    private Long orderId;
-
-    /**
-     * 订单ID
-     */
-    @TableField(value = "s_order_no")
-    private String orderNo;
-
-    /**
-     * 主键
-     */
-    @TableField(value = "l_user_id")
-    private Long userId;
-
-    /**
-     * 支付类型：wxPay，aliPay
-     */
-    @TableField(value = "s_pay_type")
-    private String payType;
-    /**
-     * 实际付款金额
-     */
-    @TableField(value = "d_actual_pay_fee")
-    private BigDecimal actualPayFee;
-
-    /**
-     * 申请退款金额
-     */
-    @TableField(value = "d_refund_fee")
-    private BigDecimal refundFee;
-
-    /**
-     * 退款入账账户
-     * 退回银行卡：{银行名称}{卡类型}{卡尾号}
-     * 退回支付用户零钱:支付用户零钱
-     * 退还商户:商户基本账户 商户结算银行账户
-     * 退回支付用户零钱通:支付用户零钱通
-     */
-    @TableField(value = "s_refund_recv_accout")
-    private String refundRecvAccout;
-
-    /**
-     * 内部退款单号
-     */
-    @TableField(value = "s_refund_no")
-    private String refundNo;
-
-    /**
-     * 第三方退款单号
-     */
-    @TableField(value = "s_thrid_refund_id")
-    private String thridRefundId;
-
-    /**
-     * 审核状态：0：申请待审核，1：申请审核通过，2：申请审核拒绝
-     */
-    @TableField(value = "i_check_status")
-    private Integer checkStatus;
-
-    /**
-     *  退款状态，WAIT：退款中，SUCCESS：退款成功，REFUNDCLOSE：退款关闭，CHANGE：退款异常
-     */
-    @TableField(value = "i_refund_status")
-    private String refundStatus;
-
-    /**
-     *  最近申请时间
-     */
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    @TableField(value = "d_apply_date")
-    private Date applyDate;
-
-    /**
-     *  后台审核时间
-     */
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    @TableField(value = "d_check_date")
-    private Date checkDate;
-
-    /**
-     *  更新时间
-     */
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    @TableField(value = "d_update_date")
-    private Date updateDate;
-
-    /**
-     * 申请人姓名
-     */
-    @TableField(value = "s_name")
-    private String name;
-
-    /**
-     * 申请手机号
-     */
-    @TableField(value = "s_phone")
-    private String phone;
-
-    /**
-     * 所在小区id
-     */
-    @TableField(value = "l_residential_id")
-    private Long residentialId;
-
-    /**
-     * 所在小区名
-     */
-    @TableField(value = "s_residential_name")
-    private String residentialName;
-
-    /**
-     * 所在单元名
-     */
-    @TableField(value = "s_unit_name")
-    private String unitName;
-
-    /**
-     * 所在房间名
-     */
-    @TableField(value = "s_room_name")
-    private String roomName;
-
-    /**
-     * 第三方退款申请提交信息
-     */
-    @TableField(value = "s_third_refund_apply")
-    private String thirdRefundApply;
-
-    /**
-     * 第三方退款申请结果通知信息
-     */
-    @TableField(value = "s_third_refund_notify")
-    private String thirdRefundNotify;
-
-    /**
-     * 删除标志
-     */
-    @TableField(value = "i_status")
-    private String status;
-}

sptg-estate/sptg-estate-api/src/main/java/com/sptg/estate/api/entity/Bills.java

@@ -1,126 +0,0 @@
-package com.sptg.estate.api.entity;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
-
-import com.baomidou.mybatisplus.enums.IdType;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author lianghanqiang
- * @since 2021-01-19
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("estate_bills")
-public class Bills {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * id
-     */
-    @TableId(value = "id",type = IdType.AUTO)
-    private Long id;
-    /**
-     * 社区id
-     */
-    @TableField("agency_id")
-    private Long agencyId;
-    /**
-     * 社区名称
-     */
-    @TableField("agency_name")
-    private String agencyName;
-    /**
-     * 小区id
-     */
-    @TableField("residential_id")
-    private Long residentialId;
-    /**
-     * 小区名称
-     */
-    @TableField("residential_name")
-    private String residentialName;
-    /**
-     * 楼栋id
-     */
-    @TableField("building_id")
-    private Long buildingId;
-    /**
-     * 楼栋名称
-     */
-    @TableField("building_name")
-    private String buildingName;
-    /**
-     * 单元id
-     */
-    @TableField("unit_id")
-    private Long unitId;
-    /**
-     * 单元名称
-     */
-    @TableField("unit_name")
-    private String unitName;
-    /**
-     * 楼层id
-     */
-    @TableField("floor_id")
-    private Long floorId;
-    /**
-     * 楼层名称
-     */
-    @TableField("floor_name")
-    private String floorName;
-    /**
-     * 房间id
-     */
-    @TableField("room_id")
-    private Long roomId;
-    /**
-     * 房间名称
-     */
-    @TableField("room_name")
-    private String roomName;
-    /**
-     * 账单日期
-     */
-    @TableField("bills_date")
-    private String billsDate;
-    /**
-     * 账单总费用
-     */
-    @TableField("total_fee")
-    private Double totalFee;
-    /**
-     * 账单支付状态，1为未支付，2为已支付
-     */
-    @TableField("status")
-    private Integer status;
-    /**
-     * 支付流水
-     */
-    @TableField("pay_id")
-    private Long payId;
-    /**
-     * 是否删除
-     */
-    @TableField("is_del")
-    private Integer isDel;
-    /**
-     * orgPosition
-     */
-    @TableField("org_position")
-    private String orgPosition;
-
-}

sptg-estate/sptg-estate-api/src/main/java/com/sptg/estate/api/entity/BillsItem.java

@@ -1,61 +0,0 @@
-package com.sptg.estate.api.entity;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author lianghanqiang
- * @since 2021-01-19
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("estate_bills_item")
-public class BillsItem extends Model<BillsItem> {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 缴费项id
-     */
-    @TableId("id")
-    private Long id;
-
-    /**
-     * 缴费项名称
-     */
-    @TableField("item_name")
-    private String itemName;
-    /**
-     * 缴费金额
-     */
-    @TableField("item_fee")
-    private Double itemFee;
-    /**
-     * 备注
-     */
-    @TableField("item_desc")
-    private String itemDesc;
-
-    /**
-     * 账单id
-     */
-    @TableField("pid")
-    private Long pid;
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
-
-}

sptg-estate/sptg-estate-api/src/main/java/com/sptg/estate/api/entity/FaceChargeProject.java

@@ -1,108 +0,0 @@
-package com.sptg.estate.api.entity;
-
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Getter;
-import lombok.Setter;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Getter
-@Setter
-@TableName(value = "estate_face_charge_project")
-public class FaceChargeProject {
-
-    /**
-     *套餐名称
-     */
-    @TableId(value = "l_id",type = IdType.AUTO)
-    private Long id;
-
-    /**
-     *套餐名称
-     */
-    @TableField(value = "s_name")
-    private String name;
-
-    /**
-     * 套餐类型{1：免费，2：付费}
-     */
-    @TableField(value = "i_type")
-    private Integer type;
-
-    /**
-     * {11：试用，12：长期，21：押金，22：套餐}
-     */
-    @TableField(value = "i_type_item")
-    private Integer typeItem;
-
-    /**
-     * 金额
-     */
-    @TableField(value = "d_amount")
-    private BigDecimal amount;
-
-    /**
-     * 天数
-     */
-    @TableField(value = "i_days")
-    private Integer days;
-
-    /**
-     * 折扣{85，表示85%，即8.5折}
-     */
-    @TableField(value = "i_discount")
-    private Integer discount;
-
-    /**
-     * 小区ID
-     */
-    @TableField(value = "l_residential_id")
-    private Long residentialId;
-
-    /**
-     * 套餐生效时间
-     */
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "t_begin_date")
-    private Date beginDate;
-
-    /**
-     * 套餐失效时间
-     */
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "t_end_date")
-    private Date endDate;
-
-    /**
-     * 上架状态
-     * {
-     *     1:上架
-     *     2:下架
-     * }
-     */
-    @TableField(value = "i_put_status")
-    private Integer putStatus;
-
-    /**
-     * 删除标志
-     */
-    @TableField(value = "i_status")
-    private Integer status;
-
-    /**
-     * 原数据的Id
-     */
-    @TableField(value = "l_old_id")
-    private String oldId;
-
-
-}

sptg-estate/sptg-estate-api/src/main/java/com/sptg/estate/api/entity/FaceChargeProjectResidentialUser.java

@@ -1,52 +0,0 @@
-package com.sptg.estate.api.entity;
-
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Getter
-@Setter
-@TableName(value = "estate_face_charge_project_residential_user")
-public class FaceChargeProjectResidentialUser {
-    /**
-     * 主键
-     */
-    @TableId(value = "l_id",type = IdType.AUTO)
-    private Long id;
-
-    /**
-     *套餐id
-     */
-    @TableField(value = "l_face_charge_id")
-    private Long faceChargeId;
-
-    /**
-     * 小区id
-     */
-    @TableField(value = "l_residential_id")
-    private Long residentialId;
-
-    /**
-     * 住户id
-     */
-    @TableField(value = "l_user_id")
-    private Long userId;
-
-    /**
-     * 创建时间
-     */
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    @TableField(value = "t_create_date")
-    private Date createDate;
-
-    @TableField(value = "i_type_item")
-    private Integer typeItem;
-}

sptg-estate/sptg-estate-api/src/main/java/com/sptg/estate/api/entity/Project.java

@@ -1,203 +0,0 @@
-package com.sptg.estate.api.entity;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.Date;
-
-/**
- * title: Project
- * package: com.sptg.estate.biz.security
- * description: 实施项目实体类
- *
- *
- *
- */
-@Setter
-@Getter
-@TableName(value = "implement_project")
-public class Project {
-
-    /**
-     * 主键
-     */
-    @TableId(value = "l_id",type = IdType.AUTO)
-    private Long id;
-    /**
-     * 删除标记：{ -1：已删除，0：正常 }
-     */
-    @TableField(value = "i_status")
-    private Integer status;
-    /**
-     * 创建人id
-     */
-    @TableField(value = "l_create_account_id")
-    private Long createAccountId;
-    /**
-     *  创建账号的用户名-userName
-     */
-    @TableField(value = "s_create_name")
-    private String createName;
-    /**
-     * 创建日期
-     */
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    @TableField(value = "t_create_date")
-    private Date createDate;
-
-    /**
-     *  小区id
-     */
-    @TableField(value = "l_residential_id")
-    private Long residentialId;
-    /**
-     * 小区名字--项目名称
-     */
-    @TableField(value = "s_residential_name")
-    private String residentialName;
-    /**
-     * 地区（广东省广州市天河区）
-     */
-    @TableField(value = "s_region")
-    private String region;
-    /**
-     * 物业联系人
-     */
-    @TableField(value = "s_property_contact")
-    private String propertyContact;
-
-    /**
-     * 物业联系人电话
-     */
-    @TableField(value = "s_property_tel")
-    private String propertyTel;
-
-    /**
-     * 项目经理
-     */
-    @TableField(value = "s_project_manager")
-    private String projectManager;
-
-    /**
-     * 项目经理电话
-     */
-    @TableField(value = "s_project_tel")
-    private String projectTel;
-
-    /**
-     * 业务经理
-     */
-    @TableField(value = "s_business_manager")
-    private String businessManager;
-
-    /**
-     * 业务经理电话
-     */
-    @TableField(value = "s_business_tel")
-    private String businessTel;
-    /**
-     * 安装工程经理
-     */
-    @TableField(value = "s_installation_manager")
-    private String installationManager;
-
-    /**
-     * 安装工程经理电话
-     */
-    @TableField(value = "s_installation_tel")
-    private String installationTel;
-    /**
-     * 所属机构id
-     */
-    @TableField(value = "l_org_id")
-    private Long orgId;
-    /**
-     * 根机构id
-     */
-    @TableField(value = "l_root_org_id")
-    private Long rootOrgId;
-    /**
-     * 存储位置（通过该字段快速查询，所有的子节点）
-     */
-    @TableField(value = "s_org_position")
-    private String orgPosition;
-
-    /*-------------------------------------------------扩展字段--------------------------------------------------------*/
-
-    /**
-     *  物业管理方
-     */
-    @TableField(exist = false)
-    private String propertyName;
-    /**
-     *  合同编号
-     */
-    @TableField(exist = false)
-    private String contractNo;
-    /**
-     *  合同签约日期
-     */
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    @TableField(exist = false)
-    private Date signingDate;
-    /**
-     *  综合服务方
-     */
-    @TableField(exist = false)
-    private String integratedServiceName;
-    /**
-     *  关联的竣工表id
-     */
-    @TableField(exist = false)
-    private Long projectCompletionId;
-    /**
-     *  竣工时间
-     */
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    @TableField(exist = false)
-    private Date completionDate;
-
-    /**
-     *  统计小区设备安装数量
-     */
-    @TableField(exist = false)
-    private Integer installationCount;
-
-    /**
-     *  统计小区设备安装待审核数量
-     */
-    @TableField(exist = false)
-    private Integer waitInstallationCount;
-
-    /**
-     *  项目开工时间，以设备安装的第一条记录创建时间作为开工时间
-     */
-    @TableField(exist = false)
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    private Date startInstallationDate;
-
-    /**
-     *  统计小区设备检测记录
-     */
-    @TableField(exist = false)
-    private Integer testCount;
-
-    /**
-     *  统计小区设备检测记录待审核数量
-     */
-    @TableField(exist = false)
-    private Integer waitTestCount;
-
-    /**
-     *  项目开工时间，以设备检测的第一条记录创建时间作为开工时间
-     */
-    @TableField(exist = false)
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    private Date startTestDate;
-
-}

sptg-estate/sptg-estate-api/src/main/java/com/sptg/estate/api/entity/ProjectBook.java

@@ -1,90 +0,0 @@
-package com.sptg.estate.api.entity;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Getter;
-import lombok.Setter;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * title: ProjectBook
- * package: com.sptg.estate.biz.security
- * description: 实施项目立项书实体类
- *
- *               
- *                     
- */
-@Setter
-@Getter
-@TableName(value = "implement_project_book")
-public class ProjectBook {
-    /**
-     * 主键
-     */
-    @TableId(value = "l_id",type = IdType.AUTO)
-    private Long id;
-    /**
-     * 项目id
-     */
-    @TableField(value = "l_project_id")
-    private Long projectId;
-    /**
-     * 开始项目整改时间
-     */
-    @DateTimeFormat(pattern="yyyy-MM")
-    @JsonFormat(pattern="yyyy-MM",timezone="GMT+8")
-    @TableField(value = "t_begin_rectification_date")
-    private Date beginRectificationDate;
-    /**
-     * 结束项目整改时间
-     */
-    @DateTimeFormat(pattern="yyyy-MM")
-    @JsonFormat(pattern="yyyy-MM",timezone="GMT+8")
-    @TableField(value = "t_end_rectification_date")
-    private Date endRectificationDate;
-    /**
-     * 开始设备生产时间
-     */
-    @DateTimeFormat(pattern="yyyy-MM")
-    @JsonFormat(pattern="yyyy-MM",timezone="GMT+8")
-    @TableField(value = "t_begin_production_date")
-    private Date beginProductionDate;
-    /**
-     * 结束设备生产时间
-     */
-    @DateTimeFormat(pattern="yyyy-MM")
-    @JsonFormat(pattern="yyyy-MM",timezone="GMT+8")
-    @TableField(value = "t_end_production_date")
-    private Date endProductionDate;
-    /**
-     * 施工日期
-     */
-    @DateTimeFormat(pattern="yyyy-MM")
-    @JsonFormat(pattern="yyyy-MM",timezone="GMT+8")
-    @TableField(value = "t_construction_date")
-    private Date constructionDate;
-    /**
-     * 项目验收和交接日期
-     */
-    @DateTimeFormat(pattern="yyyy-MM")
-    @JsonFormat(pattern="yyyy-MM",timezone="GMT+8")
-    @TableField(value = "t_acceptance_date")
-    private Date acceptanceDate;
-    /**
-     * 设备出入库测试及物流发货日期
-     */
-    @DateTimeFormat(pattern="yyyy-MM")
-    @JsonFormat(pattern="yyyy-MM",timezone="GMT+8")
-    @TableField(value = "t_delivery_date")
-    private Date deliveryDate;
-    /**
-     * 扩展字段--小区id
-     */
-    @TableField(exist = false)
-    private Long residentialId;
-}

sptg-estate/sptg-estate-api/src/main/java/com/sptg/estate/api/entity/ProjectCompletion.java

@@ -1,80 +0,0 @@
-package com.sptg.estate.api.entity;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Getter;
-import lombok.Setter;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * title: ProjectCompletion
- * package: com.sptg.estate.biz.security
- * description: 物业验收实体类
- *
- *               
- *                     
- */
-@Setter
-@Getter
-@TableName(value = "implement_project_completion")
-public class ProjectCompletion {
-    /**
-     * 主键
-     */
-    @TableId(value = "l_id",type = IdType.AUTO)
-    private Long id;
-    /**
-     * 项目id
-     */
-    @TableField(value = "l_project_id")
-    private Long projectId;
-    /**
-     * 竣工单号--日期生成
-     */
-    @TableField(value = "s_order_no")
-    private String orderNo;
-    /**
-     * 立柱机数量
-     */
-    @TableField(value = "i_pillar")
-    private Integer pillar;
-    /**
-     * 壁挂机数量
-     */
-    @TableField(value = "i_wall_hung")
-    private Integer wallHung;
-    /**
-     * 雨罩壁挂机数量
-     */
-    @TableField(value = "i_rain_cover")
-    private Integer rainCover;
-    /**
-     * 填写人id
-     */
-    @TableField(value = "l_create_account_id")
-    private Long createAccountId;
-    /**
-     * 填写人-userName
-     */
-    @TableField(value = "s_create_name")
-    private String createName;
-    /**
-     * 填写日期时间
-     */
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    @TableField(value = "t_create_date")
-    private Date createDate;
-
-    /**
-     * 竣工日期
-     */
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    @TableField(value = "t_completion_date")
-    private Date completionDate;
-}

sptg-estate/sptg-estate-api/src/main/java/com/sptg/estate/api/entity/ThirdUser.java

@@ -1,123 +0,0 @@
-package com.sptg.estate.api.entity;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.sptg.common.core.constant.OperationConstant;
-import com.sptg.common.core.entity.BaseEntity;
-import lombok.Getter;
-import lombok.Setter;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * title: User
- * package: com.sptg.estate.api.entity
- * description: 用户 实体类
- *
- *
- *
- */
-@Setter
-@Getter
-@TableName(value = "third_user")
-public class ThirdUser extends BaseEntity {
-
-    /**
-     * 姓名
-     */
-    @TableField(value = "s_name")
-    private String name;
-
-    /**
-     * 性别
-     */
-    @TableField(value = "s_sex")
-    private String sex;
-
-    /**
-     * 第三方主键
-     */
-    @TableField(value = "s_key")
-    private String key;
-
-    /**
-     * 所属社区名称
-     */
-    @TableField(value = "s_agency_name")
-    private String agencyName;
-
-    /**
-     * 所属小区名称
-     */
-    @TableField(value = "s_residential_name")
-    private String residentialname;
-
-    /**
-     * 房屋信息
-     */
-    @TableField(value = "s_house_info")
-    private String houseInfo;
-
-    /**
-     * 照片名称
-     */
-    @TableField(value = "s_image_name")
-    private String imageName;
-
-    /**
-     * 照片url
-     */
-    @TableField(value = "s_image_url")
-    private String imageUrl;
-
-    /**
-     * 照片md5
-     */
-    @TableField(value = "s_image_md5")
-    private String imageMd5;
-
-    /**
-     * 身份证
-     */
-    @TableField(value = "s_idcard")
-    private String idcard;
-
-    /**
-     * 图片创建来源类型，0-小程序添加 1-后台人脸采集或上传 2-app添加
-     */
-    @TableField(value = "s_tel")
-    private String tel;
-
-    /**
-     * 备注
-     */
-    @TableField(value = "s_remark")
-    private String remark;
-
-    /**
-     * 已同步标记{ 0：未同步， 1：已同步}
-     */
-    @TableField(value = "i_sign")
-    private Integer sign;
-
-    /**
-     * 已同步标记{ 0：未同步， 1：已同步}
-     */
-    @TableField(value = "i_is_repeared")
-    private Integer isRepeared;
-
-    /**
-     * 同步异常信息
-     */
-    @TableField(value = "s_error_msg")
-    private String errorMsg;
-
-    /**
-     * 同步异常信息
-     */
-    @TableField(value = "s_check_msg")
-    private String checkMsg;
-
-}

sptg-estate/sptg-estate-api/src/main/java/com/sptg/estate/api/feigns/AcceptanceFeign.java

@@ -1,81 +0,0 @@
-package com.sptg.estate.api.feigns;
-
-import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.estate.api.dto.AcceptanceDto;
-import com.sptg.estate.api.entity.Acceptance;
-import com.sptg.estate.api.feigns.fallback.AcceptanceFeignFallbackFactory;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * title: PositionFeign
- * package: com.sptg.estate.api.feigns
- * description: 竣工验收-服务接口
- */
-@FeignClient(value = "smart-house-estate", fallbackFactory = AcceptanceFeignFallbackFactory.class)
-public interface AcceptanceFeign {
-    /**
-     * 功能描述:检测项目是否已经创建定位记录
-     *
-     * @param projectId
-     * @return ResultBean<Boolean>
-     */
-    @PostMapping("/implement/acceptance/countByProjectId")
-    ResultBean<Boolean> countByProjectId(@RequestBody Long projectId);
-
-    /**
-     * 功能描述:新增
-     *
-     * @param dto
-     * @return ResultBean<Boolean>
-     */
-    @PostMapping("/implement/acceptance/insert")
-    ResultBean<Boolean> insert(@RequestBody AcceptanceDto dto);
-
-    /**
-     * 功能描述:根据机构位置统计数量
-     *
-     * @param orgPosition
-     * @return ResultBean<Integer>
-     */
-    @PostMapping("/implement/acceptance/countByOrgPosition")
-    ResultBean<Integer> countByOrgPosition(@RequestBody String orgPosition);
-
-    /**
-     * 功能描述:分页查询
-     *
-     * @param acceptanceDto
-     * @return ResultBean<Page < Acceptance>>
-     */
-    @PostMapping("/implement/acceptance/showList")
-    ResultBean<Page<Acceptance>> showList(@RequestBody AcceptanceDto acceptanceDto);
-
-    /**
-     * 功能描述:修改
-     *
-     * @param acceptance
-     * @return ResultBean<Page < Acceptance>>
-     */
-    @PostMapping("/implement/acceptance/edit")
-    ResultBean<Boolean> edit(@RequestBody Acceptance acceptance);
-
-    /**
-     * 功能描述:审核
-     *
-     * @param dto
-     * @return ResultBean<Boolean>
-     */
-    @PostMapping("/implement/acceptance/checkState")
-    ResultBean<Boolean> checkState(@RequestBody AcceptanceDto dto);
-
-    /**
-     * 功能描述:查询
-     *
-     * @param id
-     * @return ResultBean<Boolean>
-     */
-    @PostMapping("/implement/acceptance/findById")
-    ResultBean<Acceptance> findById(@RequestBody Long id);
-}

sptg-estate/sptg-estate-api/src/main/java/com/sptg/estate/api/feigns/AccessBlackCardFeign.java

@@ -1,33 +0,0 @@
-package com.sptg.estate.api.feigns;
-
-import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.estate.api.dto.AccessBlackCardDto;
-import com.sptg.estate.api.entity.AccessBlackCard;
-import com.sptg.estate.api.feigns.fallback.AccessBlackCardFeignFallbackFactory;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * title: AccessCardFeign
- * package: com.sptg.estate.api.feigns
- * description: 门禁卡黑名单 服务接口
- *
- *
- *
- */
-@FeignClient(value = "smart-house-estate",fallbackFactory = AccessBlackCardFeignFallbackFactory.class)
-public interface AccessBlackCardFeign {
-
-    /**
-     * 功能描述:门禁卡查询列表
-     * @param accessBlackCardDto 门禁卡业务对象（含分页及查询条件）
-     * @return ResultBean<Page<AccessCard>>
-     *
-     *
-     */
-    @PostMapping(value = "/accessBlackCard/showAccessBlackCardList")
-    ResultBean<Page<AccessBlackCard>> showAccessBlackCardList(@RequestBody AccessBlackCardDto accessBlackCardDto);
-
-}

sptg-estate/sptg-estate-api/src/main/java/com/sptg/estate/api/feigns/AccessCardPushRecordsFeign.java

@@ -1,116 +0,0 @@
-package com.sptg.estate.api.feigns;
-
-import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.estate.api.dto.AccessCardPushRecordsDto;
-import com.sptg.estate.api.entity.AccessCardPushRecords;
-import com.sptg.estate.api.feigns.fallback.AccessCardPushRecordsFeignFallbackFactory;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
-
-/**
- * title: AccessCardPushRecordsFeignFallbackFactory
- * package: com.sptg.estate.api.feigns
- * description: 授权下发记录 服务接口
- *
- *
- *
- */
-@FeignClient(value = "smart-house-estate",fallbackFactory = AccessCardPushRecordsFeignFallbackFactory.class)
-public interface AccessCardPushRecordsFeign {
-
-    /**
-     * 功能描述:授权下发记录查询列表
-     *
-     * @param accessCardPushRecordsDto 授权下发记录业务对象（含分页及查询条件）
-     * @return ResultBean<Page < AccessCardPushRecords>>
-     */
-    @PostMapping(value = "/accessCardPushRecords/showAccessCardPushRecordsList")
-    ResultBean<Page<AccessCardPushRecords>> showAccessCardPushRecordsList(@RequestBody AccessCardPushRecordsDto accessCardPushRecordsDto);
-
-    /**
-     * 功能描述:新增授权下发记录
-     *
-     * @param recordsDto 授权下发记录业务对象
-     * @return ResultBean<Boolean>
-     */
-    @PostMapping(value = "/accessCardPushRecords/addAccessCardPushRecords")
-    ResultBean<Boolean> addAccessCardPushRecords(@RequestBody AccessCardPushRecordsDto recordsDto);
-
-    /**
-     * 功能描述:新增授权下发记录，根据下发到的设备数量，批量添加记录
-     * @param recordsDto 授权下发记录业务对象
-     * @return ResultBean<Boolean>
-     */
-    @PostMapping(value = "/accessCardPushRecords/addAccessCardPushRecordsByDevices")
-    ResultBean<Boolean> addAccessCardPushRecordsByDevices(@RequestBody AccessCardPushRecordsDto recordsDto);
-
-    /**
-     * 功能描述:新增或更新授权下发记录
-     *
-     * @param recordsDto 授权下发记录业务对象
-     * @return ResultBean<Boolean>
-     */
-    @PostMapping(value = "/accessCardPushRecords/addOrUpdateAccessCardPushRecords")
-    ResultBean<Boolean> addOrUpdateAccessCardPushRecords(@RequestBody AccessCardPushRecordsDto recordsDto);
-
-    /**
-     * 根据Id 查找授权下发记录
-     *
-     * @param id 必填
-     * @return AccessCardPushRecords
-     */
-    @GetMapping(value = "/accessCardPushRecords/findAccessCardPushRecordsById/{id}")
-    AccessCardPushRecords findAccessCardPushRecordsById(@PathVariable(value = "id") Long id);
-
-    /**
-     * 根据Id 查找授权下发记录
-     *
-     * @param userId 必填
-     * @return AccessCardPushRecords
-     */
-    @GetMapping(value = "/accessCardPushRecords/findAccessCardPushRecordsById/{userId}")
-    List<AccessCardPushRecords> findAccessCardPushRecordsByUserId(@PathVariable(value = "userId") Long userId);
-
-    /**
-     * 功能描述:编辑授权下发记录
-     *
-     * @param accessCardPushRecordsDto 授权下发记录业务对象
-     * @return ResultBean<Boolean>
-     */
-    @PostMapping(value = "/accessCardPushRecords/updateAccessCardPushRecords")
-    ResultBean<Boolean> updateAccessCardPushRecords(@RequestBody AccessCardPushRecordsDto accessCardPushRecordsDto);
-
-    /**
-     * 功能描述:删除授权下发记录
-     *
-     * @param accessCardPushRecordsDto 授权下发记录业务对象
-     * @return ResultBean<Boolean>
-     */
-    @PostMapping(value = "/accessCardPushRecords/deleteAccessCardPushRecords")
-    ResultBean<Boolean> deleteAccessCardPushRecords(@RequestBody AccessCardPushRecordsDto accessCardPushRecordsDto);
-
-    /**
-     * 功能描述:查询授权下发数量
-     *
-     * @param accessCardPushRecordsDto
-     * @return Long
-     */
-    @PostMapping(value = "/accessCardPushRecords/getAccessCardPushRecordsCount")
-    Long getAccessCardPushRecordsCount(@RequestBody AccessCardPushRecordsDto accessCardPushRecordsDto);
-
-    /**
-     * 功能描述:根据userId查询
-     *
-     * @param userId
-     * @return ResultBean<AccessCardPushRecords>
-     */
-    @PostMapping(value = "/accessCardPushRecords/getListByUserId/{userId}/{accessUserType}/{specialDevice}")
-    ResultBean<AccessCardPushRecords> getListByUserId(@PathVariable("userId") Long userId, @PathVariable("accessUserType") Integer accessUserType, @PathVariable("specialDevice") Integer specialDevice);
-
-}

sptg-estate/sptg-estate-api/src/main/java/com/sptg/estate/api/feigns/AccessFacePushRecordsFeign.java

@@ -1,116 +0,0 @@
-package com.sptg.estate.api.feigns;
-
-import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.estate.api.dto.AccessFacePushRecordsDto;
-import com.sptg.estate.api.entity.AccessFacePushRecords;
-import com.sptg.estate.api.feigns.fallback.AccessFacePushRecordsFeignFallbackFactory;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
-
-/**
- * title: AccessFacePushRecordsFeignFallbackFactory
- * package: com.sptg.estate.api.feigns
- * description: 授权下发记录 服务接口
- *
- *
- *
- */
-@FeignClient(value = "smart-house-estate",fallbackFactory = AccessFacePushRecordsFeignFallbackFactory.class)
-public interface AccessFacePushRecordsFeign {
-
-    /**
-     * 功能描述:授权下发记录查询列表
-     *
-     * @param accessFacePushRecordsDto 授权下发记录业务对象（含分页及查询条件）
-     * @return ResultBean<Page < AccessFacePushRecords>>
-     */
-    @PostMapping(value = "/accessFacePushRecords/showAccessFacePushRecordsList")
-    ResultBean<Page<AccessFacePushRecords>> showAccessFacePushRecordsList(@RequestBody AccessFacePushRecordsDto accessFacePushRecordsDto);
-
-    /**
-     * 功能描述:新增授权下发记录
-     *
-     * @param recordsDto 授权下发记录业务对象
-     * @return ResultBean<Boolean>
-     */
-    @PostMapping(value = "/accessFacePushRecords/addAccessFacePushRecords")
-    ResultBean<Boolean> addAccessFacePushRecords(@RequestBody AccessFacePushRecordsDto recordsDto);
-
-    /**
-     * 功能描述:新增授权下发记录，根据下发到的设备数量，批量添加记录
-     * @param recordsDto 授权下发记录业务对象
-     * @return ResultBean<Boolean>
-     */
-    @PostMapping(value = "/accessFacePushRecords/addAccessFacePushRecordsByDevices")
-    ResultBean<Boolean> addAccessFacePushRecordsByDevices(@RequestBody AccessFacePushRecordsDto recordsDto);
-
-    /**
-     * 功能描述:新增或更新授权下发记录
-     *
-     * @param recordsDto 授权下发记录业务对象
-     * @return ResultBean<Boolean>
-     */
-    @PostMapping(value = "/accessFacePushRecords/addOrUpdateAccessFacePushRecords")
-    ResultBean<Boolean> addOrUpdateAccessFacePushRecords(@RequestBody AccessFacePushRecordsDto recordsDto);
-
-    /**
-     * 根据Id 查找授权下发记录
-     *
-     * @param id 必填
-     * @return AccessFacePushRecords
-     */
-    @GetMapping(value = "/accessFacePushRecords/findAccessFacePushRecordsById/{id}")
-    AccessFacePushRecords findAccessFacePushRecordsById(@PathVariable(value = "id") Long id);
-
-    /**
-     * 根据Id 查找授权下发记录
-     *
-     * @param userId 必填
-     * @return AccessFacePushRecords
-     */
-    @GetMapping(value = "/accessFacePushRecords/findAccessFacePushRecordsById/{userId}")
-    List<AccessFacePushRecords> findAccessFacePushRecordsByUserId(@PathVariable(value = "userId") Long userId);
-
-    /**
-     * 功能描述:编辑授权下发记录
-     *
-     * @param accessFacePushRecordsDto 授权下发记录业务对象
-     * @return ResultBean<Boolean>
-     */
-    @PostMapping(value = "/accessFacePushRecords/updateAccessFacePushRecords")
-    ResultBean<Boolean> updateAccessFacePushRecords(@RequestBody AccessFacePushRecordsDto accessFacePushRecordsDto);
-
-    /**
-     * 功能描述:删除授权下发记录
-     *
-     * @param accessFacePushRecordsDto 授权下发记录业务对象
-     * @return ResultBean<Boolean>
-     */
-    @PostMapping(value = "/accessFacePushRecords/deleteAccessFacePushRecords")
-    ResultBean<Boolean> deleteAccessFacePushRecords(@RequestBody AccessFacePushRecordsDto accessFacePushRecordsDto);
-
-    /**
-     * 功能描述:查询授权下发数量
-     *
-     * @param accessFacePushRecordsDto
-     * @return Long
-     */
-    @PostMapping(value = "/accessFacePushRecords/getAccessFacePushRecordsCount")
-    Long getAccessFacePushRecordsCount(@RequestBody AccessFacePushRecordsDto accessFacePushRecordsDto);
-
-    /**
-     * 功能描述:根据userId查询
-     *
-     * @param userId
-     * @return ResultBean<AccessFacePushRecords>
-     */
-    @PostMapping(value = "/accessFacePushRecords/getListByUserId/{userId}/{accessUserType}/{specialDevice}")
-    ResultBean<AccessFacePushRecords> getListByUserId(@PathVariable("userId") Long userId, @PathVariable("accessUserType") Integer accessUserType, @PathVariable("specialDevice") Integer specialDevice);
-
-}

sptg-estate/sptg-estate-api/src/main/java/com/sptg/estate/api/feigns/ApplyPayRefundFeign.java

@@ -1,78 +0,0 @@
-package com.sptg.estate.api.feigns;
-
-import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.estate.api.dto.ApplyPayRefundDto;
-import com.sptg.estate.api.entity.ApplyPayRefund;
-import com.sptg.estate.api.feigns.fallback.ApplyPayRefundFeignFallbackFactory;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.io.FileNotFoundException;
-
-
-/**
- * title: ApplyPayRefundFeign
- * package: com.sptg.estate.api.feigns
- * description: 住户 服务接口
- */
-@FeignClient(value = "smart-house-estate", fallbackFactory = ApplyPayRefundFeignFallbackFactory.class)
-public interface ApplyPayRefundFeign {
-
-    /**
-     * 功能描述:支付退款申请列表
-     *
-     * @param applyPayRefundDto 支付退款申请业务对象（含分页及查询条件）
-     * @return ResultBean<Page < ApplyPayRefund>>
-     */
-    @PostMapping(value = "/applyPayRefund/showApplyPayRefundPage")
-    ResultBean<Page<ApplyPayRefund>> showApplyPayRefundPage(@RequestBody ApplyPayRefundDto applyPayRefundDto);
-
-    /**
-     * 功能描述:新增支付退款申请
-     *
-     * @param applyPayRefundDto 支付退款申请业务对象
-     * @return ResultBean<Boolean>
-     */
-    @PostMapping(value = "/applyPayRefund/addApplyPayRefund")
-    ResultBean<Boolean> addApplyPayRefund(@RequestBody ApplyPayRefundDto applyPayRefundDto);
-
-    /**
-     * 根据Id 查找支付退款申请记录
-     *
-     * @param id 必填
-     * @return ApplyPayRefund
-     */
-    @GetMapping(value = "/applyPayRefund/findApplyPayRefundById/{id}")
-    ApplyPayRefund findApplyPayRefundById(@PathVariable(value = "id") Long id);
-
-    /**
-     * 功能描述:审核支付退款申请记录
-     *
-     * @param applyPayRefundDto 支付退款申请业务对象
-     * @return ResultBean<Boolean>
-     */
-    @PostMapping(value = "/applyPayRefund/auditApplyPayRefund")
-    ResultBean<Boolean> auditApplyPayRefund(@RequestBody ApplyPayRefundDto applyPayRefundDto) throws FileNotFoundException;
-
-    /**
-     * 功能描述:根据条件查询支付退款申请记录
-     *
-     * @param applyPayRefundDto 支付退款申请业务对象
-     * @return ApplyPayRefund
-     */
-    @PostMapping(value = "/applyPayRefund/findApplyPayRefundByCondition")
-    ApplyPayRefund findApplyPayRefundByCondition(@RequestBody ApplyPayRefundDto applyPayRefundDto);
-
-    /**
-     * 更新退款回调数据
-     * @param applyPayRefund
-     * @return
-     */
-    @PostMapping(value = "/applyPayRefund/updateApplyPayRefundByRefundNo")
-    Boolean updateApplyPayRefundByRefundNo(@RequestBody ApplyPayRefund applyPayRefund);
-
-}

sptg-estate/sptg-estate-api/src/main/java/com/sptg/estate/api/feigns/BillsFeign.java

@@ -1,63 +0,0 @@
-package com.sptg.estate.api.feigns;
-
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.estate.api.dto.BillsDto;
-import com.sptg.estate.api.dto.CarDto;
-import com.sptg.estate.api.entity.Bills;
-import com.sptg.estate.api.entity.Car;
-import com.sptg.estate.api.feigns.fallback.BillsFeignFallbackFactory;
-import com.sptg.estate.api.vo.BillsVO;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.plugins.Page;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-@RequestMapping("/bills")
-@FeignClient(value = "smart-house-estate",fallbackFactory = BillsFeignFallbackFactory.class)
-public interface BillsFeign {
-
-    /**
-     *  获取账单列表
-     * */
-    @PostMapping("/list")
-    Page<Bills> list(
-            @RequestParam(value = "current",required = false) Integer current,
-            @RequestParam(value = "size",required = false) Integer size,
-            Bills bills
-    );
-
-    /**
-     * 分页
-     * @param dto
-     * @return
-     */
-    @PostMapping(value = "/page")
-    ResultBean<Page<Bills>> page(@RequestBody BillsDto dto);
-
-    /**
-     *  获取账单详情
-     * */
-    @GetMapping("/detail")
-    BillsVO detail(@RequestParam(value = "id",required = true) Long id);
-
-    /**
-     *  根据id删除账单
-     * */
-    @PostMapping("/delete")
-    ResultBean<Boolean> delete(@RequestBody BillsDto billsDto);
-
-    /**
-     *  更新账单
-     *
-     * @return*/
-    @PostMapping("/edit")
-    ResultBean<Boolean> edit(@RequestBody BillsDto billsDto);
-
-    /**
-     *  新增
-     *
-     * @return*/
-    @PostMapping("/add")
-    ResultBean<Boolean> add(@RequestBody BillsDto billsDto);
-}

sptg-estate/sptg-estate-api/src/main/java/com/sptg/estate/api/feigns/BillsItemFeign.java

@@ -1,43 +0,0 @@
-package com.sptg.estate.api.feigns;
-
-import com.sptg.estate.api.entity.BillsItem;
-import com.sptg.estate.api.feigns.fallback.BillsItemFeignFallbackFactory;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-@RequestMapping("/billsItem")
-@FeignClient(value = "smart-house-estate",fallbackFactory = BillsItemFeignFallbackFactory.class)
-public interface BillsItemFeign {
-
-    /**
-     *  获取缴费项列表
-     * */
-    @GetMapping("/list")
-    List<BillsItem> list(@RequestParam("billsId") Long billsId);
-
-    /**
-     *  获取缴费项详情
-     * */
-    @GetMapping("/detail")
-    BillsItem detail(@RequestParam(value = "id",required = true) Long id);
-
-    /**
-     *  根据id删除缴费项
-     * */
-    @GetMapping("/delete")
-    boolean delete(@RequestParam(value = "id",required = true) Long id);
-
-    /**
-     *  编辑缴费项
-     * */
-    @GetMapping("/edit")
-    boolean edit(@RequestBody BillsItem billsItem);
-
-    /**
-     *  添加缴费项
-     * */
-    @PostMapping("/add")
-    boolean add(@RequestBody BillsItem billsItem);
-}

sptg-estate/sptg-estate-api/src/main/java/com/sptg/estate/api/feigns/ContractFeign.java

@@ -1,48 +0,0 @@
-package com.sptg.estate.api.feigns;
-
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.estate.api.entity.Contract;
-import com.sptg.estate.api.feigns.fallback.ContractFeignFallbackFactory;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * title: ContractFeign
- * package: com.sptg.estate.biz.security
- * description: 实施合同-服务接口
- *
- *               
- *                      
- */
-@FeignClient(value= "smart-house-estate",fallbackFactory= ContractFeignFallbackFactory.class)
-public interface ContractFeign {
-    /**
-     * 功能描述:通过项目id查询合同信息
-     * @param projectId
-     * @return ResultBean<Contract>
-     *               
-     *                      
-     */
-    @PostMapping(value = "/implement/contract/findByProjectId")
-     ResultBean<Contract> findByProjectId(@RequestBody Long projectId);
-
-    /**
-     * 功能描述:保存
-     * @param contract
-     * @return ResultBean<Boolean>
-     *               
-     *                      
-     */
-    @PostMapping(value = "/implement/contract/insertByResidentialId")
-    ResultBean<Boolean> insertByResidentialId(@RequestBody Contract contract);
-    /**
-     * 功能描述:修改
-     * @param contract
-     * @return ResultBean<Boolean>
-     *               
-     *                      
-     */
-    @PostMapping(value = "/implement/contract/editByProjectId")
-    ResultBean<Boolean> editByProjectId(@RequestBody Contract contract);
-}

sptg-estate/sptg-estate-api/src/main/java/com/sptg/estate/api/feigns/FaceChargeProjectFeign.java

@@ -1,139 +0,0 @@
-package com.sptg.estate.api.feigns;
-
-
-import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.estate.api.dto.FaceChargeProjectDto;
-import com.sptg.estate.api.entity.FaceChargeProject;
-import com.sptg.estate.api.feigns.fallback.FaceChargeProjectFeignFallbackFactory;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * title: FaceChargeProjectFeign
- * package: com.sptg.estate.api.feigns.fallback
- * description: 人脸收费项目 服务接口
- *
- *
- *
- */
-@FeignClient(value = "smart-house-estate",fallbackFactory = FaceChargeProjectFeignFallbackFactory.class)
-public interface FaceChargeProjectFeign {
-
-    /**
-     * 功能描述:获取全部的人脸收费项目
-     * @param dto 查询条件
-     * @return 返回值
-     */
-    @PostMapping(value = "/faceChargeProject/showFaceChargeProjectList")
-    ResultBean<Page<FaceChargeProject>> showFaceChargeProjectList(@RequestBody FaceChargeProjectDto dto);
-
-    /**
-     * 功能描述:获取全部的人脸收费项目
-     * @param residentialId 小区id
-     * @return 返回值
-     */
-    @PostMapping(value = "/faceChargeProject/getListByResidentialId")
-    List<FaceChargeProject> getListByResidentialId(@RequestParam("residentialId") Long residentialId);
-
-    /**
-     * 功能描述:获取没过期人脸收费项目
-     * @param residentialId 小区id
-     * @return 返回值
-     */
-    @PostMapping(value = "/faceChargeProject/getListByResidentialIdAndDate")
-    List<FaceChargeProject> getListByResidentialIdAndDate(@RequestParam("residentialId") Long residentialId);
-     /**
-     * 功能描述:根据小区id 获取全部的人脸收费项目
-     * @param residentialId 小区id
-     * @return 返回值
-     */
-    @PostMapping(value = "/faceChargeProject/selectByResidentialId")
-    ResultBean<FaceChargeProject> selectByResidentialId(@RequestBody Long residentialId);
-
-    /**
-     * 功能描述:获取全部的人脸收费项目
-     * @param dto
-     * @return 返回值
-     */
-    @PostMapping(value = "/faceChargeProject/getList")
-    List<FaceChargeProject> getList(@RequestBody FaceChargeProjectDto dto);
-
-    /**
-     * 功能描述:获取一个收费项目
-     * @param dto 查询条件
-     * @return 返回值
-     */
-    @PostMapping(value = "/faceChargeProject/getOneFaceChargeProject")
-    ResultBean<FaceChargeProject> getOneFaceChargeProject(@RequestBody FaceChargeProjectDto dto);
-
-
-    /**
-     * 功能描述:获取一个收费项目-用于验证
-     * @param dto 查询条件
-     * @return 返回值
-     */
-    @PostMapping(value = "/faceChargeProject/getOneNotInId")
-    FaceChargeProject getOneNotInId(@RequestBody FaceChargeProjectDto dto);
-
-    /**
-     * 功能描述:获取一个收费项目
-     * @param id 人脸项收费项目id
-     * @return 返回值
-     */
-    @PostMapping(value = "/faceChargeProject/getFaceChargeProjectById")
-    FaceChargeProject getFaceChargeProjectById(@RequestParam("id") Long id);
-
-    /**
-     * 功能描述:新增人脸收费项目
-     * @param dto 要新增的项目
-     * @return ModelAndView
-     *
-     */
-    @PostMapping(value = "/faceChargeProject/addFaceChargeProject")
-    ResultBean<Boolean> addFaceChargeProject(@RequestBody FaceChargeProjectDto dto);
-
-    /**
-     * 功能描述:修改人脸收费项目
-     * @param dto 要新增的项目
-     * @return ModelAndView
-     *
-     */
-    @PostMapping(value = "/faceChargeProject/updateFaceChargeProject")
-    ResultBean<Boolean> updateFaceChargeProject(@RequestBody FaceChargeProjectDto dto);
-
-    /**
-     * 功能描述:删除人脸收费项目
-     * @param dto 要新增的项目
-     * @return ModelAndView
-     *
-     */
-    @PostMapping(value = "/faceChargeProject/deleteFaceChargeProject")
-    ResultBean<Boolean> deleteFaceChargeProject(@RequestBody FaceChargeProjectDto dto);
-
-    /**
-     * 功能描述： 根据oldId获取记录
-     * @param oldId 旧数据ID
-     * @return FaceChargeProject
-     */
-    @PostMapping(value = "/faceChargeProject/getByOldId/{oldId}")
-    FaceChargeProject getByOldId(@PathVariable(value = "oldId") String oldId);
-
-    /**
-     * 功能描述： 批量修改
-     * @param List<FaceChargeProject>
-     * @return Boolean
-     */
-    @PostMapping(value = "/faceChargeProject/updateBathFaceChargeProject")
-    Boolean updateBathFaceChargeProject(@RequestBody List<FaceChargeProject> faceChargeProjectList);
-
-    /**
-     * 功能描述： 上架下架
-     * @param dto
-     * @return ResultBean<Boolean>
-     */
-    @PostMapping(value = "/faceChargeProject/putStatusChange")
-    ResultBean<Boolean> putStatusChange(@RequestBody FaceChargeProjectDto dto);
-}

sptg-estate/sptg-estate-api/src/main/java/com/sptg/estate/api/feigns/FaceChargeProjectResidentialUserFeign.java

@@ -1,29 +0,0 @@
-package com.sptg.estate.api.feigns;
-
-
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.estate.api.dto.FaceChargeProjectResidentialUserDto;
-import com.sptg.estate.api.entity.FaceChargeProjectResidentialUser;
-import com.sptg.estate.api.feigns.fallback.FaceChargeProjectResidentialUserFeignFallbackFactory;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * title: FaceChargeProjectFeign
- * package: com.sptg.estate.api.feigns.fallback
- * description: 人脸套餐绑定 服务接口
- *
- *
- *
- */
-@FeignClient(value = "smart-house-estate",fallbackFactory = FaceChargeProjectResidentialUserFeignFallbackFactory.class)
-public interface FaceChargeProjectResidentialUserFeign {
-
-    @PostMapping("/faceChargeProResUser/addFaceChargeProjectResidentialUser")
-    ResultBean<Boolean> addFaceChargeProjectResidentialUser(@RequestBody FaceChargeProjectResidentialUserDto dto);
-
-    @PostMapping("/faceChargeProResUser/findFaceChargeProjectResidentialUser")
-    ResultBean<FaceChargeProjectResidentialUser> findFaceChargeProjectResidentialUser(@RequestBody FaceChargeProjectResidentialUserDto dto);
-
-}

sptg-estate/sptg-estate-api/src/main/java/com/sptg/estate/api/feigns/ProjectBookFeign.java

@@ -1,49 +0,0 @@
-package com.sptg.estate.api.feigns;
-
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.estate.api.entity.ProjectBook;
-import com.sptg.estate.api.feigns.fallback.ProjectBookFeignFallbackFactory;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * title: ContractFeign
- * package: com.sptg.estate.biz.security
- * description: 立项书-服务接口
- *
- *               
- *                      
- */
-@FeignClient(value= "smart-house-estate",fallbackFactory= ProjectBookFeignFallbackFactory.class)
-public interface ProjectBookFeign {
-
-    /**
-     * 功能描述:新增
-     * @param projectBook
-     * @return ResultBean<Boolean>
-     *               
-     *                      
-     */
-    @PostMapping(value = "/implement/projectBook/insertByResidentialId")
-    ResultBean<Boolean> insertByResidentialId(@RequestBody ProjectBook projectBook);
-
-    /**
-     * 功能描述:通过项目id查询立项书信息
-     * @param projectId
-     * @return ResultBean<ProjectBook>
-     *               
-     *                      
-     */
-    @PostMapping(value = "/implement/projectBook/findByProjectId")
-    ResultBean<ProjectBook> findByProjectId(@RequestBody Long projectId);
-    /**
-     * 功能描述:修改
-     * @param projectBook
-     * @return ResultBean<Boolean>
-     *               
-     *                      
-     */
-    @PostMapping(value = "/implement/projectBook/editByProjectId")
-    ResultBean<Boolean> editByProjectId(@RequestBody ProjectBook projectBook);
-}

sptg-estate/sptg-estate-api/src/main/java/com/sptg/estate/api/feigns/ProjectCompletionFeign.java

@@ -1,47 +0,0 @@
-package com.sptg.estate.api.feigns;
-
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.estate.api.entity.ProjectCompletion;
-import com.sptg.estate.api.feigns.fallback.ProjectCompletionFeignFallbackFactory;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * title: MemberFeign
- * package: com.sptg.estate.api.feigns
- * description:物业验收-服务接口
- *
- *               
- *                
- */
-@FeignClient(value= "smart-house-estate",fallbackFactory= ProjectCompletionFeignFallbackFactory.class)
-public interface ProjectCompletionFeign {
-    /**
-     * 功能描述:新增
-     * @param projectCompletion
-     * @return ResultBean<Boolean>
-     *               
-     *                      
-     */
-    @PostMapping(value = "/implement/projectCompletion/insert")
-    ResultBean<Boolean> insert(@RequestBody ProjectCompletion projectCompletion);
-    /**
-     * 功能描述:通过项目id查询竣工单信息
-     * @param projectId
-     * @return ResultBean<ProjectCompletion>
-     *               
-     *                      
-     */
-    @PostMapping(value = "/implement/projectCompletion/findByProjectId")
-    ResultBean<ProjectCompletion> findByProjectId(@RequestBody Long projectId);
-    /**
-     * 功能描述:检测项目是否已经有竣工单记录
-     * @param projectId
-     * @return ResultBean<ProjectCompletion>
-     *               
-     *                      
-     */
-    @PostMapping(value = "/implement/projectCompletion/countByProjectId")
-    ResultBean<Boolean> countByProjectId(@RequestBody Long projectId);
-}

sptg-estate/sptg-estate-api/src/main/java/com/sptg/estate/api/feigns/ProjectFeign.java

@@ -1,146 +0,0 @@
-package com.sptg.estate.api.feigns;
-
-import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.estate.api.dto.ProjectDto;
-import com.sptg.estate.api.entity.Project;
-import com.sptg.estate.api.feigns.fallback.ProjectFeignFallbackFactory;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
-
-/**
- * title: MemberFeign
- * package: com.sptg.estate.api.feigns
- * description:实施项目-服务接口
- *
- *               
- *                
- */
-@FeignClient(value= "smart-house-estate",fallbackFactory= ProjectFeignFallbackFactory.class)
-public interface ProjectFeign {
-
-    /**
-     * 功能描述:分页查询
-     * @param projectDto
-     * @return ResultBean<Page<Project>>
-     *               
-     *                      
-     */
-    @PostMapping(value = "/implement/project/showList")
-    ResultBean<Page<Project>> showList(@RequestBody ProjectDto projectDto);
-    /**
-     * 功能描述:分页查询--小程序
-     * @param projectDto
-     * @return ResultBean<Page<Project>>
-     *               
-     *                      
-     */
-    @PostMapping(value = "/implement/project/showListInstallation")
-    ResultBean<Page<Project>> showListInstallation(ProjectDto projectDto);
-    /**
-     * 功能描述:分页查询--小程序
-     * @param projectDto
-     * @return ResultBean<Page<Project>>
-     *               
-     *                      
-     */
-    @PostMapping(value = "/implement/project/showListTest")
-    ResultBean<Page<Project>> showListTest(ProjectDto projectDto);
-    /**
-     * 功能描述:通过小区id获取项目信息
-     * @param residentialId
-     * @return Project
-     *               
-     *                      
-     */
-    @PostMapping(value = "/implement/project/findByResidentialId")
-    ResultBean<Project> findByResidentialId(@RequestBody Long residentialId);
-    /**
-     * 功能描述:新增项目
-     * @param project
-     * @return ResultBean<Boolean>
-     *               
-     *                      
-     */
-    @PostMapping(value = "/implement/project/insert")
-    ResultBean<Boolean> insert(@RequestBody Project project);
-    /**
-     * 功能描述:修改
-     * @param project
-     * @return Project
-     *               
-     *                      
-     */
-    @PostMapping(value = "/implement/project/updateById")
-    ResultBean<Boolean> updateById(@RequestBody Project project);
-    /**
-     * 功能描述:检测小区关联的小区项目数量，一个小区只能创建一个项目
-     * @param residentialId 小区id
-     * @return ResultBean<Boolean>
-     *               
-     *                      
-     */
-    @PostMapping(value = "/implement/project/countByResidentialId")
-    ResultBean<Boolean> countByResidentialId(@RequestBody Long residentialId);
-    /**
-     * 功能描述:根据id查询
-     * @param id
-     * @return ResultBean<Boolean>
-     *               
-     *                      
-     */
-    @PostMapping(value = "/implement/project/findById")
-    ResultBean<Project> findById(@RequestBody Long id);
-    /**
-     * 功能描述:编辑
-     * @param project
-     * @return ResultBean<Boolean>
-     *               
-     *                      
-     */
-    @PostMapping(value = "/implement/project/edit")
-    ResultBean<Boolean> edit(@RequestBody Project project);
-
-    /**
-     * 功能描述:根据位置查询所属项目
-     * @param projectDto{
-     *         orgPosition : 位置 必填
-     * }
-     * @return ResultBean<Project>
-     *             
-     *                      
-     */
-    @PostMapping(value = "/implement/project/findListByPosition")
-    ResultBean<Project> findListByPosition(@RequestBody ProjectDto projectDto);
-    /**
-     * 功能描述:根据位置统计项目数量
-     * @param orgPosition
-     * @return ResultBean<Project>
-     *               
-     *                      
-     */
-    @PostMapping(value = "/implement/project/countByOrgPosition")
-    ResultBean<Integer> countByOrgPosition(@RequestBody String orgPosition);
-    /**
-     * 功能描述:添加项目信息--小程序端专用
-     * @param dto
-     * @return ResultBean<Project>
-     *               
-     *                      
-     */
-    @PostMapping(value = "/implement/project/insertProjectAndContract")
-    ResultBean<Boolean> insertProjectAndContract(@RequestBody ProjectDto dto);
-    /**
-     * 功能描述:根据id集合查询数据
-     * @param idList
-     * @return ResultBean<Project>
-     *               
-     *                      
-     */
-    @PostMapping(value = "/implement/project/findListByXqIds")
-    List<Project> findListByXqIds(@RequestBody List<Long> idList);
-
-}

sptg-estate/sptg-estate-api/src/main/java/com/sptg/estate/api/feigns/ThirdUserFeign.java

@@ -1,74 +0,0 @@
-package com.sptg.estate.api.feigns;
-
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.estate.api.dto.ThirdUserDto;
-import com.sptg.estate.api.entity.ThirdUser;
-import com.sptg.estate.api.feigns.fallback.ThirdUserFeignFallbackFactory;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
-
-/**
- * title: UserFeign
- * package: com.sptg.estate.api.feigns
- * description: 住户 服务接口
- *
- *
- *
- */
-@FeignClient(value = "smart-house-estate",fallbackFactory = ThirdUserFeignFallbackFactory.class)
-public interface ThirdUserFeign {
-
-    /**
-     * 功能描述:新增房间元
-     * @param userDto 住户业务对象
-     * @return ResultBean<Boolean>
-     *
-     *
-     */
-    @PostMapping(value = "/thirdUser/addUser")
-    ResultBean<Boolean> addUser(@RequestBody ThirdUserDto userDto);
-
-    /**
-     * 根据Id 查找住户
-     * @param id 必填
-     * @return User
-     *
-     *
-     */
-    @GetMapping(value = "/thirdUser/findUserById/{id}")
-    ThirdUser findUserById(@PathVariable(value = "id") Long id);
-
-    /**
-     * 功能描述:编辑住户
-     * @param userDto 住户业务对象
-     * @return ResultBean<Boolean>
-     *
-     *
-     */
-    @PostMapping(value = "/thirdUser/updateUser")
-    ResultBean<Boolean> updateUser(@RequestBody ThirdUserDto userDto);
-
-    /**
-     * 功能描述:删除住户
-     * @param userDto 住户业务对象
-     * @return ResultBean<Boolean>
-     *
-     *
-     */
-    @PostMapping(value = "/thirdUser/deleteUser")
-    ResultBean<Boolean> deleteUser(@RequestBody ThirdUserDto userDto);
-
-
-
-    @PostMapping(value = "/thirdUser/updateEntity")
-    boolean updateEntity(@RequestBody ThirdUser user);
-
-
-    @PostMapping(value = "/thirdUser/getListByCondition")
-    List<ThirdUser> getListByCondition(@RequestBody ThirdUserDto dto);
-}

sptg-estate/sptg-estate-api/src/main/java/com/sptg/estate/api/feigns/fallback/AcceptanceFeignFallbackFactory.java

@@ -1,69 +0,0 @@
-package com.sptg.estate.api.feigns.fallback;
-
-import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.common.core.beans.ResultEnum;
-import com.sptg.estate.api.dto.AcceptanceDto;
-import com.sptg.estate.api.entity.Acceptance;
-import com.sptg.estate.api.feigns.AcceptanceFeign;
-import feign.hystrix.FallbackFactory;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-/**
- * title: PositionFeignFallbackFactory
- * package: com.sptg.estate.api.feigns.fallback
- * description:竣工验收-服务容错处理类
- */
-@Component
-@Slf4j
-public class AcceptanceFeignFallbackFactory implements FallbackFactory<AcceptanceFeign> {
-
-    @Override
-    public AcceptanceFeign create(Throwable cause) {
-        return new AcceptanceFeign() {
-
-            @Override
-            public ResultBean<Boolean> countByProjectId(Long projectId) {
-                log.error(cause.getMessage(), cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public ResultBean<Boolean> insert(AcceptanceDto dto) {
-                log.error(cause.getMessage(), cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public ResultBean<Integer> countByOrgPosition(String orgPosition) {
-                log.error(cause.getMessage(), cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public ResultBean<Page<Acceptance>> showList(AcceptanceDto acceptanceDto) {
-                log.error(cause.getMessage(), cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public ResultBean<Boolean> edit(Acceptance acceptance) {
-                log.error(cause.getMessage(), cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public ResultBean<Boolean> checkState(AcceptanceDto dto) {
-                log.error(cause.getMessage(), cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public ResultBean<Acceptance> findById(Long id) {
-                log.error(cause.getMessage(), cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-        };
-    }
-}

sptg-estate/sptg-estate-api/src/main/java/com/sptg/estate/api/feigns/fallback/AccessBlackCardFeignFallbackFactory.java

@@ -1,40 +0,0 @@
-package com.sptg.estate.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.device.api.entity.Device;
-import com.sptg.estate.api.dto.AccessBlackCardDto;
-import com.sptg.estate.api.dto.AccessCardDto;
-import com.sptg.estate.api.entity.AccessBlackCard;
-import com.sptg.estate.api.entity.AccessCard;
-import com.sptg.estate.api.feigns.AccessBlackCardFeign;
-import com.sptg.estate.api.feigns.AccessCardFeign;
-import com.sptg.estate.api.vo.DevicesAccessPushVO;
-import feign.hystrix.FallbackFactory;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * title: UserCardFeignFallbackFactory
- * package: com.sptg.estate.api.feigns.fallback
- * description: 门禁卡黑名单 服务接口容错处理
- */
-@Component
-@Slf4j
-public class AccessBlackCardFeignFallbackFactory implements FallbackFactory<AccessBlackCardFeign> {
-    @Override
-    public AccessBlackCardFeign create(Throwable cause) {
-        return new AccessBlackCardFeign() {
-
-            @Override
-            public ResultBean<Page<AccessBlackCard>> showAccessBlackCardList(AccessBlackCardDto accessBlackCardDto) {
-                log.error(cause.getMessage(), cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-        };
-    }
-}

sptg-estate/sptg-estate-api/src/main/java/com/sptg/estate/api/feigns/fallback/AccessCardPushRecordsFeignFallbackFactory.java

@@ -1,93 +0,0 @@
-package com.sptg.estate.api.feigns.fallback;
-
-import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.common.core.beans.ResultEnum;
-import com.sptg.estate.api.dto.AccessCardPushRecordsDto;
-import com.sptg.estate.api.entity.AccessCardPushRecords;
-import com.sptg.estate.api.entity.AccessCardPushRecords;
-import com.sptg.estate.api.feigns.AccessCardPushRecordsFeign;
-import feign.hystrix.FallbackFactory;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * title: AccessCardPushRecordsFeignFallbackFactory
- * package: com.sptg.estate.api.feigns.fallback
- * description: 授权记录 服务接口容错处理
- *
- *
- *
- */
-@Component
-@Slf4j
-public class AccessCardPushRecordsFeignFallbackFactory implements FallbackFactory<AccessCardPushRecordsFeign> {
-
-    @Override
-    public AccessCardPushRecordsFeign create(Throwable cause) {
-        return new AccessCardPushRecordsFeign(){
-
-            @Override
-            public ResultBean<Page<AccessCardPushRecords>> showAccessCardPushRecordsList(AccessCardPushRecordsDto accessCardPushRecordsDto) {
-                log.error(cause.getMessage(),cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public ResultBean<Boolean> addAccessCardPushRecords(AccessCardPushRecordsDto recordsDto) {
-                log.error(cause.getMessage(),cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public ResultBean<Boolean> addAccessCardPushRecordsByDevices(AccessCardPushRecordsDto recordsDto) {
-                log.error(cause.getMessage(),cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public ResultBean<Boolean> addOrUpdateAccessCardPushRecords(AccessCardPushRecordsDto recordsDto) {
-                log.error(cause.getMessage(),cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public AccessCardPushRecords findAccessCardPushRecordsById(Long id) {
-                log.error(cause.getMessage(),cause);
-                return null;
-            }
-
-            @Override
-            public List<AccessCardPushRecords> findAccessCardPushRecordsByUserId(Long userId) {
-                log.error(cause.getMessage(),cause);
-                return null;
-            }
-
-            @Override
-            public ResultBean<Boolean> updateAccessCardPushRecords(AccessCardPushRecordsDto accessPushRecordsDto) {
-                log.error(cause.getMessage(),cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public ResultBean<Boolean> deleteAccessCardPushRecords(AccessCardPushRecordsDto accessPushRecordsDto) {
-                log.error(cause.getMessage(),cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public Long getAccessCardPushRecordsCount(AccessCardPushRecordsDto accessPushRecordsDto) {
-                log.error(cause.getMessage(),cause);
-                return null;
-            }
-
-            @Override
-            public ResultBean<AccessCardPushRecords> getListByUserId(Long userId, Integer accessUserType, Integer specialDevice) {
-                log.error(cause.getMessage(),cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-        };
-    }
-}

sptg-estate/sptg-estate-api/src/main/java/com/sptg/estate/api/feigns/fallback/AccessFacePushRecordsFeignFallbackFactory.java

@@ -1,92 +0,0 @@
-package com.sptg.estate.api.feigns.fallback;
-
-import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.common.core.beans.ResultEnum;
-import com.sptg.estate.api.dto.AccessFacePushRecordsDto;
-import com.sptg.estate.api.entity.AccessFacePushRecords;
-import com.sptg.estate.api.feigns.AccessFacePushRecordsFeign;
-import feign.hystrix.FallbackFactory;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * title: AccessFacePushRecordsFeignFallbackFactory
- * package: com.sptg.estate.api.feigns.fallback
- * description: 授权记录 服务接口容错处理
- *
- *
- *
- */
-@Component
-@Slf4j
-public class AccessFacePushRecordsFeignFallbackFactory implements FallbackFactory<AccessFacePushRecordsFeign> {
-
-    @Override
-    public AccessFacePushRecordsFeign create(Throwable cause) {
-        return new AccessFacePushRecordsFeign(){
-
-            @Override
-            public ResultBean<Page<AccessFacePushRecords>> showAccessFacePushRecordsList(AccessFacePushRecordsDto recordsDto) {
-                log.error(cause.getMessage(),cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public ResultBean<Boolean> addAccessFacePushRecords(AccessFacePushRecordsDto recordsDto) {
-                log.error(cause.getMessage(),cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public ResultBean<Boolean> addAccessFacePushRecordsByDevices(AccessFacePushRecordsDto recordsDto) {
-                log.error(cause.getMessage(),cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public ResultBean<Boolean> addOrUpdateAccessFacePushRecords(AccessFacePushRecordsDto recordsDto) {
-                log.error(cause.getMessage(),cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public AccessFacePushRecords findAccessFacePushRecordsById(Long id) {
-                log.error(cause.getMessage(),cause);
-                return null;
-            }
-
-            @Override
-            public List<AccessFacePushRecords> findAccessFacePushRecordsByUserId(Long userId) {
-                log.error(cause.getMessage(),cause);
-                return null;
-            }
-
-            @Override
-            public ResultBean<Boolean> updateAccessFacePushRecords(AccessFacePushRecordsDto recordsDto) {
-                log.error(cause.getMessage(),cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public ResultBean<Boolean> deleteAccessFacePushRecords(AccessFacePushRecordsDto recordsDto) {
-                log.error(cause.getMessage(),cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public Long getAccessFacePushRecordsCount(AccessFacePushRecordsDto recordsDto) {
-                log.error(cause.getMessage(),cause);
-                return null;
-            }
-
-            @Override
-            public ResultBean<AccessFacePushRecords> getListByUserId(Long userId, Integer accessUserType, Integer specialDevice) {
-                log.error(cause.getMessage(),cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-        };
-    }
-}

sptg-estate/sptg-estate-api/src/main/java/com/sptg/estate/api/feigns/fallback/ApplyPayRefundFeignFallbackFactory.java

@@ -1,63 +0,0 @@
-package com.sptg.estate.api.feigns.fallback;
-
-import com.baomidou.mybatisplus.plugins.Page;
-
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.common.core.beans.ResultEnum;
-import com.sptg.estate.api.dto.ApplyPayRefundDto;
-import com.sptg.estate.api.entity.ApplyPayRefund;
-import com.sptg.estate.api.feigns.ApplyPayRefundFeign;
-import feign.hystrix.FallbackFactory;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-/**
- * title: ApplyPayRefundFeignFallbackFactory
- * package: com.sptg.estate.api.feigns.fallback
- * description: 支付退款申请 服务接口容错处理
- */
-@Component
-@Slf4j
-public class ApplyPayRefundFeignFallbackFactory implements FallbackFactory<ApplyPayRefundFeign> {
-
-    @Override
-    public ApplyPayRefundFeign create(Throwable cause) {
-        return new ApplyPayRefundFeign() {
-
-            @Override
-            public ResultBean<Page<ApplyPayRefund>> showApplyPayRefundPage(ApplyPayRefundDto applyPayRefundDto) {
-                log.error(cause.getMessage(), cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public ResultBean<Boolean> addApplyPayRefund(ApplyPayRefundDto applyPayRefundDto) {
-                log.error(cause.getMessage(), cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public ApplyPayRefund findApplyPayRefundById(Long id) {
-                log.error(cause.getMessage(), cause);
-                return null;
-            }
-
-            @Override
-            public ResultBean<Boolean> auditApplyPayRefund(ApplyPayRefundDto applyPayRefundDto) {
-                return null;
-            }
-
-            @Override
-            public ApplyPayRefund findApplyPayRefundByCondition(ApplyPayRefundDto applyPayRefundDto) {
-                log.error(cause.getMessage(), cause);
-                return null;
-            }
-
-            @Override
-            public Boolean updateApplyPayRefundByRefundNo(ApplyPayRefund applyPayRefund) {
-                log.error(cause.getMessage(), cause);
-                return null;
-            }
-        };
-    }
-}

sptg-estate/sptg-estate-api/src/main/java/com/sptg/estate/api/feigns/fallback/BillsFeignFallbackFactory.java

@@ -1,68 +0,0 @@
-package com.sptg.estate.api.feigns.fallback;
-
-import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.common.core.beans.ResultEnum;
-import com.sptg.estate.api.dto.BillsDto;
-import com.sptg.estate.api.entity.Bills;
-import com.sptg.estate.api.feigns.BillsFeign;
-import com.sptg.estate.api.vo.BillsVO;
-import feign.hystrix.FallbackFactory;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-/**
- * title: PositionFeignFallbackFactory
- * package: com.sptg.estate.api.feigns.fallback
- * description:竣工验收-服务容错处理类
- */
-@Component
-@Slf4j
-public class BillsFeignFallbackFactory implements FallbackFactory<BillsFeign> {
-
-
-    @Override
-    public BillsFeign create(Throwable throwable) {
-        return new BillsFeign() {
-
-            @Override
-            public Page<Bills> list(Integer current, Integer size, Bills bills) {
-                log.error("BillsFeign-list 调用错误");
-                log.error("错误信息："+throwable.getMessage());
-                return new Page<>();
-            }
-
-            @Override
-            public ResultBean<Page<Bills>> page(BillsDto dto) {
-                log.error(throwable.getMessage(),throwable);
-                return new ResultBean<Page<Bills>>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public BillsVO detail(Long id) {
-                log.error("BillsFeign-detail 调用错误");
-                log.error("错误信息："+throwable.getMessage());
-                return null;
-            }
-
-            @Override
-            public ResultBean<Boolean> delete(BillsDto billsDto) {
-                log.error("BillsFeign-delete 调用错误");
-                log.error("错误信息："+throwable.getMessage());
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public ResultBean<Boolean> edit(BillsDto billsDto) {
-                log.error(throwable.getMessage(),throwable);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public ResultBean<Boolean> add(BillsDto billsDto) {
-                log.error(throwable.getMessage(),throwable);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-        };
-    }
-}

sptg-estate/sptg-estate-api/src/main/java/com/sptg/estate/api/feigns/fallback/BillsItemFeignFallbackFactory.java

@@ -1,65 +0,0 @@
-package com.sptg.estate.api.feigns.fallback;
-
-import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.estate.api.entity.Bills;
-import com.sptg.estate.api.entity.BillsItem;
-import com.sptg.estate.api.feigns.BillsFeign;
-import com.sptg.estate.api.feigns.BillsItemFeign;
-import com.sptg.estate.api.vo.BillsVO;
-import feign.hystrix.FallbackFactory;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * title: PositionFeignFallbackFactory
- * package: com.sptg.estate.api.feigns.fallback
- * description:竣工验收-服务容错处理类
- */
-@Component
-@Slf4j
-public class BillsItemFeignFallbackFactory implements FallbackFactory<BillsItemFeign> {
-    @Override
-    public BillsItemFeign create(Throwable throwable) {
-        return new BillsItemFeign() {
-            @Override
-            public List<BillsItem> list(Long billsId) {
-                log.error("BillsItemFeign-list 调用错误");
-                log.error("错误信息："+throwable.getMessage());
-                return new ArrayList<>();
-            }
-
-            @Override
-            public BillsItem detail(Long id) {
-                log.error("BillsItemFeign-detail 调用错误");
-                log.error("错误信息："+throwable.getMessage());
-                return null;
-            }
-
-            @Override
-            public boolean delete(Long id) {
-                log.error("BillsItemFeign-delete 调用错误");
-                log.error("错误信息："+throwable.getMessage());
-                return false;
-            }
-
-            @Override
-            public boolean edit(BillsItem billsItem) {
-                log.error("BillsItemFeign-edit 调用错误");
-                log.error("错误信息："+throwable.getMessage());
-                return false;
-            }
-
-            @Override
-            public boolean add(BillsItem billsItem) {
-                log.error("BillsItemFeign-edit 调用错误");
-                log.error("错误信息："+throwable.getMessage());
-                return false;
-            }
-
-
-        };
-    }
-}

sptg-estate/sptg-estate-api/src/main/java/com/sptg/estate/api/feigns/fallback/ContractFeignFallbackFactory.java

@@ -1,45 +0,0 @@
-package com.sptg.estate.api.feigns.fallback;
-
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.common.core.beans.ResultEnum;
-import com.sptg.estate.api.entity.Contract;
-import com.sptg.estate.api.feigns.ContractFeign;
-import feign.hystrix.FallbackFactory;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-/**
- * title: ProjectFeignFallbackFactory
- * package: com.sptg.estate.biz.security
- * description: 实施项目-服务容错处理类
- *
- *               
- *                     
- */
-@Component
-@Slf4j
-public class ContractFeignFallbackFactory implements FallbackFactory<ContractFeign> {
-    @Override
-    public ContractFeign create(Throwable cause) {
-        return new ContractFeign() {
-
-            @Override
-            public ResultBean<Contract> findByProjectId(Long projectId) {
-                log.error(cause.getMessage(),cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public ResultBean<Boolean> insertByResidentialId(Contract contract) {
-                log.error(cause.getMessage(),cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public ResultBean<Boolean> editByProjectId(Contract contract) {
-                log.error(cause.getMessage(),cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-        };
-    }
-}

sptg-estate/sptg-estate-api/src/main/java/com/sptg/estate/api/feigns/fallback/FaceChargeProjectFeignFallbackFactory.java

@@ -1,108 +0,0 @@
-package com.sptg.estate.api.feigns.fallback;
-
-import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.common.core.beans.ResultEnum;
-import com.sptg.estate.api.dto.FaceChargeProjectDto;
-import com.sptg.estate.api.entity.FaceChargeProject;
-import com.sptg.estate.api.feigns.FaceChargeProjectFeign;
-import feign.hystrix.FallbackFactory;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Component
-@Slf4j
-public class FaceChargeProjectFeignFallbackFactory implements FallbackFactory<FaceChargeProjectFeign> {
-
-
-    @Override
-    public FaceChargeProjectFeign create(Throwable throwable) {
-        return new FaceChargeProjectFeign() {
-            @Override
-            public ResultBean<Page<FaceChargeProject>> showFaceChargeProjectList(FaceChargeProjectDto faceChargeProjectDto) {
-                log.error(throwable.getMessage(),throwable);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public List<FaceChargeProject> getListByResidentialId(Long residentialId) {
-                log.error(throwable.getMessage(),throwable);
-                return new ArrayList<>(0);
-            }
-
-            @Override
-            public List<FaceChargeProject> getListByResidentialIdAndDate(Long residentialId) {
-                log.error(throwable.getMessage(),throwable);
-                return new ArrayList<>(0);
-            }
-            @Override
-            public ResultBean<FaceChargeProject> selectByResidentialId(Long residentialId) {
-                log.error(throwable.getMessage(),throwable);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public List<FaceChargeProject> getList(FaceChargeProjectDto dto) {
-                log.error(throwable.getMessage(),throwable);
-                return new ArrayList<>(0);
-            }
-
-            @Override
-            public ResultBean<FaceChargeProject> getOneFaceChargeProject(FaceChargeProjectDto dto) {
-                log.error(throwable.getMessage(),throwable);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public FaceChargeProject getOneNotInId(FaceChargeProjectDto dto) {
-                log.error(throwable.getMessage(),throwable);
-                return null;
-            }
-
-            @Override
-            public ResultBean<Boolean> addFaceChargeProject(FaceChargeProjectDto dto) {
-                log.error(throwable.getMessage(),throwable);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public FaceChargeProject getFaceChargeProjectById(Long id) {
-                log.error(throwable.getMessage(),throwable);
-                return null;
-            }
-
-            @Override
-            public ResultBean<Boolean> updateFaceChargeProject(FaceChargeProjectDto dto) {
-                log.error(throwable.getMessage(),throwable);
-                return null;
-            }
-
-            @Override
-            public ResultBean<Boolean> deleteFaceChargeProject(FaceChargeProjectDto dto) {
-                log.error(throwable.getMessage(),throwable);
-                return null;
-            }
-
-            @Override
-            public FaceChargeProject getByOldId(String oldId) {
-                log.error(throwable.getMessage(),throwable);
-                return null;
-            }
-
-            @Override
-            public Boolean updateBathFaceChargeProject(List<FaceChargeProject> faceChargeProjectList) {
-                log.error(throwable.getMessage(),throwable);
-                return null;
-            }
-
-            @Override
-            public ResultBean<Boolean> putStatusChange(FaceChargeProjectDto dto) {
-                log.error(throwable.getMessage(),throwable);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-        };
-    }
-}

sptg-estate/sptg-estate-api/src/main/java/com/sptg/estate/api/feigns/fallback/FaceChargeProjectResidentialUserFeignFallbackFactory.java

@@ -1,35 +0,0 @@
-package com.sptg.estate.api.feigns.fallback;
-
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.common.core.beans.ResultEnum;
-import com.sptg.estate.api.dto.FaceChargeProjectResidentialUserDto;
-import com.sptg.estate.api.entity.FaceChargeProjectResidentialUser;
-import com.sptg.estate.api.feigns.FaceChargeProjectFeign;
-import com.sptg.estate.api.feigns.FaceChargeProjectResidentialUserFeign;
-import feign.hystrix.FallbackFactory;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-@Component
-@Slf4j
-public class FaceChargeProjectResidentialUserFeignFallbackFactory implements FallbackFactory<FaceChargeProjectResidentialUserFeign> {
-
-
-    @Override
-    public FaceChargeProjectResidentialUserFeign create(Throwable throwable) {
-        return new FaceChargeProjectResidentialUserFeign() {
-
-            @Override
-            public ResultBean<Boolean> addFaceChargeProjectResidentialUser(FaceChargeProjectResidentialUserDto dto) {
-                log.error(throwable.getMessage(),throwable);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public ResultBean<FaceChargeProjectResidentialUser> findFaceChargeProjectResidentialUser(FaceChargeProjectResidentialUserDto dto) {
-                log.error(throwable.getMessage(),throwable);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-        };
-    }
-}

sptg-estate/sptg-estate-api/src/main/java/com/sptg/estate/api/feigns/fallback/ProjectBookFeignFallbackFactory.java

@@ -1,45 +0,0 @@
-package com.sptg.estate.api.feigns.fallback;
-
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.common.core.beans.ResultEnum;
-import com.sptg.estate.api.entity.ProjectBook;
-import com.sptg.estate.api.feigns.ProjectBookFeign;
-import feign.hystrix.FallbackFactory;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-/**
- * title: ProjectFeignFallbackFactory
- * package: com.sptg.estate.biz.security
- * description: 立项书-服务容错处理类
- *
- *               
- *                     
- */
-@Component
-@Slf4j
-public class ProjectBookFeignFallbackFactory implements FallbackFactory<ProjectBookFeign> {
-    @Override
-    public ProjectBookFeign create(Throwable cause) {
-        return new ProjectBookFeign() {
-
-            @Override
-            public ResultBean<Boolean> insertByResidentialId(ProjectBook projectBook) {
-                log.error(cause.getMessage(),cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public ResultBean<ProjectBook> findByProjectId(Long projectId) {
-                log.error(cause.getMessage(),cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public ResultBean<Boolean> editByProjectId(ProjectBook projectBook) {
-                log.error(cause.getMessage(),cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-        };
-    }
-}

sptg-estate/sptg-estate-api/src/main/java/com/sptg/estate/api/feigns/fallback/ProjectCompletionFeignFallbackFactory.java

@@ -1,46 +0,0 @@
-package com.sptg.estate.api.feigns.fallback;
-
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.common.core.beans.ResultEnum;
-import com.sptg.estate.api.entity.ProjectBook;
-import com.sptg.estate.api.entity.ProjectCompletion;
-import com.sptg.estate.api.feigns.ProjectBookFeign;
-import com.sptg.estate.api.feigns.ProjectCompletionFeign;
-import feign.hystrix.FallbackFactory;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-/**
- * title: ProjectFeignFallbackFactory
- * package: com.sptg.estate.biz.security
- * description: 物业验收-服务容错处理类
- *
- *               
- *                     
- */
-@Component
-@Slf4j
-public class ProjectCompletionFeignFallbackFactory implements FallbackFactory<ProjectCompletionFeign> {
-    @Override
-    public ProjectCompletionFeign create(Throwable cause) {
-        return new ProjectCompletionFeign() {
-            @Override
-            public ResultBean<Boolean> insert(ProjectCompletion projectCompletion) {
-                log.error(cause.getMessage(),cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public ResultBean<ProjectCompletion> findByProjectId(Long projectId) {
-                log.error(cause.getMessage(),cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public ResultBean<Boolean> countByProjectId(Long projectId) {
-                log.error(cause.getMessage(),cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-        };
-    }
-}

sptg-estate/sptg-estate-api/src/main/java/com/sptg/estate/api/feigns/fallback/ProjectFeignFallbackFactory.java

@@ -1,108 +0,0 @@
-package com.sptg.estate.api.feigns.fallback;
-
-import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.common.core.beans.ResultEnum;
-import com.sptg.estate.api.dto.ProjectDto;
-import com.sptg.estate.api.entity.Project;
-import com.sptg.estate.api.feigns.ProjectFeign;
-import feign.hystrix.FallbackFactory;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * title: ProjectFeignFallbackFactory
- * package: com.sptg.estate.biz.security
- * description: 实施项目-服务容错处理类
- *
- *               
- *                     
- */
-@Component
-@Slf4j
-public class ProjectFeignFallbackFactory implements FallbackFactory<ProjectFeign> {
-    @Override
-    public ProjectFeign create(Throwable cause) {
-        return new ProjectFeign() {
-            @Override
-            public ResultBean<Page<Project>> showList(ProjectDto projectDto) {
-                log.error(cause.getMessage(),cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public ResultBean<Page<Project>> showListInstallation(ProjectDto projectDto) {
-                log.error(cause.getMessage(),cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public ResultBean<Page<Project>> showListTest(ProjectDto projectDto) {
-                log.error(cause.getMessage(),cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public ResultBean<Project> findByResidentialId(Long residentialId) {
-                log.error(cause.getMessage(),cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public ResultBean<Boolean> insert(Project project) {
-                log.error(cause.getMessage(),cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public ResultBean<Boolean> updateById(Project project) {
-                log.error(cause.getMessage(),cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public ResultBean<Boolean> countByResidentialId(Long residentialId) {
-                log.error(cause.getMessage(),cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public ResultBean<Project> findById(Long id) {
-                log.error(cause.getMessage(),cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public ResultBean<Boolean> edit(Project project) {
-                log.error(cause.getMessage(),cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public ResultBean<Project> findListByPosition(ProjectDto projectDto) {
-                log.error(cause.getMessage(),cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public ResultBean<Integer> countByOrgPosition(String orgPosition) {
-                log.error(cause.getMessage(),cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public ResultBean<Boolean> insertProjectAndContract(ProjectDto dto) {
-                log.error(cause.getMessage(),cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public List<Project> findListByXqIds(List<Long> idList) {
-                log.error(cause.getMessage(),cause);
-                return null;
-            }
-        };
-    }
-}

sptg-estate/sptg-estate-api/src/main/java/com/sptg/estate/api/feigns/fallback/ThirdUserFeignFallbackFactory.java

@@ -1,77 +0,0 @@
-package com.sptg.estate.api.feigns.fallback;
-
-import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.common.core.beans.ExcelResultEnum;
-import com.sptg.common.core.beans.PageBean;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.common.core.beans.ResultEnum;
-import com.sptg.estate.api.dto.SimpleUserDto;
-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.estate.api.vo.DevicesAccessPushVO;
-import feign.hystrix.FallbackFactory;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-
-/**
- * title: UserFeignFallbackFactory
- * package: com.sptg.estate.api.feigns.fallback
- * description: 住户 服务接口容错处理
- *
- *
- *
- */
-@Component
-@Slf4j
-public class ThirdUserFeignFallbackFactory implements FallbackFactory<ThirdUserFeign> {
-
-    @Override
-    public ThirdUserFeign create(Throwable cause) {
-        return new ThirdUserFeign() {
-
-            @Override
-            public ResultBean<Boolean> addUser(ThirdUserDto userDto) {
-                log.error(cause.getMessage(),cause);
-                return null;
-            }
-
-            @Override
-            public ThirdUser findUserById(Long id) {
-                log.error(cause.getMessage(),cause);
-                return null;
-            }
-
-            @Override
-            public ResultBean<Boolean> updateUser(ThirdUserDto userDto) {
-                log.error(cause.getMessage(),cause);
-                return null;
-            }
-
-            @Override
-            public ResultBean<Boolean> deleteUser(ThirdUserDto userDto) {
-                log.error(cause.getMessage(),cause);
-                return null;
-            }
-
-            @Override
-            public boolean updateEntity(ThirdUser user) {
-                log.error(cause.getMessage(),cause);
-                return false;
-            }
-
-            @Override
-            public List<ThirdUser> getListByCondition(ThirdUserDto dto) {
-                log.error(cause.getMessage(),cause);
-                return null;
-            }
-        };
-    }
-}

sptg-estate/sptg-estate-api/src/main/java/com/sptg/estate/api/vo/BillsVO.java

@@ -1,161 +0,0 @@
-package com.sptg.estate.api.vo;
-
-import com.sptg.estate.api.entity.Bills;
-import com.sptg.estate.api.entity.BillsItem;
-import lombok.Data;
-
-import java.util.List;
-@Data
-public class BillsVO extends Bills {
-
-    /** ----------账单缴费项*/
-    private List<BillsItem> itemList;
-
-    public static final class BillsVOBuilder {
-        private List<BillsItem> itemList;
-        private Long id;
-        private Long agencyId;
-        private String agencyName;
-        private Long residentialId;
-        private String residentialName;
-        private Long buildingId;
-        private String buildingName;
-        private Long unitId;
-        private String unitName;
-        private Long floorId;
-        private String floorName;
-        private Long roomId;
-        private String roomName;
-        private String billsDate;
-        private Double totalFee;
-        private Integer status;
-        private Long payId;
-        private String orgPosition;
-
-        public BillsVOBuilder() {
-        }
-
-        public static BillsVOBuilder aBillsVO() {
-            return new BillsVOBuilder();
-        }
-
-        public BillsVOBuilder withItemList(List<BillsItem> itemList) {
-            this.itemList = itemList;
-            return this;
-        }
-
-        public BillsVOBuilder withId(Long id) {
-            this.id = id;
-            return this;
-        }
-
-        public BillsVOBuilder withAgencyId(Long agencyId) {
-            this.agencyId = agencyId;
-            return this;
-        }
-
-        public BillsVOBuilder withAgencyName(String agencyName) {
-            this.agencyName = agencyName;
-            return this;
-        }
-
-        public BillsVOBuilder withResidentialId(Long residentialId) {
-            this.residentialId = residentialId;
-            return this;
-        }
-
-        public BillsVOBuilder withResidentialName(String residentialName) {
-            this.residentialName = residentialName;
-            return this;
-        }
-
-        public BillsVOBuilder withBuildingId(Long buildingId) {
-            this.buildingId = buildingId;
-            return this;
-        }
-
-        public BillsVOBuilder withBuildingName(String buildingName) {
-            this.buildingName = buildingName;
-            return this;
-        }
-
-        public BillsVOBuilder withUnitId(Long unitId) {
-            this.unitId = unitId;
-            return this;
-        }
-
-        public BillsVOBuilder withUnitName(String unitName) {
-            this.unitName = unitName;
-            return this;
-        }
-
-        public BillsVOBuilder withFloorId(Long floorId) {
-            this.floorId = floorId;
-            return this;
-        }
-
-        public BillsVOBuilder withFloorName(String floorName) {
-            this.floorName = floorName;
-            return this;
-        }
-
-        public BillsVOBuilder withRoomId(Long roomId) {
-            this.roomId = roomId;
-            return this;
-        }
-
-        public BillsVOBuilder withRoomName(String roomName) {
-            this.roomName = roomName;
-            return this;
-        }
-
-        public BillsVOBuilder withBillsDate(String billsDate) {
-            this.billsDate = billsDate;
-            return this;
-        }
-
-        public BillsVOBuilder withTotalFee(Double totalFee) {
-            this.totalFee = totalFee;
-            return this;
-        }
-
-        public BillsVOBuilder withStatus(Integer status) {
-            this.status = status;
-            return this;
-        }
-
-        public BillsVOBuilder withPayId(Long payId) {
-            this.payId = payId;
-            return this;
-        }
-
-//        public BillsVOBuilder withOrgPosition(String orgPosition) {
-//            this.orgPosition = orgPosition;
-//            return this;
-//        }
-
-        public BillsVO build() {
-            BillsVO billsVO = new BillsVO();
-            billsVO.setId(id);
-            billsVO.setAgencyId(agencyId);
-            billsVO.setAgencyName(agencyName);
-            billsVO.setResidentialId(residentialId);
-            billsVO.setResidentialName(residentialName);
-            billsVO.setBuildingId(buildingId);
-            billsVO.setBuildingName(buildingName);
-            billsVO.setUnitId(unitId);
-            billsVO.setUnitName(unitName);
-            billsVO.setFloorId(floorId);
-            billsVO.setFloorName(floorName);
-            billsVO.setRoomId(roomId);
-            billsVO.setRoomName(roomName);
-            billsVO.setBillsDate(billsDate);
-            billsVO.setTotalFee(totalFee);
-            billsVO.setStatus(status);
-            billsVO.setPayId(payId);
-//            billsVO.setOrgPosition(orgPosition);
-            billsVO.itemList = this.itemList;
-            return billsVO;
-        }
-    }
-}

sptg-estate/sptg-estate-biz/src/main/java/com/sptg/estate/biz/controller/AcceptanceController.java

@@ -1,77 +0,0 @@
-package com.sptg.estate.biz.controller;
-
-import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.common.core.beans.ResultEnum;
-import com.sptg.estate.api.dto.AcceptanceDto;
-import com.sptg.estate.api.entity.Acceptance;
-import com.sptg.estate.api.feigns.AcceptanceFeign;
-import com.sptg.estate.biz.service.AcceptanceServiceInterface;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * title: DeviceInstallationController
- * package: com.sptg.estate.biz.service
- * description: 竣工验收 - 控制器
- *
- *               
- *                      
- */
-@RestController
-@RequiredArgsConstructor
-@RequestMapping(value = "/implement/acceptance")
-@Api(value = "AcceptanceController",description = "竣工验收")
-public class AcceptanceController implements AcceptanceFeign {
-
-    private final AcceptanceServiceInterface acceptanceServiceInterface;
-
-    @Override
-    @PostMapping("/countByProjectId")
-    public ResultBean<Boolean> countByProjectId(@RequestBody Long projectId) {
-        return this.acceptanceServiceInterface.countByProjectId(projectId);
-    }
-
-    @Override
-    @PostMapping("/insert")
-    @ApiOperation(value = "insert",notes="新增")
-    public ResultBean<Boolean> insert(@RequestBody AcceptanceDto dto) {
-        return this.acceptanceServiceInterface.insertEntity(dto);
-    }
-
-    @Override
-    @PostMapping("/countByOrgPosition")
-    public ResultBean<Integer> countByOrgPosition(@RequestBody String orgPosition) {
-        return this.acceptanceServiceInterface.countByOrgPosition(orgPosition);
-    }
-
-    @Override
-    @PostMapping("/showList")
-    public ResultBean<Page<Acceptance>> showList(@RequestBody AcceptanceDto acceptanceDto) {
-        Page<Acceptance> page = this.acceptanceServiceInterface.showList(acceptanceDto);
-        return new ResultBean<>(ResultEnum.SUCCESS,page);
-    }
-
-    @Override
-    @PostMapping("/edit")
-    public ResultBean<Boolean> edit(@RequestBody Acceptance acceptance) {
-        return new ResultBean<>(ResultEnum.SUCCESS,this.acceptanceServiceInterface.updateById(acceptance));
-    }
-
-    @Override
-    @PostMapping("/checkState")
-    public ResultBean<Boolean> checkState(@RequestBody AcceptanceDto dto) {
-        return this.acceptanceServiceInterface.checkState(dto);
-    }
-
-    @Override
-    @PostMapping("/findById")
-    public ResultBean<Acceptance> findById(@RequestBody Long id) {
-        return new ResultBean<>(ResultEnum.SUCCESS,this.acceptanceServiceInterface.selectById(id));
-    }
-}

sptg-estate/sptg-estate-biz/src/main/java/com/sptg/estate/biz/controller/AccessBlackCardController.java

@@ -1,37 +0,0 @@
-package com.sptg.estate.biz.controller;
-
-import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.estate.api.dto.AccessBlackCardDto;
-import com.sptg.estate.api.entity.AccessBlackCard;
-import com.sptg.estate.api.feigns.AccessBlackCardFeign;
-import com.sptg.estate.biz.service.AccessBlackCardServiceInterface;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-
-/**
- * title: UserCardController
- * package: com.sptg.estate.biz.controller
- * description: 门禁卡黑名单 控制器
- *
- *
- *
- */
-@RestController
-public class AccessBlackCardController implements AccessBlackCardFeign {
-
-    private final AccessBlackCardServiceInterface accessBlackCardServiceInterface;
-
-    @Autowired
-    public AccessBlackCardController(AccessBlackCardServiceInterface accessBlackCardServiceInterface) {
-        this.accessBlackCardServiceInterface = accessBlackCardServiceInterface;
-    }
-
-    @Override
-    @PostMapping(value = "/accessBlackCard/showAccessBlackCardList")
-    public ResultBean<Page<AccessBlackCard>> showAccessBlackCardList(@RequestBody AccessBlackCardDto accessBlackCardDto) {
-        return this.accessBlackCardServiceInterface.showAccessBlackCardList(accessBlackCardDto);
-    }
-
-}

sptg-estate/sptg-estate-biz/src/main/java/com/sptg/estate/biz/controller/AccessCardPushRecordsController.java

@@ -1,249 +0,0 @@
-package com.sptg.estate.biz.controller;
-
-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.device.api.feigns.DeviceFeign;
-import com.sptg.estate.api.dto.AccessCardPushRecordsDto;
-
-import com.sptg.estate.api.entity.AccessCardPushRecords;
-import com.sptg.estate.api.entity.AccessFacePushRecords;
-import com.sptg.estate.api.feigns.AccessCardPushRecordsFeign;
-import com.sptg.estate.biz.service.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.BeanUtils;
-import org.springframework.util.Assert;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-/**
- * title: AccessCardPushRecordsController
- * package: com.sptg.estate.biz.controller
- * description:授权下发记录 控制器
- *
- *
- *
- */
-@RestController
-@RequiredArgsConstructor
-public class AccessCardPushRecordsController implements AccessCardPushRecordsFeign {
-
-    private final BaseUserServiceInterface baseUserServiceInterface;
-    private final AccessCardPushRecordsServiceInterface accessCardPushRecordsServiceInterface;
-    private final DeviceFeign deviceFeign;
-
-    /* -------------------------------------------------------------------------------------------------------------- */
-
-    @Override
-    @PostMapping(value = "/accessCardPushRecords/showAccessCardPushRecordsList")
-    public ResultBean<Page<AccessCardPushRecords>> showAccessCardPushRecordsList(@RequestBody AccessCardPushRecordsDto accessCardPushRecordsDto) {
-        return this.accessCardPushRecordsServiceInterface.showAccessCardPushRecordsList(accessCardPushRecordsDto);
-    }
-
-    private final UserServiceInterface userServiceInterface;
-
-    /**
-     * 添加一条用户授权下发记录
-     * @param recordsDto 授权下发记录业务对象
-     * @return
-     */
-    @Override
-    @PostMapping(value = "/accessCardPushRecords/addAccessCardPushRecords")
-    public ResultBean<Boolean> addAccessCardPushRecords(@RequestBody AccessCardPushRecordsDto recordsDto) {
-        Long userId = recordsDto.getUserId();
-        Long deviceId = recordsDto.getDeviceId();
-        Assert.notNull(userId, "用户ID为空，不能记录用户授权下发记录");
-        Assert.notNull(deviceId, "设备ID为空，不能记录用户授权下发记录");
-        AccessCardPushRecords records = this.buildAccessCardPushRecords(recordsDto);
-        this.accessCardPushRecordsServiceInterface.addAccessCardPushRecords(records);
-        return new ResultBean<>(ResultEnum.SUCCESS,true);
-    }
-
-    @Override
-    @PostMapping(value = "/accessCardPushRecords/addAccessCardPushRecordsByDevices")
-    public ResultBean<Boolean> addAccessCardPushRecordsByDevices(@RequestBody AccessCardPushRecordsDto recordsDto) {
-        Long userId = recordsDto.getUserId();
-        List<Long> deviceIdList = recordsDto.getDeviceIdList();
-        Assert.notNull(userId, "用户ID为空，不能记录用户授权下发记录");
-        Assert.notEmpty(deviceIdList, "没有下发的设备，不能记录用户授权下发记录");
-        List<AccessCardPushRecords> recordsList = this.buildAccessCardPushRecordsList(recordsDto);
-        Assert.notEmpty(recordsList, "没有下发的设备，不能记录用户授权下发记录");
-        boolean result = this.accessCardPushRecordsServiceInterface.insertBatch(recordsList);
-        return new ResultBean<>(ResultEnum.SUCCESS, result);
-    }
-
-    /**
-     * 更新用户授权下发记录
-     * @param recordsDto 授权下发记录业务对象
-     * @return
-     */
-    @Override
-    @PostMapping(value = "/accessCardPushRecords/updateAccessCardPushRecords")
-    public ResultBean<Boolean> updateAccessCardPushRecords(@RequestBody AccessCardPushRecordsDto recordsDto) {
-        Long userId = recordsDto.getUserId();
-        Assert.notNull(userId, "用户ID为空，不能记录用户授权下发记录");
-        List<AccessCardPushRecords> accessCardPushRecordsList = this.getAccessCardPushRecordsList(recordsDto);
-        Assert.notEmpty(accessCardPushRecordsList, "没有需要更新的记录");
-
-        //如果是更新则更新有效时间
-        if (recordsDto.getEnable() == OperationConstant.ONE){
-            for(int i = 0; i < accessCardPushRecordsList.size(); i++){
-                AccessCardPushRecords records = accessCardPushRecordsList.get(i);
-                records.setBeginDate(recordsDto.getBeginDate());
-                records.setEndDate(recordsDto.getEndDate());
-            }
-        }
-        if(this.accessCardPushRecordsServiceInterface.updateBatchById(accessCardPushRecordsList)){
-            return new ResultBean<>(ResultEnum.SUCCESS, true);
-        }
-        return new ResultBean<>(ResultEnum.SUCCESS, false);
-    }
-
-    /**
-     * 完善授权下发业务对象（需要新增一条记录）
-     * @param recordsDto
-     */
-    private AccessCardPushRecords buildAccessCardPushRecords(AccessCardPushRecordsDto recordsDto){
-        AccessCardPushRecords records = new AccessCardPushRecords();
-        BeanUtils.copyProperties(recordsDto, records);
-        Date today = new Date();
-        records.setAccessDate(today);
-        records.setCreateDate(today);
-        records.setBeginDate(recordsDto.getBeginDate());
-        records.setEndDate(recordsDto.getEndDate());
-        return records;
-    }
-
-    /**
-     * 构建授权下发业务对象（需要新增多条记录或一条记录）
-     * @param recordsDto
-     */
-    private List<AccessCardPushRecords> buildAccessCardPushRecordsList(AccessCardPushRecordsDto recordsDto){
-        List<Long> deviceIdList = recordsDto.getDeviceIdList();
-        Long deviceId= recordsDto.getDeviceId();
-        if(deviceIdList != null && deviceIdList.size() > 0){
-            List<AccessCardPushRecords> list = new ArrayList<>();
-            deviceIdList.forEach(item -> {
-                recordsDto.setDeviceId(item); //以deviceIdList内的设备ID为主
-                list.add(this.buildAccessCardPushRecords(recordsDto));
-            });
-            return list;
-        }else{
-            if(deviceId != null){
-                List<AccessCardPushRecords> list = new ArrayList<>();
-                list.add(this.buildAccessCardPushRecords(recordsDto));
-                return list;
-            }else{
-                return null;
-            }
-        }
-    }
-
-    /**
-     * 更新授权下发记录（一条或者多条记录更新）
-     * @param dto
-     */
-    private List<AccessCardPushRecords> getAccessCardPushRecordsList(AccessCardPushRecordsDto dto){
-        // pushType 下发类型：1 仅人脸、2 仅门禁卡、 3 人脸和门禁卡
-//        Integer pushType = dto.getPushType();
-        Date today = new Date();
-//        if(pushType.equals(OperationConstant.ONE)){
-//            List<AccessCardPushRecords> recordsList = this.accessCardPushRecordsServiceInterface.findAccessCardPushRecordsByUserId(dto.getUserId());
-//            for(int i = 0; i < recordsList.size(); i++){
-//                AccessCardPushRecords records = recordsList.get(i);
-//                records.setFaceUri(dto.getFaceUri());
-//                records.setAccessDate(today);
-//            }
-//            return recordsList;
-//        }
-//        else if(pushType.equals(OperationConstant.TWO)){
-            List<AccessCardPushRecords> recordsList = this.accessCardPushRecordsServiceInterface.findAccessCardPushRecordsByUserId(dto.getUserId());
-            for(int i = 0; i < recordsList.size(); i++){
-                AccessCardPushRecords records = recordsList.get(i);
-                records.setCardNo(dto.getCardNo());
-                records.setBeginDate(dto.getBeginDate());
-                records.setEndDate(dto.getEndDate());
-                records.setEnable(dto.getEnable());
-                records.setAccessDate(today);
-            }
-            return recordsList;
-//        }
-//        else if(pushType.equals(OperationConstant.THREE)){
-//            List<AccessCardPushRecords> recordsList = this.accessCardPushRecordsServiceInterface.findAccessCardPushRecordsByUserId(dto.getUserId());
-//            for(int i = 0; i < recordsList.size(); i++){
-//                AccessCardPushRecords records = recordsList.get(i);
-//                records.setFaceUri(dto.getFaceUri());
-//                records.setCardNo(dto.getCardNo());
-//                records.setAccessDate(today);
-//            }
-//            return recordsList;
-//        }
-//        return null;
-    }
-
-    @Override
-    @PostMapping(value = "/accessCardPushRecords/addOrUpdateAccessCardPushRecords")
-    public ResultBean<Boolean> addOrUpdateAccessCardPushRecords(@RequestBody AccessCardPushRecordsDto dto) {
-        List<AccessCardPushRecords> pushRecords = this.accessCardPushRecordsServiceInterface.findAccessCardPushRecordsByUserId(dto.getUserId());
-        boolean result = this.accessCardPushRecordsServiceInterface.insert(dto);
-        return new ResultBean<>(ResultEnum.SUCCESS,result);
-    }
-
-    @Override
-    @GetMapping(value = "/accessCardPushRecords/findAccessCardPushRecordsById/{id}")
-    public AccessCardPushRecords findAccessCardPushRecordsById(@PathVariable(value = "id") Long id) {
-        return this.accessCardPushRecordsServiceInterface.findAccessCardPushRecordsById(id);
-    }
-
-    @Override
-    public List<AccessCardPushRecords> findAccessCardPushRecordsByUserId(Long userId) {
-        return this.accessCardPushRecordsServiceInterface.findAccessCardPushRecordsByUserId(userId);
-    }
-
-    /**
-     * 禁用门禁卡
-     * @param accessCardPushRecordsDto 授权下发记录业务对象
-     * @return
-     */
-    @Override
-    @PostMapping(value = "/accessCardPushRecords/deleteAccessCardPushRecords")
-    public ResultBean<Boolean> deleteAccessCardPushRecords(@RequestBody AccessCardPushRecordsDto accessCardPushRecordsDto) {
-        List<AccessCardPushRecords> dellist = this.accessCardPushRecordsServiceInterface.findAccessCardPushRecordsByUserId(accessCardPushRecordsDto.getUserId());
-        List<Long> delIds = new ArrayList<>();
-        dellist.forEach(del -> {
-            delIds.add(del.getId());
-        });
-        if(delIds.size() > 0){
-            if(this.accessCardPushRecordsServiceInterface.deleteBatchIds(delIds)){
-                return new ResultBean<>(ResultEnum.SUCCESS, true);
-            }else{
-                return new ResultBean<>(ResultEnum.ERROR, false);
-            }
-        }else{
-            return new ResultBean<>(ResultEnum.SUCCESS, true);
-        }
-        /*for(int i = 0; i < dellist.size(); i++){
-            dellist.get(0).setEnable(OperationConstant.TWO);
-        }
-        if(this.accessCardPushRecordsServiceInterface.updateBatchById(dellist)){
-            return new ResultBean<>(ResultEnum.SUCCESS, true);
-        }else{
-            return new ResultBean<>(ResultEnum.ERROR, false);
-        }*/
-    }
-
-    @Override
-    @PostMapping(value = "/accessCardPushRecords/getAccessCardPushRecordsCount")
-    public Long getAccessCardPushRecordsCount(@RequestBody AccessCardPushRecordsDto accessCardPushRecordsDto) {
-        return this.accessCardPushRecordsServiceInterface.getAccessCardPushRecordsCount(accessCardPushRecordsDto);
-    }
-
-    @Override
-    @PostMapping(value = "/accessCardPushRecords/getListByUserId/{userId}/{accessUserType}/{specialDevice}")
-    public ResultBean<AccessCardPushRecords> getListByUserId(@PathVariable("userId") Long userId, @PathVariable("accessUserType") Integer accessUserType, @PathVariable("specialDevice") Integer specialDevice) {
-        return this.accessCardPushRecordsServiceInterface.getListByUserId(userId, accessUserType, specialDevice);
-    }
-
-}

sptg-estate/sptg-estate-biz/src/main/java/com/sptg/estate/biz/controller/AccessFacePushRecordsController.java

@@ -1,240 +0,0 @@
-package com.sptg.estate.biz.controller;
-
-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.device.api.feigns.DeviceFeign;
-import com.sptg.estate.api.dto.AccessFacePushRecordsDto;
-import com.sptg.estate.api.entity.AccessFacePushRecords;
-import com.sptg.estate.api.feigns.AccessFacePushRecordsFeign;
-import com.sptg.estate.biz.service.AccessFacePushRecordsServiceInterface;
-import com.sptg.estate.biz.service.AccessFacePushRecordsServiceInterface;
-import com.sptg.estate.biz.service.BaseUserServiceInterface;
-import com.sptg.estate.biz.service.UserServiceInterface;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.BeanUtils;
-import org.springframework.util.Assert;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- * title: AccessFacePushRecordsController
- * package: com.sptg.estate.biz.controller
- * description:授权下发记录 控制器
- *
- *
- *
- */
-@RestController
-@RequiredArgsConstructor
-public class AccessFacePushRecordsController implements AccessFacePushRecordsFeign {
-
-    private final BaseUserServiceInterface baseUserServiceInterface;
-    private final AccessFacePushRecordsServiceInterface accessFacePushRecordsServiceInterface;
-    private final DeviceFeign deviceFeign;
-
-    /* -------------------------------------------------------------------------------------------------------------- */
-
-    @Override
-    @PostMapping(value = "/accessFacePushRecords/showAccessFacePushRecordsList")
-    public ResultBean<Page<AccessFacePushRecords>> showAccessFacePushRecordsList(@RequestBody AccessFacePushRecordsDto accessFacePushRecordsDto) {
-        return this.accessFacePushRecordsServiceInterface.showAccessFacePushRecordsList(accessFacePushRecordsDto);
-    }
-
-    private final UserServiceInterface userServiceInterface;
-
-    /**
-     * 添加一条用户授权下发记录
-     * @param recordsDto 授权下发记录业务对象
-     * @return
-     */
-    @Override
-    @PostMapping(value = "/accessFacePushRecords/addAccessFacePushRecords")
-    public ResultBean<Boolean> addAccessFacePushRecords(@RequestBody AccessFacePushRecordsDto recordsDto) {
-        Long userId = recordsDto.getUserId();
-        Long deviceId = recordsDto.getDeviceId();
-        Assert.notNull(userId, "用户ID为空，不能记录用户授权下发记录");
-        Assert.notNull(deviceId, "设备ID为空，不能记录用户授权下发记录");
-        AccessFacePushRecords records = this.buildAccessFacePushRecords(recordsDto);
-        this.accessFacePushRecordsServiceInterface.addAccessFacePushRecords(records);
-        return new ResultBean<>(ResultEnum.SUCCESS,true);
-    }
-
-    @Override
-    @PostMapping(value = "/accessFacePushRecords/addAccessFacePushRecordsByDevices")
-    public ResultBean<Boolean> addAccessFacePushRecordsByDevices(@RequestBody AccessFacePushRecordsDto recordsDto) {
-        Long userId = recordsDto.getUserId();
-        List<Long> deviceIdList = recordsDto.getDeviceIdList();
-        Assert.notNull(userId, "用户ID为空，不能记录用户授权下发记录");
-        Assert.notEmpty(deviceIdList, "没有下发的设备，不能记录用户授权下发记录");
-        List<AccessFacePushRecords> recordsList = this.buildAccessFacePushRecordsList(recordsDto);
-        Assert.notEmpty(recordsList, "没有下发的设备，不能记录用户授权下发记录");
-        boolean result = this.accessFacePushRecordsServiceInterface.insertBatch(recordsList);
-        return new ResultBean<>(ResultEnum.SUCCESS, result);
-    }
-
-    /**
-     * 更新用户授权下发记录
-     * @param accessFacePushRecordsDto 授权下发记录业务对象
-     * @return
-     */
-    @Override
-    @PostMapping(value = "/accessFacePushRecords/updateAccessFacePushRecords")
-    public ResultBean<Boolean> updateAccessFacePushRecords(@RequestBody AccessFacePushRecordsDto accessFacePushRecordsDto) {
-        Long userId = accessFacePushRecordsDto.getUserId();
-        Assert.notNull(userId, "用户ID为空，不能记录用户授权下发记录");
-        List<AccessFacePushRecords> accessFacePushRecordsList = this.getAccessFacePushRecordsList(accessFacePushRecordsDto);
-        Assert.notEmpty(accessFacePushRecordsList, "没有需要更新的记录");
-
-        //如果是更新则更新有效时间
-        if (accessFacePushRecordsDto.getEnable() == OperationConstant.ONE){
-            for(int i = 0; i < accessFacePushRecordsList.size(); i++){
-                AccessFacePushRecords records = accessFacePushRecordsList.get(i);
-                records.setBeginDate(accessFacePushRecordsDto.getBeginDate());
-                records.setEndDate(accessFacePushRecordsDto.getEndDate());
-            }
-        }
-        if(this.accessFacePushRecordsServiceInterface.updateBatchById(accessFacePushRecordsList)){
-            return new ResultBean<>(ResultEnum.SUCCESS, true);
-        }
-        return new ResultBean<>(ResultEnum.SUCCESS, false);
-    }
-
-    /**
-     * 完善授权下发业务对象（需要新增一条记录）
-     * @param recordsDto
-     */
-    private AccessFacePushRecords buildAccessFacePushRecords(AccessFacePushRecordsDto recordsDto){
-        AccessFacePushRecords records = new AccessFacePushRecords();
-        BeanUtils.copyProperties(recordsDto, records);
-        Date today = new Date();
-        records.setAccessDate(today);
-        records.setCreateDate(today);
-        records.setBeginDate(recordsDto.getBeginDate());
-        records.setEndDate(recordsDto.getEndDate());
-        return records;
-    }
-
-    /**
-     * 构建授权下发业务对象（需要新增多条记录或一条记录）
-     * @param recordsDto
-     */
-    private List<AccessFacePushRecords> buildAccessFacePushRecordsList(AccessFacePushRecordsDto recordsDto){
-        List<Long> deviceIdList = recordsDto.getDeviceIdList();
-        Long deviceId= recordsDto.getDeviceId();
-        if(deviceIdList != null && deviceIdList.size() > 0){
-            List<AccessFacePushRecords> list = new ArrayList<>();
-            deviceIdList.forEach(item -> {
-                recordsDto.setDeviceId(item); //以deviceIdList内的设备ID为主
-                list.add(this.buildAccessFacePushRecords(recordsDto));
-            });
-            return list;
-        }else{
-            if(deviceId != null){
-                List<AccessFacePushRecords> list = new ArrayList<>();
-                list.add(this.buildAccessFacePushRecords(recordsDto));
-                return list;
-            }else{
-                return null;
-            }
-        }
-    }
-
-    /**
-     * 更新授权下发记录（一条或者多条记录更新）
-     * @param dto
-     */
-    private List<AccessFacePushRecords> getAccessFacePushRecordsList(AccessFacePushRecordsDto dto){
-        // pushType 下发类型：1 仅人脸、2 仅门禁卡、 3 人脸和门禁卡
-//        Integer pushType = dto.getPushType();
-        Date today = new Date();
-//        if(pushType.equals(OperationConstant.ONE)){
-            List<AccessFacePushRecords> recordsList = this.accessFacePushRecordsServiceInterface.findAccessFacePushRecordsByUserId(dto.getUserId());
-            for(int i = 0; i < recordsList.size(); i++){
-                AccessFacePushRecords records = recordsList.get(i);
-                records.setFaceUri(dto.getFaceUri());
-                records.setEnable(dto.getEnable());
-                records.setAccessDate(today);
-            }
-            return recordsList;
-//        }
-//        else if(pushType.equals(OperationConstant.TWO)){
-//            List<AccessFacePushRecords> recordsList = this.accessFacePushRecordsServiceInterface.findAccessFacePushRecordsByUserId(dto.getUserId());
-//            for(int i = 0; i < recordsList.size(); i++){
-//                AccessFacePushRecords records = recordsList.get(i);
-//                records.setCardNo(dto.getCardNo());
-//                records.setAccessDate(today);
-//            }
-//            return recordsList;
-//        }
-//        else if(pushType.equals(OperationConstant.THREE)){
-//            List<AccessFacePushRecords> recordsList = this.accessFacePushRecordsServiceInterface.findAccessFacePushRecordsByUserId(dto.getUserId());
-//            for(int i = 0; i < recordsList.size(); i++){
-//                AccessFacePushRecords records = recordsList.get(i);
-//                records.setFaceUri(dto.getFaceUri());
-//                records.setCardNo(dto.getCardNo());
-//                records.setAccessDate(today);
-//            }
-//            return recordsList;
-//        }
-//        return null;
-    }
-
-    @Override
-    @PostMapping(value = "/accessFacePushRecords/addOrUpdateAccessFacePushRecords")
-    public ResultBean<Boolean> addOrUpdateAccessFacePushRecords(@RequestBody AccessFacePushRecordsDto dto) {
-        List<AccessFacePushRecords> pushRecords = this.accessFacePushRecordsServiceInterface.findAccessFacePushRecordsByUserId(dto.getUserId());
-        boolean result = this.accessFacePushRecordsServiceInterface.insert(dto);
-        return new ResultBean<>(ResultEnum.SUCCESS,result);
-    }
-
-    @Override
-    @GetMapping(value = "/accessFacePushRecords/findAccessFacePushRecordsById/{id}")
-    public AccessFacePushRecords findAccessFacePushRecordsById(@PathVariable(value = "id") Long id) {
-        return this.accessFacePushRecordsServiceInterface.findAccessFacePushRecordsById(id);
-    }
-
-    @Override
-    public List<AccessFacePushRecords> findAccessFacePushRecordsByUserId(Long userId) {
-        return this.accessFacePushRecordsServiceInterface.findAccessFacePushRecordsByUserId(userId);
-    }
-
-    @Override
-    @PostMapping(value = "/accessFacePushRecords/deleteAccessFacePushRecords")
-    public ResultBean<Boolean> deleteAccessFacePushRecords(@RequestBody AccessFacePushRecordsDto accessFacePushRecordsDto) {
-        Long userId = accessFacePushRecordsDto.getUserId();
-        Integer accessUserType = accessFacePushRecordsDto.getAccessUserType();
-        ResultBean<AccessFacePushRecords> resultBean = this.accessFacePushRecordsServiceInterface.getListByUserId(userId, accessUserType, null);
-        List<AccessFacePushRecords> pushList = resultBean.getList();
-        if(pushList != null && pushList.size() > 0){
-            List<Long> delIds = new ArrayList<>();
-            pushList.forEach(del ->{
-                delIds.add(del.getId());
-            });
-            if(this.accessFacePushRecordsServiceInterface.deleteBatchIds(delIds)){
-                return new ResultBean<>(ResultEnum.SUCCESS, true);
-            }else{
-                return new ResultBean<>(ResultEnum.ERROR, false);
-            }
-        }else{
-            return new ResultBean<>(ResultEnum.SUCCESS, true);
-        }
-    }
-
-    @Override
-    @PostMapping(value = "/accessFacePushRecords/getAccessFacePushRecordsCount")
-    public Long getAccessFacePushRecordsCount(@RequestBody AccessFacePushRecordsDto accessFacePushRecordsDto) {
-        return this.accessFacePushRecordsServiceInterface.getAccessFacePushRecordsCount(accessFacePushRecordsDto);
-    }
-
-    @Override
-    @PostMapping(value = "/accessFacePushRecords/getListByUserId/{userId}/{accessUserType}/{specialDevice}")
-    public ResultBean<AccessFacePushRecords> getListByUserId(@PathVariable("userId") Long userId, @PathVariable("accessUserType") Integer accessUserType, @PathVariable("specialDevice") Integer specialDevice) {
-        return this.accessFacePushRecordsServiceInterface.getListByUserId(userId, accessUserType, specialDevice);
-    }
-
-}

sptg-estate/sptg-estate-biz/src/main/java/com/sptg/estate/biz/controller/ApplyPayRefundController.java

@@ -1,86 +0,0 @@
-package com.sptg.estate.biz.controller;
-
-import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.common.core.constant.OperationConstant;
-import com.sptg.estate.api.dto.ApplyPayRefundDto;
-import com.sptg.estate.api.entity.ApplyPayRefund;
-import com.sptg.estate.api.feigns.ApplyPayRefundFeign;
-import com.sptg.estate.biz.service.ApplyPayRefundInterface;
-import com.sptg.pay.api.entity.PayCertificate;
-import com.sptg.pay.api.feigns.PayCertificateFeign;
-import lombok.RequiredArgsConstructor;
-import org.springframework.util.Assert;
-import org.springframework.web.bind.annotation.*;
-
-import java.io.FileNotFoundException;
-import java.util.Date;
-
-/**
- * @author zwx
- * @create 2020/6/21 1:36
- */
-@RestController
-@RequiredArgsConstructor
-public class ApplyPayRefundController implements ApplyPayRefundFeign {
-
-    private final ApplyPayRefundInterface applyPayRefundInterface;
-    private final PayCertificateFeign payCertificateFeign;
-
-    @Override
-    @PostMapping(value = "/applyPayRefund/showApplyPayRefundPage")
-    public ResultBean<Page<ApplyPayRefund>> showApplyPayRefundPage(@RequestBody ApplyPayRefundDto applyPayRefundDto) {
-        Assert.notNull(applyPayRefundDto, "支付退款申请传输对象不能为空");
-        return this.applyPayRefundInterface.showApplyPayRefundList(applyPayRefundDto);
-    }
-
-    @Override
-    @PostMapping(value = "/applyPayRefund/addApplyPayRefund")
-    public ResultBean<Boolean> addApplyPayRefund(@RequestBody ApplyPayRefundDto applyPayRefundDto) {
-        Long payCertificateId = applyPayRefundDto.getPayCertificateId();
-        Assert.notNull(payCertificateId, "支付凭证ID不能为空");
-        Long userId = applyPayRefundDto.getUserId();
-        Assert.notNull(userId, "用户ID不能为空");
-        ApplyPayRefund applyPayRefund = this.applyPayRefundInterface.getApplyPayRefundByCondition(applyPayRefundDto);
-        Assert.isTrue(applyPayRefund == null, "支付退款申请记录已存在");
-        PayCertificate payCertificate = payCertificateFeign.findPayCertificateById(payCertificateId);
-        Assert.notNull(payCertificate, "支付凭证不能为空");
-        Integer payStatus = payCertificate.getPayStatus();
-        Integer refund = payCertificate.getRefund();
-        Assert.isTrue(payStatus.equals(OperationConstant.TWO), "支付凭证未完成支付，无需退款");
-        Assert.isTrue(!refund.equals(OperationConstant.ONE), "支付凭证已退款，请勿重复申请退款");
-        return this.applyPayRefundInterface.addApplyPayRefund(applyPayRefundDto);
-    }
-
-    @Override
-    @GetMapping(value = "/applyPayRefund/findApplyPayRefundById/{id}")
-    public ApplyPayRefund findApplyPayRefundById(@PathVariable(value = "id") Long id) {
-        ApplyPayRefund applyPayRefund = this.applyPayRefundInterface.getApplyPayRefundById(id);
-        return applyPayRefund;
-    }
-
-    @Override
-    @PostMapping(value = "/applyPayRefund/auditApplyPayRefund")
-    public ResultBean<Boolean> auditApplyPayRefund(@RequestBody ApplyPayRefundDto applyPayRefundDto){
-        Assert.notNull(applyPayRefundDto, "支付退款申请传输对象不能为空");
-        Integer checkStatus = applyPayRefundDto.getCheckStatus();
-        Assert.isTrue(checkStatus.equals(OperationConstant.ONE), "支付申请未通过，不能发起退款申请");
-        Date today = new Date();
-        applyPayRefundDto.setCheckDate(today);
-        return this.applyPayRefundInterface.auditApplyPayRefund(applyPayRefundDto);
-    }
-
-    @Override
-    @PostMapping(value = "/applyPayRefund/findApplyPayRefundByCondition")
-    public ApplyPayRefund findApplyPayRefundByCondition(@RequestBody ApplyPayRefundDto applyPayRefundDto) {
-        Assert.notNull(applyPayRefundDto, "支付退款申请传输对象不能为空");
-        return this.applyPayRefundInterface.getApplyPayRefundByCondition(applyPayRefundDto);
-    }
-
-    @Override
-    @PostMapping(value = "/applyPayRefund/updateApplyPayRefundByRefundNo")
-    public Boolean updateApplyPayRefundByRefundNo(@RequestBody ApplyPayRefund applyPayRefund) {
-        Assert.notNull(applyPayRefund, "修改退款申请传输对象不能为空");
-        return this.applyPayRefundInterface.updateApplyPayRefundByRefundNo(applyPayRefund);
-    }
-}

sptg-estate/sptg-estate-biz/src/main/java/com/sptg/estate/biz/controller/BillsController.java

@@ -1,170 +0,0 @@
-package com.sptg.estate.biz.controller;
-
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.common.core.constant.OperationConstant;
-import com.sptg.estate.api.dto.BillsDto;
-import com.sptg.estate.api.dto.CarDto;
-import com.sptg.estate.api.entity.Bills;
-import com.sptg.estate.api.entity.BillsItem;
-import com.sptg.estate.api.entity.Car;
-import com.sptg.estate.api.feigns.BillsFeign;
-import com.sptg.estate.api.vo.BillsVO;
-import com.sptg.estate.biz.service.IBillsItemService;
-import com.sptg.estate.biz.service.IBillsService;
-import com.sptg.estate.biz.service.ResidentialServiceInterface;
-import com.sptg.permissions.api.entity.Account;
-import com.sptg.permissions.api.entity.Organization;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author lianghanqiang
- * @since 2021-01-19
- */
-@RestController
-@RequiredArgsConstructor
-@RequestMapping("/bills")
-public class BillsController implements BillsFeign {
-    @Autowired
-    private IBillsService billsService;
-    @Autowired
-    private IBillsItemService billsItemService;
-
-
-    /**
-     *  获取账单列表
-     * */
-    @Override
-    @PostMapping("/list")
-    public Page<Bills> list(
-            @RequestParam(value = "current",required = false) Integer current,
-            @RequestParam(value = "size",required = false) Integer size,
-            Bills bills
-    ){
-        Page page = new Page();
-        if(current!=null){
-            page.setCurrent(current);
-        }
-        if(size!=null){
-            page.setSize(size);
-        }
-        String agencyName = bills.getAgencyName();
-        String residentialName = bills.getResidentialName();
-        String buildingName = bills.getBuildingName();
-        String unitName = bills.getUnitName();
-        String floorName = bills.getFloorName();
-        String roomName = bills.getRoomName();
-        Integer status = bills.getStatus();
-
-        bills.setAgencyName(null);
-        bills.setResidentialName(null);
-        bills.setBuildingName(null);
-        bills.setFloorName(null);
-        bills.setUnitName(null);
-        bills.setRoomName(null);
-        bills.setStatus(null);
-        return billsService.selectPage(page,new EntityWrapper<>(bills)
-        .like(agencyName!=null,"agency_name",agencyName)
-        .like(residentialName!=null,"residential_name",residentialName)
-        .like(buildingName!=null,"building_name",buildingName)
-        .like(unitName!=null,"unit_name",unitName)
-        .like(floorName!=null,"floor_name",floorName)
-        .like(roomName!=null,"room_name",roomName)
-        .eq(status!=null,"status",status)
-        .eq("is_del",0)
-        );
-    }
-
-    /**
-     * 分页
-     */
-    @Override
-    @PostMapping(value = "/page")
-    public ResultBean<Page<Bills>> page(@RequestBody BillsDto dto) {
-//        Page<Bills> page = dto.getPage();
-//        if(page == null){
-//            page = new Page<>();
-//            page.setSize(10);
-//            page.setCurrent(1);
-//        }
-        return this.billsService.page(dto);
-    }
-
-    /**
-     *  获取账单详情
-     * */
-    @Override
-    @GetMapping("/detail")
-    public BillsVO detail(@RequestParam(value = "id",required = true) Long id) {
-        Bills bills = billsService.selectById(id);
-        if(bills!=null){
-            BillsVO billsVO = new BillsVO();
-            BeanUtils.copyProperties(bills,billsVO);
-            billsVO.setItemList(billsItemService.selectList(new EntityWrapper<>(new BillsItem()).eq("pid",id)));
-            return billsVO;
-        }else{
-            return null;
-        }
-    }
-
-    /**
-     *  根据id删除账单
-     * */
-    @Override
-    @PostMapping("/delete")
-    public  ResultBean<Boolean> delete(@RequestBody BillsDto billsDto) {
-        return billsService.delete(billsDto);
-    }
-
-    /**
-     *  根据id更新账单
-     *
-     * @return*/
-    @Override
-    @PostMapping("/edit")
-    public ResultBean<Boolean> edit(@RequestBody BillsDto billsDto) {
-        System.out.println(billsDto);
-         BillsItem billsItem = new BillsItem();
-         billsItem.setPid(billsDto.getId());
-         billsItem.setItemName(billsDto.getItemName());
-         billsItem.setItemDesc(billsDto.getItemDesc());
-         billsItem.setItemFee(billsDto.getItemFee());
-         billsItemService.update(billsItem,new EntityWrapper<>(new BillsItem()).eq("pid",billsDto.getId()));
-        return billsService.edit(billsDto);
-    }
-
-    /**
-     * 添加账单
-     * @return
-     */
-    @Override
-    @PostMapping("/add")
-    public ResultBean<Boolean> add(@RequestBody BillsDto billsDto) {
-        System.out.println(billsDto);
-        BillsItem billsItem = new BillsItem();
-        billsItem.setItemName(billsDto.getItemName());
-        billsItem.setItemDesc(billsDto.getItemDesc());
-        billsItem.setItemFee(billsDto.getItemFee());
-        //写入再获取id
-        ResultBean<Boolean> resultBean = billsService.add(billsDto);
-        ResultBean<Boolean> resultBean1 = new ResultBean<>();
-        billsItem.setPid(billsDto.getId());
-        if (resultBean.getData()){
-            resultBean1.setData(true);
-        }
-        billsItemService.insert(billsItem);
-        return resultBean1;
-    }
-}
-

sptg-estate/sptg-estate-biz/src/main/java/com/sptg/estate/biz/controller/BillsItemController.java

@@ -1,73 +0,0 @@
-package com.sptg.estate.biz.controller;
-
-
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.sptg.estate.api.entity.BillsItem;
-import com.sptg.estate.api.feigns.BillsItemFeign;
-import com.sptg.estate.biz.service.IBillsItemService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author lianghanqiang
- * @since 2021-01-19
- */
-@RestController
-@RequestMapping("/bills-item")
-public class BillsItemController implements BillsItemFeign {
-    @Autowired
-    private IBillsItemService billsItemService;
-
-    /**
-     *  获取缴费项列表
-     * */
-    @GetMapping("/list")
-    @Override
-    public  List<BillsItem> list(@RequestParam("billsId") Long billsId) {
-        return billsItemService.selectList(new EntityWrapper<>(new BillsItem()).eq("pid",billsId));
-    }
-
-    /**
-     *  获取缴费项详情
-     * */
-    @GetMapping("/detail")
-    @Override
-    public BillsItem detail(@RequestParam(value = "id",required = true) Long id) {
-        return billsItemService.selectById(id);
-    }
-
-    /**
-     *  根据id删除缴费项
-     * */
-    @GetMapping("/delete")
-    @Override
-    public boolean delete(@RequestParam(value = "billsId",required = true) Long billsId) {
-        return billsItemService.delete(new EntityWrapper<>(new BillsItem()).eq("pid",billsId));
-//        return billsItemService.deleteById(id);
-    }
-
-    /**
-     *  编辑缴费项
-     * */
-    @GetMapping("/edit")
-    @Override
-    public boolean edit(@RequestBody BillsItem billsItem) {
-        return billsItemService.updateById(billsItem);
-    }
-
-    /**
-     *  编辑缴费项
-     * */
-    @PostMapping("/add")
-    @Override
-    public boolean add(@RequestBody BillsItem billsItem) {
-        return billsItemService.insert(billsItem);
-    }
-}
-

sptg-estate/sptg-estate-biz/src/main/java/com/sptg/estate/biz/controller/ContractController.java

@@ -1,45 +0,0 @@
-package com.sptg.estate.biz.controller;
-
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.common.core.beans.ResultEnum;
-import com.sptg.estate.api.entity.Contract;
-import com.sptg.estate.api.feigns.ContractFeign;
-import com.sptg.estate.biz.service.ContractServiceInterface;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * title: ProjectController
- * package: com.sptg.estate.biz.security
- * description: 实施合同信息 - 控制器
- *
- *               
- *                      
- */
-@RestController
-@RequiredArgsConstructor
-@RequestMapping(value = "/implement/contract")
-public class ContractController implements ContractFeign {
-
-    private final ContractServiceInterface contractServiceInterface;
-    @Override
-    @PostMapping(value = "/findByProjectId")
-    public ResultBean<Contract> findByProjectId(@RequestBody Long projectId) {
-        return this.contractServiceInterface.findByProjectId(projectId);
-    }
-
-    @Override
-    @PostMapping(value = "/insertByResidentialId")
-    public ResultBean<Boolean> insertByResidentialId(@RequestBody Contract contract) {
-        return this.contractServiceInterface.insertByResidentialId(contract);
-    }
-
-    @Override
-    @PostMapping(value = "/editByProjectId")
-    public ResultBean<Boolean> editByProjectId(@RequestBody Contract contract) {
-        return this.contractServiceInterface.editByProjectId(contract);
-    }
-}

sptg-estate/sptg-estate-biz/src/main/java/com/sptg/estate/biz/controller/FaceChargeProjectController.java

@@ -1,113 +0,0 @@
-package com.sptg.estate.biz.controller;
-
-import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.common.core.beans.ResultEnum;
-import com.sptg.estate.api.dto.FaceChargeProjectDto;
-import com.sptg.estate.api.entity.FaceChargeProject;
-import com.sptg.estate.api.feigns.FaceChargeProjectFeign;
-import com.sptg.estate.biz.service.FaceChargeProjectServiceInterface;
-import lombok.RequiredArgsConstructor;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * title: FaceChargeProjectController
- * package: com.sptg.estate.biz.controller
- * description: 人脸套餐 控制器
- *
- */
-
-@RestController
-@RequiredArgsConstructor
-public class FaceChargeProjectController implements FaceChargeProjectFeign {
-
-    private final FaceChargeProjectServiceInterface faceChargeProjectServiceInterface;
-
-
-    @Override
-    @PostMapping(value = "/faceChargeProject/showFaceChargeProjectList")
-    public ResultBean<Page<FaceChargeProject>> showFaceChargeProjectList(@RequestBody FaceChargeProjectDto dto) {
-        return faceChargeProjectServiceInterface.showFaceChargeProjectList(dto);
-    }
-
-    @Override
-    @PostMapping(value = "/faceChargeProject/getListByResidentialId")
-    public List<FaceChargeProject> getListByResidentialId(@RequestParam("residentialId") Long residentialId) {
-        return faceChargeProjectServiceInterface.getListByResidentialId(residentialId);
-    }
-
-    @Override
-    @PostMapping(value = "/faceChargeProject/getListByResidentialIdAndDate")
-    public List<FaceChargeProject> getListByResidentialIdAndDate(@RequestParam("residentialId") Long residentialId) {
-        return faceChargeProjectServiceInterface.getListByResidentialIdAndDate(residentialId);
-    }
-    @Override
-    @PostMapping(value = "/faceChargeProject/selectByResidentialId")
-    public ResultBean<FaceChargeProject> selectByResidentialId(@RequestBody Long residentialId) {
-        return faceChargeProjectServiceInterface.selectByResidentialId(residentialId);
-    }
-
-    @Override
-    @PostMapping(value = "/faceChargeProject/getList")
-    public List<FaceChargeProject> getList(@RequestBody FaceChargeProjectDto dto) {
-        return faceChargeProjectServiceInterface.getList(dto);
-    }
-
-    @Override
-    @PostMapping(value = "/faceChargeProject/getOneFaceChargeProject")
-    public ResultBean<FaceChargeProject> getOneFaceChargeProject(@RequestBody FaceChargeProjectDto dto) {
-        return faceChargeProjectServiceInterface.getOneFaceChargeProject(dto);
-    }
-
-    @Override
-    @PostMapping(value = "/faceChargeProject/getOneNotInId")
-    public FaceChargeProject getOneNotInId(@RequestBody FaceChargeProjectDto dto) {
-        return faceChargeProjectServiceInterface.getOneNotInId(dto);
-    }
-
-    @Override
-    @PostMapping(value = "/faceChargeProject/addFaceChargeProject")
-    public ResultBean<Boolean> addFaceChargeProject(@RequestBody FaceChargeProjectDto dto) {
-        return faceChargeProjectServiceInterface.addFaceChargeProject(dto);
-    }
-
-    @Override
-    @PostMapping(value = "/faceChargeProject/getFaceChargeProjectById")
-    public FaceChargeProject getFaceChargeProjectById(@RequestParam("id") Long id) {
-        return faceChargeProjectServiceInterface.getFaceChargeProjectById(id);
-    }
-
-    @Override
-    @PostMapping(value = "/faceChargeProject/updateFaceChargeProject")
-    public ResultBean<Boolean>updateFaceChargeProject(@RequestBody FaceChargeProjectDto dto) {
-        return faceChargeProjectServiceInterface.updateFaceChargeProject(dto);
-    }
-
-    @Override
-    @PostMapping(value = "/faceChargeProject/deleteFaceChargeProject")
-    public ResultBean<Boolean> deleteFaceChargeProject(@RequestBody FaceChargeProjectDto dto) {
-        return faceChargeProjectServiceInterface.deleteFaceChargeProject(dto);
-    }
-
-    @Override
-    @PostMapping(value = "/faceChargeProject/getByOldId/{oldId}")
-    public FaceChargeProject getByOldId(@PathVariable(value = "oldId") String oldId) {
-        return this.faceChargeProjectServiceInterface.getByOldId(oldId);
-    }
-
-    @Override
-    @PostMapping(value = "/faceChargeProject/updateBathFaceChargeProject")
-    public Boolean updateBathFaceChargeProject(List<FaceChargeProject> faceChargeProjectList) {
-        return this.faceChargeProjectServiceInterface.updateBatchById(faceChargeProjectList);
-    }
-
-    @Override
-    @PostMapping(value = "/faceChargeProject/putStatusChange")
-    public ResultBean<Boolean> putStatusChange(@RequestBody FaceChargeProjectDto dto) {
-        return new ResultBean<>(ResultEnum.SUCCESS,this.faceChargeProjectServiceInterface.updateById(dto));
-    }
-
-}

sptg-estate/sptg-estate-biz/src/main/java/com/sptg/estate/biz/controller/FaceChargeProjectResidentialUserController.java

@@ -1,40 +0,0 @@
-package com.sptg.estate.biz.controller;
-
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.estate.api.dto.FaceChargeProjectResidentialUserDto;
-import com.sptg.estate.api.entity.FaceChargeProjectResidentialUser;
-import com.sptg.estate.api.feigns.FaceChargeProjectResidentialUserFeign;
-import com.sptg.estate.biz.service.FaceChargeProjectResidentialUserServiceInterface;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * title: FaceChargeProjectController
- * package: com.sptg.estate.biz.controller
- * description: 人脸套餐绑定 控制器
- *
- *
- *
- */
-
-@RestController
-@AllArgsConstructor
-public class FaceChargeProjectResidentialUserController implements FaceChargeProjectResidentialUserFeign {
-
-    private final FaceChargeProjectResidentialUserServiceInterface faceChargeProjectResidentialUserServiceInterface;
-
-    @Override
-    @PostMapping("/faceChargeProResUser/addFaceChargeProjectResidentialUser")
-    public ResultBean<Boolean> addFaceChargeProjectResidentialUser(@RequestBody FaceChargeProjectResidentialUserDto dto){
-        return faceChargeProjectResidentialUserServiceInterface.addFaceChargeProjectResidentialUser(dto);
-    }
-
-    @Override
-    @PostMapping("/faceChargeProResUser/findFaceChargeProjectResidentialUser")
-    public ResultBean<FaceChargeProjectResidentialUser> findFaceChargeProjectResidentialUser(@RequestBody FaceChargeProjectResidentialUserDto dto){
-        return faceChargeProjectResidentialUserServiceInterface.findFaceChargeProjectResidentialUser(dto);
-    }
-
-}

sptg-estate/sptg-estate-biz/src/main/java/com/sptg/estate/biz/controller/ProjectBookController.java

@@ -1,49 +0,0 @@
-package com.sptg.estate.biz.controller;
-
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.estate.api.entity.Contract;
-import com.sptg.estate.api.entity.ProjectBook;
-import com.sptg.estate.api.feigns.ContractFeign;
-import com.sptg.estate.api.feigns.ProjectBookFeign;
-import com.sptg.estate.biz.service.ProjectBookServiceInterface;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * title: ProjectController
- * package: com.sptg.estate.biz.security
- * description: 立项书 - 控制器
- *
- *               
- *                      
- */
-@RestController
-@RequiredArgsConstructor
-@RequestMapping(value = "/implement/projectBook")
-public class ProjectBookController implements ProjectBookFeign {
-
-    private final ProjectBookServiceInterface projectBookServiceInterface;
-
-    @Override
-    @PostMapping(value = "/insertByResidentialId")
-    public ResultBean<Boolean> insertByResidentialId(@RequestBody ProjectBook projectBook) {
-        return this.projectBookServiceInterface.insertByResidentialId(projectBook);
-    }
-
-    @Override
-    @PostMapping(value = "/findByProjectId")
-    public ResultBean<ProjectBook> findByProjectId(@RequestBody Long projectId) {
-        return this.projectBookServiceInterface.findByProjectId(projectId);
-    }
-
-    @Override
-    @PostMapping(value = "/editByProjectId")
-    public ResultBean<Boolean> editByProjectId(@RequestBody ProjectBook projectBook) {
-        return this.projectBookServiceInterface.editByProjectId(projectBook);
-    }
-
-
-}

sptg-estate/sptg-estate-biz/src/main/java/com/sptg/estate/biz/controller/ProjectCompletionController.java

@@ -1,46 +0,0 @@
-package com.sptg.estate.biz.controller;
-
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.common.core.beans.ResultEnum;
-import com.sptg.estate.api.entity.ProjectCompletion;
-import com.sptg.estate.api.feigns.ProjectCompletionFeign;
-import com.sptg.estate.biz.service.ProjectCompletionServiceInterface;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * title: ProjectController
- * package: com.sptg.estate.biz.security
- * description: 物业验收 - 控制器
- *
- *               
- *                      
- */
-@RestController
-@RequiredArgsConstructor
-@RequestMapping(value = "/implement/projectCompletion")
-public class ProjectCompletionController implements ProjectCompletionFeign {
-
-    private final ProjectCompletionServiceInterface projectCompletionServiceInterface;
-
-    @Override
-    @PostMapping(value = "/insert")
-    public ResultBean<Boolean> insert(@RequestBody ProjectCompletion projectCompletion) {
-        return this.projectCompletionServiceInterface.insertProjectCompletion(projectCompletion);
-    }
-
-    @Override
-    @PostMapping(value = "/findByProjectId")
-    public ResultBean<ProjectCompletion> findByProjectId(@RequestBody Long projectId) {
-        return this.projectCompletionServiceInterface.findByProjectId(projectId);
-    }
-
-    @Override
-    @PostMapping(value = "/countByProjectId")
-    public ResultBean<Boolean> countByProjectId(@RequestBody Long projectId) {
-        return this.projectCompletionServiceInterface.countByProjectId(projectId);
-    }
-}

sptg-estate/sptg-estate-biz/src/main/java/com/sptg/estate/biz/controller/ProjectController.java

@@ -1,110 +0,0 @@
-package com.sptg.estate.biz.controller;
-
-import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.common.core.beans.ResultEnum;
-import com.sptg.estate.api.dto.ProjectDto;
-import com.sptg.estate.api.entity.Project;
-import com.sptg.estate.api.feigns.ProjectFeign;
-import com.sptg.estate.biz.service.ProjectServiceInterface;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * title: ProjectController
- * package: com.sptg.estate.biz.security
- * description: 实施项目 - 控制器
- *
- *               
- *                     
- */
-@RestController
-@RequiredArgsConstructor
-@RequestMapping(value = "/implement/project")
-public class ProjectController implements ProjectFeign {
-
-    private final ProjectServiceInterface projectServiceInterface;
-
-    @Override
-    @PostMapping(value = "/showList")
-    public ResultBean<Page<Project>> showList(@RequestBody ProjectDto projectDto) {
-        return this.projectServiceInterface.showList(projectDto);
-    }
-
-    @Override
-    @PostMapping(value = "/showListInstallation")
-    public ResultBean<Page<Project>> showListInstallation(@RequestBody ProjectDto projectDto) {
-        return this.projectServiceInterface.showListInstallation(projectDto);
-    }
-
-    @Override
-    @PostMapping(value = "/showListTest")
-    public ResultBean<Page<Project>> showListTest(@RequestBody ProjectDto projectDto) {
-        return this.projectServiceInterface.showListTest(projectDto);
-    }
-
-    @Override
-    @PostMapping(value = "/findByResidentialId")
-    public ResultBean<Project> findByResidentialId(@RequestBody Long residentialId) {
-        return this.projectServiceInterface.findByResidentialId(residentialId);
-    }
-
-    @Override
-    @PostMapping(value = "/insert")
-    public ResultBean<Boolean> insert(@RequestBody Project project) {
-        return new ResultBean<>(ResultEnum.SUCCESS,this.projectServiceInterface.insert(project));
-    }
-
-    @Override
-    @PostMapping(value = "/updateById")
-    public ResultBean<Boolean> updateById(@RequestBody Project project) {
-        return new ResultBean<>(ResultEnum.SUCCESS,this.projectServiceInterface.updateById(project));
-    }
-
-    @Override
-    @PostMapping(value = "/countByResidentialId")
-    public ResultBean<Boolean> countByResidentialId(@RequestBody Long residentialId) {
-        return this.projectServiceInterface.countByResidentialId(residentialId);
-    }
-
-    @Override
-    @PostMapping(value = "/findById")
-    public ResultBean<Project> findById(@RequestBody Long id) {
-        return new ResultBean<>(ResultEnum.SUCCESS,this.projectServiceInterface.selectById(id));
-    }
-
-    @Override
-    @PostMapping(value = "/edit")
-    public ResultBean<Boolean> edit(@RequestBody Project project) {
-        return new ResultBean<>(ResultEnum.SUCCESS,this.projectServiceInterface.updateById(project));
-    }
-
-    @Override
-    @PostMapping(value = "/findListByPosition")
-    public ResultBean<Project> findListByPosition(@RequestBody ProjectDto projectDto) {
-        return this.projectServiceInterface.findListByPosition(projectDto);
-    }
-
-    @Override
-    @PostMapping(value = "/countByOrgPosition")
-    public ResultBean<Integer> countByOrgPosition(@RequestBody String orgPosition) {
-        return this.projectServiceInterface.countByOrgPosition(orgPosition);
-    }
-
-    @Override
-    @PostMapping(value = "/insertProjectAndContract")
-    public ResultBean<Boolean> insertProjectAndContract(@RequestBody ProjectDto dto) {
-        return this.projectServiceInterface.insertProjectAndContract(dto);
-    }
-
-    @Override
-    @PostMapping(value = "/findListByXqIds")
-    public List<Project> findListByXqIds(@RequestBody List<Long> idList) {
-        return this.projectServiceInterface.findListByXqIds(idList);
-    }
-}

sptg-estate/sptg-estate-biz/src/main/java/com/sptg/estate/biz/controller/ThirdUserController.java

@@ -1,79 +0,0 @@
-package com.sptg.estate.biz.controller;
-
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.estate.api.dto.ThirdUserDto;
-import com.sptg.estate.api.entity.ThirdUser;
-import com.sptg.estate.api.feigns.ThirdUserFeign;
-import com.sptg.estate.biz.service.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * title: UserController
- * package: com.sptg.estate.biz.controller
- * description:住户 控制器
- *
- *
- *
- */
-@RestController
-public class ThirdUserController implements ThirdUserFeign {
-
-    private final ThirdUserServiceInterface thirdUserServiceInterface;
-    private final ResidentialServiceInterface residentialServiceInterface;
-    private final BuildingServiceInterface buildingServiceInterface;
-    private final UnitServiceInterface unitServiceInterface;
-    private final FloorServiceInterface floorServiceInterface;
-    private final RoomServiceInterface roomServiceInterface;
-
-    @Autowired
-    public ThirdUserController(ThirdUserServiceInterface thirdUserServiceInterface, ResidentialServiceInterface residentialServiceInterface, BuildingServiceInterface buildingServiceInterface,
-                               UnitServiceInterface unitServiceInterface, FloorServiceInterface floorServiceInterface, RoomServiceInterface roomServiceInterface) {
-        this.thirdUserServiceInterface = thirdUserServiceInterface;
-        this.residentialServiceInterface = residentialServiceInterface;
-        this.buildingServiceInterface = buildingServiceInterface;
-        this.unitServiceInterface = unitServiceInterface;
-        this.floorServiceInterface = floorServiceInterface;
-        this.roomServiceInterface = roomServiceInterface;
-    }
-
-    @Override
-    @PostMapping(value = "/thirdUser/addUser")
-    public ResultBean<Boolean> addUser(@RequestBody ThirdUserDto userDto) {
-        return this.thirdUserServiceInterface.addUser(userDto);
-    }
-
-    @Override
-    @GetMapping(value = "/thirdUser/findUserById/{id}")
-    public ThirdUser findUserById(@PathVariable(value = "id") Long id) {
-        return this.thirdUserServiceInterface.findUserById(id);
-    }
-
-    @Override
-    @PostMapping(value = "/thirdUser/updateEntity")
-    public boolean updateEntity(@RequestBody ThirdUser user) {
-        return this.thirdUserServiceInterface.updateEntity(user);
-    }
-
-    @Override
-    @PostMapping(value = "/thirdUser/getListByCondition")
-    public List<ThirdUser> getListByCondition(@RequestBody ThirdUserDto dto) {
-        return thirdUserServiceInterface.getListByCondition(dto);
-    }
-
-    @Override
-    @PostMapping(value = "/thirdUser/updateUser")
-    public ResultBean<Boolean> updateUser(@RequestBody ThirdUserDto userDto) {
-        return this.thirdUserServiceInterface.updateUser(userDto);
-    }
-
-    @Override
-    @PostMapping(value = "/thirdUser/deleteUser")
-    public ResultBean<Boolean> deleteUser(@RequestBody ThirdUserDto userDto) {
-        return this.thirdUserServiceInterface.deleteUser(userDto);
-    }
-
-
-}

sptg-estate/sptg-estate-biz/src/main/java/com/sptg/estate/biz/mapper/AcceptanceMapper.java

@@ -1,15 +0,0 @@
-package com.sptg.estate.biz.mapper;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.sptg.estate.api.entity.Acceptance;
-
-/**
- * title: NoticePushDeviceDetailsMapper
- * package: com.sptg.estate.biz.mapper
- * description: 竣工验收-DAO接口
- *
- *               
- *                 
- */
-public interface AcceptanceMapper extends BaseMapper<Acceptance> {
-}

sptg-estate/sptg-estate-biz/src/main/java/com/sptg/estate/biz/mapper/AccessBlackCardMapper.java

@@ -1,18 +0,0 @@
-package com.sptg.estate.biz.mapper;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.sptg.estate.api.entity.AccessBlackCard;
-
-/**
- * title: AccessBlackCardMapper
- * package: com.sptg.estate.biz.mapper
- * description: 门禁卡黑名单 DAO接口
- *
- *             
- *                 
- */
-public interface AccessBlackCardMapper extends BaseMapper<AccessBlackCard> {
-
-
-
-}

sptg-estate/sptg-estate-biz/src/main/java/com/sptg/estate/biz/mapper/AccessCardPushRecordsMapper.java

@@ -1,15 +0,0 @@
-package com.sptg.estate.biz.mapper;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.sptg.estate.api.entity.AccessCardPushRecords;
-
-/**
- * title: AccessPushRecordsMapper
- * package: com.sptg.estate.biz.mapper
- * description: 授权下发记录 DAO接口
- *
- *
- *
- */
-public interface AccessCardPushRecordsMapper extends BaseMapper<AccessCardPushRecords> {
-}

sptg-estate/sptg-estate-biz/src/main/java/com/sptg/estate/biz/mapper/AccessFacePushRecordsMapper.java

@@ -1,15 +0,0 @@
-package com.sptg.estate.biz.mapper;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.sptg.estate.api.entity.AccessFacePushRecords;
-
-/**
- * title: AccessPushRecordsMapper
- * package: com.sptg.estate.biz.mapper
- * description: 授权下发记录 DAO接口
- *
- *
- *
- */
-public interface AccessFacePushRecordsMapper extends BaseMapper<AccessFacePushRecords> {
-}

sptg-estate/sptg-estate-biz/src/main/java/com/sptg/estate/biz/mapper/ApplyPayRefundMapper.java

@@ -1,39 +0,0 @@
-package com.sptg.estate.biz.mapper;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.pagination.Pagination;
-import com.sptg.estate.api.dto.ApplyPayRefundDto;
-import com.sptg.estate.api.entity.ApplyPayRefund;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * title: ApplyPayRefundMapper
- * package: com.sptg.estate.biz.mapper
- * description: 支付退款申请 DAO接口
- *
- *
- *
- */
-public interface ApplyPayRefundMapper extends BaseMapper<ApplyPayRefund> {
-
-    /**
-     * 功能描述:根据条件查询住户
-     * @param applyPayRefundDto 住户业务对象
-     * @param wrapper 查询条件
-     * @return ApplyPayRefund
-     *
-     *
-     */
-    ApplyPayRefund findApplyPayRefundByCondition(@Param(value = "dto") ApplyPayRefundDto applyPayRefundDto, @Param(value = "ew") Wrapper<ApplyPayRefund> wrapper);
-
-    /**
-     * 根据申请编号更新该条申请的退款回调的数据
-     * @param applyPayRefund
-     * @return
-     */
-    Boolean updateApplyPayRefundByRefundNo(@Param("applyPayRefund") ApplyPayRefund applyPayRefund);
-
-}

sptg-estate/sptg-estate-biz/src/main/java/com/sptg/estate/biz/mapper/BillsItemMapper.java

@@ -1,16 +0,0 @@
-package com.sptg.estate.biz.mapper;
-
-import com.sptg.estate.api.entity.BillsItem;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author lianghanqiang
- * @since 2021-01-19
- */
-public interface BillsItemMapper extends BaseMapper<BillsItem> {
-
-}

sptg-estate/sptg-estate-biz/src/main/java/com/sptg/estate/biz/mapper/BillsMapper.java

@@ -1,16 +0,0 @@
-package com.sptg.estate.biz.mapper;
-
-import com.sptg.estate.api.entity.Bills;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author lianghanqiang
- * @since 2021-01-19
- */
-public interface BillsMapper extends BaseMapper<Bills> {
-
-}

sptg-estate/sptg-estate-biz/src/main/java/com/sptg/estate/biz/mapper/FaceChargeProjectMapper.java

@@ -1,9 +0,0 @@
-package com.sptg.estate.biz.mapper;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.sptg.estate.api.entity.FaceChargeProject;
-
-public interface FaceChargeProjectMapper extends BaseMapper<FaceChargeProject> {
-
-
-}

sptg-estate/sptg-estate-biz/src/main/java/com/sptg/estate/biz/mapper/FaceChargeProjectResidentialUserMapper.java

@@ -1,9 +0,0 @@
-package com.sptg.estate.biz.mapper;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.sptg.estate.api.entity.FaceChargeProjectResidentialUser;
-
-public interface FaceChargeProjectResidentialUserMapper extends BaseMapper<FaceChargeProjectResidentialUser> {
-
-
-}

sptg-estate/sptg-estate-biz/src/main/java/com/sptg/estate/biz/mapper/ProjectBookMapper.java

@@ -1,16 +0,0 @@
-package com.sptg.estate.biz.mapper;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.sptg.estate.api.entity.Contract;
-import com.sptg.estate.api.entity.ProjectBook;
-
-/**
- * title: ContractMapper
- * package: com.sptg.estate.biz.security
- * description: 立项书-DAO接口
- *
- *               
- *                     
- */
-public interface ProjectBookMapper extends BaseMapper<ProjectBook> {
-}

sptg-estate/sptg-estate-biz/src/main/java/com/sptg/estate/biz/mapper/ProjectCompletionMapper.java

@@ -1,15 +0,0 @@
-package com.sptg.estate.biz.mapper;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.sptg.estate.api.entity.ProjectCompletion;
-
-/**
- * title: NoticePushDeviceDetailsMapper
- * package: com.sptg.estate.biz.mapper
- * description: 物业验收-DAO接口
- *
- *               
- *                 
- */
-public interface ProjectCompletionMapper extends BaseMapper<ProjectCompletion> {
-}

sptg-estate/sptg-estate-biz/src/main/java/com/sptg/estate/biz/mapper/ProjectMapper.java

@@ -1,61 +0,0 @@
-package com.sptg.estate.biz.mapper;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.pagination.Pagination;
-import com.sptg.estate.api.entity.Project;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * title: NoticePushDeviceDetailsMapper
- * package: com.sptg.estate.biz.mapper
- * description: 实施项目-DAO接口
- *
- *               
- *                 
- */
-public interface ProjectMapper extends BaseMapper<Project> {
-
-    /**
-     * 功能描述:分页查询
-     * @param  wrapper 查询条件
-     * @param  page 分页条件
-     * @return
-     *               
-     *                       
-     */
-    List<Project> showList(@Param(value = "ew") Wrapper<Project> wrapper, @Param(value = "page") Pagination page);
-
-    /**
-     * 功能描述:分页查询--小程序
-     * @param  wrapper 查询条件
-     * @param  page 分页条件
-     * @return
-     *               
-     *                       
-     */
-    List<Project> showListInstallation(@Param(value = "ew") Wrapper<Project> wrapper, @Param(value = "page") Pagination page);
-
-    /**
-     * 功能描述:分页查询--小程序
-     * @param  wrapper 查询条件
-     * @param  page 分页条件
-     * @return
-     *               
-     *                       
-     */
-    List<Project> showListTest(@Param(value = "ew") Wrapper<Project> wrapper, @Param(value = "page") Pagination page);
-
-
-
-    /**
-     * 功能描述:根据位置查询所有实施项目
-     * @param  wrapper 查询条件
-     * @return
-     *             
-     *                       
-     */
-    List<Project> findListByPosition(@Param(value = "ew") Wrapper<Project> wrapper);
-}

sptg-estate/sptg-estate-biz/src/main/java/com/sptg/estate/biz/mapper/ThirdUserMapper.java

@@ -1,65 +0,0 @@
-package com.sptg.estate.biz.mapper;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.pagination.Pagination;
-import com.sptg.estate.api.dto.UserDto;
-import com.sptg.estate.api.entity.ThirdUser;
-import com.sptg.estate.api.entity.User;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * title: UserMapper
- * package: com.sptg.estate.biz.mapper
- * description: 住户 DAO接口
- *
- *             
- *                 
- */
-public interface ThirdUserMapper extends BaseMapper<ThirdUser> {
-
-    /**
-     * 功能描述:根据条件查询住户
-     * @param userDto 住户业务对象
-     * @param wrapper 查询条件
-     * @return User
-     *
-     *
-     */
-    User findUserByCondition(@Param(value = "dto") UserDto userDto, @Param(value = "ew") Wrapper<User> wrapper);
-
-    /**
-     * 功能描述:删除住户人脸
-     * @param user 住户
-     * @return boolean
-     *
-     *
-     */
-    int deleteUserFaceImage(@Param(value = "user") User user);
-
-    /**
-     * 功能描述:分页查询住户
-     * @param user 查询条件
-     * @param page 分页
-     * @return List<User>
-     *
-     *
-     */
-    List<User> getUserPage(@Param(value = "user") UserDto user, @Param(value = "page") Pagination page);
-
-
-    /**
-     * 功能描述:分页查询住户
-     * @param user 查询条件
-     * @return page 分页
-     *
-     *
-     */
-    List<User> showUserList(@Param(value = "user") UserDto user, @Param(value = "page") Pagination page);
-
-
-
-
-}

sptg-estate/sptg-estate-biz/src/main/java/com/sptg/estate/biz/service/AcceptanceServiceInterface.java

@@ -1,59 +0,0 @@
-package com.sptg.estate.biz.service;
-
-import com.baomidou.mybatisplus.plugins.Page;
-import com.baomidou.mybatisplus.service.IService;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.estate.api.dto.AcceptanceDto;
-import com.sptg.estate.api.entity.Acceptance;
-
-/**
- * title: ProjectServiceImpl
- * package: com.sptg.estate.biz.security
- * description: 竣工验收-服务层接口
- *
- *               
- *                     
- */
-public interface AcceptanceServiceInterface extends IService<Acceptance> {
-
-    /**
-     * 功能描述:检测项目是否已经创建定位记录
-     * @param projectId
-     * @return ResultBean<Boolean>
-     *               
-     *                      
-     */
-    ResultBean<Boolean> countByProjectId(Long projectId);
-    /**
-     * 功能描述:新增
-     * @param dto
-     * @return ResultBean<Boolean>
-     *               
-     *                      
-     */
-    ResultBean<Boolean> insertEntity(AcceptanceDto dto);
-    /**
-     * 功能描述:根据机构位置统计数量
-     * @param orgPosition
-     * @return ResultBean<Integer>
-     *               
-     *                      
-     */
-    ResultBean<Integer> countByOrgPosition(String orgPosition);
-    /**
-     * 功能描述:分页查询
-     * @param acceptanceDto
-     * @return ResultBean<Integer>
-     *               
-     *                      
-     */
-    Page<Acceptance> showList(AcceptanceDto acceptanceDto);
-    /**
-     * 功能描述:审核
-     * @param dto
-     * @return ResultBean<Boolean>
-     *               
-     *                      
-     */
-    ResultBean<Boolean> checkState(AcceptanceDto dto);
-}

sptg-estate/sptg-estate-biz/src/main/java/com/sptg/estate/biz/service/AccessBlackCardServiceInterface.java

@@ -1,28 +0,0 @@
-package com.sptg.estate.biz.service;
-
-import com.baomidou.mybatisplus.plugins.Page;
-import com.baomidou.mybatisplus.service.IService;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.estate.api.dto.AccessBlackCardDto;
-import com.sptg.estate.api.entity.AccessBlackCard;
-
-/**
- * title: AccessCardServiceInterface
- * package: com.sptg.estate.biz.security
- * description: 门禁卡黑名单 服务层接口
- *
- *
- *
- */
-public interface AccessBlackCardServiceInterface extends IService<AccessBlackCard> {
-
-    /**
-     * 功能描述:门禁卡查询列表
-     * @param accessBlackCardDto 门禁卡业务对象（含分页及查询条件）
-     * @return ResultBean<Page<AccessCard>>
-     *
-     *
-     */
-    ResultBean<Page<AccessBlackCard>> showAccessBlackCardList(AccessBlackCardDto accessBlackCardDto);
-
-}

sptg-estate/sptg-estate-biz/src/main/java/com/sptg/estate/biz/service/AccessCardPushRecordsServiceInterface.java

@@ -1,100 +0,0 @@
-package com.sptg.estate.biz.service;
-
-import com.baomidou.mybatisplus.plugins.Page;
-import com.baomidou.mybatisplus.service.IService;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.estate.api.dto.AccessCardPushRecordsDto;
-import com.sptg.estate.api.entity.AccessCardPushRecords;
-
-import java.util.List;
-
-/**
- * title: AccessCardPushRecordsServiceInterface
- * package: com.sptg.estate.biz.security
- * description:授权下发记录 服务层接口
- *
- *
- *
- */
-public interface AccessCardPushRecordsServiceInterface extends IService<AccessCardPushRecords> {
-    /**
-     * 功能描述:授权下发记录列表查询
-     * @param accessPushRecordsDto 授权下发记录业务对象（含分页及查询条件）
-     * @return ResultBean<Page<AccessCardPushRecords>>
-     *
-     *
-     */
-    ResultBean<Page<AccessCardPushRecords>> showAccessCardPushRecordsList(AccessCardPushRecordsDto accessPushRecordsDto);
-
-    /**
-     * 功能描述:根据Id查授权下发记录
-     * @param id 必填
-     * @return AccessCardPushRecords
-     *
-     *
-     */
-    AccessCardPushRecords findAccessCardPushRecordsById(Long id);
-
-    /**
-     * 功能描述:根据userId查授权下发记录
-     * @param userId 必填
-     * @return AccessCardPushRecords
-     *
-     *
-     */
-    List<AccessCardPushRecords> findAccessCardPushRecordsByUserId(Long userId);
-
-    /**
-     * 功能描述:添加授权下发记录
-     * @param accessPushRecords 授权下发记录业务对象
-     * @return ResultBean<Boolean>
-     *
-     *
-     */
-    ResultBean<Boolean> addAccessCardPushRecords(AccessCardPushRecords accessPushRecords);
-
-    /**
-     * 功能描述:编辑授权下发记录
-     * @param accessPushRecordsDto 授权下发记录业务对象
-     * @return ResultBean<Boolean>
-     *
-     *
-     */
-    ResultBean<Boolean> updateAccessCardPushRecords(AccessCardPushRecordsDto accessPushRecordsDto);
-
-    /**
-     * 功能描述:编辑更新授权下发记录
-     * @param accessPushRecordsList 授权下发记录业务对象
-     * @return ResultBean<Boolean>
-     *
-     *
-     */
-    ResultBean<Boolean> updateAccessCardPushRecords(List<AccessCardPushRecords> accessPushRecordsList);
-
-    /**
-     * 功能描述:删除授权下发记录
-     * @param accessPushRecordsDto 授权下发记录业务对象
-     * @return ResultBean<Boolean>
-     *
-     *
-     */
-    ResultBean<Boolean> deleteAccessCardPushRecords(AccessCardPushRecordsDto accessPushRecordsDto);
-
-    /**
-     * 功能描述:获取授权下发数量
-     * @param accessPushRecordsDto
-     * @return Long
-     *
-     *
-     */
-    Long getAccessCardPushRecordsCount(AccessCardPushRecordsDto accessPushRecordsDto);
-
-    /**
-     * 功能描述:根据userId查询
-     * @param userId
-     * @return ResultBean<AccessCardPushRecords>
-     *
-     *
-     */
-    ResultBean<AccessCardPushRecords> getListByUserId(Long userId, Integer accessUserType, Integer specialDevice);
-}

sptg-estate/sptg-estate-biz/src/main/java/com/sptg/estate/biz/service/AccessFacePushRecordsServiceInterface.java

@@ -1,100 +0,0 @@
-package com.sptg.estate.biz.service;
-
-import com.baomidou.mybatisplus.plugins.Page;
-import com.baomidou.mybatisplus.service.IService;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.estate.api.dto.AccessFacePushRecordsDto;
-import com.sptg.estate.api.entity.AccessFacePushRecords;
-
-import java.util.List;
-
-/**
- * title: AccessFacePushRecordsServiceInterface
- * package: com.sptg.estate.biz.security
- * description:授权下发记录 服务层接口
- *
- *
- *
- */
-public interface AccessFacePushRecordsServiceInterface extends IService<AccessFacePushRecords> {
-    /**
-     * 功能描述:授权下发记录列表查询
-     * @param accessFacePushRecordsDto 授权下发记录业务对象（含分页及查询条件）
-     * @return ResultBean<Page<AccessFacePushRecords>>
-     *
-     *
-     */
-    ResultBean<Page<AccessFacePushRecords>> showAccessFacePushRecordsList(AccessFacePushRecordsDto accessFacePushRecordsDto);
-
-    /**
-     * 功能描述:根据Id查授权下发记录
-     * @param id 必填
-     * @return AccessFacePushRecords
-     *
-     *
-     */
-    AccessFacePushRecords findAccessFacePushRecordsById(Long id);
-
-    /**
-     * 功能描述:根据userId查授权下发记录
-     * @param userId 必填
-     * @return AccessFacePushRecords
-     *
-     *
-     */
-    List<AccessFacePushRecords> findAccessFacePushRecordsByUserId(Long userId);
-
-    /**
-     * 功能描述:添加授权下发记录
-     * @param accessFacePushRecords 授权下发记录业务对象
-     * @return ResultBean<Boolean>
-     *
-     *
-     */
-    ResultBean<Boolean> addAccessFacePushRecords(AccessFacePushRecords accessFacePushRecords);
-
-    /**
-     * 功能描述:编辑授权下发记录
-     * @param accessFacePushRecordsDto 授权下发记录业务对象
-     * @return ResultBean<Boolean>
-     *
-     *
-     */
-    ResultBean<Boolean> updateAccessFacePushRecords(AccessFacePushRecordsDto accessFacePushRecordsDto);
-
-    /**
-     * 功能描述:编辑更新授权下发记录
-     * @param accessFacePushRecordsList 授权下发记录业务对象
-     * @return ResultBean<Boolean>
-     *
-     *
-     */
-    ResultBean<Boolean> updateAccessFacePushRecords(List<AccessFacePushRecords> accessFacePushRecordsList);
-
-    /**
-     * 功能描述:删除授权下发记录
-     * @param accessFacePushRecordsDto 授权下发记录业务对象
-     * @return ResultBean<Boolean>
-     *
-     *
-     */
-    ResultBean<Boolean> deleteAccessFacePushRecords(AccessFacePushRecordsDto accessFacePushRecordsDto);
-
-    /**
-     * 功能描述:获取授权下发数量
-     * @param accessFacePushRecordsDto
-     * @return Long
-     *
-     *
-     */
-    Long getAccessFacePushRecordsCount(AccessFacePushRecordsDto accessFacePushRecordsDto);
-
-    /**
-     * 功能描述:根据userId查询
-     * @param userId
-     * @return ResultBean<AccessFacePushRecords>
-     *
-     *
-     */
-    ResultBean<AccessFacePushRecords> getListByUserId(Long userId, Integer accessUserType, Integer specialDevice);
-}

sptg-estate/sptg-estate-biz/src/main/java/com/sptg/estate/biz/service/ApplyPayRefundInterface.java

@@ -1,77 +0,0 @@
-package com.sptg.estate.biz.service;
-
-import com.baomidou.mybatisplus.plugins.Page;
-import com.baomidou.mybatisplus.service.IService;
-import com.sptg.common.core.beans.PageBean;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.estate.api.dto.ApplyPayRefundDto;
-import com.sptg.estate.api.entity.ApplyPayRefund;
-
-import java.io.FileNotFoundException;
-import java.util.List;
-import java.util.Map;
-
-/**
- * title: ApplyPayRefundInterface
- * package: com.sptg.estate.biz.security
- * description: 支付退款申请-业务层接口
- *
- *
- *
- */
-public interface ApplyPayRefundInterface extends IService<ApplyPayRefund> {
-
-    /**
-     * 功能描述: 获取支付退款列表
-     * @param applyPayRefundDto
-     * @return Page<ApplyPayRefund>
-     *
-     *
-     */
-    ResultBean<Page<ApplyPayRefund>> showApplyPayRefundList(ApplyPayRefundDto applyPayRefundDto);
-
-    /**
-     * 功能描述: 新增支付退款申请记录
-     * @param applyPayRefundDto
-     * @return ApplyPayRefund
-     *
-     *
-     */
-    ResultBean<Boolean> addApplyPayRefund(ApplyPayRefundDto applyPayRefundDto);
-
-
-    /**
-     * 功能描述: 根据id查询
-     * @param id
-     * @return ApplyPayRefund
-     *
-     *
-     */
-    ApplyPayRefund getApplyPayRefundById(Long id);
-
-    /**
-     * 功能描述: 根据id查询
-     * @param applyPayRefundDto
-     * @return ApplyPayRefund
-     *
-     *
-     */
-    ApplyPayRefund getApplyPayRefundByCondition(ApplyPayRefundDto applyPayRefundDto);
-
-    /**
-     * 功能描述: 审核
-     * @param applyPayRefund
-     * @return ApplyPayRefund
-     *
-     *
-     */
-    ResultBean<Boolean> auditApplyPayRefund(ApplyPayRefund applyPayRefund);
-
-    /**
-     * 跟新退款回调数据
-     * @param applyPayRefund
-     * @return
-     */
-    Boolean updateApplyPayRefundByRefundNo(ApplyPayRefund applyPayRefund);
-
-}

sptg-estate/sptg-estate-biz/src/main/java/com/sptg/estate/biz/service/FaceChargeProjectResidentialUserServiceInterface.java

@@ -1,23 +0,0 @@
-package com.sptg.estate.biz.service;
-
-
-import com.baomidou.mybatisplus.service.IService;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.estate.api.dto.FaceChargeProjectResidentialUserDto;
-import com.sptg.estate.api.entity.FaceChargeProjectResidentialUser;
-
-
-/**
- * title: UnitServiceInterface
- * package: com.sptg.estate.biz.security
- * description: 人脸套餐绑定 服务层接口
- *
- *             
- *                 
- */
-public interface FaceChargeProjectResidentialUserServiceInterface extends IService<FaceChargeProjectResidentialUser> {
-
-    ResultBean<Boolean> addFaceChargeProjectResidentialUser(FaceChargeProjectResidentialUserDto dto);
-
-    ResultBean<FaceChargeProjectResidentialUser> findFaceChargeProjectResidentialUser(FaceChargeProjectResidentialUserDto dto);
-}

sptg-estate/sptg-estate-biz/src/main/java/com/sptg/estate/biz/service/FaceChargeProjectServiceInterface.java

@@ -1,44 +0,0 @@
-package com.sptg.estate.biz.service;
-
-
-import com.baomidou.mybatisplus.plugins.Page;
-import com.baomidou.mybatisplus.service.IService;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.estate.api.dto.FaceChargeProjectDto;
-import com.sptg.estate.api.entity.FaceChargeProject;
-
-import java.util.List;
-
-
-/**
- * title: UnitServiceInterface
- * package: com.sptg.estate.biz.security
- * description: 人脸套餐 服务层接口
- *
- */
-public interface FaceChargeProjectServiceInterface extends IService<FaceChargeProject> {
-
-
-    ResultBean<Page<FaceChargeProject>> showFaceChargeProjectList(FaceChargeProjectDto dto);
-
-    List<FaceChargeProject> getListByResidentialId(Long residentialId);
-
-    List<FaceChargeProject> getListByResidentialIdAndDate(Long residentialId);
-    ResultBean<FaceChargeProject> selectByResidentialId(Long residentialId);
-
-    List<FaceChargeProject> getList(FaceChargeProjectDto dto);
-
-    ResultBean<FaceChargeProject> getOneFaceChargeProject(FaceChargeProjectDto dto);
-
-    FaceChargeProject getOneNotInId(FaceChargeProjectDto dto);
-
-    ResultBean<Boolean> addFaceChargeProject(FaceChargeProjectDto dto);
-
-    FaceChargeProject getFaceChargeProjectById(Long id);
-
-    ResultBean<Boolean> updateFaceChargeProject(FaceChargeProjectDto dto);
-
-    ResultBean<Boolean> deleteFaceChargeProject(FaceChargeProjectDto dto);
-
-    FaceChargeProject getByOldId(String oldId);
-}

sptg-estate/sptg-estate-biz/src/main/java/com/sptg/estate/biz/service/IBillsItemService.java

@@ -1,16 +0,0 @@
-package com.sptg.estate.biz.service;
-
-import com.sptg.estate.api.entity.BillsItem;
-import com.baomidou.mybatisplus.service.IService;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author lianghanqiang
- * @since 2021-01-19
- */
-public interface IBillsItemService extends IService<BillsItem> {
-
-}

sptg-estate/sptg-estate-biz/src/main/java/com/sptg/estate/biz/service/IBillsService.java

@@ -1,47 +0,0 @@
-package com.sptg.estate.biz.service;
-
-import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.estate.api.dto.BillsDto;
-import com.sptg.estate.api.entity.Bills;
-import com.baomidou.mybatisplus.service.IService;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author lianghanqiang
- * @since 2021-01-19
- */
-public interface IBillsService extends IService<Bills> {
-
-    /**
-     * 查询
-     * @param dto
-     * @return
-     */
-    ResultBean<Page<Bills>> page(BillsDto dto);
-
-
-    /**
-     * 新增
-     * @param billsDto
-     * @return
-     */
-    ResultBean<Boolean> add(BillsDto billsDto);
-
-    /**
-     * 修改
-     * @param billsDto
-     * @return
-     */
-    ResultBean<Boolean> edit(BillsDto billsDto);
-
-    /**
-     * 删除
-     * @param id
-     * @return
-     */
-    ResultBean<Boolean> delete(BillsDto billsDto);
-}

sptg-estate/sptg-estate-biz/src/main/java/com/sptg/estate/biz/service/ProjectBookServiceInterface.java

@@ -1,40 +0,0 @@
-package com.sptg.estate.biz.service;
-
-import com.baomidou.mybatisplus.service.IService;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.estate.api.entity.ProjectBook;
-
-/**
- * title: ProjectServiceImpl
- * package: com.sptg.estate.biz.security
- * description: 立项书-服务层接口
- *
- *               
- *                     
- */
-public interface ProjectBookServiceInterface extends IService<ProjectBook> {
-    /**
-     * 功能描述: 保存立项书信息
-     * @param projectBook
-     * @return ResultBean<Boolean>
-     *               
-     *                      
-     */
-    ResultBean<Boolean> insertByResidentialId(ProjectBook projectBook);
-    /**
-     * 功能描述:通过项目id查询立项书信息
-     * @param projectId
-     * @return ResultBean<ProjectBook>
-     *               
-     *                      
-     */
-    ResultBean<ProjectBook> findByProjectId(Long projectId);
-    /**
-     * 功能描述: 修改
-     * @param projectBook
-     * @return ResultBean<Boolean>
-     *               
-     *                      
-     */
-    ResultBean<Boolean> editByProjectId(ProjectBook projectBook);
-}

sptg-estate/sptg-estate-biz/src/main/java/com/sptg/estate/biz/service/ProjectCompletionServiceInterface.java

@@ -1,42 +0,0 @@
-package com.sptg.estate.biz.service;
-
-import com.baomidou.mybatisplus.service.IService;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.estate.api.entity.ProjectBook;
-import com.sptg.estate.api.entity.ProjectCompletion;
-
-/**
- * title: ProjectServiceImpl
- * package: com.sptg.estate.biz.security
- * description: 物业验收-服务层接口
- *
- *               
- *                     
- */
-public interface ProjectCompletionServiceInterface extends IService<ProjectCompletion> {
-
-    /**
-     * 功能描述: 新增
-     * @param projectCompletion
-     * @return ResultBean<Boolean>
-     *               
-     *                      
-     */
-    ResultBean<Boolean> insertProjectCompletion(ProjectCompletion projectCompletion);
-    /**
-     * 功能描述:通过项目id查询竣工单信息
-     * @param projectId
-     * @return ResultBean<ProjectCompletion>
-     *               
-     *                      
-     */
-    ResultBean<ProjectCompletion> findByProjectId(Long projectId);
-    /**
-     * 功能描述:检测项目是否已经创建竣工单记录
-     * @param projectId
-     * @return ResultBean<ProjectCompletion>
-     *               
-     *                      
-     */
-    ResultBean<Boolean> countByProjectId(Long projectId);
-}

sptg-estate/sptg-estate-biz/src/main/java/com/sptg/estate/biz/service/ProjectServiceInterface.java

@@ -1,98 +0,0 @@
-package com.sptg.estate.biz.service;
-
-import com.baomidou.mybatisplus.plugins.Page;
-import com.baomidou.mybatisplus.service.IService;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.estate.api.dto.ProjectDto;
-import com.sptg.estate.api.entity.Project;
-
-import java.util.List;
-
-/**
- * title: ProjectServiceImpl
- * package: com.sptg.estate.biz.security
- * description: 实施项目-服务层接口
- *
- *               
- *                     
- */
-public interface ProjectServiceInterface extends IService<Project> {
-
-    /**
-     * 功能描述: 分页查询
-     * @param projectDto
-     * @return ResultBean<Page<Project>>
-     *               
-     *                      
-     */
-    ResultBean<Page<Project>> showList(ProjectDto projectDto);
-
-    /**
-     * 功能描述: 分页查询--小程序
-     * @param projectDto
-     * @return ResultBean<Page<Project>>
-     *               
-     *                      
-     */
-    ResultBean<Page<Project>> showListInstallation(ProjectDto projectDto);
-
-    /**
-     * 功能描述: 分页查询--小程序
-     * @param projectDto
-     * @return ResultBean<Page<Project>>
-     *               
-     *                      
-     */
-    ResultBean<Page<Project>> showListTest(ProjectDto projectDto);
-    /**
-     * 功能描述: 根据小区id获取项目信息
-     * @param residentialId 小区id
-     * @return ResultBean<Page<Project>>
-     *               
-     *                      
-     */
-    ResultBean<Project> findByResidentialId(Long residentialId);
-    /**
-     * 功能描述:检测小区关联的小区项目数量，一个小区只能创建一个项目
-     * @param residentialId 小区id
-     * @return  ResultBean<Boolean>
-     *               
-     *                      
-     */
-    ResultBean<Boolean> countByResidentialId(Long residentialId);
-
-    /**
-     * 功能描述:根据位置查询所属项目
-     * @param projectDto{
-     *         orgPosition : 位置 必填
-     * }
-     * @return ResultBean<Project>
-     *             
-     *                      
-     */
-    ResultBean<Project> findListByPosition(ProjectDto projectDto);
-    /**
-     * 功能描述:根据位置统计项目数量
-     * @param orgPosition
-     * @return ResultBean<Project>
-     *               
-     *                      
-     */
-    ResultBean<Integer> countByOrgPosition(String orgPosition);
-    /**
-     * 功能描述:添加项目信息--小程序端专用
-     * @param dto
-     * @return ResultBean<Project>
-     *               
-     *                      
-     */
-    ResultBean<Boolean> insertProjectAndContract(ProjectDto dto);
-    /**
-     * 功能描述:根基id集合查询数据
-     * @param idList
-     * @return ResultBean<Project>
-     *               
-     *                      
-     */
-    List<Project> findListByXqIds(List<Long> idList);
-}

sptg-estate/sptg-estate-biz/src/main/java/com/sptg/estate/biz/service/ThirdUserServiceInterface.java

@@ -1,31 +0,0 @@
-package com.sptg.estate.biz.service;
-
-import com.baomidou.mybatisplus.service.IService;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.estate.api.dto.ThirdUserDto;
-import com.sptg.estate.api.entity.ThirdUser;
-
-import java.util.List;
-
-/**
- * title: UserServiceInterface
- * package: com.sptg.estate.biz.security
- * description: 住户 服务层接口
- *
- *
- *
- */
-public interface ThirdUserServiceInterface extends IService<ThirdUser> {
-
-    ResultBean<Boolean> addUser(ThirdUserDto userDto);
-
-    ThirdUser findUserById(Long id);
-
-    boolean updateEntity(ThirdUser user);
-
-    List<ThirdUser> getListByCondition(ThirdUserDto dto);
-
-    ResultBean<Boolean> updateUser(ThirdUserDto userDto);
-
-    ResultBean<Boolean> deleteUser(ThirdUserDto userDto);
-}

sptg-estate/sptg-estate-biz/src/main/java/com/sptg/estate/biz/service/impl/AcceptanceServiceImpl.java

@@ -1,94 +0,0 @@
-package com.sptg.estate.biz.service.impl;
-
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.common.core.beans.ResultEnum;
-import com.sptg.common.core.constant.OperationConstant;
-import com.sptg.estate.api.dto.AcceptanceDto;
-import com.sptg.estate.api.entity.Acceptance;
-import com.sptg.estate.biz.mapper.AcceptanceMapper;
-import com.sptg.estate.biz.service.AcceptanceServiceInterface;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.stereotype.Service;
-
-import java.util.Date;
-
-/**
- * title: ProjectServiceImpl
- * package: com.sptg.estate.biz.security
- * description: 竣工验收-服务层实现层
- *
- *               
- *                     
- */
-@Service
-public class AcceptanceServiceImpl extends ServiceImpl<AcceptanceMapper, Acceptance> implements AcceptanceServiceInterface {
-
-
-    @Override
-    public ResultBean<Boolean> countByProjectId(Long projectId) {
-        Wrapper<Acceptance> wrapper = new EntityWrapper<>();
-        //项目id
-        wrapper.eq("l_project_id", projectId);
-        int count = this.selectCount(wrapper);
-        if(count>0){
-            return new ResultBean<>(ResultEnum.SUCCESS,true);
-        }
-        return new ResultBean<>(ResultEnum.SUCCESS,false);
-    }
-
-    @Override
-    public ResultBean<Boolean> insertEntity(AcceptanceDto dto) {
-        //一个项目只能有一条竣工验收记录
-        if(!this.countByProjectId(dto.getProjectId()).getData()){
-            return new ResultBean<>(ResultEnum.SUCCESS,this.insert(dto));
-        }
-        return new ResultBean<>(ResultEnum.SUCCESS,false);
-    }
-
-    @Override
-    public ResultBean<Integer> countByOrgPosition(String orgPosition) {
-        Wrapper<Acceptance> wrapper = new EntityWrapper<>();
-        wrapper.like("s_org_position", orgPosition);
-        return new ResultBean<>(ResultEnum.SUCCESS,this.selectCount(wrapper));
-    }
-
-    @Override
-    public Page<Acceptance> showList(AcceptanceDto dto) {
-        Page<Acceptance> page = dto.getPage();
-        Wrapper<Acceptance> wrapper = new EntityWrapper<>();
-        if(StringUtils.isNotBlank(dto.getResidentialName())){
-            wrapper.like("s_residential_name",dto.getResidentialName());
-        }
-        //机构位置
-        wrapper.like("s_org_position",dto.getOrgPosition());
-        if(dto.getCheckState()!=null){
-            wrapper.eq("i_check_state", dto.getCheckState());
-        }
-        if(StringUtils.isNotBlank(dto.getCreateName())){
-            wrapper.like("s_create_name", dto.getCreateName());
-        }
-        //排序
-        wrapper.orderBy("t_create_date",false);
-        return this.selectPage(page, wrapper);
-    }
-
-    @Override
-    public ResultBean<Boolean> checkState(AcceptanceDto dto) {
-        if(dto==null||dto.getId()==null||dto.getCheckState()==null){
-            return new ResultBean<>(ResultEnum.SUCCESS,false);
-        }
-        //判断是否可审核
-        Acceptance acceptance = this.selectById(dto.getId());
-        if(acceptance==null || acceptance.getCheckState()==OperationConstant.ONE){
-            return new ResultBean<>(ResultEnum.SUCCESS,false);
-        }
-        if(dto.getCheckState()== OperationConstant.TWO && StringUtils.isBlank(dto.getCheckOpinion())){
-            return new ResultBean<>(ResultEnum.SUCCESS,false);
-        }
-        return new ResultBean<>(ResultEnum.SUCCESS,this.updateById(dto));
-    }
-}

sptg-estate/sptg-estate-biz/src/main/java/com/sptg/estate/biz/service/impl/AccessBlackCardServiceImpl.java

@@ -1,37 +0,0 @@
-package com.sptg.estate.biz.service.impl;
-
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.common.core.beans.ResultEnum;
-import com.sptg.estate.api.dto.AccessBlackCardDto;
-import com.sptg.estate.api.entity.AccessBlackCard;
-import com.sptg.estate.biz.mapper.AccessBlackCardMapper;
-import com.sptg.estate.biz.service.AccessBlackCardServiceInterface;
-import lombok.AllArgsConstructor;
-import org.springframework.stereotype.Service;
-
-/**
- * title: UserCardServiceImpl
- * package: com.sptg.estate.biz.security.impl
- * description: 门禁卡黑名单 服务层实现类
- *
- *
- *
- */
-@Service
-@AllArgsConstructor
-public class AccessBlackCardServiceImpl extends ServiceImpl<AccessBlackCardMapper, AccessBlackCard> implements AccessBlackCardServiceInterface {
-
-    @Override
-    public ResultBean<Page<AccessBlackCard>> showAccessBlackCardList(AccessBlackCardDto accessBlackCardDto) {
-        Wrapper<AccessBlackCard> wrapper = new EntityWrapper<>();
-
-        //排序字段 时间排序
-        wrapper.orderBy("t_create_date",false);
-        return new ResultBean<>(ResultEnum.SUCCESS,this.selectPage(accessBlackCardDto.getPage(),wrapper));
-    }
-
-}

sptg-estate/sptg-estate-biz/src/main/java/com/sptg/estate/biz/service/impl/AccessCardPushRecordsServiceImpl.java

@@ -1,115 +0,0 @@
-package com.sptg.estate.biz.service.impl;
-
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.common.core.beans.ResultEnum;
-import com.sptg.common.core.constant.OperationConstant;
-import com.sptg.estate.api.dto.AccessCardPushRecordsDto;
-import com.sptg.estate.api.entity.AccessCardPushRecords;
-import com.sptg.estate.biz.mapper.AccessCardPushRecordsMapper;
-import com.sptg.estate.biz.service.AccessCardPushRecordsServiceInterface;
-import lombok.RequiredArgsConstructor;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.util.Assert;
-
-import java.util.List;
-
-/**
- * title: AccessCardPushRecordsServiceImpl
- * package: com.sptg.estate.biz.security.impl
- * description: 出入记录 服务层实现类
- *
- *
- *
- */
-@Service
-@RequiredArgsConstructor
-public class AccessCardPushRecordsServiceImpl extends ServiceImpl<AccessCardPushRecordsMapper, AccessCardPushRecords> implements AccessCardPushRecordsServiceInterface {
-
-    @Override
-    public ResultBean<Page<AccessCardPushRecords>> showAccessCardPushRecordsList(AccessCardPushRecordsDto accessPushRecordsDto) {
-        Wrapper<AccessCardPushRecords> wrapper = new EntityWrapper<>();
-        //根据机构
-        //根据下发时间日期
-        if(null != accessPushRecordsDto.getBeginDate()) {
-            wrapper.ge("t_access_date",accessPushRecordsDto.getBeginDate());
-        }
-        if(null != accessPushRecordsDto.getEndDate()) {
-            wrapper.le("t_access_date",accessPushRecordsDto.getEndDate());
-        }
-        //根据开门卡号
-        if(StringUtils.isNotBlank(accessPushRecordsDto.getCardNo())){
-            wrapper.like("s_card_no",accessPushRecordsDto.getCardNo());
-        }
-        //排序字段 时间排序
-        wrapper.orderBy("t_access_date",false);
-        return new ResultBean<>(ResultEnum.SUCCESS,this.selectPage(accessPushRecordsDto.getPage(), wrapper));
-    }
-
-    @Override
-    public AccessCardPushRecords findAccessCardPushRecordsById(Long id) {
-        return this.selectById(id);
-    }
-
-    @Override
-    public List<AccessCardPushRecords> findAccessCardPushRecordsByUserId(Long userId) {
-        Wrapper<AccessCardPushRecords> wrapper = new EntityWrapper<>();
-        wrapper.eq("l_user_id", userId);
-        return this.selectList(wrapper);
-    }
-
-    @Override
-    public ResultBean<Boolean> addAccessCardPushRecords(AccessCardPushRecords accessPushRecords) {
-        boolean insert = this.insert(accessPushRecords);
-        return new ResultBean<>(ResultEnum.SUCCESS, insert);
-    }
-
-    @Override
-    public ResultBean<Boolean> updateAccessCardPushRecords(AccessCardPushRecordsDto accessPushRecordsDto) {
-        return null;
-    }
-
-    @Override
-    public ResultBean<Boolean> updateAccessCardPushRecords(List<AccessCardPushRecords> accessPushRecordsList) {
-        Assert.notEmpty(accessPushRecordsList, "没有需要更新的记录");
-        if(this.updateBatchById(accessPushRecordsList)){
-            return new ResultBean<>(ResultEnum.SUCCESS, true);
-        }
-        return new ResultBean<>(ResultEnum.SUCCESS, false);
-    }
-
-    @Override
-    public ResultBean<Boolean> deleteAccessCardPushRecords(AccessCardPushRecordsDto accessPushRecordsDto) {
-        return null;
-    }
-
-    @Override
-    public Long getAccessCardPushRecordsCount(AccessCardPushRecordsDto accessPushRecordsDto){
-        EntityWrapper<AccessCardPushRecords> wrapper=new EntityWrapper<AccessCardPushRecords>();
-        wrapper.setSqlSelect("COUNT(l_id)");
-
-        //查询某月数据
-        if(accessPushRecordsDto.getUserId()!=null){
-            wrapper.eq("l_user_id", accessPushRecordsDto.getUserId());
-        }
-        return (Long) this.selectObj(wrapper);
-    }
-
-    @Override
-    public ResultBean<AccessCardPushRecords> getListByUserId(Long userId, Integer accessUserType, Integer specialDevice) {
-        Wrapper<AccessCardPushRecords> wrapper = new EntityWrapper<>();
-        wrapper.orderBy("l_id", false);
-        wrapper.eq("l_user_id", userId);
-        wrapper.eq("i_access_user_type", accessUserType);
-        if(specialDevice != null){
-            if(specialDevice.equals(OperationConstant.ONE) || specialDevice.equals(OperationConstant.TWO)){
-                wrapper.eq("i_send_device_type", specialDevice);
-            }
-        }
-        return new ResultBean<>(ResultEnum.SUCCESS,this.selectList(wrapper));
-    }
-}