Skip to content

Commit 483ef12

Browse files
committed
加入校验功能二次封装
1 parent 63466d8 commit 483ef12

3 files changed

Lines changed: 24 additions & 114 deletions

File tree

Api/src/main/java/com/java110/api/listener/index/QueryIndexStatisticListener.java

Lines changed: 11 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -40,24 +40,9 @@
4040
@Java110Listener("queryIndexStatistic")
4141
public class QueryIndexStatisticListener extends AbstractServiceApiDataFlowListener {
4242

43-
@Autowired
44-
private IFeeInnerServiceSMO feeInnerServiceSMOImpl;
45-
46-
@Autowired
47-
private IRoomInnerServiceSMO roomInnerServiceSMOImpl;
48-
49-
@Autowired
50-
private IUnitInnerServiceSMO unitInnerServiceSMOImpl;
51-
52-
@Autowired
53-
private IFloorInnerServiceSMO floorInnerServiceSMOImpl;
54-
5543
@Autowired
5644
private IOwnerInnerServiceSMO ownerInnerServiceSMOImpl;
5745

58-
@Autowired
59-
private IOwnerRoomRelInnerServiceSMO ownerRoomRelInnerServiceSMOImpl;
60-
6146
@Override
6247
public String getServiceCode() {
6348
return ServiceCodeConstant.SERVICE_CODE_QUERY_INDEX_STATISTIC;
@@ -78,58 +63,16 @@ public void soService(ServiceDataFlowEvent event) {
7863
DataFlowContext dataFlowContext = event.getDataFlowContext();
7964
//获取请求数据
8065
JSONObject reqJson = dataFlowContext.getReqJson();
81-
validateFeeData(reqJson);
82-
FeeDto feeDtoParamIn = BeanConvertUtil.covertBean(reqJson, FeeDto.class);
83-
feeDtoParamIn.setPayerObjId(reqJson.getString("roomId"));
84-
85-
List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDtoParamIn);
86-
ResponseEntity<String> responseEntity = null;
87-
if (feeDtos == null || feeDtos.size() == 0) {
88-
responseEntity = new ResponseEntity<String>("{}", HttpStatus.OK);
89-
}
90-
91-
FeeDto feeDto = feeDtos.get(0);
92-
93-
ApiFeeVo apiFeeVo = BeanConvertUtil.covertBean(feeDto, ApiFeeVo.class);
94-
//apiFeeVo.setStartTime(DateUtil.getFormatTimeString(feeDto.getStartTime(), DateUtil.DATE_FORMATE_STRING_A));
95-
//apiFeeVo.setEndTime(DateUtil.getFormatTimeString(feeDto.getEndTime(), DateUtil.DATE_FORMATE_STRING_A));
96-
97-
//查询 房屋信息
98-
RoomDto roomDto = new RoomDto();
99-
roomDto.setRoomId(feeDto.getPayerObjId());
100-
roomDto.setCommunityId(feeDto.getCommunityId());
101-
List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
102-
103-
if (roomDtos == null || roomDtos.size() != 1) {
104-
throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "数据错误,未找到房屋信息 roomId" + feeDto.getPayerObjId());
105-
}
106-
107-
roomDto = roomDtos.get(0);
108-
/*apiFeeVo.setRoomId(roomDto.getRoomId());
109-
apiFeeVo.setRoomNum(roomDto.getRoomNum());*/
110-
apiFeeVo = BeanConvertUtil.covertBean(roomDto,apiFeeVo);
111-
112-
// 业主信息
113-
OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto();
114-
ownerRoomRelDto.setRoomId(roomDto.getRoomId());
115-
List<OwnerRoomRelDto> ownerRoomRelDtos = ownerRoomRelInnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
116-
if (ownerRoomRelDtos == null || ownerRoomRelDtos.size() != 1) {
117-
throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "数据错误,未找到房屋和业主关系信息 roomId=" + roomDto.getRoomId());
118-
}
119-
OwnerDto ownerDto = new OwnerDto();
120-
ownerDto.setOwnerId(ownerRoomRelDtos.get(0).getOwnerId());
121-
ownerDto.setCommunityId(feeDto.getCommunityId());
122-
List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwners(ownerDto);
123-
124-
if (ownerDtos == null || ownerDtos.size() != 1) {
125-
throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "数据错误,未找到业主信息 ownerId=" + ownerRoomRelDtos.get(0).getOwnerId());
126-
}
127-
ownerDto = ownerDtos.get(0);
128-
apiFeeVo.setOwnerId(ownerDto.getOwnerId());
129-
apiFeeVo.setOwnerName(ownerDto.getName());
130-
apiFeeVo.setLink(ownerDto.getLink());
131-
132-
responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiFeeVo), HttpStatus.OK);
66+
validateIndexStatistic(reqJson);
67+
// 查询业主 总数量
68+
OwnerDto ownerDto = BeanConvertUtil.covertBean(reqJson, OwnerDto.class);
69+
int ownerCount = ownerInnerServiceSMOImpl.queryOwnersCount(ownerDto);
70+
int noEnterRoomCount =
71+
// 查询房屋 总数量
72+
73+
// 查询停车位 总数量
74+
75+
// 查询商铺 总数量
13376

