Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-07-05 2dcf4b9d75cc1b6613aea59cec4a0f9cc97f1c0e

 springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/java/com/panzhihua/timejob/jobhandler/LangChaoEventUploadJobHandler.java

@@ -21,7 +21,7 @@


    @Resource
    private ApiServiceFeign ApiServiceFeign;
    private ApiServiceFeign apiServiceFeign;

    /**
     * description 生成或更新redis里面的对接浪潮所需的token信息,token有效期12小时
@@ -32,7 +32,7 @@
    @XxlJob("langChaoGetToken")
    public ReturnT<String> langChaoGetToken(String param) {
        log.info("定时更新浪潮对接token。token有效期12小时");
        ApiServiceFeign.getToken("18080799023", "123456");
        apiServiceFeign.getToken("18080799023", "123456");
        log.info("定时更新浪潮对接token完成");
        return ReturnT.SUCCESS;
    }
@@ -46,9 +46,22 @@
    @XxlJob("langChaoAutomationUpload")
    public ReturnT<String> langChaoAutomationUpload(String param) {
        log.info("向浪潮服务器提交网格事件登记开始");
        ApiServiceFeign.automationUploadEventAndFile();
        apiServiceFeign.automationUploadEventAndFile();
        log.info("向浪潮服务器提交网格事件登记完成");
        return ReturnT.SUCCESS;
    }

    /**
     * description 自动上传重点人员和流动人员走访记录
     *
     * @author manailin
     * @date 2021/6/10 17:00
     */
    @XxlJob("automationUploadVisitRecord")
    public ReturnT<String> automationUploadVisitRecord(String param) {
        log.info("向浪潮服务器自动上传重点人员和流动人员走访记录开始");
        apiServiceFeign.automationUploadVisitRecord();
        log.info("向浪潮服务器自动上传重点人员和流动人员走访记录完成");
        return ReturnT.SUCCESS;
    }
}