BJ_ZTEITS-Developers / zteits-bcp-portal

Commit e89afc6735f43b394f12730c9c075f8ad480684d

Authored by 王彪总
2 parents b3cfbe77 80fa8c59

Merge branch 'branch_0808' of http://192.168.1.195:9998/ZTEITS-Developers/zteits… 

…-bcp-portal.git into branch_0808
Inline Side-by-side
Showing 3 changed files with 118 additions and 11 deletions
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/areamanage/AreaManageController.java
  View file @e89afc6
... ... @@ -9,8 +9,12 @@ import com.clouds.common.web.vo.BizResultVO;
9 9 import com.clouds.common.web.vo.EasyUIDataGridVO;
10 10 import com.zteits.clouds.api.apibase.bean.BaseRequest;
11 11 import com.zteits.clouds.api.apibase.bean.BizResult;
  12 +import com.zteits.clouds.api.dto.park.param.ParkInfoByAreaBlockIdsRequest;
12 13 import com.zteits.clouds.api.dto.sys.AreaTreeDTO;
  14 +import com.zteits.clouds.api.dto.sys.TbAreaDTO;
13 15 import com.zteits.clouds.api.dto.sys.param.AreaBlockByOrgIdQueryRequest;
  16 +import com.zteits.clouds.api.dto.sys.param.AreaBlockQueryByParentIdRequest;
  17 +import com.zteits.clouds.api.service.park.ParkingLotService;
