Merge remote-tracking branch 'origin/develop' into develop

mall-server-api/src/main/java/com/gree/mall/manager/controller/workerorder/ESOrderBaseController.java

@@ -0,0 +1,73 @@
+package com.gree.mall.manager.controller.workerorder;
+
+import cn.hutool.core.lang.TypeReference;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gree.mall.manager.annotation.ZfireList;
+import com.gree.mall.manager.bean.admin.AdminUserCom;
+import com.gree.mall.manager.bean.listvo.param.WorkOrderZfireParam;
+import com.gree.mall.manager.bean.listvo.workorder.OrderBase2VO;
+import com.gree.mall.manager.bean.listvo.workorder.OrderBaseVO;
+import com.gree.mall.manager.bean.workorder.OrderAddBean2DTO;
+import com.gree.mall.manager.bean.workorder.OrderAddBeanDTO;
+import com.gree.mall.manager.bean.workorder.OrderSettleDetailBean;
+import com.gree.mall.manager.constant.Constant;
+import com.gree.mall.manager.enums.workorder.OrderFlagEnum;
+import com.gree.mall.manager.exception.RemoteServiceException;
+import com.gree.mall.manager.helper.ResponseHelper;
+import com.gree.mall.manager.logic.common.CommonLogic;
+import com.gree.mall.manager.logic.workorder.OrderBaseExcelLogic;
+import com.gree.mall.manager.logic.workorder.OrderBaseLogic;
+import com.gree.mall.manager.logic.workorder.OrderLogLogic;
+import com.gree.mall.manager.plus.entity.PgOrderBase;
+import com.gree.mall.manager.plus.entity.PgOrderOperatorLog;
+import com.gree.mall.manager.plus.entity.PgOrderProduct;
+import com.gree.mall.manager.plus.entity.PgOrderWorker;
+import com.gree.mall.manager.utils.excel.ExcelUtils;
+import com.gree.mall.manager.zfire.bean.ZfireParamBean;
+import com.gree.mall.manager.zfire.util.FieldUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.integration.redis.util.RedisLockRegistry;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.Lock;
+
+@RequiredArgsConstructor
+@Slf4j
+@RestController
+@Api(value = "ES工单API", tags = {"ES工单API"})
+@RequestMapping(value = "/orderEs/base", produces = "application/json; charset=utf-8")
+public class ESOrderBaseController {
+
+    private final OrderBaseLogic orderBaseLogic;
+    private final OrderBaseExcelLogic orderBaseExcelLogic;
+    private final OrderLogLogic orderLogLogic;
+    private final RedisLockRegistry redisLockRegistry;
+    private final CommonLogic commonLogic;
+
+
+
+    @ZfireList
+    @PostMapping("/list")
+    @ApiOperation(value = "列表")
+    public ResponseHelper<Page<OrderBaseVO>> list(
+            @RequestBody WorkOrderZfireParam workOrderZfireParam
+    ) {
+        IPage<OrderBaseVO> orderBaseVOIPage = orderBaseLogic.orderEsBaseList(workOrderZfireParam);
+        return ResponseHelper.success(orderBaseVOIPage, new TypeReference<OrderBaseVO>() {});
+    }
+
+}

mall-server-api/src/main/java/com/gree/mall/manager/es/OrderBaseEsRepository.java

@@ -5,7 +5,7 @@ import com.gree.mall.manager.bean.es.OrderBaseEs;
 import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
 
 /**
- * @author qinrongjun
+ * @author
  * @description
  * @date 2023/6/19 10:37 星期一
  */

mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/PolicyOrderLogic.java

@@ -18,8 +18,10 @@ import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.logic.common.CommonLogic;
 import com.gree.mall.manager.plus.entity.*;
 import com.gree.mall.manager.plus.service.*;
+import com.gree.mall.manager.utils.StringUtil;
 import com.gree.mall.manager.zfire.bean.ZfireParamBean;
 import com.gree.mall.manager.zfire.util.FieldUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.remoting.RemoteAccessException;
 import org.springframework.stereotype.Service;
