【华商龙-华勤】

src/main/java/com/uas/eis/config/HQConfig.java

@@ -8,20 +8,32 @@ import org.springframework.context.annotation.PropertySource;
 @PropertySource("classpath:hq.properties")
 public class HQConfig {
     private String ev;
+    private String master;
+
     @Value("${prod.url}")
     private String apiUrl;
+    @Value("${test.url}")
+    private String apiUrlTest;
+
     @Value("${prod.userName}")
     private String userName;
     @Value("${prod.password}")
     private String pwd;
 
-    @Value("${test.url}")
-    private String apiUrlTest;
+
     @Value("${test.userName}")
     private String userNameTest;
     @Value("${test.password}")
     private String pwdTest;
 
+    @Value("${prod.userName_hk}")
+    private String userName_hk;
+    @Value("${prod.password_hk}")
+    private String pwd_hk;
+    @Value("${test.userName_hk}")
+    private String userNameTest_hk;
+    @Value("${test.password_hk}")
+    private String pwdTest_hk;
 
     public String getEv() {
         return ev;
@@ -30,6 +42,15 @@ public class HQConfig {
     public void setEv(String ev) {
         this.ev = ev;
     }
+
+    public String getMaster() {
+        return master;
+    }
+
+    public void setMaster(String master) {
+        this.master = master;
+    }
+
     public String getApiUrl() {
         if("test".equals(getEv())){
             return apiUrlTest;
@@ -39,18 +60,39 @@ public class HQConfig {
     }
 
     public String getUserName() {
-        if("test".equals(getEv())){
-            return userNameTest;
-        }else {
-            return userName;
+        if("N_HUASL_SZ".equals(getMaster())){
+            if("test".equals(getEv())){
+                return userNameTest;
+            }else {
+                return userName;
+            }
+        }else if("N_HUASL_T".equals(getMaster())){
+            if("test".equals(getEv())){
+                return userNameTest_hk;
+            }else {
+                return userName_hk;
+            }
+        }else{
+           return "";
         }
     }
 
     public String getPwd() {
-        if("test".equals(getEv())){
-            return pwdTest;
-        }else {
-            return pwd;
+        if("N_HUASL_SZ".equals(getMaster())){
+            if("test".equals(getEv())){
+                return pwdTest;
+            }else {
+                return pwd;
+            }
+        }else if("N_HUASL_T".equals(getMaster())){
+            if("test".equals(getEv())){
+                return pwdTest_hk;
+            }else {
+                return pwd_hk;
+            }
+        }else{
+            return "";
         }
+
     }
 }

src/main/java/com/uas/eis/service/Impl/HQServiceImpl.java

@@ -41,6 +41,7 @@ public class HQServiceImpl implements HQService {
     public ApiResult<String> syncHQPOPlan(String master, Integer id, String emCode, String caller) {
         logger.info("syncHQPOPlan-Begin:master {} id {}",master,id);
         hqConfig.setEv(getMasterEv(master));
+        hqConfig.setMaster(master);
         // 执行查询
         SqlRowList docMsg = baseDao.queryForRowSet(" select vp_statuscode from "+master+".vendPurExecplan where vp_id  = "+id);
         if(!docMsg.next()){

src/main/java/com/uas/eis/task/HQPODataUploadTask.java

@@ -33,5 +33,17 @@ public class HQPODataUploadTask {
             System.out.println(apiResult.toString());
         }
         logger.info("uploadHQPOPlan-End:master {} id {}",master,vpId);
+        //香港先不启用
+        /*
+        master = "N_HUASL_T";
+        vpId = baseDao.queryForObject("select max(vp_id) vp_id from "+master+".vendPurExecplan where vp_statuscode='AUDITED' and nvl(vp_remark,' ') not like '%测试%'",Integer.class);
+        if(vpId!=null && vpId > 0){
+            String emCode="TASK";
+            String caller = "";
+            ApiResult<String> apiResult = hqService.syncHQPOPlan(master,vpId,emCode,caller);
+            System.out.println(apiResult.toString());
+        }
+        logger.info("uploadHQPOPlan-End:master {} id {}",master,vpId);
+        */
     }
 }

src/main/resources/hq.properties

@@ -1,6 +1,10 @@
 test.url=https://editst.huaqin.com:10443/httpsync/agent-vendor-api/poData
+prod.url=https://edi.huaqin.com:10443/httpsync/agent-vendor-api/poData
 test.userName=14058
 test.password=kgNv9FBdfQ
-prod.url=https://edi.huaqin.com:10443/httpsync/agent-vendor-api/poData
 prod.userName=14058
-prod.password=kgNv9FBdfQ
+prod.password=kgNv9FBdfQ
+test.userName_hk=14105_01
+test.password_hk=Hsl2025~1
+prod.userName_hk=14105_01
+prod.password_hk=Hsl2025~1