Merge branch 'dev' of http://git.sckaiwu.cn/17358629955/sckw-service-platform into dev

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/controller/KwfDriverController.java

@@ -4,13 +4,11 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.sckw.core.exception.SystemException;
 import com.sckw.core.model.constant.Global;
-import com.sckw.core.model.enums.SystemTypeEnum;
 import com.sckw.core.model.page.PageHelperUtil;
 import com.sckw.core.model.page.PageResult;
 import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.core.web.response.HttpResult;
-import com.sckw.excel.easyexcel.RequestHolder;
 import com.sckw.excel.utils.ExcelUtil;
 import com.sckw.fleet.model.dto.*;
 import com.sckw.fleet.model.vo.*;
@@ -18,6 +16,7 @@ import com.sckw.fleet.service.KwfDriverService;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -125,13 +124,12 @@ public class KwfDriverController {
      * @author zk
      * @date 2023/07/11
      **/
-    @PostMapping("/export")
-    public void export(@RequestBody Map<String, Object> params) {
+    @PostMapping(value = "/export", produces = MediaType.APPLICATION_JSON_VALUE)
+    public void export(@RequestBody Map<String, Object> params, HttpServletResponse response) {
         /**分页数据**/
         List<KwfDriverVo> drivers = driverService.findPage(params);
 
         if (!CollectionUtils.isEmpty(drivers)) {
-            HttpServletResponse response = RequestHolder.getResponse();
             ExcelUtil.downData(response, KwfDriverVo.class, drivers);
             //return null;
         }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/controller/KwfFleetController.java

@@ -16,6 +16,7 @@ import com.sckw.fleet.service.KwfFleetService;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 import java.util.List;
@@ -78,14 +79,13 @@ public class KwfFleetController {
      * @author zk
      * @date 2023/07/11
      **/
-    @PostMapping("/export")
-    public HttpResult export(@RequestBody Map<String, Object> params) {
+    @PostMapping(value = "/export", produces = MediaType.APPLICATION_JSON_VALUE)
+    public HttpResult export(@RequestBody Map<String, Object> params, HttpServletResponse response) {
         params.put("entId", LoginUserHolder.getEntId());
         /**查询分页数据**/
         List<KwfFleetVo> fleets = fleetService.findPage(params);
 
         if (!CollectionUtils.isEmpty(fleets)) {
-            HttpServletResponse response = RequestHolder.getResponse();
             ExcelUtil.downData(response, KwfFleetVo.class, fleets);
             return null;
         }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/controller/KwfTruckController.java

@@ -27,6 +27,7 @@ import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import java.io.BufferedReader;
@@ -136,13 +137,12 @@ public class KwfTruckController {
      * @author zk
      * @date 2023/07/11
      **/
-    @PostMapping("/export")
-    public HttpResult export(@RequestBody Map<String, Object> params) {
+    @PostMapping(value = "/export", produces = MediaType.APPLICATION_JSON_VALUE)
+    public HttpResult export(@RequestBody Map<String, Object> params, HttpServletResponse response) {
         /**查询数据**/
         List<KwfTruckVo> trucks = truckService.findPage(params);
 
         if (!CollectionUtils.isEmpty(trucks)) {
-            HttpServletResponse response = RequestHolder.getResponse();
             ExcelUtil.downData(response, KwfTruckVo.class, trucks);
             return null;
         }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/controller/KwfTruckReportController.java

@@ -18,6 +18,7 @@ import com.sckw.fleet.service.KwfTruckReportService;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -71,14 +72,13 @@ public class KwfTruckReportController {
      * @author zk
      * @date 2023/07/18
      **/
-    @PostMapping("/export")
-    public HttpResult export(@RequestBody Map<String, Object> params) {
+    @PostMapping(value = "/export", produces = MediaType.APPLICATION_JSON_VALUE)
+    public HttpResult export(@RequestBody Map<String, Object> params, HttpServletResponse response) {
         params.put("entId", LoginUserHolder.getEntId());
         /**查询数据**/
         List<KwfTruckReportVo> trucks = reportService.findPage(params);
 
         if (!CollectionUtils.isEmpty(trucks)) {
-            HttpServletResponse response = RequestHolder.getResponse();
             ExcelUtil.downData(response, KwfTruckReportVo.class, trucks);
             return null;
         }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/vo/KwfDriverVo.java

@@ -5,7 +5,9 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.sckw.excel.annotation.ExcelContext;
 import lombok.Data;
-
+import lombok.experimental.Accessors;
+import java.io.Serial;
+import java.io.Serializable;
 import java.util.Date;
 
 /**
@@ -14,8 +16,11 @@ import java.util.Date;
  * @date 2023/7/7 0007
  */
 @Data
+@Accessors(chain = true)
 @ExcelContext(fileName = "司机信息", sheetName = "司机信息")
-public class KwfDriverVo {
+public class KwfDriverVo implements Serializable {
+    @Serial
+    private static final long serialVersionUID = -7951209824419412386L;
 
     /**
      * 司机主键id

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/vo/KwfFleetVo.java

@@ -4,6 +4,9 @@ import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.sckw.excel.annotation.ExcelContext;
 import lombok.Data;
+import lombok.experimental.Accessors;
+import java.io.Serial;
+import java.io.Serializable;
 
 /**
  * @author zk
@@ -11,8 +14,11 @@ import lombok.Data;
  * @date 2023/7/6 0006
  */
 @Data
+@Accessors(chain = true)
 @ExcelContext(fileName = "车队班组信息", sheetName = "车队班组信息")
-public class KwfFleetVo {
+public class KwfFleetVo implements Serializable {
+    @Serial
+    private static final long serialVersionUID = -7951209824419412686L;
 
     /**
      * 主键id

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/vo/KwfTruckReportVo.java

@@ -4,6 +4,9 @@ import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.sckw.excel.annotation.ExcelContext;
 import lombok.Data;
+import lombok.experimental.Accessors;
+import java.io.Serial;
+import java.io.Serializable;
 
 /**
  * @desc 车辆上报
@@ -11,8 +14,11 @@ import lombok.Data;
  * @date 2023/7/15
  */
 @Data
+@Accessors(chain = true)
 @ExcelContext(fileName = "车辆上报信息", sheetName = "车辆上报信息")
-public class KwfTruckReportVo {
+public class KwfTruckReportVo implements Serializable {
+    @Serial
+    private static final long serialVersionUID = -7951209824419412486L;
 
     /**
      * 车辆主键id

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/vo/KwfTruckVo.java

@@ -5,7 +5,9 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.sckw.excel.annotation.ExcelContext;
 import lombok.Data;
-
+import lombok.experimental.Accessors;
+import java.io.Serial;
+import java.io.Serializable;
 import java.util.Date;
 
 /**
@@ -14,8 +16,11 @@ import java.util.Date;
  * @date 2023/7/11 0011
  */
 @Data
+@Accessors(chain = true)
 @ExcelContext(fileName = "车辆信息", sheetName = "车辆信息")
-public class KwfTruckVo {
+public class KwfTruckVo implements Serializable {
+    @Serial
+    private static final long serialVersionUID = -7951209824419412586L;
 
     /**
      * 车辆信息主键id

sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwoTransportDemandService.java

@@ -24,14 +24,16 @@ import com.sckw.order.dao.KwoTransportDemandMapper;
 import com.sckw.order.model.KwoTransportDemand;
 import com.sckw.order.model.dto.TransportDemandExport;
 import com.sckw.order.model.vo.req.*;
-import com.sckw.order.model.vo.res.*;
+import com.sckw.order.model.vo.res.TransportDemandContactInfoRes;
+import com.sckw.order.model.vo.res.TransportDemandDetailRes;
+import com.sckw.order.model.vo.res.TransportDemandListRes;
+import com.sckw.order.model.vo.res.TransportDemandSquaresListRes;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.EntCacheResDto;
 import com.sckw.system.api.model.dto.res.SysDictResDto;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
-import org.springframework.data.mongodb.core.aggregation.ArrayOperators;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
@@ -203,7 +205,7 @@ public class KwoTransportDemandService {
                     .setStatusLabel(DictEnum.getLabel(DictTypeEnum.TRANSPORT_DEMAND_STATUS.getType(), String.valueOf(e.getStatus())))
                     .setLoadAddress(loadAreaName + loadDetailAddress)
                     .setUnloadAddress(unloadAreaName + unloadDetailAddress)
-                    .setEntName(entMap != null ? entMap.get(e.getEntId()) : null);
+                    .setEntName(entMap.get(e.getEntId()));
             result.add(demand);
         });
         return PageResult.build(param.getPage(), param.getPageSize(), demandPage.getTotal(), result);
@@ -217,13 +219,12 @@ public class KwoTransportDemandService {
      * @return: com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper<com.sckw.order.model.KwoTransportDemand>
      */
     private LambdaQueryWrapper<KwoTransportDemand> buildWrapper(ExportTransportDemandParam param) {
-        Long entId = !Objects.equals(LoginUserHolder.getSystemType(), SystemTypeEnum.MANAGE.getCode()) ? LoginUserHolder.getEntId() : null;
         LambdaQueryWrapper<KwoTransportDemand> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(KwoTransportDemand::getDelFlag, Global.NO);
         if (!Objects.equals(LoginUserHolder.getSystemType(), SystemTypeEnum.MANAGE.getCode())) {
-            wrapper.eq(KwoTransportDemand::getEntId, entId);
-        } else {
-            wrapper.in(KwoTransportDemand::getStatus, 1 , 2);
+            wrapper.eq(KwoTransportDemand::getEntId, LoginUserHolder.getEntId());
+        } else if (Objects.isNull(param.getStatus())) {
+            wrapper.in(KwoTransportDemand::getStatus, 1, 2);
         }
         if (StringUtils.isNotBlank(param.getIds())) {
             List<Long> ids = StringUtils.splitStrToList(param.getIds(), ",", Long.class);
@@ -429,7 +430,7 @@ public class KwoTransportDemandService {
             }
         }
         Integer unloadCode = param.getUnloadAreaCode();
-        if (Objects.nonNull(unloadCode) && Objects.nonNull(param.getLoadAreaLevel())) {
+        if (Objects.nonNull(unloadCode) && Objects.nonNull(param.getUnloadAreaLevel())) {
             switch (param.getUnloadAreaLevel()) {
                 case 1 ->
                         wrapper.likeRight(KwoTransportDemand::getUnloadAreaCode, Integer.valueOf(String.valueOf(unloadCode).substring(0, 2)));

sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwpWantBuyService.java

@@ -141,7 +141,7 @@ public class KwpWantBuyService {
             List<String> goodsTypes = goodsTypeHandle(wantBuySelectParam);
             wantBuySelectParam.setGoodsTypeValueSearch(goodsTypes);
         }
-        wantBuySelectParam.setEntId(LoginUserHolder.getSystemType() != SystemTypeEnum.MANAGE.getCode() ? LoginUserHolder.getEntId() : null);
+        wantBuySelectParam.setEntId(!Objects.equals(LoginUserHolder.getSystemType(), SystemTypeEnum.MANAGE.getCode()) ? LoginUserHolder.getEntId() : null);
         wantBuySelectParam.setSystemType(LoginUserHolder.getSystemType());
 
         PageHelper.startPage(wantBuySelectParam.getPage(), wantBuySelectParam.getPageSize());
@@ -490,7 +490,7 @@ public class KwpWantBuyService {
                 selectParam.setGoodsTypeValueSearch(goodsTypes);
             }
         }
-        selectParam.setEntId(LoginUserHolder.getSystemType() != SystemTypeEnum.MANAGE.getCode() ? LoginUserHolder.getEntId() : null);
+        selectParam.setEntId(!Objects.equals(LoginUserHolder.getSystemType(), SystemTypeEnum.MANAGE.getCode()) ? LoginUserHolder.getEntId() : null);
         selectParam.setSystemType(LoginUserHolder.getSystemType());
 
         List<WantBuySelectRes> wantBuyDto = kwpWantBuyMapper.pageSelect(selectParam);

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/operator/TradeOrderManageService.java

@@ -16,7 +16,6 @@ import com.sckw.report.service.param.TradeOrderListExport;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Sort;
-import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
@@ -35,8 +34,6 @@ import java.util.regex.Pattern;
 @AllArgsConstructor
 public class TradeOrderManageService {
 
-    private final MongoTemplate mongoTemplate;
-
     private final KwOrderService kwOrderService;
 
 

sckw-modules/sckw-system/src/main/java/com/sckw/system/controller/KwsUserController.java

@@ -88,6 +88,7 @@ public class KwsUserController {
      * @date: 2023/6/14
      */
     @PostMapping("/add")
+    @RepeatSubmit(interval = 3000,message ="两次请求间隔未超过3秒")
     public HttpResult add(@Valid @RequestBody UserAddReqVo reqVo) {
         kwsUserService.add(reqVo);
         return HttpResult.ok(HttpStatus.MSG_003);

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsUserService.java

@@ -95,19 +95,22 @@ public class KwsUserService {
 
         /*2、填充密码*/
         fillPassword(kwsUser);
+        synchronized(this) {
+            //再次校验数据
+            checkAccountValid(kwsUser.getAccount(), kwsUser.getSystemType());
+            /*3、存库*/
+            long userId = new IdWorker(1).nextId();
+            kwsUser.setId(userId);
+            if (kwsUserDao.insert(kwsUser) <= 0) {
+                throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.INSERT_FAIL);
+            }
 
-        /*3、存库*/
-        long userId = new IdWorker(1).nextId();
-        kwsUser.setId(userId);
-        if (kwsUserDao.insert(kwsUser) <= 0) {
-            throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.INSERT_FAIL);
-        }
-
-        /*4、填充用户角色*/
-        fillUserRole(reqVo.getRoleIds(), userId, reqVo.getSystemType());
+            /*4、填充用户角色*/
+            fillUserRole(reqVo.getRoleIds(), userId, reqVo.getSystemType());
 
-        /*5、用户机构关系*/
-        fillUserDept(kwsUser.getId(), reqVo.getDeptId());
+            /*5、用户机构关系*/
+            fillUserDept(kwsUser.getId(), reqVo.getDeptId());
+        }
 
     }