add

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

@@ -16,10 +16,7 @@ import java.net.HttpURLConnection;
 import java.net.URL;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Locale;
-import java.util.TimeZone;
+import java.util.*;
 
 /**
  * 基础服务实现类
@@ -35,9 +32,8 @@ public class BaseService {
 
 
      public Brand getBrand() {
-         String brands="格力";
-        Brand brand = brandService.lambdaQuery().eq(Brand::getBrand,brands).one();
-        return brand;
+        List<Brand> brands = brandService.lambdaQuery().eq(Brand::getBrand,"格力").list();
+        return brands.get(0);
     }
 
     public void saveToFile(String desUrl,String id){

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

@@ -138,7 +138,9 @@ public class OldForNewUploadLogic {
 				if( !Objects.isNull(jddMap) && jddMap.containsKey(Integer.parseInt(toGreeUpload.getId()))) {
 					// 提取工单数据 目的看工单大类数据
 					OrderBase orderBase = orderBaseService.lambdaQuery()
-							.eq(OrderBase::getId,toGreeUpload.getOrderNo()).one();
+							.eq(OrderBase::getId,toGreeUpload.getOrderNo())
+							.last("limit 1")
+							.one();
 
 					for(YjhxAppraise jdd : jddList) {
 						// 取工单对应的鉴定单
@@ -895,7 +897,9 @@ public class OldForNewUploadLogic {
 			//一个pgguid只对应一条YjhxJdd数据
 			YjhxAppraise yjhxJdd = yjhxJddList.get(0);
 			OrderBase order = orderBaseService.lambdaQuery()
-					.eq(OrderBase::getPgguid, yjhxJdd.getPgguid()).one();
+					.eq(OrderBase::getPgguid, yjhxJdd.getPgguid())
+					.last("limit 1")
+					.one();
 			if(Objects.isNull(order)) {
 				item.setSynStatus(Constant.SynStatus.FAIL.getCode());
 				item.setSynErrMsg("没有工单数据, pgguid="+item.getPgguid());

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

@@ -73,7 +73,7 @@ public class MasterDownloadTask {
 
             List<ItfGreeToFaSynTaskList> recs =  itfGreeToFaSynTaskListService.lambdaQuery()
                     .eq(ItfGreeToFaSynTaskList::getSynTaskType,9002)
-                    .eq(ItfGreeToFaSynTaskList::getSynStatus,SynStatusEnum.UN_SYN.getCode()).list();
+                    .eq(ItfGreeToFaSynTaskList::getSynStatus,0).list();
 
             // 数据落本地表
             for (ItfGreeToFaSynTaskList item : recs) {

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

@@ -84,7 +84,7 @@ public class RepairBusinessApi {
 
         // 提取待落本地表的数据
         repairRec = itfTblAssignDownloadService.lambdaQuery()
-                .eq(ItfTblAssignDownload::getSynStatus, SynStatusEnum.UN_SYN.getCode())
+                .eq(ItfTblAssignDownload::getSynStatus, 0)
                 .orderByAsc(ItfTblAssignDownload::getSynReqId)
                 .list();
 

src/main/java/com/zfire/jiasm/syncdata/sendmessage/SendMessage.java

@@ -87,7 +87,9 @@ public class SendMessage {
         up.updateById();
         // 工单的发送时间同步
         SmsRecord record = smsRecordService.lambdaQuery()
-                .eq(SmsRecord::getId,item.getSynTaskNo()).one();
+                .eq(SmsRecord::getId,item.getSynTaskNo())
+                .last("limit 1")
+                .one();
         if (record !=null){
             record.setSendTime(new Date());
             record.updateById();

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

@@ -138,7 +138,9 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService {
 
         OrderBase order = orderBaseService.lambdaQuery()
                 .eq(OrderBase::getPgid, item.getPgid())
-                .eq(OrderBase::getOrderType, OrderTypeEnum.ORDER_TYPE_REPAIR.getCode()).one();
+                .eq(OrderBase::getOrderType, OrderTypeEnum.ORDER_TYPE_REPAIR.getCode())
+                .last("limit 1")
+                .one();
 
         // 工单师傅信息更新
         upOrderWorker(order);
@@ -236,7 +238,9 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService {
 
         OrderBase order = orderBaseService.lambdaQuery()
                 .eq(OrderBase::getPgid, item.getPgid())
-                .eq(OrderBase::getOrderType, OrderTypeEnum.ORDER_TYPE_REPAIR.getCode()).one();
+                .eq(OrderBase::getOrderType, OrderTypeEnum.ORDER_TYPE_REPAIR.getCode())
+                .last("limit 1")
+                .one();
         orderStatus = order.getOrderStatus();
 
         // TL_SynDataFrom_tbl_assign_batch
@@ -530,7 +534,9 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService {
         // 提取基础表数据
         OrderBase oldOrder = orderBaseService.lambdaQuery()
                 .eq(OrderBase::getPgid, item.getPgid())
-                .eq(OrderBase::getOrderType, OrderTypeEnum.ORDER_TYPE_REPAIR.getCode()).one();
+                .eq(OrderBase::getOrderType, OrderTypeEnum.ORDER_TYPE_REPAIR.getCode())
+                .last("limit 1")
+                .one();
         orderStatus = oldOrder.getOrderStatus();
         cjDowFlag = oldOrder.getOutCjDownloadFlag();
         // 批量关闭的工单 同步下载无需再修改
@@ -1180,7 +1186,9 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService {
 
         OrderInformation old = orderInformationService.lambdaQuery()
                 .eq(OrderInformation::getOrderBaseId,order.getId())
-                .eq(OrderInformation::getXzid,yd.getXzid()).one();
+                .eq(OrderInformation::getXzid,yd.getXzid())
+                .last("limit 1")
+                .one();
 
         up.setId(old.getId());
         up.setXzid(yd.getXzid());
@@ -1244,6 +1252,7 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService {
         OrderAppraise oaOne = orderAppraiseService.lambdaQuery()
                 .eq(OrderAppraise::getOrderBaseId,order.getId())
                 .eq(OrderAppraise::getType,0)
+                .last("limit 1")
                 .one();
         if (oaOne !=null){
             jcaninsert=0;
@@ -1252,7 +1261,9 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService {
 
         // 提取差评申诉信息
         OrderAppeal oldcpss = orderAppealService.lambdaQuery()
-                .eq(OrderAppeal::getOrderBaseId,order.getId()).one();
+                .eq(OrderAppeal::getOrderBaseId,order.getId())
+                .last("limit 1")
+                .one();
 
 
         List<ItfTblAssignSatisfactionDownload> satis = itfTblAssignSatisfactionDownloadService.lambdaQuery()
@@ -1382,7 +1393,9 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService {
 
         // 提取差评申诉信息
         OrderAppeal oldcpss = orderAppealService.lambdaQuery()
-                .eq(OrderAppeal::getOrderBaseId,orderBase.getId()).one();
+                .eq(OrderAppeal::getOrderBaseId,orderBase.getId())
+                .last("limit 1")
+                .one();
 
         for (ItfTblAssignSatisfactionDownload s:satis){
             jcaninsert=1;
@@ -1407,7 +1420,9 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService {
                 OrderAppraise oldoatt = orderAppraiseService.lambdaQuery()
                         .eq(OrderAppraise::getOrderBaseId,orderBase.getId())
                         .eq(OrderAppraise::getPid,s.getId())
-                        .eq(OrderAppraise::getType,1).one();
+                        .eq(OrderAppraise::getType,1)
+                        .last("limit 1")
+                        .one();
                 if (oldoatt !=null){
                     jcaninsert=0;
                 }
@@ -1665,7 +1680,9 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService {
                 .eq(ItfTblAssignSatisfactionDownload::getPgid, s.getPgid())
                 .eq(ItfTblAssignSatisfactionDownload::getId, s.getId())
                 .lt(ItfTblAssignSatisfactionDownload::getLastModifiedDate, s.getLastModifiedDate())
-                .eq(ItfTblAssignSatisfactionDownload::getPjly, s.getPjly()).one();
+                .eq(ItfTblAssignSatisfactionDownload::getPjly, s.getPjly())
+                .last("limit 1")
+                .one();
         if (azas !=null){
             s.setSynStatus(9);
             s.setSynTime(new Date());
@@ -1679,7 +1696,9 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService {
     private boolean checkRecord(OrderBase orderBase, ItfTblAssignSatisfactionDownload s) {
         OrderAppraise oldoa = orderAppraiseService.lambdaQuery()
                 .eq(OrderAppraise::getOrderBaseId, orderBase.getId())
-                .eq(OrderAppraise::getPid, s.getId()).one();
+                .eq(OrderAppraise::getPid, s.getId())
+                .last("limit 1")
+                .one();
         if (oldoa !=null){
             s.setSynStatus(9);
             s.setSynTime(new Date());
@@ -1694,6 +1713,7 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService {
         OrderAppraise oaOne = orderAppraiseService.lambdaQuery()
                 .eq(OrderAppraise::getOrderBaseId, orderBase.getId())
                 .eq(OrderAppraise::getType,1)
+                .last("limit 1")
                 .one();
         if (oaOne !=null){
             spmessage = oaOne.getAppraiseContent();
@@ -1730,7 +1750,9 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService {
 
         // 提取差评申诉信息
         OrderAppeal oldcpss = orderAppealService.lambdaQuery()
-                .eq(OrderAppeal::getOrderBaseId,orderBase.getId()).one();
+                .eq(OrderAppeal::getOrderBaseId,orderBase.getId())
+                .last("limit 1")
+                .one();
 
         for (ItfTblAssignSatisfactionDownload s:satis){
             jcaninsert=1;
@@ -1755,7 +1777,9 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService {
                 OrderAppraise oldoatt = orderAppraiseService.lambdaQuery()
                         .eq(OrderAppraise::getOrderBaseId,orderBase.getId())
                         .eq(OrderAppraise::getPid,s.getId())
-                        .eq(OrderAppraise::getType,1).one();
+                        .eq(OrderAppraise::getType,1)
+                        .last("limit 1")
+                        .one();
                 if (oldoatt !=null){
                     jcaninsert=0;
                 }
@@ -2130,7 +2154,9 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService {
 
         // 查看是否存在
         OrderRepair oldor = orderRepairService.lambdaQuery()
-                .eq(OrderRepair::getOrderBaseId,order.getId()).one();
+                .eq(OrderRepair::getOrderBaseId,order.getId())
+                .last("limit 1")
+                .one();
 
         if (oldor !=null){
             or.setId(oldor.getId());
@@ -2175,7 +2201,9 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService {
                                  Map<String, List<SysDictRef>> sysDictRefXLMapXq,OrderRepair or) {
         // 查看是否存在
         OrderRepair oldor = orderRepairService.lambdaQuery()
-                .eq(OrderRepair::getOrderBaseId,order.getId()).one();
+                .eq(OrderRepair::getOrderBaseId,order.getId())
+                .last("limit 1")
+                .one();
 
         if (oldor !=null){
             or.setId(oldor.getId());

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

@@ -118,7 +118,9 @@ public class GLPPGFWebsitServiceImpl implements GLPPGFWebsitService {
     private void insertTSWDInfoTM(Brand record) {
         BrandWebsit oldWebsitRec =  brandWebsitService.lambdaQuery()
                 .eq(BrandWebsit::getBrandWebsitNumber,"X9920000")
-                .eq(BrandWebsit::getType,InterFaceTypeEnum.XS_WEBSIT_TYPE.getCode()).one();
+                .eq(BrandWebsit::getType,InterFaceTypeEnum.XS_WEBSIT_TYPE.getCode())
+                .last("limit 1")
+                .one();
         if (oldWebsitRec == null){
             BrandWebsit v = new BrandWebsit();
 
@@ -166,7 +168,9 @@ public class GLPPGFWebsitServiceImpl implements GLPPGFWebsitService {
     private void insertTSWDInfo(Brand record) {
         BrandWebsit oldWebsitRec =  brandWebsitService.lambdaQuery()
                 .eq(BrandWebsit::getBrandWebsitNumber,"99999999")
-                .eq(BrandWebsit::getType,InterFaceTypeEnum.XS_WEBSIT_TYPE.getCode()).one();
+                .eq(BrandWebsit::getType,InterFaceTypeEnum.XS_WEBSIT_TYPE.getCode())
+                .last("limit 1")
+                .one();
         if (oldWebsitRec == null){
             BrandWebsit v = new BrandWebsit();
 

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

@@ -275,7 +275,9 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
                     // 生成师傅所在平台网点信息对像(如已存在不再新增 即不修改平台网点师傅信息)
                     WebsitWorker ww = websitWorkerService.lambdaQuery()
                             .eq(WebsitWorker::getWorkerId,add.getWorkerId())
-                            .eq(WebsitWorker::getWebsitId,i.getWebsitId()).one();
+                            .eq(WebsitWorker::getWebsitId,i.getWebsitId())
+                            .last("limit 1")
+                            .one();
 
                     if (ww == null){
                         getWebsitWorker(workerIdCardMap, websitMap, m, websitWorkeradd, i, add);

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

@@ -45,7 +45,9 @@ public class GLPPLeiBieServiceImpl implements GLPPLeiBieService {
         List<ItfTblSplbDaleiDownload> updateRec = new ArrayList<>();
 
         // 提取品牌信息
-        Brand brandRec = brandService.lambdaQuery().eq(Brand::getBrand,"格力").one();
+        Brand brandRec = brandService.lambdaQuery().eq(Brand::getBrand,"格力")
+                .last("limit 1")
+                .one();
         if (brandRec == null){
             log.info("格力品牌信息不存在【brand】");
             return;
@@ -72,7 +74,9 @@ public class GLPPLeiBieServiceImpl implements GLPPLeiBieService {
         List<ItfTblSplbXiaoleiDownload> updateRec = new ArrayList<>();
 
         // 提取品牌信息
-        Brand brandRec = brandService.lambdaQuery().eq(Brand::getBrand,"格力").one();
+        Brand brandRec = brandService.lambdaQuery().eq(Brand::getBrand,"格力")
+                .last("limit 1")
+                .one();
         if (brandRec == null){
             log.info("格力品牌信息不存在【brand】");
             return;
@@ -99,7 +103,9 @@ public class GLPPLeiBieServiceImpl implements GLPPLeiBieService {
         List<ItfTblSplbXilieDownload> updateRec = new ArrayList<>();
 
         // 提取品牌信息
-        Brand brandRec = brandService.lambdaQuery().eq(Brand::getBrand,"格力").one();
+        Brand brandRec = brandService.lambdaQuery().eq(Brand::getBrand,"格力")
+                .last("limit 1")
+                .one();
         if (brandRec == null){
             log.info("格力品牌信息不存在【brand】");
             return;
@@ -127,7 +133,9 @@ public class GLPPLeiBieServiceImpl implements GLPPLeiBieService {
         List<ItfTblSplbJixinDownload> updateRec = new ArrayList<>();
 
         // 提取品牌信息
-        Brand brandRec = brandService.lambdaQuery().eq(Brand::getBrand,"格力").one();
+        Brand brandRec = brandService.lambdaQuery().eq(Brand::getBrand,"格力")
+                .last("limit 1")
+                .one();
         if (brandRec == null){
             log.info("格力品牌信息不存在【brand】");
             return;

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

@@ -213,7 +213,9 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
         // 字典表中查出ID 格力只有-家电售后
         SysDict sysDict =  sysDictService.lambdaQuery()
                 .eq(SysDict::getDictType, ServiceCategoryEnum.DICT_TYPE_SERVICE_CATEGORY.getCode())
-                .eq(SysDict::getDictValue,ServiceCategoryEnum.DICT_TYPE_SERVICE_CATEGORY.getText()).one();
+                .eq(SysDict::getDictValue,ServiceCategoryEnum.DICT_TYPE_SERVICE_CATEGORY.getText())
+                .last("limit 1")
+                .one();
         if (sysDict == null) {
             return;
         }
@@ -511,7 +513,9 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
         // 提取省信息
         if (StringUtils.isNotEmpty(wvos.getSfen())){
             Province province = provinceService.lambdaQuery()
-                    .eq(Province::getProvince, wvos.getSfen()).one();
+                    .eq(Province::getProvince, wvos.getSfen())
+                    .last("limit 1")
+                    .one();
             if (province !=null){
                 List<BrandLbsRelate> bra = brandLbsRelateService.lambdaQuery()
                         .eq(BrandLbsRelate::getProvinceId,province.getProvinceId())

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

@@ -80,7 +80,9 @@ public class GLPPWXGQueryUpdateServiceImpl implements GLPPWXGQueryUpdateService
         // 字典表中查出ID 格力只有-家电售后
         SysDict sysDict =  sysDictService.lambdaQuery().
                 eq(SysDict::getDictType, ServiceCategoryEnum.DICT_TYPE_SERVICE_CATEGORY.getCode())
-                .eq(SysDict::getDictValue,ServiceCategoryEnum.DICT_TYPE_SERVICE_CATEGORY.getText()).one();
+                .eq(SysDict::getDictValue,ServiceCategoryEnum.DICT_TYPE_SERVICE_CATEGORY.getText())
+                .last("limit 1")
+                .one();
         if (sysDict == null) {
             return;
         }
@@ -372,6 +374,7 @@ public class GLPPWXGQueryUpdateServiceImpl implements GLPPWXGQueryUpdateService
         WorkerCert old = workerCertService.lambdaQuery()
                 .eq(WorkerCert::getWorkerId, workerBrandAccount.getWorkerId())
                 .eq(WorkerCert::getCertName, zj.getZjmc())
+                .last("limit 1")
                 .one();
 
         if (old !=null){

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

@@ -114,7 +114,9 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
     @Transactional(rollbackFor = Exception.class)
     public Boolean orderBaseInstallCjOrWg(String cjOrWg, Brand brand, OutJiasmToGreeUploadTaskList ojtutl, Map<String, List<SysDictRef>> CategoryRefmap){
         OrderBase orderBase = orderBaseService.lambdaQuery()
-                .eq(OrderBase::getId, ojtutl.getId()).one();
+                .eq(OrderBase::getId, ojtutl.getId())
+                .last("limit 1")
+                .one();
         if (orderBase !=null ){
             // 安装工单产品信息,操作日志,完工明细,完工明细附件
             // 预约改约-总部短信发送请求表,派服务人员-短信发送请求表 以主表的pgguid统一修改
@@ -377,7 +379,9 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         // 所属区域处理
         BrandWebsit bb = brandWebsitService.lambdaQuery()
                 .eq(BrandWebsit::getGroupCompanyId, brand.getBrandId())
-                .eq(BrandWebsit::getBrandWebsitNumber, lcls.getSsqy()).one();
+                .eq(BrandWebsit::getBrandWebsitNumber, lcls.getSsqy())
+                .last("limit 1")
+                .one();
         lcls.setSsqy("其他");
         if (bb!=null){
             if (bb.getBelongCompany().equals("X2300000") || bb.getBelongCompany().equals("S9219807")) {
@@ -478,7 +482,9 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
             // 采集明细表中取pgwcmxid
             OrderInstallDetail orderInstallDetail = orderInstallDetailService.lambdaQuery()
                     .eq(OrderInstallDetail::getOrderBaseId,code.getOrderBaseId())
-                    .eq(OrderInstallDetail::getId,code.getOrderDetailId()).one();
+                    .eq(OrderInstallDetail::getId,code.getOrderDetailId())
+                    .last("limit 1")
+                    .one();
             if (orderInstallDetail == null || StringUtils.isEmpty(orderInstallDetail.getPgwcmxid())){
                 continue;
             } else {
@@ -621,7 +627,9 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
             // 提取获取采集明细表数据中获取pgwcmxid(生成格力总部-采集明细序号)
             OrderInstallDetail detailone = orderInstallDetailService.lambdaQuery()
                     .eq(OrderInstallDetail::getOrderBaseId,file.getOrderBaseId())
-                    .eq(OrderInstallDetail::getId,file.getOrderDetailId()).one();
+                    .eq(OrderInstallDetail::getId,file.getOrderDetailId())
+                    .last("limit 1")
+                    .one();
 
             // 获取完工明细数据(采集附件表) 家用、商用、其他
             if (!getwgmxDataCj(mainName, file, detailone, taskno)){
@@ -996,7 +1004,9 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
 
         ItfTblWangdianWxgDownload wxg = itfTblWangdianWxgDownloadService.lambdaQuery()
                 .eq(ItfTblWangdianWxgDownload::getSfzen,mxup.getAzrenid())
-                .eq(ItfTblWangdianWxgDownload::getWdno,mxup.getCzwd()).one();
+                .eq(ItfTblWangdianWxgDownload::getWdno,mxup.getCzwd())
+                .last("limit 1")
+                .one();
 
         if (wxg !=null){
             mxup.setAzrenid(wxg.getWxgid());
@@ -1058,7 +1068,9 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
 
         ItfTblWangdianWxgDownload wxg = itfTblWangdianWxgDownloadService.lambdaQuery()
                 .eq(ItfTblWangdianWxgDownload::getSfzen,mxup.getAzrenid())
-                .eq(ItfTblWangdianWxgDownload::getWdno,websitSH.getWdId()).one();
+                .eq(ItfTblWangdianWxgDownload::getWdno,websitSH.getWdId())
+                .last("limit 1")
+                .one();
         if (wxg !=null){
             mxup.setAzrenid(wxg.getWxgid());
         }
@@ -1119,7 +1131,9 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
 
         ItfTblWangdianWxgDownload wxg = itfTblWangdianWxgDownloadService.lambdaQuery()
                 .eq(ItfTblWangdianWxgDownload::getSfzen,mxup.getAzrenid())
-                .eq(ItfTblWangdianWxgDownload::getWdno,websitSH.getWdId()).one();
+                .eq(ItfTblWangdianWxgDownload::getWdno,websitSH.getWdId())
+                .last("limit 1")
+                .one();
         if (wxg !=null){
             mxup.setAzrenid(wxg.getWxgid());
         }

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

@@ -219,7 +219,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderBaseMapper, OrderBase> im
                 orderBase.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_A1309.getCode())){
             // 提取本地订单
             OrderBase old = orderBaseService.lambdaQuery()
-                    .eq(OrderBase::getPgguid, item.getPgguid()).one();
+                    .eq(OrderBase::getPgguid, item.getPgguid())
+                    .last("limit 1")
+                    .one();
             if ((old !=null && old.getOutCjDownloadFlag().equals(0)) || (old ==null)){
                 List<OrderInstallDetail> orderDetailRec = orderInstallDetailService.lambdaQuery()
                                 .eq(OrderInstallDetail::getOrderBaseId, orderBase.getId())
@@ -304,7 +306,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderBaseMapper, OrderBase> im
                     .eq(OrderInstallDetail::getStatus,1).list();
             // 提取本地订单
             OrderBase old = orderBaseService.lambdaQuery()
-                    .eq(OrderBase::getPgguid, item.getPgguid()).one();
+                    .eq(OrderBase::getPgguid, item.getPgguid())
+                    .last("limit 1")
+                    .one();
 
             if (CollectionUtils.isNotEmpty(oid) && oid.size()==old.getTotalNum()){
                 orderBase.setOrderStatus(GDOrderStatusEnum.INSTALL_STATUS_G10.getCode());
@@ -603,7 +607,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderBaseMapper, OrderBase> im
                     .eq(Street::getProvince, orderBase.getProvince())
                     .eq(Street::getCity, orderBase.getCity())
                     .eq(Street::getArea, orderBase.getArea())
-                    .eq(Street::getStreet, orderBase.getStreet()).one();
+                    .eq(Street::getStreet, orderBase.getStreet())
+                    .last("limit 1")
+                    .one();
             // 对应出平台的省市区街道信息 无对应关系时依总部的为准
             if (street!=null){
                 getPosition(orderBase, street);
@@ -688,7 +694,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderBaseMapper, OrderBase> im
                         .eq(Street::getProvince, lcls.getSfenid())
                         .eq(Street::getCity, lcls.getCshiid())
                         .eq(Street::getArea, lcls.getXianid())
-                        .eq(Street::getStreet, lcls.getXzhenid()).one();
+                        .eq(Street::getStreet, lcls.getXzhenid())
+                        .last("limit 1")
+                        .one();
                 // 这里一定有
                 if (street !=null){
                     lcls.setSfen(street.getProvince());
@@ -731,7 +739,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderBaseMapper, OrderBase> im
 
         // 总部区必选
         Area area = areaService.lambdaQuery()
-                .eq(Area::getAreaId, lcls.getXianid()).one();
+                .eq(Area::getAreaId, lcls.getXianid())
+                .last("limit 1")
+                .one();
         if (area !=null){
             lcls.setSfen(area.getProvince());
             lcls.setCshi(area.getCity());

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

@@ -157,7 +157,9 @@ public class OtherDownServiceImpl implements OtherDownService {
         int oldtotal=0;
         List<NotificationDownload> ads = new ArrayList<>();
         Date synTime = new Date();
-        Brand brand = brandService.lambdaQuery().eq(Brand::getBrand,"格力").one();
+        Brand brand = brandService.lambdaQuery().eq(Brand::getBrand,"格力")
+                .last("limit 1")
+                .one();
 
         // 提取商品大类
         List<SysDictRef> sysDictRef =  sysDictRefService.lambdaQuery()
@@ -464,7 +466,9 @@ public class OtherDownServiceImpl implements OtherDownService {
     @Override
     public void uploadDatakqaz(TblAzwgmxUpload item) throws Exception {
         TblAzwgmxKqazDownload kqaz = tblAzwgmxKqazDownloadService.lambdaQuery()
-                .eq(TblAzwgmxKqazDownload::getPgwcmxid, item.getKeyId()).one();
+                .eq(TblAzwgmxKqazDownload::getPgwcmxid, item.getKeyId())
+                .last("limit 1")
+                .one();
         if (kqaz !=null ){
             // 同步更新
             if (getDatakqaz(kqaz,"kqaz", item.getId())==0){
@@ -476,7 +480,9 @@ public class OtherDownServiceImpl implements OtherDownService {
     @Override
     public void uploadDatacjsj(TblAzwgmxUpload item) throws Exception {
         TblAzwgmxKqcjsjDownload cjsj = tblAzwgmxKqcjsjDownloadService.lambdaQuery()
-                .eq(TblAzwgmxKqcjsjDownload::getPgwcmxid, item.getKeyId()).one();
+                .eq(TblAzwgmxKqcjsjDownload::getPgwcmxid, item.getKeyId())
+                .last("limit 1")
+                .one();
         if (cjsj !=null ){
             // 同步更新
             if (getDatacjsj(cjsj,"cjsj", item.getId())==0){
@@ -488,7 +494,9 @@ public class OtherDownServiceImpl implements OtherDownService {
     @Override
     public void uploadDataKjmm(TblAzwgmxUpload item) throws Exception {
         TblAzwgmxKjmmDownload kjmm = tblAzwgmxKjmmDownloadService.lambdaQuery()
-                .eq(TblAzwgmxKjmmDownload::getPgwcmxid, item.getKeyId()).one();
+                .eq(TblAzwgmxKjmmDownload::getPgwcmxid, item.getKeyId())
+                .last("limit 1")
+                .one();
         if (kjmm !=null ){
             // 同步更新
             if (getDataKjmm(kjmm,"kjmm", item.getId())==0){
@@ -500,7 +508,9 @@ public class OtherDownServiceImpl implements OtherDownService {
     @Override
     public void addCjsj(TblAddUploadList item) throws Exception {
         TblAzwgmxKqcjsjDownload cjsj = tblAzwgmxKqcjsjDownloadService.lambdaQuery()
-                .eq(TblAzwgmxKqcjsjDownload::getPgwcmxid, item.getKeyId()).one();
+                .eq(TblAzwgmxKqcjsjDownload::getPgwcmxid, item.getKeyId())
+                .last("limit 1")
+                .one();
         if (cjsj != null) {
             // 同步更新
             if (addDatacjsj(cjsj, "cjsj", item.getId()) == 0) {
@@ -512,7 +522,9 @@ public class OtherDownServiceImpl implements OtherDownService {
     @Override
     public void addKjmm(TblAddUploadList item) throws Exception {
         TblAzwgmxKjmmDownload kjmm = tblAzwgmxKjmmDownloadService.lambdaQuery()
-                .eq(TblAzwgmxKjmmDownload::getPgwcmxid, item.getKeyId()).one();
+                .eq(TblAzwgmxKjmmDownload::getPgwcmxid, item.getKeyId())
+                .last("limit 1")
+                .one();
         if (kjmm != null) {
             // 同步更新
             if (addDataKjmm(kjmm, "kjmm", item.getId()) == 0) {
@@ -524,7 +536,9 @@ public class OtherDownServiceImpl implements OtherDownService {
     @Override
     public void addFeedBack(TblAddUploadList item) throws Exception{
         QualityFeedbackHeadDownload feedback = qualityFeedbackHeadDownloadService.lambdaQuery()
-                .eq(QualityFeedbackHeadDownload::getId, item.getKeyId()).one();
+                .eq(QualityFeedbackHeadDownload::getId, item.getKeyId())
+                .last("limit 1")
+                .one();
         if (feedback != null) {
             // 同步更新
             if (addDataFeedBack(feedback, item.getId()) == 0) {
@@ -538,7 +552,9 @@ public class OtherDownServiceImpl implements OtherDownService {
     @Override
     public void addKqaz(TblAddUploadList item) throws Exception {
         TblAzwgmxKqazDownload kqaz = tblAzwgmxKqazDownloadService.lambdaQuery()
-                .eq(TblAzwgmxKqazDownload::getPgwcmxid, item.getKeyId()).one();
+                .eq(TblAzwgmxKqazDownload::getPgwcmxid, item.getKeyId())
+                .last("limit 1")
+                .one();
         if (kqaz != null) {
             // 同步更新
             if (addDatakqaz(kqaz, "kqaz", item.getId()) == 0) {
@@ -550,7 +566,9 @@ public class OtherDownServiceImpl implements OtherDownService {
     @Override
     public void addRefunds(TblAddUploadList item) throws Exception {
         TblRefundsDownload kqaz = tblRefundsDownloadService.lambdaQuery()
-                .eq(TblRefundsDownload::getPgguid, item.getKeyId()).one();
+                .eq(TblRefundsDownload::getPgguid, item.getKeyId())
+                .last("limit 1")
+                .one();
         if (kqaz != null) {
             // 同步新增
             if (addDataRfunds(kqaz, item.getId()) == 0) {
@@ -656,7 +674,9 @@ public class OtherDownServiceImpl implements OtherDownService {
 
     private void getjykt(TblAddUploadList item, Tblazwgmxjykt jykt) {
         TblazwgmxjyktUpload jt = tblazwgmxjyktUploadService.lambdaQuery()
-                .eq(TblazwgmxjyktUpload::getWorkerOrderNo, item.getKeyId()).one();
+                .eq(TblazwgmxjyktUpload::getWorkerOrderNo, item.getKeyId())
+                .last("limit 1")
+                .one();
         if (jt !=null){
             MyBeanUtils.copyProperties(jt, jykt);
 
@@ -761,7 +781,9 @@ public class OtherDownServiceImpl implements OtherDownService {
     @Override
     public void updateRefunds(TblAddUploadList item) throws Exception {
         TblRefundsDownload kqaz = tblRefundsDownloadService.lambdaQuery()
-                .eq(TblRefundsDownload::getPgguid, item.getKeyId()).one();
+                .eq(TblRefundsDownload::getPgguid, item.getKeyId())
+                .last("limit 1")
+                .one();
         if (kqaz != null) {
             // 同步更新
             if (updateDataRfunds(kqaz, item.getId()) == 0) {
@@ -773,7 +795,9 @@ public class OtherDownServiceImpl implements OtherDownService {
     @Override
     public void feedback(TblAddUploadList item) throws Exception {
         TblRefundsDownload kqaz = tblRefundsDownloadService.lambdaQuery()
-                .eq(TblRefundsDownload::getPgguid, item.getKeyId()).one();
+                .eq(TblRefundsDownload::getPgguid, item.getKeyId())
+                .last("limit 1")
+                .one();
         if (kqaz != null) {
             // 过程反馈
             if (feedbackRfunds(kqaz, item.getId()) == 0) {

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

@@ -251,6 +251,7 @@ public class PublicServiceImpl implements PublicService {
     public String getSHWDPhone(String websitNo){
         Websit websit = websitService.lambdaQuery()
                 .eq(Websit::getWebsitId,websitNo)
+                .last("limit 1")
                 .one();
         if (websit != null){
             if (StringUtils.isNotEmpty(websit.getHotline())){
@@ -272,6 +273,7 @@ public class PublicServiceImpl implements PublicService {
         WebsitOrderSign wos = websitOrderSignService.lambdaQuery()
                 .eq(WebsitOrderSign::getBrandWebsitId, websitNo)
                 .eq(WebsitOrderSign::getBrandId, brandId)
+                .last("limit 1")
                 .one();
         if (wos != null){
             resultData.setWebsitId(wos.getWebsitId());
@@ -279,6 +281,7 @@ public class PublicServiceImpl implements PublicService {
             CustomerInformationWebsit ciwx = customerInformationWebsitService.lambdaQuery()
                     .eq(CustomerInformationWebsit::getRefWebsitId, websitNo)
                     .eq(CustomerInformationWebsit::getBrandId, brandId)
+                    .last("limit 1")
                     .one();
             if (ciwx !=null){
                 resultData.setWebsitId(ciwx.getWebsitId());
@@ -289,6 +292,7 @@ public class PublicServiceImpl implements PublicService {
         if (StringUtils.isNotEmpty(resultData.getWebsitId())){
             Websit websit = websitService.lambdaQuery()
                     .eq(Websit::getWebsitId,resultData.getWebsitId())
+                    .last("limit 1")
                     .one();
             if (websit != null){
                 resultData.setWdmc(websit.getWebsitName());
@@ -314,6 +318,7 @@ public class PublicServiceImpl implements PublicService {
         WebsitOrderSign wos = websitOrderSignService.lambdaQuery()
                 .eq(WebsitOrderSign::getWebsitId, websitId)
                 .eq(WebsitOrderSign::getBrandId, brandId)
+                .last("limit 1")
                 .one();
         if (wos != null){
             resultData.setWdno(wos.getBrandWebsitId());
@@ -323,6 +328,7 @@ public class PublicServiceImpl implements PublicService {
             CustomerInformationWebsit ciwx = customerInformationWebsitService.lambdaQuery()
                     .eq(CustomerInformationWebsit::getWebsitId, websitId)
                     .eq(CustomerInformationWebsit::getBrandId, brandId)
+                    .last("limit 1")
                     .one();
             if (ciwx !=null){
                 resultData.setWdno(ciwx.getRefWebsitId());
@@ -335,6 +341,7 @@ public class PublicServiceImpl implements PublicService {
             BrandWebsit bw = brandWebsitService.lambdaQuery()
                     .eq(BrandWebsit::getBrandWebsitNumber, resultData.getWdno())
                     .eq(BrandWebsit::getGroupCompanyId, brandId)
+                    .last("limit 1")
                     .one();
             if (bw != null){
                 resultData.setXtwdno(bw.getSysWebsitNumber());
@@ -351,7 +358,9 @@ public class PublicServiceImpl implements PublicService {
                                                              String itemTableName, String itemOrderType, int taskType) {
         // 提取目志的类型
         OrderRepairOperatingLog rlog = orderRepairOperatingLogService.lambdaQuery()
-                .eq(OrderRepairOperatingLog::getId,id).one();
+                .eq(OrderRepairOperatingLog::getId,id)
+                .last("limit 1")
+                .one();
 
         OutJiasmToGreeUploadTaskList add = new OutJiasmToGreeUploadTaskList();
         add.setUploadTaskType(taskType);
@@ -474,7 +483,9 @@ public class PublicServiceImpl implements PublicService {
     public WebsitSH merchantWebsitInfoX(String websitNo,String type){
         WebsitSH resultData = new WebsitSH();
         // 提取格力集团信息
-        Brand brandRec = brandService.lambdaQuery().eq(Brand::getBrand,"格力").one();
+        Brand brandRec = brandService.lambdaQuery().eq(Brand::getBrand,"格力")
+                .last("limit 1")
+                .one();
 
         if (StringUtils.isEmpty(websitNo)){
             return resultData;
@@ -483,7 +494,9 @@ public class PublicServiceImpl implements PublicService {
         BrandWebsit brandWebsit = brandWebsitService.lambdaQuery()
                 .eq(BrandWebsit::getGroupCompanyId,brandRec.getBrandId())
                 .eq(BrandWebsit::getType,type)
-                .eq(BrandWebsit::getBrandWebsitNumber,websitNo).one();
+                .eq(BrandWebsit::getBrandWebsitNumber,websitNo)
+                .last("limit 1")
+                .one();
 
         if (brandWebsit !=null){
             resultData.setWdId(brandWebsit.getBrandWebsitNumber());
@@ -639,6 +652,7 @@ public class PublicServiceImpl implements PublicService {
                         .eq(BrandWebsit::getGroupCompanyId, item.getGroupCompanyId())
                         .eq(BrandWebsit::getSplb,category)
                         .eq(BrandWebsit::getBrandWebsitNumber, item.getRefWebsitId())
+                        .last("limit 1")
                         .one();
                 if (bw != null) {
                     return merchantWebsitInfoX(bw.getBrandWebsitNumber(),
@@ -683,6 +697,7 @@ public class PublicServiceImpl implements PublicService {
                 BrandWebsit bw = brandWebsitService.lambdaQuery()
                         .eq(BrandWebsit::getSplb, category)
                         .eq(BrandWebsit::getBrandWebsitNumber, item.getBrandWebsitId())
+                        .last("limit 1")
                         .one();
                 if (bw != null) {
                     wosn.add(bw);
@@ -730,7 +745,9 @@ public class PublicServiceImpl implements PublicService {
     private Boolean addSRecord(OrderReAppointment rea){
         // 插入前查看是否已存在，存在不再插入
         SmsRecord sr = smsRecordService.lambdaQuery()
-                .eq(SmsRecord::getId,rea.getId()).one();
+                .eq(SmsRecord::getId,rea.getId())
+                .last("limit 1")
+                .one();
         if (sr !=null){
             return Boolean.TRUE;
         }
@@ -743,14 +760,18 @@ public class PublicServiceImpl implements PublicService {
     @Override
     public Boolean addFaOrderSms(OrderReAppointment rea){
         OrderBase orderBase = orderbaseService.lambdaQuery()
-                .eq(OrderBase::getId,rea.getOrderBaseId()).one();
+                .eq(OrderBase::getId,rea.getOrderBaseId())
+                .last("limit 1")
+                .one();
         if (orderBase == null){
             return Boolean.TRUE;
         }
         // 一个工单只能有一次预约信息，改约可以多个
         if (rea.getFlag()==1){
             FaOrderSms r = faOrderSmsService.lambdaQuery()
-                    .eq(FaOrderSms::getSynTaskNo,rea.getId()).one();
+                    .eq(FaOrderSms::getSynTaskNo,rea.getId())
+                    .last("limit 1")
+                    .one();
             if (r !=null){
                 return Boolean.TRUE;
             }
@@ -878,7 +899,9 @@ public class PublicServiceImpl implements PublicService {
     @Override
     public Integer getCompanyId(String brandWebsitNumber){
         BrandWebsit bw = brandWebsitService.lambdaQuery()
-                .eq(BrandWebsit::getBrandWebsitNumber, brandWebsitNumber).one();
+                .eq(BrandWebsit::getBrandWebsitNumber, brandWebsitNumber)
+                .last("limit 1")
+                .one();
         if (bw != null){
             return bw.getBelongCompanyId();
         }
@@ -894,7 +917,9 @@ public class PublicServiceImpl implements PublicService {
         // 提取配置参数 首次申诉-服务人员+网点审核截止时间
         SysVariableConfig config = sysVariableConfigService.lambdaQuery()
                 .eq(SysVariableConfig::getVariableType,"APPEAL_TIME")
-                .eq(SysVariableConfig::getSmallType,3).one();
+                .eq(SysVariableConfig::getSmallType,3)
+                .last("limit 1")
+                .one();
         if (config != null){
             hour = Integer.valueOf(config.getVariableValue());
         }
@@ -905,7 +930,9 @@ public class PublicServiceImpl implements PublicService {
         // 提取短信发送时间 目的配合配置参数生成申诉单的截止申诉时间
         ItfMessagehuifangentity message = itfMessagehuifangentityService.lambdaQuery()
                 .eq(ItfMessagehuifangentity::getOrderBaseId, orderBase.getId())
-                .eq(ItfMessagehuifangentity::getFjid, orderBase.getPgguid()).one();
+                .eq(ItfMessagehuifangentity::getFjid, orderBase.getPgguid())
+                .last("limit 1")
+                .one();
 
 
         // 测试时存在无message的情况
@@ -933,7 +960,9 @@ public class PublicServiceImpl implements PublicService {
         // 提取配置参数 首次申诉-服务人员+网点审核截止时间
         SysVariableConfig config = sysVariableConfigService.lambdaQuery()
                 .eq(SysVariableConfig::getVariableType,"APPEAL_TIME")
-                .eq(SysVariableConfig::getSmallType,3).one();
+                .eq(SysVariableConfig::getSmallType,3)
+                .last("limit 1")
+                .one();
         if (config != null){
             hour = Integer.valueOf(config.getVariableValue());
         }
@@ -944,7 +973,9 @@ public class PublicServiceImpl implements PublicService {
         // 提取短信发送时间 目的配合配置参数生成申诉单的截止申诉时间
         ItfMessagehuifangentity message = itfMessagehuifangentityService.lambdaQuery()
                 .eq(ItfMessagehuifangentity::getOrderBaseId, orderBase.getId())
-                .eq(ItfMessagehuifangentity::getFjid, orderBase.getPgid()).one();
+                .eq(ItfMessagehuifangentity::getFjid, orderBase.getPgid())
+                .last("limit 1")
+                .one();
 
 
         // 测试时存在无message的情况
@@ -968,7 +999,9 @@ public class PublicServiceImpl implements PublicService {
     @Override
     public Boolean  checkEvaluatemessage(String pjly){
         SatisfactionList sfl = satisfactionListService.lambdaQuery()
-                .eq(SatisfactionList::getPjly,pjly.trim()).one();
+                .eq(SatisfactionList::getPjly,pjly.trim())
+                .last("limit 1")
+                .one();
         if (sfl==null){
             return Boolean.TRUE;
         }
@@ -995,7 +1028,9 @@ public class PublicServiceImpl implements PublicService {
     public Worker getInstallOrderWorker(Long azrenid){
         List<Worker> worker = new ArrayList<>();
         ItfTblWangdianWxgDownload wdwxg = itfTblWangdianWxgDownloadService.lambdaQuery()
-                .eq(ItfTblWangdianWxgDownload::getWxgid,azrenid).one();
+                .eq(ItfTblWangdianWxgDownload::getWxgid,azrenid)
+                .last("limit 1")
+                .one();
         // 根据身份证取师傅信息
         if (wdwxg !=null){
             worker = workerService.lambdaQuery()
@@ -1014,7 +1049,9 @@ public class PublicServiceImpl implements PublicService {
     public String checkAppraiseType(String pjly){
         String result ="C";
         SatisfactionList sfl = satisfactionListService.lambdaQuery()
-                .eq(SatisfactionList::getPjly,pjly.trim()).one();
+                .eq(SatisfactionList::getPjly,pjly.trim())
+                .last("limit 1")
+                .one();
         if (sfl==null){
             result = "C";
         } else {
@@ -1058,7 +1095,9 @@ public class PublicServiceImpl implements PublicService {
                 .eq(WorkerBrandAccount::getDel,0)
                 .eq(WorkerBrandAccount::getWorkerId,workerId)
                 .eq(WorkerBrandAccount::getBrandWebsitId,brandWebsitId)
-                .eq(WorkerBrandAccount::getWebsitId,websitId).one();
+                .eq(WorkerBrandAccount::getWebsitId,websitId)
+                .last("limit 1")
+                .one();
         if (wba !=null){
             if (StringUtils.isNotEmpty(wba.getBrandWorkerId())){
                 return Long.valueOf(wba.getBrandWorkerId());
@@ -1076,11 +1115,15 @@ public class PublicServiceImpl implements PublicService {
                 .eq(WorkerBrandAccount::getBrandWorkerStatus,"ON")
                 .eq(WorkerBrandAccount::getDel,0)
                 .eq(WorkerBrandAccount::getWorkerId,workerId)
-                .eq(WorkerBrandAccount::getBrandWebsitId,brandWebsitId).one();
+                .eq(WorkerBrandAccount::getBrandWebsitId,brandWebsitId)
+                .last("limit 1")
+                .one();
         if (wba !=null){
             MyBeanUtils.copyProperties(wba,info);
             Worker wk = workerService.lambdaQuery()
-                    .eq(Worker::getWorkerId,workerId).one();
+                    .eq(Worker::getWorkerId,workerId)
+                    .last("limit 1")
+                    .one();
 
             MyBeanUtils.copyProperties(wk,info);
         }
@@ -1214,7 +1257,9 @@ public class PublicServiceImpl implements PublicService {
         // 依然有多个时按位置再次过滤 这里指网点的位置
         // 商户网点位置
         BrandWebsit bw = brandWebsitService.lambdaQuery()
-                .eq(BrandWebsit::getBrandWebsitNumber, websitNo).one();
+                .eq(BrandWebsit::getBrandWebsitNumber, websitNo)
+                .last("limit 1")
+                .one();
         List<String> wdno = new ArrayList<>();
         // 有为空的按经纬度重新提取位置
         if (StringUtils.isEmpty(bw.getSfen()) ||
@@ -1283,7 +1328,9 @@ public class PublicServiceImpl implements PublicService {
         // 依然有多个时按位置再次过滤 这里指网点的位置
         // 商户网点位置
         BrandWebsit bw = brandWebsitService.lambdaQuery()
-                .eq(BrandWebsit::getBrandWebsitNumber, websitNo).one();
+                .eq(BrandWebsit::getBrandWebsitNumber, websitNo)
+                .last("limit 1")
+                .one();
         List<String> wdno = new ArrayList<>();
         // 有为空的按经纬度重新提取位置
         if (StringUtils.isNotEmpty(bw.getSfen()) ||
@@ -1338,13 +1385,17 @@ public class PublicServiceImpl implements PublicService {
                 .eq(WebsitServiceCategoryDetail::getBrandId,brandId)
                 .eq(WebsitServiceCategoryDetail::getWebsitId,websitId)
                 .eq(WebsitServiceCategoryDetail::getType,type)
-                .eq(WebsitServiceCategoryDetail::getMainId,categoryId).one();
+                .eq(WebsitServiceCategoryDetail::getMainId,categoryId)
+                .last("limit 1")
+                .one();
     }
 
     // 提取平台网点名称及服务热线
     private  void getNameAndHotline(WebsitFWS req){
         Websit websit = websitService.lambdaQuery()
-                .eq(Websit::getWebsitId,req.getWebsitId()).one();
+                .eq(Websit::getWebsitId,req.getWebsitId())
+                .last("limit 1")
+                .one();
 
         if (websit != null){
             if (StringUtils.isNotEmpty(websit.getHotline())){

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

@@ -58,7 +58,9 @@ public class RepairDownloadGDServiceImpl implements RepairDownloadGDService {
 
         try {
             ItfGreeToFaRepairSynRule synRule = itfGreeToFaRepairSynRuleService.lambdaQuery()
-                    .orderByAsc(ItfGreeToFaRepairSynRule::getId).one();
+                    .orderByAsc(ItfGreeToFaRepairSynRule::getId)
+                    .last("limit 1")
+                    .one();
             if (synRule==null){
                 return;
             }

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

@@ -14,6 +14,7 @@ import com.zfire.jiasm.syncdata.utils.HttpUtil;
 import com.zfire.jiasm.syncdata.utils.JSONResult;
 import com.zfire.jiasm.syncdata.utils.TokenCenter;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.dao.DataAccessException;
@@ -53,13 +54,15 @@ public class RepairDownloadServiceImpl implements RepairDownloadService {
     @Override
     public void processRepairDownload() throws Exception {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        ItfGreeToFaRepairSynRule synRule = new ItfGreeToFaRepairSynRule();
 
         try {
-            ItfGreeToFaRepairSynRule synRule = itfGreeToFaRepairSynRuleService.lambdaQuery()
-                    .orderByAsc(ItfGreeToFaRepairSynRule::getId).one();
-            if (synRule==null){
+            List<ItfGreeToFaRepairSynRule> synRules = itfGreeToFaRepairSynRuleService.lambdaQuery()
+                    .orderByAsc(ItfGreeToFaRepairSynRule::getId).list();
+            if (CollectionUtils.isEmpty(synRules)){
                 return;
             }
+            synRule = synRules.get(0);
 
             log.info("开始下载维修工单: \uF0B7{}",sdf.format(new Date()));
 

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

@@ -188,7 +188,9 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
                     Long taskId = row.getSynReqId();
                     try {
                         OutJiasmToGreeUploadTaskList sourceData = outJiasmToGreeUploadTaskListService.lambdaQuery()
-                                .eq(OutJiasmToGreeUploadTaskList::getSynReqId,taskId).one();
+                                .eq(OutJiasmToGreeUploadTaskList::getSynReqId,taskId)
+                                .last("limit 1")
+                                .one();
                         if (!sourceData.getSynStatus().equals(0)){
                             continue;
                         }
@@ -245,7 +247,9 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
                                                OutJiasmToGreeUploadTaskList sourceData, String newDykh) {
         // 提取工单数据
         OrderBase orderBase = orderBaseService.lambdaQuery()
-                .eq(OrderBase::getId, sourceData.getOrderNo()).one();
+                .eq(OrderBase::getId, sourceData.getOrderNo())
+                .last("limit 1")
+                .one();
         if (StringUtils.isEmpty(orderBase.getPgid())){
             publicService.updateUploadTaskLisError(sourceData,"order_base表pgid为空暂不同步");
             return;
@@ -268,7 +272,9 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
     @Transactional(rollbackFor = Exception.class)
     public  void getAppointment(OutJiasmToGreeUploadTaskList ojtutl) {
         OrderBase orderBase = orderBaseService.lambdaQuery()
-                .eq(OrderBase::getId, ojtutl.getOrderNo()).one();
+                .eq(OrderBase::getId, ojtutl.getOrderNo())
+                .last("limit 1")
+                .one();
 
         if (orderBase !=null ){
             // 修改内部序列outid
@@ -415,7 +421,9 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
                                      OutJiasmToGreeUploadTaskList sourceData, String newDykh) {
         // 提取工单数据
         OrderProduct op = orderProductService.lambdaQuery()
-                .eq(OrderProduct::getId,row.getId()).one();
+                .eq(OrderProduct::getId,row.getId())
+                .last("limit 1")
+                .one();
         if (op == null){
             publicService.updateUploadTaskLisError(sourceData,"找不到对应记录:"+row.getId());
             return;
@@ -475,7 +483,9 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         OrderPar request = new OrderPar();
         WebsitSH websitSH = new WebsitSH();
         OrderBase orderBase = orderBaseService.lambdaQuery()
-                .eq(OrderBase::getId,sourceData.getOrderNo()).one();
+                .eq(OrderBase::getId,sourceData.getOrderNo())
+                .last("limit 1")
+                .one();
 
         request.setBrandId(brand.getBrandId());
         request.setId(sourceData.getId());

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

@@ -144,10 +144,14 @@ public class RepairProduceUploadListServiceImpl implements RepairProduceUploadLi
         String newDykh = "";
         // 提取工单数据
         OrderBase orderBase = orderBaseService.lambdaQuery()
-                .eq(OrderBase::getId, itemOrderNo).one();
+                .eq(OrderBase::getId, itemOrderNo)
+                .last("limit 1")
+                .one();
         // 提取对应的子信息
         OrderInformation oi = orderInformationService.lambdaQuery()
-                .eq(OrderInformation::getId, itemTableNameId).one();
+                .eq(OrderInformation::getId, itemTableNameId)
+                .last("limit 1")
+                .one();
         // 为空不做处理
         if (StringUtils.isNotEmpty(orderBase.getPgid())){
             // 看 xzid 值 不为空取该值 为空时网络获取
@@ -172,7 +176,9 @@ public class RepairProduceUploadListServiceImpl implements RepairProduceUploadLi
         orderPar.setId(itemTableNameId);
         ItfTblAssignXzydUpload rec = orderInformationNewMapper.getOrderInformationrepair(orderPar);
         OrderBase orderBase = orderBaseService.lambdaQuery()
-                .eq(OrderBase::getId,rec.getWorkerOrderNo()).one();
+                .eq(OrderBase::getId,rec.getWorkerOrderNo())
+                .last("limit 1")
+                .one();
         rec.setPgid(Long.valueOf(orderBase.getPgid()));
         websitFWS = publicService.shshwdToptshwd(rec.getWdno(),orderBase);
         if (StringUtils.isEmpty(websitFWS.getWebsitId())){
@@ -247,7 +253,9 @@ public class RepairProduceUploadListServiceImpl implements RepairProduceUploadLi
     public void logProess(OutJiasmToGreeUploadnotifylist item, String itemTableName, String itemOrderNo, String itemTableNameId,String itemOrderType) {
         // 提取日志数据
         OrderRepairOperatingLog org = orderRepairOperatingLogService.lambdaQuery()
-                .eq(OrderRepairOperatingLog::getId, itemTableNameId).one();
+                .eq(OrderRepairOperatingLog::getId, itemTableNameId)
+                .last("limit 1")
+                .one();
         if (org !=null){
             // 生成67类型上传任务数据
             // 单号，主键，同步任务生成时间，同步的表名，工单类型，任务类型
@@ -264,7 +272,9 @@ public class RepairProduceUploadListServiceImpl implements RepairProduceUploadLi
     @Transactional(rollbackFor = Exception.class)
     public  void OrderReAppointment(OutJiasmToGreeUploadnotifylist item, String itemTableName, String itemOrderType) {
         OrderReAppointment rea = orderReAppointmentService.lambdaQuery()
-                .eq(OrderReAppointment::getId, item.getId()).one();
+                .eq(OrderReAppointment::getId, item.getId())
+                .last("limit 1")
+                .one();
         // 同步任务增加一条数据
         if (rea !=null){
             OutJiasmToGreeUploadTaskList add = publicService.getUploadTaskList(item.getOrderNo(), item.getId(),
@@ -283,7 +293,9 @@ public class RepairProduceUploadListServiceImpl implements RepairProduceUploadLi
     public void orderProductProess(OutJiasmToGreeUploadnotifylist item, String itemTableName, String itemOrderNo, String itemTableNameId) {
         // 提取工单机型
         OrderProduct op = orderProductService.lambdaQuery()
-                .eq(OrderProduct::getId, itemTableNameId).one();
+                .eq(OrderProduct::getId, itemTableNameId)
+                .last("limit 1")
+                .one();
         if (op!=null){
             // 生成68类型上传任务数据
             // 单号，主键，同步任务生成时间，同步的表名，工单类型，任务类型
@@ -302,7 +314,9 @@ public class RepairProduceUploadListServiceImpl implements RepairProduceUploadLi
                                 List<OutJiasmToGreeUploadTaskList> ojtgutls, Long synReqId) {
         // 提取工单数据
         OrderBase orderBase = orderBaseService.lambdaQuery()
-                .eq(OrderBase::getId, itemOrderNo).one();
+                .eq(OrderBase::getId, itemOrderNo)
+                .last("limit 1")
+                .one();
         // 生成任务清单数据
         if (orderBase != null){
             // 删除工单更新被忽略

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

@@ -546,7 +546,9 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
     // true为有信息
     private Boolean getbxz(WorkerCertificateInfo workerCertificateInfo, String workerId, String websitWorkerId) throws ParseException {
         WebsitWorker wk = websitWorkerService.lambdaQuery()
-                .eq(WebsitWorker::getWebsitWorkerId,websitWorkerId).one();
+                .eq(WebsitWorker::getWebsitWorkerId,websitWorkerId)
+                .last("limit 1")
+                .one();
 
         // 证件信息未同步，不操作
         if (StringUtils.isEmpty(wk.getOutInsureCert())){
@@ -728,7 +730,9 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
 
     private void setReq(List<ZJInfo> zjInfoList, WorkUploadInfo req, Worker worker, String websitWorkerId) {
         WebsitWorker wb = websitWorkerService.lambdaQuery()
-                .eq(WebsitWorker::getWebsitWorkerId,websitWorkerId).one();
+                .eq(WebsitWorker::getWebsitWorkerId,websitWorkerId)
+                .last("limit 1")
+                .one();
         req.setZjInfoList(zjInfoList);
 
         req.setCsgzns(worker.getJobAge());
@@ -850,7 +854,9 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
             ZJInfo zjInfo = new ZJInfo();
             WebsitWorker ww = new WebsitWorker();
             ww = websitWorkerService.lambdaQuery()
-                    .eq(WebsitWorker::getWebsitWorkerId,websitWorkerId).one();
+                    .eq(WebsitWorker::getWebsitWorkerId,websitWorkerId)
+                    .last("limit 1")
+                    .one();
 
             zjInfo.setZjbh(ww.getSafeCompany()+"/"+ ww.getSafeNo());
             zjInfo.setZjmc("保险证");

src/main/resources/bootstrap.properties

@@ -1,4 +1,4 @@
-spring.profiles.active=test
+spring.profiles.active=dev
 spring.application.name=jiasm-syncdata
 spring.main.allow-bean-definition-overriding=true
 # 修改线程池的拒绝策略