BJ_ZTEITS-Developers / zteits-bcp-portal

Commit 80fa8c59c96848a5360849477b3ae65ff590c399

Authored by atao
2 parents e77567c2 3e1bcfba

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

…-bcp-portal into branch_0808
Inline Side-by-side
Showing 3 changed files with 211 additions and 13 deletions
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/CloudsParDurationController.java
  View file @80fa8c5
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 @80fa8c5
... ... @@ -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 }
... ...
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/parklotmanage/ParkLotManageController.java
  View file @80fa8c5
1 1 package com.zteits.irain.portal.web.parkinglotcloudplatform.parklotmanage;
2 2  
  3 +import java.text.SimpleDateFormat;
3 4 import java.util.ArrayList;
4 5 import java.util.List;
5 6 import java.util.Map;
6 7  
  8 +import javax.servlet.http.HttpServletResponse;
7 9 import javax.servlet.http.HttpSession;
8 10  
9 11 import org.apache.commons.lang3.StringUtils;
  12 +import org.apache.poi.util.StringUtil;
  13 +import org.apache.poi.xssf.usermodel.XSSFSheet;
10 14 import org.slf4j.Logger;
11 15 import org.slf4j.LoggerFactory;
12 16 import org.springframework.beans.factory.annotation.Autowired;
13 17 import org.springframework.web.bind.annotation.GetMapping;
  18 +import org.springframework.web.bind.annotation.PostMapping;
  19 +import org.springframework.web.bind.annotation.RequestBody;
14 20 import org.springframework.web.bind.annotation.RequestMapping;
15 21 import org.springframework.web.bind.annotation.RequestParam;
16 22 import org.springframework.web.bind.annotation.RestController;
17 23  
18 24 import com.alibaba.dubbo.common.utils.CollectionUtils;
  25 +import com.alibaba.fastjson.JSONObject;
19 26 import com.clouds.common.cache.park.ParkingLotCacheUtil;
20 27 import com.clouds.common.entity.UserInfo;
21 28 import com.clouds.common.utils.ResultUtils;
  29 +import com.clouds.common.utils.excle.ExcelUtil;
  30 +import com.clouds.common.utils.excle.ExcleFillDateManager;
  31 +import com.clouds.common.utils.excle.Layouter;
  32 +import com.clouds.common.web.BizController;
22 33 import com.clouds.common.web.SessionCommUtil;
23 34 import com.clouds.common.web.vo.BizResultVO;
  35 +import com.clouds.common.web.vo.EasyUIDataGridVO;
24 36 import com.google.common.collect.Lists;
25 37 import com.google.common.collect.Maps;
26 38 import com.zteits.clouds.api.apibase.bean.BizResult;
  39 +import com.zteits.clouds.api.apibase.bean.PageBean;
27 40 import com.zteits.clouds.api.apibase.constants.ErrorType;
28 41 import com.zteits.clouds.api.apibase.exception.BizException;
29 42 import com.zteits.clouds.api.dto.park.dto.ParkingLotDTO;
  43 +import com.zteits.clouds.api.dto.park.param.ParkingLotInfoDeleteRequest;
  44 +import com.zteits.clouds.api.dto.park.param.ParkingLotInfoSaveRequest;
  45 +import com.zteits.clouds.api.dto.park.param.ParkingLotInfoUpdateRequest;
30 46 import com.zteits.clouds.api.dto.park.param.QueryParkLotInfoByPkNoRequest;
31   -import com.zteits.clouds.api.dto.pay.param.TdCompanyParkQueryRequest;
  47 +import com.zteits.clouds.api.dto.park.param.QueryParkingLotByParkRequest;
32 48 import com.zteits.clouds.api.service.park.ParkingLotQueryService;
  49 +import com.zteits.clouds.api.service.park.ParkingLotService;
