单位开户、单位变更、单位销户协议修改

src/main/java/net/cdkj/gjj/adapter/controller/AlarmTask.java

 package net.cdkj.gjj.adapter.controller;
 
 
+import net.cdkj.gjj.adapter.service.DeptInfoUpdateService;
+import net.cdkj.gjj.adapter.service.DeptLogoutService;
+import net.cdkj.gjj.adapter.service.OpenAccountService;
 import net.cdkj.gjj.adapter.utils.InternalUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -21,14 +24,14 @@ import javax.annotation.Resource;
 //@Async
 public class AlarmTask {
 
-    private static final Logger log = LoggerFactory.getLogger(DeptInfoUpdateController.class);
+    private static final Logger log = LoggerFactory.getLogger(AlarmTask.class);
 
     @Resource
-    private DeptInfoUpdateController deptInfoUpdateController;
+    private OpenAccountService openAccountService;
     @Resource
-    private DeptLogoutController deptLogoutController;
+    private DeptInfoUpdateService deptInfoUpdateService;
     @Resource
-    private ProvidentFundServicesController providentFundServicesController;
+    private DeptLogoutService deptLogoutService;
 
     /**
      * 第一次延迟(initialDelay)?秒后执行，之后按fixedDelay的规则每?秒执行一次
@@ -37,7 +40,7 @@ public class AlarmTask {
     public void dwkhPullTask() {
         log.debug("第一个接口开始时间:{}", InternalUtils.getCurrentTime());
         try {
-            providentFundServicesController.gjjxtfwjk();
+            openAccountService.syncDeptInfo();
         } catch (Exception e) {
             log.error("{}", e);
         }
@@ -51,34 +54,20 @@ public class AlarmTask {
     @Scheduled(initialDelay = 20 * 1000, fixedDelayString = "${dwkhPushTaskDelay}")
     public void dwkhPushTask() {
         log.debug("第二个接口开始时间:{}", InternalUtils.getCurrentTime());
-        providentFundServicesController.BusinessProcessing();
+        openAccountService.dwkhPush();
     }
 
-
     @Scheduled(initialDelay = 40 * 1000, fixedDelayString = "${dwxxbgPushTaskDelay}")
     public void dwxxbgPushTask() {
         log.debug("dwxxbgPushTask 开始时间:{}", InternalUtils.getCurrentTime());
-        deptInfoUpdateController.dwxxbgPush();
-    }
-
-
-    @Scheduled(initialDelay = 60 * 1000, fixedDelayString = "${dwxxbgPullTaskDelay}")
-    public void dwxxbgPullTask() {
-        log.debug("dwxxbgPullTask 开始时间:{}", InternalUtils.getCurrentTime());
-        deptInfoUpdateController.dwxxbgPull();
+        deptInfoUpdateService.deptInfoUpdatePush();
     }
 
     @Scheduled(initialDelay = 80 * 1000, fixedDelayString = "${dwxhPushTaskDelay}")
     public void dwxhPushTask() {
         log.debug("dwxhPushTask 开始时间:{}", InternalUtils.getCurrentTime());
-        deptLogoutController.dwxhPush();
+        deptLogoutService.dwxhPush();
     }
 
-
-    @Scheduled(initialDelay = 100 * 1000, fixedDelayString = "${dwxhPullTaskDelay}")
-    public void dwxhPullTask() {
-        log.debug("dwxhPullTask 开始时间:{}", InternalUtils.getCurrentTime());
-        deptLogoutController.dwxhPull();
-    }
 }
 

src/main/java/net/cdkj/gjj/adapter/controller/TestController.java

-package net.cdkj.gjj.adapter.controller;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping(value = "demo")
-public class TestController {
-
-    @RequestMapping("test")
-    public String test(String name) {
-        System.out.println("内部业务机");
-        return "hello,hello" + name;
-    }
-}

src/main/java/net/cdkj/gjj/adapter/domain/Json.java

@@ -47,15 +47,5 @@ public class Json {
         this.data = data;
     }
 
-    @Override
-    public String toString() {
-        return "Json{" +
-                "code=" + code +
-                ", message='" + message + '\'' +
-                ", fields='" + fields + '\'' +
-                ", data=" + data +
-                '}';
-    }
-
 
 }

src/main/java/net/cdkj/gjj/adapter/domain/PropertyqUtil.java

 package net.cdkj.gjj.adapter.domain;
 
-import net.cdkj.gjj.adapter.controller.DeptInfoUpdateController;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -14,7 +13,7 @@ import java.util.Properties;
  */
 public class PropertyqUtil {
 
-    private static final Logger log = LoggerFactory.getLogger(DeptInfoUpdateController.class);
+    private static final Logger log = LoggerFactory.getLogger(PropertyqUtil.class);
 
     /**
      * 读取 classpath 下 指定的properties配置文件，加载到Properties并返回Properties

src/main/java/net/cdkj/gjj/adapter/domain/UnitAccountOpeningInformation.java

@@ -58,6 +58,16 @@ public class UnitAccountOpeningInformation {
 
     private String errmsg;
 
+    private String dataStatus;
+
+
+    public String getDataStatus() {
+        return dataStatus;
+    }
+
+    public void setDataStatus(String dataStatus) {
+        this.dataStatus = dataStatus;
+    }
 
     public String getBusId() {
         return busId;
@@ -250,34 +260,4 @@ public class UnitAccountOpeningInformation {
     public void setErrmsg(String errmsg) {
         this.errmsg = errmsg;
     }
-
-    @Override
-    public String toString() {
-        return "UnitAccountOpeningInformation{" +
-                "ywbh='" + ywbh + '\'' +
-                ", busId='" + busId + '\'' +
-                ", uscc='" + uscc + '\'' +
-                ", entName='" + entName + '\'' +
-                ", dom='" + dom + '\'' +
-                ", estDate=" + estDate +
-                ", lerep='" + lerep + '\'' +
-                ", cerType='" + cerType + '\'' +
-                ", cerNo='" + cerNo + '\'' +
-                ", operatorName='" + operatorName + '\'' +
-                ", operatorCerNo='" + operatorCerNo + '\'' +
-                ", operatorPhone='" + operatorPhone + '\'' +
-                ", oplocdistrict='" + oplocdistrict + '\'' +
-                ", unitNature='" + unitNature + '\'' +
-                ", economicType='" + economicType + '\'' +
-                ", industryphy='" + industryphy + '\'' +
-                ", unitPayDay='" + unitPayDay + '\'' +
-                ", unitDepPro='" + unitDepPro + '\'' +
-                ", personalDepPro='" + personalDepPro + '\'' +
-                ", zxdqbm='" + zxdqbm + '\'' +
-                ", lcls='" + lcls + '\'' +
-                ", dwzh='" + dwzh + '\'' +
-                ", errcode='" + errcode + '\'' +
-                ", errmsg='" + errmsg + '\'' +
-                '}';
-    }
 }

src/main/resources/application.properties

@@ -24,20 +24,11 @@ password:ENC(PI2/xdOsEObL0YZlfGfQnyiJeYUw/90FePU+sO4EDjU=)
 
 
 # 前置服务URL
-#单位开户拉取url
-dwkhPullUrl:http://127.0.0.1:8081/FrontEndProcessor/ProvidentFundServices
-#单位开户推送url
-dwkhPushUrl:http://127.0.0.1:8081/FrontEndProcessor/BusinessProcessing
+#单位信息拉取url
+providentFundServices:http://127.0.0.1:8081/FrontEndProcessor/ProvidentFundServices
+#办理进度推送url
+businessProcessing:http://127.0.0.1:8081/FrontEndProcessor/BusinessProcessing
 
-#单位信息变跟拉取url
-dwxxbgPullUrl:http://127.0.0.1:8081/FrontEndProcessor/dwxxbgPull
-#单位信息变跟推送url
-dwxxbgPushUrl:http://127.0.0.1:8081/FrontEndProcessor/dwxxbgPush
-
-#单位销户拉取url
-dwxhPullUrl:http://127.0.0.1:8081/FrontEndProcessor/dwxhPull
-#单位销户推送url
-dwxhPushUrl:http://127.0.0.1:8081/FrontEndProcessor/dwxhPush
 
 
 
@@ -45,9 +36,7 @@ dwxhPushUrl:http://127.0.0.1:8081/FrontEndProcessor/dwxhPush
 dwkhPullTaskDelay:60000
 dwkhPushTaskDelay:60000
 dwxxbgPushTaskDelay:60000
-dwxxbgPullTaskDelay:60000
 dwxhPushTaskDelay:60000
-dwxhPullTaskDelay:60000
 
 # 日志配置
 logging.config:classpath:logback.xml