BJ_ZTEITS-Developers / zteits-bcp-portal

Commit 1f949ec7c4214ca30e76c67916462872c4d04914

Authored by llw
2 parents 724041a6 5453f6ac

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 7 changed files with 326 additions and 10 deletions
src/main/java/com/zteits/irain/portal/vo/parkinglotcloudplatform/datastatistic/ParkLotEqpTypeCountVO.java
  View file @1f949ec
... ... @@ -20,7 +20,8 @@ public class ParkLotEqpTypeCountVO {
20 20  
21 21 /**设备类型:1-地磁*/
22 22 private Integer eqpType;
23   - /**设备状态:1-未安装，2-使用中，3-损坏*/
  23 + ///**设备状态:1-未安装，2-使用中，3-损坏*/
  24 + /**设备状态:1-在线，0-离线*/
24 25 private Integer eqpState;
25 26 /**个数*/
26 27 private Integer eqpNum;
... ...
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/areamanage/AreaManageController.java
  View file @1f949ec
... ... @@ -11,7 +11,6 @@ import com.zteits.clouds.api.apibase.bean.BaseRequest;
11 11 import com.zteits.clouds.api.apibase.bean.BizResult;
12 12 import com.zteits.clouds.api.dto.sys.AreaTreeDTO;
13 13 import com.zteits.clouds.api.dto.sys.param.AreaBlockByOrgIdQueryRequest;
14   -
15 14 import com.zteits.clouds.api.service.sys.TbAreaService;
16 15 import io.swagger.annotations.Api;
17 16 import io.swagger.annotations.ApiOperation;
... ... @@ -48,7 +47,7 @@ public class AreaManageController {
48 47  
49 48 @ApiOperation("根据归属组织ID查询区域与区块树")
50 49 @PostMapping("/queryAreaAndBlockTree")
51   - public BizResultVO<EasyUIDataGridVO<AreaTreeDTO>> queryAreaAndBlockTree(@RequestBody BaseRequest baseRequest){
  50 + public BizResultVO<EasyUIDataGridVO<AreaTreeDTO>> queryAreaAndBlockTree(@RequestBody BaseRequest baseRequest) {
52 51  
53 52 BizResultVO<EasyUIDataGridVO<AreaTreeDTO>> resultVO = new BizResultVO<>();
54 53 EasyUIDataGridVO<AreaTreeDTO> easyUIDataGridVO = new EasyUIDataGridVO<>();
... ... @@ -56,12 +55,12 @@ public class AreaManageController {
56 55 request.setSysCode(baseRequest.getSysCode());
57 56 // TODO 此处orgId 从当前登录操作人中取，现在先不限制
58 57 request.setOrgId(1L);
59   - BizResult<List<AreaTreeDTO>> result= tbAreaService.queryAreaBlockByOrgId(request);
60   - if(ResultUtils.isSuccess(result)){
  58 + BizResult<List<AreaTreeDTO>> result = tbAreaService.queryAreaBlockByOrgId(request);
  59 + if (ResultUtils.isSuccess(result)) {
61 60 easyUIDataGridVO.setRows(result.getData());
62 61 easyUIDataGridVO.setTotal(result.getData().size());
63 62 resultVO.setData(easyUIDataGridVO);
64   - }else {
  63 + } else {
65 64 resultVO.setCode(result.getErrCode().getCode());
66 65 resultVO.setMsg(result.getErrMsg());
67 66 }
... ...
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/AnalysisController.java
  View file @1f949ec
... ... @@ -231,7 +231,7 @@ public class AnalysisController extends BizController {
231 231 request.setBeginTime(DateUtil.to_date(beginTime, DateUtil.DATETIME_FORMAT));
232 232 request.setEndTime(DateUtil.to_date(endTime, DateUtil.DATETIME_FORMAT));
233 233 request.setPlNos(plNos);
234   - request.setBaseRequest(new BaseInfo(1, 100));
  234 + request.setBaseRequest(new BaseInfo(1, 1000));
235 235 request.setTimeType(ParkConstant.ParkingLotUseStatistic.StatisticType.PER1DAY);
236 236  
237 237 Calendar endc = Calendar.getInstance();
... ...
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/BerthManageController.java 0 → 100644
  View file @1f949ec
  1 +package com.zteits.irain.portal.web.parkinglotcloudplatform.datastatistic;
  2 +
  3 +import java.text.DecimalFormat;
  4 +import java.text.SimpleDateFormat;
  5 +import java.util.ArrayList;
  6 +import java.util.Calendar;
  7 +import java.util.Date;
  8 +import java.util.List;
  9 +
  10 +import javax.servlet.http.HttpServletRequest;
  11 +import javax.servlet.http.HttpServletResponse;
  12 +
  13 +import org.apache.poi.xssf.usermodel.XSSFSheet;
  14 +import org.slf4j.Logger;
  15 +import org.slf4j.LoggerFactory;
  16 +import org.springframework.beans.factory.annotation.Autowired;
  17 +import org.springframework.beans.factory.annotation.Value;
  18 +import org.springframework.stereotype.Controller;
  19 +import org.springframework.web.bind.annotation.GetMapping;
  20 +import org.springframework.web.bind.annotation.PostMapping;
  21 +import org.springframework.web.bind.annotation.RequestBody;
  22 +import org.springframework.web.bind.annotation.RequestMapping;
  23 +import org.springframework.web.bind.annotation.RequestParam;
  24 +import org.springframework.web.bind.annotation.ResponseBody;
  25 +
  26 +import com.alibaba.dubbo.common.utils.CollectionUtils;
  27 +import com.clouds.common.constants.TableNameEnum;
  28 +import com.clouds.common.utils.DateUtil;
  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;
  33 +import com.clouds.common.web.vo.BizResultVO;
  34 +import com.clouds.common.web.vo.EasyUIDataGridVO;
  35 +import com.zteits.clouds.api.apibase.bean.BaseInfo;
  36 +import com.zteits.clouds.api.apibase.bean.BizResult;
  37 +import com.zteits.clouds.api.apibase.bean.PageBean;
  38 +import com.zteits.clouds.api.dto.clouds.param.BerthTurnOverQueryRequest;
  39 +import com.zteits.clouds.api.dto.park.dto.BerthTurnOverCountDTO;
  40 +import com.zteits.clouds.api.dto.park.dto.BerthsDTO;
  41 +import com.zteits.clouds.api.dto.park.param.BerthManageRequest;
  42 +import com.zteits.clouds.api.service.park.BerthManageService;
  43 +import com.zteits.irain.portal.constant.ParkConstant;
  44 +
  45 +import io.swagger.annotations.Api;
  46 +import io.swagger.annotations.ApiOperation;
  47 +
  48 +/**
  49 + *
  50 + *
  51 + * Copyright: Copyright (c) 2017 zteits
  52 + *
  53 + * @ClassName: BerthManageController.java
  54 + * @Description:
  55 + * @version: v1.0.0
  56 + * @author: wangfei
  57 + * @date: 2017年8月28日 下午5:45:21
  58 + * Modification History:
  59 + * Date Author Version Description
  60 + *---------------------------------------------------------*
  61 + * 2017年8月28日 wangfei v1.0.0 创建
  62 + */
  63 +@Api("停车场云平台 基础信息 泊位管理")
  64 +@Controller
  65 +@RequestMapping("/berth")
  66 +public class BerthManageController extends BizController {
  67 + private static final Logger logger = LoggerFactory.getLogger(BerthManageController.class);
  68 + @Value("${project.syscode}")
  69 + private String sysCode;
  70 + @Autowired
  71 + private BerthManageService berthManageService;
  72 +
  73 +
  74 + /**
  75 + * @param requestObject
  76 + * @return
  77 + * @throws IllegalAccessException
  78 + * @throws InstantiationException
  79 + */
  80 + @ApiOperation("泊位信息分页查询")
  81 + @PostMapping("berthInfoList")
  82 + @ResponseBody
  83 + public BizResultVO<EasyUIDataGridVO<BerthsDTO>> berthInfoList(@RequestBody BerthManageRequest requestObject)
  84 + throws InstantiationException, IllegalAccessException {
  85 +
  86 + requestObject.setSysCode(sysCode);
  87 + BizResult<PageBean<BerthsDTO>> respondObject =
  88 + berthManageService.queryBerthByCondition(requestObject);
  89 + return returnJqGridData(respondObject,BerthsDTO.class);
  90 + }
  91 + /**
  92 + * @param requestObject
  93 + * @return
  94 + */
  95 + @ApiOperation("修改泊位信息")
  96 + @PostMapping("updateBerthInfo")
  97 + @ResponseBody
  98 + public BizResultVO<Boolean> updateBerthInfo(@RequestBody BerthManageRequest requestObject) {
  99 + requestObject.setSysCode(sysCode);
  100 + BizResult<Boolean> respondObject = berthManageService.updateBerthById(requestObject);
  101 + return new BizResultVO<Boolean>(respondObject);
  102 + }
  103 +
  104 + /**
  105 + * @param requestObject
  106 + * @return
  107 + */
  108 + @ApiOperation("批量删除泊位信息")
  109 + @PostMapping("deleteBerths")
  110 + @ResponseBody
  111 + public BizResultVO<Boolean> deleteBerths(@RequestBody BerthManageRequest requestObject) {
  112 + requestObject.setSysCode(sysCode);
  113 + BizResult<Boolean> respondObject = berthManageService.deleteBerthByIds(requestObject);
  114 + return new BizResultVO<Boolean>(respondObject);
  115 + }
  116 +
  117 + /**
  118 + * 保存泊位信息
  119 + * @param requestObject
  120 + * @return
  121 + */
  122 + @ApiOperation("保存泊位信息")
  123 + @PostMapping("saveBerthInfo")
  124 + @ResponseBody
  125 + public BizResultVO<Boolean> saveBerthInfo(@RequestBody BerthManageRequest requestObject) {
  126 + requestObject.setSysCode(sysCode);
  127 + BizResult<Boolean> respondObject = berthManageService.saveBerthInfo(requestObject);
  128 + return new BizResultVO<Boolean>(respondObject);
  129 + }
  130 +
  131 + @ApiOperation("导出泊位信息excel")
  132 + @GetMapping("exportBerthInfoExcel")
  133 + public void exportBerthInfoExcel(@RequestParam List<String> plNos,@RequestParam List<String> parkTypes,
  134 + @RequestParam List<String> parkAreaCodes, HttpServletRequest requests, HttpServletResponse response) {
  135 + BerthManageRequest request = new BerthManageRequest();
  136 + request.setSysCode(sysCode);
  137 + request.setPlNos(plNos);
  138 + request.setBaseRequest(new BaseInfo(1, 1000));
  139 +
  140 +
  141 + BizResult<PageBean<BerthsDTO>> bizResult = berthManageService.queryBerthByCondition(request);
  142 + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
  143 + String[] title = new String[] { "序号","泊位编号", "所属停车场", "所属泊位区间", "停车方式" };
  144 + String sheetName = "泊位信息";
  145 + String fileName = "泊位信息" + sdf.format(new Date());
  146 + // 1.创建excel信息
  147 + XSSFSheet workSheet = ExcelUtil.createExcel(sheetName);
  148 + // 2.设置excel表头和表体
  149 + Layouter.buildReport(workSheet, title, 0, 0);
  150 + // 3.填充数据
  151 + List<Object[]> contentList = new ArrayList<Object[]>();
  152 + List<BerthsDTO> list = new ArrayList<>();
  153 + if (CollectionUtils.isNotEmpty(bizResult.getData().getDataList())) {
  154 + list = bizResult.getData().getDataList();
  155 + }
  156 + int number = 1;
  157 + for (BerthsDTO b : list) {
  158 + Object[] obj = new Object[title.length];
  159 + int index = 0;
  160 + obj[index++] = number++;
  161 + obj[index++] = b.getBerthNo();
  162 + obj[index++] = b.getPlName();
  163 + obj[index++] = b.getParkAreaName();
  164 + obj[index++] = b.getParkType();
  165 + contentList.add(obj);
  166 + }
  167 + ExcleFillDateManager fillUserManager = new ExcleFillDateManager();
  168 + fillUserManager.fillSalesOrga(workSheet, title, contentList, 2);
  169 + // 4.excel输出配置
  170 + ExcelUtil.write(response, workSheet, fileName);
  171 + }
  172 +
  173 +}
... ...
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/devicemanagement/GeomagneticManagementController.java 0 → 100644
  View file @1f949ec
  1 +/**
  2 + *
  3 + */
  4 +package com.zteits.irain.portal.web.parkinglotcloudplatform.devicemanagement;
  5 +
  6 +import org.slf4j.Logger;
  7 +import org.slf4j.LoggerFactory;
  8 +import org.springframework.web.bind.annotation.RequestMapping;
  9 +import org.springframework.web.bind.annotation.RestController;
  10 +
  11 +/**
  12 + * @author hxz
  13 + *
  14 + */
  15 +@RestController
  16 +@RequestMapping("/geomagnetic")
  17 +public class GeomagneticManagementController {
  18 + private static final Logger logger = LoggerFactory.getLogger(GeomagneticManagementController.class);
  19 +
  20 +}
... ...
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/parklotmanage/ParkLotManageController.java
  View file @1f949ec
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 }
... ...
src/main/resources/dubbo/dubbo-park-consumer.xml
  View file @1f949ec
... ... @@ -153,5 +153,8 @@
153 153 version="${spring.dubbo.provider.version}"
154 154 timeout="30000"/>
155 155  
156   -
  156 + <!--企业云平台－基础信息-泊位管理 -->
  157 + <dubbo:reference id="berthManageService" interface="com.zteits.clouds.api.service.park.BerthManageService"
  158 + version="${spring.dubbo.provider.version}"
  159 + timeout="30000"/>
157 160 </beans>
158 161 \ No newline at end of file
... ...