@@ -152,10 +154,17 @@ public class PolicyOrderLogic {
     @Transactional(rollbackFor = Exception.class)
     public void importData(List<Object> objects) {
 
+        Integer index = 0;
         for (Object o : objects) {
             List<Object> row = (List<Object>) o;
 
+            ++index;
 
+            String errPrefix = "第" + (index) + "行";
+
+            if (StringUtils.isAnyBlank((String) row.get(1), (String) row.get(6))) {
+                throw new RemoteServiceException(errPrefix + "黄色区域为必填项");
+            }
             PolicyOrder policyOrder = policyOrderService.lambdaQuery()
                     .eq(PolicyOrder::getWebsitId, (String) row.get(1))
                     .eq(PolicyOrder::getWorkerIdcard, (String) row.get(6))

mall-server-api/src/main/java/com/gree/mall/manager/logic/user/UserLogic.java

@@ -381,12 +381,10 @@ public class UserLogic {
             }
 
 
-            try {
-
 
                 if (!StringUtil.isEmpty(company)) {
                     userWait.setCompany(company);
-                    userWait.setPolicyStartTime(DateUtil.parse(policy_start_time, "yyyy-MM-dd"));
+
                     userWait.setPolicyEndTime(DateUtil.offsetSecond(DateUtil.endOfDay(DateUtil.parse(policy_end_time, "yyyy-MM-dd")), -1));
 
                     if (userWait.getPolicyEndTime().before(new Date()))
@@ -404,8 +402,17 @@ public class UserLogic {
                     userWaitPolicy.setCompany(company);
                     userWaitPolicy.setPolicyName(policy_name);
                     userWaitPolicy.setPolicyOrder(policy_order);
-                    userWaitPolicy.setStartTime(DateUtil.parse(policy_start_time, "yyyy-MM-dd"));
-                    userWaitPolicy.setEndTime(this.getEndOfDay(DateUtil.parse(policy_end_time, "yyyy-MM-dd")));
+
+
+                    try {
+                        userWait.setPolicyStartTime(DateUtil.parse(policy_start_time, "yyyy-MM-dd"));
+                        userWaitPolicy.setStartTime(DateUtil.parse(policy_start_time, "yyyy-MM-dd"));
+                        userWaitPolicy.setEndTime(this.getEndOfDay(DateUtil.parse(policy_end_time, "yyyy-MM-dd")));
+
+                    }catch (Exception e){
+                        throw new RemoteServiceException(errPrefix + "时间格式错误");
+                    }
+
 
                     userWaitPolicies.add(userWaitPolicy);
                 } else {
@@ -429,19 +436,22 @@ public class UserLogic {
 
                 userWait.setName(name);
                 userWait.setIdcard(idcard);
-                userWait.setIdCardStartTime(DateUtil.parse(idcardStartTime, "yyyy-MM-dd"));
-                userWait.setIdCardEndTime(DateUtil.parse(idcardEndTime, "yyyy-MM-dd"));
+
                 userWait.setCompanyWechatId(adminUser.getCompanyWechatId());
                 userWait.setCompanyWechatName(adminUser.getCompanyName());
                 userWait.setBankAccount(brank);
                 userWait.setWorkerNumber(workerNumber);
 
+            try {
+                userWait.setIdCardStartTime(DateUtil.parse(idcardStartTime, "yyyy-MM-dd"));
+                userWait.setIdCardEndTime(DateUtil.parse(idcardEndTime, "yyyy-MM-dd"));
                 if (!StringUtil.isEmpty(hightNumber)) {
                     userWait.setNumber(hightNumber);
                     userWait.setStartTime(DateUtil.parse(hightStartTime, "yyyy-MM-dd"));
                     userWait.setEndTime(DateUtil.parse(hightEndTime, "yyyy-MM-dd"));
                     userWait.setHightExamineTime(DateUtil.parse(hightExamineTime, "yyyy-MM-dd"));
                 }
+
             }catch (Exception e){
                 throw new RemoteServiceException(errPrefix + "时间格式错误");
             }

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseLogic.java

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
 import com.gree.mall.manager.bean.common.RegionBean;
+import com.gree.mall.manager.bean.es.OrderBaseEs;
 import com.gree.mall.manager.bean.listvo.param.WorkOrderZfireParam;
 import com.gree.mall.manager.bean.listvo.workorder.OrderBase2VO;
 import com.gree.mall.manager.bean.listvo.workorder.OrderBaseAppraiseVO;
@@ -26,6 +27,7 @@ import com.gree.mall.manager.enums.workorder.OrderBaseStatusEnum;
 import com.gree.mall.manager.enums.workorder.OrderFlagEnum;
 import com.gree.mall.manager.enums.workorder.OrderTypeEnum;
 import com.gree.mall.manager.enums.workorder.SaleTypeEnum;
+import com.gree.mall.manager.es.OrderBaseEsRepository;
 import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.logic.common.CommonLogic;
 import com.gree.mall.manager.logic.common.LbsAmapLogic;
@@ -40,6 +42,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -84,6 +87,7 @@ public class OrderBaseLogic {
     private final RegionService regionService;
     private final NoticeRecordService noticeRecordService;
     private final LeaseOrderService leaseOrderService;
+    private final OrderBaseEsRepository orderBaseEsRepository;
 
     /**
      * 工单列表
@@ -1732,4 +1736,12 @@ public class OrderBaseLogic {
         itfGreeSynDownloadRec.setUpdatedTimestamp(new Date());
         itfGreeSynDownloadRec.insert();
     }
+
+    public IPage<OrderBaseVO> orderEsBaseList(WorkOrderZfireParam workOrderZfireParam) {
+        Iterable<OrderBaseEs> all = orderBaseEsRepository.findAll();
+
+        log.info("ES打印:"+all);
+
+        return new Page<>();
+    }
 }

mall-server-api/src/main/resources/bootstrap-dev.properties

@@ -95,7 +95,7 @@ inf.token.appSecret=3e7iee31ub94rvvesp7266kwske7fple
 #分销商城appid
 share.mall.appid=wx21d155e8a449d9b1
 
-#elasticsearch
+#elasticsearch,支持集群
 spring.elasticsearch.rest.uris=http://116.62.158.92:9200
 spring.elasticsearch.rest.username=elastic
 spring.elasticsearch.rest.password=zfire2022@