13477

13578
dataFlowContext.setResponseEntity(responseEntity);
@@ -140,11 +83,8 @@ public void soService(ServiceDataFlowEvent event) {
14083
*
14184
* @param reqJson 包含查询条件
14285
*/
143-
private void validateFeeData(JSONObject reqJson) {
86+
private void validateIndexStatistic(JSONObject reqJson) {
14487
Assert.jsonObjectHaveKey(reqJson, "communityId", "请求中未包含communityId信息");
145-
Assert.jsonObjectHaveKey(reqJson, "feeTypeCd", "请求中未包含feeTypeCd信息");
146-
Assert.jsonObjectHaveKey(reqJson, "roomId", "请求中未包含roomId信息");
147-
14888

14989
}
15090

@@ -153,39 +93,6 @@ public int getOrder() {
15393
return super.DEFAULT_ORDER;
15494
}
15595

156-
public IFeeInnerServiceSMO getFeeInnerServiceSMOImpl() {
157-
return feeInnerServiceSMOImpl;
158-
}
159-
160-
public void setFeeInnerServiceSMOImpl(IFeeInnerServiceSMO feeInnerServiceSMOImpl) {
161-
this.feeInnerServiceSMOImpl = feeInnerServiceSMOImpl;
162-
}
163-
164-
165-
public IRoomInnerServiceSMO getRoomInnerServiceSMOImpl() {
166-
return roomInnerServiceSMOImpl;
167-
}
168-
169-
public void setRoomInnerServiceSMOImpl(IRoomInnerServiceSMO roomInnerServiceSMOImpl) {
170-
this.roomInnerServiceSMOImpl = roomInnerServiceSMOImpl;
171-
}
172-
173-
174-
public IFloorInnerServiceSMO getFloorInnerServiceSMOImpl() {
175-
return floorInnerServiceSMOImpl;
176-
}
177-
178-
public void setFloorInnerServiceSMOImpl(IFloorInnerServiceSMO floorInnerServiceSMOImpl) {
179-
this.floorInnerServiceSMOImpl = floorInnerServiceSMOImpl;
180-
}
181-
182-
public IUnitInnerServiceSMO getUnitInnerServiceSMOImpl() {
183-
return unitInnerServiceSMOImpl;
184-
}
185-
186-
public void setUnitInnerServiceSMOImpl(IUnitInnerServiceSMO unitInnerServiceSMOImpl) {
187-
this.unitInnerServiceSMOImpl = unitInnerServiceSMOImpl;
188-
}
18996

19097
public IOwnerInnerServiceSMO getOwnerInnerServiceSMOImpl() {
19198
return ownerInnerServiceSMOImpl;
@@ -194,12 +101,4 @@ public IOwnerInnerServiceSMO getOwnerInnerServiceSMOImpl() {
194101
public void setOwnerInnerServiceSMOImpl(IOwnerInnerServiceSMO ownerInnerServiceSMOImpl) {
195102
this.ownerInnerServiceSMOImpl = ownerInnerServiceSMOImpl;
196103
}
197-
198-
public IOwnerRoomRelInnerServiceSMO getOwnerRoomRelInnerServiceSMOImpl() {
199-
return ownerRoomRelInnerServiceSMOImpl;
200-
}
201-
202-
public void setOwnerRoomRelInnerServiceSMOImpl(IOwnerRoomRelInnerServiceSMO ownerRoomRelInnerServiceSMOImpl) {
203-
this.ownerRoomRelInnerServiceSMOImpl = ownerRoomRelInnerServiceSMOImpl;
204-
}
205104
}

WebService/src/main/resources/static/js/vc-core.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,5 @@
3939
vc.initMethod.forEach(function(callback){
4040
callback();
4141
});
42-
})(window.vc);
42+
})(window.vc);
43+

WebService/src/main/resources/static/js/vc-validate.js

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,4 +223,14 @@ vc 校验 工具类 -method
223223
return true;
224224
}
225225

226-
})(window.vc.validate);
226+
})(window.vc.validate);
227+
228+
229+
/**
230+
对 validate 进行二次封装
231+
**/
232+
(function(vc){
233+
vc.check = function(dataObj,dataConfig){
234+
return vc.validate.validate(dataObj, dataConfig);
235+
}
236+
})(window.vc)

0 commit comments

Comments
 (0)