BJ_ZTEITS-Developers / zteits-bcp-portal

Commit 3108b9027760e6ea0c8ffea9014ea9d842d19ed4

Authored by xiejp
2 parents 1dc6010b 9e2474b7

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 2 changed files with 27 additions and 12 deletions
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/BerthManageController.java renamed to src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/berthmanage/BerthManageController.java
  View file @3108b90
1 -package com.zteits.irain.portal.web.parkinglotcloudplatform.datastatistic; 1 +package com.zteits.irain.portal.web.parkinglotcloudplatform.berthmanage;
2 2
3 import java.text.SimpleDateFormat; 3 import java.text.SimpleDateFormat;
4 import java.util.ArrayList; 4 import java.util.ArrayList;
@@ -9,10 +9,7 @@ import javax.servlet.http.HttpServletRequest; @@ -9,10 +9,7 @@ import javax.servlet.http.HttpServletRequest;
9 import javax.servlet.http.HttpServletResponse; 9 import javax.servlet.http.HttpServletResponse;
10 10
11 import org.apache.poi.xssf.usermodel.XSSFSheet; 11 import org.apache.poi.xssf.usermodel.XSSFSheet;
12 -import org.slf4j.Logger;  
13 -import org.slf4j.LoggerFactory;  
14 import org.springframework.beans.factory.annotation.Autowired; 12 import org.springframework.beans.factory.annotation.Autowired;
15 -import org.springframework.beans.factory.annotation.Value;  
16 import org.springframework.stereotype.Controller; 13 import org.springframework.stereotype.Controller;
17 import org.springframework.web.bind.annotation.GetMapping; 14 import org.springframework.web.bind.annotation.GetMapping;
18 import org.springframework.web.bind.annotation.PostMapping; 15 import org.springframework.web.bind.annotation.PostMapping;
@@ -58,9 +55,6 @@ import io.swagger.annotations.ApiOperation; @@ -58,9 +55,6 @@ import io.swagger.annotations.ApiOperation;
58 @Controller 55 @Controller
59 @RequestMapping("/berth") 56 @RequestMapping("/berth")
60 public class BerthManageController extends BizController { 57 public class BerthManageController extends BizController {
61 - private static final Logger logger = LoggerFactory.getLogger(BerthManageController.class);  
62 - @Value("${project.syscode}")  
63 - private String sysCode;  
64 @Autowired 58 @Autowired
65 private BerthManageService berthManageService; 59 private BerthManageService berthManageService;
66 60
@@ -77,7 +71,6 @@ public class BerthManageController extends BizController { @@ -77,7 +71,6 @@ public class BerthManageController extends BizController {
77 public BizResultVO<EasyUIDataGridVO<BerthsDTO>> berthInfoList(@RequestBody BerthManageRequest requestObject) 71 public BizResultVO<EasyUIDataGridVO<BerthsDTO>> berthInfoList(@RequestBody BerthManageRequest requestObject)
78 throws InstantiationException, IllegalAccessException { 72 throws InstantiationException, IllegalAccessException {
79 73
80 - requestObject.setSysCode(sysCode);  
81 BizResult<PageBean<BerthsDTO>> respondObject = berthManageService.queryBerthByCondition(requestObject); 74 BizResult<PageBean<BerthsDTO>> respondObject = berthManageService.queryBerthByCondition(requestObject);
82 if(!(respondObject.isSuccess())){ 75 if(!(respondObject.isSuccess())){
83 throw new BizException(respondObject.getErrCode(),respondObject.getErrMsg()); 76 throw new BizException(respondObject.getErrCode(),respondObject.getErrMsg());
@@ -92,7 +85,6 @@ public class BerthManageController extends BizController { @@ -92,7 +85,6 @@ public class BerthManageController extends BizController {
92 @PostMapping("updateBerthInfo") 85 @PostMapping("updateBerthInfo")
93 @ResponseBody 86 @ResponseBody
94 public BizResultVO<Boolean> updateBerthInfo(@RequestBody BerthManageRequest requestObject) { 87 public BizResultVO<Boolean> updateBerthInfo(@RequestBody BerthManageRequest requestObject) {
95 - requestObject.setSysCode(sysCode);  
96 BizResult<Boolean> respondObject = berthManageService.updateBerthById(requestObject); 88 BizResult<Boolean> respondObject = berthManageService.updateBerthById(requestObject);
97 return new BizResultVO<Boolean>(respondObject); 89 return new BizResultVO<Boolean>(respondObject);
98 } 90 }
@@ -105,7 +97,6 @@ public class BerthManageController extends BizController { @@ -105,7 +97,6 @@ public class BerthManageController extends BizController {
105 @PostMapping("deleteBerths") 97 @PostMapping("deleteBerths")
106 @ResponseBody 98 @ResponseBody
107 public BizResultVO<Boolean> deleteBerths(@RequestBody BerthManageRequest requestObject) { 99 public BizResultVO<Boolean> deleteBerths(@RequestBody BerthManageRequest requestObject) {
108 - requestObject.setSysCode(sysCode);  
109 BizResult<Boolean> respondObject = berthManageService.batDeleteBerths(requestObject); 100 BizResult<Boolean> respondObject = berthManageService.batDeleteBerths(requestObject);
110 return new BizResultVO<Boolean>(respondObject); 101 return new BizResultVO<Boolean>(respondObject);
111 } 102 }
@@ -119,7 +110,6 @@ public class BerthManageController extends BizController { @@ -119,7 +110,6 @@ public class BerthManageController extends BizController {
119 @PostMapping("saveBerthInfo") 110 @PostMapping("saveBerthInfo")
120 @ResponseBody 111 @ResponseBody
121 public BizResultVO<Boolean> saveBerthInfo(@RequestBody BerthManageRequest requestObject) { 112 public BizResultVO<Boolean> saveBerthInfo(@RequestBody BerthManageRequest requestObject) {
122 - requestObject.setSysCode(sysCode);  
123 BizResult<Boolean> respondObject = berthManageService.saveBerthInfo(requestObject); 113 BizResult<Boolean> respondObject = berthManageService.saveBerthInfo(requestObject);
124 return new BizResultVO<Boolean>(respondObject); 114 return new BizResultVO<Boolean>(respondObject);
125 } 115 }
@@ -129,7 +119,6 @@ public class BerthManageController extends BizController { @@ -129,7 +119,6 @@ public class BerthManageController extends BizController {
129 public void exportBerthInfoExcel(@RequestParam List<String> plNos,@RequestParam List<String> parkTypes, 119 public void exportBerthInfoExcel(@RequestParam List<String> plNos,@RequestParam List<String> parkTypes,
130 @RequestParam List<String> parkAreaCodes, HttpServletRequest requests, HttpServletResponse response) { 120 @RequestParam List<String> parkAreaCodes, HttpServletRequest requests, HttpServletResponse response) {
131 BerthManageRequest request = new BerthManageRequest(); 121 BerthManageRequest request = new BerthManageRequest();
132 - request.setSysCode(sysCode);  
133 request.setPlNos(plNos); 122 request.setPlNos(plNos);
134 request.setParkTypes(parkTypes); 123 request.setParkTypes(parkTypes);
135 request.setParkAreaCodes(parkAreaCodes); 124 request.setParkAreaCodes(parkAreaCodes);
src/main/resources/application-wwwtown.properties 0 → 100644
  View file @3108b90
  1 +#irain
  2 +irain.url=http://api.parkingwang.com:8280
  3 +server.port=8093
  4 +#irain艾润
  5 +irain.appid=avakrky0gk1m7n00
  6 +#irain
  7 +irain.appsecret=rrr6uz3aqvutpsq2lsna0k18cea4mabw
  8 +#irain aes
  9 +irain.aes=avakrky0gk1m7n00
  10 +
  11 +irain.park_code=734861a1e8656ffa51bdd90829941ca9
  12 +
  13 +spring.dubbo.application.name=${spring.application.name}
  14 +spring.dubbo.registry.address=zookeeper://10.112.92.88:2181?backup=10.112.92.87:2181
  15 +spring.dubbo.provider.version=1.0.0
  16 +spring.dubbo.cunsumer.check=false
  17 +
  18 +#spring session redis config
  19 +spring.redis.host=10.112.92.88
  20 +spring.redis.port=7001
  21 +spring.redis.password=myredis
  22 +
  23 +#ebochong config
  24 +ebochong.url=
  25 +ebochong.clientCode=12345678
  26 +ebochong.key=2xJLZAlyolvMMz4+c/8nRA==
0 \ No newline at end of file 27 \ No newline at end of file