测试

gradle.properties

@@ -1,3 +1,3 @@
 org.gradle.jvmargs=-Xmx1024m
 fastjsonVersion=1.2.35
-mallApiVersion=0.0.2
+mallApiVersion=0.0.2-SNAPSHOT

src/main/java/com/uas/erp/schedular/publicproduct/domain/ProductReplace.java

@@ -0,0 +1,141 @@
+package com.uas.erp.schedular.publicproduct.domain;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * ERP替代料
+ * created by shicr on 2018/4/25
+ **/
+public class ProductReplace implements Serializable{
+
+    /**
+     * ERP数据库主键号
+     */
+    private Long BPR_ID;
+
+    /**
+     * 替代状态
+     */
+    private String BPR_STATUSCODE;
+
+    /**
+     * 上传状态
+     */
+    private String BPR_SENDSTATUS;
+
+    /**
+     * 物料编号
+     */
+    private String BPR_PRODCODE;
+
+    /**
+     * 替代料号
+     */
+    private String BPR_REPCODE;
+
+    /**
+     * 更新时间
+     */
+    private Date BPR_DATE;
+
+    /**
+     * 物料品牌
+     */
+    private String BPR_PRODBRAND;
+
+    /**
+     * 物料原厂型号
+     */
+    private String BPR_PRODOSCODE;
+
+    /**
+     * 替代料品牌
+     */
+    private String BPR_REPBAND;
+
+    /**
+     * 替代料型号
+     */
+    private String BPR_REPOSCODE;
+
+    public Long getBPR_ID() {
+        return BPR_ID;
+    }
+
+    public void setBPR_ID(Long BPR_ID) {
+        this.BPR_ID = BPR_ID;
+    }
+
+    public String getBPR_STATUSCODE() {
+        return BPR_STATUSCODE;
+    }
+
+    public void setBPR_STATUSCODE(String BPR_STATUSCODE) {
+        this.BPR_STATUSCODE = BPR_STATUSCODE;
+    }
+
+    public String getBPR_SENDSTATUS() {
+        return BPR_SENDSTATUS;
+    }
+
+    public void setBPR_SENDSTATUS(String BPR_SENDSTATUS) {
+        this.BPR_SENDSTATUS = BPR_SENDSTATUS;
+    }
+
+    public String getBPR_PRODCODE() {
+        return BPR_PRODCODE;
+    }
+
+    public void setBPR_PRODCODE(String BPR_PRODCODE) {
+        this.BPR_PRODCODE = BPR_PRODCODE;
+    }
+
+    public String getBPR_REPCODE() {
+        return BPR_REPCODE;
+    }
+
+    public void setBPR_REPCODE(String BPR_REPCODE) {
+        this.BPR_REPCODE = BPR_REPCODE;
+    }
+
+    public Date getBPR_DATE() {
+        return BPR_DATE;
+    }
+
+    public void setBPR_DATE(Date BPR_DATE) {
+        this.BPR_DATE = BPR_DATE;
+    }
+
+    public String getBPR_PRODBRAND() {
+        return BPR_PRODBRAND;
+    }
+
+    public void setBPR_PRODBRAND(String BPR_PRODBRAND) {
+        this.BPR_PRODBRAND = BPR_PRODBRAND;
+    }
+
+    public String getBPR_PRODOSCODE() {
+        return BPR_PRODOSCODE;
+    }
+
+    public void setBPR_PRODOSCODE(String BPR_PRODOSCODE) {
+        this.BPR_PRODOSCODE = BPR_PRODOSCODE;
+    }
+
+    public String getBPR_REPBAND() {
+        return BPR_REPBAND;
+    }
+
+    public void setBPR_REPBAND(String BPR_REPBAND) {
+        this.BPR_REPBAND = BPR_REPBAND;
+    }
+
+    public String getBPR_REPOSCODE() {
+        return BPR_REPOSCODE;
+    }
+
+    public void setBPR_REPOSCODE(String BPR_REPOSCODE) {
+        this.BPR_REPOSCODE = BPR_REPOSCODE;
+    }
+}

src/main/java/com/uas/erp/schedular/publicproduct/task/ProdUserTask.java

@@ -1,6 +1,6 @@
 package com.uas.erp.schedular.publicproduct.task;
 
