java110-bean/src/main/java/com/java110/dto/Dict/DictSpecDto.java
File was renamed from java110-bean/src/main/java/com/java110/dto/dictSpec/DictSpecDto.java @@ -1,4 +1,4 @@ package com.java110.dto.dictSpec; package com.java110.dto.Dict; import com.java110.dto.PageDto; import java.io.Serializable; java110-bean/src/main/java/com/java110/dto/account/AccountDetailDto.java
File was renamed from java110-bean/src/main/java/com/java110/dto/accountDetail/AccountDetailDto.java @@ -1,4 +1,4 @@ package com.java110.dto.accountDetail; package com.java110.dto.account; import com.java110.dto.PageDto; java110-bean/src/main/java/com/java110/dto/account/AccountReceiptDto.java
File was renamed from java110-bean/src/main/java/com/java110/dto/accountReceipt/AccountReceiptDto.java @@ -1,4 +1,4 @@ package com.java110.dto.accountReceipt; package com.java110.dto.account; import com.java110.dto.PageDto; import com.java110.dto.account.AccountDto; java110-bean/src/main/java/com/java110/dto/accountBond/AccountBondObjDetailDto.java
File was renamed from java110-bean/src/main/java/com/java110/dto/accountBondObjDetail/AccountBondObjDetailDto.java @@ -1,4 +1,4 @@ package com.java110.dto.accountBondObjDetail; package com.java110.dto.accountBond; import com.java110.dto.PageDto; import java.io.Serializable; java110-bean/src/main/java/com/java110/dto/accountBond/AccountBondObjDto.java
File was renamed from java110-bean/src/main/java/com/java110/dto/accountBondObj/AccountBondObjDto.java @@ -1,4 +1,4 @@ package com.java110.dto.accountBondObj; package com.java110.dto.accountBond; import com.java110.dto.PageDto; import java.io.Serializable; java110-bean/src/main/java/com/java110/dto/assetImportLog/AssetImportLogDetailDto.java
File was renamed from java110-bean/src/main/java/com/java110/dto/assetImportLogDetail/AssetImportLogDetailDto.java @@ -1,4 +1,4 @@ package com.java110.dto.assetImportLogDetail; package com.java110.dto.assetImportLog; import com.java110.dto.PageDto; java110-bean/src/main/java/com/java110/dto/assetImportLog/AssetImportLogDto.java
@@ -1,7 +1,6 @@ package com.java110.dto.assetImportLog; import com.java110.dto.PageDto; import com.java110.dto.assetImportLogDetail.AssetImportLogDetailDto; import java.io.Serializable; import java.util.Date; java110-bean/src/main/java/com/java110/dto/chargeMachine/ChargeMachineDto.java
@@ -1,7 +1,6 @@ package com.java110.dto.chargeMachine; import com.java110.dto.PageDto; import com.java110.dto.chargeRuleFee.ChargeRuleFeeDto; import java.io.Serializable; import java.util.Date; java110-bean/src/main/java/com/java110/dto/chargeMachine/ChargeMachineFactoryDto.java
File was renamed from java110-bean/src/main/java/com/java110/dto/chargeMachineFactory/ChargeMachineFactoryDto.java @@ -1,7 +1,6 @@ package com.java110.dto.chargeMachineFactory; package com.java110.dto.chargeMachine; import com.java110.dto.PageDto; import com.java110.dto.chargeMachineFactorySpec.ChargeMachineFactorySpecDto; import java.io.Serializable; import java.util.Date; java110-bean/src/main/java/com/java110/dto/chargeMachine/ChargeMachineFactorySpecDto.java
File was renamed from java110-bean/src/main/java/com/java110/dto/chargeMachineFactorySpec/ChargeMachineFactorySpecDto.java @@ -1,4 +1,4 @@ package com.java110.dto.chargeMachineFactorySpec; package com.java110.dto.chargeMachine; import com.java110.dto.PageDto; java110-bean/src/main/java/com/java110/dto/chargeMachine/ChargeMachineOrderAcctDto.java
File was renamed from java110-bean/src/main/java/com/java110/dto/chargeMachineOrderAcct/ChargeMachineOrderAcctDto.java @@ -1,4 +1,4 @@ package com.java110.dto.chargeMachineOrderAcct; package com.java110.dto.chargeMachine; import com.java110.dto.PageDto; java110-bean/src/main/java/com/java110/dto/chargeMachine/ChargeMachineOrderCouponDto.java
File was renamed from java110-bean/src/main/java/com/java110/dto/chargeMachineOrderCoupon/ChargeMachineOrderCouponDto.java @@ -1,4 +1,4 @@ package com.java110.dto.chargeMachineOrderCoupon; package com.java110.dto.chargeMachine; import com.java110.dto.PageDto; import java.io.Serializable; java110-bean/src/main/java/com/java110/dto/chargeMachine/ChargeMachineOrderDto.java
File was renamed from java110-bean/src/main/java/com/java110/dto/chargeMachineOrder/ChargeMachineOrderDto.java @@ -1,4 +1,4 @@ package com.java110.dto.chargeMachineOrder; package com.java110.dto.chargeMachine; import com.java110.dto.PageDto; java110-bean/src/main/java/com/java110/dto/chargeMachine/ChargeMachinePortDto.java
File was renamed from java110-bean/src/main/java/com/java110/dto/chargeMachinePort/ChargeMachinePortDto.java @@ -1,4 +1,4 @@ package com.java110.dto.chargeMachinePort; package com.java110.dto.chargeMachine; import com.java110.dto.PageDto; java110-bean/src/main/java/com/java110/dto/chargeMachine/ChargeMachineSpecDto.java
File was renamed from java110-bean/src/main/java/com/java110/dto/chargeMachineSpec/ChargeMachineSpecDto.java @@ -1,4 +1,4 @@ package com.java110.dto.chargeMachineSpec; package com.java110.dto.chargeMachine; import com.java110.dto.PageDto; import java.io.Serializable; java110-bean/src/main/java/com/java110/dto/chargeMachine/ChargeRuleDto.java
File was renamed from java110-bean/src/main/java/com/java110/dto/chargeRule/ChargeRuleDto.java @@ -1,4 +1,4 @@ package com.java110.dto.chargeRule; package com.java110.dto.chargeMachine; import com.java110.dto.PageDto; import java.io.Serializable; java110-bean/src/main/java/com/java110/dto/chargeMachine/ChargeRuleFeeDto.java
File was renamed from java110-bean/src/main/java/com/java110/dto/chargeRuleFee/ChargeRuleFeeDto.java @@ -1,4 +1,4 @@ package com.java110.dto.chargeRuleFee; package com.java110.dto.chargeMachine; import com.java110.dto.PageDto; java110-bean/src/main/java/com/java110/dto/chargeMachine/NotifyChargeOrderDto.java
File was renamed from java110-bean/src/main/java/com/java110/dto/chargeMachineOrder/NotifyChargeOrderDto.java @@ -1,4 +1,4 @@ package com.java110.dto.chargeMachineOrder; package com.java110.dto.chargeMachine; import java.io.Serializable; import java.util.List; java110-bean/src/main/java/com/java110/dto/chargeMachine/NotifyChargePortDto.java
File was renamed from java110-bean/src/main/java/com/java110/dto/chargeMachineOrder/NotifyChargePortDto.java @@ -1,4 +1,4 @@ package com.java110.dto.chargeMachineOrder; package com.java110.dto.chargeMachine; import java.io.Serializable; import java.util.Date; java110-bean/src/main/java/com/java110/dto/classes/ClassesDto.java
@@ -1,7 +1,6 @@ package com.java110.dto.classes; import com.java110.dto.PageDto; import com.java110.dto.classesTime.ClassesTimeDto; import java.io.Serializable; import java.util.Date; java110-bean/src/main/java/com/java110/dto/classes/ClassesTimeDto.java
File was renamed from java110-bean/src/main/java/com/java110/dto/classesTime/ClassesTimeDto.java @@ -1,4 +1,4 @@ package com.java110.dto.classesTime; package com.java110.dto.classes; import com.java110.dto.PageDto; java110-bean/src/main/java/com/java110/dto/communitySetting/CommunitySettingKeyDto.java
File was renamed from java110-bean/src/main/java/com/java110/dto/communitySettingKey/CommunitySettingKeyDto.java @@ -1,4 +1,4 @@ package com.java110.dto.communitySettingKey; package com.java110.dto.communitySetting; import com.java110.dto.PageDto; java110-bean/src/main/java/com/java110/dto/communitySpace/CommunitySpaceConfirmOrderDto.java
File was renamed from java110-bean/src/main/java/com/java110/dto/communitySpaceConfirmOrder/CommunitySpaceConfirmOrderDto.java @@ -1,4 +1,4 @@ package com.java110.dto.communitySpaceConfirmOrder; package com.java110.dto.communitySpace; import com.java110.dto.PageDto; java110-bean/src/main/java/com/java110/dto/communitySpace/CommunitySpaceDto.java
@@ -1,7 +1,6 @@ package com.java110.dto.communitySpace; import com.java110.dto.PageDto; import com.java110.dto.communitySpaceOpenTime.CommunitySpaceOpenTimeDto; import java.io.Serializable; import java.util.Date; java110-bean/src/main/java/com/java110/dto/communitySpace/CommunitySpaceOpenTimeDto.java
File was renamed from java110-bean/src/main/java/com/java110/dto/communitySpaceOpenTime/CommunitySpaceOpenTimeDto.java @@ -1,4 +1,4 @@ package com.java110.dto.communitySpaceOpenTime; package com.java110.dto.communitySpace; import com.java110.dto.PageDto; java110-bean/src/main/java/com/java110/dto/communitySpace/CommunitySpacePersonDto.java
File was renamed from java110-bean/src/main/java/com/java110/dto/communitySpacePerson/CommunitySpacePersonDto.java @@ -1,7 +1,6 @@ package com.java110.dto.communitySpacePerson; package com.java110.dto.communitySpace; import com.java110.dto.PageDto; import com.java110.dto.communitySpacePersonTime.CommunitySpacePersonTimeDto; import java.io.Serializable; import java.util.Date; java110-bean/src/main/java/com/java110/dto/communitySpace/CommunitySpacePersonTimeDto.java
File was renamed from java110-bean/src/main/java/com/java110/dto/communitySpacePersonTime/CommunitySpacePersonTimeDto.java @@ -1,4 +1,4 @@ package com.java110.dto.communitySpacePersonTime; package com.java110.dto.communitySpace; import com.java110.dto.PageDto; java110-bean/src/main/java/com/java110/dto/communitySpace/CommunityVenueDto.java
File was renamed from java110-bean/src/main/java/com/java110/dto/communityVenue/CommunityVenueDto.java @@ -1,4 +1,4 @@ package com.java110.dto.communityVenue; package com.java110.dto.communitySpace; import com.java110.dto.PageDto; java110-bean/src/main/java/com/java110/dto/contract/ContractAttrDto.javaold mode 100755 new mode 100644
File was renamed from java110-bean/src/main/java/com/java110/dto/contractAttr/ContractAttrDto.java @@ -1,4 +1,4 @@ package com.java110.dto.contractAttr; package com.java110.dto.contract; import com.java110.dto.PageDto; java110-bean/src/main/java/com/java110/dto/contract/ContractChangePlanDetailAttrDto.java
File was renamed from java110-bean/src/main/java/com/java110/dto/contractChangePlanDetailAttr/ContractChangePlanDetailAttrDto.java @@ -1,4 +1,4 @@ package com.java110.dto.contractChangePlanDetailAttr; package com.java110.dto.contract; import com.java110.dto.PageDto; import java.io.Serializable; java110-bean/src/main/java/com/java110/dto/contract/ContractChangePlanDetailDto.java
File was renamed from java110-bean/src/main/java/com/java110/dto/contractChangePlanDetail/ContractChangePlanDetailDto.java @@ -1,4 +1,4 @@ package com.java110.dto.contractChangePlanDetail; package com.java110.dto.contract; import com.java110.dto.PageDto; java110-bean/src/main/java/com/java110/dto/contract/ContractChangePlanDto.java
File was renamed from java110-bean/src/main/java/com/java110/dto/contractChangePlan/ContractChangePlanDto.java @@ -1,4 +1,4 @@ package com.java110.dto.contractChangePlan; package com.java110.dto.contract; import com.java110.dto.PageDto; import com.java110.dto.contract.ContractDto; java110-bean/src/main/java/com/java110/dto/contract/ContractChangePlanRoomDto.java
File was renamed from java110-bean/src/main/java/com/java110/dto/contractChangePlanRoom/ContractChangePlanRoomDto.java @@ -1,4 +1,4 @@ package com.java110.dto.contractChangePlanRoom; package com.java110.dto.contract; import com.java110.dto.PageDto; java110-bean/src/main/java/com/java110/dto/contract/ContractCollectionPlanDto.java
File was renamed from java110-bean/src/main/java/com/java110/dto/contractCollectionPlan/ContractCollectionPlanDto.java @@ -1,4 +1,4 @@ package com.java110.dto.contractCollectionPlan; package com.java110.dto.contract; import com.java110.dto.PageDto; import java.io.Serializable; java110-bean/src/main/java/com/java110/dto/contract/ContractDto.java
@@ -1,7 +1,6 @@ package com.java110.dto.contract; import com.java110.dto.PageDto; import com.java110.dto.contractAttr.ContractAttrDto; import java.io.Serializable; import java.util.Date; @@ -43,6 +42,7 @@ private String objId; private String contractName; private String contractNameLike; private String startTime; private String endTime; private String state; java110-bean/src/main/java/com/java110/dto/contract/ContractFileDto.java
File was renamed from java110-bean/src/main/java/com/java110/dto/contractFile/ContractFileDto.java @@ -1,4 +1,4 @@ package com.java110.dto.contractFile; package com.java110.dto.contract; import com.java110.dto.PageDto; java110-bean/src/main/java/com/java110/dto/contract/ContractPartyaDto.java
File was renamed from java110-bean/src/main/java/com/java110/dto/contractPartya/ContractPartyaDto.java @@ -1,4 +1,4 @@ package com.java110.dto.contractPartya; package com.java110.dto.contract; import com.java110.dto.PageDto; java110-bean/src/main/java/com/java110/dto/contract/ContractRoomDto.java
File was renamed from java110-bean/src/main/java/com/java110/dto/contractRoom/ContractRoomDto.java @@ -1,4 +1,4 @@ package com.java110.dto.contractRoom; package com.java110.dto.contract; import com.java110.dto.PageDto; import com.java110.dto.RoomDto; java110-bean/src/main/java/com/java110/dto/contract/ContractTypeDto.javaold mode 100755 new mode 100644
File was renamed from java110-bean/src/main/java/com/java110/dto/contractType/ContractTypeDto.java @@ -1,4 +1,4 @@ package com.java110.dto.contractType; package com.java110.dto.contract; import com.java110.dto.PageDto; java110-bean/src/main/java/com/java110/dto/contract/ContractTypeSpecDto.javaold mode 100755 new mode 100644
File was renamed from java110-bean/src/main/java/com/java110/dto/contractTypeSpec/ContractTypeSpecDto.java @@ -1,4 +1,4 @@ package com.java110.dto.contractTypeSpec; package com.java110.dto.contract; import com.java110.dto.PageDto; import java.io.Serializable; java110-bean/src/main/java/com/java110/dto/contract/ContractTypeTemplateDto.javaold mode 100755 new mode 100644
File was renamed from java110-bean/src/main/java/com/java110/dto/contractTypeTemplate/ContractTypeTemplateDto.java @@ -1,4 +1,4 @@ package com.java110.dto.contractTypeTemplate; package com.java110.dto.contract; import com.java110.dto.PageDto; java110-bean/src/main/java/com/java110/dto/couponPool/CouponPropertyPoolConfigDto.java
File was renamed from java110-bean/src/main/java/com/java110/dto/couponPropertyPoolConfig/CouponPropertyPoolConfigDto.java @@ -1,4 +1,4 @@ package com.java110.dto.couponPropertyPoolConfig; package com.java110.dto.couponPool; import com.java110.dto.PageDto; java110-bean/src/main/java/com/java110/dto/couponPool/CouponPropertyPoolDetailDto.java
File was renamed from java110-bean/src/main/java/com/java110/dto/couponPropertyPoolDetail/CouponPropertyPoolDetailDto.java @@ -1,4 +1,4 @@ package com.java110.dto.couponPropertyPoolDetail; package com.java110.dto.couponPool; import com.java110.dto.PageDto; java110-bean/src/main/java/com/java110/dto/couponPool/CouponPropertyPoolDto.java
File was renamed from java110-bean/src/main/java/com/java110/dto/couponPropertyPool/CouponPropertyPoolDto.java @@ -1,7 +1,6 @@ package com.java110.dto.couponPropertyPool; package com.java110.dto.couponPool; import com.java110.dto.PageDto; import com.java110.dto.couponPropertyPoolConfig.CouponPropertyPoolConfigDto; import java.io.Serializable; import java.util.Date; java110-bean/src/main/java/com/java110/dto/couponPool/CouponPropertyUserDetailDto.java
File was renamed from java110-bean/src/main/java/com/java110/dto/couponPropertyUserDetail/CouponPropertyUserDetailDto.java @@ -1,4 +1,4 @@ package com.java110.dto.couponPropertyUserDetail; package com.java110.dto.couponPool; import com.java110.dto.PageDto; java110-bean/src/main/java/com/java110/dto/couponPool/CouponPropertyUserDto.java
File was renamed from java110-bean/src/main/java/com/java110/dto/couponPropertyUser/CouponPropertyUserDto.java @@ -1,4 +1,4 @@ package com.java110.dto.couponPropertyUser; package com.java110.dto.couponPool; import com.java110.dto.PageDto; java110-bean/src/main/java/com/java110/dto/couponPool/CouponQrCodeDto.java
File was renamed from java110-bean/src/main/java/com/java110/dto/couponPropertyUser/CouponQrCodeDto.java @@ -1,4 +1,4 @@ package com.java110.dto.couponPropertyUser; package com.java110.dto.couponPool; import java.io.Serializable; java110-bean/src/main/java/com/java110/dto/couponPool/CouponRuleCppsDto.java
File was renamed from java110-bean/src/main/java/com/java110/dto/couponRuleCpps/CouponRuleCppsDto.java @@ -1,4 +1,4 @@ package com.java110.dto.couponRuleCpps; package com.java110.dto.couponPool; import com.java110.dto.PageDto; java110-bean/src/main/java/com/java110/dto/couponPool/CouponRuleDto.java
File was renamed from java110-bean/src/main/java/com/java110/dto/couponRule/CouponRuleDto.java @@ -1,4 +1,4 @@ package com.java110.dto.couponRule; package com.java110.dto.couponPool; import com.java110.dto.PageDto; java110-bean/src/main/java/com/java110/dto/couponPool/CouponRuleFeeDto.java
File was renamed from java110-bean/src/main/java/com/java110/dto/couponRuleFee/CouponRuleFeeDto.java @@ -1,4 +1,4 @@ package com.java110.dto.couponRuleFee; package com.java110.dto.couponPool; import com.java110.dto.PageDto; java110-bean/src/main/java/com/java110/dto/couponPool/CouponShopPoolDetailDto.java
File was renamed from java110-bean/src/main/java/com/java110/dto/couponShopPoolDetail/CouponShopPoolDetailDto.java @@ -1,4 +1,4 @@ package com.java110.dto.couponShopPoolDetail; package com.java110.dto.couponPool; import com.java110.dto.PageDto; import java.io.Serializable; java110-bean/src/main/java/com/java110/dto/couponPool/CouponShopPoolDto.java
File was renamed from java110-bean/src/main/java/com/java110/dto/couponShopPool/CouponShopPoolDto.java @@ -1,4 +1,4 @@ package com.java110.dto.couponShopPool; package com.java110.dto.couponPool; import com.java110.dto.PageDto; import java.io.Serializable; java110-bean/src/main/java/com/java110/dto/couponPool/CouponUserDetailDto.java
File was renamed from java110-bean/src/main/java/com/java110/dto/couponUserDetail/CouponUserDetailDto.java @@ -1,4 +1,4 @@ package com.java110.dto.couponUserDetail; package com.java110.dto.couponPool; import com.java110.dto.PageDto; java110-bean/src/main/java/com/java110/dto/couponPool/CouponUserDto.java
File was renamed from java110-bean/src/main/java/com/java110/dto/couponUser/CouponUserDto.java @@ -1,4 +1,4 @@ package com.java110.dto.couponUser; package com.java110.dto.couponPool; import com.java110.dto.PageDto; java110-bean/src/main/java/com/java110/dto/data/DataPrivilegeDto.java
File was renamed from java110-bean/src/main/java/com/java110/dto/dataPrivilege/DataPrivilegeDto.java @@ -1,4 +1,4 @@ package com.java110.dto.dataPrivilege; package com.java110.dto.data; import com.java110.dto.PageDto; import java.io.Serializable; java110-bean/src/main/java/com/java110/dto/data/DataPrivilegeStaffDto.java
File was renamed from java110-bean/src/main/java/com/java110/dto/dataPrivilegeStaff/DataPrivilegeStaffDto.java @@ -1,4 +1,4 @@ package com.java110.dto.dataPrivilegeStaff; package com.java110.dto.data; import com.java110.dto.PageDto; java110-bean/src/main/java/com/java110/dto/data/DataPrivilegeUnitDto.java
File was renamed from java110-bean/src/main/java/com/java110/dto/dataPrivilegeUnit/DataPrivilegeUnitDto.java @@ -1,4 +1,4 @@ package com.java110.dto.dataPrivilegeUnit; package com.java110.dto.data; import com.java110.dto.PageDto; java110-bean/src/main/java/com/java110/dto/data/SearchDataDto.java
New file @@ -0,0 +1,148 @@ package com.java110.dto.data; import com.java110.dto.RoomDto; import com.java110.dto.contract.ContractDto; import com.java110.dto.owner.OwnerCarDto; import com.java110.dto.owner.OwnerDto; import com.java110.dto.repair.RepairDto; import com.java110.dto.user.UserDto; import com.java110.dto.visit.VisitDto; import java.io.Serializable; import java.util.List; /** * 搜索数据封装 */ public class SearchDataDto implements Serializable { private String communityId; private String storeId; private String searchValue; private String tel; private List<RoomDto> rooms; private List<OwnerDto> owners; private List<OwnerDto> ownerMembers; private List<OwnerCarDto> cars; private List<OwnerCarDto> carMembers; private List<RepairDto> repairs; private List<ContractDto> contracts; private List<VisitDto> visitDtos; private List<UserDto> staffs; public String getCommunityId() { return communityId; } public void setCommunityId(String communityId) { this.communityId = communityId; } public String getSearchValue() { return searchValue; } public void setSearchValue(String searchValue) { this.searchValue = searchValue; } public String getTel() { return tel; } public void setTel(String tel) { this.tel = tel; } public List<RoomDto> getRooms() { return rooms; } public void setRooms(List<RoomDto> rooms) { this.rooms = rooms; } public List<OwnerDto> getOwners() { return owners; } public void setOwners(List<OwnerDto> owners) { this.owners = owners; } public List<OwnerDto> getOwnerMembers() { return ownerMembers; } public void setOwnerMembers(List<OwnerDto> ownerMembers) { this.ownerMembers = ownerMembers; } public List<OwnerCarDto> getCars() { return cars; } public void setCars(List<OwnerCarDto> cars) { this.cars = cars; } public List<OwnerCarDto> getCarMembers() { return carMembers; } public void setCarMembers(List<OwnerCarDto> carMembers) { this.carMembers = carMembers; } public List<RepairDto> getRepairs() { return repairs; } public void setRepairs(List<RepairDto> repairs) { this.repairs = repairs; } public List<ContractDto> getContracts() { return contracts; } public void setContracts(List<ContractDto> contracts) { this.contracts = contracts; } public List<VisitDto> getVisitDtos() { return visitDtos; } public void setVisitDtos(List<VisitDto> visitDtos) { this.visitDtos = visitDtos; } public List<UserDto> getStaffs() { return staffs; } public void setStaffs(List<UserDto> staffs) { this.staffs = staffs; } public String getStoreId() { return storeId; } public void setStoreId(String storeId) { this.storeId = storeId; } } java110-bean/src/main/java/com/java110/dto/examineProject/ExamineStaffDto.java
File was renamed from java110-bean/src/main/java/com/java110/dto/examineStaff/ExamineStaffDto.java @@ -1,7 +1,6 @@ package com.java110.dto.examineStaff; package com.java110.dto.examineProject; import com.java110.dto.PageDto; import com.java110.dto.examineStaffProject.ExamineStaffProjectDto; import java.io.Serializable; import java.util.Date; java110-bean/src/main/java/com/java110/dto/examineProject/ExamineStaffIntroductionDto.java
File was renamed from java110-bean/src/main/java/com/java110/dto/examineStaffIntroduction/ExamineStaffIntroductionDto.java @@ -1,4 +1,4 @@ package com.java110.dto.examineStaffIntroduction; package com.java110.dto.examineProject; import com.java110.dto.PageDto; java110-bean/src/main/java/com/java110/dto/examineProject/ExamineStaffProjectDto.java
File was renamed from java110-bean/src/main/java/com/java110/dto/examineStaffProject/ExamineStaffProjectDto.java @@ -1,4 +1,4 @@ package com.java110.dto.examineStaffProject; package com.java110.dto.examineProject; import com.java110.dto.PageDto; java110-bean/src/main/java/com/java110/dto/examineProject/ExamineStaffValueDto.java
File was renamed from java110-bean/src/main/java/com/java110/dto/examineStaffValue/ExamineStaffValueDto.java @@ -1,4 +1,4 @@ package com.java110.dto.examineStaffValue; package com.java110.dto.examineProject; import com.java110.dto.PageDto; java110-bean/src/main/java/com/java110/dto/owner/OwnerDto.java
@@ -21,6 +21,9 @@ public static final String OWNER_TYPE_CD_OWNER = "1001"; //业主 public static final String OWNER_TYPE_CD_MEMBER = "1002"; //家庭成员 public static final String OWNER_TYPE_CD_RENTING = "1003"; //租客 public static final String OWNER_TYPE_CD_TEMP = "1004"; //临时人员 public static final String OWNER_TYPE_CD_OTHER = "1005"; //其他 public static final String OWNER_FLAG_TRUE = "T";//业主标识 T是真实业主 F 是虚拟业主 public static final String OWNER_FLAG_FALSE = "F";//业主标识 T是真实业主 F 是虚拟业主 @@ -42,6 +45,7 @@ private String[] roomIds; private String sex; private String name; private String nameLike; private String link; private String address; private String remark; @@ -509,4 +513,12 @@ public void setOperate(String operate) { this.operate = operate; } public String getNameLike() { return nameLike; } public void setNameLike(String nameLike) { this.nameLike = nameLike; } } java110-bean/src/main/java/com/java110/dto/repair/RepairDto.java
@@ -50,6 +50,9 @@ public static final String REPAIR_CHANNEL_OWNER = "Z"; //Z业主自主保修 private String repairName; private String repairNameLike; private String appointmentTime; private String repairType; private String context; @@ -540,4 +543,12 @@ public void setRepairSettingTypeName(String repairSettingTypeName) { this.repairSettingTypeName = repairSettingTypeName; } public String getRepairNameLike() { return repairNameLike; } public void setRepairNameLike(String repairNameLike) { this.repairNameLike = repairNameLike; } } java110-bean/src/main/java/com/java110/dto/user/UserDto.java
@@ -27,6 +27,8 @@ private String name; private String nameLike; private String tel; private String email; @@ -395,4 +397,12 @@ public void setOrgIds(String[] orgIds) { this.orgIds = orgIds; } public String getNameLike() { return nameLike; } public void setNameLike(String nameLike) { this.nameLike = nameLike; } } java110-bean/src/main/java/com/java110/dto/visit/VisitDto.java
@@ -28,6 +28,7 @@ private String departureTime; private String vName; private String vNameLike; private String visitGender; private String ownerId; private String ownerName; @@ -407,4 +408,12 @@ public void setReasonTypeName(String reasonTypeName) { this.reasonTypeName = reasonTypeName; } public String getvNameLike() { return vNameLike; } public void setvNameLike(String vNameLike) { this.vNameLike = vNameLike; } } java110-core/src/main/java/com/java110/core/smo/impl/ComputeFeeSMOImpl.java
@@ -9,7 +9,7 @@ import com.java110.dto.RoomDto; import com.java110.dto.community.CommunityDto; import com.java110.dto.contract.ContractDto; import com.java110.dto.contractRoom.ContractRoomDto; import com.java110.dto.contract.ContractRoomDto; import com.java110.dto.fee.*; import com.java110.dto.integralRuleConfig.IntegralRuleConfigDto; import com.java110.dto.machine.CarInoutDetailDto; java110-db/src/main/resources/mapper/community/RepairServiceDaoImplMapper.xml
@@ -179,6 +179,9 @@ <if test="repairName !=null and repairName != ''"> and t.repair_name like '%${repairName}%' </if> <if test="repairNameLike !=null and repairNameLike != ''"> and t.repair_name like concat('%',${repairNameLike},'%') </if> <if test="appointmentTime !=null "> and t.appointment_time= #{appointmentTime} </if> @@ -323,6 +326,9 @@ <if test="repairName !=null and repairName != ''"> and t.repair_name like '%${repairName}%' </if> <if test="repairNameLike !=null and repairNameLike != ''"> and t.repair_name like concat('%',${repairNameLike},'%') </if> <if test="appointmentTime !=null "> and t.appointment_time= #{appointmentTime} </if> java110-db/src/main/resources/mapper/community/RoomV1ServiceDaoImplMapper.xml
@@ -71,6 +71,9 @@ <if test="roomNum !=null and roomNum != ''"> and t.room_num= #{roomNum} </if> <if test="roomNumLike !=null and roomNumLike != ''"> and t.room_num like concat('%',#{roomNumLike},'%') </if> <if test="unitId !=null and unitId != ''"> and t.unit_id= #{unitId} </if> @@ -207,6 +210,9 @@ <if test="roomNum !=null and roomNum != ''"> and t.room_num= #{roomNum} </if> <if test="roomNumLike !=null and roomNumLike != ''"> and t.room_num like concat('%',#{roomNumLike},'%') </if> <if test="unitId !=null and unitId != ''"> and t.unit_id= #{unitId} </if> java110-db/src/main/resources/mapper/community/VisitV1ServiceDaoImplMapper.xml
@@ -40,6 +40,9 @@ <if test="vName !=null and vName != ''"> and t.v_name= #{vName} </if> <if test="vNameLike !=null and vNameLike != ''"> and t.v_name like concat('%',#{vNameLike},'%') </if> <if test="statusCd !=null and statusCd != ''"> and t.status_cd= #{statusCd} </if> @@ -197,6 +200,9 @@ <if test="vName !=null and vName != ''"> and t.v_name= #{vName} </if> <if test="vNameLike !=null and vNameLike != ''"> and t.v_name like concat('%',#{vNameLike},'%') </if> <if test="statusCd !=null and statusCd != ''"> and t.status_cd= #{statusCd} </if> java110-db/src/main/resources/mapper/user/OwnerCarV1ServiceDaoImplMapper.xml
@@ -30,6 +30,9 @@ <if test="carNum !=null and carNum != ''"> and t.car_num= #{carNum} </if> <if test="carNumLike !=null and carNumLike != ''"> and t.car_num like concat('%',#{carNumLike},'%') </if> <if test="psId !=null and psId != ''"> and t.ps_id= #{psId} </if> @@ -160,6 +163,9 @@ <if test="carNum !=null and carNum != ''"> and t.car_num= #{carNum} </if> <if test="carNumLike !=null and carNumLike != ''"> and t.car_num like concat('%',#{carNumLike},'%') </if> <if test="psId !=null and psId != ''"> and t.ps_id= #{psId} </if> java110-db/src/main/resources/mapper/user/OwnerV1ServiceDaoImplMapper.xml
@@ -33,6 +33,12 @@ <if test="ownerTypeCd !=null and ownerTypeCd != ''"> and t.owner_type_cd= #{ownerTypeCd} </if> <if test="ownerTypeCds != null"> and t.owner_type_cd in <foreach collection="ownerTypeCds" item="item" open="(" close=")" separator=","> #{item} </foreach> </if> <if test="remark !=null and remark != ''"> and t.remark= #{remark} </if> @@ -53,6 +59,9 @@ </if> <if test="name !=null and name != ''"> and t.name= #{name} </if> <if test="nameLike !=null and nameLike != ''"> and t.name like concat('%',#{nameLike},'%') </if> <if test="state !=null and state != ''"> and t.state= #{state} @@ -138,6 +147,12 @@ <if test="ownerTypeCd !=null and ownerTypeCd != ''"> and t.owner_type_cd= #{ownerTypeCd} </if> <if test="ownerTypeCds != null"> and t.owner_type_cd in <foreach collection="ownerTypeCds" item="item" open="(" close=")" separator=","> #{item} </foreach> </if> <if test="remark !=null and remark != ''"> and t.remark= #{remark} </if> @@ -159,6 +174,9 @@ <if test="name !=null and name != ''"> and t.name= #{name} </if> <if test="nameLike !=null and nameLike != ''"> and t.name like concat('%',#{nameLike},'%') </if> <if test="state !=null and state != ''"> and t.state= #{state} </if> java110-db/src/main/resources/mapper/user/UserServiceDaoImplMapper.xml
@@ -489,6 +489,9 @@ <if test="name !=null and name != ''"> and u.name like concat('%',#{name},'%') </if> <if test="nameLike !=null and nameLike != ''"> and u.name like concat('%',#{nameLike},'%') </if> <if test="staffName !=null and staffName != ''"> and u.name like concat('%',#{staffName},'%') </if> @@ -550,6 +553,9 @@ <if test="name !=null and name != ''"> and u.name like concat('%',#{name},'%') </if> <if test="nameLike !=null and nameLike != ''"> and u.name like concat('%',#{nameLike},'%') </if> <if test="staffName !=null and staffName != ''"> and u.name like concat('%',#{staffName},'%') </if> java110-interface/src/main/java/com/java110/intf/acct/IAccountBondObjDetailInnerServiceSMO.java
@@ -1,7 +1,7 @@ package com.java110.intf.acct; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.accountBondObjDetail.AccountBondObjDetailDto; import com.java110.dto.accountBond.AccountBondObjDetailDto; import com.java110.po.accountBondObjDetail.AccountBondObjDetailPo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; java110-interface/src/main/java/com/java110/intf/acct/IAccountBondObjInnerServiceSMO.java
@@ -1,7 +1,7 @@ package com.java110.intf.acct; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.accountBondObj.AccountBondObjDto; import com.java110.dto.accountBond.AccountBondObjDto; import com.java110.po.accountBondObj.AccountBondObjPo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; java110-interface/src/main/java/com/java110/intf/acct/IAccountDetailInnerServiceSMO.java
@@ -1,7 +1,7 @@ package com.java110.intf.acct; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.accountDetail.AccountDetailDto; import com.java110.dto.account.AccountDetailDto; import com.java110.po.accountDetail.AccountDetailPo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; java110-interface/src/main/java/com/java110/intf/acct/ICouponPropertyPoolConfigV1InnerServiceSMO.java
@@ -16,7 +16,7 @@ package com.java110.intf.acct; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.couponPropertyPoolConfig.CouponPropertyPoolConfigDto; import com.java110.dto.couponPool.CouponPropertyPoolConfigDto; import com.java110.po.couponPropertyPoolConfig.CouponPropertyPoolConfigPo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; java110-interface/src/main/java/com/java110/intf/acct/ICouponPropertyPoolDetailV1InnerServiceSMO.java
@@ -16,7 +16,7 @@ package com.java110.intf.acct; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.couponPropertyPoolDetail.CouponPropertyPoolDetailDto; import com.java110.dto.couponPool.CouponPropertyPoolDetailDto; import com.java110.po.couponPropertyPoolDetail.CouponPropertyPoolDetailPo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; java110-interface/src/main/java/com/java110/intf/acct/ICouponPropertyPoolV1InnerServiceSMO.java
@@ -16,7 +16,7 @@ package com.java110.intf.acct; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.couponPropertyPool.CouponPropertyPoolDto; import com.java110.dto.couponPool.CouponPropertyPoolDto; import com.java110.po.couponPropertyPool.CouponPropertyPoolPo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; java110-interface/src/main/java/com/java110/intf/acct/ICouponPropertyUserDetailV1InnerServiceSMO.java
@@ -16,7 +16,7 @@ package com.java110.intf.acct; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.couponPropertyUserDetail.CouponPropertyUserDetailDto; import com.java110.dto.couponPool.CouponPropertyUserDetailDto; import com.java110.po.couponPropertyUserDetail.CouponPropertyUserDetailPo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; java110-interface/src/main/java/com/java110/intf/acct/ICouponPropertyUserV1InnerServiceSMO.java
@@ -16,7 +16,7 @@ package com.java110.intf.acct; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.couponPropertyUser.CouponPropertyUserDto; import com.java110.dto.couponPool.CouponPropertyUserDto; import com.java110.po.couponPropertyUser.CouponPropertyUserPo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; java110-interface/src/main/java/com/java110/intf/acct/ICouponRuleCppsV1InnerServiceSMO.java
@@ -16,7 +16,7 @@ package com.java110.intf.acct; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.couponRuleCpps.CouponRuleCppsDto; import com.java110.dto.couponPool.CouponRuleCppsDto; import com.java110.po.couponRuleCpps.CouponRuleCppsPo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; java110-interface/src/main/java/com/java110/intf/acct/ICouponRuleFeeV1InnerServiceSMO.java
@@ -16,7 +16,7 @@ package com.java110.intf.acct; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.couponRuleFee.CouponRuleFeeDto; import com.java110.dto.couponPool.CouponRuleFeeDto; import com.java110.po.couponRuleFee.CouponRuleFeePo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; java110-interface/src/main/java/com/java110/intf/acct/ICouponRuleV1InnerServiceSMO.java
@@ -16,7 +16,7 @@ package com.java110.intf.acct; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.couponRule.CouponRuleDto; import com.java110.dto.couponPool.CouponRuleDto; import com.java110.po.couponRule.CouponRulePo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; java110-interface/src/main/java/com/java110/intf/acct/ICouponShopPoolDetailV1InnerServiceSMO.java
@@ -16,7 +16,7 @@ package com.java110.intf.acct; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.couponShopPoolDetail.CouponShopPoolDetailDto; import com.java110.dto.couponPool.CouponShopPoolDetailDto; import com.java110.po.couponShopPoolDetail.CouponShopPoolDetailPo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; java110-interface/src/main/java/com/java110/intf/acct/ICouponShopPoolV1InnerServiceSMO.java
@@ -16,7 +16,7 @@ package com.java110.intf.acct; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.couponShopPool.CouponShopPoolDto; import com.java110.dto.couponPool.CouponShopPoolDto; import com.java110.po.couponShopPool.CouponShopPoolPo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; java110-interface/src/main/java/com/java110/intf/acct/ICouponUserDetailV1InnerServiceSMO.java
@@ -16,7 +16,7 @@ package com.java110.intf.acct; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.couponUserDetail.CouponUserDetailDto; import com.java110.dto.couponPool.CouponUserDetailDto; import com.java110.po.couponUserDetail.CouponUserDetailPo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; java110-interface/src/main/java/com/java110/intf/acct/ICouponUserV1InnerServiceSMO.java
@@ -16,7 +16,7 @@ package com.java110.intf.acct; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.couponUser.CouponUserDto; import com.java110.dto.couponPool.CouponUserDto; import com.java110.po.couponUser.CouponUserPo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; java110-interface/src/main/java/com/java110/intf/common/IAssetImportLogDetailInnerServiceSMO.java
@@ -1,7 +1,7 @@ package com.java110.intf.common; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.assetImportLogDetail.AssetImportLogDetailDto; import com.java110.dto.assetImportLog.AssetImportLogDetailDto; import com.java110.po.assetImportLogDetail.AssetImportLogDetailPo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; java110-interface/src/main/java/com/java110/intf/common/IChargeMachineFactorySpecV1InnerServiceSMO.java
@@ -16,7 +16,7 @@ package com.java110.intf.common; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.chargeMachineFactorySpec.ChargeMachineFactorySpecDto; import com.java110.dto.chargeMachine.ChargeMachineFactorySpecDto; import com.java110.po.chargeMachineFactorySpec.ChargeMachineFactorySpecPo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; java110-interface/src/main/java/com/java110/intf/common/IChargeMachineFactoryV1InnerServiceSMO.java
@@ -16,7 +16,7 @@ package com.java110.intf.common; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.chargeMachineFactory.ChargeMachineFactoryDto; import com.java110.dto.chargeMachine.ChargeMachineFactoryDto; import com.java110.po.chargeMachineFactory.ChargeMachineFactoryPo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; java110-interface/src/main/java/com/java110/intf/common/IChargeMachineOrderAcctV1InnerServiceSMO.java
@@ -16,7 +16,7 @@ package com.java110.intf.common; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.chargeMachineOrderAcct.ChargeMachineOrderAcctDto; import com.java110.dto.chargeMachine.ChargeMachineOrderAcctDto; import com.java110.po.chargeMachineOrderAcct.ChargeMachineOrderAcctPo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; java110-interface/src/main/java/com/java110/intf/common/IChargeMachineOrderCouponV1InnerServiceSMO.java
@@ -16,7 +16,7 @@ package com.java110.intf.common; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.chargeMachineOrderCoupon.ChargeMachineOrderCouponDto; import com.java110.dto.chargeMachine.ChargeMachineOrderCouponDto; import com.java110.po.chargeMachineOrderCoupon.ChargeMachineOrderCouponPo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; java110-interface/src/main/java/com/java110/intf/common/IChargeMachineOrderV1InnerServiceSMO.java
@@ -16,7 +16,7 @@ package com.java110.intf.common; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.chargeMachineOrder.ChargeMachineOrderDto; import com.java110.dto.chargeMachine.ChargeMachineOrderDto; import com.java110.po.chargeMachineOrder.ChargeMachineOrderPo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; java110-interface/src/main/java/com/java110/intf/common/IChargeMachinePortV1InnerServiceSMO.java
@@ -16,7 +16,7 @@ package com.java110.intf.common; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.chargeMachinePort.ChargeMachinePortDto; import com.java110.dto.chargeMachine.ChargeMachinePortDto; import com.java110.po.chargeMachinePort.ChargeMachinePortPo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; java110-interface/src/main/java/com/java110/intf/common/IChargeMachineSpecV1InnerServiceSMO.java
@@ -16,7 +16,7 @@ package com.java110.intf.common; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.chargeMachineSpec.ChargeMachineSpecDto; import com.java110.dto.chargeMachine.ChargeMachineSpecDto; import com.java110.po.chargeMachineSpec.ChargeMachineSpecPo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; java110-interface/src/main/java/com/java110/intf/common/IChargeRuleFeeV1InnerServiceSMO.java
@@ -16,7 +16,7 @@ package com.java110.intf.common; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.chargeRuleFee.ChargeRuleFeeDto; import com.java110.dto.chargeMachine.ChargeRuleFeeDto; import com.java110.po.chargeRuleFee.ChargeRuleFeePo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; java110-interface/src/main/java/com/java110/intf/common/IChargeRuleV1InnerServiceSMO.java
@@ -16,7 +16,7 @@ package com.java110.intf.common; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.chargeRule.ChargeRuleDto; import com.java110.dto.chargeMachine.ChargeRuleDto; import com.java110.po.chargeRule.ChargeRulePo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; java110-interface/src/main/java/com/java110/intf/common/IContractChangeUserInnerServiceSMO.java
@@ -1,19 +1,15 @@ package com.java110.intf.common; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.contract.ContractDto; import com.java110.dto.contractChangePlan.ContractChangePlanDto; import com.java110.dto.contract.ContractChangePlanDto; import com.java110.entity.audit.AuditUser; import com.java110.po.contract.ContractPo; import com.java110.po.contractChangePlan.ContractChangePlanPo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import java.util.HashMap; import java.util.List; import java.util.Map; @FeignClient(name = "${java110.common-service}", configuration = {FeignConfiguration.class}) @RequestMapping("/contractChangeUserApi") java110-interface/src/main/java/com/java110/intf/common/INotifyChargeV1InnerServiceSMO.java
@@ -16,11 +16,9 @@ package com.java110.intf.common; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.chargeMachineOrder.NotifyChargeOrderDto; import com.java110.dto.meterWater.NotifyMeterWaterOrderDto; import com.java110.dto.chargeMachine.NotifyChargeOrderDto; import com.java110.vo.ResultVo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; java110-interface/src/main/java/com/java110/intf/community/ICommunitySettingKeyV1InnerServiceSMO.java
@@ -16,7 +16,7 @@ package com.java110.intf.community; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.communitySettingKey.CommunitySettingKeyDto; import com.java110.dto.communitySetting.CommunitySettingKeyDto; import com.java110.po.communitySettingKey.CommunitySettingKeyPo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; java110-interface/src/main/java/com/java110/intf/community/ICommunitySpaceConfirmOrderV1InnerServiceSMO.java
@@ -16,7 +16,7 @@ package com.java110.intf.community; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.communitySpaceConfirmOrder.CommunitySpaceConfirmOrderDto; import com.java110.dto.communitySpace.CommunitySpaceConfirmOrderDto; import com.java110.po.communitySpaceConfirmOrder.CommunitySpaceConfirmOrderPo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; java110-interface/src/main/java/com/java110/intf/community/ICommunitySpaceOpenTimeV1InnerServiceSMO.java
@@ -16,7 +16,7 @@ package com.java110.intf.community; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.communitySpaceOpenTime.CommunitySpaceOpenTimeDto; import com.java110.dto.communitySpace.CommunitySpaceOpenTimeDto; import com.java110.po.communitySpaceOpenTime.CommunitySpaceOpenTimePo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; java110-interface/src/main/java/com/java110/intf/community/ICommunitySpacePersonTimeV1InnerServiceSMO.java
@@ -16,7 +16,7 @@ package com.java110.intf.community; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.communitySpacePersonTime.CommunitySpacePersonTimeDto; import com.java110.dto.communitySpace.CommunitySpacePersonTimeDto; import com.java110.po.communitySpacePersonTime.CommunitySpacePersonTimePo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; java110-interface/src/main/java/com/java110/intf/community/ICommunitySpacePersonV1InnerServiceSMO.java
@@ -16,7 +16,7 @@ package com.java110.intf.community; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.communitySpacePerson.CommunitySpacePersonDto; import com.java110.dto.communitySpace.CommunitySpacePersonDto; import com.java110.po.communitySpacePerson.CommunitySpacePersonPo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; java110-interface/src/main/java/com/java110/intf/community/ICommunityVenueV1InnerServiceSMO.java
@@ -16,7 +16,7 @@ package com.java110.intf.community; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.communityVenue.CommunityVenueDto; import com.java110.dto.communitySpace.CommunityVenueDto; import com.java110.po.communityVenue.CommunityVenuePo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; java110-interface/src/main/java/com/java110/intf/community/IDataPrivilegeUnitV1InnerServiceSMO.java
@@ -17,8 +17,8 @@ import com.java110.config.feign.FeignConfiguration; import com.java110.dto.UnitDto; import com.java110.dto.dataPrivilegeStaff.DataPrivilegeStaffDto; import com.java110.dto.dataPrivilegeUnit.DataPrivilegeUnitDto; import com.java110.dto.data.DataPrivilegeStaffDto; import com.java110.dto.data.DataPrivilegeUnitDto; import com.java110.po.dataPrivilegeUnit.DataPrivilegeUnitPo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; java110-interface/src/main/java/com/java110/intf/community/IDataPrivilegeV1InnerServiceSMO.java
@@ -16,7 +16,7 @@ package com.java110.intf.community; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.dataPrivilege.DataPrivilegeDto; import com.java110.dto.data.DataPrivilegeDto; import com.java110.po.dataPrivilege.DataPrivilegePo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; java110-interface/src/main/java/com/java110/intf/dev/IDictSpecV1InnerServiceSMO.java
@@ -16,7 +16,7 @@ package com.java110.intf.dev; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.dictSpec.DictSpecDto; import com.java110.dto.Dict.DictSpecDto; import com.java110.po.dictSpec.DictSpecPo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; java110-interface/src/main/java/com/java110/intf/fee/IAccountReceiptV1InnerServiceSMO.java
@@ -16,7 +16,7 @@ package com.java110.intf.fee; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.accountReceipt.AccountReceiptDto; import com.java110.dto.account.AccountReceiptDto; import com.java110.po.accountReceipt.AccountReceiptPo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; java110-interface/src/main/java/com/java110/intf/scm/ISupplierV1InnerServiceSMO.java
@@ -16,8 +16,8 @@ package com.java110.intf.scm; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.couponPropertyUser.CouponPropertyUserDto; import com.java110.dto.couponPropertyUser.CouponQrCodeDto; import com.java110.dto.couponPool.CouponPropertyUserDto; import com.java110.dto.couponPool.CouponQrCodeDto; import com.java110.dto.supplier.SupplierDto; import com.java110.po.supplier.SupplierPo; import org.springframework.cloud.openfeign.FeignClient; java110-interface/src/main/java/com/java110/intf/store/IClassesTimeV1InnerServiceSMO.java
@@ -16,7 +16,7 @@ package com.java110.intf.store; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.classesTime.ClassesTimeDto; import com.java110.dto.classes.ClassesTimeDto; import com.java110.po.classesTime.ClassesTimePo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; java110-interface/src/main/java/com/java110/intf/store/IContractAttrInnerServiceSMO.java
@@ -1,7 +1,7 @@ package com.java110.intf.store; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.contractAttr.ContractAttrDto; import com.java110.dto.contract.ContractAttrDto; import com.java110.po.contractAttr.ContractAttrPo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; java110-interface/src/main/java/com/java110/intf/store/IContractChangePlanDetailAttrInnerServiceSMO.java
@@ -1,7 +1,7 @@ package com.java110.intf.store; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.contractChangePlanDetailAttr.ContractChangePlanDetailAttrDto; import com.java110.dto.contract.ContractChangePlanDetailAttrDto; import com.java110.po.contractChangePlanDetailAttr.ContractChangePlanDetailAttrPo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; java110-interface/src/main/java/com/java110/intf/store/IContractChangePlanDetailInnerServiceSMO.java
@@ -1,7 +1,7 @@ package com.java110.intf.store; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.contractChangePlanDetail.ContractChangePlanDetailDto; import com.java110.dto.contract.ContractChangePlanDetailDto; import com.java110.po.contractChangePlanDetail.ContractChangePlanDetailPo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; java110-interface/src/main/java/com/java110/intf/store/IContractChangePlanInnerServiceSMO.java
@@ -1,7 +1,7 @@ package com.java110.intf.store; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.contractChangePlan.ContractChangePlanDto; import com.java110.dto.contract.ContractChangePlanDto; import com.java110.po.contractChangePlan.ContractChangePlanPo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; java110-interface/src/main/java/com/java110/intf/store/IContractChangePlanRoomInnerServiceSMO.java
@@ -1,7 +1,7 @@ package com.java110.intf.store; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.contractChangePlanRoom.ContractChangePlanRoomDto; import com.java110.dto.contract.ContractChangePlanRoomDto; import com.java110.po.contractChangePlanRoom.ContractChangePlanRoomPo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; java110-interface/src/main/java/com/java110/intf/store/IContractCollectionPlanInnerServiceSMO.java
@@ -1,7 +1,7 @@ package com.java110.intf.store; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.contractCollectionPlan.ContractCollectionPlanDto; import com.java110.dto.contract.ContractCollectionPlanDto; import com.java110.po.contractCollectionPlan.ContractCollectionPlanPo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; java110-interface/src/main/java/com/java110/intf/store/IContractFileInnerServiceSMO.java
@@ -1,7 +1,7 @@ package com.java110.intf.store; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.contractFile.ContractFileDto; import com.java110.dto.contract.ContractFileDto; import com.java110.po.contractFile.ContractFilePo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; java110-interface/src/main/java/com/java110/intf/store/IContractPartyaInnerServiceSMO.java
@@ -1,7 +1,7 @@ package com.java110.intf.store; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.contractPartya.ContractPartyaDto; import com.java110.dto.contract.ContractPartyaDto; import com.java110.po.contractPartya.ContractPartyaPo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; java110-interface/src/main/java/com/java110/intf/store/IContractRoomInnerServiceSMO.java
@@ -1,7 +1,7 @@ package com.java110.intf.store; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.contractRoom.ContractRoomDto; import com.java110.dto.contract.ContractRoomDto; import com.java110.po.contractRoom.ContractRoomPo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; java110-interface/src/main/java/com/java110/intf/store/IContractTypeInnerServiceSMO.java
@@ -1,7 +1,7 @@ package com.java110.intf.store; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.contractType.ContractTypeDto; import com.java110.dto.contract.ContractTypeDto; import com.java110.po.contractType.ContractTypePo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; java110-interface/src/main/java/com/java110/intf/store/IContractTypeSpecInnerServiceSMO.java
@@ -1,7 +1,7 @@ package com.java110.intf.store; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.contractTypeSpec.ContractTypeSpecDto; import com.java110.dto.contract.ContractTypeSpecDto; import com.java110.po.contractTypeSpec.ContractTypeSpecPo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; java110-interface/src/main/java/com/java110/intf/store/IContractTypeTemplateInnerServiceSMO.java
@@ -1,7 +1,7 @@ package com.java110.intf.store; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.contractTypeTemplate.ContractTypeTemplateDto; import com.java110.dto.contract.ContractTypeTemplateDto; import com.java110.po.contractTypeTemplate.ContractTypeTemplatePo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; java110-interface/src/main/java/com/java110/intf/user/IDataPrivilegeStaffV1InnerServiceSMO.java
@@ -16,7 +16,7 @@ package com.java110.intf.user; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.dataPrivilegeStaff.DataPrivilegeStaffDto; import com.java110.dto.data.DataPrivilegeStaffDto; import com.java110.dto.user.UserDto; import com.java110.po.dataPrivilegeStaff.DataPrivilegeStaffPo; import org.springframework.cloud.openfeign.FeignClient; java110-interface/src/main/java/com/java110/intf/user/IExamineStaffIntroductionV1InnerServiceSMO.java
@@ -16,7 +16,7 @@ package com.java110.intf.user; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.examineStaffIntroduction.ExamineStaffIntroductionDto; import com.java110.dto.examineProject.ExamineStaffIntroductionDto; import com.java110.po.examineStaffIntroduction.ExamineStaffIntroductionPo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; java110-interface/src/main/java/com/java110/intf/user/IExamineStaffProjectV1InnerServiceSMO.java
@@ -16,7 +16,7 @@ package com.java110.intf.user; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.examineStaffProject.ExamineStaffProjectDto; import com.java110.dto.examineProject.ExamineStaffProjectDto; import com.java110.po.examineStaffProject.ExamineStaffProjectPo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; java110-interface/src/main/java/com/java110/intf/user/IExamineStaffV1InnerServiceSMO.java
@@ -16,7 +16,7 @@ package com.java110.intf.user; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.examineStaff.ExamineStaffDto; import com.java110.dto.examineProject.ExamineStaffDto; import com.java110.po.examineStaff.ExamineStaffPo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; java110-interface/src/main/java/com/java110/intf/user/IExamineStaffValueV1InnerServiceSMO.java
@@ -16,7 +16,7 @@ package com.java110.intf.user; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.examineStaffValue.ExamineStaffValueDto; import com.java110.dto.examineProject.ExamineStaffValueDto; import com.java110.po.examineStaffValue.ExamineStaffValuePo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; service-acct/src/main/java/com/java110/acct/api/AccountApi.java
@@ -4,7 +4,7 @@ import com.java110.acct.bmo.account.IGetAccountBMO; import com.java110.acct.bmo.account.IOwnerPrestoreAccountBMO; import com.java110.dto.account.AccountDto; import com.java110.dto.accountDetail.AccountDetailDto; import com.java110.dto.account.AccountDetailDto; import com.java110.dto.fee.FeeDto; import com.java110.dto.owner.OwnerCarDto; import com.java110.dto.owner.OwnerDto; service-acct/src/main/java/com/java110/acct/api/AccountBondObjApi.java
@@ -5,7 +5,7 @@ import com.java110.acct.bmo.accountBondObj.IGetAccountBondObjBMO; import com.java110.acct.bmo.accountBondObj.ISaveAccountBondObjBMO; import com.java110.acct.bmo.accountBondObj.IUpdateAccountBondObjBMO; import com.java110.dto.accountBondObj.AccountBondObjDto; import com.java110.dto.accountBond.AccountBondObjDto; import com.java110.po.accountBondObj.AccountBondObjPo; import com.java110.utils.util.Assert; import com.java110.utils.util.BeanConvertUtil; service-acct/src/main/java/com/java110/acct/api/AccountBondObjDetailApi.java
@@ -5,7 +5,7 @@ import com.java110.acct.bmo.accountBondObjDetail.IGetAccountBondObjDetailBMO; import com.java110.acct.bmo.accountBondObjDetail.ISaveAccountBondObjDetailBMO; import com.java110.acct.bmo.accountBondObjDetail.IUpdateAccountBondObjDetailBMO; import com.java110.dto.accountBondObjDetail.AccountBondObjDetailDto; import com.java110.dto.accountBond.AccountBondObjDetailDto; import com.java110.po.accountBondObjDetail.AccountBondObjDetailPo; import com.java110.utils.util.Assert; import com.java110.utils.util.BeanConvertUtil; service-acct/src/main/java/com/java110/acct/bmo/account/IGetAccountBMO.java
@@ -1,8 +1,7 @@ package com.java110.acct.bmo.account; import com.java110.dto.account.AccountDto; import com.java110.dto.accountDetail.AccountDetailDto; import com.java110.dto.account.AccountDetailDto; import com.java110.dto.owner.OwnerDto; import com.java110.dto.shopVipAccount.ShopVipAccountDto; import org.springframework.http.ResponseEntity; public interface IGetAccountBMO { service-acct/src/main/java/com/java110/acct/bmo/account/IOwnerPrestoreAccountBMO.java
@@ -1,8 +1,5 @@ package com.java110.acct.bmo.account; import com.alibaba.fastjson.JSONObject; import com.java110.dto.account.AccountDto; import com.java110.dto.accountDetail.AccountDetailDto; import com.java110.dto.owner.OwnerDto; import com.java110.po.accountDetail.AccountDetailPo; import org.springframework.http.ResponseEntity; service-acct/src/main/java/com/java110/acct/bmo/account/impl/GetAccountBMOImpl.java
@@ -4,7 +4,7 @@ import com.java110.core.factory.CommunitySettingFactory; import com.java110.core.factory.GenerateCodeFactory; import com.java110.dto.account.AccountDto; import com.java110.dto.accountDetail.AccountDetailDto; import com.java110.dto.account.AccountDetailDto; import com.java110.dto.owner.OwnerDto; import com.java110.dto.user.UserDto; import com.java110.intf.acct.IAccountDetailInnerServiceSMO; @@ -13,7 +13,6 @@ import com.java110.intf.user.IUserInnerServiceSMO; import com.java110.po.account.AccountPo; import com.java110.utils.lock.DistributedLock; import com.java110.utils.util.Assert; import com.java110.utils.util.StringUtil; import com.java110.vo.ResultVo; import org.springframework.beans.factory.annotation.Autowired; service-acct/src/main/java/com/java110/acct/bmo/account/impl/OwnerPrestoreAccountBMOImpl.java
@@ -5,7 +5,7 @@ import com.java110.core.annotation.Java110Transactional; import com.java110.core.factory.GenerateCodeFactory; import com.java110.dto.account.AccountDto; import com.java110.dto.accountDetail.AccountDetailDto; import com.java110.dto.account.AccountDetailDto; import com.java110.dto.owner.OwnerDto; import com.java110.intf.acct.IAccountDetailInnerServiceSMO; import com.java110.intf.acct.IAccountInnerServiceSMO; service-acct/src/main/java/com/java110/acct/bmo/accountBondObj/IGetAccountBondObjBMO.java
@@ -1,5 +1,5 @@ package com.java110.acct.bmo.accountBondObj; import com.java110.dto.accountBondObj.AccountBondObjDto; import com.java110.dto.accountBond.AccountBondObjDto; import org.springframework.http.ResponseEntity; public interface IGetAccountBondObjBMO { service-acct/src/main/java/com/java110/acct/bmo/accountBondObj/impl/GetAccountBondObjBMOImpl.java
@@ -7,7 +7,7 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; import com.java110.dto.accountBondObj.AccountBondObjDto; import com.java110.dto.accountBond.AccountBondObjDto; import java.util.ArrayList; import java.util.List; service-acct/src/main/java/com/java110/acct/bmo/accountBondObjDetail/IGetAccountBondObjDetailBMO.java
@@ -1,5 +1,5 @@ package com.java110.acct.bmo.accountBondObjDetail; import com.java110.dto.accountBondObjDetail.AccountBondObjDetailDto; import com.java110.dto.accountBond.AccountBondObjDetailDto; import org.springframework.http.ResponseEntity; public interface IGetAccountBondObjDetailBMO { service-acct/src/main/java/com/java110/acct/bmo/accountBondObjDetail/impl/GetAccountBondObjDetailBMOImpl.java
@@ -7,7 +7,7 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; import com.java110.dto.accountBondObjDetail.AccountBondObjDetailDto; import com.java110.dto.accountBond.AccountBondObjDetailDto; import java.util.ArrayList; import java.util.List; service-acct/src/main/java/com/java110/acct/bmo/accountWithdrawalApply/impl/SaveAccountWithdrawalApplyBMOImpl.java
@@ -5,7 +5,6 @@ import com.java110.core.annotation.Java110Transactional; import com.java110.core.factory.GenerateCodeFactory; import com.java110.dto.accountDetail.AccountDetailDto; import com.java110.dto.user.UserDto; import com.java110.intf.acct.IAccountInnerServiceSMO; import com.java110.intf.acct.IAccountWithdrawalApplyInnerServiceSMO; service-acct/src/main/java/com/java110/acct/cmd/account/CancelAccountDetailCmd.java
@@ -6,7 +6,7 @@ import com.java110.core.context.ICmdDataFlowContext; import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; import com.java110.dto.accountDetail.AccountDetailDto; import com.java110.dto.account.AccountDetailDto; import com.java110.intf.acct.IAccountDetailInnerServiceSMO; import com.java110.intf.acct.IAccountInnerServiceSMO; import com.java110.po.accountDetail.AccountDetailPo; service-acct/src/main/java/com/java110/acct/cmd/coupon/ComputePayFeeCouponCmd.java
@@ -7,8 +7,8 @@ import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; import com.java110.doc.annotation.*; import com.java110.dto.couponRuleCpps.CouponRuleCppsDto; import com.java110.dto.couponRuleFee.CouponRuleFeeDto; import com.java110.dto.couponPool.CouponRuleCppsDto; import com.java110.dto.couponPool.CouponRuleFeeDto; import com.java110.dto.fee.FeeDto; import com.java110.intf.acct.ICouponRuleCppsV1InnerServiceSMO; import com.java110.intf.acct.ICouponRuleFeeV1InnerServiceSMO; service-acct/src/main/java/com/java110/acct/cmd/couponProperty/CouponPropertyUserGiftCarCmd.java
@@ -8,9 +8,8 @@ import com.java110.core.event.cmd.CmdEvent; import com.java110.core.factory.GenerateCodeFactory; import com.java110.doc.annotation.*; import com.java110.dto.couponPropertyPoolConfig.CouponPropertyPoolConfigDto; import com.java110.dto.couponPropertyUser.CouponPropertyUserDto; import com.java110.dto.couponPropertyUserDetail.CouponPropertyUserDetailDto; import com.java110.dto.couponPool.CouponPropertyPoolConfigDto; import com.java110.dto.couponPool.CouponPropertyUserDto; import com.java110.dto.parkingCouponCar.ParkingCouponCarDto; import com.java110.dto.user.UserDto; import com.java110.intf.acct.*; service-acct/src/main/java/com/java110/acct/cmd/couponProperty/DeleteCouponPropertyPoolDetailCmd.java
@@ -21,11 +21,9 @@ import com.java110.core.context.ICmdDataFlowContext; import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; import com.java110.core.factory.GenerateCodeFactory; import com.java110.dto.couponPropertyPool.CouponPropertyPoolDto; import com.java110.dto.couponPropertyPoolConfig.CouponPropertyPoolConfigDto; import com.java110.dto.couponPropertyPoolDetail.CouponPropertyPoolDetailDto; import com.java110.dto.couponPropertyUser.CouponPropertyUserDto; import com.java110.dto.couponPool.CouponPropertyPoolDto; import com.java110.dto.couponPool.CouponPropertyPoolDetailDto; import com.java110.dto.couponPool.CouponPropertyUserDto; import com.java110.intf.acct.ICouponPropertyPoolDetailV1InnerServiceSMO; import com.java110.intf.acct.ICouponPropertyPoolV1InnerServiceSMO; import com.java110.intf.acct.ICouponPropertyUserV1InnerServiceSMO; @@ -35,8 +33,6 @@ import com.java110.utils.exception.CmdException; import com.java110.utils.lock.DistributedLock; import com.java110.utils.util.Assert; import com.java110.utils.util.BeanConvertUtil; import com.java110.utils.util.DateUtil; import com.java110.vo.ResultVo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; service-acct/src/main/java/com/java110/acct/cmd/couponProperty/GeneratorCouponQrcodeCmd.java
@@ -7,8 +7,8 @@ import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; import com.java110.doc.annotation.*; import com.java110.dto.couponPropertyUser.CouponPropertyUserDto; import com.java110.dto.couponPropertyUser.CouponQrCodeDto; import com.java110.dto.couponPool.CouponPropertyUserDto; import com.java110.dto.couponPool.CouponQrCodeDto; import com.java110.dto.user.UserDto; import com.java110.intf.acct.ICouponPropertyUserV1InnerServiceSMO; import com.java110.intf.user.IUserV1InnerServiceSMO; @@ -17,7 +17,6 @@ import com.java110.utils.util.Assert; import com.java110.vo.ResultVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import java.text.ParseException; import java.util.List; service-acct/src/main/java/com/java110/acct/cmd/couponProperty/GiftCouponPropertyCmd.java
@@ -8,10 +8,9 @@ import com.java110.core.event.cmd.CmdEvent; import com.java110.core.factory.GenerateCodeFactory; import com.java110.doc.annotation.*; import com.java110.dto.couponPropertyPool.CouponPropertyPoolDto; import com.java110.dto.couponPropertyPoolConfig.CouponPropertyPoolConfigDto; import com.java110.dto.couponPropertyUser.CouponPropertyUserDto; import com.java110.dto.fee.FeeAttrDto; import com.java110.dto.couponPool.CouponPropertyPoolDto; import com.java110.dto.couponPool.CouponPropertyPoolConfigDto; import com.java110.dto.couponPool.CouponPropertyUserDto; import com.java110.dto.owner.OwnerDto; import com.java110.intf.acct.ICouponPropertyPoolConfigV1InnerServiceSMO; import com.java110.intf.acct.ICouponPropertyPoolDetailV1InnerServiceSMO; service-acct/src/main/java/com/java110/acct/cmd/couponProperty/ListCouponPropertyPoolCmd.java
@@ -20,14 +20,14 @@ import com.java110.core.context.ICmdDataFlowContext; import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; import com.java110.dto.couponPropertyPoolConfig.CouponPropertyPoolConfigDto; import com.java110.dto.couponPool.CouponPropertyPoolConfigDto; import com.java110.intf.acct.ICouponPropertyPoolConfigV1InnerServiceSMO; import com.java110.intf.acct.ICouponPropertyPoolV1InnerServiceSMO; import com.java110.utils.exception.CmdException; import com.java110.utils.util.BeanConvertUtil; import com.java110.vo.ResultVo; import org.springframework.beans.factory.annotation.Autowired; import com.java110.dto.couponPropertyPool.CouponPropertyPoolDto; import com.java110.dto.couponPool.CouponPropertyPoolDto; import java.util.List; import java.util.ArrayList; import org.springframework.http.ResponseEntity; service-acct/src/main/java/com/java110/acct/cmd/couponProperty/ListCouponPropertyPoolConfigCmd.java
@@ -25,7 +25,7 @@ import com.java110.utils.util.BeanConvertUtil; import com.java110.vo.ResultVo; import org.springframework.beans.factory.annotation.Autowired; import com.java110.dto.couponPropertyPoolConfig.CouponPropertyPoolConfigDto; import com.java110.dto.couponPool.CouponPropertyPoolConfigDto; import java.util.List; import java.util.ArrayList; import org.springframework.http.ResponseEntity; service-acct/src/main/java/com/java110/acct/cmd/couponProperty/ListCouponPropertyPoolDetailCmd.java
@@ -25,7 +25,7 @@ import com.java110.utils.util.BeanConvertUtil; import com.java110.vo.ResultVo; import org.springframework.beans.factory.annotation.Autowired; import com.java110.dto.couponPropertyPoolDetail.CouponPropertyPoolDetailDto; import com.java110.dto.couponPool.CouponPropertyPoolDetailDto; import java.util.List; import java.util.ArrayList; import org.springframework.http.ResponseEntity; service-acct/src/main/java/com/java110/acct/cmd/couponProperty/ListCouponPropertyUserCmd.java
@@ -25,7 +25,7 @@ import com.java110.utils.util.BeanConvertUtil; import com.java110.vo.ResultVo; import org.springframework.beans.factory.annotation.Autowired; import com.java110.dto.couponPropertyUser.CouponPropertyUserDto; import com.java110.dto.couponPool.CouponPropertyUserDto; import java.util.List; import java.util.ArrayList; import org.springframework.http.ResponseEntity; service-acct/src/main/java/com/java110/acct/cmd/couponProperty/ListCouponPropertyUserDetailCmd.java
@@ -25,7 +25,7 @@ import com.java110.utils.util.BeanConvertUtil; import com.java110.vo.ResultVo; import org.springframework.beans.factory.annotation.Autowired; import com.java110.dto.couponPropertyUserDetail.CouponPropertyUserDetailDto; import com.java110.dto.couponPool.CouponPropertyUserDetailDto; import java.util.List; import java.util.ArrayList; import org.springframework.http.ResponseEntity; service-acct/src/main/java/com/java110/acct/cmd/couponProperty/SaveCouponPropertyPoolCmd.java
@@ -24,7 +24,7 @@ import com.java110.core.event.cmd.CmdEvent; import com.java110.core.factory.GenerateCodeFactory; import com.java110.dto.community.CommunityDto; import com.java110.dto.couponPropertyPool.CouponPropertyPoolDto; import com.java110.dto.couponPool.CouponPropertyPoolDto; import com.java110.intf.acct.ICouponPropertyPoolConfigV1InnerServiceSMO; import com.java110.intf.acct.ICouponPropertyPoolV1InnerServiceSMO; import com.java110.intf.community.ICommunityV1InnerServiceSMO; service-acct/src/main/java/com/java110/acct/cmd/couponProperty/WriteOffCouponPropertyUserCmd.java
@@ -8,8 +8,8 @@ import com.java110.core.event.cmd.CmdEvent; import com.java110.core.factory.GenerateCodeFactory; import com.java110.doc.annotation.*; import com.java110.dto.couponPropertyUser.CouponPropertyUserDto; import com.java110.dto.couponPropertyUserDetail.CouponPropertyUserDetailDto; import com.java110.dto.couponPool.CouponPropertyUserDto; import com.java110.dto.couponPool.CouponPropertyUserDetailDto; import com.java110.dto.user.UserDto; import com.java110.intf.acct.ICouponPropertyUserDetailV1InnerServiceSMO; import com.java110.intf.acct.ICouponPropertyUserV1InnerServiceSMO; service-acct/src/main/java/com/java110/acct/cmd/couponRule/ListCouponRuleCmd.java
@@ -17,19 +17,16 @@ import com.alibaba.fastjson.JSONObject; import com.java110.core.annotation.Java110Cmd; import com.java110.core.annotation.Java110Transactional; import com.java110.core.context.ICmdDataFlowContext; import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; import com.java110.core.factory.GenerateCodeFactory; import com.java110.intf.acct.ICouponRuleV1InnerServiceSMO; import com.java110.po.couponRule.CouponRulePo; import com.java110.utils.exception.CmdException; import com.java110.utils.util.Assert; import com.java110.utils.util.BeanConvertUtil; import com.java110.vo.ResultVo; import org.springframework.beans.factory.annotation.Autowired; import com.java110.dto.couponRule.CouponRuleDto; import com.java110.dto.couponPool.CouponRuleDto; import java.util.List; import java.util.ArrayList; import org.springframework.http.ResponseEntity; service-acct/src/main/java/com/java110/acct/cmd/couponRule/ListCouponRuleCppsCmd.java
@@ -17,19 +17,15 @@ import com.alibaba.fastjson.JSONObject; import com.java110.core.annotation.Java110Cmd; import com.java110.core.annotation.Java110Transactional; import com.java110.core.context.ICmdDataFlowContext; import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; import com.java110.core.factory.GenerateCodeFactory; import com.java110.intf.acct.ICouponRuleCppsV1InnerServiceSMO; import com.java110.po.couponRuleCpps.CouponRuleCppsPo; import com.java110.utils.exception.CmdException; import com.java110.utils.util.Assert; import com.java110.utils.util.BeanConvertUtil; import com.java110.vo.ResultVo; import org.springframework.beans.factory.annotation.Autowired; import com.java110.dto.couponRuleCpps.CouponRuleCppsDto; import com.java110.dto.couponPool.CouponRuleCppsDto; import java.util.List; import java.util.ArrayList; import org.springframework.http.ResponseEntity; service-acct/src/main/java/com/java110/acct/cmd/couponRule/ListCouponRuleFeeCmd.java
@@ -17,19 +17,15 @@ import com.alibaba.fastjson.JSONObject; import com.java110.core.annotation.Java110Cmd; import com.java110.core.annotation.Java110Transactional; import com.java110.core.context.ICmdDataFlowContext; import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; import com.java110.core.factory.GenerateCodeFactory; import com.java110.intf.acct.ICouponRuleFeeV1InnerServiceSMO; import com.java110.po.couponRuleFee.CouponRuleFeePo; import com.java110.utils.exception.CmdException; import com.java110.utils.util.Assert; import com.java110.utils.util.BeanConvertUtil; import com.java110.vo.ResultVo; import org.springframework.beans.factory.annotation.Autowired; import com.java110.dto.couponRuleFee.CouponRuleFeeDto; import com.java110.dto.couponPool.CouponRuleFeeDto; import java.util.List; import java.util.ArrayList; import org.springframework.http.ResponseEntity; service-acct/src/main/java/com/java110/acct/cmd/couponRule/SaveCouponRuleCppsCmd.java
@@ -22,7 +22,7 @@ import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; import com.java110.core.factory.GenerateCodeFactory; import com.java110.dto.couponRuleCpps.CouponRuleCppsDto; import com.java110.dto.couponPool.CouponRuleCppsDto; import com.java110.intf.acct.ICouponRuleCppsV1InnerServiceSMO; import com.java110.po.couponRuleCpps.CouponRuleCppsPo; import com.java110.utils.exception.CmdException; service-acct/src/main/java/com/java110/acct/cmd/couponRule/SaveCouponRuleFeeCmd.java
@@ -22,7 +22,7 @@ import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; import com.java110.core.factory.GenerateCodeFactory; import com.java110.dto.couponRuleFee.CouponRuleFeeDto; import com.java110.dto.couponPool.CouponRuleFeeDto; import com.java110.dto.fee.FeeConfigDto; import com.java110.intf.acct.ICouponRuleFeeV1InnerServiceSMO; import com.java110.intf.fee.IFeeConfigInnerServiceSMO; service-acct/src/main/java/com/java110/acct/cmd/couponShopPool/ListCouponShopPoolCmd.java
@@ -25,7 +25,7 @@ import com.java110.utils.util.BeanConvertUtil; import com.java110.vo.ResultVo; import org.springframework.beans.factory.annotation.Autowired; import com.java110.dto.couponShopPool.CouponShopPoolDto; import com.java110.dto.couponPool.CouponShopPoolDto; import java.util.List; import java.util.ArrayList; service-acct/src/main/java/com/java110/acct/cmd/couponShopPoolDetail/ListCouponShopPoolDetailCmd.java
@@ -25,7 +25,7 @@ import com.java110.utils.util.BeanConvertUtil; import com.java110.vo.ResultVo; import org.springframework.beans.factory.annotation.Autowired; import com.java110.dto.couponShopPoolDetail.CouponShopPoolDetailDto; import com.java110.dto.couponPool.CouponShopPoolDetailDto; import java.util.List; import java.util.ArrayList; service-acct/src/main/java/com/java110/acct/cmd/couponUser/ListCouponUserCmd.java
@@ -22,7 +22,7 @@ import com.java110.core.event.cmd.CmdEvent; import com.java110.core.log.LoggerFactory; import com.java110.dto.CommunityMemberDto; import com.java110.dto.couponUser.CouponUserDto; import com.java110.dto.couponPool.CouponUserDto; import com.java110.dto.owner.OwnerDto; import com.java110.intf.acct.ICouponUserV1InnerServiceSMO; import com.java110.intf.community.ICommunityMemberV1InnerServiceSMO; service-acct/src/main/java/com/java110/acct/cmd/couponUserDetail/ListCouponUserDetailCmd.java
@@ -25,7 +25,7 @@ import com.java110.utils.util.BeanConvertUtil; import com.java110.vo.ResultVo; import org.springframework.beans.factory.annotation.Autowired; import com.java110.dto.couponUserDetail.CouponUserDetailDto; import com.java110.dto.couponPool.CouponUserDetailDto; import java.util.List; import java.util.ArrayList; service-acct/src/main/java/com/java110/acct/cmd/integral/ComputePayFeeIntegralCmd.java
@@ -1,21 +1,15 @@ package com.java110.acct.cmd.integral; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.java110.acct.smo.impl.IntegralRuleConfigV1InnerServiceSMOImpl; import com.java110.core.annotation.Java110Cmd; import com.java110.core.context.ICmdDataFlowContext; import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; import com.java110.core.smo.IComputeFeeSMO; import com.java110.doc.annotation.*; import com.java110.dto.couponRuleCpps.CouponRuleCppsDto; import com.java110.dto.couponRuleFee.CouponRuleFeeDto; import com.java110.dto.fee.FeeDto; import com.java110.dto.integralRuleConfig.IntegralRuleConfigDto; import com.java110.dto.integralRuleFee.IntegralRuleFeeDto; import com.java110.intf.acct.ICouponRuleCppsV1InnerServiceSMO; import com.java110.intf.acct.ICouponRuleFeeV1InnerServiceSMO; import com.java110.intf.acct.IIntegralRuleConfigV1InnerServiceSMO; import com.java110.intf.acct.IIntegralRuleFeeV1InnerServiceSMO; import com.java110.intf.fee.IFeeInnerServiceSMO; @@ -25,7 +19,6 @@ import com.java110.vo.ResultVo; import org.springframework.beans.factory.annotation.Autowired; import java.math.BigDecimal; import java.text.ParseException; import java.util.ArrayList; import java.util.List; service-acct/src/main/java/com/java110/acct/cmd/integral/CustomSendIntegralCmd.java
@@ -169,7 +169,7 @@ reqJson.put("objId", "-1"); return userDtos.get(0).getName(); } return ""; throw new CmdException("业主不存在"); } private void doGiftIntegral(AccountDto accountDto, JSONObject reqJson) { service-acct/src/main/java/com/java110/acct/cmd/integral/SaveIntegralConfigCmd.java
@@ -22,8 +22,6 @@ import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; import com.java110.core.factory.GenerateCodeFactory; import com.java110.dto.couponRuleCpps.CouponRuleCppsDto; import com.java110.dto.integralRuleConfig.IntegralRuleConfigDto; import com.java110.intf.acct.IIntegralConfigV1InnerServiceSMO; import com.java110.po.integralConfig.IntegralConfigPo; import com.java110.utils.exception.CmdException; service-acct/src/main/java/com/java110/acct/cmd/integral/SaveIntegralRuleFeeCmd.java
@@ -22,7 +22,6 @@ import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; import com.java110.core.factory.GenerateCodeFactory; import com.java110.dto.couponRuleFee.CouponRuleFeeDto; import com.java110.dto.fee.FeeConfigDto; import com.java110.dto.integralRuleFee.IntegralRuleFeeDto; import com.java110.intf.acct.IIntegralRuleFeeV1InnerServiceSMO; service-acct/src/main/java/com/java110/acct/coupon/AbstractCouponAdapt.java
@@ -1,7 +1,7 @@ package com.java110.acct.coupon; import com.java110.dto.couponPropertyUser.CouponPropertyUserDto; import com.java110.dto.couponPropertyUser.CouponQrCodeDto; import com.java110.dto.couponPool.CouponPropertyUserDto; import com.java110.dto.couponPool.CouponQrCodeDto; public abstract class AbstractCouponAdapt implements ICouponAdapt{ service-acct/src/main/java/com/java110/acct/coupon/ICouponAdapt.java
@@ -1,7 +1,7 @@ package com.java110.acct.coupon; import com.java110.dto.couponPropertyUser.CouponPropertyUserDto; import com.java110.dto.couponPropertyUser.CouponQrCodeDto; import com.java110.dto.couponPool.CouponPropertyUserDto; import com.java110.dto.couponPool.CouponQrCodeDto; public interface ICouponAdapt { service-acct/src/main/java/com/java110/acct/coupon/goods/GoodsCouponAdapt.java
@@ -3,9 +3,9 @@ import com.java110.acct.coupon.AbstractCouponAdapt; import com.java110.acct.coupon.ICouponAdapt; import com.java110.core.factory.GenerateCodeFactory; import com.java110.dto.couponPropertyPool.CouponPropertyPoolDto; import com.java110.dto.couponPropertyUser.CouponPropertyUserDto; import com.java110.dto.couponPropertyUser.CouponQrCodeDto; import com.java110.dto.couponPool.CouponPropertyPoolDto; import com.java110.dto.couponPool.CouponPropertyUserDto; import com.java110.dto.couponPool.CouponQrCodeDto; import com.java110.intf.acct.ICouponPropertyPoolV1InnerServiceSMO; import com.java110.utils.cache.CommonCache; import com.java110.utils.util.Assert; service-acct/src/main/java/com/java110/acct/coupon/goods/ThridGoodsCouponAdapt.java
@@ -2,20 +2,12 @@ import com.java110.acct.coupon.AbstractCouponAdapt; import com.java110.acct.coupon.ICouponAdapt; import com.java110.dto.couponPropertyPool.CouponPropertyPoolDto; import com.java110.dto.couponPropertyUser.CouponPropertyUserDto; import com.java110.dto.couponPropertyUser.CouponQrCodeDto; import com.java110.dto.supplier.SupplierDto; import com.java110.dto.supplierCoupon.SupplierCouponDto; import com.java110.intf.acct.ICouponPropertyPoolV1InnerServiceSMO; import com.java110.intf.acct.ISupplierCouponV1InnerServiceSMO; import com.java110.dto.couponPool.CouponPropertyUserDto; import com.java110.dto.couponPool.CouponQrCodeDto; import com.java110.intf.scm.ISupplierV1InnerServiceSMO; import com.java110.utils.util.Assert; import com.java110.utils.util.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.util.List; @Component(ICouponAdapt.COUPON_PRE + "1001") public class ThridGoodsCouponAdapt extends AbstractCouponAdapt { service-acct/src/main/java/com/java110/acct/listener/accountDetail/SaveAccountDetailInfoListener.java
@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.java110.acct.dao.IAccountServiceDao; import com.java110.dto.account.AccountDto; import com.java110.dto.accountDetail.AccountDetailDto; import com.java110.dto.account.AccountDetailDto; import com.java110.po.account.AccountPo; import com.java110.po.accountDetail.AccountDetailPo; import com.java110.utils.constant.BusinessTypeConstant; service-acct/src/main/java/com/java110/acct/payment/business/account/PreStoreOnlinePaymentBusiness.java
@@ -1,33 +1,21 @@ package com.java110.acct.payment.business.account; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.java110.acct.payment.IPaymentBusiness; import com.java110.core.context.ICmdDataFlowContext; import com.java110.core.factory.GenerateCodeFactory; import com.java110.doc.annotation.*; import com.java110.dto.account.AccountDto; import com.java110.dto.accountDetail.AccountDetailDto; import com.java110.dto.communitySpace.CommunitySpaceDto; import com.java110.dto.communitySpacePerson.CommunitySpacePersonDto; import com.java110.dto.communitySpacePersonTime.CommunitySpacePersonTimeDto; import com.java110.dto.payment.PaymentOrderDto; import com.java110.intf.acct.IAccountInnerServiceSMO; import com.java110.intf.community.ICommunitySpacePersonTimeV1InnerServiceSMO; import com.java110.intf.community.ICommunitySpacePersonV1InnerServiceSMO; import com.java110.intf.community.ICommunitySpaceV1InnerServiceSMO; import com.java110.po.accountDetail.AccountDetailPo; import com.java110.po.communitySpacePerson.CommunitySpacePersonPo; import com.java110.po.communitySpacePersonTime.CommunitySpacePersonTimePo; import com.java110.utils.exception.CmdException; import com.java110.utils.util.Assert; import com.java110.utils.util.BeanConvertUtil; import com.java110.utils.util.StringUtil; import com.java110.vo.ResultVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.math.BigDecimal; import java.util.List; service-acct/src/main/java/com/java110/acct/payment/business/oweFee/OweFeePaymentBusiness.java
@@ -10,26 +10,16 @@ import com.java110.core.log.LoggerFactory; import com.java110.core.smo.IComputeFeeSMO; import com.java110.dto.community.CommunityDto; import com.java110.dto.communitySpace.CommunitySpaceDto; import com.java110.dto.communitySpacePerson.CommunitySpacePersonDto; import com.java110.dto.fee.FeeAttrDto; import com.java110.dto.fee.FeeDto; import com.java110.dto.payment.PaymentOrderDto; import com.java110.intf.community.ICommunitySpacePersonTimeV1InnerServiceSMO; import com.java110.intf.community.ICommunitySpacePersonV1InnerServiceSMO; import com.java110.intf.community.ICommunitySpaceV1InnerServiceSMO; import com.java110.intf.community.ICommunityV1InnerServiceSMO; import com.java110.intf.fee.IFeeInnerServiceSMO; import com.java110.po.communitySpacePerson.CommunitySpacePersonPo; import com.java110.po.communitySpacePersonTime.CommunitySpacePersonTimePo; import com.java110.utils.cache.CommonCache; import com.java110.utils.cache.MappingCache; import com.java110.utils.exception.CmdException; import com.java110.utils.util.Assert; import com.java110.utils.util.BeanConvertUtil; import com.java110.utils.util.DateUtil; import com.java110.utils.util.StringUtil; import com.java110.vo.ResultVo; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; service-acct/src/main/java/com/java110/acct/payment/business/reserve/ReserveGoodsPaymentBusiness.java
@@ -6,7 +6,7 @@ import com.java110.core.context.ICmdDataFlowContext; import com.java110.core.factory.GenerateCodeFactory; import com.java110.doc.annotation.*; import com.java110.dto.communitySpacePersonTime.CommunitySpacePersonTimeDto; import com.java110.dto.communitySpace.CommunitySpacePersonTimeDto; import com.java110.dto.payment.PaymentOrderDto; import com.java110.dto.reserveGoods.ReserveGoodsDto; import com.java110.dto.reserveGoodsOrder.ReserveGoodsOrderDto; service-acct/src/main/java/com/java110/acct/payment/business/venue/VenueReservationPaymentBusiness.java
@@ -7,8 +7,8 @@ import com.java110.core.factory.GenerateCodeFactory; import com.java110.doc.annotation.*; import com.java110.dto.communitySpace.CommunitySpaceDto; import com.java110.dto.communitySpacePerson.CommunitySpacePersonDto; import com.java110.dto.communitySpacePersonTime.CommunitySpacePersonTimeDto; import com.java110.dto.communitySpace.CommunitySpacePersonDto; import com.java110.dto.communitySpace.CommunitySpacePersonTimeDto; import com.java110.dto.payment.PaymentOrderDto; import com.java110.intf.community.ICommunitySpacePersonTimeV1InnerServiceSMO; import com.java110.intf.community.ICommunitySpacePersonV1InnerServiceSMO; service-acct/src/main/java/com/java110/acct/smo/impl/AccountBondObjDetailInnerServiceSMOImpl.java
@@ -2,7 +2,7 @@ import com.java110.acct.dao.IAccountBondObjDetailServiceDao; import com.java110.dto.accountBondObjDetail.AccountBondObjDetailDto; import com.java110.dto.accountBond.AccountBondObjDetailDto; import com.java110.intf.acct.IAccountBondObjDetailInnerServiceSMO; import com.java110.po.accountBondObjDetail.AccountBondObjDetailPo; import com.java110.utils.util.BeanConvertUtil; service-acct/src/main/java/com/java110/acct/smo/impl/AccountBondObjInnerServiceSMOImpl.java
@@ -2,7 +2,7 @@ import com.java110.acct.dao.IAccountBondObjServiceDao; import com.java110.dto.accountBondObj.AccountBondObjDto; import com.java110.dto.accountBond.AccountBondObjDto; import com.java110.intf.acct.IAccountBondObjInnerServiceSMO; import com.java110.po.accountBondObj.AccountBondObjPo; import com.java110.utils.util.BeanConvertUtil; service-acct/src/main/java/com/java110/acct/smo/impl/AccountDetailInnerServiceSMOImpl.java
@@ -5,7 +5,7 @@ import com.java110.core.annotation.Java110Transactional; import com.java110.core.base.smo.BaseServiceSMO; import com.java110.dto.PageDto; import com.java110.dto.accountDetail.AccountDetailDto; import com.java110.dto.account.AccountDetailDto; import com.java110.intf.acct.IAccountDetailInnerServiceSMO; import com.java110.po.accountDetail.AccountDetailPo; import com.java110.utils.util.BeanConvertUtil; service-acct/src/main/java/com/java110/acct/smo/impl/AccountInnerServiceSMOImpl.java
@@ -8,7 +8,7 @@ import com.java110.core.factory.GenerateCodeFactory; import com.java110.dto.PageDto; import com.java110.dto.account.AccountDto; import com.java110.dto.accountDetail.AccountDetailDto; import com.java110.dto.account.AccountDetailDto; import com.java110.dto.user.UserDto; import com.java110.intf.acct.IAccountInnerServiceSMO; import com.java110.po.account.AccountPo; @@ -17,7 +17,6 @@ import com.java110.utils.util.BeanConvertUtil; import com.java110.utils.util.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; service-acct/src/main/java/com/java110/acct/smo/impl/CouponPropertyPoolConfigV1InnerServiceSMOImpl.java
@@ -18,17 +18,15 @@ import com.java110.acct.dao.ICouponPropertyPoolConfigV1ServiceDao; import com.java110.intf.acct.ICouponPropertyPoolConfigV1InnerServiceSMO; import com.java110.dto.couponPropertyPoolConfig.CouponPropertyPoolConfigDto; import com.java110.dto.couponPool.CouponPropertyPoolConfigDto; import com.java110.po.couponPropertyPoolConfig.CouponPropertyPoolConfigPo; import com.java110.utils.util.BeanConvertUtil; import com.java110.core.base.smo.BaseServiceSMO; import com.java110.dto.user.UserDto; import com.java110.dto.PageDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; import java.util.List; /** service-acct/src/main/java/com/java110/acct/smo/impl/CouponPropertyPoolDetailV1InnerServiceSMOImpl.java
@@ -18,17 +18,15 @@ import com.java110.acct.dao.ICouponPropertyPoolDetailV1ServiceDao; import com.java110.intf.acct.ICouponPropertyPoolDetailV1InnerServiceSMO; import com.java110.dto.couponPropertyPoolDetail.CouponPropertyPoolDetailDto; import com.java110.dto.couponPool.CouponPropertyPoolDetailDto; import com.java110.po.couponPropertyPoolDetail.CouponPropertyPoolDetailPo; import com.java110.utils.util.BeanConvertUtil; import com.java110.core.base.smo.BaseServiceSMO; import com.java110.dto.user.UserDto; import com.java110.dto.PageDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; import java.util.List; /** service-acct/src/main/java/com/java110/acct/smo/impl/CouponPropertyPoolV1InnerServiceSMOImpl.java
@@ -18,17 +18,15 @@ import com.java110.acct.dao.ICouponPropertyPoolV1ServiceDao; import com.java110.intf.acct.ICouponPropertyPoolV1InnerServiceSMO; import com.java110.dto.couponPropertyPool.CouponPropertyPoolDto; import com.java110.dto.couponPool.CouponPropertyPoolDto; import com.java110.po.couponPropertyPool.CouponPropertyPoolPo; import com.java110.utils.util.BeanConvertUtil; import com.java110.core.base.smo.BaseServiceSMO; import com.java110.dto.user.UserDto; import com.java110.dto.PageDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; import java.util.List; /** service-acct/src/main/java/com/java110/acct/smo/impl/CouponPropertyUserDetailV1InnerServiceSMOImpl.java
@@ -18,17 +18,15 @@ import com.java110.acct.dao.ICouponPropertyUserDetailV1ServiceDao; import com.java110.intf.acct.ICouponPropertyUserDetailV1InnerServiceSMO; import com.java110.dto.couponPropertyUserDetail.CouponPropertyUserDetailDto; import com.java110.dto.couponPool.CouponPropertyUserDetailDto; import com.java110.po.couponPropertyUserDetail.CouponPropertyUserDetailPo; import com.java110.utils.util.BeanConvertUtil; import com.java110.core.base.smo.BaseServiceSMO; import com.java110.dto.user.UserDto; import com.java110.dto.PageDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; import java.util.List; /** service-acct/src/main/java/com/java110/acct/smo/impl/CouponPropertyUserV1InnerServiceSMOImpl.java
@@ -17,20 +17,17 @@ import com.java110.acct.dao.ICouponPropertyUserV1ServiceDao; import com.java110.dto.couponUser.CouponUserDto; import com.java110.intf.acct.ICouponPropertyUserV1InnerServiceSMO; import com.java110.dto.couponPropertyUser.CouponPropertyUserDto; import com.java110.dto.couponPool.CouponPropertyUserDto; import com.java110.po.couponPropertyUser.CouponPropertyUserPo; import com.java110.utils.util.BeanConvertUtil; import com.java110.core.base.smo.BaseServiceSMO; import com.java110.dto.user.UserDto; import com.java110.dto.PageDto; import com.java110.utils.util.DateUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; import java.util.List; /** service-acct/src/main/java/com/java110/acct/smo/impl/CouponRuleCppsV1InnerServiceSMOImpl.java
@@ -18,17 +18,15 @@ import com.java110.acct.dao.ICouponRuleCppsV1ServiceDao; import com.java110.intf.acct.ICouponRuleCppsV1InnerServiceSMO; import com.java110.dto.couponRuleCpps.CouponRuleCppsDto; import com.java110.dto.couponPool.CouponRuleCppsDto; import com.java110.po.couponRuleCpps.CouponRuleCppsPo; import com.java110.utils.util.BeanConvertUtil; import com.java110.core.base.smo.BaseServiceSMO; import com.java110.dto.user.UserDto; import com.java110.dto.PageDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; import java.util.List; /** service-acct/src/main/java/com/java110/acct/smo/impl/CouponRuleFeeV1InnerServiceSMOImpl.java
@@ -18,17 +18,15 @@ import com.java110.acct.dao.ICouponRuleFeeV1ServiceDao; import com.java110.intf.acct.ICouponRuleFeeV1InnerServiceSMO; import com.java110.dto.couponRuleFee.CouponRuleFeeDto; import com.java110.dto.couponPool.CouponRuleFeeDto; import com.java110.po.couponRuleFee.CouponRuleFeePo; import com.java110.utils.util.BeanConvertUtil; import com.java110.core.base.smo.BaseServiceSMO; import com.java110.dto.user.UserDto; import com.java110.dto.PageDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; import java.util.List; /** service-acct/src/main/java/com/java110/acct/smo/impl/CouponRuleV1InnerServiceSMOImpl.java
@@ -18,17 +18,15 @@ import com.java110.acct.dao.ICouponRuleV1ServiceDao; import com.java110.intf.acct.ICouponRuleV1InnerServiceSMO; import com.java110.dto.couponRule.CouponRuleDto; import com.java110.dto.couponPool.CouponRuleDto; import com.java110.po.couponRule.CouponRulePo; import com.java110.utils.util.BeanConvertUtil; import com.java110.core.base.smo.BaseServiceSMO; import com.java110.dto.user.UserDto; import com.java110.dto.PageDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; import java.util.List; /** service-acct/src/main/java/com/java110/acct/smo/impl/CouponShopPoolDetailV1InnerServiceSMOImpl.java
@@ -18,17 +18,15 @@ import com.java110.acct.dao.ICouponShopPoolDetailV1ServiceDao; import com.java110.intf.acct.ICouponShopPoolDetailV1InnerServiceSMO; import com.java110.dto.couponShopPoolDetail.CouponShopPoolDetailDto; import com.java110.dto.couponPool.CouponShopPoolDetailDto; import com.java110.po.couponShopPoolDetail.CouponShopPoolDetailPo; import com.java110.utils.util.BeanConvertUtil; import com.java110.core.base.smo.BaseServiceSMO; import com.java110.dto.user.UserDto; import com.java110.dto.PageDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; import java.util.List; /** service-acct/src/main/java/com/java110/acct/smo/impl/CouponShopPoolV1InnerServiceSMOImpl.java
@@ -18,17 +18,15 @@ import com.java110.acct.dao.ICouponShopPoolV1ServiceDao; import com.java110.intf.acct.ICouponShopPoolV1InnerServiceSMO; import com.java110.dto.couponShopPool.CouponShopPoolDto; import com.java110.dto.couponPool.CouponShopPoolDto; import com.java110.po.couponShopPool.CouponShopPoolPo; import com.java110.utils.util.BeanConvertUtil; import com.java110.core.base.smo.BaseServiceSMO; import com.java110.dto.user.UserDto; import com.java110.dto.PageDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; import java.util.List; /** service-acct/src/main/java/com/java110/acct/smo/impl/CouponUserDetailV1InnerServiceSMOImpl.java
@@ -18,17 +18,15 @@ import com.java110.acct.dao.ICouponUserDetailV1ServiceDao; import com.java110.intf.acct.ICouponUserDetailV1InnerServiceSMO; import com.java110.dto.couponUserDetail.CouponUserDetailDto; import com.java110.dto.couponPool.CouponUserDetailDto; import com.java110.po.couponUserDetail.CouponUserDetailPo; import com.java110.utils.util.BeanConvertUtil; import com.java110.core.base.smo.BaseServiceSMO; import com.java110.dto.user.UserDto; import com.java110.dto.PageDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; import java.util.List; /** service-acct/src/main/java/com/java110/acct/smo/impl/CouponUserV1InnerServiceSMOImpl.java
@@ -18,20 +18,16 @@ import com.java110.acct.dao.ICouponUserV1ServiceDao; import com.java110.intf.acct.ICouponUserV1InnerServiceSMO; import com.java110.dto.couponUser.CouponUserDto; import com.java110.dto.couponPool.CouponUserDto; import com.java110.po.couponUser.CouponUserPo; import com.java110.utils.util.BeanConvertUtil; import com.java110.core.base.smo.BaseServiceSMO; import com.java110.dto.user.UserDto; import com.java110.dto.PageDto; import com.java110.utils.util.DateUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import java.math.BigDecimal; import java.text.ParseException; import java.util.ArrayList; import java.util.List; /** service-acct/src/main/java/com/java110/acct/smo/impl/ShopVipAccountInnerServiceSMOImpl.java
@@ -7,12 +7,9 @@ import com.java110.core.base.smo.BaseServiceSMO; import com.java110.core.factory.GenerateCodeFactory; import com.java110.dto.PageDto; import com.java110.dto.account.AccountDto; import com.java110.dto.accountDetail.AccountDetailDto; import com.java110.dto.account.AccountDetailDto; import com.java110.dto.shopVipAccount.ShopVipAccountDto; import com.java110.intf.acct.IShopVipAccountInnerServiceSMO; import com.java110.po.account.AccountPo; import com.java110.po.accountDetail.AccountDetailPo; import com.java110.po.shopVipAccount.ShopVipAccountPo; import com.java110.po.shopVipAccountDetail.ShopVipAccountDetailPo; import com.java110.utils.lock.DistributedLock; service-api/src/main/java/com/java110/api/bmo/account/impl/AccountDetailBMOImpl.java
@@ -7,20 +7,16 @@ import com.java110.core.context.DataFlowContext; import com.java110.core.factory.GenerateCodeFactory; import com.java110.dto.account.AccountDto; import com.java110.dto.accountDetail.AccountDetailDto; import com.java110.dto.account.AccountDetailDto; import com.java110.intf.acct.IAccountDetailInnerServiceSMO; import com.java110.intf.acct.IAccountInnerServiceSMO; import com.java110.po.account.AccountPo; import com.java110.po.accountDetail.AccountDetailPo; import com.java110.po.fee.PayFeePo; import com.java110.utils.constant.BusinessTypeConstant; import com.java110.utils.constant.CommonConstant; import com.java110.utils.util.Assert; import com.java110.utils.util.BeanConvertUtil; import com.java110.utils.util.StringUtil; import com.java110.vo.ResultVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; import java.math.BigDecimal; service-api/src/main/java/com/java110/api/controller/app/charge/NotifyDingDingChargeController.java
@@ -3,8 +3,7 @@ import com.alibaba.fastjson.JSONObject; import com.java110.core.base.controller.BaseController; import com.java110.core.log.LoggerFactory; import com.java110.dto.chargeMachineOrder.NotifyChargeOrderDto; import com.java110.dto.meterWater.NotifyMeterWaterOrderDto; import com.java110.dto.chargeMachine.NotifyChargeOrderDto; import com.java110.intf.common.INotifyChargeV1InnerServiceSMO; import com.java110.utils.cache.MappingCache; import com.java110.vo.ResultVo; @@ -18,7 +17,6 @@ import javax.crypto.SecretKey; import javax.crypto.spec.SecretKeySpec; import javax.servlet.http.HttpServletRequest; import java.security.NoSuchAlgorithmException; import java.util.Base64; @RestController service-api/src/main/java/com/java110/api/controller/app/charge/NotifyKeHangChargeController.java
@@ -3,7 +3,7 @@ import com.alibaba.fastjson.JSONObject; import com.java110.core.base.controller.BaseController; import com.java110.core.log.LoggerFactory; import com.java110.dto.chargeMachineOrder.NotifyChargeOrderDto; import com.java110.dto.chargeMachine.NotifyChargeOrderDto; import com.java110.intf.common.INotifyChargeV1InnerServiceSMO; import com.java110.vo.ResultVo; import org.slf4j.Logger; service-api/src/main/java/com/java110/api/smo/assetImport/impl/AssetImportSMOImpl.java
@@ -8,7 +8,7 @@ import com.java110.core.smo.ISaveTransactionLogSMO; import com.java110.dto.RoomDto; import com.java110.dto.assetImportLog.AssetImportLogDto; import com.java110.dto.assetImportLogDetail.AssetImportLogDetailDto; import com.java110.dto.assetImportLog.AssetImportLogDetailDto; import com.java110.dto.owner.OwnerDto; import com.java110.entity.assetImport.*; import com.java110.entity.component.ComponentValidateResult; service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportFeeDetailSMOImpl.java
@@ -3,12 +3,11 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.java110.api.smo.DefaultAbstractComponentSMO; import com.java110.core.component.BaseComponentSMO; import com.java110.core.context.IPageData; import com.java110.core.factory.GenerateCodeFactory; import com.java110.core.smo.ISaveTransactionLogSMO; import com.java110.dto.assetImportLog.AssetImportLogDto; import com.java110.dto.assetImportLogDetail.AssetImportLogDetailDto; import com.java110.dto.assetImportLog.AssetImportLogDetailDto; import com.java110.dto.fee.FeeDto; import com.java110.dto.payFeeBatch.PayFeeBatchDto; import com.java110.dto.user.UserDto; @@ -18,7 +17,6 @@ import com.java110.intf.fee.IPayFeeBatchV1InnerServiceSMO; import com.java110.intf.user.IUserInnerServiceSMO; import com.java110.po.payFeeBatch.PayFeeBatchPo; import com.java110.utils.constant.ServiceConstant; import com.java110.utils.util.Assert; import com.java110.utils.util.DateUtil; import com.java110.utils.util.ImportExcelUtils; service-common/src/main/java/com/java110/common/api/AssetImportLogDetailApi.java
@@ -5,7 +5,7 @@ import com.java110.common.bmo.assetImportLogDetail.IGetAssetImportLogDetailBMO; import com.java110.common.bmo.assetImportLogDetail.ISaveAssetImportLogDetailBMO; import com.java110.common.bmo.assetImportLogDetail.IUpdateAssetImportLogDetailBMO; import com.java110.dto.assetImportLogDetail.AssetImportLogDetailDto; import com.java110.dto.assetImportLog.AssetImportLogDetailDto; import com.java110.po.assetImportLogDetail.AssetImportLogDetailPo; import com.java110.utils.util.Assert; import com.java110.utils.util.BeanConvertUtil; service-common/src/main/java/com/java110/common/bmo/assetImportLogDetail/IGetAssetImportLogDetailBMO.java
@@ -1,5 +1,5 @@ package com.java110.common.bmo.assetImportLogDetail; import com.java110.dto.assetImportLogDetail.AssetImportLogDetailDto; import com.java110.dto.assetImportLog.AssetImportLogDetailDto; import org.springframework.http.ResponseEntity; public interface IGetAssetImportLogDetailBMO { service-common/src/main/java/com/java110/common/bmo/assetImportLogDetail/impl/GetAssetImportLogDetailBMOImpl.java
@@ -1,7 +1,7 @@ package com.java110.common.bmo.assetImportLogDetail.impl; import com.java110.common.bmo.assetImportLogDetail.IGetAssetImportLogDetailBMO; import com.java110.dto.assetImportLogDetail.AssetImportLogDetailDto; import com.java110.dto.assetImportLog.AssetImportLogDetailDto; import com.java110.intf.common.IAssetImportLogDetailInnerServiceSMO; import com.java110.vo.ResultVo; import org.springframework.beans.factory.annotation.Autowired; service-common/src/main/java/com/java110/common/charge/ChargeCoreImpl.java
@@ -4,12 +4,12 @@ import com.java110.core.factory.GenerateCodeFactory; import com.java110.dto.account.AccountDto; import com.java110.dto.chargeMachine.ChargeMachineDto; import com.java110.dto.chargeMachineFactory.ChargeMachineFactoryDto; import com.java110.dto.chargeMachineOrder.ChargeMachineOrderDto; import com.java110.dto.chargeMachineOrder.NotifyChargeOrderDto; import com.java110.dto.chargeMachineOrderCoupon.ChargeMachineOrderCouponDto; import com.java110.dto.chargeMachinePort.ChargeMachinePortDto; import com.java110.dto.chargeRuleFee.ChargeRuleFeeDto; import com.java110.dto.chargeMachine.ChargeMachineFactoryDto; import com.java110.dto.chargeMachine.ChargeMachineOrderDto; import com.java110.dto.chargeMachine.NotifyChargeOrderDto; import com.java110.dto.chargeMachine.ChargeMachineOrderCouponDto; import com.java110.dto.chargeMachine.ChargeMachinePortDto; import com.java110.dto.chargeMachine.ChargeRuleFeeDto; import com.java110.intf.acct.IAccountInnerServiceSMO; import com.java110.intf.common.*; import com.java110.po.accountDetail.AccountDetailPo; @@ -24,8 +24,6 @@ import com.java110.utils.util.StringUtil; import com.java110.vo.ResultVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; import java.math.BigDecimal; service-common/src/main/java/com/java110/common/charge/IChargeCore.java
@@ -1,10 +1,9 @@ package com.java110.common.charge; import com.java110.dto.chargeMachine.ChargeMachineDto; import com.java110.dto.chargeMachineOrder.NotifyChargeOrderDto; import com.java110.dto.chargeMachinePort.ChargeMachinePortDto; import com.java110.dto.chargeMachine.NotifyChargeOrderDto; import com.java110.dto.chargeMachine.ChargeMachinePortDto; import com.java110.vo.ResultVo; import org.springframework.http.ResponseEntity; import java.util.List; service-common/src/main/java/com/java110/common/charge/IChargeFactoryAdapt.java
@@ -1,9 +1,9 @@ package com.java110.common.charge; import com.java110.dto.chargeMachine.ChargeMachineDto; import com.java110.dto.chargeMachineOrder.NotifyChargeOrderDto; import com.java110.dto.chargeMachineOrder.NotifyChargePortDto; import com.java110.dto.chargeMachinePort.ChargeMachinePortDto; import com.java110.dto.chargeMachine.NotifyChargeOrderDto; import com.java110.dto.chargeMachine.NotifyChargePortDto; import com.java110.dto.chargeMachine.ChargeMachinePortDto; import com.java110.vo.ResultVo; import java.util.List; service-common/src/main/java/com/java110/common/charge/factory/common/CommonChargeMachineFactoryAdapt.java
@@ -2,15 +2,12 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.java110.common.charge.IChargeFactoryAdapt; import com.java110.common.charge.factory.dingding.DingdingChargeUtils; import com.java110.dto.chargeMachine.ChargeMachineDto; import com.java110.dto.chargeMachineOrder.NotifyChargeOrderDto; import com.java110.dto.chargeMachineOrder.NotifyChargePortDto; import com.java110.dto.chargeMachinePort.ChargeMachinePortDto; import com.java110.dto.chargeMachine.NotifyChargeOrderDto; import com.java110.dto.chargeMachine.NotifyChargePortDto; import com.java110.dto.chargeMachine.ChargeMachinePortDto; import com.java110.vo.ResultVo; import org.springframework.http.HttpMethod; import org.springframework.stereotype.Service; import java.util.ArrayList; service-common/src/main/java/com/java110/common/charge/factory/dingding/DingdingChargeMachineFactoryAdapt.java
@@ -5,19 +5,16 @@ import com.alibaba.fastjson.JSONObject; import com.java110.common.charge.IChargeFactoryAdapt; import com.java110.dto.chargeMachine.ChargeMachineDto; import com.java110.dto.chargeMachineOrder.ChargeMachineOrderDto; import com.java110.dto.chargeMachineOrder.NotifyChargeOrderDto; import com.java110.dto.chargeMachineOrder.NotifyChargePortDto; import com.java110.dto.chargeMachinePort.ChargeMachinePortDto; import com.java110.dto.chargeMachine.NotifyChargeOrderDto; import com.java110.dto.chargeMachine.NotifyChargePortDto; import com.java110.dto.chargeMachine.ChargeMachinePortDto; import com.java110.intf.common.IChargeMachineOrderV1InnerServiceSMO; import com.java110.po.chargeMachineOrder.ChargeMachineOrderPo; import com.java110.utils.util.DateUtil; import com.java110.vo.ResultVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpMethod; import org.springframework.stereotype.Service; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.List; service-common/src/main/java/com/java110/common/charge/factory/kehang/KeHangChargeMachineFactoryAdapt.java
@@ -4,11 +4,10 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.java110.common.charge.IChargeFactoryAdapt; import com.java110.common.charge.factory.dingding.DingdingChargeUtils; import com.java110.dto.chargeMachine.ChargeMachineDto; import com.java110.dto.chargeMachineOrder.NotifyChargeOrderDto; import com.java110.dto.chargeMachineOrder.NotifyChargePortDto; import com.java110.dto.chargeMachinePort.ChargeMachinePortDto; import com.java110.dto.chargeMachine.NotifyChargeOrderDto; import com.java110.dto.chargeMachine.NotifyChargePortDto; import com.java110.dto.chargeMachine.ChargeMachinePortDto; import com.java110.vo.ResultVo; import org.springframework.http.HttpMethod; import org.springframework.stereotype.Service; service-common/src/main/java/com/java110/common/cmd/chargeMachine/ListChargeMachineCmd.java
@@ -18,17 +18,14 @@ import com.alibaba.fastjson.JSONObject; import com.java110.common.charge.IChargeCore; import com.java110.core.annotation.Java110Cmd; import com.java110.core.annotation.Java110Transactional; import com.java110.core.context.ICmdDataFlowContext; import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; import com.java110.core.factory.GenerateCodeFactory; import com.java110.dto.chargeRuleFee.ChargeRuleFeeDto; import com.java110.dto.chargeMachine.ChargeRuleFeeDto; import com.java110.dto.smallWeChat.SmallWeChatDto; import com.java110.intf.common.IChargeMachineV1InnerServiceSMO; import com.java110.intf.common.IChargeRuleFeeV1InnerServiceSMO; import com.java110.intf.store.ISmallWeChatInnerServiceSMO; import com.java110.po.chargeMachine.ChargeMachinePo; import com.java110.utils.cache.UrlCache; import com.java110.utils.exception.CmdException; import com.java110.utils.util.Assert; service-common/src/main/java/com/java110/common/cmd/chargeMachine/ListChargeMachineFactoryCmd.java
@@ -20,18 +20,14 @@ import com.java110.core.context.ICmdDataFlowContext; import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; import com.java110.dto.chargeMachineFactorySpec.ChargeMachineFactorySpecDto; import com.java110.dto.meterMachineFactory.MeterMachineFactoryDto; import com.java110.dto.meterMachineFactorySpec.MeterMachineFactorySpecDto; import com.java110.dto.chargeMachine.ChargeMachineFactorySpecDto; import com.java110.intf.common.IChargeMachineFactorySpecV1InnerServiceSMO; import com.java110.intf.common.IChargeMachineFactoryV1InnerServiceSMO; import com.java110.intf.common.IChargeMachineSpecV1InnerServiceSMO; import com.java110.utils.exception.CmdException; import com.java110.utils.util.Assert; import com.java110.utils.util.BeanConvertUtil; import com.java110.vo.ResultVo; import org.springframework.beans.factory.annotation.Autowired; import com.java110.dto.chargeMachineFactory.ChargeMachineFactoryDto; import com.java110.dto.chargeMachine.ChargeMachineFactoryDto; import java.util.List; import java.util.ArrayList; import org.springframework.http.ResponseEntity; service-common/src/main/java/com/java110/common/cmd/chargeMachine/ListChargeMachineOrderAcctCmd.java
@@ -26,7 +26,7 @@ import com.java110.utils.util.BeanConvertUtil; import com.java110.vo.ResultVo; import org.springframework.beans.factory.annotation.Autowired; import com.java110.dto.chargeMachineOrderAcct.ChargeMachineOrderAcctDto; import com.java110.dto.chargeMachine.ChargeMachineOrderAcctDto; import java.util.List; import java.util.ArrayList; service-common/src/main/java/com/java110/common/cmd/chargeMachine/ListChargeMachineOrderCmd.java
@@ -26,7 +26,7 @@ import com.java110.utils.util.BeanConvertUtil; import com.java110.vo.ResultVo; import org.springframework.beans.factory.annotation.Autowired; import com.java110.dto.chargeMachineOrder.ChargeMachineOrderDto; import com.java110.dto.chargeMachine.ChargeMachineOrderDto; import java.util.List; import java.util.ArrayList; import org.springframework.http.ResponseEntity; service-common/src/main/java/com/java110/common/cmd/chargeMachine/ListChargeMachinePortCmd.java
@@ -26,7 +26,7 @@ import com.java110.utils.util.BeanConvertUtil; import com.java110.vo.ResultVo; import org.springframework.beans.factory.annotation.Autowired; import com.java110.dto.chargeMachinePort.ChargeMachinePortDto; import com.java110.dto.chargeMachine.ChargeMachinePortDto; import java.util.List; import java.util.ArrayList; service-common/src/main/java/com/java110/common/cmd/chargeMachine/ListChargeMachineSpecCmd.java
@@ -26,7 +26,7 @@ import com.java110.utils.util.BeanConvertUtil; import com.java110.vo.ResultVo; import org.springframework.beans.factory.annotation.Autowired; import com.java110.dto.chargeMachineSpec.ChargeMachineSpecDto; import com.java110.dto.chargeMachine.ChargeMachineSpecDto; import java.util.List; import java.util.ArrayList; service-common/src/main/java/com/java110/common/cmd/chargeMachine/SaveChargeMachineCmd.java
@@ -24,14 +24,13 @@ import com.java110.core.event.cmd.CmdEvent; import com.java110.core.factory.GenerateCodeFactory; import com.java110.dto.chargeMachine.ChargeMachineDto; import com.java110.dto.chargeMachinePort.ChargeMachinePortDto; import com.java110.dto.chargeMachine.ChargeMachinePortDto; import com.java110.intf.common.IChargeMachinePortV1InnerServiceSMO; import com.java110.intf.common.IChargeMachineSpecV1InnerServiceSMO; import com.java110.intf.common.IChargeMachineV1InnerServiceSMO; import com.java110.po.chargeMachine.ChargeMachinePo; import com.java110.po.chargeMachinePort.ChargeMachinePortPo; import com.java110.po.chargeMachineSpec.ChargeMachineSpecPo; import com.java110.po.meterMachineSpec.MeterMachineSpecPo; import com.java110.utils.exception.CmdException; import com.java110.utils.util.Assert; import com.java110.utils.util.BeanConvertUtil; service-common/src/main/java/com/java110/common/cmd/chargeMachine/SaveChargeMachinePortCmd.java
@@ -22,7 +22,7 @@ import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; import com.java110.core.factory.GenerateCodeFactory; import com.java110.dto.chargeMachinePort.ChargeMachinePortDto; import com.java110.dto.chargeMachine.ChargeMachinePortDto; import com.java110.intf.common.IChargeMachinePortV1InnerServiceSMO; import com.java110.po.chargeMachinePort.ChargeMachinePortPo; import com.java110.utils.exception.CmdException; service-common/src/main/java/com/java110/common/cmd/chargeMachine/StartChargeCmd.java
@@ -1,6 +1,5 @@ package com.java110.common.cmd.chargeMachine; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.java110.common.charge.IChargeCore; import com.java110.core.annotation.Java110Cmd; @@ -10,13 +9,12 @@ import com.java110.core.event.cmd.CmdEvent; import com.java110.core.factory.GenerateCodeFactory; import com.java110.dto.account.AccountDto; import com.java110.dto.accountDetail.AccountDetailDto; import com.java110.dto.chargeMachine.ChargeMachineDto; import com.java110.dto.chargeMachineOrder.ChargeMachineOrderDto; import com.java110.dto.chargeMachinePort.ChargeMachinePortDto; import com.java110.dto.chargeRuleFee.ChargeRuleFeeDto; import com.java110.dto.couponPropertyPoolConfig.CouponPropertyPoolConfigDto; import com.java110.dto.couponPropertyUser.CouponPropertyUserDto; import com.java110.dto.chargeMachine.ChargeMachineOrderDto; import com.java110.dto.chargeMachine.ChargeMachinePortDto; import com.java110.dto.chargeMachine.ChargeRuleFeeDto; import com.java110.dto.couponPool.CouponPropertyPoolConfigDto; import com.java110.dto.couponPool.CouponPropertyUserDto; import com.java110.dto.user.UserDto; import com.java110.intf.acct.IAccountInnerServiceSMO; import com.java110.intf.acct.ICouponPropertyPoolConfigV1InnerServiceSMO; service-common/src/main/java/com/java110/common/cmd/chargeMachine/StopChargeCmd.java
@@ -6,28 +6,19 @@ import com.java110.core.context.ICmdDataFlowContext; import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; import com.java110.core.factory.GenerateCodeFactory; import com.java110.dto.account.AccountDto; import com.java110.dto.chargeMachine.ChargeMachineDto; import com.java110.dto.chargeMachineOrder.ChargeMachineOrderDto; import com.java110.dto.chargeMachinePort.ChargeMachinePortDto; import com.java110.dto.user.UserDto; import com.java110.dto.chargeMachine.ChargeMachinePortDto; import com.java110.intf.acct.IAccountInnerServiceSMO; import com.java110.intf.common.IChargeMachineOrderV1InnerServiceSMO; import com.java110.intf.common.IChargeMachinePortV1InnerServiceSMO; import com.java110.intf.common.IChargeMachineV1InnerServiceSMO; import com.java110.intf.user.IUserV1InnerServiceSMO; import com.java110.po.chargeMachineOrder.ChargeMachineOrderPo; import com.java110.po.chargeMachinePort.ChargeMachinePortPo; import com.java110.utils.exception.CmdException; import com.java110.utils.util.Assert; import com.java110.utils.util.DateUtil; import com.java110.vo.ResultVo; import org.springframework.beans.factory.annotation.Autowired; import java.math.BigDecimal; import java.text.ParseException; import java.util.Calendar; import java.util.List; /** service-common/src/main/java/com/java110/common/cmd/chargeRule/ListChargeRuleCmd.java
@@ -17,19 +17,16 @@ import com.alibaba.fastjson.JSONObject; import com.java110.core.annotation.Java110Cmd; import com.java110.core.annotation.Java110Transactional; import com.java110.core.context.ICmdDataFlowContext; import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; import com.java110.core.factory.GenerateCodeFactory; import com.java110.intf.common.IChargeRuleV1InnerServiceSMO; import com.java110.po.chargeRule.ChargeRulePo; import com.java110.utils.exception.CmdException; import com.java110.utils.util.Assert; import com.java110.utils.util.BeanConvertUtil; import com.java110.vo.ResultVo; import org.springframework.beans.factory.annotation.Autowired; import com.java110.dto.chargeRule.ChargeRuleDto; import com.java110.dto.chargeMachine.ChargeRuleDto; import java.util.List; import java.util.ArrayList; import org.springframework.http.ResponseEntity; service-common/src/main/java/com/java110/common/cmd/chargeRule/ListChargeRuleFeeCmd.java
@@ -26,7 +26,7 @@ import com.java110.utils.util.BeanConvertUtil; import com.java110.vo.ResultVo; import org.springframework.beans.factory.annotation.Autowired; import com.java110.dto.chargeRuleFee.ChargeRuleFeeDto; import com.java110.dto.chargeMachine.ChargeRuleFeeDto; import java.util.List; import java.util.ArrayList; import org.springframework.http.ResponseEntity; service-common/src/main/java/com/java110/common/smo/impl/AssetImportLogDetailInnerServiceSMOImpl.java
@@ -4,7 +4,7 @@ import com.java110.common.dao.IAssetImportLogDetailServiceDao; import com.java110.core.base.smo.BaseServiceSMO; import com.java110.dto.PageDto; import com.java110.dto.assetImportLogDetail.AssetImportLogDetailDto; import com.java110.dto.assetImportLog.AssetImportLogDetailDto; import com.java110.intf.common.IAssetImportLogDetailInnerServiceSMO; import com.java110.po.assetImportLogDetail.AssetImportLogDetailPo; import com.java110.utils.util.BeanConvertUtil; service-common/src/main/java/com/java110/common/smo/impl/ChargeMachineFactorySpecV1InnerServiceSMOImpl.java
@@ -18,17 +18,15 @@ import com.java110.common.dao.IChargeMachineFactorySpecV1ServiceDao; import com.java110.intf.common.IChargeMachineFactorySpecV1InnerServiceSMO; import com.java110.dto.chargeMachineFactorySpec.ChargeMachineFactorySpecDto; import com.java110.dto.chargeMachine.ChargeMachineFactorySpecDto; import com.java110.po.chargeMachineFactorySpec.ChargeMachineFactorySpecPo; import com.java110.utils.util.BeanConvertUtil; import com.java110.core.base.smo.BaseServiceSMO; import com.java110.dto.user.UserDto; import com.java110.dto.PageDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; import java.util.List; /** service-common/src/main/java/com/java110/common/smo/impl/ChargeMachineFactoryV1InnerServiceSMOImpl.java
@@ -18,17 +18,15 @@ import com.java110.common.dao.IChargeMachineFactoryV1ServiceDao; import com.java110.intf.common.IChargeMachineFactoryV1InnerServiceSMO; import com.java110.dto.chargeMachineFactory.ChargeMachineFactoryDto; import com.java110.dto.chargeMachine.ChargeMachineFactoryDto; import com.java110.po.chargeMachineFactory.ChargeMachineFactoryPo; import com.java110.utils.util.BeanConvertUtil; import com.java110.core.base.smo.BaseServiceSMO; import com.java110.dto.user.UserDto; import com.java110.dto.PageDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; import java.util.List; /** service-common/src/main/java/com/java110/common/smo/impl/ChargeMachineOrderAcctV1InnerServiceSMOImpl.java
@@ -18,17 +18,15 @@ import com.java110.common.dao.IChargeMachineOrderAcctV1ServiceDao; import com.java110.intf.common.IChargeMachineOrderAcctV1InnerServiceSMO; import com.java110.dto.chargeMachineOrderAcct.ChargeMachineOrderAcctDto; import com.java110.dto.chargeMachine.ChargeMachineOrderAcctDto; import com.java110.po.chargeMachineOrderAcct.ChargeMachineOrderAcctPo; import com.java110.utils.util.BeanConvertUtil; import com.java110.core.base.smo.BaseServiceSMO; import com.java110.dto.user.UserDto; import com.java110.dto.PageDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; import java.util.List; /** service-common/src/main/java/com/java110/common/smo/impl/ChargeMachineOrderCouponV1InnerServiceSMOImpl.java
@@ -18,17 +18,15 @@ import com.java110.common.dao.IChargeMachineOrderCouponV1ServiceDao; import com.java110.intf.common.IChargeMachineOrderCouponV1InnerServiceSMO; import com.java110.dto.chargeMachineOrderCoupon.ChargeMachineOrderCouponDto; import com.java110.dto.chargeMachine.ChargeMachineOrderCouponDto; import com.java110.po.chargeMachineOrderCoupon.ChargeMachineOrderCouponPo; import com.java110.utils.util.BeanConvertUtil; import com.java110.core.base.smo.BaseServiceSMO; import com.java110.dto.user.UserDto; import com.java110.dto.PageDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; import java.util.List; /** service-common/src/main/java/com/java110/common/smo/impl/ChargeMachineOrderV1InnerServiceSMOImpl.java
@@ -18,17 +18,15 @@ import com.java110.common.dao.IChargeMachineOrderV1ServiceDao; import com.java110.intf.common.IChargeMachineOrderV1InnerServiceSMO; import com.java110.dto.chargeMachineOrder.ChargeMachineOrderDto; import com.java110.dto.chargeMachine.ChargeMachineOrderDto; import com.java110.po.chargeMachineOrder.ChargeMachineOrderPo; import com.java110.utils.util.BeanConvertUtil; import com.java110.core.base.smo.BaseServiceSMO; import com.java110.dto.user.UserDto; import com.java110.dto.PageDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; import java.util.List; /** service-common/src/main/java/com/java110/common/smo/impl/ChargeMachinePortV1InnerServiceSMOImpl.java
@@ -18,17 +18,15 @@ import com.java110.common.dao.IChargeMachinePortV1ServiceDao; import com.java110.intf.common.IChargeMachinePortV1InnerServiceSMO; import com.java110.dto.chargeMachinePort.ChargeMachinePortDto; import com.java110.dto.chargeMachine.ChargeMachinePortDto; import com.java110.po.chargeMachinePort.ChargeMachinePortPo; import com.java110.utils.util.BeanConvertUtil; import com.java110.core.base.smo.BaseServiceSMO; import com.java110.dto.user.UserDto; import com.java110.dto.PageDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; import java.util.List; /** service-common/src/main/java/com/java110/common/smo/impl/ChargeMachineSpecV1InnerServiceSMOImpl.java
@@ -18,17 +18,15 @@ import com.java110.common.dao.IChargeMachineSpecV1ServiceDao; import com.java110.intf.common.IChargeMachineSpecV1InnerServiceSMO; import com.java110.dto.chargeMachineSpec.ChargeMachineSpecDto; import com.java110.dto.chargeMachine.ChargeMachineSpecDto; import com.java110.po.chargeMachineSpec.ChargeMachineSpecPo; import com.java110.utils.util.BeanConvertUtil; import com.java110.core.base.smo.BaseServiceSMO; import com.java110.dto.user.UserDto; import com.java110.dto.PageDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; import java.util.List; /** service-common/src/main/java/com/java110/common/smo/impl/ChargeRuleFeeV1InnerServiceSMOImpl.java
@@ -18,17 +18,15 @@ import com.java110.common.dao.IChargeRuleFeeV1ServiceDao; import com.java110.intf.common.IChargeRuleFeeV1InnerServiceSMO; import com.java110.dto.chargeRuleFee.ChargeRuleFeeDto; import com.java110.dto.chargeMachine.ChargeRuleFeeDto; import com.java110.po.chargeRuleFee.ChargeRuleFeePo; import com.java110.utils.util.BeanConvertUtil; import com.java110.core.base.smo.BaseServiceSMO; import com.java110.dto.user.UserDto; import com.java110.dto.PageDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; import java.util.List; /** service-common/src/main/java/com/java110/common/smo/impl/ChargeRuleV1InnerServiceSMOImpl.java
@@ -18,17 +18,15 @@ import com.java110.common.dao.IChargeRuleV1ServiceDao; import com.java110.intf.common.IChargeRuleV1InnerServiceSMO; import com.java110.dto.chargeRule.ChargeRuleDto; import com.java110.dto.chargeMachine.ChargeRuleDto; import com.java110.po.chargeRule.ChargeRulePo; import com.java110.utils.util.BeanConvertUtil; import com.java110.core.base.smo.BaseServiceSMO; import com.java110.dto.user.UserDto; import com.java110.dto.PageDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; import java.util.List; /** service-common/src/main/java/com/java110/common/smo/impl/ContractChangeUserInnerServiceSMOImpl.java
@@ -3,14 +3,12 @@ import com.java110.core.base.smo.BaseServiceSMO; import com.java110.dto.PageDto; import com.java110.dto.contract.ContractDto; import com.java110.dto.contractChangePlan.ContractChangePlanDto; import com.java110.dto.contract.ContractChangePlanDto; import com.java110.dto.workflow.WorkflowDto; import com.java110.entity.audit.AuditUser; import com.java110.intf.common.IContractChangeUserInnerServiceSMO; import com.java110.intf.common.IWorkflowInnerServiceSMO; import com.java110.intf.store.IContractChangePlanInnerServiceSMO; import com.java110.po.contract.ContractPo; import com.java110.po.contractChangePlan.ContractChangePlanPo; import com.java110.utils.util.Assert; import com.java110.utils.util.FlowUtil; service-common/src/main/java/com/java110/common/smo/impl/NotifyChargeV1InnerServiceSMOImpl.java
@@ -17,25 +17,15 @@ import com.java110.common.charge.IChargeCore; import com.java110.common.smartMeter.ISmartMeterFactoryAdapt; import com.java110.core.base.smo.BaseServiceSMO; import com.java110.core.log.LoggerFactory; import com.java110.dto.chargeMachine.ChargeMachineDto; import com.java110.dto.chargeMachineOrder.NotifyChargeOrderDto; import com.java110.dto.meterMachineFactory.MeterMachineFactoryDto; import com.java110.dto.meterWater.NotifyMeterWaterOrderDto; import com.java110.dto.chargeMachine.NotifyChargeOrderDto; import com.java110.intf.common.*; import com.java110.utils.exception.CmdException; import com.java110.utils.factory.ApplicationContextFactory; import com.java110.utils.util.Assert; import com.java110.vo.ResultVo; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import java.util.List; /** * 类表述: 服务之前调用的接口实现类,不对外提供接口能力 只用于接口建调用 service-community/src/main/java/com/java110/community/cmd/communitySettingKey/ListCommunitySettingKeyCmd.java
@@ -20,7 +20,7 @@ import com.java110.core.context.ICmdDataFlowContext; import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; import com.java110.dto.communitySettingKey.CommunitySettingKeyDto; import com.java110.dto.communitySetting.CommunitySettingKeyDto; import com.java110.intf.community.ICommunitySettingKeyV1InnerServiceSMO; import com.java110.utils.exception.CmdException; import com.java110.utils.util.BeanConvertUtil; service-community/src/main/java/com/java110/community/cmd/communitySpace/DeleteCommunitySpacePersonCmd.java
@@ -21,8 +21,8 @@ import com.java110.core.context.ICmdDataFlowContext; import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; import com.java110.dto.communitySpacePerson.CommunitySpacePersonDto; import com.java110.dto.communitySpacePersonTime.CommunitySpacePersonTimeDto; import com.java110.dto.communitySpace.CommunitySpacePersonDto; import com.java110.dto.communitySpace.CommunitySpacePersonTimeDto; import com.java110.dto.onlinePay.OnlinePayDto; import com.java110.intf.acct.IOnlinePayV1InnerServiceSMO; import com.java110.intf.community.ICommunitySpacePersonTimeV1InnerServiceSMO; service-community/src/main/java/com/java110/community/cmd/communitySpace/ListCommunitySpaceCmd.java
@@ -22,7 +22,7 @@ import com.java110.core.event.cmd.CmdEvent; import com.java110.doc.annotation.*; import com.java110.dto.communitySpace.CommunitySpaceDto; import com.java110.dto.communitySpaceOpenTime.CommunitySpaceOpenTimeDto; import com.java110.dto.communitySpace.CommunitySpaceOpenTimeDto; import com.java110.intf.community.ICommunitySpaceOpenTimeV1InnerServiceSMO; import com.java110.intf.community.ICommunitySpaceV1InnerServiceSMO; import com.java110.utils.exception.CmdException; service-community/src/main/java/com/java110/community/cmd/communitySpace/ListCommunitySpaceConfirmOrderCmd.java
@@ -26,7 +26,7 @@ import com.java110.utils.util.BeanConvertUtil; import com.java110.vo.ResultVo; import org.springframework.beans.factory.annotation.Autowired; import com.java110.dto.communitySpaceConfirmOrder.CommunitySpaceConfirmOrderDto; import com.java110.dto.communitySpace.CommunitySpaceConfirmOrderDto; import java.util.List; import java.util.ArrayList; import org.springframework.http.ResponseEntity; service-community/src/main/java/com/java110/community/cmd/communitySpace/ListCommunitySpaceOpenTimeCmd.java
@@ -7,7 +7,7 @@ import com.java110.core.event.cmd.CmdEvent; import com.java110.core.log.LoggerFactory; import com.java110.doc.annotation.*; import com.java110.dto.communitySpaceOpenTime.CommunitySpaceOpenTimeDto; import com.java110.dto.communitySpace.CommunitySpaceOpenTimeDto; import com.java110.intf.community.ICommunitySpaceOpenTimeV1InnerServiceSMO; import com.java110.utils.exception.CmdException; import com.java110.utils.util.Assert; service-community/src/main/java/com/java110/community/cmd/communitySpace/ListCommunitySpacePersonCmd.java
@@ -20,13 +20,10 @@ import com.java110.core.context.ICmdDataFlowContext; import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; import com.java110.dto.communitySpace.CommunitySpaceDto; import com.java110.dto.communitySpaceOpenTime.CommunitySpaceOpenTimeDto; import com.java110.dto.communitySpacePerson.CommunitySpacePersonDto; import com.java110.dto.communitySpacePersonTime.CommunitySpacePersonTimeDto; import com.java110.dto.communitySpace.CommunitySpacePersonDto; import com.java110.dto.communitySpace.CommunitySpacePersonTimeDto; import com.java110.intf.community.ICommunitySpacePersonTimeV1InnerServiceSMO; import com.java110.intf.community.ICommunitySpacePersonV1InnerServiceSMO; import com.java110.po.communitySpacePersonTime.CommunitySpacePersonTimePo; import com.java110.utils.exception.CmdException; import com.java110.utils.util.BeanConvertUtil; import com.java110.vo.ResultVo; service-community/src/main/java/com/java110/community/cmd/communitySpace/SaveCommunitySpaceConfirmOrderCmd.java
@@ -23,8 +23,8 @@ import com.java110.core.event.cmd.CmdEvent; import com.java110.core.factory.GenerateCodeFactory; import com.java110.doc.annotation.*; import com.java110.dto.communitySpaceConfirmOrder.CommunitySpaceConfirmOrderDto; import com.java110.dto.communitySpacePersonTime.CommunitySpacePersonTimeDto; import com.java110.dto.communitySpace.CommunitySpaceConfirmOrderDto; import com.java110.dto.communitySpace.CommunitySpacePersonTimeDto; import com.java110.intf.community.ICommunitySpaceConfirmOrderV1InnerServiceSMO; import com.java110.intf.community.ICommunitySpacePersonTimeV1InnerServiceSMO; import com.java110.po.communitySpaceConfirmOrder.CommunitySpaceConfirmOrderPo; service-community/src/main/java/com/java110/community/cmd/communitySpace/SaveCommunitySpacePersonCmd.java
@@ -24,8 +24,8 @@ import com.java110.core.event.cmd.CmdEvent; import com.java110.core.factory.GenerateCodeFactory; import com.java110.doc.annotation.*; import com.java110.dto.communitySpacePerson.CommunitySpacePersonDto; import com.java110.dto.communitySpacePersonTime.CommunitySpacePersonTimeDto; import com.java110.dto.communitySpace.CommunitySpacePersonDto; import com.java110.dto.communitySpace.CommunitySpacePersonTimeDto; import com.java110.intf.community.ICommunitySpacePersonTimeV1InnerServiceSMO; import com.java110.intf.community.ICommunitySpacePersonV1InnerServiceSMO; import com.java110.po.communitySpacePerson.CommunitySpacePersonPo; service-community/src/main/java/com/java110/community/cmd/communityVenue/ListCommunityVenueCmd.java
@@ -17,20 +17,17 @@ import com.alibaba.fastjson.JSONObject; import com.java110.core.annotation.Java110Cmd; import com.java110.core.annotation.Java110Transactional; import com.java110.core.context.ICmdDataFlowContext; import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; import com.java110.core.factory.GenerateCodeFactory; import com.java110.doc.annotation.*; import com.java110.intf.community.ICommunityVenueV1InnerServiceSMO; import com.java110.po.communityVenue.CommunityVenuePo; import com.java110.utils.exception.CmdException; import com.java110.utils.util.Assert; import com.java110.utils.util.BeanConvertUtil; import com.java110.vo.ResultVo; import org.springframework.beans.factory.annotation.Autowired; import com.java110.dto.communityVenue.CommunityVenueDto; import com.java110.dto.communitySpace.CommunityVenueDto; import java.util.List; import java.util.ArrayList; import org.springframework.http.ResponseEntity; service-community/src/main/java/com/java110/community/cmd/dataPrivilege/ListDataPrivilegeCmd.java
@@ -20,7 +20,7 @@ import com.java110.core.context.ICmdDataFlowContext; import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; import com.java110.dto.dataPrivilege.DataPrivilegeDto; import com.java110.dto.data.DataPrivilegeDto; import com.java110.intf.community.IDataPrivilegeV1InnerServiceSMO; import com.java110.utils.exception.CmdException; import com.java110.utils.util.Assert; service-community/src/main/java/com/java110/community/cmd/dataPrivilegeUnit/ListDataPrivilegeUnitCmd.java
@@ -17,19 +17,15 @@ import com.alibaba.fastjson.JSONObject; import com.java110.core.annotation.Java110Cmd; import com.java110.core.annotation.Java110Transactional; import com.java110.core.context.ICmdDataFlowContext; import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; import com.java110.core.factory.GenerateCodeFactory; import com.java110.intf.community.IDataPrivilegeUnitV1InnerServiceSMO; import com.java110.po.dataPrivilegeUnit.DataPrivilegeUnitPo; import com.java110.utils.exception.CmdException; import com.java110.utils.util.Assert; import com.java110.utils.util.BeanConvertUtil; import com.java110.vo.ResultVo; import org.springframework.beans.factory.annotation.Autowired; import com.java110.dto.dataPrivilegeUnit.DataPrivilegeUnitDto; import com.java110.dto.data.DataPrivilegeUnitDto; import java.util.List; import java.util.ArrayList; import org.springframework.http.ResponseEntity; service-community/src/main/java/com/java110/community/cmd/dataPrivilegeUnit/ListUnitsNotInDataPrivilegeCmd.java
@@ -17,20 +17,16 @@ import com.alibaba.fastjson.JSONObject; import com.java110.core.annotation.Java110Cmd; import com.java110.core.annotation.Java110Transactional; import com.java110.core.context.ICmdDataFlowContext; import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; import com.java110.core.factory.GenerateCodeFactory; import com.java110.dto.UnitDto; import com.java110.intf.community.IDataPrivilegeUnitV1InnerServiceSMO; import com.java110.po.dataPrivilegeUnit.DataPrivilegeUnitPo; import com.java110.utils.exception.CmdException; import com.java110.utils.util.Assert; import com.java110.utils.util.BeanConvertUtil; import com.java110.vo.ResultVo; import org.springframework.beans.factory.annotation.Autowired; import com.java110.dto.dataPrivilegeUnit.DataPrivilegeUnitDto; import com.java110.dto.data.DataPrivilegeUnitDto; import java.util.List; import java.util.ArrayList; import org.springframework.http.ResponseEntity; service-community/src/main/java/com/java110/community/cmd/floor/QueryFloorAndUnitsCmd.java
@@ -6,7 +6,7 @@ import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; import com.java110.dto.UnitDto; import com.java110.dto.dataPrivilegeStaff.DataPrivilegeStaffDto; import com.java110.dto.data.DataPrivilegeStaffDto; import com.java110.intf.community.IDataPrivilegeUnitV1InnerServiceSMO; import com.java110.intf.community.IFloorInnerServiceSMO; import com.java110.utils.exception.CmdException; service-community/src/main/java/com/java110/community/cmd/room/QueryRoomsCmd.java
@@ -11,7 +11,7 @@ import com.java110.dto.RoomDto; import com.java110.dto.UnitDto; import com.java110.dto.basePrivilege.BasePrivilegeDto; import com.java110.dto.dataPrivilegeStaff.DataPrivilegeStaffDto; import com.java110.dto.data.DataPrivilegeStaffDto; import com.java110.dto.owner.OwnerDto; import com.java110.intf.community.*; import com.java110.intf.user.IOwnerInnerServiceSMO; service-community/src/main/java/com/java110/community/cmd/unit/QueryUnitsCmd.java
@@ -7,7 +7,7 @@ import com.java110.core.event.cmd.CmdEvent; import com.java110.doc.annotation.*; import com.java110.dto.UnitDto; import com.java110.dto.dataPrivilegeStaff.DataPrivilegeStaffDto; import com.java110.dto.data.DataPrivilegeStaffDto; import com.java110.intf.community.IDataPrivilegeUnitV1InnerServiceSMO; import com.java110.intf.community.IFloorInnerServiceSMO; import com.java110.intf.community.IUnitInnerServiceSMO; service-community/src/main/java/com/java110/community/smo/impl/CommunitySettingKeyV1InnerServiceSMOImpl.java
@@ -18,17 +18,15 @@ import com.java110.community.dao.ICommunitySettingKeyV1ServiceDao; import com.java110.intf.community.ICommunitySettingKeyV1InnerServiceSMO; import com.java110.dto.communitySettingKey.CommunitySettingKeyDto; import com.java110.dto.communitySetting.CommunitySettingKeyDto; import com.java110.po.communitySettingKey.CommunitySettingKeyPo; import com.java110.utils.util.BeanConvertUtil; import com.java110.core.base.smo.BaseServiceSMO; import com.java110.dto.user.UserDto; import com.java110.dto.PageDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; import java.util.List; /** service-community/src/main/java/com/java110/community/smo/impl/CommunitySpaceConfirmOrderV1InnerServiceSMOImpl.java
@@ -18,17 +18,15 @@ import com.java110.community.dao.ICommunitySpaceConfirmOrderV1ServiceDao; import com.java110.intf.community.ICommunitySpaceConfirmOrderV1InnerServiceSMO; import com.java110.dto.communitySpaceConfirmOrder.CommunitySpaceConfirmOrderDto; import com.java110.dto.communitySpace.CommunitySpaceConfirmOrderDto; import com.java110.po.communitySpaceConfirmOrder.CommunitySpaceConfirmOrderPo; import com.java110.utils.util.BeanConvertUtil; import com.java110.core.base.smo.BaseServiceSMO; import com.java110.dto.user.UserDto; import com.java110.dto.PageDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; import java.util.List; /** service-community/src/main/java/com/java110/community/smo/impl/CommunitySpaceOpenTimeV1InnerServiceSMOImpl.java
@@ -18,17 +18,15 @@ import com.java110.community.dao.ICommunitySpaceOpenTimeV1ServiceDao; import com.java110.intf.community.ICommunitySpaceOpenTimeV1InnerServiceSMO; import com.java110.dto.communitySpaceOpenTime.CommunitySpaceOpenTimeDto; import com.java110.dto.communitySpace.CommunitySpaceOpenTimeDto; import com.java110.po.communitySpaceOpenTime.CommunitySpaceOpenTimePo; import com.java110.utils.util.BeanConvertUtil; import com.java110.core.base.smo.BaseServiceSMO; import com.java110.dto.user.UserDto; import com.java110.dto.PageDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; service-community/src/main/java/com/java110/community/smo/impl/CommunitySpacePersonTimeV1InnerServiceSMOImpl.java
@@ -18,17 +18,15 @@ import com.java110.community.dao.ICommunitySpacePersonTimeV1ServiceDao; import com.java110.intf.community.ICommunitySpacePersonTimeV1InnerServiceSMO; import com.java110.dto.communitySpacePersonTime.CommunitySpacePersonTimeDto; import com.java110.dto.communitySpace.CommunitySpacePersonTimeDto; import com.java110.po.communitySpacePersonTime.CommunitySpacePersonTimePo; import com.java110.utils.util.BeanConvertUtil; import com.java110.core.base.smo.BaseServiceSMO; import com.java110.dto.user.UserDto; import com.java110.dto.PageDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; import java.util.List; /** service-community/src/main/java/com/java110/community/smo/impl/CommunitySpacePersonV1InnerServiceSMOImpl.java
@@ -18,17 +18,15 @@ import com.java110.community.dao.ICommunitySpacePersonV1ServiceDao; import com.java110.intf.community.ICommunitySpacePersonV1InnerServiceSMO; import com.java110.dto.communitySpacePerson.CommunitySpacePersonDto; import com.java110.dto.communitySpace.CommunitySpacePersonDto; import com.java110.po.communitySpacePerson.CommunitySpacePersonPo; import com.java110.utils.util.BeanConvertUtil; import com.java110.core.base.smo.BaseServiceSMO; import com.java110.dto.user.UserDto; import com.java110.dto.PageDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; import java.util.List; /** service-community/src/main/java/com/java110/community/smo/impl/CommunityVenueV1InnerServiceSMOImpl.java
@@ -18,17 +18,15 @@ import com.java110.community.dao.ICommunityVenueV1ServiceDao; import com.java110.intf.community.ICommunityVenueV1InnerServiceSMO; import com.java110.dto.communityVenue.CommunityVenueDto; import com.java110.dto.communitySpace.CommunityVenueDto; import com.java110.po.communityVenue.CommunityVenuePo; import com.java110.utils.util.BeanConvertUtil; import com.java110.core.base.smo.BaseServiceSMO; import com.java110.dto.user.UserDto; import com.java110.dto.PageDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; import java.util.List; /** service-community/src/main/java/com/java110/community/smo/impl/DataPrivilegeUnitV1InnerServiceSMOImpl.java
@@ -18,14 +18,13 @@ import com.java110.community.dao.IDataPrivilegeUnitV1ServiceDao; import com.java110.dto.UnitDto; import com.java110.dto.dataPrivilegeStaff.DataPrivilegeStaffDto; import com.java110.dto.data.DataPrivilegeStaffDto; import com.java110.intf.user.IDataPrivilegeStaffV1InnerServiceSMO; import com.java110.intf.community.IDataPrivilegeUnitV1InnerServiceSMO; import com.java110.dto.dataPrivilegeUnit.DataPrivilegeUnitDto; import com.java110.dto.data.DataPrivilegeUnitDto; import com.java110.po.dataPrivilegeUnit.DataPrivilegeUnitPo; import com.java110.utils.util.BeanConvertUtil; import com.java110.core.base.smo.BaseServiceSMO; import com.java110.dto.user.UserDto; import com.java110.dto.PageDto; import com.java110.utils.util.StringUtil; import org.springframework.beans.factory.annotation.Autowired; service-community/src/main/java/com/java110/community/smo/impl/DataPrivilegeV1InnerServiceSMOImpl.java
@@ -18,17 +18,15 @@ import com.java110.community.dao.IDataPrivilegeV1ServiceDao; import com.java110.intf.community.IDataPrivilegeV1InnerServiceSMO; import com.java110.dto.dataPrivilege.DataPrivilegeDto; import com.java110.dto.data.DataPrivilegeDto; import com.java110.po.dataPrivilege.DataPrivilegePo; import com.java110.utils.util.BeanConvertUtil; import com.java110.core.base.smo.BaseServiceSMO; import com.java110.dto.user.UserDto; import com.java110.dto.PageDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; import java.util.List; /** service-dev/src/main/java/com/java110/dev/cmd/dict/SaveDictCmd.java
@@ -21,7 +21,7 @@ import com.java110.core.context.ICmdDataFlowContext; import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; import com.java110.dto.dictSpec.DictSpecDto; import com.java110.dto.Dict.DictSpecDto; import com.java110.intf.dev.IDictSpecV1InnerServiceSMO; import com.java110.intf.dev.IDictV1InnerServiceSMO; import com.java110.po.dict.DictPo; service-dev/src/main/java/com/java110/dev/cmd/dictSpec/ListDictSpecCmd.java
@@ -17,19 +17,15 @@ import com.alibaba.fastjson.JSONObject; import com.java110.core.annotation.Java110Cmd; import com.java110.core.annotation.Java110Transactional; import com.java110.core.context.ICmdDataFlowContext; import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; import com.java110.core.factory.GenerateCodeFactory; import com.java110.intf.dev.IDictSpecV1InnerServiceSMO; import com.java110.po.dictSpec.DictSpecPo; import com.java110.utils.exception.CmdException; import com.java110.utils.util.Assert; import com.java110.utils.util.BeanConvertUtil; import com.java110.vo.ResultVo; import org.springframework.beans.factory.annotation.Autowired; import com.java110.dto.dictSpec.DictSpecDto; import com.java110.dto.Dict.DictSpecDto; import java.util.List; import java.util.ArrayList; import org.springframework.http.ResponseEntity; service-dev/src/main/java/com/java110/dev/smo/impl/DictSpecV1InnerServiceSMOImpl.java
@@ -18,17 +18,15 @@ import com.java110.dev.dao.IDictSpecV1ServiceDao; import com.java110.intf.dev.IDictSpecV1InnerServiceSMO; import com.java110.dto.dictSpec.DictSpecDto; import com.java110.dto.Dict.DictSpecDto; import com.java110.po.dictSpec.DictSpecPo; import com.java110.utils.util.BeanConvertUtil; import com.java110.core.base.smo.BaseServiceSMO; import com.java110.dto.user.UserDto; import com.java110.dto.PageDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; import java.util.List; /** service-fee/src/main/java/com/java110/fee/bmo/account/IUpdateAccountBMO.java
@@ -3,19 +3,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.java110.core.context.DataFlowContext; import com.java110.core.factory.GenerateCodeFactory; import com.java110.dto.account.AccountDto; import com.java110.dto.accountDetail.AccountDetailDto; import com.java110.fee.bmo.IApiBaseBMO; import com.java110.po.accountDetail.AccountDetailPo; import com.java110.utils.constant.BusinessTypeConstant; import com.java110.utils.constant.CommonConstant; import com.java110.utils.util.Assert; import com.java110.utils.util.BeanConvertUtil; import com.java110.utils.util.StringUtil; import java.math.BigDecimal; import java.util.List; public interface IUpdateAccountBMO extends IApiBaseBMO { service-fee/src/main/java/com/java110/fee/bmo/account/impl/UpdateAccountBMOImpl.java
@@ -5,7 +5,7 @@ import com.java110.core.context.DataFlowContext; import com.java110.core.factory.GenerateCodeFactory; import com.java110.dto.account.AccountDto; import com.java110.dto.accountDetail.AccountDetailDto; import com.java110.dto.account.AccountDetailDto; import com.java110.dto.owner.OwnerDto; import com.java110.dto.owner.OwnerRoomRelDto; import com.java110.fee.bmo.ApiBaseBMO; @@ -17,7 +17,6 @@ import com.java110.po.account.AccountPo; import com.java110.po.accountDetail.AccountDetailPo; import com.java110.utils.constant.BusinessTypeConstant; import com.java110.utils.constant.CommonConstant; import com.java110.utils.util.Assert; import com.java110.utils.util.BeanConvertUtil; import com.java110.utils.util.StringUtil; service-fee/src/main/java/com/java110/fee/bmo/meterWater/impl/QueryPreMeterWaterImpl.java
@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.java110.core.factory.GenerateCodeFactory; import com.java110.dto.RoomDto; import com.java110.dto.contractRoom.ContractRoomDto; import com.java110.dto.contract.ContractRoomDto; import com.java110.dto.fee.FeeAttrDto; import com.java110.dto.fee.FeeDto; import com.java110.dto.meterWater.ImportExportMeterWaterDto; service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java
@@ -12,7 +12,7 @@ import com.java110.core.log.LoggerFactory; import com.java110.core.smo.IComputeFeeSMO; import com.java110.dto.account.AccountDto; import com.java110.dto.accountDetail.AccountDetailDto; import com.java110.dto.account.AccountDetailDto; import com.java110.dto.fee.FeeAttrDto; import com.java110.dto.fee.FeeConfigDto; import com.java110.dto.fee.FeeDto; service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeConfirmCmd.java
@@ -10,7 +10,7 @@ import com.java110.core.factory.GenerateCodeFactory; import com.java110.dto.account.AccountDto; import com.java110.dto.app.AppDto; import com.java110.dto.couponUser.CouponUserDto; import com.java110.dto.couponPool.CouponUserDto; import com.java110.dto.fee.FeeAttrDto; import com.java110.dto.fee.FeeConfigDto; import com.java110.dto.fee.FeeDetailDto; service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeePreCmd.java
@@ -11,7 +11,7 @@ import com.java110.core.smo.IComputeFeeSMO; import com.java110.dto.account.AccountDto; import com.java110.dto.community.CommunityDto; import com.java110.dto.couponUser.CouponUserDto; import com.java110.dto.couponPool.CouponUserDto; import com.java110.dto.fee.FeeAttrDto; import com.java110.dto.fee.FeeConfigDto; import com.java110.dto.fee.FeeDetailDto; @@ -25,9 +25,6 @@ import com.java110.intf.community.IRoomInnerServiceSMO; import com.java110.intf.fee.*; import com.java110.intf.user.IOwnerCarInnerServiceSMO; import com.java110.po.account.AccountPo; import com.java110.po.accountDetail.AccountDetailPo; import com.java110.po.feeAccountDetail.FeeAccountDetailPo; import com.java110.utils.cache.CommonCache; import com.java110.utils.constant.ResponseConstant; import com.java110.utils.exception.CmdException; @@ -35,7 +32,6 @@ import com.java110.utils.util.Assert; import com.java110.utils.util.BeanConvertUtil; import com.java110.utils.util.DateUtil; import com.java110.utils.util.StringUtil; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; service-fee/src/main/java/com/java110/fee/cmd/receipt/ListAccountReceiptCmd.java
@@ -27,7 +27,7 @@ import com.java110.utils.util.StringUtil; import com.java110.vo.ResultVo; import org.springframework.beans.factory.annotation.Autowired; import com.java110.dto.accountReceipt.AccountReceiptDto; import com.java110.dto.account.AccountReceiptDto; import java.util.List; import java.util.ArrayList; service-fee/src/main/java/com/java110/fee/cmd/tempCarFee/NotifyTempCarFeeOrderCmd.java
@@ -1,29 +1,14 @@ package com.java110.fee.cmd.tempCarFee; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.java110.core.annotation.Java110Cmd; import com.java110.core.annotation.Java110Transactional; import com.java110.core.context.ICmdDataFlowContext; import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; import com.java110.core.factory.GenerateCodeFactory; import com.java110.dto.couponUser.CouponUserDto; import com.java110.dto.tempCarFeeConfig.TempCarPayOrderDto; import com.java110.fee.bmo.tempCarFee.IGetTempCarFeeRules; import com.java110.intf.acct.ICouponUserDetailV1InnerServiceSMO; import com.java110.intf.acct.ICouponUserV1InnerServiceSMO; import com.java110.intf.fee.ITempCarFeeCreateOrderV1InnerServiceSMO; import com.java110.po.couponUser.CouponUserPo; import com.java110.po.couponUserDetail.CouponUserDetailPo; import com.java110.utils.cache.CommonCache; import com.java110.utils.exception.CmdException; import com.java110.utils.util.BeanConvertUtil; import com.java110.utils.util.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import java.util.List; /** * 类表述:通知 service-fee/src/main/java/com/java110/fee/cmd/tempCarFee/QueryTempCarFeeOrderCmd.java
@@ -1,29 +1,14 @@ package com.java110.fee.cmd.tempCarFee; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.java110.core.annotation.Java110Cmd; import com.java110.core.context.ICmdDataFlowContext; import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; import com.java110.core.factory.GenerateCodeFactory; import com.java110.dto.couponUser.CouponUserDto; import com.java110.dto.tempCarFeeConfig.TempCarPayOrderDto; import com.java110.fee.bmo.tempCarFee.IGetTempCarFeeRules; import com.java110.intf.acct.ICouponUserV1InnerServiceSMO; import com.java110.intf.fee.ITempCarFeeCreateOrderV1InnerServiceSMO; import com.java110.utils.cache.CommonCache; import com.java110.utils.exception.CmdException; import com.java110.utils.util.Assert; import com.java110.utils.util.BeanConvertUtil; import com.java110.utils.util.DateUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import java.math.BigDecimal; import java.util.Arrays; import java.util.List; /** * 类表述:删除 service-fee/src/main/java/com/java110/fee/smo/impl/AccountReceiptV1InnerServiceSMOImpl.java
@@ -18,17 +18,15 @@ import com.java110.fee.dao.IAccountReceiptV1ServiceDao; import com.java110.intf.fee.IAccountReceiptV1InnerServiceSMO; import com.java110.dto.accountReceipt.AccountReceiptDto; import com.java110.dto.account.AccountReceiptDto; import com.java110.po.accountReceipt.AccountReceiptPo; import com.java110.utils.util.BeanConvertUtil; import com.java110.core.base.smo.BaseServiceSMO; import com.java110.dto.user.UserDto; import com.java110.dto.PageDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; import java.util.List; /** service-fee/src/main/java/com/java110/fee/smo/impl/TempCarFeeCreateOrderV1InnerServiceSMOImpl.java
@@ -1,10 +1,8 @@ package com.java110.fee.smo.impl; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.java110.core.base.smo.BaseServiceSMO; import com.java110.core.factory.GenerateCodeFactory; import com.java110.dto.couponUser.CouponUserDto; import com.java110.dto.parking.ParkingAreaDto; import com.java110.dto.parkingCouponCar.ParkingCouponCarDto; import com.java110.dto.tempCarFeeConfig.TempCarPayOrderDto; @@ -15,15 +13,11 @@ import com.java110.intf.acct.IParkingCouponCarV1InnerServiceSMO; import com.java110.intf.community.IParkingAreaV1InnerServiceSMO; import com.java110.intf.fee.ITempCarFeeCreateOrderV1InnerServiceSMO; import com.java110.po.couponUser.CouponUserPo; import com.java110.po.couponUserDetail.CouponUserDetailPo; import com.java110.po.parkingCouponCar.ParkingCouponCarPo; import com.java110.po.parkingCouponCarOrder.ParkingCouponCarOrderPo; import com.java110.po.tempCarFeeConfig.TempCarFeeConfigPo; import com.java110.utils.cache.CommonCache; import com.java110.utils.exception.CmdException; import com.java110.utils.util.BeanConvertUtil; import com.java110.utils.util.DateUtil; import com.java110.utils.util.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; @@ -32,7 +26,6 @@ import org.springframework.web.bind.annotation.RestController; import java.math.BigDecimal; import java.util.Arrays; import java.util.List; @RestController service-job/src/main/java/com/java110/job/adapt/payment/coupon/PayFeeGiftCouponAdapt.java
@@ -6,11 +6,11 @@ import com.java110.core.factory.GenerateCodeFactory; import com.java110.core.log.LoggerFactory; import com.java110.core.smo.IComputeFeeSMO; import com.java110.dto.couponPropertyPool.CouponPropertyPoolDto; import com.java110.dto.couponPropertyPoolConfig.CouponPropertyPoolConfigDto; import com.java110.dto.couponPropertyUser.CouponPropertyUserDto; import com.java110.dto.couponRuleCpps.CouponRuleCppsDto; import com.java110.dto.couponRuleFee.CouponRuleFeeDto; import com.java110.dto.couponPool.CouponPropertyPoolDto; import com.java110.dto.couponPool.CouponPropertyPoolConfigDto; import com.java110.dto.couponPool.CouponPropertyUserDto; import com.java110.dto.couponPool.CouponRuleCppsDto; import com.java110.dto.couponPool.CouponRuleFeeDto; import com.java110.dto.fee.FeeAttrDto; import com.java110.dto.fee.FeeDetailDto; import com.java110.dto.fee.FeeDto; @@ -25,7 +25,6 @@ import com.java110.po.couponPropertyPool.CouponPropertyPoolPo; import com.java110.po.couponPropertyPoolDetail.CouponPropertyPoolDetailPo; import com.java110.po.couponPropertyUser.CouponPropertyUserPo; import com.java110.po.couponRuleCpps.CouponRuleCppsPo; import com.java110.po.fee.PayFeeDetailPo; import com.java110.po.logSystemError.LogSystemErrorPo; import com.java110.service.smo.ISaveSystemErrorSMO; service-job/src/main/java/com/java110/job/adapt/payment/integral/PayFeeGiftIntegralAdapt.java
@@ -8,9 +8,6 @@ import com.java110.core.smo.IComputeFeeSMO; import com.java110.dto.RoomDto; import com.java110.dto.account.AccountDto; import com.java110.dto.couponPropertyPool.CouponPropertyPoolDto; import com.java110.dto.couponPropertyPoolConfig.CouponPropertyPoolConfigDto; import com.java110.dto.couponPropertyUser.CouponPropertyUserDto; import com.java110.dto.fee.FeeAttrDto; import com.java110.dto.fee.FeeDetailDto; import com.java110.dto.fee.FeeDto; @@ -29,10 +26,6 @@ import com.java110.job.adapt.DatabusAdaptImpl; import com.java110.po.account.AccountPo; import com.java110.po.accountDetail.AccountDetailPo; import com.java110.po.couponPropertyPool.CouponPropertyPoolPo; import com.java110.po.couponPropertyPoolDetail.CouponPropertyPoolDetailPo; import com.java110.po.couponPropertyUser.CouponPropertyUserPo; import com.java110.po.fee.PayFeeConfigPo; import com.java110.po.fee.PayFeeDetailPo; import com.java110.po.integralGiftDetail.IntegralGiftDetailPo; import com.java110.po.logSystemError.LogSystemErrorPo; @@ -44,9 +37,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; service-job/src/main/java/com/java110/job/printer/manufactor/FeieManufactor.java
@@ -2,7 +2,7 @@ import com.java110.core.client.RestTemplate; import com.java110.core.log.LoggerFactory; import com.java110.dto.accountReceipt.AccountReceiptDto; import com.java110.dto.account.AccountReceiptDto; import com.java110.dto.fee.FeeDetailDto; import com.java110.dto.fee.FeeDto; import com.java110.dto.feeReceipt.FeeReceiptDetailDto; @@ -10,17 +10,13 @@ import com.java110.dto.machinePrinter.MachinePrinterDto; import com.java110.dto.repair.RepairDto; import com.java110.dto.repair.RepairUserDto; import com.java110.dto.smallWeChat.SmallWeChatDto; import com.java110.dto.user.UserDto; import com.java110.intf.community.IRepairInnerServiceSMO; import com.java110.intf.community.IRepairUserInnerServiceSMO; import com.java110.intf.fee.*; import com.java110.intf.store.ISmallWeChatInnerServiceSMO; import com.java110.intf.user.IUserInnerServiceSMO; import com.java110.intf.user.IUserV1InnerServiceSMO; import com.java110.job.printer.IPrinter; import com.java110.utils.cache.MappingCache; import com.java110.utils.cache.UrlCache; import com.java110.utils.constant.MappingConstant; import com.java110.utils.exception.CmdException; import com.java110.utils.util.Assert; service-report/src/main/java/com/java110/report/bmo/search/ISearchCarBMO.java
New file @@ -0,0 +1,16 @@ package com.java110.report.bmo.search; import com.java110.dto.data.SearchDataDto; /** * 查询车辆信息 */ public interface ISearchCarBMO { /** * 查询房屋信息 * @param searchDataDto * @return */ SearchDataDto query(SearchDataDto searchDataDto); } service-report/src/main/java/com/java110/report/bmo/search/ISearchCarMemberBMO.java
New file @@ -0,0 +1,16 @@ package com.java110.report.bmo.search; import com.java110.dto.data.SearchDataDto; /** * 查询车辆成员信息 */ public interface ISearchCarMemberBMO { /** * 查询房屋信息 * @param searchDataDto * @return */ SearchDataDto query(SearchDataDto searchDataDto); } service-report/src/main/java/com/java110/report/bmo/search/ISearchContractBMO.java
New file @@ -0,0 +1,16 @@ package com.java110.report.bmo.search; import com.java110.dto.data.SearchDataDto; /** * 查询合同信息 */ public interface ISearchContractBMO { /** * 查询房屋信息 * @param searchDataDto * @return */ SearchDataDto query(SearchDataDto searchDataDto); } service-report/src/main/java/com/java110/report/bmo/search/ISearchOwnerBMO.java
New file @@ -0,0 +1,16 @@ package com.java110.report.bmo.search; import com.java110.dto.data.SearchDataDto; /** * 查询业主信息 */ public interface ISearchOwnerBMO { /** * 查询房屋信息 * @param searchDataDto * @return */ SearchDataDto query(SearchDataDto searchDataDto); } service-report/src/main/java/com/java110/report/bmo/search/ISearchOwnerMemberBMO.java
New file @@ -0,0 +1,16 @@ package com.java110.report.bmo.search; import com.java110.dto.data.SearchDataDto; /** * 查询业主成员信息 */ public interface ISearchOwnerMemberBMO { /** * 查询房屋信息 * @param searchDataDto * @return */ SearchDataDto query(SearchDataDto searchDataDto); } service-report/src/main/java/com/java110/report/bmo/search/ISearchRepairBMO.java
New file @@ -0,0 +1,16 @@ package com.java110.report.bmo.search; import com.java110.dto.data.SearchDataDto; /** * 查询报修信息 */ public interface ISearchRepairBMO { /** * 查询房屋信息 * @param searchDataDto * @return */ SearchDataDto query(SearchDataDto searchDataDto); } service-report/src/main/java/com/java110/report/bmo/search/ISearchRoomBMO.java
New file @@ -0,0 +1,16 @@ package com.java110.report.bmo.search; import com.java110.dto.data.SearchDataDto; /** * 查询房屋信息 */ public interface ISearchRoomBMO { /** * 查询房屋信息 * @param searchDataDto * @return */ SearchDataDto query(SearchDataDto searchDataDto); } service-report/src/main/java/com/java110/report/bmo/search/ISearchStaffBMO.java
New file @@ -0,0 +1,16 @@ package com.java110.report.bmo.search; import com.java110.dto.data.SearchDataDto; /** * 查询员工信息 */ public interface ISearchStaffBMO { /** * 查询房屋信息 * @param searchDataDto * @return */ SearchDataDto query(SearchDataDto searchDataDto); } service-report/src/main/java/com/java110/report/bmo/search/ISearchVisitBMO.java
New file @@ -0,0 +1,16 @@ package com.java110.report.bmo.search; import com.java110.dto.data.SearchDataDto; /** * 查询访客信息 */ public interface ISearchVisitBMO { /** * 查询房屋信息 * @param searchDataDto * @return */ SearchDataDto query(SearchDataDto searchDataDto); } service-report/src/main/java/com/java110/report/bmo/search/impl/SearchCarBMOImpl.java
New file @@ -0,0 +1,44 @@ package com.java110.report.bmo.search.impl; import com.java110.dto.data.SearchDataDto; import com.java110.dto.owner.OwnerCarDto; import com.java110.intf.user.IOwnerCarV1InnerServiceSMO; import com.java110.report.bmo.search.ISearchCarBMO; import com.java110.report.bmo.search.ISearchRoomBMO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; @Service public class SearchCarBMOImpl implements ISearchCarBMO { @Autowired private IOwnerCarV1InnerServiceSMO ownerCarV1InnerServiceSMOImpl; @Override public SearchDataDto query(SearchDataDto searchDataDto) { List<OwnerCarDto> ownerCarDtos = new ArrayList<>(); queryCarsByCarNum(searchDataDto, ownerCarDtos); searchDataDto.setCars(ownerCarDtos); return searchDataDto; } private void queryCarsByCarNum(SearchDataDto searchDataDto, List<OwnerCarDto> ownerCarDtos) { OwnerCarDto ownerCarDto = new OwnerCarDto(); ownerCarDto.setCarNumLike(searchDataDto.getSearchValue()); ownerCarDto.setCommunityId(searchDataDto.getCommunityId()); ownerCarDto.setCarTypeCd(OwnerCarDto.CAR_TYPE_PRIMARY); List<OwnerCarDto> tmpOwnerCarDtos = ownerCarV1InnerServiceSMOImpl.queryOwnerCars(ownerCarDto); if (tmpOwnerCarDtos == null || tmpOwnerCarDtos.size() < 1) { return; } ownerCarDtos.addAll(tmpOwnerCarDtos); } } service-report/src/main/java/com/java110/report/bmo/search/impl/SearchCarMemberBMOImpl.java
New file @@ -0,0 +1,43 @@ package com.java110.report.bmo.search.impl; import com.java110.dto.data.SearchDataDto; import com.java110.dto.owner.OwnerCarDto; import com.java110.intf.user.IOwnerCarV1InnerServiceSMO; import com.java110.report.bmo.search.ISearchCarMemberBMO; import com.java110.report.bmo.search.ISearchRoomBMO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; @Service public class SearchCarMemberBMOImpl implements ISearchCarMemberBMO { @Autowired private IOwnerCarV1InnerServiceSMO ownerCarV1InnerServiceSMOImpl; @Override public SearchDataDto query(SearchDataDto searchDataDto) { List<OwnerCarDto> ownerCarMemberDtos = new ArrayList<>(); queryCarMembersByCarNum(searchDataDto, ownerCarMemberDtos); searchDataDto.setCarMembers(ownerCarMemberDtos); return searchDataDto; } private void queryCarMembersByCarNum(SearchDataDto searchDataDto, List<OwnerCarDto> ownerCarMemberDtos) { OwnerCarDto ownerCarDto = new OwnerCarDto(); ownerCarDto.setCarNumLike(searchDataDto.getSearchValue()); ownerCarDto.setCommunityId(searchDataDto.getCommunityId()); ownerCarDto.setCarTypeCd(OwnerCarDto.CAR_TYPE_MEMBER); List<OwnerCarDto> tmpOwnerCarDtos = ownerCarV1InnerServiceSMOImpl.queryOwnerCars(ownerCarDto); if (tmpOwnerCarDtos == null || tmpOwnerCarDtos.size() < 1) { return; } ownerCarMemberDtos.addAll(tmpOwnerCarDtos); } } service-report/src/main/java/com/java110/report/bmo/search/impl/SearchContractBMOImpl.java
New file @@ -0,0 +1,72 @@ package com.java110.report.bmo.search.impl; import com.java110.dto.contract.ContractDto; import com.java110.dto.data.SearchDataDto; import com.java110.intf.store.IContractInnerServiceSMO; import com.java110.report.bmo.search.ISearchCarBMO; import com.java110.report.bmo.search.ISearchContractBMO; import com.java110.utils.util.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; @Service public class SearchContractBMOImpl implements ISearchContractBMO { @Autowired private IContractInnerServiceSMO contractInnerServiceSMOImpl; @Override public SearchDataDto query(SearchDataDto searchDataDto) { List<ContractDto> contractDtos = new ArrayList<>(); // todo 根据名称查询合同 queryContractByName(searchDataDto, contractDtos); // todo 根据手机号查询合同 queryContractByLink(searchDataDto, contractDtos); searchDataDto.setContracts(contractDtos); return searchDataDto; } /** * 根据手机号 查询 合同 * @param searchDataDto * @param contractDtos */ private void queryContractByLink(SearchDataDto searchDataDto, List<ContractDto> contractDtos) { if(StringUtil.isEmpty(searchDataDto.getTel())){ return; } ContractDto contractDto = new ContractDto(); contractDto.setPartyB(searchDataDto.getTel()); contractDto.setStoreId(searchDataDto.getStoreId()); List<ContractDto> tmpContractDtos = contractInnerServiceSMOImpl.queryContracts(contractDto); if (tmpContractDtos == null || tmpContractDtos.size() < 1) { return; } contractDtos.addAll(tmpContractDtos); } private void queryContractByName(SearchDataDto searchDataDto, List<ContractDto> contractDtos) { ContractDto contractDto = new ContractDto(); contractDto.setContractNameLike(searchDataDto.getSearchValue()); contractDto.setStoreId(searchDataDto.getStoreId()); List<ContractDto> tmpContractDtos = contractInnerServiceSMOImpl.queryContracts(contractDto); if (tmpContractDtos == null || tmpContractDtos.size() < 1) { return; } contractDtos.addAll(tmpContractDtos); } } service-report/src/main/java/com/java110/report/bmo/search/impl/SearchOwnerBMOImpl.java
New file @@ -0,0 +1,69 @@ package com.java110.report.bmo.search.impl; import com.java110.dto.data.SearchDataDto; import com.java110.dto.owner.OwnerDto; import com.java110.intf.user.IOwnerV1InnerServiceSMO; import com.java110.report.bmo.search.ISearchCarBMO; import com.java110.report.bmo.search.ISearchOwnerBMO; import com.java110.utils.util.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; @Service public class SearchOwnerBMOImpl implements ISearchOwnerBMO { @Autowired private IOwnerV1InnerServiceSMO ownerV1InnerServiceSMOImpl; @Override public SearchDataDto query(SearchDataDto searchDataDto) { List<OwnerDto> ownerDtos = new ArrayList<>(); //todo 根据名称模糊 queryOwnerByName(searchDataDto,ownerDtos); //todo 根据手机号查询 queryOwnerByLink(searchDataDto,ownerDtos); searchDataDto.setOwners(ownerDtos); return searchDataDto; } private void queryOwnerByLink(SearchDataDto searchDataDto, List<OwnerDto> ownerDtos) { if(StringUtil.isEmpty(searchDataDto.getTel())){ return ; } OwnerDto ownerDto = new OwnerDto(); ownerDto.setLink(searchDataDto.getTel()); ownerDto.setCommunityId(searchDataDto.getCommunityId()); ownerDto.setOwnerTypeCd(OwnerDto.OWNER_TYPE_CD_OWNER); List<OwnerDto> tmpOwnerDtos = ownerV1InnerServiceSMOImpl.queryOwners(ownerDto); if(tmpOwnerDtos == null || tmpOwnerDtos.size() < 1){ return ; } ownerDtos.addAll(tmpOwnerDtos); } private void queryOwnerByName(SearchDataDto searchDataDto, List<OwnerDto> ownerDtos) { OwnerDto ownerDto = new OwnerDto(); ownerDto.setNameLike(searchDataDto.getSearchValue()); ownerDto.setCommunityId(searchDataDto.getCommunityId()); ownerDto.setOwnerTypeCd(OwnerDto.OWNER_TYPE_CD_OWNER); List<OwnerDto> tmpOwnerDtos = ownerV1InnerServiceSMOImpl.queryOwners(ownerDto); if(tmpOwnerDtos == null || tmpOwnerDtos.size() < 1){ return ; } ownerDtos.addAll(tmpOwnerDtos); } } service-report/src/main/java/com/java110/report/bmo/search/impl/SearchOwnerMemberBMOImpl.java
New file @@ -0,0 +1,67 @@ package com.java110.report.bmo.search.impl; import com.java110.dto.data.SearchDataDto; import com.java110.dto.owner.OwnerDto; import com.java110.intf.user.IOwnerInnerServiceSMO; import com.java110.intf.user.IOwnerV1InnerServiceSMO; import com.java110.report.bmo.search.ISearchOwnerBMO; import com.java110.report.bmo.search.ISearchOwnerMemberBMO; import com.java110.utils.util.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; @Service public class SearchOwnerMemberBMOImpl implements ISearchOwnerMemberBMO { @Autowired private IOwnerV1InnerServiceSMO ownerV1InnerServiceSMOImpl; @Override public SearchDataDto query(SearchDataDto searchDataDto) { List<OwnerDto> ownerDtos = new ArrayList<>(); //todo 根据名称模糊 queryOwnerMemberByName(searchDataDto,ownerDtos); //todo 根据手机号查询 queryOwnerMemberByLink(searchDataDto,ownerDtos); searchDataDto.setOwnerMembers(ownerDtos); return searchDataDto; } private void queryOwnerMemberByLink(SearchDataDto searchDataDto, List<OwnerDto> ownerDtos) { if(StringUtil.isEmpty(searchDataDto.getTel())){ return ; } OwnerDto ownerDto = new OwnerDto(); ownerDto.setLink(searchDataDto.getTel()); ownerDto.setCommunityId(searchDataDto.getCommunityId()); ownerDto.setOwnerTypeCds(new String[]{OwnerDto.OWNER_TYPE_CD_MEMBER,OwnerDto.OWNER_TYPE_CD_RENTING}); List<OwnerDto> tmpOwnerDtos = ownerV1InnerServiceSMOImpl.queryOwners(ownerDto); if(tmpOwnerDtos == null || tmpOwnerDtos.size() < 1){ return ; } ownerDtos.addAll(tmpOwnerDtos); } private void queryOwnerMemberByName(SearchDataDto searchDataDto, List<OwnerDto> ownerDtos) { OwnerDto ownerDto = new OwnerDto(); ownerDto.setNameLike(searchDataDto.getSearchValue()); ownerDto.setCommunityId(searchDataDto.getCommunityId()); ownerDto.setOwnerTypeCds(new String[]{OwnerDto.OWNER_TYPE_CD_MEMBER,OwnerDto.OWNER_TYPE_CD_RENTING,OwnerDto.OWNER_TYPE_CD_TEMP,OwnerDto.OWNER_TYPE_CD_OTHER}); List<OwnerDto> tmpOwnerDtos = ownerV1InnerServiceSMOImpl.queryOwners(ownerDto); if(tmpOwnerDtos == null || tmpOwnerDtos.size() < 1){ return ; } ownerDtos.addAll(tmpOwnerDtos); } } service-report/src/main/java/com/java110/report/bmo/search/impl/SearchRepairBMOImpl.java
New file @@ -0,0 +1,67 @@ package com.java110.report.bmo.search.impl; import com.java110.dto.data.SearchDataDto; import com.java110.dto.repair.RepairDto; import com.java110.intf.community.IRepairInnerServiceSMO; import com.java110.report.bmo.search.ISearchOwnerBMO; import com.java110.report.bmo.search.ISearchRepairBMO; import com.java110.utils.util.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; @Service public class SearchRepairBMOImpl implements ISearchRepairBMO { @Autowired private IRepairInnerServiceSMO repairInnerServiceSMOImpl; @Override public SearchDataDto query(SearchDataDto searchDataDto) { List<RepairDto> repairDtos = new ArrayList<>(); // todo 根据名称查询报修 queryRepairByName(searchDataDto,repairDtos); // todo 根据手机号查询报修 queryRepairByLink(searchDataDto,repairDtos); searchDataDto.setRepairs(repairDtos); return searchDataDto; } private void queryRepairByLink(SearchDataDto searchDataDto, List<RepairDto> repairDtos) { if(StringUtil.isEmpty(searchDataDto.getTel())){ return; } RepairDto repairDto = new RepairDto(); repairDto.setCommunityId(searchDataDto.getCommunityId()); repairDto.setTel(searchDataDto.getTel()); List<RepairDto> tmpRepairDtos = repairInnerServiceSMOImpl.queryRepairs(repairDto); if(tmpRepairDtos == null || tmpRepairDtos.size() < 1){ return ; } repairDtos.addAll(tmpRepairDtos); } private void queryRepairByName(SearchDataDto searchDataDto, List<RepairDto> repairDtos) { RepairDto repairDto = new RepairDto(); repairDto.setCommunityId(searchDataDto.getCommunityId()); repairDto.setRepairNameLike(searchDataDto.getSearchValue()); List<RepairDto> tmpRepairDtos = repairInnerServiceSMOImpl.queryRepairs(repairDto); if(tmpRepairDtos == null || tmpRepairDtos.size() < 1){ return ; } repairDtos.addAll(tmpRepairDtos); } } service-report/src/main/java/com/java110/report/bmo/search/impl/SearchRoomBMOImpl.java
New file @@ -0,0 +1,78 @@ package com.java110.report.bmo.search.impl; import com.java110.dto.RoomDto; import com.java110.dto.data.SearchDataDto; import com.java110.intf.community.IRoomInnerServiceSMO; import com.java110.intf.community.IRoomV1InnerServiceSMO; import com.java110.report.bmo.search.ISearchRoomBMO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; @Service public class SearchRoomBMOImpl implements ISearchRoomBMO { @Autowired private IRoomV1InnerServiceSMO roomV1InnerServiceSMOImpl; @Autowired private IRoomInnerServiceSMO roomInnerServiceSMOImpl; @Override public SearchDataDto query(SearchDataDto searchDataDto) { List<RoomDto> roomDtos = new ArrayList<>(); // todo 根据房屋编号 查询房屋信息 queryRoomByRoomNum(searchDataDto, roomDtos); // todo 根据 楼栋单元房屋 去查询房屋信息 queryRoomByRoomName(searchDataDto, roomDtos); searchDataDto.setRooms(roomDtos); return searchDataDto; } private void queryRoomByRoomName(SearchDataDto searchDataDto, List<RoomDto> roomDtos) { if (!searchDataDto.getSearchValue().contains("-")) { return; } String[] values = searchDataDto.getSearchValue().split("-", 3); if (values.length != 3) { return; } RoomDto roomDto = new RoomDto(); roomDto.setFloorNum(values[0]); roomDto.setUnitNum(values[1]); roomDto.setRoomNum(values[2]); roomDto.setCommunityId(searchDataDto.getCommunityId()); List<RoomDto> tmpRoomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto); if (tmpRoomDtos == null || tmpRoomDtos.size() < 1) { return; } roomDtos.addAll(tmpRoomDtos); } /** * 根据房屋编号查询 * * @param searchDataDto * @param roomDtos */ private void queryRoomByRoomNum(SearchDataDto searchDataDto, List<RoomDto> roomDtos) { RoomDto roomDto = new RoomDto(); roomDto.setRoomNumLike(searchDataDto.getSearchValue()); roomDto.setCommunityId(searchDataDto.getCommunityId()); List<RoomDto> tmpRoomDtos = roomV1InnerServiceSMOImpl.queryRooms(roomDto); if (tmpRoomDtos == null || tmpRoomDtos.size() < 1) { return; } roomDtos.addAll(tmpRoomDtos); } } service-report/src/main/java/com/java110/report/bmo/search/impl/SearchStaffBMOImpl.java
New file @@ -0,0 +1,62 @@ package com.java110.report.bmo.search.impl; import com.java110.dto.data.SearchDataDto; import com.java110.dto.user.UserDto; import com.java110.intf.user.IUserInnerServiceSMO; import com.java110.report.bmo.search.ISearchRoomBMO; import com.java110.report.bmo.search.ISearchStaffBMO; import com.java110.utils.util.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; @Service public class SearchStaffBMOImpl implements ISearchStaffBMO { @Autowired private IUserInnerServiceSMO userInnerServiceSMOImpl; @Override public SearchDataDto query(SearchDataDto searchDataDto) { List<UserDto> userDtos = new ArrayList<>(); //todo 根据名称 queryStaffByName(searchDataDto, userDtos); //todo 根据手机号 queryStaffByLink(searchDataDto, userDtos); searchDataDto.setStaffs(userDtos); return searchDataDto; } private void queryStaffByLink(SearchDataDto searchDataDto, List<UserDto> userDtos) { if(StringUtil.isEmpty(searchDataDto.getTel())){ return; } UserDto userDto = new UserDto(); userDto.setTel(searchDataDto.getTel()); userDto.setStoreId(searchDataDto.getStoreId()); List<UserDto> tmpUserDtos = userInnerServiceSMOImpl.getStaffs(userDto); if(tmpUserDtos == null || tmpUserDtos.size()< 1){ return ; } userDtos.addAll(userDtos); } private void queryStaffByName(SearchDataDto searchDataDto, List<UserDto> userDtos) { UserDto userDto = new UserDto(); userDto.setNameLike(searchDataDto.getSearchValue()); userDto.setStoreId(searchDataDto.getStoreId()); List<UserDto> tmpUserDtos = userInnerServiceSMOImpl.getStaffs(userDto); if(tmpUserDtos == null || tmpUserDtos.size()< 1){ return ; } userDtos.addAll(userDtos); } } service-report/src/main/java/com/java110/report/bmo/search/impl/SearchVisitBMOImpl.java
New file @@ -0,0 +1,70 @@ package com.java110.report.bmo.search.impl; import com.java110.dto.data.SearchDataDto; import com.java110.dto.visit.VisitDto; import com.java110.intf.community.IVisitV1InnerServiceSMO; import com.java110.report.bmo.search.ISearchStaffBMO; import com.java110.report.bmo.search.ISearchVisitBMO; import com.java110.utils.util.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; @Service public class SearchVisitBMOImpl implements ISearchVisitBMO { @Autowired private IVisitV1InnerServiceSMO visitV1InnerServiceSMOImpl; @Override public SearchDataDto query(SearchDataDto searchDataDto) { List<VisitDto> visitDtos = new ArrayList<>(); // todo 查询访问 queryVisitByName(searchDataDto,visitDtos); // todo 通过电话 queryVisitByLink(searchDataDto,visitDtos); searchDataDto.setVisitDtos(visitDtos); return searchDataDto; } private void queryVisitByLink(SearchDataDto searchDataDto, List<VisitDto> visitDtos) { if(StringUtil.isEmpty(searchDataDto.getTel())){ return; } VisitDto visitDto = new VisitDto(); visitDto.setPhoneNumber(searchDataDto.getTel()); visitDto.setCommunityId(searchDataDto.getCommunityId()); List<VisitDto> tmpVisitDtos = visitV1InnerServiceSMOImpl.queryVisits(visitDto); if(tmpVisitDtos == null || tmpVisitDtos.size()< 1){ return ; } visitDtos.addAll(tmpVisitDtos); } private void queryVisitByName(SearchDataDto searchDataDto, List<VisitDto> visitDtos) { VisitDto visitDto = new VisitDto(); visitDto.setvNameLike(searchDataDto.getSearchValue()); visitDto.setCommunityId(searchDataDto.getCommunityId()); List<VisitDto> tmpVisitDtos = visitV1InnerServiceSMOImpl.queryVisits(visitDto); if(tmpVisitDtos == null || tmpVisitDtos.size()< 1){ return ; } visitDtos.addAll(tmpVisitDtos); } } service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportFeeSummaryCmd.java
@@ -6,7 +6,7 @@ import com.java110.core.context.ICmdDataFlowContext; import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; import com.java110.dto.dataPrivilegeStaff.DataPrivilegeStaffDto; import com.java110.dto.data.DataPrivilegeStaffDto; import com.java110.dto.fee.FeeConfigDto; import com.java110.dto.reportFeeMonthStatistics.ReportFeeMonthStatisticsDto; import com.java110.intf.community.IDataPrivilegeUnitV1InnerServiceSMO; service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportFeeSummaryDetailCmd.java
@@ -5,7 +5,7 @@ import com.java110.core.context.ICmdDataFlowContext; import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; import com.java110.dto.dataPrivilegeStaff.DataPrivilegeStaffDto; import com.java110.dto.data.DataPrivilegeStaffDto; import com.java110.dto.reportFeeMonthStatistics.ReportFeeMonthStatisticsDto; import com.java110.intf.community.IDataPrivilegeUnitV1InnerServiceSMO; import com.java110.intf.report.IReportFeeMonthStatisticsInnerServiceSMO; service-report/src/main/java/com/java110/report/cmd/search/SearchCommunityDataCmd.java
New file @@ -0,0 +1,104 @@ package com.java110.report.cmd.search; import com.alibaba.fastjson.JSONObject; import com.java110.core.annotation.Java110Cmd; import com.java110.core.context.ICmdDataFlowContext; import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; import com.java110.dto.data.SearchDataDto; import com.java110.report.bmo.search.*; import com.java110.utils.exception.CmdException; import com.java110.utils.util.Assert; import com.java110.utils.util.StringUtil; import com.java110.vo.ResultVo; import org.springframework.beans.factory.annotation.Autowired; import java.text.ParseException; /** * 模糊搜索,主要用于 不管在那个页面看到想要搜索的内容 就搜索一把,让操作简单化 * <p> * add by wuxw 2023-04-16 */ @Java110Cmd(serviceCode = "search.searchCommunityData") public class SearchCommunityDataCmd extends Cmd { @Autowired private ISearchRoomBMO searchRoomBMOImpl; @Autowired private ISearchOwnerBMO searchOwnerBMOImpl; @Autowired private ISearchOwnerMemberBMO searchOwnerMemberBMOImpl; @Autowired private ISearchCarBMO searchCarBMOImpl; @Autowired private ISearchCarMemberBMO searchCarMemberBMOImpl; @Autowired private ISearchContractBMO searchContractBMOImpl; @Autowired private ISearchRepairBMO searchRepairBMOImpl; @Autowired private ISearchStaffBMO searchStaffBMOImpl; @Autowired private ISearchVisitBMO searchVisitBMOImpl; @Override public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException { Assert.hasKeyAndValue(reqJson, "communityId", "未包含小区信息"); Assert.hasKeyAndValue(reqJson, "searchValue", "未包含搜索内容"); } @Override public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException { String storeId = context.getReqHeaders().get("store-id"); SearchDataDto searchDataDto = new SearchDataDto(); searchDataDto.setCommunityId(reqJson.getString("communityId")); searchDataDto.setSearchValue(reqJson.getString("searchValue")); searchDataDto.setStoreId(storeId); if (StringUtil.isNumber(reqJson.getString("searchValue"))) { searchDataDto.setTel(reqJson.getString("searchValue")); } //todo 搜索房屋 searchDataDto = searchRoomBMOImpl.query(searchDataDto); //todo 搜索业主 searchDataDto = searchOwnerBMOImpl.query(searchDataDto); //todo 搜索业主成员 searchDataDto = searchOwnerMemberBMOImpl.query(searchDataDto); //todo 搜索车辆 searchDataDto = searchCarBMOImpl.query(searchDataDto); //todo 搜索车辆成员 searchDataDto = searchCarMemberBMOImpl.query(searchDataDto); //todo 搜索合同 searchDataDto = searchContractBMOImpl.query(searchDataDto); //todo 搜索报修单 searchDataDto = searchRepairBMOImpl.query(searchDataDto); //todo 搜索员工 searchDataDto = searchStaffBMOImpl.query(searchDataDto); //todo 搜索访客 searchDataDto = searchVisitBMOImpl.query(searchDataDto); context.setResponseEntity(ResultVo.createResponseEntity(searchDataDto)); } } service-scm/src/main/java/com/java110/scm/smo/impl/SupplierV1InnerServiceSMOImpl.java
@@ -16,9 +16,9 @@ package com.java110.scm.smo.impl; import com.java110.dto.couponPropertyPool.CouponPropertyPoolDto; import com.java110.dto.couponPropertyUser.CouponPropertyUserDto; import com.java110.dto.couponPropertyUser.CouponQrCodeDto; import com.java110.dto.couponPool.CouponPropertyPoolDto; import com.java110.dto.couponPool.CouponPropertyUserDto; import com.java110.dto.couponPool.CouponQrCodeDto; import com.java110.dto.supplierCoupon.SupplierCouponDto; import com.java110.intf.acct.ICouponPropertyPoolV1InnerServiceSMO; import com.java110.intf.acct.ISupplierCouponV1InnerServiceSMO; @@ -31,13 +31,11 @@ import com.java110.utils.util.Assert; import com.java110.utils.util.BeanConvertUtil; import com.java110.core.base.smo.BaseServiceSMO; import com.java110.dto.user.UserDto; import com.java110.dto.PageDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; import java.util.List; /** service-scm/src/main/java/com/java110/scm/supplier/ISupplierAdapt.java
@@ -1,7 +1,7 @@ package com.java110.scm.supplier; import com.java110.dto.couponPropertyUser.CouponPropertyUserDto; import com.java110.dto.couponPropertyUser.CouponQrCodeDto; import com.java110.dto.couponPool.CouponPropertyUserDto; import com.java110.dto.couponPool.CouponQrCodeDto; import com.java110.dto.supplier.SupplierDto; import com.java110.dto.supplierCoupon.SupplierCouponDto; service-scm/src/main/java/com/java110/scm/supplier/defaultSupplier/DefaultSupplierAdapt.java
@@ -2,8 +2,8 @@ import com.alibaba.fastjson.JSONObject; import com.java110.core.client.RestTemplate; import com.java110.dto.couponPropertyUser.CouponPropertyUserDto; import com.java110.dto.couponPropertyUser.CouponQrCodeDto; import com.java110.dto.couponPool.CouponPropertyUserDto; import com.java110.dto.couponPool.CouponQrCodeDto; import com.java110.dto.supplier.SupplierDto; import com.java110.dto.supplierConfig.SupplierConfigDto; import com.java110.dto.supplierCoupon.SupplierCouponDto; service-store/src/main/java/com/java110/store/api/ContractApi.java
@@ -5,15 +5,15 @@ import com.alibaba.fastjson.JSONObject; import com.java110.core.factory.GenerateCodeFactory; import com.java110.dto.contract.ContractDto; import com.java110.dto.contractAttr.ContractAttrDto; import com.java110.dto.contractChangePlan.ContractChangePlanDto; import com.java110.dto.contractChangePlanDetail.ContractChangePlanDetailDto; import com.java110.dto.contractChangePlanDetailAttr.ContractChangePlanDetailAttrDto; import com.java110.dto.contractCollectionPlan.ContractCollectionPlanDto; import com.java110.dto.contractRoom.ContractRoomDto; import com.java110.dto.contractType.ContractTypeDto; import com.java110.dto.contractTypeSpec.ContractTypeSpecDto; import com.java110.dto.contractTypeTemplate.ContractTypeTemplateDto; import com.java110.dto.contract.ContractAttrDto; import com.java110.dto.contract.ContractChangePlanDto; import com.java110.dto.contract.ContractChangePlanDetailDto; import com.java110.dto.contract.ContractChangePlanDetailAttrDto; import com.java110.dto.contract.ContractCollectionPlanDto; import com.java110.dto.contract.ContractRoomDto; import com.java110.dto.contract.ContractTypeDto; import com.java110.dto.contract.ContractTypeSpecDto; import com.java110.dto.contract.ContractTypeTemplateDto; import com.java110.entity.audit.AuditUser; import com.java110.po.contract.ContractPo; import com.java110.po.contractAttr.ContractAttrPo; service-store/src/main/java/com/java110/store/api/ContractChangePlanRoomApi.java
@@ -1,7 +1,7 @@ package com.java110.store.api; import com.alibaba.fastjson.JSONObject; import com.java110.dto.contractChangePlanRoom.ContractChangePlanRoomDto; import com.java110.dto.contract.ContractChangePlanRoomDto; import com.java110.po.contractChangePlanRoom.ContractChangePlanRoomPo; import com.java110.store.bmo.contractChangePlanRoom.IDeleteContractChangePlanRoomBMO; import com.java110.store.bmo.contractChangePlanRoom.IGetContractChangePlanRoomBMO; service-store/src/main/java/com/java110/store/api/ContractFileApi.java
@@ -1,7 +1,7 @@ package com.java110.store.api; import com.alibaba.fastjson.JSONObject; import com.java110.dto.contractFile.ContractFileDto; import com.java110.dto.contract.ContractFileDto; import com.java110.po.contractFile.ContractFilePo; import com.java110.store.bmo.contractFile.IDeleteContractFileBMO; import com.java110.store.bmo.contractFile.IGetContractFileBMO; service-store/src/main/java/com/java110/store/api/ContractPartyaApi.java
@@ -1,7 +1,7 @@ package com.java110.store.api; import com.alibaba.fastjson.JSONObject; import com.java110.dto.contractPartya.ContractPartyaDto; import com.java110.dto.contract.ContractPartyaDto; import com.java110.po.contractPartya.ContractPartyaPo; import com.java110.store.bmo.contractPartya.IDeleteContractPartyaBMO; import com.java110.store.bmo.contractPartya.IGetContractPartyaBMO; service-store/src/main/java/com/java110/store/bmo/contract/IUpdateContractBMO.java
@@ -1,7 +1,7 @@ package com.java110.store.bmo.contract; import com.alibaba.fastjson.JSONObject; import com.java110.dto.contract.ContractDto; import com.java110.dto.contractChangePlan.ContractChangePlanDto; import com.java110.dto.contract.ContractChangePlanDto; import com.java110.po.contract.ContractPo; import org.springframework.http.ResponseEntity; service-store/src/main/java/com/java110/store/bmo/contract/impl/DeleteContractBMOImpl.java
@@ -2,7 +2,7 @@ import com.java110.core.annotation.Java110Transactional; import com.java110.dto.RoomDto; import com.java110.dto.contractRoom.ContractRoomDto; import com.java110.dto.contract.ContractRoomDto; import com.java110.dto.fee.FeeDto; import com.java110.dto.owner.OwnerRoomRelDto; import com.java110.intf.common.IContractApplyUserInnerServiceSMO; service-store/src/main/java/com/java110/store/bmo/contract/impl/GetContractBMOImpl.java
@@ -1,8 +1,8 @@ package com.java110.store.bmo.contract.impl; import com.java110.dto.contract.ContractDto; import com.java110.dto.contractAttr.ContractAttrDto; import com.java110.dto.contractChangePlan.ContractChangePlanDto; import com.java110.dto.contract.ContractAttrDto; import com.java110.dto.contract.ContractChangePlanDto; import com.java110.entity.audit.AuditUser; import com.java110.intf.common.IContractApplyUserInnerServiceSMO; import com.java110.intf.common.IContractChangeUserInnerServiceSMO; service-store/src/main/java/com/java110/store/bmo/contract/impl/SaveContractBMOImpl.java
@@ -6,7 +6,7 @@ import com.java110.core.factory.GenerateCodeFactory; import com.java110.dto.RoomDto; import com.java110.dto.contract.ContractDto; import com.java110.dto.contractType.ContractTypeDto; import com.java110.dto.contract.ContractTypeDto; import com.java110.dto.fee.FeeDto; import com.java110.dto.owner.OwnerRoomRelDto; import com.java110.dto.rentingPool.RentingPoolDto; service-store/src/main/java/com/java110/store/bmo/contract/impl/UpdateContractBMOImpl.java
@@ -6,11 +6,11 @@ import com.java110.core.factory.GenerateCodeFactory; import com.java110.dto.RoomDto; import com.java110.dto.contract.ContractDto; import com.java110.dto.contractAttr.ContractAttrDto; import com.java110.dto.contractChangePlan.ContractChangePlanDto; import com.java110.dto.contractChangePlanDetail.ContractChangePlanDetailDto; import com.java110.dto.contractChangePlanRoom.ContractChangePlanRoomDto; import com.java110.dto.contractRoom.ContractRoomDto; import com.java110.dto.contract.ContractAttrDto; import com.java110.dto.contract.ContractChangePlanDto; import com.java110.dto.contract.ContractChangePlanDetailDto; import com.java110.dto.contract.ContractChangePlanRoomDto; import com.java110.dto.contract.ContractRoomDto; import com.java110.dto.fee.FeeDto; import com.java110.dto.owner.OwnerRoomRelDto; import com.java110.dto.rentingPool.RentingPoolDto; service-store/src/main/java/com/java110/store/bmo/contractAttr/IGetContractAttrBMO.java
@@ -1,6 +1,6 @@ package com.java110.store.bmo.contractAttr; import com.java110.dto.contractAttr.ContractAttrDto; import com.java110.dto.contract.ContractAttrDto; import org.springframework.http.ResponseEntity; public interface IGetContractAttrBMO { service-store/src/main/java/com/java110/store/bmo/contractAttr/impl/GetContractAttrBMOImpl.java
@@ -1,6 +1,6 @@ package com.java110.store.bmo.contractAttr.impl; import com.java110.dto.contractAttr.ContractAttrDto; import com.java110.dto.contract.ContractAttrDto; import com.java110.intf.store.IContractAttrInnerServiceSMO; import com.java110.store.bmo.contractAttr.IGetContractAttrBMO; import com.java110.vo.ResultVo; service-store/src/main/java/com/java110/store/bmo/contractChangePlan/IGetContractChangePlanBMO.java
@@ -1,5 +1,5 @@ package com.java110.store.bmo.contractChangePlan; import com.java110.dto.contractChangePlan.ContractChangePlanDto; import com.java110.dto.contract.ContractChangePlanDto; import org.springframework.http.ResponseEntity; public interface IGetContractChangePlanBMO { service-store/src/main/java/com/java110/store/bmo/contractChangePlan/impl/GetContractChangePlanBMOImpl.java
@@ -1,6 +1,6 @@ package com.java110.store.bmo.contractChangePlan.impl; import com.java110.dto.contractChangePlan.ContractChangePlanDto; import com.java110.dto.contract.ContractChangePlanDto; import com.java110.intf.store.IContractChangePlanInnerServiceSMO; import com.java110.store.bmo.contractChangePlan.IGetContractChangePlanBMO; import com.java110.vo.ResultVo; service-store/src/main/java/com/java110/store/bmo/contractChangePlan/impl/SaveContractChangePlanBMOImpl.java
@@ -5,11 +5,11 @@ import com.java110.core.factory.GenerateCodeFactory; import com.java110.dto.RoomDto; import com.java110.dto.contract.ContractDto; import com.java110.dto.contractChangePlan.ContractChangePlanDto; import com.java110.dto.contractChangePlanDetail.ContractChangePlanDetailDto; import com.java110.dto.contractChangePlanRoom.ContractChangePlanRoomDto; import com.java110.dto.contractRoom.ContractRoomDto; import com.java110.dto.contractType.ContractTypeDto; import com.java110.dto.contract.ContractChangePlanDto; import com.java110.dto.contract.ContractChangePlanDetailDto; import com.java110.dto.contract.ContractChangePlanRoomDto; import com.java110.dto.contract.ContractRoomDto; import com.java110.dto.contract.ContractTypeDto; import com.java110.dto.owner.OwnerRoomRelDto; import com.java110.intf.common.IContractChangeUserInnerServiceSMO; import com.java110.intf.community.IRoomInnerServiceSMO; service-store/src/main/java/com/java110/store/bmo/contractChangePlanDetail/IGetContractChangePlanDetailBMO.java
@@ -1,5 +1,5 @@ package com.java110.store.bmo.contractChangePlanDetail; import com.java110.dto.contractChangePlanDetail.ContractChangePlanDetailDto; import com.java110.dto.contract.ContractChangePlanDetailDto; import org.springframework.http.ResponseEntity; public interface IGetContractChangePlanDetailBMO { service-store/src/main/java/com/java110/store/bmo/contractChangePlanDetail/impl/GetContractChangePlanDetailBMOImpl.java
@@ -1,6 +1,6 @@ package com.java110.store.bmo.contractChangePlanDetail.impl; import com.java110.dto.contractChangePlanDetail.ContractChangePlanDetailDto; import com.java110.dto.contract.ContractChangePlanDetailDto; import com.java110.intf.store.IContractChangePlanDetailInnerServiceSMO; import com.java110.store.bmo.contractChangePlanDetail.IGetContractChangePlanDetailBMO; import com.java110.vo.ResultVo; service-store/src/main/java/com/java110/store/bmo/contractChangePlanDetailAttr/IGetContractChangePlanDetailAttrBMO.java
@@ -1,5 +1,5 @@ package com.java110.store.bmo.contractChangePlanDetailAttr; import com.java110.dto.contractChangePlanDetailAttr.ContractChangePlanDetailAttrDto; import com.java110.dto.contract.ContractChangePlanDetailAttrDto; import org.springframework.http.ResponseEntity; public interface IGetContractChangePlanDetailAttrBMO { service-store/src/main/java/com/java110/store/bmo/contractChangePlanDetailAttr/impl/GetContractChangePlanDetailAttrBMOImpl.java
@@ -1,6 +1,6 @@ package com.java110.store.bmo.contractChangePlanDetailAttr.impl; import com.java110.dto.contractChangePlanDetailAttr.ContractChangePlanDetailAttrDto; import com.java110.dto.contract.ContractChangePlanDetailAttrDto; import com.java110.intf.store.IContractChangePlanDetailAttrInnerServiceSMO; import com.java110.store.bmo.contractChangePlanDetailAttr.IGetContractChangePlanDetailAttrBMO; import com.java110.vo.ResultVo; service-store/src/main/java/com/java110/store/bmo/contractChangePlanRoom/IGetContractChangePlanRoomBMO.java
@@ -1,5 +1,5 @@ package com.java110.store.bmo.contractChangePlanRoom; import com.java110.dto.contractChangePlanRoom.ContractChangePlanRoomDto; import com.java110.dto.contract.ContractChangePlanRoomDto; import org.springframework.http.ResponseEntity; public interface IGetContractChangePlanRoomBMO { service-store/src/main/java/com/java110/store/bmo/contractChangePlanRoom/impl/GetContractChangePlanRoomBMOImpl.java
@@ -1,6 +1,6 @@ package com.java110.store.bmo.contractChangePlanRoom.impl; import com.java110.dto.contractChangePlanRoom.ContractChangePlanRoomDto; import com.java110.dto.contract.ContractChangePlanRoomDto; import com.java110.intf.store.IContractChangePlanRoomInnerServiceSMO; import com.java110.store.bmo.contractChangePlanRoom.IGetContractChangePlanRoomBMO; import com.java110.vo.ResultVo; service-store/src/main/java/com/java110/store/bmo/contractCollectionPlan/IGetContractCollectionPlanBMO.java
@@ -1,5 +1,5 @@ package com.java110.store.bmo.contractCollectionPlan; import com.java110.dto.contractCollectionPlan.ContractCollectionPlanDto; import com.java110.dto.contract.ContractCollectionPlanDto; import org.springframework.http.ResponseEntity; public interface IGetContractCollectionPlanBMO { service-store/src/main/java/com/java110/store/bmo/contractCollectionPlan/impl/GetContractCollectionPlanBMOImpl.java
@@ -1,6 +1,6 @@ package com.java110.store.bmo.contractCollectionPlan.impl; import com.java110.dto.contractCollectionPlan.ContractCollectionPlanDto; import com.java110.dto.contract.ContractCollectionPlanDto; import com.java110.intf.store.IContractCollectionPlanInnerServiceSMO; import com.java110.store.bmo.contractCollectionPlan.IGetContractCollectionPlanBMO; import com.java110.vo.ResultVo; service-store/src/main/java/com/java110/store/bmo/contractFile/IGetContractFileBMO.java
@@ -1,5 +1,5 @@ package com.java110.store.bmo.contractFile; import com.java110.dto.contractFile.ContractFileDto; import com.java110.dto.contract.ContractFileDto; import org.springframework.http.ResponseEntity; public interface IGetContractFileBMO { service-store/src/main/java/com/java110/store/bmo/contractFile/impl/GetContractFileBMOImpl.java
@@ -1,6 +1,6 @@ package com.java110.store.bmo.contractFile.impl; import com.java110.dto.contractFile.ContractFileDto; import com.java110.dto.contract.ContractFileDto; import com.java110.intf.store.IContractFileInnerServiceSMO; import com.java110.store.bmo.contractFile.IGetContractFileBMO; import com.java110.utils.cache.MappingCache; service-store/src/main/java/com/java110/store/bmo/contractPartya/IGetContractPartyaBMO.java
@@ -1,5 +1,5 @@ package com.java110.store.bmo.contractPartya; import com.java110.dto.contractPartya.ContractPartyaDto; import com.java110.dto.contract.ContractPartyaDto; import org.springframework.http.ResponseEntity; public interface IGetContractPartyaBMO { service-store/src/main/java/com/java110/store/bmo/contractPartya/impl/GetContractPartyaBMOImpl.java
@@ -1,6 +1,6 @@ package com.java110.store.bmo.contractPartya.impl; import com.java110.dto.contractPartya.ContractPartyaDto; import com.java110.dto.contract.ContractPartyaDto; import com.java110.intf.store.IContractPartyaInnerServiceSMO; import com.java110.store.bmo.contractPartya.IGetContractPartyaBMO; import com.java110.vo.ResultVo; service-store/src/main/java/com/java110/store/bmo/contractRoom/IGetContractRoomBMO.java
@@ -1,5 +1,5 @@ package com.java110.store.bmo.contractRoom; import com.java110.dto.contractRoom.ContractRoomDto; import com.java110.dto.contract.ContractRoomDto; import org.springframework.http.ResponseEntity; public interface IGetContractRoomBMO { service-store/src/main/java/com/java110/store/bmo/contractRoom/impl/GetContractRoomBMOImpl.java
@@ -1,6 +1,6 @@ package com.java110.store.bmo.contractRoom.impl; import com.java110.dto.contractRoom.ContractRoomDto; import com.java110.dto.contract.ContractRoomDto; import com.java110.intf.store.IContractRoomInnerServiceSMO; import com.java110.store.bmo.contractRoom.IGetContractRoomBMO; import com.java110.vo.ResultVo; service-store/src/main/java/com/java110/store/bmo/contractType/IGetContractTypeBMO.java
@@ -1,6 +1,6 @@ package com.java110.store.bmo.contractType; import com.java110.dto.contractType.ContractTypeDto; import com.java110.dto.contract.ContractTypeDto; import org.springframework.http.ResponseEntity; public interface IGetContractTypeBMO { service-store/src/main/java/com/java110/store/bmo/contractType/impl/GetContractTypeBMOImpl.java
@@ -1,6 +1,6 @@ package com.java110.store.bmo.contractType.impl; import com.java110.dto.contractType.ContractTypeDto; import com.java110.dto.contract.ContractTypeDto; import com.java110.intf.store.IContractTypeInnerServiceSMO; import com.java110.store.bmo.contractType.IGetContractTypeBMO; import com.java110.vo.ResultVo; service-store/src/main/java/com/java110/store/bmo/contractTypeSpec/IGetContractTypeSpecBMO.java
@@ -1,6 +1,6 @@ package com.java110.store.bmo.contractTypeSpec; import com.java110.dto.contractTypeSpec.ContractTypeSpecDto; import com.java110.dto.contract.ContractTypeSpecDto; import org.springframework.http.ResponseEntity; public interface IGetContractTypeSpecBMO { service-store/src/main/java/com/java110/store/bmo/contractTypeSpec/impl/GetContractTypeSpecBMOImpl.java
@@ -1,6 +1,6 @@ package com.java110.store.bmo.contractTypeSpec.impl; import com.java110.dto.contractTypeSpec.ContractTypeSpecDto; import com.java110.dto.contract.ContractTypeSpecDto; import com.java110.intf.store.IContractTypeSpecInnerServiceSMO; import com.java110.store.bmo.contractTypeSpec.IGetContractTypeSpecBMO; import com.java110.vo.ResultVo; service-store/src/main/java/com/java110/store/bmo/contractTypeTemplate/IGetContractTypeTemplateBMO.java
@@ -1,6 +1,6 @@ package com.java110.store.bmo.contractTypeTemplate; import com.java110.dto.contractTypeTemplate.ContractTypeTemplateDto; import com.java110.dto.contract.ContractTypeTemplateDto; import org.springframework.http.ResponseEntity; public interface IGetContractTypeTemplateBMO { service-store/src/main/java/com/java110/store/bmo/contractTypeTemplate/IPrintContractTemplateBMO.java
@@ -1,8 +1,8 @@ package com.java110.store.bmo.contractTypeTemplate; import com.java110.dto.contract.ContractDto; import com.java110.dto.contractTypeSpec.ContractTypeSpecDto; import com.java110.dto.contractTypeTemplate.ContractTypeTemplateDto; import com.java110.dto.contract.ContractTypeSpecDto; import com.java110.dto.contract.ContractTypeTemplateDto; import org.springframework.http.ResponseEntity; public interface IPrintContractTemplateBMO { service-store/src/main/java/com/java110/store/bmo/contractTypeTemplate/impl/GetContractTypeTemplateBMOImpl.java
@@ -1,6 +1,6 @@ package com.java110.store.bmo.contractTypeTemplate.impl; import com.java110.dto.contractTypeTemplate.ContractTypeTemplateDto; import com.java110.dto.contract.ContractTypeTemplateDto; import com.java110.intf.store.IContractTypeTemplateInnerServiceSMO; import com.java110.store.bmo.contractTypeTemplate.IGetContractTypeTemplateBMO; import com.java110.vo.ResultVo; service-store/src/main/java/com/java110/store/bmo/contractTypeTemplate/impl/PrintContractTemplateBMOImpl.java
@@ -1,9 +1,9 @@ package com.java110.store.bmo.contractTypeTemplate.impl; import com.java110.dto.contract.ContractDto; import com.java110.dto.contractAttr.ContractAttrDto; import com.java110.dto.contractTypeSpec.ContractTypeSpecDto; import com.java110.dto.contractTypeTemplate.ContractTypeTemplateDto; import com.java110.dto.contract.ContractAttrDto; import com.java110.dto.contract.ContractTypeSpecDto; import com.java110.dto.contract.ContractTypeTemplateDto; import com.java110.entity.mapping.Mapping; import com.java110.intf.store.IContractAttrInnerServiceSMO; import com.java110.intf.store.IContractInnerServiceSMO; service-store/src/main/java/com/java110/store/cmd/contract/QueryContractByRoomIdCmd.java
@@ -6,8 +6,8 @@ import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; import com.java110.dto.contract.ContractDto; import com.java110.dto.contractAttr.ContractAttrDto; import com.java110.dto.contractRoom.ContractRoomDto; import com.java110.dto.contract.ContractAttrDto; import com.java110.dto.contract.ContractRoomDto; import com.java110.intf.common.IContractApplyUserInnerServiceSMO; import com.java110.intf.common.IContractChangeUserInnerServiceSMO; import com.java110.intf.store.IContractAttrInnerServiceSMO; @@ -16,7 +16,6 @@ import com.java110.utils.exception.CmdException; import com.java110.utils.util.Assert; import com.java110.utils.util.BeanConvertUtil; import com.java110.utils.util.DateUtil; import com.java110.vo.ResultVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; service-store/src/main/java/com/java110/store/cmd/contract/QueryContractCmd.java
@@ -6,7 +6,7 @@ import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; import com.java110.dto.contract.ContractDto; import com.java110.dto.contractAttr.ContractAttrDto; import com.java110.dto.contract.ContractAttrDto; import com.java110.intf.common.IContractApplyUserInnerServiceSMO; import com.java110.intf.common.IContractChangeUserInnerServiceSMO; import com.java110.intf.store.IContractAttrInnerServiceSMO; service-store/src/main/java/com/java110/store/cmd/reserve/ListReserveParamsCmd.java
@@ -20,8 +20,6 @@ import com.java110.core.context.ICmdDataFlowContext; import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; import com.java110.dto.communitySpace.CommunitySpaceDto; import com.java110.dto.communitySpaceOpenTime.CommunitySpaceOpenTimeDto; import com.java110.dto.reserveParamsOpenTime.ReserveParamsOpenTimeDto; import com.java110.intf.store.IReserveParamsOpenTimeV1InnerServiceSMO; import com.java110.intf.store.IReserveParamsV1InnerServiceSMO; service-store/src/main/java/com/java110/store/cmd/reserveOrder/DeleteReserveGoodsPersonCmd.java
@@ -21,17 +21,13 @@ import com.java110.core.context.ICmdDataFlowContext; import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; import com.java110.dto.communitySpacePerson.CommunitySpacePersonDto; import com.java110.dto.communitySpacePersonTime.CommunitySpacePersonTimeDto; import com.java110.dto.communitySpace.CommunitySpacePersonDto; import com.java110.dto.communitySpace.CommunitySpacePersonTimeDto; import com.java110.dto.onlinePay.OnlinePayDto; import com.java110.dto.reserveGoodsOrder.ReserveGoodsOrderDto; import com.java110.intf.acct.IOnlinePayV1InnerServiceSMO; import com.java110.intf.community.ICommunitySpacePersonTimeV1InnerServiceSMO; import com.java110.intf.community.ICommunitySpacePersonV1InnerServiceSMO; import com.java110.intf.store.IReserveGoodsOrderTimeV1InnerServiceSMO; import com.java110.intf.store.IReserveGoodsOrderV1InnerServiceSMO; import com.java110.po.communitySpacePerson.CommunitySpacePersonPo; import com.java110.po.communitySpacePersonTime.CommunitySpacePersonTimePo; import com.java110.po.onlinePay.OnlinePayPo; import com.java110.po.reserveGoodsOrder.ReserveGoodsOrderPo; import com.java110.po.reserveGoodsOrderTime.ReserveGoodsOrderTimePo; service-store/src/main/java/com/java110/store/cmd/reserveOrder/SaveReserveGoodsConfirmOrderCmd.java
@@ -22,19 +22,15 @@ import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; import com.java110.core.factory.GenerateCodeFactory; import com.java110.dto.communitySpaceConfirmOrder.CommunitySpaceConfirmOrderDto; import com.java110.dto.communitySpacePersonTime.CommunitySpacePersonTimeDto; import com.java110.dto.reserveGoods.ReserveGoodsDto; import com.java110.dto.communitySpace.CommunitySpacePersonTimeDto; import com.java110.dto.reserveGoodsConfirmOrder.ReserveGoodsConfirmOrderDto; import com.java110.dto.reserveGoodsOrder.ReserveGoodsOrderDto; import com.java110.dto.reserveGoodsOrderTime.ReserveGoodsOrderTimeDto; import com.java110.intf.store.IReserveGoodsConfirmOrderV1InnerServiceSMO; import com.java110.intf.store.IReserveGoodsOrderTimeV1InnerServiceSMO; import com.java110.intf.store.IReserveGoodsOrderV1InnerServiceSMO; import com.java110.po.communitySpacePersonTime.CommunitySpacePersonTimePo; import com.java110.po.reserveGoodsConfirmOrder.ReserveGoodsConfirmOrderPo; import com.java110.po.reserveGoodsOrderTime.ReserveGoodsOrderTimePo; import com.java110.store.dao.IReserveGoodsOrderTimeV1ServiceDao; import com.java110.utils.exception.CmdException; import com.java110.utils.util.Assert; import com.java110.utils.util.BeanConvertUtil; service-store/src/main/java/com/java110/store/cmd/reserveOrder/SaveReserveGoodsOrderCmd.java
@@ -23,8 +23,6 @@ import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; import com.java110.core.factory.GenerateCodeFactory; import com.java110.dto.communitySpacePerson.CommunitySpacePersonDto; import com.java110.dto.communitySpacePersonTime.CommunitySpacePersonTimeDto; import com.java110.dto.reserveGoods.ReserveGoodsDto; import com.java110.dto.reserveGoodsOrder.ReserveGoodsOrderDto; import com.java110.dto.reserveGoodsOrderTime.ReserveGoodsOrderTimeDto; @@ -32,7 +30,6 @@ import com.java110.intf.store.IReserveGoodsOrderTimeV1InnerServiceSMO; import com.java110.intf.store.IReserveGoodsOrderV1InnerServiceSMO; import com.java110.intf.store.IReserveGoodsV1InnerServiceSMO; import com.java110.po.communitySpacePersonTime.CommunitySpacePersonTimePo; import com.java110.po.reserveGoodsOrder.ReserveGoodsOrderPo; import com.java110.po.reserveGoodsOrderTime.ReserveGoodsOrderTimePo; import com.java110.utils.exception.CmdException; @@ -45,7 +42,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.awt.color.CMMException; import java.util.Arrays; import java.util.Calendar; import java.util.List; service-store/src/main/java/com/java110/store/smo/impl/ClassesTimeV1InnerServiceSMOImpl.java
@@ -18,17 +18,15 @@ import com.java110.store.dao.IClassesTimeV1ServiceDao; import com.java110.intf.store.IClassesTimeV1InnerServiceSMO; import com.java110.dto.classesTime.ClassesTimeDto; import com.java110.dto.classes.ClassesTimeDto; import com.java110.po.classesTime.ClassesTimePo; import com.java110.utils.util.BeanConvertUtil; import com.java110.core.base.smo.BaseServiceSMO; import com.java110.dto.user.UserDto; import com.java110.dto.PageDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; import java.util.List; /** service-store/src/main/java/com/java110/store/smo/impl/ClassesV1InnerServiceSMOImpl.java
@@ -16,7 +16,7 @@ package com.java110.store.smo.impl; import com.java110.dto.classesTime.ClassesTimeDto; import com.java110.dto.classes.ClassesTimeDto; import com.java110.intf.store.IClassesTimeV1InnerServiceSMO; import com.java110.store.dao.IClassesV1ServiceDao; import com.java110.intf.store.IClassesV1InnerServiceSMO; @@ -24,7 +24,6 @@ import com.java110.po.classes.ClassesPo; import com.java110.utils.util.BeanConvertUtil; import com.java110.core.base.smo.BaseServiceSMO; import com.java110.dto.user.UserDto; import com.java110.dto.PageDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; service-store/src/main/java/com/java110/store/smo/impl/ContractAttrInnerServiceSMOImpl.java
@@ -3,7 +3,7 @@ import com.java110.core.base.smo.BaseServiceSMO; import com.java110.dto.PageDto; import com.java110.dto.contractAttr.ContractAttrDto; import com.java110.dto.contract.ContractAttrDto; import com.java110.intf.store.IContractAttrInnerServiceSMO; import com.java110.po.contractAttr.ContractAttrPo; import com.java110.store.dao.IContractAttrServiceDao; service-store/src/main/java/com/java110/store/smo/impl/ContractChangePlanDetailAttrInnerServiceSMOImpl.java
@@ -3,7 +3,7 @@ import com.java110.core.base.smo.BaseServiceSMO; import com.java110.dto.PageDto; import com.java110.dto.contractChangePlanDetailAttr.ContractChangePlanDetailAttrDto; import com.java110.dto.contract.ContractChangePlanDetailAttrDto; import com.java110.intf.store.IContractChangePlanDetailAttrInnerServiceSMO; import com.java110.po.contractChangePlanDetailAttr.ContractChangePlanDetailAttrPo; import com.java110.store.dao.IContractChangePlanDetailAttrServiceDao; service-store/src/main/java/com/java110/store/smo/impl/ContractChangePlanDetailInnerServiceSMOImpl.java
@@ -3,7 +3,7 @@ import com.java110.core.base.smo.BaseServiceSMO; import com.java110.dto.PageDto; import com.java110.dto.contractChangePlanDetail.ContractChangePlanDetailDto; import com.java110.dto.contract.ContractChangePlanDetailDto; import com.java110.intf.store.IContractChangePlanDetailInnerServiceSMO; import com.java110.po.contractChangePlanDetail.ContractChangePlanDetailPo; import com.java110.store.dao.IContractChangePlanDetailServiceDao; service-store/src/main/java/com/java110/store/smo/impl/ContractChangePlanInnerServiceSMOImpl.java
@@ -3,7 +3,7 @@ import com.java110.core.base.smo.BaseServiceSMO; import com.java110.dto.PageDto; import com.java110.dto.contractChangePlan.ContractChangePlanDto; import com.java110.dto.contract.ContractChangePlanDto; import com.java110.dto.user.UserDto; import com.java110.intf.store.IContractChangePlanInnerServiceSMO; import com.java110.intf.user.IUserInnerServiceSMO; service-store/src/main/java/com/java110/store/smo/impl/ContractChangePlanRoomInnerServiceSMOImpl.java
@@ -4,16 +4,14 @@ import com.java110.intf.store.IContractChangePlanRoomInnerServiceSMO; import com.java110.po.contractChangePlanRoom.ContractChangePlanRoomPo; import com.java110.store.dao.IContractChangePlanRoomServiceDao; import com.java110.dto.contractChangePlanRoom.ContractChangePlanRoomDto; import com.java110.dto.contract.ContractChangePlanRoomDto; import com.java110.utils.util.BeanConvertUtil; import com.java110.core.base.smo.BaseServiceSMO; import com.java110.dto.user.UserDto; import com.java110.dto.PageDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; import java.util.List; /** service-store/src/main/java/com/java110/store/smo/impl/ContractCollectionPlanInnerServiceSMOImpl.java
@@ -3,7 +3,7 @@ import com.java110.core.base.smo.BaseServiceSMO; import com.java110.dto.PageDto; import com.java110.dto.contractCollectionPlan.ContractCollectionPlanDto; import com.java110.dto.contract.ContractCollectionPlanDto; import com.java110.intf.store.IContractCollectionPlanInnerServiceSMO; import com.java110.po.contractCollectionPlan.ContractCollectionPlanPo; import com.java110.store.dao.IContractCollectionPlanServiceDao; service-store/src/main/java/com/java110/store/smo/impl/ContractFileInnerServiceSMOImpl.java
@@ -4,16 +4,14 @@ import com.java110.intf.store.IContractFileInnerServiceSMO; import com.java110.po.contractFile.ContractFilePo; import com.java110.store.dao.IContractFileServiceDao; import com.java110.dto.contractFile.ContractFileDto; import com.java110.dto.contract.ContractFileDto; import com.java110.utils.util.BeanConvertUtil; import com.java110.core.base.smo.BaseServiceSMO; import com.java110.dto.user.UserDto; import com.java110.dto.PageDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; import java.util.List; /** service-store/src/main/java/com/java110/store/smo/impl/ContractPartyaInnerServiceSMOImpl.java
@@ -3,7 +3,7 @@ import com.java110.core.base.smo.BaseServiceSMO; import com.java110.dto.PageDto; import com.java110.dto.contractPartya.ContractPartyaDto; import com.java110.dto.contract.ContractPartyaDto; import com.java110.intf.store.IContractPartyaInnerServiceSMO; import com.java110.po.contractPartya.ContractPartyaPo; import com.java110.store.dao.IContractPartyaServiceDao; service-store/src/main/java/com/java110/store/smo/impl/ContractRoomInnerServiceSMOImpl.java
@@ -4,7 +4,7 @@ import com.java110.core.base.smo.BaseServiceSMO; import com.java110.dto.PageDto; import com.java110.dto.RoomDto; import com.java110.dto.contractRoom.ContractRoomDto; import com.java110.dto.contract.ContractRoomDto; import com.java110.intf.community.IRoomInnerServiceSMO; import com.java110.intf.store.IContractRoomInnerServiceSMO; import com.java110.po.contractRoom.ContractRoomPo; service-store/src/main/java/com/java110/store/smo/impl/ContractTypeInnerServiceSMOImpl.java
@@ -2,7 +2,7 @@ import com.java110.core.base.smo.BaseServiceSMO; import com.java110.dto.PageDto; import com.java110.dto.contractType.ContractTypeDto; import com.java110.dto.contract.ContractTypeDto; import com.java110.intf.store.IContractTypeInnerServiceSMO; import com.java110.po.contractType.ContractTypePo; import com.java110.store.dao.IContractTypeServiceDao; service-store/src/main/java/com/java110/store/smo/impl/ContractTypeSpecInnerServiceSMOImpl.java
@@ -3,7 +3,7 @@ import com.java110.core.base.smo.BaseServiceSMO; import com.java110.dto.PageDto; import com.java110.dto.contractTypeSpec.ContractTypeSpecDto; import com.java110.dto.contract.ContractTypeSpecDto; import com.java110.intf.store.IContractTypeSpecInnerServiceSMO; import com.java110.po.contractTypeSpec.ContractTypeSpecPo; import com.java110.store.dao.IContractTypeSpecServiceDao; service-store/src/main/java/com/java110/store/smo/impl/ContractTypeTemplateInnerServiceSMOImpl.java
@@ -3,7 +3,7 @@ import com.java110.core.base.smo.BaseServiceSMO; import com.java110.dto.PageDto; import com.java110.dto.contractTypeTemplate.ContractTypeTemplateDto; import com.java110.dto.contract.ContractTypeTemplateDto; import com.java110.intf.store.IContractTypeTemplateInnerServiceSMO; import com.java110.po.contractTypeTemplate.ContractTypeTemplatePo; import com.java110.store.dao.IContractTypeTemplateServiceDao; service-user/src/main/java/com/java110/user/cmd/dataPrivilegeStaff/ListDataPrivilegeStaffCmd.java
@@ -25,7 +25,7 @@ import com.java110.utils.util.BeanConvertUtil; import com.java110.vo.ResultVo; import org.springframework.beans.factory.annotation.Autowired; import com.java110.dto.dataPrivilegeStaff.DataPrivilegeStaffDto; import com.java110.dto.data.DataPrivilegeStaffDto; import java.util.List; import java.util.ArrayList; import org.springframework.http.ResponseEntity; service-user/src/main/java/com/java110/user/cmd/dataPrivilegeStaff/ListStaffNotInDataPrivilegeCmd.java
@@ -20,7 +20,7 @@ import com.java110.core.context.ICmdDataFlowContext; import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; import com.java110.dto.dataPrivilegeStaff.DataPrivilegeStaffDto; import com.java110.dto.data.DataPrivilegeStaffDto; import com.java110.dto.user.UserDto; import com.java110.intf.user.IDataPrivilegeStaffV1InnerServiceSMO; import com.java110.utils.exception.CmdException; service-user/src/main/java/com/java110/user/cmd/examine/ListExamineStaffCmd.java
@@ -20,15 +20,13 @@ import com.java110.core.context.ICmdDataFlowContext; import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; import com.java110.dto.examineStaffIntroduction.ExamineStaffIntroductionDto; import com.java110.dto.examineStaffProject.ExamineStaffProjectDto; import com.java110.dto.examineProject.ExamineStaffIntroductionDto; import com.java110.dto.examineProject.ExamineStaffProjectDto; import com.java110.dto.file.FileRelDto; import com.java110.dto.owner.OwnerDto; import com.java110.intf.common.IFileRelInnerServiceSMO; import com.java110.intf.user.IExamineStaffIntroductionV1InnerServiceSMO; import com.java110.intf.user.IExamineStaffProjectV1InnerServiceSMO; import com.java110.intf.user.IExamineStaffV1InnerServiceSMO; import com.java110.po.examineStaffProject.ExamineStaffProjectPo; import com.java110.utils.cache.MappingCache; import com.java110.utils.constant.MappingConstant; import com.java110.utils.exception.CmdException; @@ -36,7 +34,7 @@ import com.java110.utils.util.BeanConvertUtil; import com.java110.vo.ResultVo; import org.springframework.beans.factory.annotation.Autowired; import com.java110.dto.examineStaff.ExamineStaffDto; import com.java110.dto.examineProject.ExamineStaffDto; import java.util.List; import java.util.ArrayList; service-user/src/main/java/com/java110/user/cmd/examine/ListExamineStaffIntroductionCmd.java
@@ -26,7 +26,7 @@ import com.java110.utils.util.BeanConvertUtil; import com.java110.vo.ResultVo; import org.springframework.beans.factory.annotation.Autowired; import com.java110.dto.examineStaffIntroduction.ExamineStaffIntroductionDto; import com.java110.dto.examineProject.ExamineStaffIntroductionDto; import java.util.List; import java.util.ArrayList; import org.springframework.http.ResponseEntity; service-user/src/main/java/com/java110/user/cmd/examine/ListExamineStaffProjectCmd.java
@@ -26,7 +26,7 @@ import com.java110.utils.util.BeanConvertUtil; import com.java110.vo.ResultVo; import org.springframework.beans.factory.annotation.Autowired; import com.java110.dto.examineStaffProject.ExamineStaffProjectDto; import com.java110.dto.examineProject.ExamineStaffProjectDto; import java.util.List; import java.util.ArrayList; import org.springframework.http.ResponseEntity; service-user/src/main/java/com/java110/user/cmd/examine/ListExamineStaffValueCmd.java
@@ -26,7 +26,7 @@ import com.java110.utils.util.BeanConvertUtil; import com.java110.vo.ResultVo; import org.springframework.beans.factory.annotation.Autowired; import com.java110.dto.examineStaffValue.ExamineStaffValueDto; import com.java110.dto.examineProject.ExamineStaffValueDto; import java.util.List; import java.util.ArrayList; service-user/src/main/java/com/java110/user/cmd/examine/SaveExamineStaffValueCmd.java
@@ -24,8 +24,8 @@ import com.java110.core.event.cmd.CmdEvent; import com.java110.core.factory.GenerateCodeFactory; import com.java110.dto.RoomDto; import com.java110.dto.examineStaff.ExamineStaffDto; import com.java110.dto.examineStaffValue.ExamineStaffValueDto; import com.java110.dto.examineProject.ExamineStaffDto; import com.java110.dto.examineProject.ExamineStaffValueDto; import com.java110.dto.owner.OwnerAppUserDto; import com.java110.dto.owner.OwnerDto; import com.java110.dto.owner.OwnerRoomRelDto; @@ -35,7 +35,6 @@ import com.java110.po.examineStaffValue.ExamineStaffValuePo; import com.java110.utils.exception.CmdException; import com.java110.utils.util.Assert; import com.java110.utils.util.BeanConvertUtil; import com.java110.utils.util.DateUtil; import com.java110.utils.util.StringUtil; import com.java110.vo.ResultVo; service-user/src/main/java/com/java110/user/smo/impl/DataPrivilegeStaffV1InnerServiceSMOImpl.java
@@ -18,7 +18,7 @@ import com.java110.user.dao.IDataPrivilegeStaffV1ServiceDao; import com.java110.intf.user.IDataPrivilegeStaffV1InnerServiceSMO; import com.java110.dto.dataPrivilegeStaff.DataPrivilegeStaffDto; import com.java110.dto.data.DataPrivilegeStaffDto; import com.java110.po.dataPrivilegeStaff.DataPrivilegeStaffPo; import com.java110.utils.util.BeanConvertUtil; import com.java110.core.base.smo.BaseServiceSMO; @@ -28,7 +28,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; import java.util.List; /** service-user/src/main/java/com/java110/user/smo/impl/ExamineStaffIntroductionV1InnerServiceSMOImpl.java
@@ -18,17 +18,15 @@ import com.java110.user.dao.IExamineStaffIntroductionV1ServiceDao; import com.java110.intf.user.IExamineStaffIntroductionV1InnerServiceSMO; import com.java110.dto.examineStaffIntroduction.ExamineStaffIntroductionDto; import com.java110.dto.examineProject.ExamineStaffIntroductionDto; import com.java110.po.examineStaffIntroduction.ExamineStaffIntroductionPo; import com.java110.utils.util.BeanConvertUtil; import com.java110.core.base.smo.BaseServiceSMO; import com.java110.dto.user.UserDto; import com.java110.dto.PageDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; import java.util.List; /** service-user/src/main/java/com/java110/user/smo/impl/ExamineStaffProjectV1InnerServiceSMOImpl.java
@@ -18,17 +18,15 @@ import com.java110.user.dao.IExamineStaffProjectV1ServiceDao; import com.java110.intf.user.IExamineStaffProjectV1InnerServiceSMO; import com.java110.dto.examineStaffProject.ExamineStaffProjectDto; import com.java110.dto.examineProject.ExamineStaffProjectDto; import com.java110.po.examineStaffProject.ExamineStaffProjectPo; import com.java110.utils.util.BeanConvertUtil; import com.java110.core.base.smo.BaseServiceSMO; import com.java110.dto.user.UserDto; import com.java110.dto.PageDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; import java.util.List; /** service-user/src/main/java/com/java110/user/smo/impl/ExamineStaffV1InnerServiceSMOImpl.java
@@ -18,17 +18,15 @@ import com.java110.user.dao.IExamineStaffV1ServiceDao; import com.java110.intf.user.IExamineStaffV1InnerServiceSMO; import com.java110.dto.examineStaff.ExamineStaffDto; import com.java110.dto.examineProject.ExamineStaffDto; import com.java110.po.examineStaff.ExamineStaffPo; import com.java110.utils.util.BeanConvertUtil; import com.java110.core.base.smo.BaseServiceSMO; import com.java110.dto.user.UserDto; import com.java110.dto.PageDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; import java.util.List; /** service-user/src/main/java/com/java110/user/smo/impl/ExamineStaffValueV1InnerServiceSMOImpl.java
@@ -18,17 +18,15 @@ import com.java110.user.dao.IExamineStaffValueV1ServiceDao; import com.java110.intf.user.IExamineStaffValueV1InnerServiceSMO; import com.java110.dto.examineStaffValue.ExamineStaffValueDto; import com.java110.dto.examineProject.ExamineStaffValueDto; import com.java110.po.examineStaffValue.ExamineStaffValuePo; import com.java110.utils.util.BeanConvertUtil; import com.java110.core.base.smo.BaseServiceSMO; import com.java110.dto.user.UserDto; import com.java110.dto.PageDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; import java.util.List; /** springboot/src/main/java/com/java110/boot/controller/app/charge/NotifyCommonChargeController.java
@@ -3,21 +3,15 @@ import com.alibaba.fastjson.JSONObject; import com.java110.core.base.controller.BaseController; import com.java110.core.log.LoggerFactory; import com.java110.dto.chargeMachineOrder.NotifyChargeOrderDto; import com.java110.dto.chargeMachine.NotifyChargeOrderDto; import com.java110.intf.common.INotifyChargeV1InnerServiceSMO; import com.java110.utils.cache.MappingCache; import com.java110.vo.ResultVo; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import javax.crypto.Mac; import javax.crypto.SecretKey; import javax.crypto.spec.SecretKeySpec; import javax.servlet.http.HttpServletRequest; import java.util.Base64; /** * 通用充电桩 充电完成回调 springboot/src/main/java/com/java110/boot/controller/app/charge/NotifyDingDingChargeController.java
@@ -3,7 +3,7 @@ import com.alibaba.fastjson.JSONObject; import com.java110.core.base.controller.BaseController; import com.java110.core.log.LoggerFactory; import com.java110.dto.chargeMachineOrder.NotifyChargeOrderDto; import com.java110.dto.chargeMachine.NotifyChargeOrderDto; import com.java110.intf.common.INotifyChargeV1InnerServiceSMO; import com.java110.utils.cache.MappingCache; import com.java110.vo.ResultVo; springboot/src/main/java/com/java110/boot/controller/app/charge/NotifyKeHangChargeController.java
@@ -3,9 +3,8 @@ import com.alibaba.fastjson.JSONObject; import com.java110.core.base.controller.BaseController; import com.java110.core.log.LoggerFactory; import com.java110.dto.chargeMachineOrder.NotifyChargeOrderDto; import com.java110.dto.chargeMachine.NotifyChargeOrderDto; import com.java110.intf.common.INotifyChargeV1InnerServiceSMO; import com.java110.utils.cache.MappingCache; import com.java110.vo.ResultVo; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -13,11 +12,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import javax.crypto.Mac; import javax.crypto.SecretKey; import javax.crypto.spec.SecretKeySpec; import javax.servlet.http.HttpServletRequest; import java.util.Base64; /** * 科航充电桩 充电完成回调 springboot/src/main/java/com/java110/boot/smo/assetImport/impl/AssetImportSMOImpl.java
@@ -9,7 +9,7 @@ import com.java110.core.smo.ISaveTransactionLogSMO; import com.java110.dto.RoomDto; import com.java110.dto.assetImportLog.AssetImportLogDto; import com.java110.dto.assetImportLogDetail.AssetImportLogDetailDto; import com.java110.dto.assetImportLog.AssetImportLogDetailDto; import com.java110.dto.owner.OwnerDto; import com.java110.entity.assetImport.*; import com.java110.entity.component.ComponentValidateResult; springboot/src/main/java/com/java110/boot/smo/assetImport/impl/ImportFeeDetailSMOImpl.java
@@ -9,7 +9,7 @@ import com.java110.core.log.LoggerFactory; import com.java110.core.smo.ISaveTransactionLogSMO; import com.java110.dto.assetImportLog.AssetImportLogDto; import com.java110.dto.assetImportLogDetail.AssetImportLogDetailDto; import com.java110.dto.assetImportLog.AssetImportLogDetailDto; import com.java110.dto.fee.FeeDto; import com.java110.dto.payFeeBatch.PayFeeBatchDto; import com.java110.dto.user.UserDto;