正式环境配置和模板修改

smart-city-platform/src/main/java/com/bz/smart_city/service/udip/GdAgentUtils.java

@@ -49,7 +49,7 @@ public class GdAgentUtils {
     public Boolean archivesCheck(Integer concentratorId){
         Boolean result = false;
         log.info("begin archivesCheck concentratorId={}",concentratorId);
-        String url = gdAgentUrl+"/api/readmeter/readMeterInfoByID?concentratorId={concentratorId}";
+        String url = gdAgentUrl+"/readmeter/readMeterInfoByID?concentratorId={concentratorId}";
 
         Map<String,Integer> map = new HashMap<String,Integer>();
         map.put("concentratorId",concentratorId);
@@ -123,7 +123,7 @@ public class GdAgentUtils {
     //读取集中器状态
     public Integer readConcentratorState(Integer concentratorId){
         log.info("begin readConcentratorState concentratorId={}",concentratorId);
-        String url = gdAgentUrl+"/api/readmeter/readConcentratorState?concentratorId={concentratorId}";
+        String url = gdAgentUrl+"/readmeter/readConcentratorState?concentratorId={concentratorId}";
         Map<String,Integer> map = new HashMap<String,Integer>();
         map.put("concentratorId",concentratorId);
         ResponseEntity<ConcentratorInfo> responseEntity = restTemplate.getForEntity(url, ConcentratorInfo.class,map);
@@ -144,7 +144,7 @@ public class GdAgentUtils {
     //
     public Integer setMeterInfo(Long deviceId){
         log.info("begin setMeterInfo deviceId={}",deviceId);
-        String url = gdAgentUrl+"/api/readmeter/setMeterInfo?deviceId={deviceId}";
+        String url = gdAgentUrl+"/readmeter/setMeterInfo?deviceId={deviceId}";
         Map<String,String> map = new HashMap<String,String>();
         map.put("deviceId",deviceId.toString());
         ConcentratorInfo concentratorInfo = restTemplate.getForObject(url, ConcentratorInfo.class,map);
@@ -157,7 +157,7 @@ public class GdAgentUtils {
     //开关阀门
     public Integer setMeterValve(Long deviceId, Boolean valveStatus){
         log.info("begin setMeterValve deviceId={},valveStatus={}",deviceId,valveStatus);
-        String url = gdAgentUrl+"/api/readmeter/setMeterValve?deviceId={deviceId}&valveStatus={valveStatus}";
+        String url = gdAgentUrl+"/readmeter/setMeterValve?deviceId={deviceId}&valveStatus={valveStatus}";
         Map<String,String> map = new HashMap<String,String>();
         map.put("deviceId",deviceId.toString());
         map.put("valveStatus",valveStatus.toString());

smart-city-platform/src/main/resources/application-dev.properties

@@ -164,7 +164,7 @@ udip.unit.url=http://114.135.61.188:48322
 invoice.print.url=http://nnfpbox.nuonuocs.cn/shop/buyer/allow/cxfKp/cxfServerKpOrderSync.action
 invoice.query.url=http://nnfpbox.nuonuocs.cn/shop/buyer/allow/ecOd/queryElectricKp.action
 #光电直读agent url
-gd.agent.url=http://10.0.0.160:6377
+gd.agent.url=http://10.0.0.160:6377/api
 #临河客户
 sync.customer.linhe.id=126
 sync.data.limit=50

smart-city-platform/src/main/resources/application-sit.properties

@@ -167,7 +167,7 @@ udip.unit.url=http://114.135.61.188:48322
 invoice.print.url=http://nnfpbox.nuonuocs.cn/shop/buyer/allow/cxfKp/cxfServerKpOrderSync.action
 invoice.query.url=http://nnfpbox.nuonuocs.cn/shop/buyer/allow/ecOd/queryElectricKp.action
 #光电直读agent url
-gd.agent.url=http://10.0.0.160:6377
+gd.agent.url=http://10.0.0.160:6377/api
 #临河客户
 sync.customer.linhe.id=126
 sync.data.limit=100

smart-city-platform/src/main/resources/application.properties

@@ -1,2 +1,2 @@
 #开发环境：dev  测试环境：sit  线上环境：prd  演示环境：uat
-spring.profiles.active=dev
+spring.profiles.active=prd