14 18 import com.zteits.clouds.api.service.sys.TbAreaService;
15 19 import io.swagger.annotations.Api;
16 20 import io.swagger.annotations.ApiOperation;
... ... @@ -45,6 +49,9 @@ public class AreaManageController {
45 49 @Autowired
46 50 private TbAreaService tbAreaService;
47 51  
  52 + @Autowired
  53 + private ParkingLotService parkingLotService;
  54 +
48 55 @ApiOperation("根据归属组织ID查询区域与区块树")
49 56 @PostMapping("/queryAreaAndBlockTree")
50 57 public BizResultVO<EasyUIDataGridVO<AreaTreeDTO>> queryAreaAndBlockTree(@RequestBody BaseRequest baseRequest) {
... ... @@ -68,4 +75,26 @@ public class AreaManageController {
68 75 return resultVO;
69 76 }
70 77  
  78 + @ApiOperation("根据区块ID查询区块下停车场数量")
  79 + @PostMapping("/queryParkInfoNumByAreaBlockIds")
  80 + public BizResultVO<Integer> queryParkInfoNumByAreaBlockIds(@RequestBody ParkInfoByAreaBlockIdsRequest request){
  81 + BizResult<List<AreaTreeDTO>> bizResult = parkingLotService.queryParkInfoByAreaBlockIds(request);
  82 + BizResultVO<Integer> bizResultVO = new BizResultVO<>();
  83 + Integer num;
  84 + if(ResultUtils.isSuccess(bizResult)){
  85 + List<AreaTreeDTO> list = bizResult.getData();
  86 + if(list != null){
  87 + num = list.size();
  88 + }else {
  89 + num = 0;
  90 + }
  91 + bizResultVO.setData(num);
  92 + }else{
  93 + bizResultVO.setCode(bizResult.getErrCode().getCode());
  94 + bizResultVO.setMsg(bizResult.getErrMsg());
  95 + }
  96 +
  97 + return bizResultVO;
  98 + }
  99 +
71 100 }
... ...
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/CloudsParDurationController.java
  View file @e89afc6
1 1 package com.zteits.irain.portal.web.parkinglotcloudplatform.datastatistic;
2 2  
3   -import java.math.BigDecimal;
  3 +import java.text.ParseException;
4 4 import java.text.SimpleDateFormat;
5 5 import java.util.ArrayList;
  6 +import java.util.Date;
  7 +import java.util.HashMap;
6 8 import java.util.List;
  9 +import java.util.Map;
7 10  
8 11 import javax.servlet.http.HttpServletRequest;
9 12 import javax.servlet.http.HttpServletResponse;
10 13  
  14 +import org.apache.commons.collections.map.HashedMap;
11 15 import org.apache.poi.xssf.usermodel.XSSFSheet;
12 16 import org.springframework.beans.factory.annotation.Autowired;
13 17 import org.springframework.util.CollectionUtils;
... ... @@ -18,6 +22,7 @@ import org.springframework.web.bind.annotation.RequestParam;
18 22 import org.springframework.web.bind.annotation.RestController;
19 23  
20 24 import com.alibaba.dubbo.common.utils.StringUtils;
  25 +import com.clouds.common.utils.DateUtil;
21 26 import com.clouds.common.utils.excle.ExcelUtil;
22 27 import com.clouds.common.utils.excle.ExcleFillDateManager;
23 28 import com.clouds.common.utils.excle.Layouter;
... ... @@ -25,10 +30,8 @@ import com.clouds.common.web.BizController;
25 30 import com.clouds.common.web.vo.BizResultVO;
26 31 import com.zteits.clouds.api.apibase.bean.BizResult;
27 32 import com.zteits.clouds.api.apibase.bean.PageBean;
28   -import com.zteits.clouds.api.dto.clouds.dto.BillManageDTO;
29 33 import com.zteits.clouds.api.dto.clouds.dto.ParkDurationDTO;
30 34 import com.zteits.clouds.api.dto.clouds.dto.ParkDurationForHourDTO;
31   -import com.zteits.clouds.api.dto.clouds.param.BillQueryRequest;
32 35 import com.zteits.clouds.api.dto.clouds.param.ParkDurationRequest;
33 36 import com.zteits.clouds.api.service.clouds.CloudsParDurationService;
34 37  
... ... @@ -44,12 +47,40 @@ public class CloudsParDurationController extends BizController{
44 47 /**
45 48 * 企业云平台->停车时长折线图－>按日.<br/>
46 49 * @return
  50 + * @throws Exception
47 51 */
48 52 @ApiOperation("企业云平台->停车时长折线图－>按日")
49 53 @PostMapping("/queryEchartsForParkDurationForDay")
50   - public BizResultVO<List<ParkDurationDTO>> queryEchartsForParkDurationForDay(@RequestBody ParkDurationRequest parkDurationRequest){
51   - BizResult<List<ParkDurationDTO>> result = cloudsParDurationService.queryEchartsForParkDurationForDay(parkDurationRequest);
52   - return new BizResultVO<List<ParkDurationDTO>>(result);
  54 + public BizResultVO<Map<String,Object>> queryEchartsForParkDurationForDay(@RequestBody ParkDurationRequest parkDurationRequest,HttpServletResponse response) throws Exception{
  55 + BizResult<Map<String,Object>> result = cloudsParDurationService.queryEchartsForParkDurationForDay(parkDurationRequest);
  56 +
  57 + return new BizResultVO<Map<String,Object>>(result);
  58 + }
  59 +
  60 + /**
  61 + * 获取2个时间的时间所有天数.<br/>
  62 + * @param parkDurationRequest
  63 + * @return
  64 + */
  65 + public List<String> getTwoDaysDay(ParkDurationRequest parkDurationRequest){
  66 + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
  67 + String beginTime = DateUtil.getDateString(parkDurationRequest.getParkOutBeginTime(),"yyyy-MM-dd");
  68 + String endTime = DateUtil.getDateString(parkDurationRequest.getParkOutEndTime(),"yyyy-MM-dd");
  69 + List<String> dateList =new ArrayList<String>();
  70 + //获取开始结束之间的所有日期
  71 + try {
  72 + List<Date> datas = DateUtil.getBetweenDates(format.parse(beginTime),format.parse(endTime));
  73 + if(!CollectionUtils.isEmpty(datas)){
  74 + for(Date e:datas){
  75 + if(e != null){
  76 + dateList.add(format.format(e));
  77 + }
  78 + }
  79 + }
  80 + } catch (ParseException e) {
  81 + e.printStackTrace();
  82 + }
  83 + return dateList;
53 84 }
54 85  
55 86 /**
... ... @@ -228,12 +259,13 @@ public class CloudsParDurationController extends BizController{
228 259 /**
229 260 * 企业云平台->停车时长折线图－>按日.<br/>
230 261 * @return
  262 + * @throws Exception
231 263 */
232 264 @ApiOperation("企业云平台->停车时长折线图－>按月")
233 265 @PostMapping("/queryEchartsForParkDurationForMonth")
234   - public BizResultVO<List<ParkDurationDTO>> queryEchartsForParkDurationForMonth(@RequestBody ParkDurationRequest parkDurationRequest){
235   - BizResult<List<ParkDurationDTO>> result = cloudsParDurationService.queryEchartsForParkDurationForMonth(parkDurationRequest);
236   - return new BizResultVO<List<ParkDurationDTO>>(result);
  266 + public BizResultVO<Map<String,Object>> queryEchartsForParkDurationForMonth(@RequestBody ParkDurationRequest parkDurationRequest) throws Exception{
  267 + BizResult<Map<String,Object>> result = cloudsParDurationService.queryEchartsForParkDurationForMonth(parkDurationRequest);
  268 + return new BizResultVO<Map<String,Object>>(result);
237 269 }
238 270  
239 271 /**
... ... @@ -298,4 +330,5 @@ public class CloudsParDurationController extends BizController{
298 330  
299 331  
300 332  
  333 +
301 334 }
... ...
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/RealTimeMonitorController.java
  View file @e89afc6
... ... @@ -28,8 +28,10 @@ import com.zteits.clouds.api.apibase.bean.PageBean;
28 28 import com.zteits.clouds.api.apibase.constants.ErrorType;
29 29 import com.zteits.clouds.api.apibase.exception.BizException;
30 30 import com.zteits.clouds.api.dto.clouds.param.RealTimeMonitoringRequest;
  31 +import com.zteits.clouds.api.dto.park.dto.BerthsDTO;
31 32 import com.zteits.clouds.api.dto.park.dto.ParkOccupancyRateDTO;
32 33 import com.zteits.clouds.api.dto.park.dto.TpPEqpLogDTO;
  34 +import com.zteits.clouds.api.dto.park.param.QueryBerthForPageRequest;
33 35 import com.zteits.clouds.api.dto.sys.SysOpDTO;
34 36 import com.zteits.clouds.api.dto.sys.SysOrgDTO;
35 37 import com.zteits.clouds.api.dto.sys.SysRoleDTO;
... ... @@ -38,6 +40,7 @@ import com.zteits.clouds.api.dto.sys.param.SysOpForPageRequest;
38 40 import com.zteits.clouds.api.dto.sys.param.SysOpSaveOrModfiyRequest;
39 41 import com.zteits.clouds.api.dto.sys.param.SysOrgPageQueryRequest;
40 42 import com.zteits.clouds.api.dto.sys.param.SysRolePageQueryRequest;
  43 +import com.zteits.clouds.api.service.park.BerthManageService;
41 44 import com.zteits.clouds.api.service.park.EqpBerthsService;
42 45  
43 46 import io.swagger.annotations.Api;
... ... @@ -67,6 +70,8 @@ public class RealTimeMonitorController extends BizController {
67 70  
68 71 @Autowired
69 72 private EqpBerthsService eqpBerthsService;
  73 + @Autowired
  74 + private BerthManageService berthManageService;
70 75  
71 76  
72 77 /**
... ... @@ -78,8 +83,8 @@ public class RealTimeMonitorController extends BizController {
78 83 * langlw 2017-08-30
79 84 */
80 85 @ApiOperation("分页查询停车场设备日志数据")
81   - @PostMapping("/queryOpsBySysCode")
82   - public BizResultVO<EasyUIDataGridVO<TpPEqpLogDTO>> queryUsersPageList(
  86 + @PostMapping("/queryParkEqpForPageByPlNo")
  87 + public BizResultVO<EasyUIDataGridVO<TpPEqpLogDTO>> queryParkEqpForPageByPlNo(
83 88 @RequestBody RealTimeMonitoringRequest request)
84 89 throws Exception {
85 90 logger.info("调用分页查询停车场设备日志数据dubbo服务入参：request={}"+JSONObject.toJSONString(request));
... ... @@ -109,4 +114,44 @@ public class RealTimeMonitorController extends BizController {
109 114 logger.info("调用分组查询停车场占用率dubbo服务返回信息：request={}"+JSONObject.toJSONString(result));
110 115 return new BizResultVO<List<ParkOccupancyRateDTO>>(result);
111 116 }
  117 +
  118 +
  119 +
  120 + /**
  121 + * 通过车位对象分页查询车位信息
  122 + * query berths by berth for page
  123 + * langlw 2017-8-31
  124 + * @param request
  125 + * @return
  126 + * @throws Exception
  127 + */
  128 + @ApiOperation("通过车位对象分页查询车位信息")
  129 + @PostMapping("/queryBerthByBerthForPage")
  130 + public BizResultVO<EasyUIDataGridVO<BerthsDTO>> queryBerthByBerthForPage(
  131 + @RequestBody QueryBerthForPageRequest request)
  132 + throws Exception {
  133 + logger.info("通过车位对象分页查询车位信息dubbo服务入参：request={}"+JSONObject.toJSONString(request));
  134 + BizResult<PageBean<BerthsDTO>> result = berthManageService.queryBerthByBerth(request);
  135 + logger.info("通过车位对象分页查询车位信息dubbo服务返回信息：response={}"+JSONObject.toJSONString(result));
  136 + return returnJqGridData(result, BerthsDTO.class);
  137 + }
  138 +
  139 + /**
  140 + * 分组查询停车场占用率
  141 + *
  142 + * @param request
  143 + * @return
  144 + * @throws Exception
  145 + * langlw 2017-08-31
  146 + */
  147 + @ApiOperation("分组查询停车场占用率")
  148 + @PostMapping("/queryParkBerthOccupancyRate")
  149 + public BizResultVO<List<ParkOccupancyRateDTO>> queryParkBerthOccupancyRate(
  150 + @RequestBody QueryBerthForPageRequest request)
  151 + throws Exception {
  152 + logger.info("调用分组查询停车场占用率dubbo服务入参：request={}"+JSONObject.toJSONString(request));
  153 + BizResult<List<ParkOccupancyRateDTO>> result = berthManageService.queryParkOccupancyRate(request);
  154 + logger.info("调用分组查询停车场占用率dubbo服务返回信息：request={}"+JSONObject.toJSONString(result));
  155 + return new BizResultVO<List<ParkOccupancyRateDTO>>(result);
  156 + }
112 157 }
... ...