-import com.uas.erp.schedular.publicproduct.domain.ProductSaler;
+import com.uas.erp.schedular.publicproduct.domain.ProductReplace;
 import com.uas.erp.schedular.task.support.Method;
 import com.uas.erp.schedular.task.support.Role;
 import com.uas.erp.schedular.task.support.TaskMapping;
@@ -27,11 +27,11 @@ public class ProdUserTask extends AbstractTask {
      */
     @TaskMapping(title = "同步ERP的个人物料信息到公共服务", fixedDelay = 60000, method = Method.UPLOAD)
     public void uploadProductSaler() {
-        List<ProductSaler> prods = jdbcTemplate.queryForBeanList("select ps_id,ps_prcode ps_code,nvl(em_uu,0) em_uu,nvl((select en_uu from enterprise ),0) en_uu  from productSaler, employee, product where em_code = ps_emcode and nvl(em_uu, 0)<>0 and pr_code = ps_prcode and nvl(pr_sendstatus, ' ') = '已上传' and nvl(pr_status, ' ') = '已审核' and nvl(ps_emstatus,' ') = '是' and nvl(ps_uploadstatus, ' ') <> '已上传' and rownum <= 200",
-                ProductSaler.class);
+        List<ProductReplace> prods = jdbcTemplate.queryForBeanList("select ps_id,ps_prcode ps_code,nvl(em_uu,0) em_uu,nvl((select en_uu from enterprise ),0) en_uu  from productSaler, employee, product where em_code = ps_emcode and nvl(em_uu, 0)<>0 and pr_code = ps_prcode and nvl(pr_sendstatus, ' ') = '已上传' and nvl(pr_status, ' ') = '已审核' and nvl(ps_emstatus,' ') = '是' and nvl(ps_uploadstatus, ' ') <> '已上传' and rownum <= 200",
+                ProductReplace.class);
         if (!CollectionUtils.isEmpty(prods)) {
             ContextHolder.increaseDataSize(prods.size());
-            new StatusBasedHandler<ProductSaler>("productsaler", "ps_id", "ps_uploadstatus", "/product/produser", prods).run();
+            postForList("/erp/productReplace/update", ProductReplace.class, dataWrap(prods));
         }
     }
     /**
@@ -40,7 +40,7 @@ public class ProdUserTask extends AbstractTask {
      * @author wuyx
      * @date 2018-01-30 08:16
      */
-    @TaskMapping(title = "同步取消公共服务ERP的个人物料信息", fixedDelay = 60000, method = Method.UPLOAD)
+   /* @TaskMapping(title = "同步取消公共服务ERP的个人物料信息", fixedDelay = 60000, method = Method.UPLOAD)
     public void uploadProductSalerQuit() {
         List<ProductSaler> prods = jdbcTemplate.queryForBeanList("select ps_id,ps_prcode ps_code,nvl(em_uu,0) em_uu,nvl((select en_uu from enterprise ),0) en_uu from productSaler, employee, product where em_code = ps_emcode and nvl(em_uu, 0)<>0 and pr_code = ps_prcode and nvl(pr_sendstatus, ' ') = '已上传' and nvl(pr_status, ' ') = '已审核' and nvl(ps_emstatus,' ') = '否' and nvl(ps_uploadstatus, ' ') <> '已上传' and rownum <= 200",
                 ProductSaler.class);
@@ -48,6 +48,6 @@ public class ProdUserTask extends AbstractTask {
             ContextHolder.increaseDataSize(prods.size());
             new StatusBasedHandler<ProductSaler>("productsaler", "ps_id", "ps_uploadstatus", "/product/produser/quit", prods).run();
         }
-    }
+    }*/
 
 }

src/main/java/com/uas/erp/schedular/web/ResultWrap.java

