yaozhixue 1 год назад
Родитель
Сommit
8525083a12

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

@@ -143,6 +143,8 @@ public interface PublicService {
 
     String path(String f);
 
+    String uploadPath(String f);
+
     File createf(String name) throws IOException;
 
 

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

@@ -2752,7 +2752,7 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
                 orderBase.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_A1130.getCode()) ){
             orderBase.setIsReservation(1);
         }
-        // 重置部分数据
+        // 重置部分数据 采集数据下载
         orderService.setParApi(item, orderBase,its);
 
         // 赋值接收师傅信息

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

@@ -820,7 +820,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
             // 品牌方fileindex未获取上传被忽略
             if (StringUtils.isEmpty(file.getBrandFilePath())){
                 // 上传图片
-                oldFile = publicService.path(file.getFilePath());
+                oldFile = publicService.uploadPath(file.getFilePath());
                 File nFile = publicService.createf(oldFile);
 
                 baseService.saveToFile(ossUtil.getUrlWw(file.getFilePath()),nFile);

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

@@ -255,7 +255,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderBaseMapper, OrderBase> im
 
         // 99999999 待验证要不要处理 todo
         // 采集数据下载
-        // getOrderDetailRec(item, orderBase, its);
+        getOrderDetailRec(item, orderBase, its);
     }
 
     private void getOrderDetailRec(ItfTblAzAssignLcLsDownload item, OrderBase orderBase, List<ItfGreeToFaDownloadTaskList> its) {

+ 7 - 0
src/main/java/com/zfire/jiasm/syncdata/service/impl/PublicServiceImpl.java

@@ -1500,6 +1500,13 @@ public class PublicServiceImpl implements PublicService {
     }
 
     @Override
+    public String uploadPath(String f){
+        SimpleDateFormat sdfs = new SimpleDateFormat("yyyy/");
+        String filedir = sdfs.format(new Date()) + f;
+        return filedir;
+    }
+
+    @Override
     public File createf(String name) throws IOException {
         File newFile = new File(name);
         while (newFile.exists()){

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

@@ -248,7 +248,7 @@ ththhgx=60000
 wxzjs=60000
 wxzjscx=60000
 #网点维修工 证件照,服务类目,位置、新增同步到本地、修改、保险
-zjzxx=60000
+zjzxx=600000
 lmxx=600000
 wxgwz=600000
 wxgxg=600000