33 50 import com.zteits.clouds.api.service.pay.TdCustCompanyService;
34 51  
35 52 import io.swagger.annotations.Api;
... ... @@ -53,7 +70,7 @@ import io.swagger.annotations.ApiOperation;
53 70 @Api(value="停车场管理",description="停车场管理")
54 71 @RestController
55 72 @RequestMapping("parkLotManage")
56   -public class ParkLotManageController{
  73 +public class ParkLotManageController extends BizController{
57 74 private Logger logger = LoggerFactory.getLogger(ParkLotManageController.class);
58 75 @Autowired
59 76 private HttpSession session;
... ... @@ -63,6 +80,8 @@ public class ParkLotManageController{
63 80 private TdCustCompanyService tdCustCompanyService;
64 81 @Autowired
65 82 private ParkingLotQueryService parkingLotQueryService;
  83 + @Autowired
  84 + private ParkingLotService parkingLotService;
66 85 /**
67 86 * 根据登录人权限获取停车场名称列表
68 87 * @return
... ... @@ -111,4 +130,105 @@ public class ParkLotManageController{
111 130 }
112 131 return plNos;
113 132 }
  133 + /**
  134 + * xiejp 2017-08-30
  135 + * @param request
  136 + * @return
  137 + * @throws Exception
  138 + */
  139 + @ApiOperation("分页查询停车场列表")
  140 + @PostMapping("/queryParkingLotPageByPark")
  141 + public BizResultVO<EasyUIDataGridVO<ParkingLotDTO>> queryParkingLotByPark(@RequestBody QueryParkingLotByParkRequest request) throws Exception {
  142 + logger.info("调用分页获取停车场列表dubbo服务入参：request={}"+JSONObject.toJSONString(request));
  143 + if (request == null) {
  144 + throw new BizException(ErrorType.PARAMM_NULL, "请求对象");
  145 + }
  146 + BizResult<PageBean<ParkingLotDTO>> bizResult = parkingLotQueryService.queryParkingLotByPark(request,request.getBaseRequest().getPageNum(), request.getBaseRequest().getPageSize());
  147 + return returnJqGridData(bizResult, ParkingLotDTO.class);
  148 + }
  149 + /**
  150 + * 添加停车场信息
  151 + * @param request
  152 + * @return
  153 + */
  154 + @ApiOperation("添加停车场信息")
  155 + @PostMapping("/saveParkingLotInfo")
  156 + public BizResultVO<Boolean> SaveParkingLotInfo(@RequestBody ParkingLotInfoSaveRequest request){
  157 + logger.info("调用添加停车场信息dubbo服务入参：request={}"+JSONObject.toJSONString(request));
  158 + BizResult<Boolean> bizResult = parkingLotService.SaveParkingLotInfo(request);
  159 + return new BizResultVO<Boolean>(bizResult);
  160 + }
  161 + /**
  162 + * 修改停车场信息
  163 + * @param request
  164 + * @return
  165 + */
  166 + @ApiOperation("修改停车场信息")
  167 + @PostMapping("/updateParkingLotInfo")
  168 + public BizResultVO<Boolean> UpdateParkingLotInfo(@RequestBody ParkingLotInfoUpdateRequest request){
  169 + logger.info("调用修改停车场信息dubbo服务入参：request={}"+JSONObject.toJSONString(request));
  170 + BizResult<Boolean> bizResult = parkingLotService.UpdateParkingLotInfo(request);
  171 + return new BizResultVO<Boolean>(bizResult);
  172 + }
  173 + /**
  174 + * 根据停车场编号查询停车场信息
  175 + * @param request
  176 + * @return
  177 + */
  178 + @ApiOperation("根据停车场编号查询停车场信息")
  179 + @PostMapping("/queryParkingLotByPkNo")
  180 + public BizResultVO<ParkingLotDTO> QueryParkingLotByPkNo(@RequestBody QueryParkLotInfoByPkNoRequest request){
  181 + logger.info("调用根据停车场编号查询停车场信息dubbo服务入参：request={}"+JSONObject.toJSONString(request));
  182 + BizResult<ParkingLotDTO> bizResult = parkingLotQueryService.QueryParkingLotByPkNo(request);
  183 + return new BizResultVO<ParkingLotDTO>(bizResult);
  184 + }
  185 + /**
  186 + * 删除停车场信息
  187 + * @param request
  188 + * @return
  189 + */
  190 + @ApiOperation("删除停车场信息")
  191 + @PostMapping("/deleteParkingLotInfoByPlIds")
  192 + public BizResultVO<Boolean> DeleteParkingLotInfoByPlIds(@RequestBody ParkingLotInfoDeleteRequest request){
  193 + logger.info("调用删除停车场信息dubbo服务入参：request={}"+JSONObject.toJSONString(request));
  194 + BizResult<Boolean> bizResult = parkingLotService.DeleteParkingLotInfoByPlIds(request);
  195 + return new BizResultVO<Boolean>(bizResult);
  196 + }
  197 + /**
  198 + * 导出
  199 + * @param request
  200 + * @param response
  201 + * @throws Exception
  202 + */
  203 + @ApiOperation("导出停车场信息")
  204 + @PostMapping("/parkingToExcleForPage")
  205 + public void parkingToExcleForPage(@RequestBody QueryParkingLotByParkRequest request,HttpServletResponse response) throws Exception{
  206 + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
  207 +
  208 + BizResult<PageBean<ParkingLotDTO>> bizResult = parkingLotQueryService.queryParkingLotByPark(request,0,0);
  209 +
  210 + String[] title = new String[]{"停车场编号","停车场名称"};
  211 + String sheetName="停车场";
  212 + String fileName = "停车场信息";
  213 + // 1.创建excel信息
  214 + XSSFSheet workSheet = ExcelUtil.createExcel(sheetName);
  215 + // 2.设置excel表头和表体
  216 + Layouter.buildReport(workSheet,title,0, 0);
  217 + //3.填充数据
  218 + List<Object[]> contentList=new ArrayList<Object[]>();
  219 + List<ParkingLotDTO> list = bizResult.getData().getDataList();
  220 + for (ParkingLotDTO e: list) {
  221 + Object[] obj=new Object[title.length];
  222 + int index=0;
  223 + obj[index++]=e.getPlNo();
  224 + obj[index++]=e.getPlName();
  225 +
  226 + contentList.add(obj);
  227 + }
  228 + ExcleFillDateManager fillUserManager=new ExcleFillDateManager();
  229 + fillUserManager.fillSalesOrga(workSheet,title,contentList,2);
  230 + // 4.excel输出配置
  231 + ExcelUtil.write(response, workSheet, fileName);
  232 + }
  233 +
114 234 }
... ...