add

pom.xml

@@ -36,6 +36,16 @@
                 </exclusion>
             </exclusions>
         </dependency>-->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+            <version>2.1.0.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+            <version>2.1.0.RELEASE</version>
+        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -234,6 +244,12 @@
             <version>4.4</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
+            <version>2.2.9.RELEASE</version>
+        </dependency>
+
         <!--模板组件-->
         <dependency>
             <groupId>org.springframework.boot</groupId>

src/main/java/com/zfire/jiasm/syncdata/ManagerApplication.java

@@ -6,12 +6,13 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.ApplicationContext;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
-
+@EnableDiscoveryClient
 @EnableScheduling
 @SpringBootApplication
 @ServletComponentScan(basePackages = {"com.zfire.jiasm.syncdata"})

src/main/java/com/zfire/jiasm/syncdata/api/BaseEnum.java

@@ -17,7 +17,6 @@ public interface BaseEnum {
     String getKey();
     String getValue();
 
-
     @JsonIgnore
     default Integer getIntKey() {
         return Optional.ofNullable(getKey())

src/main/java/com/zfire/jiasm/syncdata/api/DispatchFlagEnum.java

@@ -1,21 +0,0 @@
-package com.zfire.jiasm.syncdata.api;
-
-
-import com.baomidou.mybatisplus.annotation.EnumValue;
-import com.fasterxml.jackson.annotation.JsonValue;
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@Getter
-@AllArgsConstructor(access = AccessLevel.PRIVATE)
-public enum DispatchFlagEnum implements BaseEnum {
-    A("A","自动派工"),
-    B("B","特定派工")
-    ;
-    @JsonValue
-    @EnumValue
-    private final String key;
-    private final String value;
-
-}

src/main/java/com/zfire/jiasm/syncdata/api/OrderAddBeanDTO.java

@@ -12,182 +12,168 @@ import java.util.List;
 
 @Data
 public class OrderAddBeanDTO {
-    //id
     private String id;
-    //操作标记 1=临时保存,2=下派工单"
+    //操作标记 1=临时保存,2=下派工单
     private Integer operatorFlag;
     //客户名称
     private String userName;
-    //联系人",required = true)
+    //联系人
     private String linkName;
-    //客户电话",required = true)
+    //客户电话
     private String userMobile;
-    //客户电话2")
+    //客户电话2
     private String userMobile2;
-    //用户属性",required = true)
+    //用户属性
     private String userAttr;
-    //用户属性ID",required = true)
+    //用户属性ID
     private String userAttrId;
-    //VIP等级")
+    //VIP等级
     private String vip;
-    //区号")
+    //区号
     private String areaCode;
-    // 固话")
+    // 固话
     private String telPhone;
-    // 省id")
+    // 省id
     private String provinceId;
-    // 省")
+    // 省
     private String province;
-    // 市id")
+    // 市id
     private String cityId;
-    // 市")
+    // 市
     private String city;
-    // 区id")
+    // 区id
     private String areaId;
-    // 区")
+    // 区
     private String area;
-    // 街道id")
+    // 街道id
     private String streetId;
-    // 街道")
+    // 街道
     private String street;
-    // 详细地址")
+    // 详细地址
     private String address;
-
-    // gps地址")
+    // gps地址
     private String gpsAddress;
-    // 经度")
+    // 经度
     private String lng;
-    // 纬度")
+    // 纬度
     private String lat;
-    // 服务类目id")
+    // 服务类目id
     private String serviceCategoryId;
-    // 工单类型 INSTALL=安装 REPAIR=维修 RECOVERY=回收 RETURN_EXCHANGE=退换货 TRADE_IN=以旧换新 MAINTENANCE=维保工单 CLEAN=清洗保养")
+    // 工单类型 INSTALL=安装 REPAIR=维修 RECOVERY=回收 RETURN_EXCHANGE=退换货 TRADE_IN=以旧换新 MAINTENANCE=维保工单 CLEAN=清洗保养
     private String orderType;
-    //@NotEmpty(message = "工单小类不能为空")
-    // 工单小类 INSTALL=普通工单 LOOK=看位工单 LAYING=铺管工单 CLEAN=清洗保养")
+    // 工单小类 INSTALL=普通工单 LOOK=看位工单 LAYING=铺管工单 CLEAN=清洗保养
     private String orderSmallType;
-    // 需求大类")
+    // 需求大类
     private String demandTypeId;
-    // 需求大类名称")
+    // 需求大类名称
     private String demandTypeName;
-    // 需求小类")
+    // 需求小类
     private String demandSmallTypeId;
-    // 需求小类名称")
+    // 需求小类名称
     private String demandSmallTypeName;
-    // 结算主体id")
+    // 结算主体id
     private String brandId;
-    // 产品品牌id")
+    // 产品品牌id
     private String productBrandId;
-    // 产品大类id")
+    // 产品大类id
     private String mainId;
-    // 商户网点id")
+    // 商户网点id
     private String saleWebsitId;
-    // 商户网点")
+    // 商户网点
     private String saleWebsitName;
-    // 销售单号")
+    // 销售单号
     private String saleNo;
-    // 销售联系人")
+    // 销售联系人
     private String saleLinkName;
-    // 销售联系人电话")
+    // 销售联系人电话
     private String saleLinkPhone;
-    // 销售类型")
+    // 销售类型
     private String saleTypeId;
-    // 销售类型")
+    // 销售类型
     private String saleType;
-    // 消息来源")
+    // 消息来源
     private String infoSourceId;
-    // 消息渠道")
+    // 消息渠道
     private String infoChannelId;
-    // 跨区编号")
+    // 跨区编号
     private String crossNo;
-    // 购买时间")
+    // 购买时间
     private Date buyTime;
-    // 用户期望上门时间开始")
+    // 用户期望上门时间开始
     private Date expectStartTime;
-    // 用户期望上门结束开始")
+    // 用户期望上门结束开始
     private Date expectEndTime;
-    // 发票号码")
+    // 发票号码
     private String invoiceNo;
-    // 营销活动Id")
+    // 营销活动Id
     private String marketActivityId;
-    // 营销活动名称")
+    // 营销活动名称
     private String marketActivityName;
-    // 是否上传总部")
+    // 是否上传总部
     private Boolean uploadFlag;
-    // 特殊要求-师傅标签（传中文名）")
+    // 特殊要求-师傅标签（传中文名）
     private List<String> labels1;
-    // 特殊要求-信息员标签（传中文名）")
+    // 特殊要求-信息员标签（传中文名）
     private List<String> labels2;
-    // 特殊要求-业务员等级id")
+    // 特殊要求-业务员等级id
     private List<String> messengerLevelIds;
-    // 派工方式 A=自动派工 B=手动派工")
-    private DispatchFlagEnum dispatchFlag;
-    // 工程师，第一个为大工")
+    // 派工方式 A=自动派工 B=手动派工
+    private String dispatchFlag;
+    // 工程师，第一个为大工
     private List<String> workerIds;
-    // 支架")
+    // 支架
     private String bracket;
-    // 加长管")
+    // 加长管
     private String pipe;
-    // 空气开关")
+    // 空气开关
     private String swithFlag;
-    // 高空作业")
+    // 高空作业
     private String highAltitude;
-    // 一次性成型墙孔")
+    // 一次性成型墙孔
     private String hole;
-    // 备注")
+    // 备注
     private String remark;
-    // 预约时间")
+    // 预约时间
     private Date appointmentTime;
-    // 服务商网点ID-手动派工必填")
+    // 服务商网点ID-手动派工必填
     private String websitId;
-    // 店铺编号")
+    // 店铺编号
     private String shopNo;
-    // 店铺名称")
+    // 店铺名称
     private String shopName;
-    // 商城订单行号")
+    // 商城订单行号
     private String shopOrderNo;
-    // 商城下单人电话")
+    // 商城下单人电话
     private String shopOrderPhone;
-    // 是否新零售")
+    // 是否新零售
     private String shopNewRetail;
-    // 电商标识")
+    // 电商标识
     private String shopFlag;
-    // 产品信息/故障信息")
+    // 产品信息/故障信息
     private List<OrderProduct> orderProductList;
 
-    /*销售类型 = 工程机   start*/
-    // 工程单号-销售类型为工程机必填")
+    // 工程单号-销售类型为工程机必填
     private String enginNo;
-    // 工程名字-销售类型为工程机必填")
+    // 工程名字-销售类型为工程机必填
     private String enginName;
-    // 工程机垫装类型")
+    // 工程机垫装类型
     private String enginAdvanceType;
-    // 工程机商户网点确认的辅材提供方")
+    // 工程机商户网点确认的辅材提供方
     private String enginMaterialSupply1;
-    // 工程机的工程师确认的辅材提供方")
+    // 工程机的工程师确认的辅材提供方
     private String enginMaterialSupply2;
-    // 辅材信息")
+    // 辅材信息
     private List<OrderMaterial> orderMaterialList;
-    /*销售类型 = 工程机   end*/
-
-
-    /*安装工单 start*/
-    // 关联(看位工单,铺管工单)工单号")
+    // 关联(看位工单,铺管工单)工单号
     private String relaOrderBaseId;
-    // 预计到货时间")
+    // 预计到货时间
     private Date expectArrivalTime;
     // 清洗项目
     private List<OrderCleanItem> orderCleanItems;
-    /*清洗工单 end*/
-
-    // 是否现场收费YES/NO")
+    // 是否现场收费YES/NO
     private IsEnum isOnsiteCharges;
-
-    // 是否可离线操作，通过相册的图片提交采集 YES/NO")
+    // 是否可离线操作，通过相册的图片提交采集 YES/NO
     private IsEnum isOfflineWorker;
-
-    @Length(max = 20)
-    // 工单来源")
+    // 工单来源
     private String source;
-
 }

src/main/java/com/zfire/jiasm/syncdata/config/FeignConfigure.java

@@ -0,0 +1,18 @@
+package com.zfire.jiasm.syncdata.config;
+
+import com.zfire.jiasm.syncdata.constant.Constant;
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class FeignConfigure implements RequestInterceptor {
+
+        @Override
+        public void apply(RequestTemplate template) {
+            if(null != template) {
+                template.header(Constant.FEIGN_HEADER, Constant.FEIGN_HEADER);
+            }
+        }
+}
+

src/main/java/com/zfire/jiasm/syncdata/constant/Constant.java

@@ -7,6 +7,8 @@ import lombok.Getter;
 import org.springframework.beans.factory.annotation.Value;
 
 public class Constant {
+    //feign 内部用header
+    public static final String FEIGN_HEADER = "privacy";
 
     //校验的token
     public static final String TOKEN_NAME = "x-token";

src/main/java/com/zfire/jiasm/syncdata/constant/JiasmApi.java

@@ -1,14 +1,17 @@
 package com.zfire.jiasm.syncdata.constant;
 
 
-
 import com.zfire.jiasm.syncdata.api.OrderAddBeanDTO;
+import com.zfire.jiasm.syncdata.config.FeignConfigure;
+import com.zfire.jiasm.syncdata.service.impl.JiasmApiFeignClientFallback;
 import com.zfire.jiasm.syncdata.utils.ResponseHelper;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
-@FeignClient(name = "jiasm-api", url = "${jaismapi.system.url}")
+@FeignClient(name = "jiasm-service", path ="/pcapi",
+        configuration = FeignConfigure.class,
+        fallback = JiasmApiFeignClientFallback.class)
 public interface JiasmApi {
     @PostMapping("order/add")
     ResponseHelper orderAdd(@RequestBody OrderAddBeanDTO orderAddBeanDTO);

src/main/java/com/zfire/jiasm/syncdata/download/order/InstallBusinessApi.java

@@ -0,0 +1,47 @@
+package com.zfire.jiasm.syncdata.download.order;
+
+import com.alibaba.fastjson.JSONObject;
+import com.zfire.jiasm.syncdata.api.OrderAddBeanDTO;
+import com.zfire.jiasm.syncdata.constant.JiasmApi;
+import com.zfire.jiasm.syncdata.plus.entity.OrderBase;
+import com.zfire.jiasm.syncdata.plus.service.OrderBaseService;
+import com.zfire.jiasm.syncdata.utils.MyBeanUtils;
+import com.zfire.jiasm.syncdata.utils.ResponseHelper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+public class InstallBusinessApi {
+
+    @Qualifier("com.zfire.jiasm.syncdata.constant.JiasmApi")
+    @Autowired
+    private JiasmApi jiasmApi;
+    @Autowired
+    OrderBaseService orderBaseService;
+
+    // 3：工单落入本地表
+    @Scheduled(fixedDelayString = "${installin}")
+    public void inputOrderInstall() {
+        /*if (1 == 1) {
+            return;
+        }
+        */
+        OrderAddBeanDTO order = new OrderAddBeanDTO();
+
+        OrderBase obs = orderBaseService.lambdaQuery().eq(OrderBase::getId,"331671357990808080386").one();
+        MyBeanUtils.copyProperties(obs,order);
+        order.setSaleNo("00002305788851");
+        order.setVip("1");
+        try {
+            ResponseHelper respone = jiasmApi.orderAdd(order);
+            log.info("respone:{}", JSONObject.toJSONString(respone));
+        }catch (Exception e){
+            log.error("worker order error:",e);
+        }
+
+    }
+}

src/main/java/com/zfire/jiasm/syncdata/download/order/RecycleDownload.java

@@ -10,6 +10,8 @@ import org.springframework.stereotype.Component;
 
 /**
  * 格力品牌回收工单下载
+ * syn_status 为内部下载同步状态
+ *
  */
 @Slf4j
 @Component
@@ -23,18 +25,19 @@ public class RecycleDownload {
     /** 未同步->已同步反馈明细->已同步采集数据->同步到业务表->已同步
      * 1：下载回收工单数据
      * 生成记录表数据、回收工单主表、回收工单反馈明细表、回收工单产品明细表 放到download表中(有则修改，无则插入,主键不同，只有插入)
-     * 记录表中的任务号每条记录单独一个任务号；本次拉取数据批次号相同
+     * 记录表中的任务号每单独一个任务号；本次拉取数据批次号相同
      * @throws Exception
      */
     @Scheduled(fixedDelayString = "${recycledown}")
     public void download() throws Exception {
-        if (1 == 1) {
+        /*if (1 == 1) {
             return;
-        }
+        }*/
 
         RecycleAssignParamBean recycleAssignParamBean = new RecycleAssignParamBean();
         // type说明： all--全量  active--获取未完工/未关闭/未作废的工单  getExtend--获取更新数据
         // 一次取100工单
+        // 工单主表，一条反馈明细，多条产品明细  相同的任务号
         recycleAssignParamBean.setType("getExtend");
         recycleAssignParamBean.setPage("1");
         recycleAssignParamBean.setPageSize("100");
@@ -50,6 +53,8 @@ public class RecycleDownload {
      */
     @Scheduled(fixedDelayString = "${recyclefkdown}")
     private void updateFkmx() throws Exception {
+        // 获取工单的反馈明细数据 记录表状态改为44
+        // 失败时最多重复10次
         recycleAssignLogic.updateFeedback();
     }
 
@@ -61,6 +66,8 @@ public class RecycleDownload {
      */
     @Scheduled(fixedDelayString = "${recyclecjdown}")
     private void updateAcquisition() {
+        // 下载回收工单采集表数据、附件数据、条码明细数据 记录表及三表状态为66
+        // 失败时 SynStatus=99 下次也不再同步 最好加上 99 的及次数
         recycleAcquisitionLogic.updateAcquisition();
     }
 
@@ -77,6 +84,11 @@ public class RecycleDownload {
      */
     @Scheduled(fixedDelayString = "${recycleverifydown}")
     private void updateExtend() throws Exception {
+        if (1 == 1) {
+            return;
+        }
+
+        // 与总部进行确认
         recycleAssignLogic.updateExtend();
     }
 

src/main/java/com/zfire/jiasm/syncdata/gree/recycle/RecycleAcquisitionLogic.java

@@ -19,6 +19,7 @@ import com.zfire.jiasm.syncdata.service.PublicService;
 import com.zfire.jiasm.syncdata.utils.StringUtil;
 import io.jsonwebtoken.lang.Collections;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.integration.redis.util.RedisLockRegistry;
 import org.springframework.stereotype.Service;
@@ -112,19 +113,25 @@ public class RecycleAcquisitionLogic {
 
 	private void updateData(RecycleAssignBean bean, GreeResponseHelper response, ItfTblRecycleAssignBatchDownloadRec rec) {
 		//回收工单采集数据下载失败
-		rec.setSynStatus(99);
+		// rec.setSynStatus(99);
+		rec.setCjSynStatus(Constant.SynStatus.FAIL.getCode());
+		rec.setCjSynTimes(rec.getCjSynTimes()+1);
 		rec.setSynErrMsg(response.getMsg());
 		rec.setSynReqTime(new Date());
 		rec.setLastModifiedDate(new Date());
 		recycleAssignBatchDownloadRecService.saveOrUpdate(rec);
-		// 下载失败原表中一般也不会有数据 处理一下也不会有问题
+
+		/*// 下载失败原表中一般也不会有数据 处理一下也不会有问题
+		// 采集表
 		List<ItfTblRecycleHsptJjcjDownload> jjcjList = recycleHsptJjcjDownloadService.lambdaQuery()
 				.eq(ItfTblRecycleHsptJjcjDownload::getDownloadTaskNo, bean.getTaskNo()).list();
+		// 采集附件表
 		List<ItfTblRecycleHsptJjcjFjDownload> fjlist = recycleHsptJjcjFjDownloadService.lambdaQuery()
 				.eq(ItfTblRecycleHsptJjcjFjDownload::getDownloadTaskNo, bean.getTaskNo()).list();
+		// 采集条码明细表
 		List<ItfTblRecycleHsptJjcjTmmxDownload> tmmxlist = recycleHsptJjcjTmmxDownloadService.lambdaQuery()
 				.eq(ItfTblRecycleHsptJjcjTmmxDownload::getDownloadTaskNo, bean.getTaskNo()).list();
-		if(null != jjcjList && !jjcjList.isEmpty()) {
+		if(CollectionUtils.isNotEmpty(jjcjList)) {
 			jjcjList.stream().forEach(o->{
 					o.setSynStatus(rec.getSynStatus());
 					o.setSynErrMsg(rec.getSynErrMsg());
@@ -134,7 +141,7 @@ public class RecycleAcquisitionLogic {
 			recycleHsptJjcjDownloadService.saveOrUpdateBatch(jjcjList);
 			jjcjList.clear();
 		}
-		if(null != fjlist && !fjlist.isEmpty()) {
+		if(CollectionUtils.isNotEmpty(fjlist)) {
 			fjlist.stream().forEach(o->{
 					o.setSynStatus(rec.getSynStatus());
 					o.setSynErrMsg(rec.getSynErrMsg());
@@ -144,7 +151,7 @@ public class RecycleAcquisitionLogic {
 			recycleHsptJjcjFjDownloadService.saveOrUpdateBatch(fjlist);
 			fjlist.clear();
 		}
-		if(null != tmmxlist && !tmmxlist.isEmpty()) {
+		if(CollectionUtils.isNotEmpty(tmmxlist)) {
 			tmmxlist.stream().forEach(o->{
 					o.setSynStatus(rec.getSynStatus());
 					o.setSynErrMsg(rec.getSynErrMsg());
@@ -154,11 +161,12 @@ public class RecycleAcquisitionLogic {
 			recycleHsptJjcjTmmxDownloadService.saveOrUpdateBatch(tmmxlist);
 			tmmxlist.clear();
 		}
+		*/
 	}
 
 	private void addData(RecycleAssignBean bean, GreeResponseHelper response, ItfTblRecycleAssignBatchDownloadRec rec) throws JsonProcessingException {
 		List<RecycleAcquisitionDownloadBean> responsebeanList = mapper.readValue((String) response.getData(), new TypeReference<List<RecycleAcquisitionDownloadBean>>() {});
-		if( null != responsebeanList && !responsebeanList.isEmpty() ) {
+		if(CollectionUtils.isNotEmpty(responsebeanList)) {
 			responsebeanList.stream().forEach(responseBean->{
 				// 采集主表
 				List<ItfTblRecycleHsptJjcjDownload> jjcjList = new ArrayList<>();
@@ -182,6 +190,8 @@ public class RecycleAcquisitionLogic {
 		}
 		//更新状态为已同步 增加一个中间状态，代表数据采集已完成
 		rec.setSynStatus(Constant.SynStatus.SYN_ACQUISITION.getCode());
+		rec.setCjSynStatus(Constant.SynStatus.SYN.getCode());
+		rec.setSynErrMsg("");
 		rec.setSynReqTime(new Date());
 		rec.setLastModifiedDate(new Date());
 		recycleAssignBatchDownloadRecService.saveOrUpdate(rec);
@@ -258,11 +268,13 @@ public class RecycleAcquisitionLogic {
 	 * 批量获取回收工单的采集数据
 	 */
 	public void updateAcquisition() {
-		// 任务记录表中只提取 SynStatus = 44 的回收工单数据 即已从总部获取反馈明细的回收工单
+		// 任务记录表中只提取待同步采集的数据 即已成功同步反馈明细的数据
 		List<ItfTblRecycleAssignBatchDownloadRec> recList = recycleAssignBatchDownloadRecService.lambdaQuery()
 				.eq(ItfTblRecycleAssignBatchDownloadRec::getSynStatus, Constant.SynStatus.SYN_FEEDBACK.getCode())
-				.eq(ItfTblRecycleAssignBatchDownloadRec::getGreeStatSynStatus,0).list();
-		if(null != recList && !recList.isEmpty()) {
+				.in(ItfTblRecycleAssignBatchDownloadRec::getCjSynStatus, 0,99)
+				.lt(ItfTblRecycleAssignBatchDownloadRec::getCjSynTimes,10).list();
+		if(CollectionUtils.isNotEmpty(recList)) {
+			// 按单同步获取
 			recList.stream().forEach(rec->{
 				RecycleAssignBean bean = new RecycleAssignBean();
 				bean.setBatchNo(rec.getDownloadBatchNo());

src/main/java/com/zfire/jiasm/syncdata/gree/recycle/RecycleAssignLogic.java

@@ -13,6 +13,7 @@ import com.zfire.jiasm.syncdata.plus.service.*;
 import io.jsonwebtoken.lang.Collections;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -20,6 +21,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
+import java.math.BigDecimal;
 
 @Slf4j
 @Service
@@ -92,6 +94,7 @@ public class RecycleAssignLogic {
 		map.put("type", param.getType());
 		//回收工单请求
 		String dataStr = greeLogic.post(apiPath, map, 1);
+		// 工单主表，一条反馈明细，多条产品明细
 		// 工单信息pgid|pgguid、反馈信息pgguid、回收的产品pgguid
 		List<RecycleAssignDownloadBean> responseBeanList = mapper.readValue(dataStr, new TypeReference<List<RecycleAssignDownloadBean>>() {} );
 
@@ -102,13 +105,15 @@ public class RecycleAssignLogic {
 			List<RecycleAssignDownloadEntity> newTaskEntities = new ArrayList<>();
 
 			if(!pguuidLhs.isEmpty()) {
+				// 每次请求使用相同的批次号
 				String batchNo = UUID.randomUUID().toString();
 
-				// 下载任务记录表中提取相同已下载的数据，0及99的
+				// 下载记录表中查看是否存在与本次下载相同的工单 0及99的
+				// 这里的99 为与总部进行确认失败的工单
 				recList = recycleAssignBatchDownloadRecService.lambdaQuery()
 						.in(ItfTblRecycleAssignBatchDownloadRec::getPgguid, pguuidLhs)
 						.in(ItfTblRecycleAssignBatchDownloadRec::getGreeStatSynStatus, 0, Constant.SynStatus.FAIL.getCode()).list();
-				// 已下载记录表中存在数据时
+				// 已下载记录表中存在数据时分组
 				if(CollectionUtils.isNotEmpty(recList)) {
 					// 按状态分组0-99
 					recMap = recList.stream().collect(Collectors.groupingBy(ItfTblRecycleAssignBatchDownloadRec::getGreeStatSynStatus));
@@ -129,8 +134,13 @@ public class RecycleAssignLogic {
 							continue;
 						}
 
-						// 状态为99的单独处理 超3次不再同步，逻辑与下同 只处理下载记录表，同步次数+1
+						// 工单主表，一条反馈明细，多条产品明细
+						// 状态为99的单独处理 超10次重新下载
 						if (nnMap !=null && nnMap.containsKey(o.getPgguid())){
+							// 待与总部确认下载完成的工单不处理
+							if (nnMap.get(o.getPgguid()).get(0).getSynTimes()<10){
+								continue;
+							}
 							process(nnMap, newTaskEntities, o);
 						} else {
 							// 获取新增的
@@ -154,6 +164,7 @@ public class RecycleAssignLogic {
 	private void getAdd(List<RecycleAssignDownloadEntity> newTaskEntities, RecycleAssignDownloadBean o) {
 		try {
 			// 报文中提取实体表对像数据 主表，反馈表，回收产品明细表
+			// 工单主表，一条反馈明细，多条产品明细
 			RecycleAssignDownloadEntity entity = copyBean2Entity(o);
 			ItfTblRecycleAssignBatchDownloadRec rec = new ItfTblRecycleAssignBatchDownloadRec();
 			rec.setPgguid(o.getPgguid());
@@ -168,40 +179,32 @@ public class RecycleAssignLogic {
 		}
 	}
 
-	private void process(Map<String, List<ItfTblRecycleAssignBatchDownloadRec>> nnMap, List<RecycleAssignDownloadEntity> newTaskEntities, RecycleAssignDownloadBean o) {
+	private void process(Map<String, List<ItfTblRecycleAssignBatchDownloadRec>> nnMap, List<RecycleAssignDownloadEntity> newTaskEntities,
+						 RecycleAssignDownloadBean o) {
 		ItfTblRecycleAssignBatchDownloadRec rec = nnMap.get(o.getPgguid()).get(0);
-		// 查看状态为99的数据(请求失败过的任务) 若超过3次，则不再请求接口
-		if( rec.getSynTimes() >= 3 ) {
-			rec.setGreeStatSynStatus(Constant.SynStatus.FAIL.getCode());
-			rec.setCreatedDate(new Date());
+		// 超10次的重新同步
+		try {
+			RecycleAssignDownloadEntity entity = copyBean2Entity(o);
+			rec.setSynTimes(0);
+			rec.setGreeStatSynStatus(0);
 			rec.setLastModifiedDate(new Date());
-			rec.setGreeStatSynErrMsg("请求次数大于3次，不再发送pgguid={}"+ rec.getPgguid());
-			RecycleAssignDownloadEntity entity = new RecycleAssignDownloadEntity();
 			entity.setRec(rec);
 			newTaskEntities.add(entity);
-		}else {
-			// 未超三次把数据同步下来   这里最好改synStatus为0,目的就是与总部确认时重新获取反馈明细数据 todo 1
-			try {
-				RecycleAssignDownloadEntity entity = copyBean2Entity(o);
-				rec.setSynTimes(rec.getSynTimes()+1);
-				rec.setLastModifiedDate(new Date());
-				entity.setRec(rec);
-				newTaskEntities.add(entity);
-			} catch (JsonProcessingException e) {
-				log.error("RecycleAssignDownload bean复制到RecycleAssignDownloadEntity异常:{}", e.getMessage());
-			}
+		} catch (JsonProcessingException e) {
+			log.error("RecycleAssignDownload bean复制到RecycleAssignDownloadEntity异常:{}", e.getMessage());
 		}
 	}
 
 	/**
 	 * 批量添加回收工单任务
+	 * 每个工单单独的且相同的任务号，批次号同一次下载的相同
 	 * @param newTaskEntities
 	 */
 	@Transactional
 	public void batchAddDownloadTask(List<RecycleAssignDownloadEntity> newTaskEntities,String batchNo) {
 		List<ItfTblRecycleAssignBatchDownloadRec> recList = new ArrayList<>();
 
-		if(null != newTaskEntities && !newTaskEntities.isEmpty()) {
+		if(CollectionUtils.isNotEmpty(newTaskEntities)) {
 			List<ItfTblRecycleAssignDownload> tblRecycleAssignEntity = new ArrayList<>();
 			List<ItfTblRecycleAssignFkmxDownload> lastStep = new ArrayList<>();
 			List<ItfTblRecycleAssignMxDownload> hscpmx = new ArrayList<>();
@@ -272,6 +275,7 @@ public class RecycleAssignLogic {
 		RecycleAssignDownloadEntity entity = new RecycleAssignDownloadEntity();
 		List<ItfTblRecycleAssignMxDownload>  mxList = new ArrayList<>();
 
+		// 工单主表，一条反馈明细，多条产品明细
 		// 提取回收工单主表数据
 		entity.setTblRecycleAssignEntity(mapper.readValue(mapper.writeValueAsString(bean), ItfTblRecycleAssignDownload.class));
 		// 提取回收工单反馈数据
@@ -293,7 +297,7 @@ public class RecycleAssignLogic {
 	
 	
 	private List<RecycleAssignDownloadBean> copyEntities2Bean(List<ItfTblRecycleAssignBatchDownloadRec> recList){
-		if(null != recList && !recList.isEmpty()) {
+		if(CollectionUtils.isNotEmpty(recList)) {
 			List<RecycleAssignDownloadBean> resultList = new ArrayList<>();
 			LinkedHashSet<String> taskNos = new LinkedHashSet<>();
 			recList.forEach(o->{
@@ -304,15 +308,18 @@ public class RecycleAssignLogic {
 			// 回收工单主表 并按任务号分组
 			List<ItfTblRecycleAssignDownload> raList = recycleAssignService.lambdaQuery()
 					.in(ItfTblRecycleAssignDownload::getDownloadTaskNo, taskNos).list();
-			Map<String, List<ItfTblRecycleAssignDownload>> raMap = raList.stream().collect(Collectors.groupingBy(ItfTblRecycleAssignDownload::getDownloadTaskNo));
+			Map<String, List<ItfTblRecycleAssignDownload>> raMap = raList.stream()
+					.collect(Collectors.groupingBy(ItfTblRecycleAssignDownload::getDownloadTaskNo));
 			// 回收工单过程反馈表 并按任务号分组
 			List<ItfTblRecycleAssignFkmxDownload> fkmxList = recycleAssignFkmxDownloadService.lambdaQuery()
 					.in(ItfTblRecycleAssignFkmxDownload::getDownloadTaskNo, taskNos).list();
-			Map<String, List<ItfTblRecycleAssignFkmxDownload>> fkmxMap = fkmxList.stream().collect(Collectors.groupingBy(ItfTblRecycleAssignFkmxDownload::getDownloadTaskNo));
+			Map<String, List<ItfTblRecycleAssignFkmxDownload>> fkmxMap = fkmxList.stream()
+					.collect(Collectors.groupingBy(ItfTblRecycleAssignFkmxDownload::getDownloadTaskNo));
 			// 回收工单产品明细表 并按任务号分组
 			List<ItfTblRecycleAssignMxDownload> mxList = recycleAssignMxDownloadService.lambdaQuery()
 					.in(ItfTblRecycleAssignMxDownload::getDownloadTaskNo, taskNos).list();
-			Map<String, List<ItfTblRecycleAssignMxDownload>> mxMap = mxList.stream().collect(Collectors.groupingBy(ItfTblRecycleAssignMxDownload::getDownloadTaskNo));
+			Map<String, List<ItfTblRecycleAssignMxDownload>> mxMap = mxList.stream()
+					.collect(Collectors.groupingBy(ItfTblRecycleAssignMxDownload::getDownloadTaskNo));
 
 			recList.forEach(o->{
 				RecycleAssignDownloadBean bean = new RecycleAssignDownloadBean();
@@ -370,7 +377,9 @@ public class RecycleAssignLogic {
 	private List<RecycleAssignDownloadBean> queryUnSynList() {
 		return copyEntities2Bean(recycleAssignBatchDownloadRecService.lambdaQuery()
 				.eq(ItfTblRecycleAssignBatchDownloadRec::getSynStatus, 66)
-				.eq(ItfTblRecycleAssignBatchDownloadRec::getGreeStatSynStatus, 0).list());
+				.in(ItfTblRecycleAssignBatchDownloadRec::getGreeStatSynStatus, 0,99)
+				.lt(ItfTblRecycleAssignBatchDownloadRec::getSynTimes, 10)
+				.list());
 	}
 	
 	/**
@@ -380,15 +389,16 @@ public class RecycleAssignLogic {
 	 */
 	public List<GreeResponseHelper> updateFeedback() throws Exception {
 		List<GreeResponseHelper> responseList = new ArrayList<>();
-		// 任务记录表中提取 syn_status = 0 and gree_stat_syn_status = 0的数据  这里加上同步次数小于3的，重新获取反馈明细更好 todo 2
+		// 任务记录表中提取待获取反馈明细的数据
 		List<ItfTblRecycleAssignBatchDownloadRec> recList = recycleAssignBatchDownloadRecService.lambdaQuery()
-				.eq(ItfTblRecycleAssignBatchDownloadRec::getSynStatus, 0)
-				.eq(ItfTblRecycleAssignBatchDownloadRec::getGreeStatSynStatus,0).list();
-		if( null != recList && !recList.isEmpty()) {
+				.in(ItfTblRecycleAssignBatchDownloadRec::getFkmxSynStatus, 0,99)
+				.le(ItfTblRecycleAssignBatchDownloadRec::getFkmxSynTimes,10).list();
+		if(CollectionUtils.isNotEmpty(recList)) {
 			// 提取回收工单主表、过程反馈、明细表中数据 组装下载请求时相同的报文信息
 			List<RecycleAssignDownloadBean> unSynList = copyEntities2Bean(recList);
-			// 与总数进行确认 成功时同步获取的反馈明细表数据，下载记录表置标识为 syn_status=44 代表已同步反馈明细数据
+			// 与总数进行确认 成功时同步反馈明细表数据，下载记录表置标识为 syn_status=44 代表已同步反馈明细数据
 			// 失败时 下载记录表、反馈明细表、新产品明细表置syn_status=99
+			// 按单获取反馈明细数据
 			for (RecycleAssignDownloadBean recycleAssignDownloadBean : unSynList) {
 				responseList.add(assignDetail(recycleAssignDownloadBean));
 			}
@@ -421,26 +431,33 @@ public class RecycleAssignLogic {
 	}
 
 	private void errorUpdateGreeStatSynStatus(RecycleAssignDownloadBean bean, GreeResponseHelper response) {
+		// 记录表
 		ItfTblRecycleAssignBatchDownloadRec rec = recycleAssignBatchDownloadRecService.lambdaQuery()
 				.eq(ItfTblRecycleAssignBatchDownloadRec::getDownloadTaskNo, bean.getTaskNo()).one();
+		// 主表
 		ItfTblRecycleAssignDownload ra = recycleAssignService.lambdaQuery()
 				.eq(ItfTblRecycleAssignDownload::getDownloadTaskNo, bean.getTaskNo()).one();
+		// 明细表
 		List<ItfTblRecycleAssignMxDownload> mxList = recycleAssignMxDownloadService.lambdaQuery()
 				.eq(ItfTblRecycleAssignMxDownload::getDownloadTaskNo, bean.getTaskNo()).list();
-		//更新状态为已同步
+		// 记录表更新状态为已同步
 		rec.setGreeStatSynStatus(GreeSynStatusEnum.FAIL.getCode());
 		rec.setGreeStatSynTime(new Date());
-		rec.setSynStatus(GreeSynStatusEnum.FAIL.getCode());
+		rec.setSynTimes(rec.getSynTimes()+1);
+		// rec.setSynStatus(GreeSynStatusEnum.FAIL.getCode());
 		rec.setSynReqTime(new Date());
 		rec.setLastModifiedDate(new Date());
 		rec.setGreeStatSynErrMsg(response.getMsg());
 		recycleAssignBatchDownloadRecService.saveOrUpdate(rec);
-		ra.setGreeStatSynStatus(1);
+
+		// 主表为成功
+		ra.setGreeStatSynStatus(GreeSynStatusEnum.FAIL.getCode());
 		ra.setGreeStatSynTime(new Date());
 		ra.setSynReqTime(new Date());
 		ra.setLastModifiedDate(new Date());
 		ra.setSynErrMsg(response.getMsg());
 		recycleAssignService.saveOrUpdate(ra);
+		/*// 明细表为失败
 		mxList.stream().forEach(o->{
 			o.setGreeStatSynStatus(GreeSynStatusEnum.FAIL.getCode());
 			o.setGreeStatSynTime(new Date());
@@ -450,11 +467,12 @@ public class RecycleAssignLogic {
 		if (mxList !=null && mxList.size()>0){
 			recycleAssignMxDownloadService.saveOrUpdateBatch(mxList);
 			mxList.clear();
-		}
+		}*/
 	}
 
 	private void updateGreeStatSynStatus(GreeResponseHelper response) throws JsonProcessingException {
 		RecycleAssignDownloadBean resultBean =  mapper.readValue(response.getData().toString(), RecycleAssignDownloadBean.class);
+		// 记录表
 		ItfTblRecycleAssignBatchDownloadRec rec = recycleAssignBatchDownloadRecService.lambdaQuery()
 				.eq(ItfTblRecycleAssignBatchDownloadRec::getDownloadTaskNo, resultBean.getTaskNo()).one();
 		// 回收工单主表
@@ -477,7 +495,7 @@ public class RecycleAssignLogic {
 		ra.setLastModifiedDate(new Date());
 		recycleAssignService.saveOrUpdate(ra);
 
-		mxList.stream().forEach(o->{
+		/*mxList.stream().forEach(o->{
 			o.setGreeStatSynStatus(GreeSynStatusEnum.SYN.getCode());
 			o.setGreeStatSynTime(new Date());
 			o.setSynReqTime(new Date());
@@ -486,7 +504,7 @@ public class RecycleAssignLogic {
 		if (mxList!=null && mxList.size()>0){
 			recycleAssignMxDownloadService.saveOrUpdateBatch(mxList);
 			mxList.clear();
-		}
+		}*/
 	}
 
 	/**
@@ -497,7 +515,7 @@ public class RecycleAssignLogic {
 		List<GreeResponseHelper> responseList = new ArrayList<>();
 		// 提取已成功下载采集数据且未与总部确认的回收工单数据
 		List<RecycleAssignDownloadBean> unSynList = queryUnSynList();
-		if( null != unSynList && !unSynList.isEmpty()) {
+		if(CollectionUtils.isNotEmpty(unSynList)) {
 			// 按单与总部同步确认并修改记录表
 			for (RecycleAssignDownloadBean recycleAssignDownloadBean : unSynList) {
 				responseList.add(updateExtendReq(recycleAssignDownloadBean));
@@ -511,17 +529,19 @@ public class RecycleAssignLogic {
 	public GreeResponseHelper assignDetail(RecycleAssignBean bean) throws Exception {
 		final String apiPath = Constant.GreeApiPath.RECYCLE_ASSIGN_DETAIL;
 		Map<String, Object> param = mapper.readValue(mapper.writeValueAsString(bean), Map.class);
+		// 获取反馈明细数据
 		GreeResponseHelper response = greeLogic.greePost(apiPath, param, 1);
 		ItfTblRecycleAssignBatchDownloadRec rec = recycleAssignBatchDownloadRecService.lambdaQuery()
 				.eq(ItfTblRecycleAssignBatchDownloadRec::getDownloadTaskNo, bean.getTaskNo()).one();
 		if( 200 == response.getStatus()) {
 			RecycleAssignDetailDownloadBean responseBean = mapper.readValue((String)response.getData(), RecycleAssignDetailDownloadBean.class);
+			// 提取获取回收工单时已下载的反馈明细数据
 			List<ItfTblRecycleAssignFkmxDownload> fkmxList= recycleAssignFkmxDownloadService.lambdaQuery()
 					.eq(ItfTblRecycleAssignFkmxDownload::getDownloadTaskNo, bean.getTaskNo())
 					.eq(ItfTblRecycleAssignFkmxDownload::getPgguid, bean.getPgguid()).list();
 			// 反馈明细表处理
 			if(null != responseBean.getFkmx() && !responseBean.getFkmx().isEmpty()) {
-				// 与总部返回的反馈明细表数据比较 无时增加
+				// 与总部返回的反馈明细表数据比较 不存在增加，存在不处理
 				for(RecycleAssignFkmxDownloadBean fkmxBean: responseBean.getFkmx()) {
 					if(!fkmxList.stream().filter(o->o.getFkid().equals(fkmxBean.getFkid())).findAny().isPresent()) {
 						ItfTblRecycleAssignFkmxDownload newFkmx = mapper.readValue(mapper.writeValueAsString(fkmxBean), ItfTblRecycleAssignFkmxDownload.class);
@@ -532,17 +552,24 @@ public class RecycleAssignLogic {
 				}
 				recycleAssignFkmxDownloadService.saveOrUpdateBatch(fkmxList);
 			}
-			//更新状态为已同步
+			//更新记录表已同步反馈明细状态为已同步
 			rec.setSynStatus(Constant.SynStatus.SYN_FEEDBACK.getCode());//增加一个中间状态，代表反馈明细已更新
+			rec.setFkmxSynStatus(Constant.SynStatus.SYN.getCode());// 同步反馈明细数据成功
+			rec.setSynErrMsg("");
 			rec.setSynReqTime(new Date());
 			rec.setLastModifiedDate(new Date());
 			recycleAssignBatchDownloadRecService.saveOrUpdate(rec);
 		}else {
-			rec.setSynStatus(Constant.SynStatus.FAIL.getCode());// 本次与总部确认同步失败
+			// 记录表同步失败
+			// rec.setSynStatus(Constant.SynStatus.FAIL.getCode());
+			rec.setFkmxSynStatus(Constant.SynStatus.FAIL.getCode());
+			rec.setFkmxSynTimes(rec.getFkmxSynTimes()+1);
 			rec.setSynErrMsg(response.getMsg());
 			rec.setSynReqTime(new Date());
 			rec.setLastModifiedDate(new Date());
 			recycleAssignBatchDownloadRecService.saveOrUpdate(rec);
+
+/*
 			List<ItfTblRecycleAssignFkmxDownload> fkmxList = recycleAssignFkmxDownloadService.lambdaQuery()
 					.eq(ItfTblRecycleAssignFkmxDownload::getDownloadTaskNo, bean.getTaskNo()).list();
 			List<ItfTblRecycleAssignMxDownload> mxList = recycleAssignMxDownloadService.lambdaQuery()
@@ -566,16 +593,17 @@ public class RecycleAssignLogic {
 						o.setSynReqTime(new Date());
 					});
 				recycleAssignMxDownloadService.saveOrUpdateBatch(mxList);
-			}
+			}*/
 		}
 		return response;
 	}
 	
 	
 	public void processBusiness() {
-//		//查找未同步到广佛系统且已经和总部同步的数据
-//		//这里需要增加一个中间状态(反馈明细和采集明细是否已经同步)，代表工单信息已同步，但反馈明细或采集信息还没同步的，这里因为反馈和采集信息量过大，不能同一个接口传回来，所以分开
-//		//44代表已同步反馈明细，66代表已经同步采集信息
+ 		//查找未同步到广佛系统且已经和总部同步的数据
+ 		//这里需要增加一个中间状态(反馈明细和采集明细是否已经同步)，代表工单信息已同步，但反馈明细或采集信息还没同步的，这里因为反馈和采集信息量过大，不能同一个接口传回来，所以分开
+ 		//44代表已同步反馈明细，66代表已经同步采集信息
+		// 提取下载成功的记录数据
 		List<ItfTblRecycleAssignBatchDownloadRec> recList = recycleAssignBatchDownloadRecService.lambdaQuery()
 				.eq(ItfTblRecycleAssignBatchDownloadRec::getSynStatus, Constant.SynStatus.SYN_ACQUISITION.getCode())
 				.eq(ItfTblRecycleAssignBatchDownloadRec::getGreeStatSynStatus,Constant.GreeSynStatus.SYN.getCode())
@@ -585,6 +613,7 @@ public class RecycleAssignLogic {
 			return;
 		}
 		for( ItfTblRecycleAssignBatchDownloadRec rec : recList ) {
+			/*// 提取同步失败的或是还未从总部获取其他信息的记录数据-最近的一次
 			List<ItfTblRecycleAssignBatchDownloadRec> lastTaskList = recycleAssignBatchDownloadRecService.lambdaQuery()
 					.in(ItfTblRecycleAssignBatchDownloadRec::getSynStatus,
 							new Integer[] { Constant.SynStatus.FAIL.getCode(),
@@ -603,7 +632,7 @@ public class RecycleAssignLogic {
 					rec.setSynTime(new Date());
 					continue;
 				}
-			}
+			}*/
 			// 这里先不做处理
 			// processBusiness(rec);
 		}
@@ -739,6 +768,7 @@ public class RecycleAssignLogic {
 	 * 更新接口表数据到业务表
 	 * @return
 	 */
+
 	/*
 	@Transactional(rollbackFor = Exception.class)
 	public void processBusiness(ItfTblRecycleAssignBatchDownloadRec rec) {
@@ -748,17 +778,36 @@ public class RecycleAssignLogic {
 		int synStatus = 1;
 		String msg = "";
 		try {
-			//查找未同步到广佛系统且已经和总部同步的数据
-			//这里需要增加一个中间状态(反馈明细和采集明细是否已经同步)，代表工单信息已同步，但反馈明细或采集信息还没同步的，这里因为反馈和采集信息量过大，不能同一个接口传回来，所以分开
-			//44代表已同步反馈明细，66代表已经同步采集信息
-			ItfTblRecycleAssignDownload tblRecycleAssignEntity = recycleAssignService.lambdaQuery().eq(ItfTblRecycleAssignDownload::getDownloadTaskNo, rec.getDownloadTaskNo()).one();
-			List<ItfTblRecycleHsptJjcjFjDownload> lastStep = recycleAssignFkmxDownloadService.lambdaQuery().eq(ItfTblRecycleHsptJjcjFjDownload::getDownloadTaskNo, rec.getDownloadTaskNo()).list();
-			List<ItfTblRecycleAssignMxDownload> hscpmx = recycleAssignMxDownloadService.lambdaQuery().eq(ItfTblRecycleAssignMxDownload::getDownloadTaskNo, rec.getDownloadTaskNo()).list();
-			//采集 信息
+			// 主表
+			ItfTblRecycleAssignDownload tblRecycleAssignEntity = recycleAssignService.lambdaQuery()
+					.eq(ItfTblRecycleAssignDownload::getDownloadTaskNo, rec.getDownloadTaskNo()).one();
+
+			// 集团id 单独处理 brand_id 师傅信息
+
+			// orderBase.setProductBrandId("A");
+			// orderBase.setProductBrandName("格力(机型品牌)");
+
+
+
+
+
+
+
+
+
+			// 反馈明细表
+			List<ItfTblRecycleAssignFkmxDownload> lastStep = recycleAssignFkmxDownloadService.lambdaQuery()
+					.eq(ItfTblRecycleAssignFkmxDownload::getDownloadTaskNo, rec.getDownloadTaskNo()).list();
+			// 回收明细表
+			List<ItfTblRecycleAssignMxDownload> hscpmx = recycleAssignMxDownloadService.lambdaQuery()
+					.eq(ItfTblRecycleAssignMxDownload::getDownloadTaskNo, rec.getDownloadTaskNo()).list();
+			//采集表
 			List<ItfTblRecycleHsptJjcjDownload> jjcjList= recycleHsptJjcjDownloadService.lambdaQuery()
 					.eq(ItfTblRecycleHsptJjcjDownload::getDownloadTaskNo, rec.getDownloadTaskNo()).list();
+			// 采集附件表
 			List<ItfTblRecycleHsptJjcjFjDownload> fjList = recycleHsptJjcjFjDownloadService.lambdaQuery()
 					.eq(ItfTblRecycleHsptJjcjFjDownload::getDownloadTaskNo, rec.getDownloadTaskNo()).list();
+			// 采集条码表
 			List<ItfTblRecycleHsptJjcjTmmxDownload> tmmxList = recycleHsptJjcjTmmxDownloadService.lambdaQuery()
 					.eq(ItfTblRecycleHsptJjcjTmmxDownload::getDownloadTaskNo, rec.getDownloadTaskNo()).list();
 			
@@ -772,7 +821,7 @@ public class RecycleAssignLogic {
 			
 			LinkedHashSet<String> webSitNums = new LinkedHashSet<>();
 			//用省，市，区获取省，市，区id
-			List<Area> provinceList = areaService.lambdaQuery().eq(Area::getName, tblRecycleAssignEntity.getSfen()).eq(Area::getLevel, 1).eq(Area::getStatus, 1).list();
+			List<Area> provinceList = areaService.lambdaQuery().eq(Area::getArea, tblRecycleAssignEntity.getSfen()).eq(Area::getLevel, 1).eq(Area::getStatus, 1).list();
 			List<Area> cityList = areaService.lambdaQuery().eq(Area::getName, tblRecycleAssignEntity.getCshi()).eq(Area::getLevel, 2).eq(Area::getStatus, 1).list();
 			List<Area> areaList = areaService.lambdaQuery().eq(Area::getName, tblRecycleAssignEntity.getXian()).eq(Area::getLevel, 3).eq(Area::getStatus, 1).list();
 			List<Area> streetList = areaService.lambdaQuery().eq(Area::getName, tblRecycleAssignEntity.getXzhen()).eq(Area::getLevel, 4).eq(Area::getStatus, 1).list();
@@ -780,11 +829,18 @@ public class RecycleAssignLogic {
 			Map<Integer, Object> newWxWebsiteItemMap = new HashMap<>();
 			//派工下级网点编号新map， pgguid主键对应
 			Map<Integer, Object> newXjWebsiteItemMap = new HashMap<>();
-			OrderRecycleAssign recycleAssign = orderRecycleAssignService.lambdaQuery().eq(OrderRecycleAssign::getPgguid, tblRecycleAssignEntity.getPgguid()).one();
+			// 看工单主表是否已存在
+			OrderRecycleAssign recycleAssign = orderRecycleAssignService.lambdaQuery()
+					.eq(OrderRecycleAssign::getPgguid, tblRecycleAssignEntity.getPgguid()).one();
 			if( !Objects.isNull(recycleAssign)) {
+				// 更新
 				BeanUtils.copyProperties(tblRecycleAssignEntity, recycleAssign, new String[] {"id","createTime","updateTime","deletetime"});
 			}else {
+				// 创建
 				recycleAssign = mapper.readValue(mapper.writeValueAsString(tblRecycleAssignEntity), OrderRecycleAssign.class);
+
+
+
 				recycleAssign.setCreateTime(new Date());
 				//第一次下单状态为保存
 				recycleAssign.setAppointState(0);
@@ -858,11 +914,14 @@ public class RecycleAssignLogic {
 			
 			orderRecycleAssignExpandService.saveOrUpdate(expand);
 			//反馈明细
-			List<OrderRecycleAssignFkmx> fkmxEntitiesList = orderRecycleAssignFkmxService.lambdaQuery().eq(OrderRecycleAssignFkmx::getOrderId, recycleAssign.getId()).list();
+			List<OrderRecycleAssignFkmx> fkmxEntitiesList = orderRecycleAssignFkmxService.lambdaQuery()
+					.eq(OrderRecycleAssignFkmx::getOrderId, recycleAssign.getId()).list();
 			//明细
-			List<OrderRecycleAssignMx> mxEntitiesList = orderRecycleAssignMxService.lambdaQuery().eq(OrderRecycleAssignMx::getOrderId, recycleAssign.getId()).list();
+			List<OrderRecycleAssignMx> mxEntitiesList = orderRecycleAssignMxService.lambdaQuery()
+					.eq(OrderRecycleAssignMx::getOrderId, recycleAssign.getId()).list();
 			//采集明细
-			List<OrderRecycleAssignCollection> collectionEntitiesList = orderRecycleAssignCollectionService.lambdaQuery().eq(OrderRecycleAssignCollection::getOrderId, recycleAssign.getId()).list();
+			List<OrderRecycleAssignCollection> collectionEntitiesList = orderRecycleAssignCollectionService.lambdaQuery()
+					.eq(OrderRecycleAssignCollection::getOrderId, recycleAssign.getId()).list();
 			List<OrderRecycleAssignWorker> newWorkList = new ArrayList<>();
 			
 			//查询网点元数据，不过滤state为0的
@@ -1066,8 +1125,7 @@ public class RecycleAssignLogic {
 		//批量处理下载数据状态
 		batchProcessSynStatus(rec, synStatus, msg);
 	}
-	*/
-
+*/
 	
 	/**
 	 * 状态上传接口

src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminFastEntryPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/admin-fast-entry")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminFieldPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/admin-field")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminModuleFavoritesPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/admin-module-favorites")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminModulePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/admin-module")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminRolePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/admin-role")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminUserModuleRelaPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/admin-user-module-rela")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminUserPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/admin-user")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminUserRoleRelaPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/admin-user-role-rela")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminWebsitPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/admin-websit")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminWebsitProductTypeRelaPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/admin-websit-product-type-rela")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminWebsitSlavePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/admin-websit-slave")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/AreaPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/area")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/BrandLbsRelatePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/brand-lbs-relate")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/BrandPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/brand")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/BrandWebsitPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/brand-websit")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/CityPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/city")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/ComDetailLogPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/com-detail-log")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/ComDetailPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/com-detail")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/ComListPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/com-list")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/CommonFilePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/common-file")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/CompanyCaAuthPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/company-ca-auth")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/CompanyRecordManagePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/company-record-manage")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/ContractTemplatePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/contract-template")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/CustomerInformationCategoryPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/customer-information-category")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/CustomerInformationPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/customer-information")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/CustomerInformationWebsitPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/customer-information-websit")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/ImgCarouselManagePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/img-carousel-manage")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/InstallChargeConfigPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/install-charge-config")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureAgreePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/insure-agree")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureEmailPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/insure-email")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureEmailRecordPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/insure-email-record")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsurePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/insure")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureRangePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/insure-range")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureWorkerCommercialFilePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/insure-worker-commercial-file")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureWorkerCommercialPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/insure-worker-commercial")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureWorkerRecordPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/insure-worker-record")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralDoublePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/integral-double")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralGradeConfigurePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/integral-grade-configure")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralGradeExplainPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/integral-grade-explain")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralGradeSkillPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/integral-grade-skill")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralOffsetPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/integral-offset")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralScorePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/integral-score")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralSkillLabelPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/integral-skill-label")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralWorkerApplyPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/integral-worker-apply")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfGreeToFaDownloadTaskPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/itf-gree-to-fa-download-task")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAssignGzdmDowloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-assign-gzdm-dowload")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAssignXqxlDowloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-assign-xqxl-dowload")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAssignXxlbDowloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-assign-xxlb-dowload")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAssignXxlyDowloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-assign-xxly-dowload")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAssignXxqdDowloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-assign-xxqd-dowload")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAssignYhsxWxDowloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-assign-yhsx-wx-dowload")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAzAssignXslxDowloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-az-assign-xslx-dowload")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblCityDownloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-city-download")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblCityJdxzDownloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-city-jdxz-download")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblCountyDownloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-county-download")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblProvinceDownloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-province-download")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblSplbDaleiDownloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-splb-dalei-download")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblSplbJixinDownloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-splb-jixin-download")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblSplbXiaoleiDownloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-splb-xiaolei-download")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblSplbXilieDownloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-splb-xilie-download")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblWangdianWxgDownloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-wangdian-wxg-download")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblXinWangdianDownloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-xin-wangdian-download")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblYhsxViprankDowloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-yhsx-viprank-dowload")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/LabelCurrencyPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/label-currency")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/LabelPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/label")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/LbsAmapPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/lbs-amap")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/NoticePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/notice")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/NoticeRecordPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/notice-record")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/OperationLogPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/operation-log")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/ProductPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/product")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/ProductSeriesPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/product-series")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/ProvincePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/province")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/QualificationsManagePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/qualifications-manage")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/RepairBugPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/repair-bug")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/RepairProjectPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/repair-project")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/SmsRecordPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/sms-record")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/StreetPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/street")

src/main/java/com/zfire/jiasm/syncdata/plus/controller/SysDictPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-07-04
+ * @since 2023-07-06
  */
 @Controller
 @RequestMapping("/plus/sys-dict")