add

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

@@ -6,6 +6,7 @@ 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.openfeign.EnableFeignClients;
 import org.springframework.context.ApplicationContext;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
@@ -15,6 +16,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @SpringBootApplication
 @ServletComponentScan(basePackages = {"com.zfire.jiasm.syncdata"})
 @EnableAsync
+@EnableFeignClients
 @EnableCaching
 @MapperScan(basePackages = {
         "com.zfire.jiasm.syncdata.plus.mapper",

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

@@ -0,0 +1,158 @@
+package com.zfire.jiasm.syncdata.api;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import org.apache.commons.lang3.math.NumberUtils;
+import org.mapstruct.Named;
+import org.mapstruct.TargetType;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+/**
+ * @description: 枚举基类
+ * @author: qinrongjun
+ * @date: 2023/3/10 15:34
+ **/
+public interface BaseEnum {
+    String getKey();
+    String getValue();
+
+
+    @JsonIgnore
+    default Integer getIntKey() {
+        return Optional.ofNullable(getKey())
+                .filter(NumberUtils::isCreatable)
+                .map(Integer::valueOf)
+                .orElse(null);
+    }
+
+
+    /**
+     * 通用转换对应的枚举实例
+     * @param clazz 枚举类型
+     * @param key 枚举的key字段值
+     * @return
+     */
+    @Named("keyToEnum")
+    static <T extends BaseEnum> T keyToEnum(@TargetType Class<T> clazz, String key) {
+        if (!clazz.isEnum() | !BaseEnum.class.isAssignableFrom(clazz)) {
+            return null;
+        }
+        return Arrays.stream(clazz.getEnumConstants())
+                .filter(item -> item.getKey().equals(key))
+                .findAny()
+                .orElse(null);
+
+    }
+
+    @Named("intKeyToEnum")
+    static <T extends BaseEnum> T intKeyToEnum(@TargetType Class<T> clazz, Integer key) {
+        if (!clazz.isEnum() | !BaseEnum.class.isAssignableFrom(clazz)) {
+            return null;
+        }
+        return Arrays.stream(clazz.getEnumConstants())
+                .filter(item -> item.getIntKey().equals(key))
+                .findAny()
+                .orElse(null);
+
+    }
+
+    @Named("intKeyToEnum")
+    static <T extends BaseEnum> Optional<T> intKeyToEnumOpt(@TargetType Class<T> clazz, Integer key) {
+        return Optional.ofNullable(intKeyToEnum(clazz, key));
+    }
+
+    @Named("intKeyToValue")
+    static String intKeyToValue(@TargetType Class<? extends BaseEnum> clazz, Integer key) {
+        if (!clazz.isEnum() | !BaseEnum.class.isAssignableFrom(clazz)) {
+            return null;
+        }
+        return Arrays.stream(clazz.getEnumConstants())
+                .filter(item -> item.getIntKey().equals(key))
+                .findAny()
+                .map(BaseEnum::getValue)
+                .orElse(null);
+
+    }
+
+    @Named("keyToValue")
+    static String keyToValue(@TargetType Class<? extends BaseEnum> clazz, String key) {
+        if (!clazz.isEnum() | !BaseEnum.class.isAssignableFrom(clazz)) {
+            return null;
+        }
+        return Arrays.stream(clazz.getEnumConstants())
+                .filter(item -> item.getKey().equals(key))
+                .findAny()
+                .map(BaseEnum::getValue)
+                .orElse(null);
+
+    }
+
+    @Named("keyToValueOpt")
+    static Optional<String> keyToValueOpt(@TargetType Class<? extends BaseEnum> clazz, String key) {
+        return Optional.ofNullable(keyToValue(clazz,key));
+
+    }
+
+    static <T extends BaseEnum> Optional<T> keyToEnumOpt(@TargetType Class<T> clazz, String key) {
+        return Optional.ofNullable(keyToEnum(clazz, key));
+    }
+
+    @Named("enumToKey")
+    static String enumToKey(BaseEnum baseEnum) {
+        if (baseEnum == null) {
+            return null;
+        }
+        return baseEnum.getKey();
+    }
+
+    @Named("enumToIntKey")
+    static Integer enumToIntKey(BaseEnum baseEnum) {
+        if (baseEnum == null) {
+            return null;
+        }
+        return baseEnum.getIntKey();
+    }
+
+    @Named("valueToEnum")
+    static <T extends BaseEnum> T valueToEnum(@TargetType Class<T> clazz, String value) {
+        if (!clazz.isEnum() | !BaseEnum.class.isAssignableFrom(clazz)) {
+            return null;
+        }
+        return Arrays.stream(clazz.getEnumConstants())
+                .filter(item -> item.getValue().equals(value))
+                .findAny()
+                .orElse(null);
+
+    }
+
+    @Named("valueToKey")
+    static String valueToKey(@TargetType Class<? extends BaseEnum> clazz, String value) {
+        if (!clazz.isEnum() | !BaseEnum.class.isAssignableFrom(clazz)) {
+            return null;
+        }
+        return Arrays.stream(clazz.getEnumConstants())
+                .filter(item -> item.getValue().equals(value))
+                .findAny()
+                .map(BaseEnum::getKey)
+                .orElse(null);
+
+    }
+
+    @Named("valueToIntKey")
+    static Integer valueToIntKey(@TargetType Class<? extends BaseEnum> clazz, String value) {
+        if (!clazz.isEnum() | !BaseEnum.class.isAssignableFrom(clazz)) {
+            return null;
+        }
+        return Arrays.stream(clazz.getEnumConstants())
+                .filter(item -> item.getValue().equals(value))
+                .findAny()
+                .map(BaseEnum::getIntKey)
+                .orElse(null);
+
+    }
+
+    static <T extends BaseEnum> Optional<T> valueToEnumOpt(@TargetType Class<T> clazz, String value) {
+        return Optional.ofNullable(valueToEnum(clazz, value));
+    }
+}

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

@@ -0,0 +1,21 @@
+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/IsEnum.java

@@ -0,0 +1,31 @@
+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 IsEnum implements BaseEnum {
+    YES("YES","是"),
+    NO("NO","否");
+
+    @EnumValue
+    @JsonValue
+    private final String key;
+    private final String value;
+
+    public static IsEnum findEnumByKey(String key) {
+        IsEnum[] values = IsEnum.values();
+        for (IsEnum isEnum : values) {
+            if (isEnum.getKey().equals(key)) {
+                return isEnum;
+            }
+        }
+        return null;
+    }
+
+}

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

@@ -0,0 +1,193 @@
+package com.zfire.jiasm.syncdata.api;
+
+import com.zfire.jiasm.syncdata.plus.entity.OrderCleanItem;
+import com.zfire.jiasm.syncdata.plus.entity.OrderMaterial;
+import com.zfire.jiasm.syncdata.plus.entity.OrderProduct;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import java.util.Date;
+import java.util.List;
+
+
+@Data
+public class OrderAddBeanDTO {
+    //id
+    private String id;
+    //操作标记 1=临时保存,2=下派工单"
+    private Integer operatorFlag;
+    //客户名称
+    private String userName;
+    //联系人",required = true)
+    private String linkName;
+    //客户电话",required = true)
+    private String userMobile;
+    //客户电话2")
+    private String userMobile2;
+    //用户属性",required = true)
+    private String userAttr;
+    //用户属性ID",required = true)
+    private String userAttrId;
+    //VIP等级")
+    private String vip;
+    //区号")
+    private String areaCode;
+    // 固话")
+    private String telPhone;
+    // 省id")
+    private String provinceId;
+    // 省")
+    private String province;
+    // 市id")
+    private String cityId;
+    // 市")
+    private String city;
+    // 区id")
+    private String areaId;
+    // 区")
+    private String area;
+    // 街道id")
+    private String streetId;
+    // 街道")
+    private String street;
+    // 详细地址")
+    private String address;
+
+    // gps地址")
+    private String gpsAddress;
+    // 经度")
+    private String lng;
+    // 纬度")
+    private String lat;
+    // 服务类目id")
+    private String serviceCategoryId;
+    // 工单类型 INSTALL=安装 REPAIR=维修 RECOVERY=回收 RETURN_EXCHANGE=退换货 TRADE_IN=以旧换新 MAINTENANCE=维保工单 CLEAN=清洗保养")
+    private String orderType;
+    //@NotEmpty(message = "工单小类不能为空")
+    // 工单小类 INSTALL=普通工单 LOOK=看位工单 LAYING=铺管工单 CLEAN=清洗保养")
+    private String orderSmallType;
+    // 需求大类")
+    private String demandTypeId;
+    // 需求大类名称")
+    private String demandTypeName;
+    // 需求小类")
+    private String demandSmallTypeId;
+    // 需求小类名称")
+    private String demandSmallTypeName;
+    // 结算主体id")
+    private String brandId;
+    // 产品品牌id")
+    private String productBrandId;
+    // 产品大类id")
+    private String mainId;
+    // 商户网点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")
+    private String marketActivityId;
+    // 营销活动名称")
+    private String marketActivityName;
+    // 是否上传总部")
+    private Boolean uploadFlag;
+    // 特殊要求-师傅标签（传中文名）")
+    private List<String> labels1;
+    // 特殊要求-信息员标签（传中文名）")
+    private List<String> labels2;
+    // 特殊要求-业务员等级id")
+    private List<String> messengerLevelIds;
+    // 派工方式 A=自动派工 B=手动派工")
+    private DispatchFlagEnum 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-手动派工必填")
+    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")
+    private IsEnum isOnsiteCharges;
+
+    // 是否可离线操作，通过相册的图片提交采集 YES/NO")
+    private IsEnum isOfflineWorker;
+
+    @Length(max = 20)
+    // 工单来源")
+    private String source;
+
+}

src/main/java/com/zfire/jiasm/syncdata/base/BaseService.java

@@ -101,13 +101,13 @@ public class BaseService {
             try{
                 fos.close();
                 bis.close();
-                httpUrl.disconnect();
             }catch (IOException e){
             }catch (NullPointerException e){
             }
         }
     }
 
+
     public String dateSub(Date d) {
         SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US);
         long localTime = d.getTime()-8*60*60*1000;

src/main/java/com/zfire/jiasm/syncdata/common/OldForNewUploadLogic.java

@@ -61,8 +61,6 @@ public class OldForNewUploadLogic {
 	@Autowired
 	private OldForNewProductService oldForNewProductService;
 	@Autowired
-	private YjhxJddService yjhxJddService;
-	@Autowired
 	private OrderBaseService orderBaseService;
 	@Autowired
 	private ItfTblTradeNewForOldStockInfoUploadTaskService itfTblTradeNewForOldStockInfoUploadTaskService;
@@ -82,6 +80,9 @@ public class OldForNewUploadLogic {
 	ItfTblTradeNewForOldRejectJddDownloadService itfTblTradeNewForOldRejectJddDownloadService;
 	@Autowired
 	ItfTblRecycleStockBarcodeInfoUploadService barcodeInfoUploadService;
+	@Autowired
+	YjhxAppraiseService yjhxAppraiseService;
+
 
 
 	private ObjectMapper mapper;
@@ -120,14 +121,16 @@ public class OldForNewUploadLogic {
 			Map<String, OldForNewProduct> oldForNewProductMap  = CollectionUtils.isEmpty(oldForNewProductList)
 					? null : oldForNewProductList.stream().collect(Collectors.toMap(OldForNewProduct::getOrderBaseId, Function.identity()));
 
-			// 提取已采集需上传的鉴定单数据
-			final List<YjhxJdd> jddList = yjhxJddService.lambdaQuery()
-					.in(YjhxJdd::getOrderBaseId, uploadOrderNos)
-					.eq(YjhxJdd::getCollectionStatus, 1)
-					.eq(YjhxJdd::getUploadNotifyFlag, 1)
+			// 提取已采集需上传的鉴定单数据 只取状态为已采集的
+			final List<YjhxAppraise> jddList = yjhxAppraiseService.lambdaQuery()
+					.in(YjhxAppraise::getOrderBaseId, uploadOrderNos)
+					.eq(YjhxAppraise::getCollectionStatus, 1)
+					.eq(YjhxAppraise::getUploadNotifyFlag, 1)
 					.list();
 			// 这里ID做为 key
-			final Map<Integer, List<YjhxJdd>> jddMap = (null == jddList || jddList.isEmpty()) ? null : jddList.stream().collect(Collectors.groupingBy(YjhxJdd::getId));
+			final Map<Integer, List<YjhxAppraise>> jddMap =
+					(null == jddList || jddList.isEmpty()) ?
+							null : jddList.stream().collect(Collectors.groupingBy(YjhxAppraise::getId));
 
 			// 按单来处理 要有鉴定单
 			for(OutJiasmToGreeUploadnotifylist toGreeUpload : toGreeUploadList) {
@@ -137,17 +140,17 @@ public class OldForNewUploadLogic {
 					OrderBase orderBase = orderBaseService.lambdaQuery()
 							.eq(OrderBase::getId,toGreeUpload.getOrderNo()).one();
 
-					for(YjhxJdd jdd : jddList) {
+					for(YjhxAppraise jdd : jddList) {
 						// 取工单对应的鉴定单
 						if (!jdd.getOrderBaseId().equals(toGreeUpload.getOrderNo())){
 							continue;
 						}
-						// 广佛鉴定结果为0（不回收）、不同步总部
+						// 广佛鉴定结果 identifyResult为0（不回收）、不同步总部
 						if( "0".equals(jdd.getIdentifyResult()) ) {
 							continue;
 						}
 
-						// 生成格力总部图片 图片生成失败不同步
+						// 生成格力总部图片(条码图及全景图) 图片生成失败不同步
 						if (setGreeImage(orderBase, jdd)) {
 							continue;
 						}
@@ -196,7 +199,7 @@ public class OldForNewUploadLogic {
 		return "";
 	}
 
-	private boolean setGreeImage(OrderBase orderBase, YjhxJdd jdd) {
+	private boolean setGreeImage(OrderBase orderBase, YjhxAppraise jdd) {
 		WebsitSH websitSH = publicService.ptshwdToshshwd(jdd.getWebsitId(), orderBase.getMainId());
 		Boolean upflag = Boolean.FALSE;
 		// 图片生成 条码图片 njtm图像#wjtm图像
@@ -234,13 +237,13 @@ public class OldForNewUploadLogic {
 			upflag = Boolean.TRUE;
 		}
 		if (upflag){
-			yjhxJddService.updateById(jdd);
+			yjhxAppraiseService.updateById(jdd);
 		}
 		return false;
 	}
 
 	@Nullable
-	private String getFullImage(YjhxJdd jdd, WebsitSH websitSH) {
+	private String getFullImage(YjhxAppraise jdd, WebsitSH websitSH) {
 		String greeImageId = "";
 		String greeImageIdN = "";
 		String greeImageIdW = "";
@@ -289,7 +292,7 @@ public class OldForNewUploadLogic {
 	}
 
 	@Nullable
-	private String getBarcodeImage(YjhxJdd jdd,WebsitSH websitSH) {
+	private String getBarcodeImage(YjhxAppraise jdd,WebsitSH websitSH) {
 		String greeImageId = "";
 		String greeImageIdN = "";
 		String greeImageIdW = "";
@@ -382,7 +385,7 @@ public class OldForNewUploadLogic {
 		}
 	}
 
-	private void synData(YjhxJdd jdd, ItfTblYjhxJddUpload yjhxJddUpload, TradeNewForOldUploadBean bean) {
+	private void synData(YjhxAppraise jdd, ItfTblYjhxJddUpload yjhxJddUpload, TradeNewForOldUploadBean bean) {
 		final String url = webUrl + Constant.GreeWebPath.TBLYJHXJDD_COLLECTION;
 		try {
 			JSONObject response = greeLogic.postPubV3(url, mapper.readValue(mapper.writeValueAsString(bean), Map.class));
@@ -433,7 +436,7 @@ public class OldForNewUploadLogic {
 		}
 	}
 
-	private void getFileAttUpload(YjhxJdd jdd, List<ItfTblYjhxJddFjUpload> yjhxJddFjUploadList,
+	private void getFileAttUpload(YjhxAppraise jdd, List<ItfTblYjhxJddFjUpload> yjhxJddFjUploadList,
 								  ItfTblYjhxJddUpload yjhxJddUpload, List<TradeNewForOldUploadAttachmentBean> jddfjList) {
 		// 总部图片，除了tempBarcodeImg以外的所有，#号分割，in_full_picture#out_full_picture#other_picture
 		String[] fullimgs = jdd.getGreeImgIdAllOther().split("#");
@@ -459,7 +462,7 @@ public class OldForNewUploadLogic {
 		}
 	}
 
-	private void getOtherFileAttUpload(YjhxJdd jdd, List<ItfTblYjhxJddFjUpload> yjhxJddFjUploadList,
+	private void getOtherFileAttUpload(YjhxAppraise jdd, List<ItfTblYjhxJddFjUpload> yjhxJddFjUploadList,
 									   ItfTblYjhxJddUpload yjhxJddUpload, List<TradeNewForOldUploadAttachmentBean> jddfjList,
 									   List<String> greeFjguidArr, String[] fullimgs, int i, int i2, String 其他, String s) {
 		ItfTblYjhxJddFjUpload otherFileAttUpload = new ItfTblYjhxJddFjUpload();
@@ -481,7 +484,7 @@ public class OldForNewUploadLogic {
 		}
 	}
 
-	private void getOutFileAttUpload(YjhxJdd jdd, List<ItfTblYjhxJddFjUpload> yjhxJddFjUploadList,
+	private void getOutFileAttUpload(YjhxAppraise jdd, List<ItfTblYjhxJddFjUpload> yjhxJddFjUploadList,
 									 ItfTblYjhxJddUpload yjhxJddUpload, List<TradeNewForOldUploadAttachmentBean> jddfjList,
 									 List<String> greeFjguidArr, String[] fullimgs, int i, int i2,
 									 String 旧机外机整机, String s) {
@@ -504,7 +507,7 @@ public class OldForNewUploadLogic {
 		}
 	}
 
-	private void getInFileAttUpload(YjhxJdd jdd, List<ItfTblYjhxJddFjUpload> yjhxJddFjUploadList, ItfTblYjhxJddUpload yjhxJddUpload,
+	private void getInFileAttUpload(YjhxAppraise jdd, List<ItfTblYjhxJddFjUpload> yjhxJddFjUploadList, ItfTblYjhxJddUpload yjhxJddUpload,
 									List<TradeNewForOldUploadAttachmentBean> jddfjList, List<String> greeFjguidArr,
 									String[] fullimgs, int i, int i2, String 旧机内机整机, String s) {
 		ItfTblYjhxJddFjUpload inFileAttUpload = new ItfTblYjhxJddFjUpload();
@@ -527,7 +530,7 @@ public class OldForNewUploadLogic {
 		}
 	}
 
-	private boolean setOldForNewProduct(Map<String, OldForNewProduct> oldForNewProductMap, YjhxJdd jdd, TradeNewForOldUploadBean bean) {
+	private boolean setOldForNewProduct(Map<String, OldForNewProduct> oldForNewProductMap, YjhxAppraise jdd, TradeNewForOldUploadBean bean) {
 		// 看旧机信息大类决定是否需要上传
 		if( !Objects.isNull(oldForNewProductMap)
 				&& oldForNewProductMap.containsKey(jdd.getOrderBaseId())
@@ -548,7 +551,7 @@ public class OldForNewUploadLogic {
 		return false;
 	}
 
-	private void setParame(OrderBase orderBase, YjhxJdd jdd, TradeNewForOldUploadBean bean) {
+	private void setParame(OrderBase orderBase, YjhxAppraise jdd, TradeNewForOldUploadBean bean) {
 		WebsitSH websitSH;
 		// hxjddido 为空时说明为平台自建的鉴定数据 自生成
 		if (StringUtils.isEmpty(jdd.getHxjddid())){
@@ -598,7 +601,7 @@ public class OldForNewUploadLogic {
 		bean.setAzrenyddh(worderInfo.getMobile());
 	}
 
-	private void updateJdd(YjhxJdd jdd, TradeNewForOldUploadBean bean) {
+	private void updateJdd(YjhxAppraise jdd, TradeNewForOldUploadBean bean) {
 		Boolean flag = Boolean.FALSE;
 		// 来自报文请求后的id,
 		if (StringUtils.isEmpty(jdd.getGreeId())){
@@ -626,7 +629,7 @@ public class OldForNewUploadLogic {
 			}
 		}
 		if (flag){
-			yjhxJddService.updateById(jdd);
+			yjhxAppraiseService.updateById(jdd);
 		}
 	}
 
@@ -642,7 +645,7 @@ public class OldForNewUploadLogic {
 			ItfTblYjhxJddUpload yjhxJddUpload,
 			List<ItfTblYjhxJddFjUpload> yjhxJddFjUploadList,
 			OutJiasmToGreeUploadnotifylist toGreeUploadnotifylist
-			,YjhxJdd jdd) {
+			,YjhxAppraise jdd) {
 		try {
 		Integer synStatus = -1;
 		String msg = "";
@@ -691,7 +694,7 @@ public class OldForNewUploadLogic {
 		if( null != jdd) {
 			if( Constant.SynStatus.SYN.getCode().intValue() == synStatus) {
 				//返回成功，反写业务表 部分数据来自于格力总部要反写
-				yjhxJddService.saveOrUpdate(jdd);
+				yjhxAppraiseService.saveOrUpdate(jdd);
 			}
 		}
 		}catch(Exception e) {
@@ -792,15 +795,15 @@ public class OldForNewUploadLogic {
 				});
 
 				// 提取以旧换新鉴定单数据
-				List<YjhxJdd> jddList = new ArrayList<>();
-				List<YjhxJdd> newAddJddList = new ArrayList<>();
+				List<YjhxAppraise> jddList = new ArrayList<>();
+				List<YjhxAppraise> newAddJddList = new ArrayList<>();
 				if(!orderBaseIds.isEmpty()) {
-					jddList =  yjhxJddService.lambdaQuery()
-							.in(YjhxJdd::getOrderBaseId, orderBaseIds).list();
+					jddList =  yjhxAppraiseService.lambdaQuery()
+							.in(YjhxAppraise::getOrderBaseId, orderBaseIds).list();
 				}
 
-				final Map<String, List<YjhxJdd>> jddMap = jddList.isEmpty() ?
-						null : jddList.stream().collect(Collectors.groupingBy(YjhxJdd::getOrderBaseId));
+				final Map<String, List<YjhxAppraise>> jddMap = jddList.isEmpty() ?
+						null : jddList.stream().collect(Collectors.groupingBy(YjhxAppraise::getOrderBaseId));
 
 				for (ItfTblTradeNewForOldRejectJddDownload item:tradeNewForOldRejectJddDownloadList){
 					if( null != orderBaseMap && orderBaseMap.containsKey(item.getPgguid()) &&
@@ -812,7 +815,7 @@ public class OldForNewUploadLogic {
 								&& null != jddMap.get(orderBase.getId())
 								&& !jddMap.get(orderBase.getId()) .isEmpty()) {
 							// 提取鉴定单
-							YjhxJdd jdd = jddMap.get(orderBase.getId()) .get(0);
+							YjhxAppraise jdd = jddMap.get(orderBase.getId()) .get(0);
 							// 查看最后更新日期
 							if( null != jdd.getLastModifiedDate()) {
 								//广佛系统最后更新时间在总部下载的时间前才可以更新
@@ -851,7 +854,7 @@ public class OldForNewUploadLogic {
 				}
 
 				if(newAddJddList.size()>0) {
-					yjhxJddService.saveOrUpdateBatch(newAddJddList);
+					yjhxAppraiseService.saveOrUpdateBatch(newAddJddList);
 					newAddJddList.clear();
 				}
 
@@ -880,8 +883,8 @@ public class OldForNewUploadLogic {
 			}
 
 			//根据pgguid获取以旧换新鉴定单数据 无鉴定数据不处理
-			final List<YjhxJdd> yjhxJddList = yjhxJddService.lambdaQuery()
-					.eq(YjhxJdd::getPgguid, item.getPgguid()).list();
+			final List<YjhxAppraise> yjhxJddList = yjhxAppraiseService.lambdaQuery()
+					.eq(YjhxAppraise::getPgguid, item.getPgguid()).list();
 			if(Collections.isEmpty(yjhxJddList)) {
 				item.setSynStatus(Constant.SynStatus.FAIL.getCode());
 				item.setSynErrMsg("没有鉴定单数据, pgguid="+item.getPgguid());
@@ -890,7 +893,7 @@ public class OldForNewUploadLogic {
 			}
 
 			//一个pgguid只对应一条YjhxJdd数据
-			YjhxJdd yjhxJdd = yjhxJddList.get(0);
+			YjhxAppraise yjhxJdd = yjhxJddList.get(0);
 			OrderBase order = orderBaseService.lambdaQuery()
 					.eq(OrderBase::getPgguid, yjhxJdd.getPgguid()).one();
 			if(Objects.isNull(order)) {
@@ -918,11 +921,11 @@ public class OldForNewUploadLogic {
 
 			String taskNo = java.util.UUID.randomUUID().toString();
 			// 生成内机条码上传数据
-			if(!StringUtils.isEmpty(yjhxJdd.getNjtm())) {
+			if(StringUtils.isNotEmpty(yjhxJdd.getNjtm())) {
 				getItfTblRecycleStockBarcodeInfoUploadNjtm(tradeNewForOldStockBarcodeInfoUploadList, yjhxJdd, order, product, websitSH, worderInfo, taskNo);
 			}
 			// 生成外机条码上传数据
-			if(!StringUtils.isEmpty(yjhxJdd.getWjtm())) {
+			if(StringUtils.isNotEmpty(yjhxJdd.getWjtm())) {
 				getItfTblRecycleStockBarcodeInfoUploadWjtm(tradeNewForOldStockBarcodeInfoUploadList, yjhxJdd, order, product, websitSH, worderInfo, taskNo);
 			}
 
@@ -963,7 +966,8 @@ public class OldForNewUploadLogic {
 		return false;
 	}
 
-	private void getItfTblRecycleStockBarcodeInfoUploadWjtm(List<ItfTblRecycleStockBarcodeInfoUpload> tradeNewForOldStockBarcodeInfoUploadList, YjhxJdd yjhxJdd, OrderBase order, OldForNewProduct product, WebsitSH websitSH, WorderInfo worderInfo, String taskNo) {
+	private void getItfTblRecycleStockBarcodeInfoUploadWjtm(List<ItfTblRecycleStockBarcodeInfoUpload> tradeNewForOldStockBarcodeInfoUploadList,
+															YjhxAppraise yjhxJdd, OrderBase order, OldForNewProduct product, WebsitSH websitSH, WorderInfo worderInfo, String taskNo) {
 		ItfTblRecycleStockBarcodeInfoUpload barcodeInfoUpload = new ItfTblRecycleStockBarcodeInfoUpload();
 		barcodeInfoUpload.setPgguid(yjhxJdd.getPgguid());
 		barcodeInfoUpload.setUploadTaskNo(taskNo);
@@ -997,7 +1001,8 @@ public class OldForNewUploadLogic {
 		tradeNewForOldStockBarcodeInfoUploadList.add(barcodeInfoUpload);
 	}
 
-	private void getItfTblRecycleStockBarcodeInfoUploadNjtm(List<ItfTblRecycleStockBarcodeInfoUpload> tradeNewForOldStockBarcodeInfoUploadList, YjhxJdd yjhxJdd, OrderBase order, OldForNewProduct product, WebsitSH websitSH, WorderInfo worderInfo, String taskNo) {
+	private void getItfTblRecycleStockBarcodeInfoUploadNjtm(List<ItfTblRecycleStockBarcodeInfoUpload> tradeNewForOldStockBarcodeInfoUploadList, YjhxAppraise yjhxJdd,
+															OrderBase order, OldForNewProduct product, WebsitSH websitSH, WorderInfo worderInfo, String taskNo) {
 		ItfTblRecycleStockBarcodeInfoUpload barcodeInfoUpload = new ItfTblRecycleStockBarcodeInfoUpload();
 		barcodeInfoUpload.setPgguid(yjhxJdd.getPgguid());
 		barcodeInfoUpload.setUploadTaskNo(taskNo);
@@ -1086,7 +1091,6 @@ public class OldForNewUploadLogic {
 			// 条码数据同步
 			try {
 				GreeResponseHelper response = greeLogic.greePost(apiPath, param, 1);
-//				log.info("RECYCLE_STOCK_STOCKINFOS接口请求参数: {}", JSONObject.parseObject(param.toString()));
 				if(200 == response.getStatus()) {
 					synStatus = Constant.SynStatus.SYN.getCode();
 					for( ItfTblRecycleStockBarcodeInfoUpload tradeNewForOldStockBarcodeInfoUpload : barcodeInfoUploads) {
@@ -1116,12 +1120,12 @@ public class OldForNewUploadLogic {
 					tradeNewForOldStockBarcodeInfoUpload.setSynTimes( Objects.isNull(tradeNewForOldStockBarcodeInfoUpload.getSynTimes()) ? 1 : tradeNewForOldStockBarcodeInfoUpload.getSynTimes() + 1 );
 				}
 			}
-			// 上传条码信息任务列表
+			// 上传条码信息任务列表提取状态为0的数据理论上是取不到的，因为生成上传条码表时已更新了状态为1
 			List<ItfTblTradeNewForOldStockInfoUploadTask> tradeNewForOldStockInfoUploadTaskList = itfTblTradeNewForOldStockInfoUploadTaskService.lambdaQuery()
 					.eq(ItfTblTradeNewForOldStockInfoUploadTask::getPgguid, pgguid)
 					.eq(ItfTblTradeNewForOldStockInfoUploadTask::getSynStatus, Constant.SynStatus.UN_SYN.getCode())
 					.orderByAsc(ItfTblTradeNewForOldStockInfoUploadTask::getSynReqId).list();
-			if( Collections.isEmpty(tradeNewForOldStockInfoUploadTaskList) ) {
+			if(Collections.isEmpty(tradeNewForOldStockInfoUploadTaskList) ) {
 				continue;
 			}
 			//按synReqId顺序更新

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

@@ -0,0 +1,15 @@
+package com.zfire.jiasm.syncdata.constant;
+
+
+
+import com.zfire.jiasm.syncdata.api.OrderAddBeanDTO;
+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}")
+public interface JiasmApi {
+    @PostMapping("order/add")
+    ResponseHelper orderAdd(@RequestBody OrderAddBeanDTO orderAddBeanDTO);
+}

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

@@ -16,8 +16,9 @@ public enum OrderTypeEnum {
     ORDER_TYPE_RETURN_EXCHANGE("RETURN_EXCHANGE","退换货"),
     ORDER_TYPE_TRADE_IN("TRADE_IN","以旧换新"),
     ORDER_TYPE_MAINTENANCE("MAINTENANCE","维保工单"),
-    YJHX_JDD_TABLE_NAME("yjhx_jdd","以旧换新鉴定单表"),
 
+
+    YJHX_JDD_TABLE_NAME("yjhx_appraise","以旧换新鉴定单表"),
     ORDER_SALE_TYPE1("以旧换新","以旧换新"),
     ORDER_SALE_TYPE2("格力商城-以旧换新","格力商城-以旧换新"),
     ORDER_SALE_TYPE3("格力商城-以旧换新2","格力商城-以旧换新2"),

src/main/java/com/zfire/jiasm/syncdata/download/basedata/GLPPGuZhandDaiMa.java

@@ -3,6 +3,7 @@ package com.zfire.jiasm.syncdata.download.basedata;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.zfire.jiasm.syncdata.constant.DictTypeEnum;
 import com.zfire.jiasm.syncdata.constant.InterFaceTypeEnum;
 import com.zfire.jiasm.syncdata.data.Token;
@@ -27,7 +28,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 /**
- * 格力品牌固障代码基础资料下载  同步一次不再使用
+ * 格力品牌固障代码基础资料下载  同步一次不再同步，PC端使用
  */
 @Slf4j
 @Component
@@ -56,9 +57,9 @@ public class GLPPGuZhandDaiMa {
     @Scheduled(fixedDelayString = "${guzdm}")
     @Transactional(rollbackFor = Exception.class)
     public void processGZDMTask() throws Exception {
-        /*if (1==1){
+        if (1==1){
             return;
-        }*/
+        }
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Map<String, String> paramMap = new HashMap<String, String>();
@@ -95,6 +96,17 @@ public class GLPPGuZhandDaiMa {
             // 数据同步到本地故障现象表
             extractedGZDMLocalAddOrUpdate(brandRec, addRec, updateRec);
 
+            // 新增的插入到表
+            if (addRec.size()>0){
+                // 先清除再新增
+                QueryWrapper del = new QueryWrapper<ItfTblAssignGzdmDowload>()
+                        .gt("gzid", 0);
+                itfTblAssignGzdmDowloadService.remove(del);
+
+                itfTblAssignGzdmDowloadService.saveBatch(addRec);
+                log.info("格力品牌固障代码信息同步新增插入了{}条数据", addRec.size());
+                addRec.clear();
+            }
 
             log.info("格力品牌固障代码处理完成: \uF0B7{}",sdf.format(new Date()));
         }else {
@@ -105,52 +117,39 @@ public class GLPPGuZhandDaiMa {
 
     private void extractedGZDMLocalAddOrUpdate(Brand brandRec, List<ItfTblAssignGzdmDowload> addRec, List<ItfTblAssignGzdmDowload> updateRec) {
         List<RepairBug> addRepairBug = new ArrayList<>();
-        List<RepairBug> updateRepairBug = new ArrayList<>();
         // 提取小类字典数据
         List<SysDict> oldSysDictRec =  sysDictService.lambdaQuery()
                 .eq(SysDict::getDictType, DictTypeEnum.DICT_TYPE_SMALL_TYPE.getCode())
                 .eq(SysDict::getStatus, DictTypeEnum.DICT_TYPE_ON.getCode())
                 .list();
         // 小类名称
-        List<String> oldSysDictReclist = oldSysDictRec.stream().map(SysDict::getDictValue).collect(Collectors.toList());
+        List<String> xlname = oldSysDictRec.stream().map(SysDict::getDictValue).collect(Collectors.toList());
         // 小类编号
-        Map<String, List<SysDict>> oldSysDictRecMap = oldSysDictRec.stream().collect(Collectors.groupingBy(SysDict::getDictValue));
+        Map<String, List<SysDict>> xlMap = oldSysDictRec.stream().collect(Collectors.groupingBy(SysDict::getDictValue));
 
         // 提取大类字典数据
         List<SysDict> oldDSysDictRec =  sysDictService.lambdaQuery()
                 .eq(SysDict::getDictType, DictTypeEnum.DICT_TYPE_MAIN_TYPE.getCode())
                 .eq(SysDict::getStatus, DictTypeEnum.DICT_TYPE_ON.getCode()).list();
         // 大类名称
-        List<String> oldSysDictReclistDL = oldDSysDictRec.stream().map(SysDict::getDictValue).collect(Collectors.toList());
+        List<String> dlname = oldDSysDictRec.stream().map(SysDict::getDictValue).collect(Collectors.toList());
         // 大类编号
-        Map<String, List<SysDict>> oldDSysDictRecMapN = oldDSysDictRec.stream().collect(Collectors.groupingBy(SysDict::getDictValue));
-        // 大类编号
-        Map<String, List<SysDict>> oldDSysDictRecMap = oldDSysDictRec.stream().collect(Collectors.groupingBy(SysDict::getDictCode));
-
-        // 提取原有数据
-        List<RepairBug> oldRepairBugRec =  repairBugService.lambdaQuery()
-                .eq(RepairBug::getBrandId, brandRec.getBrandId()).list();
-        Map<String, List<RepairBug>> oldRepairBugRecMap = oldRepairBugRec.stream().collect(Collectors.groupingBy(RepairBug::getGzid));
+        Map<String, List<SysDict>> dlMap = oldDSysDictRec.stream().collect(Collectors.groupingBy(SysDict::getDictCode));
+        Map<String, List<SysDict>> dlNameMap = oldDSysDictRec.stream().collect(Collectors.groupingBy(SysDict::getDictValue));
 
         // 获取新增的
         if (addRec.size()>0){
+            // 先清除再新增
+            QueryWrapper del = new QueryWrapper<RepairBug>()
+                    .eq("brand_id", brandRec.getBrandId());
+            repairBugService.remove(del);
+
             for (ItfTblAssignGzdmDowload item : addRec){
                 // 类别不存在不新增 这里的类别为类别名称，可能是大类也可能是小类
                 // 大类的处理
                 // addDL(brandRec, addRepairBug, oldSysDictReclistDL, oldDSysDictRecMapN, oldDSysDictRecMap, item);
                 // 小类的处理
-                addXL(brandRec, addRepairBug, oldSysDictReclist, oldSysDictRecMap, oldDSysDictRecMap, item);
-            }
-        }
-
-
-        // 获取修改的
-        if (updateRec.size()>0){
-            for (ItfTblAssignGzdmDowload item : updateRec){
-                // 大类修改
-                // upDL(updateRepairBug, oldSysDictRecMap, oldSysDictReclistDL, oldDSysDictRecMapN, oldDSysDictRecMap, oldRepairBugRecMap, item);
-                // 小类修改
-                upXL(updateRepairBug, oldSysDictReclist, oldSysDictRecMap, oldDSysDictRecMap, oldRepairBugRecMap, item);
+                addXL(brandRec, addRepairBug, xlname, xlMap, dlMap, item, dlname, dlNameMap);
             }
         }
 
@@ -158,15 +157,13 @@ public class GLPPGuZhandDaiMa {
         if (addRepairBug.size()>0){
             repairBugService.saveBatch(addRepairBug);
             log.info("格力品牌固障代码本地信息表新增插入了{}条数据",addRepairBug.size());
-        }
-        // 更新
-        if (updateRepairBug.size()>0){
-            repairBugService.updateBatchById(updateRepairBug);
-            log.info("格力品牌固障代码本地信息表更新修改了{}条数据", updateRepairBug.size());
+            addRepairBug.clear();
         }
     }
 
-    private void upXL(List<RepairBug> updateRepairBug, List<String> oldSysDictReclist, Map<String, List<SysDict>> oldSysDictRecMap, Map<String, List<SysDict>> oldDSysDictRecMap, Map<String, List<RepairBug>> oldRepairBugRecMap, ItfTblAssignGzdmDowload item) {
+    private void upXL(List<RepairBug> updateRepairBug, List<String> oldSysDictReclist,
+                      Map<String, List<SysDict>> oldSysDictRecMap, Map<String, List<SysDict>> oldDSysDictRecMap,
+                      Map<String, List<RepairBug>> oldRepairBugRecMap, ItfTblAssignGzdmDowload item) {
         Boolean flag;
         flag = Boolean.FALSE;
         // 类别存在的修改
@@ -353,17 +350,190 @@ public class GLPPGuZhandDaiMa {
         }
     }
 
-    private void addXL(Brand brandRec, List<RepairBug> addRepairBug, List<String> oldSysDictReclist, Map<String, List<SysDict>> oldSysDictRecMap, Map<String, List<SysDict>> oldDSysDictRecMap, ItfTblAssignGzdmDowload item) {
+    private void addXL(Brand brandRec, List<RepairBug> addRepairBug, List<String> xlname, Map<String, List<SysDict>> xlMap,
+                       Map<String, List<SysDict>> dlMap, ItfTblAssignGzdmDowload item, List<String> dlname,Map<String, List<SysDict>> dlNameMap) {
+        Boolean flag = Boolean.FALSE;
         // leib为小类的名称
-        if (oldSysDictReclist.contains(item.getLeib())){
-            addRepairBugCheck(brandRec, addRepairBug, oldSysDictRecMap, oldDSysDictRecMap, item);
+        if (xlname.contains(item.getLeib())){
+            addRepairBugCheck(brandRec, addRepairBug, xlMap, dlMap, item);
+        } else {
+            // 部分小类特殊处理
+            if (!StringUtils.isEmpty(item.getLeib())){
+                // 小类的处理
+                flag = addRepairBugCheckt(brandRec, addRepairBug, xlMap, dlMap, item);
+                if (flag){
+                    // 小类做为大类处理
+                    flag = addRepairBugCheckd(brandRec, addRepairBug, item,dlNameMap);
+                    if (flag){
+                        // 无法对应到类别信息直接添加
+                        addRepairBug(brandRec, addRepairBug, item);
+                    }
+                }
+            } else {
+                // 无小类信息直接添加
+                addRepairBug(brandRec, addRepairBug, item);
+            }
+        }
+    }
+
+    private void addXLbak(Brand brandRec, List<RepairBug> addRepairBug, List<String> xlname, Map<String, List<SysDict>> xlMap,
+                       Map<String, List<SysDict>> dlMap, ItfTblAssignGzdmDowload item) {
+        // leib为小类的名称
+        if (xlname.contains(item.getLeib())){
+            addRepairBugCheck(brandRec, addRepairBug, xlMap, dlMap, item);
         } else {
             // 无小类信息直接添加
             addRepairBug(brandRec, addRepairBug, item);
         }
     }
 
-    private void addRepairBugCheck(Brand brandRec, List<RepairBug> addRepairBug, Map<String, List<SysDict>> oldSysDictRecMap, Map<String, List<SysDict>> oldDSysDictRecMap, ItfTblAssignGzdmDowload item) {
+    private void addRepairBugCheck(Brand brandRec, List<RepairBug> addRepairBug, Map<String, List<SysDict>> xlMap,
+                                   Map<String, List<SysDict>> dlMap, ItfTblAssignGzdmDowload item) {
+        RepairBug v = new RepairBug();
+        v.setBugId(UUID.randomUUID().toString());
+        v.setGzid(String.valueOf(item.getGzid()));
+        v.setBrandId(brandRec.getBrandId());
+        v.setBrandName(brandRec.getBrand());
+        // 类别不为空时 key名称
+        if (xlMap.get(item.getLeib()).get(0)!=null){
+            // 小类编号
+            v.setSmallId(xlMap.get(item.getLeib()).get(0).getDictCode());
+            // 小类名称
+            v.setSmallName(xlMap.get(item.getLeib()).get(0).getDictValue());
+            // 小类有对应的父类时 提取父类信息
+            if (!StringUtils.isEmpty(xlMap.get(item.getLeib()).get(0).getParentDictCode())){
+                v.setMainId(xlMap.get(item.getLeib()).get(0).getParentDictCode());
+                v.setMainName(dlMap.get(v.getMainId()).get(0).getDictValue());
+                v.setMainFlag(dlMap.get(v.getMainId()).get(0).getFlag());
+            }
+        }
+        v.setBugObj(item.getGzmc());
+        v.setBugObjCode(item.getGzno());
+        v.setStatus(DictTypeEnum.DICT_TYPE_OFF.getCode());
+        if (item.getFlag().equals(DictTypeEnum.DICT_TYPE_FLAG_ON.getCode())){
+            v.setStatus(DictTypeEnum.DICT_TYPE_ON.getCode());
+        }
+        v.setCreateBy("system");
+        v.setCreateTime(new Date());
+        if (item.getCjren() !=null){
+            v.setCreateBy(item.getCjren());
+        }
+        if (item.getCjdt() != null){
+            v.setCreateTime(item.getCjdt());
+        }
+        addRepairBug.add(v);
+    }
+
+    private Boolean addRepairBugCheckt(@NotNull Brand brandRec, List<RepairBug> addRepairBug, Map<String, List<SysDict>> xlMap,
+                                       Map<String, List<SysDict>> dlMap, ItfTblAssignGzdmDowload item) {
+        RepairBug v = new RepairBug();
+        v.setBugId(UUID.randomUUID().toString());
+        v.setGzid(String.valueOf(item.getGzid()));
+        v.setBrandId(brandRec.getBrandId());
+        v.setBrandName(brandRec.getBrand());
+        // 类别不为空时 key名称
+        String leibname = "";
+        if (item.getLeib().equals("煤气灶")){
+            leibname="燃气灶";
+        } else if (item.getLeib().equals("家用热水器") || item.getLeib().equals("商用热水器")){
+            leibname="家用空气能热水器";
+        } else if (item.getLeib().equals("电风扇/冷风扇/塔扇")){
+            leibname="电风扇/冷风扇/大厦扇";
+        } else if (item.getLeib().equals("电风扇/冷风扇/塔扇")){
+            leibname="电风扇/冷风扇/大厦扇";
+        } else if (item.getLeib().equals("抽油烟机")){
+            leibname="吸油烟机";
+        }
+        if (StringUtils.isEmpty(leibname)) {
+            return Boolean.TRUE;
+        }
+        if (!xlMap.containsKey(leibname)){
+            return Boolean.TRUE;
+        }
+
+        // 小类编号
+        v.setSmallId(xlMap.get(leibname).get(0).getDictCode());
+        // 小类名称
+        v.setSmallName(xlMap.get(leibname).get(0).getDictValue());
+        // 小类有对应的父类时 提取父类信息
+        if (!StringUtils.isEmpty(xlMap.get(leibname).get(0).getParentDictCode())){
+            v.setMainId(xlMap.get(leibname).get(0).getParentDictCode());
+            v.setMainName(dlMap.get(v.getMainId()).get(0).getDictValue());
+            v.setMainFlag(dlMap.get(v.getMainId()).get(0).getFlag());
+        }
+
+        v.setBugObj(item.getGzmc());
+        v.setBugObjCode(item.getGzno());
+        v.setStatus(DictTypeEnum.DICT_TYPE_OFF.getCode());
+        if (item.getFlag().equals(DictTypeEnum.DICT_TYPE_FLAG_ON.getCode())){
+            v.setStatus(DictTypeEnum.DICT_TYPE_ON.getCode());
+        }
+        v.setCreateBy("system");
+        v.setCreateTime(new Date());
+        if (item.getCjren() !=null){
+            v.setCreateBy(item.getCjren());
+        }
+        if (item.getCjdt() != null){
+            v.setCreateTime(item.getCjdt());
+        }
+        addRepairBug.add(v);
+        return Boolean.FALSE;
+    }
+
+    private Boolean addRepairBugCheckd(Brand brandRec, List<RepairBug> addRepairBug, ItfTblAssignGzdmDowload item,
+                                       Map<String, List<SysDict>> dlNameMap) {
+        RepairBug v = new RepairBug();
+        v.setBugId(UUID.randomUUID().toString());
+        v.setGzid(String.valueOf(item.getGzid()));
+        v.setBrandId(brandRec.getBrandId());
+        v.setBrandName(brandRec.getBrand());
+        // 类别不为空时 key名称
+        String leibname = "";
+        if (item.getLeib().equals("空调")){
+            leibname="家用空调";
+        } else if (item.getLeib().equals("家用热水器") || item.getLeib().equals("商用热水器")){
+            leibname="家用空气能热水器";
+        } else if (item.getLeib().equals("晶弘冰箱")){
+            leibname="晶弘冰箱";
+        } else if (item.getLeib().equals("洗衣机")){
+            leibname="洗衣机";
+        } else if (item.getLeib().equals("商用空调")){
+            leibname="商用空调";
+        } else if (item.getLeib().equals("手机")){
+            leibname="手机";
+        } else if (item.getLeib().equals("移动电源")){
+            leibname="移动电源";
+        } else if (item.getLeib().equals("智能门锁")){
+            leibname="智能门锁";
+        }
+        if (StringUtils.isEmpty(leibname)) {
+            return Boolean.TRUE;
+        }
+        if (!dlNameMap.containsKey(leibname)){
+            return Boolean.TRUE;
+        }
+        v.setMainId(dlNameMap.get(leibname).get(0).getDictCode());
+        v.setMainName(dlNameMap.get(leibname).get(0).getDictValue());
+        v.setMainFlag(dlNameMap.get(leibname).get(0).getFlag());
+        v.setBugObj(item.getGzmc());
+        v.setBugObjCode(item.getGzno());
+        v.setStatus(DictTypeEnum.DICT_TYPE_OFF.getCode());
+        if (item.getFlag().equals(DictTypeEnum.DICT_TYPE_FLAG_ON.getCode())){
+            v.setStatus(DictTypeEnum.DICT_TYPE_ON.getCode());
+        }
+        v.setCreateBy("system");
+        v.setCreateTime(new Date());
+        if (item.getCjren() !=null){
+            v.setCreateBy(item.getCjren());
+        }
+        if (item.getCjdt() != null){
+            v.setCreateTime(item.getCjdt());
+        }
+        addRepairBug.add(v);
+        return Boolean.FALSE;
+    }
+
+    private void addRepairBugCheckBak(Brand brandRec, List<RepairBug> addRepairBug, Map<String, List<SysDict>> oldSysDictRecMap, Map<String, List<SysDict>> oldDSysDictRecMap, ItfTblAssignGzdmDowload item) {
         RepairBug v = new RepairBug();
         v.setBugId(UUID.randomUUID().toString());
         v.setGzid(String.valueOf(item.getGzid()));
@@ -423,15 +593,11 @@ public class GLPPGuZhandDaiMa {
         addRepairBug.add(v);
     }
 
+
     private void extractedGZDMAddOrUpdate(JSONArray jsonArray, List<ItfTblAssignGzdmDowload> addRec, List<ItfTblAssignGzdmDowload> updateRec) {
-        Boolean flag = Boolean.FALSE;
         String synTaskNo = UUID.randomUUID().toString();
-        // 提取现有的数据信息
-        List<ItfTblAssignGzdmDowload> oldRec =  itfTblAssignGzdmDowloadService.lambdaQuery().list();
-        List<Long> oldRecId = oldRec.stream().map(ItfTblAssignGzdmDowload::getGzid).collect(Collectors.toList());
-        Map<Long, List<ItfTblAssignGzdmDowload>> oldRecMap = oldRec.stream().collect(Collectors.groupingBy(ItfTblAssignGzdmDowload::getGzid));
+
         for (int i = 0; i < jsonArray.size(); i++) {
-            flag = Boolean.FALSE;
             JSONObject aData = jsonArray.getJSONObject(i);
             ItfTblAssignGzdmDowload item = JSON.toJavaObject(aData,ItfTblAssignGzdmDowload.class);
             if (StringUtils.isEmpty(item.getGzno())){
@@ -454,70 +620,15 @@ public class GLPPGuZhandDaiMa {
                 item.setPxdj(0);
             }
 
-
-            // 修改
-            if (oldRecId.contains(item.getGzid())){
-                ItfTblAssignGzdmDowload old = oldRecMap.get(item.getGzid()).get(0);
-                if (!old.getGzno().equals(item.getGzno())){
-                    old.setGzno(item.getGzno());
-                    flag = Boolean.TRUE;
-                }
-
-                if (!old.getGzmc().equals(item.getGzmc())){
-                    old.setGzmc(item.getGzmc());
-                    flag = Boolean.TRUE;
-                }
-                if (!old.getPxdj().equals(item.getPxdj())){
-                    old.setPxdj(item.getPxdj());
-                    flag = Boolean.TRUE;
-                }
-                if (!old.getFlag().equals(item.getFlag())){
-                    old.setFlag(item.getFlag());
-                    flag = Boolean.TRUE;
-                }
-                if (!old.getLeib().equals(item.getLeib())){
-                    old.setLeib(item.getLeib());
-                    flag = Boolean.TRUE;
-                }
-                if (!old.getCjwdno().equals(item.getCjwdno())){
-                    old.setCjwdno(item.getCjwdno());
-                    flag = Boolean.TRUE;
-                }
-                if (flag){
-                    old.setLastModifiedBy("system");
-                    old.setLastModifiedDate(new Date());
-                    // 操作人
-                    if (item.getLastModifiedBy() != null){
-                        old.setLastModifiedBy(item.getLastModifiedBy());
-                    }
-                    // 修改时间
-                    if (item.getLastModifiedDate() != null){
-                        old.setLastModifiedDate(item.getLastModifiedDate());
-                    }
-                    updateRec.add(old);
-                }
-            } else {
-                // 新增
-                item.setSynTaskNo(synTaskNo);
-                if (item.getCreatedBy() ==null){
-                    item.setCreatedBy("system");
-                }
-                if (item.getCreatedDate() == null){
-                    item.setCreatedDate(new Date());
-                }
-                addRec.add(item);
+            // 新增
+            item.setSynTaskNo(synTaskNo);
+            if (item.getCreatedBy() ==null){
+                item.setCreatedBy("system");
             }
-        }
-        // 新增的插入到表
-        if (addRec.size()>0){
-            itfTblAssignGzdmDowloadService.saveBatch(addRec);
-            log.info("格力品牌固障代码信息同步新增插入了{}条数据", addRec.size());
-        }
-
-        // 更新
-        if (updateRec.size()>0){
-            itfTblAssignGzdmDowloadService.updateBatchById(updateRec);
-            log.info("格力品牌固障代码信息同步更新修改了{}条数据", updateRec.size());
+            if (item.getCreatedDate() == null){
+                item.setCreatedDate(new Date());
+            }
+            addRec.add(item);
         }
     }
 }

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

@@ -1319,7 +1319,7 @@ public class InstallBusiness {
 
         // 获取工单师傅信息
         OrderWorker orderWorker = getOrderWorker(orderBase);
-        // 获取工单机型
+        // 获取工单机型 + 生成采集明细数据+附件数据
         getOrderProduct(orderBase, orderProducts, sysDictRefDLMap, sysDictRefXLMap, sysDictRefXiLieMap, orderMx,oids,odfs);
         // 获取工单操作明细- 操作日志表
         List<OrderInstallOperatingLog> oiolList = getOrderInstallOperatingLogs(fkmxs, orderBase,item);
@@ -1901,6 +1901,7 @@ public class InstallBusiness {
             // 生成工单产品对象
             getOrderProduct(orderBase, orderProducts, sysDictRefDLMap, sysDictRefXLMap, sysDictRefXiLieMap, mx, op);
             // 生成采集明细数据+附件数据
+            // 总数量一条条插入，内外机数量不再拆分
             extracted(orderBase, oids, odfs, insertnum, outid, mx, op);
         }
     }

src/main/java/com/zfire/jiasm/syncdata/download/worker/GLPPWXGQueryAdd.java

@@ -15,6 +15,7 @@ import com.zfire.jiasm.syncdata.request.SignSplb;
 import com.zfire.jiasm.syncdata.request.ZJInfo;
 import com.zfire.jiasm.syncdata.response.WangdianWxgVos;
 import com.zfire.jiasm.syncdata.response.WxgQueryInfo;
+import com.zfire.jiasm.syncdata.service.PublicService;
 import com.zfire.jiasm.syncdata.utils.oss.OSSUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;
@@ -77,6 +78,8 @@ public class GLPPWXGQueryAdd {
     WorkerService workerService;
     @Resource
     ItfTblWangdianPositionDownloadService itfTblWangdianPositionDownloadService;
+    @Resource
+    PublicService publicService;
 
     /**
      * 同步师傅的证件照 新增
@@ -138,7 +141,7 @@ public class GLPPWXGQueryAdd {
             // 参数 获取网点维修工信息
             getParameter(wxg.getWdno(), wxg.getWxgno(), req);
             // 格力总部查询工程师信息
-            GreeResponseHelper response = greeLogic.greePost(wdqyapi, JSONObject.toJSONString(req), 1);
+            GreeResponseHelper response = greeLogic.greePost(wdqyapi, JSONObject.toJSONString(req), publicService.getCompanyId(wxg.getWdno()));
             if (response.getStatus() == 200){
                 WxgQueryInfo resultDatax = JSONObject.parseObject(response.getData().toString(), WxgQueryInfo.class);
                 // 无证件不处理
@@ -296,7 +299,7 @@ public class GLPPWXGQueryAdd {
                 }
             }
         }
-        log.info("同步同步网点师傅服务类目信息结束: \uF0B7{}",sdf.format(new Date()));
+        log.info("同步网点师傅服务类目信息结束: \uF0B7{}",sdf.format(new Date()));
     }
 
 

src/main/java/com/zfire/jiasm/syncdata/gree/GreeLogic.java

@@ -68,6 +68,8 @@ public class GreeLogic {
     private String gzAppId;
     @Value("${gree.fs.appid}")
     private String fsAppId;
+    @Value("${gree.tm.appid}")
+    private String tmAppId;
     @Value("${uploadbaseurl}")
     private String uploadbaseurl;
     @Value("${sevefileurl}")
@@ -106,9 +108,11 @@ public class GreeLogic {
 
     public String getAppId(Integer belongType){
         if(belongType == 1){
-            return gzAppId;
-        }else{
             return fsAppId;
+        } else if(belongType == 2){
+            return gzAppId;
+        } else {
+            return tmAppId;
         }
     }
 

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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @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-06-30
+ * @since 2023-07-04
  */
 @Controller
 @RequestMapping("/plus/sms-record")