yaozhixue 1 year ago
parent
commit
612aa2ac38

BIN
1691000236421070849.jpeg


BIN
1691384916156792833.jpeg


+ 0 - 2
src/main/java/com/zfire/jiasm/syncdata/download/order/RepairBusinessApi.java

@@ -44,8 +44,6 @@ public class RepairBusinessApi {
     AddRepairBusinessService addRepairBusinessService;
 
 
-
-
     // 1:工单落入本地表 TL_SynDataFrom_tbl_assign_batch
     @Scheduled(fixedDelayString = "${repairin}")
     public void inputOrder() {

+ 24 - 0
src/main/java/com/zfire/jiasm/syncdata/download/order/testt.java

@@ -0,0 +1,24 @@
+package com.zfire.jiasm.syncdata.download.order;
+
+import com.zfire.jiasm.syncdata.service.AddRepairBusinessService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+
+@Slf4j
+@Component
+public class testt {
+    @Resource
+    AddRepairBusinessService addRepairBusinessService;
+
+
+    public void test() {
+        try{
+            addRepairBusinessService.csfun();
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+    }
+}

+ 2 - 0
src/main/java/com/zfire/jiasm/syncdata/service/AddRepairBusinessService.java

@@ -35,4 +35,6 @@ public interface AddRepairBusinessService {
                      ItfTblAssignDownload item,
                      Map<String, List<SysDictRef>> sysDictRefDLMapXq,
                      Map<String, List<SysDictRef>> sysDictRefXLMapXq,Boolean flag) throws Exception;
+
+    Boolean csfun() throws Exception;
 }

+ 78 - 1
src/main/java/com/zfire/jiasm/syncdata/service/impl/AddRepairBusinessServiceImpl.java

@@ -20,6 +20,7 @@ import com.zfire.jiasm.syncdata.service.AddRepairBusinessService;
 import com.zfire.jiasm.syncdata.service.JiasmApi;
 import com.zfire.jiasm.syncdata.service.OrderService;
 import com.zfire.jiasm.syncdata.service.PublicService;
+import com.zfire.jiasm.syncdata.test;
 import com.zfire.jiasm.syncdata.utils.MyBeanUtils;
 import com.zfire.jiasm.syncdata.utils.ResponseHelper;
 import lombok.extern.slf4j.Slf4j;
@@ -91,6 +92,10 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService {
     JiasmApi jiasmApi;
     @Resource
     BaseService baseService;
+    @Resource
+    BrandService brandService;
+    @Resource
+    TestService testService;
 
 
 
@@ -298,7 +303,7 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService {
 
         // 工单主表、机型、辅材、清洗、预约改约记录、师傅、创建日志、生成采集数据不要
         getOrderApi(item, addmx, order, orderWorker, or, orderApi, orderProductList, orderMaterialList, orderCleanItems,flag);
-        log.info("修改维修工单 request:{}", JSONObject.toJSONString(order));
+        log.info("修改维修工单 request:{}", JSONObject.toJSONString(orderApi));
         ResponseHelper respone = jiasmApi.orderAdd(orderApi);
         log.info("修改维修工单 respone:{}", JSONObject.toJSONString(respone));
         if (respone.getCode()==200){
@@ -2801,4 +2806,76 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService {
         }
     }
 
+
+    // //////////////////////////////////////////
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean csfun() throws Exception {
+        List<Brand> addmx = new ArrayList<>();
+        List<Brand> upMxd = new ArrayList<>();
+        List<Test> ttt = new ArrayList<>();
+        // 取数据
+        csfuna(upMxd,ttt);
+        // 表中插入数据
+        csfunb(addmx,upMxd,ttt);
+
+        // 网络请求
+        // csfunbc();
+        return Boolean.FALSE;
+    }
+
+    @NotNull
+    public Boolean csfunbc() throws Exception {
+        // 创建工单
+        OrderAddBeanDTO orderApi = new OrderAddBeanDTO();
+
+        ResponseHelper respone = jiasmApi.orderAdd(orderApi);
+        log.info("修改维修工单 respone:{}", JSONObject.toJSONString(respone));
+        if (respone.getCode()==200){
+            return Boolean.TRUE;
+        } else {
+            log.info("网络失败 {}",respone.getMessage());
+            throw new Exception("msg");
+        }
+    }
+
+
+    private Boolean csfunb(List<Brand> addmx,List<Brand> upMxd,List<Test> ttt){
+        if (upMxd.size()>0){
+            brandService.updateBatchById(upMxd);
+        }
+
+        if (ttt.size()>0){
+            testService.saveBatch(ttt);
+        }
+
+        return Boolean.TRUE;
+    }
+
+    public void csfuna(List<Brand> upMxd,List<Test> ttt) {
+        List<Brand> mxRec = new ArrayList<>();
+
+        // 提取明细表数据
+        mxRec = brandService.lambdaQuery()
+                .eq(Brand::getBrand, "格力")
+                .list();
+
+        for (Brand rec:mxRec){
+            Brand up = new Brand();
+            up.setBrandId(rec.getBrandId());
+            up.setBrand("格力格");
+            upMxd.add(up);
+        }
+
+        Test t = new Test();
+        t.setId("88888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888");
+        ttt.add(t);
+
+    }
+
+
+
+
+    //  /////////////////////////////////////////////////////////////////////////////
+
 }

+ 1 - 1
src/main/resources/bootstrap-dev.properties

@@ -291,7 +291,7 @@ installdownc=FALSE
 installinc=FALSE
 #维修工单下载、入本地表
 repairdownc=FALSE
-repairinc=TRUE
+repairinc=FALSE
 #回收工单下载、获取工单的反馈明细数据、(获取对应的采集数据、附件数据、条码明细数据)、与总部进行确认下载完成、同步到业务表
 recycledownc=FALSE
 recyclefkdownc=FALSE

+ 30 - 30
src/main/resources/bootstrap-test.properties

@@ -284,8 +284,8 @@ hsgdcjtm=7200000
 dataupload=60000
 ######################## 同步定时任务配置 ########################
 #师傅 证件、师傅、工单子表信息
-workercertificatec=FALSE
-workerceruploadc=FALSE
+workercertificatec=TRUE
+workerceruploadc=TRUE
 detaildownc=TRUE
 #安装工单下载 、入本地表
 installdownc=TRUE
@@ -314,36 +314,36 @@ masterdownloadratec=FALSE
 masterratec=FALSE
 guzdmc=FALSE
 #网点 佛山销售网点|售后网点、广州销售网点|售后网点
-netfsxc=FALSE
-netfssc=FALSE
-netgzxc=FALSE
-netgzsc=FALSE
+netfsxc=TRUE
+netfssc=TRUE
+netgzxc=TRUE
+netgzsc=TRUE
 #网点维修工 佛山销售|售后、广州销售|售后
-fsxwxgc=FALSE
-fsswxgc=FALSE
-gzxwxgc=FALSE
-gzswxgc=FALSE
+fsxwxgc=TRUE
+fsswxgc=TRUE
+gzxwxgc=TRUE
+gzswxgc=TRUE
 gfwwwc=TRUE
 #类别大类、小类、系列、机型
-lbdlc=FALSE
-lbxlc=FALSE
-lbxltc=FALSE
-lbjxc=FALSE
+lbdlc=TRUE
+lbxlc=TRUE
+lbxltc=TRUE
+lbjxc=TRUE
 #销售类型
-azxslxc=FALSE
+azxslxc=TRUE
 #需求类别 需求大类、小类
-xqdlc=FALSE
-xqxlc=FALSE
+xqdlc=TRUE
+xqxlc=TRUE
 #用户属性、用户等级、信息渠道、信息来源
-yhsxc=FALSE
-yhdjc=FALSE
-xxqdc=FALSE
-xxlyc=FALSE
+yhsxc=TRUE
+yhdjc=TRUE
+xxqdc=TRUE
+xxlyc=TRUE
 #省、市、区、镇
-sxc=FALSE
-ssxc=FALSE
-qxc=FALSE
-zxc=FALSE
+sxc=TRUE
+ssxc=TRUE
+qxc=TRUE
+zxc=TRUE
 #安装 配件查询、家用特殊安装申请新增、新增质量信息反馈、家用特殊安装查询、家用特殊安装申请更新、安装转结算、安装转结算查询最终结果
 pjcxc=FALSE
 jytsazxzc=FALSE
@@ -365,11 +365,11 @@ ththhgxc=FALSE
 wxzjsc=FALSE
 wxzjscxc=FALSE
 #网点维修工 证件照,服务类目,位置、新增同步到本地、修改
-zjzxxc=FALSE
-lmxxc=FALSE
-wxgwzc=FALSE
-wxgxgc=FALSE
-wxgwztc=FALSE
+zjzxxc=TRUE
+lmxxc=TRUE
+wxgwzc=TRUE
+wxgxgc=TRUE
+wxgwztc=TRUE
 #京东商城 预约改约、指派改派网点、作废取消、报完工、指派改派人员
 jdyygyc=FALSE
 jdzpgpwdc=FALSE