iidi
/
bocloud.sms
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: iidi:5c720b68b7497d023616f99e954e4286f67bac34
Branches Tags
iidi:develop
..
compare: iidi:d938d659a461e2a450080a0beb32de32135da8d4
Branches Tags
iidi:develop

No commits in common. "5c720b68b7497d023616f99e954e4286f67bac34" and "d938d659a461e2a450080a0beb32de32135da8d4" have entirely different histories.
5c720b68b7 ... d938d659a4

3 changed files with 9 additions and 57 deletions
Show Stats Expand all files Collapse all files

26
bocloud.sms.booter/src/main/java/com/bocloud/sms/booter/controller/IndexDataController.java
View File

@ -28,39 +28,15 @@ public class IndexDataController {
private IndexService indexService;
/**
* 待办工单列表
* @param pager
* @param requestContext
* @return
*/
@GetMapping("/doneWorkOrder")
@Operation(summary = "待办工单列表")
public GeneralResult doneWorkOrder(Pager pager, @Value(Common.REQ_CONTEXT) RequestContext requestContext) {
return indexService.doneWorkOrder(pager, requestContext);
}
/**
* 工单统计
* @param pager
* @param requestContext
* @return
*/
@GetMapping("/workOrder/stattic")
@Operation(summary = "工单统计")
@Operation(summary = "待办工单列表")
public GeneralResult workOrderStatic(Pager pager, @Value(Common.REQ_CONTEXT) RequestContext requestContext) {
return indexService.workOrderStatic(requestContext);
}
/**
* 当前用户首页数据展示模块的数据查询
* @param pager
* @param requestContext
* @return
*/
@GetMapping("/userData/stattic")
@Operation(summary = "当前用户首页数据展示模块的数据查询")
public GeneralResult userStatic(Pager pager, @Value(Common.REQ_CONTEXT) RequestContext requestContext) {
return indexService.userDataStatic(requestContext);
}
}

2
bocloud.sms.service/src/main/java/com/bocloud/sms/interfaces/IndexService.java
View File

@ -11,6 +11,4 @@ public interface IndexService {
GeneralResult doneWorkOrder(Pager pager, RequestContext requestContext);
GeneralResult workOrderStatic(RequestContext requestContext);
GeneralResult userDataStatic(RequestContext requestContext);
}

38
bocloud.sms.service/src/main/java/com/bocloud/sms/service/IndexServiceImpl.java
View File

@ -51,52 +51,30 @@ public class IndexServiceImpl implements IndexService {
JSONObject param = new JSONObject();
User user = userRepository.query(requestContext.getTarget());
param.put("userId", "1111");
param.put("page", 1);
param.put("page",1);
param.put("limit", Integer.MAX_VALUE);
String result = ykUtil.call(YkInfo.getTaskList, param, JSONArray.class);
JSONObject jsonObject = JSONArray.parseObject(result, JSONObject.class);
Integer total = jsonObject.getInteger("total");
Map<String, Object> resultMap = new HashMap<>();
resultMap.put("orderTotal", total);
Map<String,Object> resultMap = new HashMap<>();
resultMap.put("orderTotal",total);
List<JSONObject> data = JSONObject.parseObject(jsonObject.getString("data"), List.class);
Integer waitDoneTotal = 0;
Integer doneTotal = 0;
for (JSONObject obj : data) {
if ("0".equals(obj.getString("approve_status"))) {
if("0".equals(obj.getString("approve_status"))){
waitDoneTotal++;
} else {
}else {
doneTotal++;
}
}
resultMap.put("waitDoneTotal", waitDoneTotal);
resultMap.put("doneTotal", doneTotal);
resultMap.put("waitDoneTotal",waitDoneTotal);
resultMap.put("doneTotal",doneTotal);
return new GeneralResult(true, resultMap, "查询成功");
} catch (Exception e) {
log.info("查询失败", e);
return new GeneralResult(false, "查询失败");
}
}
@Override
public GeneralResult userDataStatic(RequestContext requestContext) {
try {
//查询当前用户授权应用
JSONObject param = new JSONObject();
param.put("userId", "1111");
param.put("type", "user");
String result = ykUtil.call(YkInfo.getUserAppList, param, JSONArray.class);
//获取用户信息
JSONObject userParam = new JSONObject();
param.put("userParam", "1111");
String userRolesStr = ykUtil.call(YkInfo.getUserRoles, param, JSONArray.class);
return new GeneralResult(true, "查询成功");
return new GeneralResult(true, resultMap,"查询成功");
} catch (Exception e) {
log.info("查询失败", e);
return new GeneralResult(false, "查询失败");