add

pom.xml

@@ -19,6 +19,24 @@
     </properties>
 
     <dependencies>
+        <!--<dependency>
+            <groupId>com.github.binarywang</groupId>
+            <artifactId>wx-java-pay-spring-boot-starter</artifactId>
+            <version>4.1.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.gree.manager</groupId>
+            <artifactId>jiasm_api</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>-->
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>

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

@@ -5,27 +5,29 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.zfire.jiasm.syncdata.base.BaseService;
 import com.zfire.jiasm.syncdata.constant.Constant;
-import com.zfire.jiasm.syncdata.constant.DictTypeEnum;
+import com.zfire.jiasm.syncdata.constant.GreeSynStatusEnum;
 import com.zfire.jiasm.syncdata.constant.OrderTypeEnum;
 import com.zfire.jiasm.syncdata.gree.GreeLogic;
+import com.zfire.jiasm.syncdata.gree.helper.GreeResponseHelper;
 import com.zfire.jiasm.syncdata.gree.recycle.GreeLogicT;
 import com.zfire.jiasm.syncdata.helper.GreeFileResponseHelper;
 import com.zfire.jiasm.syncdata.helper.GreeFileSaveHelper;
 import com.zfire.jiasm.syncdata.http.PostObjectSample;
 import com.zfire.jiasm.syncdata.plus.entity.*;
 import com.zfire.jiasm.syncdata.plus.service.*;
+import com.zfire.jiasm.syncdata.request.oldfornew.TradeNewForOldStockBarcodeInfoUploadBean;
 import com.zfire.jiasm.syncdata.request.oldfornew.TradeNewForOldUploadAttachmentBean;
 import com.zfire.jiasm.syncdata.request.oldfornew.TradeNewForOldUploadBean;
 import com.zfire.jiasm.syncdata.response.ResultData;
-import com.zfire.jiasm.syncdata.response.WebsitFWS;
 import com.zfire.jiasm.syncdata.response.WebsitSH;
 import com.zfire.jiasm.syncdata.response.WorderInfo;
 import com.zfire.jiasm.syncdata.service.PublicService;
-import com.zfire.jiasm.syncdata.test;
 import com.zfire.jiasm.syncdata.utils.oss.OSSUtil;
 import io.jsonwebtoken.lang.Collections;
 import lombok.extern.slf4j.Slf4j;