@@ -13,6 +13,8 @@ public class ResultWrap<T> {
 
     private T content;
 
+    private String busincode;
+
     public boolean isSuccess() {
         return success;
     }
@@ -44,4 +46,12 @@ public class ResultWrap<T> {
     public void setMessage(String message) {
         this.message = message;
     }
+
+    public String getBusincode() {
+        return busincode;
+    }
+
+    public void setBusincode(String busincode) {
+        this.busincode = busincode;
+    }
 }

src/main/resources/hessian/mall.xml

@@ -236,4 +236,23 @@
 		<property name="hessian2" value="true" />
 		<property name="readTimeout" value="30000"/>
 	</bean>
+
+	<!--替代料接口-->
+	<bean class="com.uas.remoting.hessian.MultiProxyFactoryBean" id="product">
+		<property name="proxyFactory" ref="signedProxyFactory" />
+		<property name="serviceUrls">
+			<map>
+				<entry key="test"
+					   value="http://localhost:8080/platform-b2c/erp/productReplace/update" />
+				<entry key="prod"
+					   value="http://localhost:8080/platform-b2c/erp/productReplace/update" />
+			</map>
+		</property>
+
+		<property name="serviceInterface"
+				  value="com.uas.api.b2c_erp.seller.service.ProductReplaceService" />
+		<property name="overloadEnabled" value="true" />
+		<property name="hessian2" value="true" />
+		<property name="readTimeout" value="30000"/>
+	</bean>
 </beans>

src/main/resources/init/setting.json

@@ -4,11 +4,12 @@
   "value": "http://127.0.0.1:9002/uas_database"
 },{
   "key": "api.uas.outer.url",
-  "description": "UAS系统外网接口地址"
+  "description": "UAS系统外网接口地址",
+  "value": "http://218.18.115.198:8888/ERP"
 },{
   "key": "api.uas.inner.url",
   "description": "UAS系统内网接口地址",
-  "value": "http://127.0.0.1:8081/ERP"
+  "value": "http://192.168.253.29:8080/ERP"
 },{
   "key": "api.b2b.test.url",
   "description": "优软B2B平台测试接口地址",
@@ -17,17 +18,14 @@
   "key": "api.b2b.url",
   "description": "优软B2B平台正式接口地址",
   "value": "http://uas.ubtob.com"
-},{
-  "key": "api.finance.test.url",
-  "description": "金融保理平台测试接口地址"
 },{
   "key": "api.finance.url",
   "description": "金融保理平台（后台）正式接口地址",
-  "value": "http://10.10.100.178:23000"
+  "value": "http://finance.ubtob.com"
 },{
-  "key": "api.finance.service.test.url",
+  "key": "api.finance.test.url",
   "description": "金融保理平台（客户端）测试接口地址",
-  "value": "http://localhost:8081"
+  "value": "http://localhost:8080/platform-b2c"
 },{
   "key": "api.finance.service.url",
   "description": "金融保理平台（客户端）正式接口地址",

src/test/java/com/uas/erp/test/ProductReplaceTest.java

@@ -0,0 +1,54 @@
+package com.uas.erp.test;
+
+import com.uas.api.b2c_erp.seller.service.ProductReplaceService;
+import com.uas.erp.schedular.UasSchedulingApplication;
+import com.uas.erp.schedular.entity.Master;
+import com.uas.erp.schedular.finance.task.AbstractTask;
+import com.uas.erp.schedular.mall.config.HessianConfig;
+import com.uas.erp.schedular.publicproduct.domain.ProductReplace;
+import com.uas.erp.schedular.util.ContextHolder;
+import org.aspectj.lang.annotation.Aspect;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.util.CollectionUtils;
+
+import java.util.List;
+
+/*
+ * created by shicr on 2018/4/26
+ */
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, classes = UasSchedulingApplication.class)
+public class ProductReplaceTest extends AbstractTask{
+//    @Autowired
+//    private ProductReplaceService productReplaceService;
+
+    @Autowired
+    private ProductReplaceService productReplaceService;
+
+    @Test
+    public void testConnect() {
+        System.out.println(productReplaceService);
+        Master master = new Master();
+        master.setMa_user("UAS_DEV");
+        master.setMa_uu(10041166L);
+        master.setMa_accesssecret("2c1ea0898633796fe050007f01002ea6");
+        master.setMa_env("test");
+        master.setMa_name("UAS");
+        ContextHolder.setMaster(master);
+        List<ProductReplace> prods = jdbcTemplate.queryForBeanList("select BPR_ID,BPR_STATUSCODE,BPR_SENDSTATUS,BPR_PRODCODE,BPR_REPCODE,BPR_DATE,BPR_PRODBRAND,BPR_PRODOSCODE,BPR_REPBAND,BPR_REPOSCODE,BPR_ENUU " +
+                        "from B2B_PRODREPLACE where nvl(BPR_SENDSTATUS,' ')<>'已上传'",
+                ProductReplace.class);
+        if (!CollectionUtils.isEmpty(prods)) {
+            ContextHolder.increaseDataSize(prods.size());
+            productReplaceService.update(null);
+          //  postForList("/erp/productReplace/update", ProductReplace.class, dataWrap(prods));
+
+        }
+
+    }
+}