add

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

@@ -17,6 +17,8 @@ public class OrderAddBeanDTO {
     private String id;
     //操作标记 1=临时保存,2=下派工单   不能为空
     private Integer operatorFlag;
+    // 操作标记: 0=临时保存 1=下派服务单，2=下派网点，3=下派师傅)
+    private Integer flag;
     //客户名称  不能为空
     private String userName;
     //联系人  不能为空

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

@@ -1,10 +1,12 @@
 package com.zfire.jiasm.syncdata.base;
 
+import com.zfire.jiasm.syncdata.constant.RedisConstant;
 import com.zfire.jiasm.syncdata.plus.entity.Brand;
 import com.zfire.jiasm.syncdata.plus.service.BrandService;
 import com.zfire.jiasm.syncdata.plus.service.BrandWebsitService;
 import com.zfire.jiasm.syncdata.plus.service.CustomerInformationWebsitService;
 import com.zfire.jiasm.syncdata.plus.service.WebsitOrderSignService;
+import com.zfire.jiasm.syncdata.utils.RedisUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -28,14 +30,27 @@ import java.util.*;
 public class BaseService {
     @Resource
     BrandService brandService;
+    @Resource
+    RedisUtil redis;
 
 
 
      public Brand getBrand() {
-        Brand brand = brandService.lambdaQuery().eq(Brand::getBrand,"格力")
-                .last("limit 1")
-                .one();
-        return brand;
+         Brand brand = new Brand();
+         String gree = "格力";
+
+         if (redis.hasKey(RedisConstant.BRAND_CODE + gree)) {
+             brand = (Brand) redis.get(RedisConstant.BRAND_CODE + gree);
+         } else {
+             brand = brandService.lambdaQuery().eq(Brand::getBrand,gree)
+                     .last("limit 1")
+                     .one();
+             if (brand != null){
+                 redis.set(RedisConstant.BRAND_CODE + gree, brand,RedisConstant.BRAND_CODE_TIME_LENGTH);
+             }
+         }
+
+         return brand;
     }
 
     public void saveToFile(String desUrl,String id){

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

@@ -0,0 +1,37 @@
+package com.zfire.jiasm.syncdata.constant;
+
+import lombok.Getter;
+
+/**
+ * @author yaozx
+ * @version 1.0
+ * @description 所有使用Redis的常量定义在这里面
+ * @date 2022-10-01
+ */
+@Getter
+public class RedisConstant {
+    public static final Long BRAND_CODE_TIME_LENGTH = 1 * 60 *60 *1000L;
+
+    public static final Long ADDRES_TIME_LENGTH = 1 * 60 *60 *1000L;
+
+
+
+    public static final String GREE = "GREE:";
+    public static final String ADDRE = "ADDRE:";
+
+
+
+    // 格力品牌
+    public static final String BRAND_CODE = GREE + "CODE:";
+
+    // 省信息
+    public static final String PROVINCE_ADDRE = ADDRE + "PROVINCE:";
+
+    // 市信息
+    public static final String CITY_ADDRE = ADDRE + "CITY:";
+
+
+
+
+
+}

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

@@ -76,7 +76,7 @@ public class InstallBusinessApi {
         // 提取待落本地表的数据
         lcls = itfTblAzAssignLcLsDownloadService.lambdaQuery()
                 .eq(ItfTblAzAssignLcLsDownload::getSynStatus, SynStatusEnum.UN_SYN.getCode())
-                // .eq(ItfTblAzAssignLcLsDownload::getSynReqId,4049)// 测试使用
+                // .eq(ItfTblAzAssignLcLsDownload::getSynReqId,4051)// 测试使用
                 .orderByAsc(ItfTblAzAssignLcLsDownload::getSynReqId)
                 .list();
 

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

@@ -632,6 +632,7 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
         createOrder.getOrderCleanItems().addAll(orderCleanItems);
         createOrder.getOrderProductList().addAll(orderProductList);
         createOrder.setOperatorFlag(2);
+        createOrder.setFlag(1);
         if (orderWorker !=null){
             List<String> workerIds = new ArrayList<>();
             workerIds.add(orderWorker.getWorkerId());

src/main/java/com/zfire/jiasm/syncdata/service/impl/AddRepairBusinessServiceImpl.java

@@ -493,6 +493,7 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService {
         createOrder.getOrderCleanItems().addAll(orderCleanItems);
         createOrder.getOrderProductList().addAll(orderProductList);
         createOrder.setOperatorFlag(2);
+        createOrder.setFlag(1);
         if (orderWorker !=null){
             List<String> workerIds = new ArrayList<>();
             workerIds.add(orderWorker.getWorkerId());

src/main/java/com/zfire/jiasm/syncdata/service/impl/BaseDownServiceImpl.java

@@ -2,6 +2,7 @@ package com.zfire.jiasm.syncdata.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
+import com.zfire.jiasm.syncdata.base.BaseService;
 import com.zfire.jiasm.syncdata.constant.InterFaceTypeEnum;
 import com.zfire.jiasm.syncdata.constant.TaskConfigEnum;
 import com.zfire.jiasm.syncdata.data.Token;
@@ -71,6 +72,8 @@ public class BaseDownServiceImpl implements BaseDownService {
     CityService cityService;
     @Resource
     ProvinceService provinceService;
+    @Resource
+    BaseService baseService;
 
 
 
@@ -249,7 +252,7 @@ public class BaseDownServiceImpl implements BaseDownService {
         log.info("开始下载格力品牌需求类别信息: \uF0B7{}",sdf.format(new Date()));
 
         // 提取品牌信息
-        Brand brandRec = brandService.lambdaQuery().eq(Brand::getBrand,"格力").one();
+        Brand brandRec = baseService.getBrand();
         if (brandRec == null){
             log.info("格力品牌信息不存在【brand】");
             return;
@@ -390,7 +393,7 @@ public class BaseDownServiceImpl implements BaseDownService {
         log.info("开始下载格力品牌固障代码信息: \uF0B7{}",sdf.format(new Date()));
 
         // 提取品牌信息
-        Brand brandRec = brandService.lambdaQuery().eq(Brand::getBrand,"格力").one();
+        Brand brandRec = baseService.getBrand();
         if (brandRec == null){
             log.info("格力品牌信息不存在【brand】");
             return;
@@ -482,12 +485,9 @@ public class BaseDownServiceImpl implements BaseDownService {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Map<String, String> paramMap = new HashMap<String, String>();
         List<String> req = new ArrayList<>();
-        String brands="格力";
 
         // 提取品牌信息
-        Brand record = brandService.lambdaQuery()
-                .eq(Brand::getBrand,brands).one();
-
+        Brand record = baseService.getBrand();
         if (record == null){
             log.info("格力品牌信息不存在【brand】");
             return;

src/main/java/com/zfire/jiasm/syncdata/service/impl/GLPPLeiBieServiceImpl.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.zfire.jiasm.syncdata.base.BaseService;
 import com.zfire.jiasm.syncdata.constant.DictTypeEnum;
 import com.zfire.jiasm.syncdata.constant.ServiceCategoryEnum;
 import com.zfire.jiasm.syncdata.plus.entity.*;
@@ -34,9 +35,9 @@ public class GLPPLeiBieServiceImpl implements GLPPLeiBieService {
     @Resource
     SysDictRefService sysDictRefService;
     @Resource
-    BrandService brandService;
-    @Resource
     ProductService productService;
+    @Resource
+    BaseService baseService;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -45,9 +46,7 @@ public class GLPPLeiBieServiceImpl implements GLPPLeiBieService {
         List<ItfTblSplbDaleiDownload> updateRec = new ArrayList<>();
 
         // 提取品牌信息
-        Brand brandRec = brandService.lambdaQuery().eq(Brand::getBrand,"格力")
-                .last("limit 1")
-                .one();
+        Brand brandRec = baseService.getBrand();
         if (brandRec == null){
             log.info("格力品牌信息不存在【brand】");
             return;
@@ -74,9 +73,7 @@ public class GLPPLeiBieServiceImpl implements GLPPLeiBieService {
         List<ItfTblSplbXiaoleiDownload> updateRec = new ArrayList<>();
 
         // 提取品牌信息
-        Brand brandRec = brandService.lambdaQuery().eq(Brand::getBrand,"格力")
-                .last("limit 1")
-                .one();
+        Brand brandRec = baseService.getBrand();
         if (brandRec == null){
             log.info("格力品牌信息不存在【brand】");
             return;
@@ -103,9 +100,7 @@ public class GLPPLeiBieServiceImpl implements GLPPLeiBieService {
         List<ItfTblSplbXilieDownload> updateRec = new ArrayList<>();
 
         // 提取品牌信息
-        Brand brandRec = brandService.lambdaQuery().eq(Brand::getBrand,"格力")
-                .last("limit 1")
-                .one();
+        Brand brandRec = baseService.getBrand();
         if (brandRec == null){
             log.info("格力品牌信息不存在【brand】");
             return;
@@ -133,9 +128,7 @@ public class GLPPLeiBieServiceImpl implements GLPPLeiBieService {
         List<ItfTblSplbJixinDownload> updateRec = new ArrayList<>();
 
         // 提取品牌信息
-        Brand brandRec = brandService.lambdaQuery().eq(Brand::getBrand,"格力")
-                .last("limit 1")
-                .one();
+        Brand brandRec = baseService.getBrand();
         if (brandRec == null){
             log.info("格力品牌信息不存在【brand】");
             return;

src/main/java/com/zfire/jiasm/syncdata/service/impl/MasterDownloadServiceImpl.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.zfire.jiasm.syncdata.base.BaseService;
 import com.zfire.jiasm.syncdata.constant.DictTypeEnum;
 import com.zfire.jiasm.syncdata.data.Token;
 import com.zfire.jiasm.syncdata.plus.entity.*;
@@ -59,7 +60,7 @@ public class MasterDownloadServiceImpl implements MasterDownloadService {
 	@Resource
 	ItfGreeToFaSynTaskListService itfGreeToFaSynTaskListService;
 	@Resource
-	BrandService brandService;
+	BaseService baseService;
 
 
 	/**
@@ -152,7 +153,7 @@ public class MasterDownloadServiceImpl implements MasterDownloadService {
 	@Transactional(rollbackFor = Exception.class)
 	public void masterProcessData(String synTaskNo,Integer id) {
 		// 提取品牌信息
-		Brand brandRec = brandService.lambdaQuery().eq(Brand::getBrand,"格力").one();
+		Brand brandRec = baseService.getBrand();
 		if (brandRec == null){
 			log.info("格力品牌信息不存在【brand】");
 			return;

src/main/java/com/zfire/jiasm/syncdata/service/impl/OtherDownServiceImpl.java

@@ -2,6 +2,7 @@ package com.zfire.jiasm.syncdata.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.zfire.jiasm.syncdata.base.BaseService;
 import com.zfire.jiasm.syncdata.constant.DictTypeEnum;
 import com.zfire.jiasm.syncdata.gree.GreeLogic;
 import com.zfire.jiasm.syncdata.helper.GreeResponseHelperOther;
@@ -56,7 +57,7 @@ public class OtherDownServiceImpl implements OtherDownService {
     @Resource
     TableDataQueryTimeService tableDataQueryTimeService;
     @Resource
-    BrandService brandService;
+    BaseService baseService;
     @Resource
     SysDictRefService sysDictRefService;
     @Resource
@@ -157,9 +158,7 @@ public class OtherDownServiceImpl implements OtherDownService {
         int oldtotal=0;
         List<NotificationDownload> ads = new ArrayList<>();
         Date synTime = new Date();
-        Brand brand = brandService.lambdaQuery().eq(Brand::getBrand,"格力")
-                .last("limit 1")
-                .one();
+        Brand brand = baseService.getBrand();
 
         // 提取商品大类
         List<SysDictRef> sysDictRef =  sysDictRefService.lambdaQuery()

src/main/java/com/zfire/jiasm/syncdata/service/impl/PublicServiceImpl.java

@@ -5,17 +5,14 @@ import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.zfire.jiasm.syncdata.constant.Constant;
-import com.zfire.jiasm.syncdata.constant.DictTypeEnum;
-import com.zfire.jiasm.syncdata.constant.InterFaceTypeEnum;
-import com.zfire.jiasm.syncdata.constant.OrderTypeEnum;
+import com.zfire.jiasm.syncdata.base.BaseService;
+import com.zfire.jiasm.syncdata.constant.*;
 import com.zfire.jiasm.syncdata.dao.mapper.OJTGUploadTaskListMapper;
 import com.zfire.jiasm.syncdata.parameter.InstallUpdatePar;
 import com.zfire.jiasm.syncdata.plus.entity.*;
 import com.zfire.jiasm.syncdata.plus.service.*;
 import com.zfire.jiasm.syncdata.response.*;
 import com.zfire.jiasm.syncdata.service.PublicService;
-import com.zfire.jiasm.syncdata.test;
 import com.zfire.jiasm.syncdata.utils.MyBeanUtils;
 import com.zfire.jiasm.syncdata.utils.RedisUtil;
 import com.zfire.jiasm.syncdata.utils.ResponseHelper;
@@ -64,7 +61,7 @@ public class PublicServiceImpl implements PublicService {
     @Resource
     WebsitServiceCategoryDetailService websitServiceCategoryDetailService;
     @Resource
-    BrandService brandService;
+    BaseService baseService;
     @Resource
     ItfMessagehuifangentityService itfMessagehuifangentityService;
     @Resource
@@ -501,15 +498,14 @@ public class PublicServiceImpl implements PublicService {
     @Override
     public WebsitSH merchantWebsitInfoX(String websitNo,String type){
         WebsitSH resultData = new WebsitSH();
-        // 提取格力集团信息
-        Brand brandRec = brandService.lambdaQuery().eq(Brand::getBrand,"格力")
-                .last("limit 1")
-                .one();
 
         if (StringUtils.isEmpty(websitNo)){
             return resultData;
         }
 
+        // 提取格力集团信息
+        Brand brandRec = baseService.getBrand();
+
         BrandWebsit brandWebsit = brandWebsitService.lambdaQuery()
                 .eq(BrandWebsit::getGroupCompanyId,brandRec.getBrandId())
                 .eq(BrandWebsit::getType,type)
@@ -1276,25 +1272,36 @@ public class PublicServiceImpl implements PublicService {
 
     // 1省，2市，3区，4街道
     private Integer getLbsAmap(OrderBase orderBase){
+        LbsAmap lbsAmap = new LbsAmap();
         // 先查 lbs_amap表
-        LbsAmap lbsAmap = lbsAmapService.lambdaQuery()
-                .eq(LbsAmap::getName,orderBase.getProvince())
-                .eq(LbsAmap::getLevel,"province")
-                .last("limit 1").one();
-        if (lbsAmap == null){
-            return 0;
+        if (redis.hasKey(RedisConstant.PROVINCE_ADDRE+orderBase.getProvince())){
+            lbsAmap = (LbsAmap) redis.get(RedisConstant.PROVINCE_ADDRE+orderBase.getProvince());
+        } else {
+            lbsAmap = lbsAmapService.lambdaQuery()
+                    .eq(LbsAmap::getName,orderBase.getProvince())
+                    .eq(LbsAmap::getLevel,"province")
+                    .last("limit 1").one();
+            if (lbsAmap == null){
+                return 0;
+            }
+            redis.set(RedisConstant.PROVINCE_ADDRE + orderBase.getProvince(), lbsAmap,RedisConstant.ADDRES_TIME_LENGTH);
         }
         //省
         orderBase.setProvinceId(lbsAmap.getProvinceId());
         orderBase.setProvince(lbsAmap.getProvinceName());
 
-        lbsAmap = lbsAmapService.lambdaQuery()
-                .eq(LbsAmap::getProvinceId,lbsAmap.getProvinceId())
-                .eq(LbsAmap::getName,orderBase.getCity())
-                .eq(LbsAmap::getLevel,"city")
-                .last("limit 1").one();
-        if (lbsAmap == null){
-            return 1;
+        if (redis.hasKey(RedisConstant.CITY_ADDRE+lbsAmap.getProvinceId()+orderBase.getCity())){
+            lbsAmap = (LbsAmap) redis.get(RedisConstant.CITY_ADDRE+lbsAmap.getProvinceId()+orderBase.getCity());
+        } else {
+            lbsAmap = lbsAmapService.lambdaQuery()
+                    .eq(LbsAmap::getProvinceId,lbsAmap.getProvinceId())
+                    .eq(LbsAmap::getName,orderBase.getCity())
+                    .eq(LbsAmap::getLevel,"city")
+                    .last("limit 1").one();
+            if (lbsAmap == null){
+                return 1;
+            }
+            redis.set(RedisConstant.CITY_ADDRE+lbsAmap.getProvinceId()+orderBase.getCity(), lbsAmap,RedisConstant.ADDRES_TIME_LENGTH);
         }
         //市
         orderBase.setCityId(lbsAmap.getCityId());