@@ -39,6 +41,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.io.File;
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.function.Function;
@@ -77,6 +80,9 @@ public class OldForNewUploadLogic {
 	OSSUtil ossUtil;
 	@Autowired
 	ItfTblTradeNewForOldRejectJddDownloadService itfTblTradeNewForOldRejectJddDownloadService;
+	@Autowired
+	ItfTblRecycleStockBarcodeInfoUploadService barcodeInfoUploadService;
+
 
 	private ObjectMapper mapper;
 
@@ -176,7 +182,7 @@ public class OldForNewUploadLogic {
 						}
 						bean.setJddfj(jddfjList);
 
-						// 同步数据
+						// 同步数据 + 新增一条待入库条码上传记录
 						synData(jdd, yjhxJddUpload, bean);
 
 						processSave(yjhxJddUpload, yjhxJddFjUploadList,toGreeUpload,jdd);
@@ -721,11 +727,26 @@ public class OldForNewUploadLogic {
 				List<ItfTblTradeNewForOldRejectJddDownload> tradeNewForOldRejectJddDownloadList = JSONArray.parseArray(this.mapper.writeValueAsString(response.get("data")),
 						ItfTblTradeNewForOldRejectJddDownload.class);
 				if(CollectionUtils.isNotEmpty(tradeNewForOldRejectJddDownloadList)) {
-					tradeNewForOldRejectJddDownloadList.stream().forEach(reject->{
+					Map<String,List<ItfTblTradeNewForOldRejectJddDownload>> jddsMap= new HashMap<>();
+					// 提取同步无批次号的数据
+					List<ItfTblTradeNewForOldRejectJddDownload> jdds = itfTblTradeNewForOldRejectJddDownloadService.lambdaQuery()
+							.eq(ItfTblTradeNewForOldRejectJddDownload::getFlag,1).list();
+					if (CollectionUtils.isNotEmpty(jdds)){
+						jddsMap = jdds.stream().collect(Collectors.groupingBy(ItfTblTradeNewForOldRejectJddDownload::getPgguid));
+					}
+					for (ItfTblTradeNewForOldRejectJddDownload reject: tradeNewForOldRejectJddDownloadList){
 						reject.setSynReqTime(new Date());
 						reject.setSynStatus(Constant.SynStatus.UN_SYN.getCode());
 						reject.setSynTimes(1);
-					});
+						if (StringUtils.isEmpty(reject.getDownloadTaskNo())){
+							if (jddsMap.containsKey(reject.getPgguid())){
+								reject.setDownloadTaskNo(jddsMap.get(reject.getPgguid()).get(0).getDownloadTaskNo());
+							} else {
+								reject.setDownloadTaskNo(UUID.randomUUID().toString());
+								reject.setFlag(1);
+							}
+						}
+					}
 					itfTblTradeNewForOldRejectJddDownloadService.saveOrUpdateBatch(tradeNewForOldRejectJddDownloadList);
 				}else {
 					log.info("TradeOldForNewLogic.queryRejectJdd接口返回记录数为空");
@@ -743,7 +764,7 @@ public class OldForNewUploadLogic {
 		return "";
     }
 
-    // 修改鉴定单状态为驳回状态
+    // 修改鉴定单状态为驳回状态+更新同步数据状态
 	public String processBusiness() {
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -769,6 +790,7 @@ public class OldForNewUploadLogic {
 					orderBaseIds.add(OrderBase.getId());
 				});
 
+				// 提取以旧换新鉴定单数据
 				List<YjhxJdd> jddList = new ArrayList<>();
 				List<YjhxJdd> newAddJddList = new ArrayList<>();
 				if(!orderBaseIds.isEmpty()) {
@@ -840,4 +862,292 @@ public class OldForNewUploadLogic {
 		return "";
 	}
 
+	public void stockBarcodeInfoDonwlodToUpload() {
+		// 提取待入库条码上传记录表数据
+		List<ItfTblTradeNewForOldStockInfoUploadTask> tradeNewForOldStockInfoUploadTaskList = itfTblTradeNewForOldStockInfoUploadTaskService.lambdaQuery()
+				.eq(ItfTblTradeNewForOldStockInfoUploadTask::getSynStatus, Constant.SynStatus.UN_SYN.getCode())
+				.orderByAsc(ItfTblTradeNewForOldStockInfoUploadTask::getSynReqId).list();
+		//测试，用状态为77 无数据不处理
+		if( Collections.isEmpty(tradeNewForOldStockInfoUploadTaskList)) {
+			return ;
+		}
+		List<ItfTblRecycleStockBarcodeInfoUpload> tradeNewForOldStockBarcodeInfoUploadList = new ArrayList<>();
+		for(ItfTblTradeNewForOldStockInfoUploadTask item : tradeNewForOldStockInfoUploadTaskList) {
+			// 相同 pgguid 上一条未同步或同步失败本记录不再同步
+			if (checkUpload(item)){
+				continue;
+			}
+
+			//根据pgguid获取以旧换新鉴定单数据 无鉴定数据不处理
+			final List<YjhxJdd> yjhxJddList = yjhxJddService.lambdaQuery()
+					.eq(YjhxJdd::getPgguid, item.getPgguid()).list();
+			if(Collections.isEmpty(yjhxJddList)) {
+				item.setSynStatus(Constant.SynStatus.FAIL.getCode());
+				item.setSynErrMsg("没有鉴定单数据, pgguid="+item.getPgguid());
+				item.setSynTime(new Date());
+				continue;
+			}
+
+			//一个pgguid只对应一条YjhxJdd数据
+			YjhxJdd yjhxJdd = yjhxJddList.get(0);
+			OrderBase order = orderBaseService.lambdaQuery()
+					.eq(OrderBase::getPgguid, yjhxJdd.getPgguid()).one();
+			if(Objects.isNull(order)) {
+				item.setSynStatus(Constant.SynStatus.FAIL.getCode());
+				item.setSynErrMsg("没有工单数据, pgguid="+item.getPgguid());
+				item.setSynTime(new Date());
+				continue;
+			}
+
+			//查询old_for_new_product 旧机信息表，获取大类
+			final List<OldForNewProduct> tradeNewForOldList = oldForNewProductService.lambdaQuery()
+					.eq(OldForNewProduct::getOrderBaseId, yjhxJdd.getOrderBaseId()).list();
+			OldForNewProduct product = (Collections.isEmpty(tradeNewForOldList)) ? null : tradeNewForOldList.get(0);
+			//内外机条码，以#分割
+			if(StringUtils.isEmpty(yjhxJdd.getTempBarcode())) {
+				item.setSynStatus(Constant.SynStatus.FAIL.getCode());
+				item.setSynErrMsg("没有内外机条码信息, pgguid="+item.getPgguid());
+				item.setSynTime(new Date());
+				continue;
+			}
+
+			WebsitSH websitSH = publicService.ptshwdToshshwd(yjhxJdd.getWebsitId(), order.getMainId());
+			WorderInfo worderInfo = publicService.getWorkerInfo(order.getWorkerId(),
+					websitSH.getWdId(), order.getGroupCompanyId());
+
+			String taskNo = java.util.UUID.randomUUID().toString();
+			// 生成内机条码上传数据
+			if(!StringUtils.isEmpty(yjhxJdd.getNjtm())) {
+				getItfTblRecycleStockBarcodeInfoUploadNjtm(tradeNewForOldStockBarcodeInfoUploadList, yjhxJdd, order, product, websitSH, worderInfo, taskNo);
+			}
+			// 生成外机条码上传数据
+			if(!StringUtils.isEmpty(yjhxJdd.getWjtm())) {
+				getItfTblRecycleStockBarcodeInfoUploadWjtm(tradeNewForOldStockBarcodeInfoUploadList, yjhxJdd, order, product, websitSH, worderInfo, taskNo);
+			}
+
+
+			item.setSynStatus(Constant.SynStatus.SYN.getCode());
+			item.setSynTime(new Date());
+		}
+
+		// 修改同步待入库条码上传记录表状态
+		itfTblTradeNewForOldStockInfoUploadTaskService.saveOrUpdateBatch(tradeNewForOldStockInfoUploadTaskList);
+		// 生成条码信息上传表数据
+		if(!Collections.isEmpty(tradeNewForOldStockBarcodeInfoUploadList)) {
+			barcodeInfoUploadService.saveOrUpdateBatch(tradeNewForOldStockBarcodeInfoUploadList);
+		}
+	}
+
+	private boolean checkUpload(ItfTblTradeNewForOldStockInfoUploadTask item) {
+		//提取小于当前id的数据   含有上一条失败，本条不上传
+		List<ItfTblTradeNewForOldStockInfoUploadTask> lastTaskList = itfTblTradeNewForOldStockInfoUploadTaskService.lambdaQuery().
+				in(ItfTblTradeNewForOldStockInfoUploadTask::getSynStatus,
+						new Integer[] { Constant.SynStatus.FAIL.getCode(), Constant.SynStatus.UN_SYN.getCode()}).
+				lt(ItfTblTradeNewForOldStockInfoUploadTask::getSynReqId, item.getSynReqId()).
+				eq(ItfTblTradeNewForOldStockInfoUploadTask::getPgguid, item.getPgguid()).
+				orderByDesc(ItfTblTradeNewForOldStockInfoUploadTask::getSynReqId).list();
+		if(!Collections.isEmpty(lastTaskList)) {
+			ItfTblTradeNewForOldStockInfoUploadTask lastTask = lastTaskList.get(0);
+			// 若上一条未同步，则本条跳过
+			if( Constant.SynStatus.UN_SYN.getCode().intValue() == lastTask.getSynStatus() ) {
+				return true;
+			}else {
+				// 若上一条失败，则本条也不允许上传
+				item.setSynStatus(Constant.SynStatus.FAIL.getCode());
+				item.setSynErrMsg("上一条数据没上传成功，本条数据不上传, pguuid="+ item.getPgguid());
+				item.setSynTime(new Date());
+				return true;
+			}
+		}
+		return false;
+	}
+
+	private void getItfTblRecycleStockBarcodeInfoUploadWjtm(List<ItfTblRecycleStockBarcodeInfoUpload> tradeNewForOldStockBarcodeInfoUploadList, YjhxJdd yjhxJdd, OrderBase order, OldForNewProduct product, WebsitSH websitSH, WorderInfo worderInfo, String taskNo) {
+		ItfTblRecycleStockBarcodeInfoUpload barcodeInfoUpload = new ItfTblRecycleStockBarcodeInfoUpload();
+		barcodeInfoUpload.setPgguid(yjhxJdd.getPgguid());
+		barcodeInfoUpload.setUploadTaskNo(taskNo);
+		barcodeInfoUpload.setJqtm(yjhxJdd.getWjtm());
+		barcodeInfoUpload.setTmlx(1);
+		barcodeInfoUpload.setSpid(Integer.valueOf(product.getMainId()));
+		//大类名字，现在暂时只有空调，spid=101
+		barcodeInfoUpload.setSpmc( (Objects.isNull(product) || Objects.isNull(product.getMainId()) ) ? null : (product.getMainId().equals("101") ? "空调" : ""));
+		barcodeInfoUpload.setPinp(StringUtils.isEmpty(yjhxJdd.getRealBrand()) ?   yjhxJdd.getOldMachineBrand() : yjhxJdd.getRealBrand());
+		barcodeInfoUpload.setJqlx( StringUtils.isEmpty(yjhxJdd.getRealType()) ? yjhxJdd.getOldMachineType() : yjhxJdd.getRealType());
+		//匹数要传数字型，1点5匹，就填1.50 ，用数字填
+		barcodeInfoUpload.setPshu( new BigDecimal(yjhxJdd.getCpps() ).floatValue() );
+		barcodeInfoUpload.setWdno(websitSH.getWdId());
+		barcodeInfoUpload.setDqcfid(websitSH.getWdId());
+		barcodeInfoUpload.setDqcfmc(websitSH.getWdmc());
+		barcodeInfoUpload.setYddh(worderInfo.getMobile());
+		//工单类型:1:以旧换新;2:回收工单
+		barcodeInfoUpload.setSrclx(1);
+		barcodeInfoUpload.setHssj(new Date());
+		barcodeInfoUpload.setHsfwwdno(websitSH.getWdId());
+		barcodeInfoUpload.setHsfwwdmc(websitSH.getWdmc());
+		barcodeInfoUpload.setSrcno(order.getSaleNo());
+		barcodeInfoUpload.setSrcId(yjhxJdd.getPgguid());
+		barcodeInfoUpload.setPgwcmxid(yjhxJdd.getHxjddid());
+		barcodeInfoUpload.setState(0);
+		barcodeInfoUpload.setCreatedBy(yjhxJdd.getCreatedBy());
+		barcodeInfoUpload.setCreatedDate(yjhxJdd.getCreatedDate());
+		barcodeInfoUpload.setLastModifiedBy(yjhxJdd.getLastModifiedBy());
+		barcodeInfoUpload.setLastModifiedDate(yjhxJdd.getLastModifiedDate());
+		barcodeInfoUpload.setSrcxsdh(order.getSaleNo());
+		tradeNewForOldStockBarcodeInfoUploadList.add(barcodeInfoUpload);
+	}
+
+	private void getItfTblRecycleStockBarcodeInfoUploadNjtm(List<ItfTblRecycleStockBarcodeInfoUpload> tradeNewForOldStockBarcodeInfoUploadList, YjhxJdd yjhxJdd, OrderBase order, OldForNewProduct product, WebsitSH websitSH, WorderInfo worderInfo, String taskNo) {
+		ItfTblRecycleStockBarcodeInfoUpload barcodeInfoUpload = new ItfTblRecycleStockBarcodeInfoUpload();
+		barcodeInfoUpload.setPgguid(yjhxJdd.getPgguid());
+		barcodeInfoUpload.setUploadTaskNo(taskNo);
+		barcodeInfoUpload.setJqtm(yjhxJdd.getNjtm());
+		barcodeInfoUpload.setTmlx(0);
+		barcodeInfoUpload.setSpid(Objects.isNull(product) ? null : Integer.valueOf(product.getMainId()));
+		//大类名字，现在暂时只有空调，spid=101
+		barcodeInfoUpload.setSpmc( (Objects.isNull(product) || Objects.isNull(product.getMainId()) ) ? null : (product.getMainId().equals("101") ? "空调" : ""));
+		barcodeInfoUpload.setPinp(StringUtils.isEmpty(yjhxJdd.getRealBrand()) ?   yjhxJdd.getOldMachineBrand() : yjhxJdd.getRealBrand());
+		barcodeInfoUpload.setJqlx( StringUtils.isEmpty(yjhxJdd.getRealType()) ? yjhxJdd.getOldMachineType() : yjhxJdd.getRealType());
+		//匹数要传数字型，1点5匹，就填1.50 ，用数字填
+		barcodeInfoUpload.setPshu( new BigDecimal(yjhxJdd.getCpps() ).floatValue() );
+		barcodeInfoUpload.setWdno(websitSH.getWdId());
+		barcodeInfoUpload.setDqcfid(websitSH.getWdId());
+		barcodeInfoUpload.setDqcfmc(websitSH.getWdmc());
+		barcodeInfoUpload.setYddh(worderInfo.getMobile());
+		//工单类型:1:以旧换新;2:回收工单
+		barcodeInfoUpload.setSrclx(1);
+		barcodeInfoUpload.setHssj(new Date());
+		barcodeInfoUpload.setHsfwwdno(websitSH.getWdId());
+		barcodeInfoUpload.setHsfwwdmc(websitSH.getWdmc());
+		barcodeInfoUpload.setSrcno(order.getSaleNo());
+		barcodeInfoUpload.setSrcId(yjhxJdd.getPgguid());
+		barcodeInfoUpload.setPgwcmxid(yjhxJdd.getHxjddid());
+		barcodeInfoUpload.setState(0);
+		barcodeInfoUpload.setCreatedBy(yjhxJdd.getCreatedBy());
+		barcodeInfoUpload.setCreatedDate(yjhxJdd.getCreatedDate());
+		barcodeInfoUpload.setLastModifiedBy(yjhxJdd.getLastModifiedBy());
+		barcodeInfoUpload.setLastModifiedDate(yjhxJdd.getLastModifiedDate());
+		barcodeInfoUpload.setSrcxsdh(order.getSaleNo());
+		tradeNewForOldStockBarcodeInfoUploadList.add(barcodeInfoUpload);
+	}
+
+	/**
+	 * 上传总部条码（需要上传了barcodeInfo主表数据，上传的stockin和stockout才有有效）
+	 */
+	public void stockBarcodeInfoUpload() {
+		// 条码信息上传表中提取待同步的数据
+		final List<ItfTblRecycleStockBarcodeInfoUpload> barcodeInfoUploads = barcodeInfoUploadService.lambdaQuery()
+				.eq(ItfTblRecycleStockBarcodeInfoUpload::getSynStatus, Constant.SynStatus.UN_SYN.getCode()).list();
+		// 无数据不处理
+		if(Collections.isEmpty(barcodeInfoUploads)) {
+			return;
+		}
+
+		List<ItfTblTradeNewForOldStockInfoUploadTask> stockInfoUploadTaskList = new ArrayList<>();
+		// 按uploadTaskNo分组 内外机条码各一条记录
+		final Map<String, List<ItfTblRecycleStockBarcodeInfoUpload>> barcodeInfoUploadsMap = Collections.isEmpty(barcodeInfoUploads) ? null :barcodeInfoUploads.stream().collect(Collectors.groupingBy(ItfTblRecycleStockBarcodeInfoUpload::getUploadTaskNo));
+		// 取键值对的每个entry
+		for(Map.Entry<String,List<ItfTblRecycleStockBarcodeInfoUpload>> entry : barcodeInfoUploadsMap.entrySet()){
+			List<ItfTblRecycleStockBarcodeInfoUpload> barcodeInfoList = entry.getValue();
+			String pgguid = barcodeInfoList.get(0).getPgguid();
+			final String apiPath = Constant.GreeApiPath.TRADE_NEW_FOR_OLD_STOCK_STOCKINFOS;
+			Integer synStatus = -1;
+			String errMsg = "";
+			List<TradeNewForOldStockBarcodeInfoUploadBean> barcodeInfoBeanList = new ArrayList<>();
+			List<Map> infos = new ArrayList<>() ;
+			// 组装参数 infos
+			try {
+				barcodeInfoBeanList = this.mapper.readValue(this.mapper.writeValueAsString(barcodeInfoList), new TypeReference<List<TradeNewForOldStockBarcodeInfoUploadBean>>() {});
+				infos = this.mapper.readValue(this.mapper.writeValueAsString(barcodeInfoBeanList), new TypeReference<List<Map>>() {});
+			} catch (JsonMappingException e1) {
+				synStatus = Constant.SynStatus.FAIL.getCode();
+				for( ItfTblRecycleStockBarcodeInfoUpload tradeNewForOldStockBarcodeInfoUpload : barcodeInfoUploads) {
+					tradeNewForOldStockBarcodeInfoUpload.setSynStatus(GreeSynStatusEnum.FAIL.getCode());
+					tradeNewForOldStockBarcodeInfoUpload.setSynErrMsg(e1.getMessage().length() > 100 ? e1.getMessage().substring(0, 99) : e1.getMessage());
+					errMsg = tradeNewForOldStockBarcodeInfoUpload.getSynErrMsg();
+					tradeNewForOldStockBarcodeInfoUpload.setSynTime(new Date());
+					tradeNewForOldStockBarcodeInfoUpload.setSynTimes( Objects.isNull(tradeNewForOldStockBarcodeInfoUpload.getSynTimes()) ? 1 : tradeNewForOldStockBarcodeInfoUpload.getSynTimes() + 1 );
+				}
+				continue;
+			} catch (JsonProcessingException e1) {
+				synStatus = Constant.SynStatus.FAIL.getCode();
+				for( ItfTblRecycleStockBarcodeInfoUpload tradeNewForOldStockBarcodeInfoUpload : barcodeInfoUploads) {
+					tradeNewForOldStockBarcodeInfoUpload.setSynStatus(synStatus);
+					tradeNewForOldStockBarcodeInfoUpload.setSynErrMsg(e1.getMessage().length() > 100 ? e1.getMessage().substring(0, 99) : e1.getMessage());
+					errMsg = tradeNewForOldStockBarcodeInfoUpload.getSynErrMsg();
+					tradeNewForOldStockBarcodeInfoUpload.setSynTime(new Date());
+					tradeNewForOldStockBarcodeInfoUpload.setSynTimes( Objects.isNull(tradeNewForOldStockBarcodeInfoUpload.getSynTimes()) ? 1 : tradeNewForOldStockBarcodeInfoUpload.getSynTimes() + 1 );
+				}
+				continue;
+			}
+			Map<String, Object> param = new HashMap<>();
+			param.put("taskNo", entry.getKey());
+			param.put("infos", infos);
+			// 条码数据同步
+			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) {
+						tradeNewForOldStockBarcodeInfoUpload.setSynStatus(Constant.SynStatus.SYN.getCode());
+						tradeNewForOldStockBarcodeInfoUpload.setSynTime(new Date());
+						tradeNewForOldStockBarcodeInfoUpload.setSynTimes( Objects.isNull(tradeNewForOldStockBarcodeInfoUpload.getSynTimes()) ? 1 : tradeNewForOldStockBarcodeInfoUpload.getSynTimes() + 1 );
+					}
+				}else {
+					synStatus = Constant.SynStatus.FAIL.getCode();
+					for( ItfTblRecycleStockBarcodeInfoUpload tradeNewForOldStockBarcodeInfoUpload : barcodeInfoUploads) {
+						tradeNewForOldStockBarcodeInfoUpload.setSynStatus(synStatus);
+						tradeNewForOldStockBarcodeInfoUpload.setSynErrMsg(response.getMsg());
+						errMsg = tradeNewForOldStockBarcodeInfoUpload.getSynErrMsg();
+						tradeNewForOldStockBarcodeInfoUpload.setSynTime(new Date());
+						tradeNewForOldStockBarcodeInfoUpload.setSynTimes( Objects.isNull(tradeNewForOldStockBarcodeInfoUpload.getSynTimes()) ? 1 : tradeNewForOldStockBarcodeInfoUpload.getSynTimes() + 1 );
+						pgguid = tradeNewForOldStockBarcodeInfoUpload.getPgguid();
+					}
+				}
+			}catch(Exception e) {
+				e.printStackTrace();
+				synStatus = Constant.SynStatus.FAIL.getCode();
+				for( ItfTblRecycleStockBarcodeInfoUpload tradeNewForOldStockBarcodeInfoUpload : barcodeInfoUploads) {
+					tradeNewForOldStockBarcodeInfoUpload.setSynStatus(GreeSynStatusEnum.FAIL.getCode());
+					tradeNewForOldStockBarcodeInfoUpload.setSynErrMsg(e.getMessage().length() > 100 ? e.getMessage().substring(0, 99) : e.getMessage());
+					errMsg = tradeNewForOldStockBarcodeInfoUpload.getSynErrMsg();
+					tradeNewForOldStockBarcodeInfoUpload.setSynTime(new Date());
+					tradeNewForOldStockBarcodeInfoUpload.setSynTimes( Objects.isNull(tradeNewForOldStockBarcodeInfoUpload.getSynTimes()) ? 1 : tradeNewForOldStockBarcodeInfoUpload.getSynTimes() + 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) ) {
+				continue;
+			}
+			//按synReqId顺序更新
+			ItfTblTradeNewForOldStockInfoUploadTask tradeNewForOldStockInfoUploadTask = tradeNewForOldStockInfoUploadTaskList.get(0);
+			if( synStatus == Constant.SynStatus.SYN.getCode()) {
+				tradeNewForOldStockInfoUploadTask.setSynStatus(synStatus);
+				tradeNewForOldStockInfoUploadTask.setSynTime(new Date());
+			}else {
+				if( (Objects.isNull(tradeNewForOldStockInfoUploadTask.getSynTimes()) ? 0 : tradeNewForOldStockInfoUploadTask.getSynTimes()) >= 6 ) {
+					tradeNewForOldStockInfoUploadTask.setSynStatus(synStatus);
+					tradeNewForOldStockInfoUploadTask.setSynErrMsg(errMsg);
+					tradeNewForOldStockInfoUploadTask.setSynTime(new Date());
+				}else {
+					//请求失败，累加请求次数
+					tradeNewForOldStockInfoUploadTask.setSynTimes((Objects.isNull(tradeNewForOldStockInfoUploadTask.getSynTimes()) ? 0 : tradeNewForOldStockInfoUploadTask.getSynTimes()) + 1);
+				}
+			}
+			stockInfoUploadTaskList.add(tradeNewForOldStockInfoUploadTask);
+		}
+		// 更新以旧换新条码信息上传任务表同步状态
+		if(!Collections.isEmpty(stockInfoUploadTaskList)) {
+			itfTblTradeNewForOldStockInfoUploadTaskService.saveOrUpdateBatch(stockInfoUploadTaskList);
+		}
+		// 更新条码信息上传表同步状态
+		if(!Collections.isEmpty(barcodeInfoUploads)) {
+			barcodeInfoUploadService.saveOrUpdateBatch(barcodeInfoUploads);
+		}
+	}
+
 }

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

@@ -76,6 +76,8 @@ public class Constant {
         public final static String RECYCLE_ASSIGN_DETAIL = "/outapp/recycle/assignDetail";
         //批量新增待入库单
         public final static String RECYCLE_STOCK_STOCKINFOS = "/outapp/recycle/stock/stockInfos";
+        //批量新增待入库单(与回收工单共用同一个接口)
+        public final static String TRADE_NEW_FOR_OLD_STOCK_STOCKINFOS = "/outapp/recycle/stock/stockInfos";
     }
 
     @Getter

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

@@ -28,7 +28,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 /**
- * 格力品牌网点基础资料下载
+ * 格力品牌网点基础资料下载(销售与售后)
  */
 @Slf4j
 @Component

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

@@ -26,7 +26,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 /**
- * 格力品牌网点维修工基础资料下载
+ * 格力品牌网点维修工基础资料下载（销售与售后网点维修工）
  */
 @Slf4j
 @Component

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

@@ -6,14 +6,10 @@ import com.alibaba.fastjson.JSONObject;
 import com.zfire.jiasm.syncdata.constant.DictTypeEnum;
 import com.zfire.jiasm.syncdata.constant.InterFaceTypeEnum;
 import com.zfire.jiasm.syncdata.data.Token;
-import com.zfire.jiasm.syncdata.plus.entity.Brand;
-import com.zfire.jiasm.syncdata.plus.entity.ItfTblAssignGzdmDowload;
-import com.zfire.jiasm.syncdata.plus.entity.RepairBug;
-import com.zfire.jiasm.syncdata.plus.entity.SysDict;
-import com.zfire.jiasm.syncdata.plus.service.BrandService;
-import com.zfire.jiasm.syncdata.plus.service.ItfTblAssignGzdmDowloadService;
-import com.zfire.jiasm.syncdata.plus.service.RepairBugService;
-import com.zfire.jiasm.syncdata.plus.service.SysDictService;
+import com.zfire.jiasm.syncdata.plus.entity.*;
+import com.zfire.jiasm.syncdata.plus.service.*;
+import com.zfire.jiasm.syncdata.service.MasterDownloadService;
+import com.zfire.jiasm.syncdata.utils.DataUtil;
 import com.zfire.jiasm.syncdata.utils.HttpUtil;
 import com.zfire.jiasm.syncdata.utils.JSONResult;
 import com.zfire.jiasm.syncdata.utils.TokenCenter;
@@ -38,6 +34,8 @@ import java.util.stream.Collectors;
 public class GLPPGuZhandDaiMa {
     @Value("${baseurl}")
     private String baseurl = "";
+    @Value("${masterbaseurl}")
+    private String masterbaseurl = "";
 
     @Resource
     TokenCenter tokenCenter;
@@ -49,6 +47,10 @@ public class GLPPGuZhandDaiMa {
     SysDictService sysDictService;
     @Resource
     RepairBugService repairBugService;
+    @Resource
+    MasterDownloadService downloadService;
+    @Resource
+    ItfGreeToFaDownloadTaskService itfGreeToFaDownloadTaskService;
 
 
 
@@ -107,6 +109,84 @@ public class GLPPGuZhandDaiMa {
         }
     }
 
+    @Scheduled(fixedRateString = "${MasterDownload_Rate}")
+    private void process() {
+        try {
+            Token token = tokenCenter.getCurrentToken();
+            List<ItfGreeToFaDownloadTask> recs = new ArrayList<>();
+            recs = itfGreeToFaDownloadTaskService.lambdaQuery()
+                    .eq(ItfGreeToFaDownloadTask::getNeedDownload,1)
+                    .orderByAsc(ItfGreeToFaDownloadTask::getId).list();
+
+            for (ItfGreeToFaDownloadTask item : recs) {
+                int reqId =item.getId();
+                log.info("开始基础资料下载任务["+reqId+"]");
+                try {
+                    int downloadTaskType =item.getDownloadTaskType();
+                    String srcTabNames =item.getSrcTabName();
+                    String srcTabColLists =item.getSrcTabColList();
+                    String destTabNames =item.getDestTabName();
+                    String destTabColLists =item.getDestTabColList();
+                    String afterProcName =item.getAftrProcName();
+                    String belongCompany=item.getBelongCompany();
+
+                    String[] arySrcTabName = srcTabNames.split("\\Q|\\E");
+                    String[] arySrcTabColList = srcTabColLists.split("\\Q|\\E");
+                    String[] aryDestTabName = destTabNames.split("\\Q|\\E");
+                    String[] aryDestTabColList = destTabColLists.split("\\Q|\\E");
+
+                    batchDownload(token, arySrcTabName, downloadTaskType, arySrcTabColList, aryDestTabName,
+                            aryDestTabColList, afterProcName,belongCompany,reqId);
+                    log.info("结束基础资料下载任务["+reqId+"]");
+                } catch (Exception ex) {
+                    log.error("执行基础资料下载任务[" + reqId + "]发生错误:"+ex.getMessage());
+                }
+
+            }
+        } catch (Exception ex) {
+            log.error("ִ执行基础资料下载发生错误", ex);
+        }
+
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void batchDownload(Token token, String[] arySrcTabName, int downloadTaskType, String[] arySrcTabColList,
+                              String[] aryDestTabName, String[] aryDestTabColList, String afterProcName,
+                              String belongCompany,int reqId) throws Exception {
+
+        String synTaskNo = UUID.randomUUID().toString();
+
+        for (int i = 0; i < arySrcTabName.length; i++) {
+            String srcTabName = arySrcTabName[i].trim();
+            String serviceName = DataUtil.fromDbName2ServiceName(srcTabName);
+            String url = masterbaseurl + serviceName + "/querylist";
+            Map<String, String> paramMap = new HashMap<String, String>();
+            if(belongCompany!=null && belongCompany.trim().length()>0) {
+                paramMap.put("belongCompany", belongCompany);
+            }
+            String paramJson=JSON.toJSONString(paramMap);
+            log.info("url[" + url + "],send[" + paramJson + "]");
+            JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
+            JSONArray jsonArray = (JSONArray) jsonResult.getData();
+            if (jsonArray != null) {
+                log.info("["+url+"]下载了["+jsonArray.size()+"]条数据");
+                downloadService.insertData(arySrcTabColList[i], aryDestTabName[i], aryDestTabColList[i], synTaskNo,
+                        jsonArray);
+                log.info("["+url+"]插入了["+jsonArray.size()+"]条数据");
+            }else {
+                log.info("["+url+"]无数据");
+            }
+        }
+
+        ItfGreeToFaDownloadTask up = new ItfGreeToFaDownloadTask();
+        up.setId(reqId);
+        up.setNeedDownload(0);
+        up.setLastDownloadTime(new Date());
+
+        itfGreeToFaDownloadTaskService.updateById(up);
+        // downloadService.finish(downloadTaskType, afterProcName, synTaskNo,belongCompany);
+    }
+
     private void extractedGZDMLocalAddOrUpdate(Brand brandRec, List<ItfTblAssignGzdmDowload> addRec, List<ItfTblAssignGzdmDowload> updateRec) {
         List<RepairBug> addRepairBug = new ArrayList<>();
         List<RepairBug> updateRepairBug = new ArrayList<>();

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

@@ -24,7 +24,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 /**
- * 格力品牌类别系列基础资料下载
+ * 格力品牌类别系列基础资料下载（大类、小类、系列、机型）
  */
 @Slf4j
 @Component

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

@@ -23,7 +23,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 /**
- * 格力品牌 信息类别 - 需求类别基础资料下载
+ * 格力品牌 需求类别 - 需求类别基础资料下载（需求大类、需求小类）
  */
 @Slf4j
 @Component

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

@@ -23,7 +23,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 /**
- * 格力品牌用户属性、信息渠道 基础资料下载
+ * 格力品牌用户属性、信息渠道 基础资料下载（用户属性、用户等级、信息渠道、信息来源）
  */
 @Slf4j
 @Component

src/main/java/com/zfire/jiasm/syncdata/download/basedata/说明文档.txt

@@ -4,3 +4,21 @@ SELECT * FROM itf_gree_to_fa_syn_rule order by id 定时同步
 
 // 可配置一次 同步
  select * from itf_gree_to_fa_download_task where src_tab_name like '%tbl_az_assign_xslx%';
+
+
+
+-- 维修－产品故障基表下载记录
+select * from itf_tbl_wx_cpgz_download;
+-- 故障代码与维修项目基础表下载记录
+select * from  itf_tbl_wx_gzdm_wxxmjc_download;
+-- 晶弘冰箱故障代码基础表下载记录
+select * from itf_jh_azd_cause_sort_new_download;
+-- 晶弘冰箱维修项目基础表下载记录
+select * from itf_jh_azd_cause_atter_download;
+-- 小家电故障现象基础表下载记录
+select * from itf_tbl_wx_cpgz_xjd_download;
+-- 小家电维修项目基础表下载记录
+select * from itf_tbl_wx_wxxm_xjd_download;
+-- 维修－维修项目基础表下载记录
+select * from itf_tbl_wx_wxxmjc_download;
+

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

@@ -7,7 +7,7 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 /**
- * 以旧换新-单独上传鉴定+附件数据
+ * 以旧换新-获取所有驳回的鉴定单 + 修改鉴定单状态为驳回状态
  */
 @Slf4j
 @Component

src/main/java/com/zfire/jiasm/syncdata/download/order/数据下载.txt

@@ -49,4 +49,6 @@ and a.download_status=0 and (download_times is null or download_times<=5) order
    服务商销售网点不会存在存在多个的情况
 
 
-一个批次多单 相同单相同任务号，
+一个批次多单 相同单相同任务号，
+############################ 以旧换新 ###########################
+旧机信息表，鉴定单表

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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @Controller
 @RequestMapping("/plus/company-record-manage")

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

@@ -7,11 +7,11 @@ import org.springframework.stereotype.Controller;
 
 /**
  * <p>
- *  前端控制器
+ * 合同模版 前端控制器
  * </p>
  *
  * @author gejiang
- * @since 2023-06-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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 2022-12-26
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-12
+ * @since 2023-06-17
  */
 @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-06-12
+ * @since 2023-06-17
  */
 @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-06-12
+ * @since 2023-06-17
  */
 @Controller
 @RequestMapping("/plus/sys-dict")

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-12
+ * @since 2023-06-17
  */
 @Controller
 @RequestMapping("/plus/websit-main-info-change-data")

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

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-12
+ * @since 2023-06-17
  */
 @Controller
 @RequestMapping("/plus/websit-main-info-change")