修改xxl-job配置

src/main/java/com/wangxiaolu/promotion/domain/user/dao/QinceDealerDao.java

@@ -22,6 +22,4 @@ public interface QinceDealerDao {
 
     List<QinCeDealerDto> selectList(DealerWrapper dw);
 
-    void updateOrg();
-
 }

src/main/java/com/wangxiaolu/promotion/domain/user/dao/impl/QinceDealerDaoImpl.java

@@ -76,34 +76,6 @@ public class QinceDealerDaoImpl implements QinceDealerDao {
         return transitionDtos(qinceDealerDOS);
     }
 
-    @Override
-    public void updateOrg() {
-        /**
-         * 更新非直营经销商的所属战区ID、战区名
-         * 非直营经销商所属部门是经销商级部门，上级战区无论是xx战区还是重客都可以直接将上级部门进行补充到org信息中
-         */
-        qinceDealerMapper.updateOrg();
-
-        /**
-         * 更新直营经销商的所属战区ID、战区名
-         * 直营经销商所属部门是直属战区（没有经销商级部门），直接将所属部门补充到org信息中
-         */
-        qinceDealerMapper.updateOrgZY();
-
-        /**
-         * 更新非直营经销商的所属大区ID、大区名
-         * 判断是否是重客，如果是重客直接将重客放到大区中
-         * 如果不是重客，直接将所属战区的parent部门放到大区中
-         */
-        qinceDealerMapper.updateParentOrg();
-        qinceDealerMapper.updateParentOrgZK();
-
-        /**
-         * 直接将所属战区的parent部门放到大区中(目前重客没有直接经销商)
-         */
-        qinceDealerMapper.updateParentOrgZY();
-    }
-
     /**
      * DO to DTO (单个对象)
      *

src/main/java/com/wangxiaolu/promotion/domain/user/mapper/QinceDealerMapper.java

@@ -19,16 +19,6 @@ import java.util.List;
 public interface QinceDealerMapper extends BaseMapper<QinceDealerDO> {
 
     void saveList(@Param("dealerJsons") List<Object> dealerJsons);
-
-    void updateOrg();
-
-    void updateOrgZY();
-
-    void updateParentOrg();
-
-    void updateParentOrgZY();
-
-    void updateParentOrgZK();
 }
 
 

src/main/java/com/wangxiaolu/promotion/service/user/QinCeDataTaskService.java

@@ -17,6 +17,4 @@ public interface QinCeDataTaskService {
     void productAllTask();
 
     void productDealers();
-
-    void putDealersOrg();
 }

src/main/java/com/wangxiaolu/promotion/service/user/impl/QinCeDataTaskServiceImpl.java

@@ -137,16 +137,6 @@ public class QinCeDataTaskServiceImpl implements QinCeDataTaskService {
         }
     }
 
-    /**
-     * 修改经销商
-     * 同步有独立部门经销商的战区、大区
-     * 同步王小卤直营经销商数据
-     */
-    @Override
-    public void putDealersOrg() {
-        qinceDealerDao.updateOrg();
-    }
-
     private boolean booleanDealersPage(Integer pageNum){
         Map<String, Object> params = qinCeUtils.queryDealerParam(pageNum);
         String url = qinCeUtils.builderUrl(QinCeUtils.QUERY_DEALER, params);

src/main/java/com/wangxiaolu/promotion/xxljobtask/XxlJobHandler.java

@@ -33,10 +33,6 @@ public class XxlJobHandler {
         log.info("[xxl-job] start === 同步昨日修改过的勤策部门数据");
         qinCeDataTaskService.departmentSyncTask();
         log.info("[xxl-job] end === 同步昨日修改过的勤策部门数据");
-
-        log.info("[xxl-job] start === 更新经销商所属战区、大区信息");
-        qinCeDataTaskService.putDealersOrg();
-        log.info("[xxl-job] end === 更新经销商所属战区、大区信息");
     }
 
     /**

src/main/resources/application-dev.yml

@@ -89,7 +89,7 @@ xxl:
   job:
     accessToken: default_token
     admin:
-      addresses: http://192.168.100.38:9001/xxl-job-admin
+      addresses: http://192.168.100.38:9000/xxl-job-admin
     executor:
       appname: promotion-dev
       port: 9996

src/main/resources/application-master.yml

@@ -79,7 +79,7 @@ xxl:
   job:
     accessToken: default_token
     admin:
-      addresses: http://10.0.0.170:9001/xxl-job-admin
+      addresses: http://10.0.0.170:9003/xxl-job-admin
     executor:
       appname: promotion-live
       port: 9989

src/main/resources/application-qa.yml

@@ -87,13 +87,13 @@ xxl:
   job:
     accessToken: default_token
     admin:
-      addresses: http://192.168.100.38:9001/xxl-job-admin
+      addresses: http://192.168.100.38:9000/xxl-job-admin
     executor:
       appname: promotion-qa
       port: 9997
       logretentiondays: 30
       address:
-      ip: 192.168.100.39
+      ip: 192.168.100.55
       logpath: /var/logs/xxl_job
 
 aliyun:

src/main/resources/mapper/QinceDealerMapper.xml

@@ -18,75 +18,15 @@
 
     <insert id="saveList">
         insert into qince_dealer
-        (dealer_id, dealer_name, dealer_cooperate_status, create_time,dealer_dept_waiqin365_id,dealer_dept_name,dealer_type,dealer_status,dealer_manager_code,dealer_manager)
+        (dealer_id, dealer_name, dealer_cooperate_status)
         VALUES
         <foreach collection="dealerJsons" item="item" separator=",">
             (#{item.dealer_id}, #{item.dealer_name},
-            #{item.dealer_cooperate_status},#{item.create_time},#{item.dealer_dept_waiqin365_id},#{item.dealer_dept_name},#{item.dealer_type},#{item.dealer_status},#{item.dealer_manager_code},#{item.dealer_manager})
+            #{item.dealer_cooperate_status})
         </foreach>
         ON DUPLICATE KEY UPDATE
         dealer_name = values(dealer_name),
-        dealer_cooperate_status = values(dealer_cooperate_status),
-        dealer_dept_waiqin365_id = values(dealer_dept_waiqin365_id),
-        dealer_dept_name = values(dealer_dept_name),
-        dealer_type = values(dealer_type),
-        dealer_status = values(dealer_status),
-        dealer_manager_code = values(dealer_manager_code),
-        dealer_manager = values(dealer_manager);
+        dealer_cooperate_status = values(dealer_cooperate_status)
     </insert>
 
-    <update id="updateOrg">
-        update qince_dealer de
-            inner join qince_department dept
-        set de.zq_org_qc_id = dept.waiqin365_parent_id,
-            de.zq_org_name  = dept.parent_name
-        where de.dealer_dept_waiqin365_id = dept.qc_id
-          and de.dealer_cooperate_status = 1
-          and de.dealer_status = 1
-          and de.dealer_type = '经销商'
-          and de.dealer_dept_name = de.dealer_name;
-    </update>
-
-    <update id="updateOrgZY">
-        update qince_dealer
-        set zq_org_qc_id = dealer_dept_waiqin365_id,
-            zq_org_name=dealer_dept_name
-        where dealer_cooperate_status = 1
-          and dealer_status = 1
-          and dealer_type = '经销商'
-          and dealer_name like '王小卤直营%';
-    </update>
-
-    <update id="updateParentOrg">
-        update qince_dealer de inner join qince_department dept
-        set dq_org_qc_id = dept.waiqin365_parent_id,
-            dq_org_name  = dept.parent_name
-        where de.zq_org_qc_id = dept.qc_id
-          and de.dealer_cooperate_status = 1
-          and de.dealer_status = 1
-          and de.dealer_type = '经销商'
-          and de.dealer_dept_name = de.dealer_name
-          and zq_org_name != '重客销售部'
-    </update>
-
-    <update id="updateParentOrgZK">
-        update qince_dealer
-        set dq_org_qc_id = zq_org_qc_id,
-            dq_org_name  = zq_org_name
-        where dealer_cooperate_status = 1
-          and dealer_status = 1
-          and dealer_type = '经销商'
-          and zq_org_name = '重客销售部';
-    </update>
-
-    <update id="updateParentOrgZY">
-        update qince_dealer de inner join qince_department dept
-        set dq_org_qc_id = dept.waiqin365_parent_id,
-            dq_org_name  = dept.parent_name
-        where de.zq_org_qc_id = dept.qc_id
-          and de.dealer_cooperate_status = 1
-          and de.dealer_status = 1
-          and de.dealer_type = '经销商'
-          and dealer_name like '王小卤直营%';
-    </update>
 </mapper>