From 29cd606f6e2c614f765aa043435e6ca110c5c6cf Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 16 八月 2024 18:14:27 +0800
Subject: [PATCH] 代码初始化
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java | 14 ++
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformJobService.java | 9 +
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/PdaPlatformController.java | 78 +++++++++++
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/join/PlatformJobJoinMapper.java | 13 +
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/LineUpVO.java | 28 ++++
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/join/PlatformJoinMapper.java | 12 +
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformGroup.java | 5
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/DriverPlatformController.java | 8 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java | 80 +++++++++++
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/LineUpDetailDTO.java | 33 ++++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java | 63 +++++++++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformGroupService.java | 14 ++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformShowParamServiceImpl.java | 29 ++++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformShowParamService.java | 9 +
15 files changed, 397 insertions(+), 2 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/DriverPlatformController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/DriverPlatformController.java
index 9be7635..b3ca71c 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/DriverPlatformController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/DriverPlatformController.java
@@ -14,6 +14,7 @@
import com.doumee.dao.business.model.Visits;
import com.doumee.dao.web.reqeust.*;
import com.doumee.dao.web.response.DriverHomeVO;
+import com.doumee.dao.web.response.LineUpVO;
import com.doumee.dao.web.response.MemberVO;
import com.doumee.dao.web.response.VisitRecordVO;
import com.doumee.service.business.*;
@@ -94,7 +95,7 @@
}
- /******************************************************浠诲姟鎺ュ彛************************************************************************/
+ /******************************************************鍙告満浠诲姟鎺ュ彛************************************************************************/
@ApiOperation("浠诲姟绛惧埌")
@PostMapping("/signIn")
@@ -111,6 +112,11 @@
}
+ @ApiOperation("鏌ヨ鎺掗槦鎯呭喌")
+ @PostMapping("/jobDetail")
+ public ApiResponse<LineUpVO> lineUpDetail (@RequestBody LineUpDetailDTO lineUpDetailDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ return ApiResponse.success(platformJobService.lineUpDetail(lineUpDetailDTO));
+ }
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/PdaPlatformController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/PdaPlatformController.java
new file mode 100644
index 0000000..b9c77b5
--- /dev/null
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/PdaPlatformController.java
@@ -0,0 +1,78 @@
+package com.doumee.cloud.web;
+
+import com.doumee.api.BaseController;
+import com.doumee.config.annotation.LoginNoRequired;
+import com.doumee.core.annotation.trace.Trace;
+import com.doumee.core.model.ApiResponse;
+import com.doumee.core.model.PageData;
+import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
+import com.doumee.core.utils.DateUtil;
+import com.doumee.dao.business.model.PlatformBooks;
+import com.doumee.dao.business.model.PlatformGroup;
+import com.doumee.dao.business.model.PlatformJob;
+import com.doumee.dao.business.model.PlatformShowParam;
+import com.doumee.dao.web.reqeust.*;
+import com.doumee.dao.web.response.DriverHomeVO;
+import com.doumee.dao.web.response.LineUpVO;
+import com.doumee.service.business.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @Author : Rk
+ * @create 2023/12/28 14:31
+ */
+
+@Api(tags = "銆愬叕浼楀彿銆慞DA鏈堝彴涓氬姟")
+@Trace(exclude = true)
+@RestController
+@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/web/pdaPlatform")
+@Slf4j
+@LoginNoRequired
+public class PdaPlatformController extends BaseController {
+
+
+ @Autowired
+ private PlatformJobService platformJobService;
+
+ @Autowired
+ private PlatformBooksService platformBooksService;
+
+ @Autowired
+ private PlatformGroupService platformGroupService;
+
+ @Autowired
+ private PlatformShowParamService platformShowParamService;
+
+
+
+ @ApiOperation("鑾峰彇鏈堝彴缁勪俊鎭�")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "queryType", dataType = "Integer", value = "0=鍏ㄩ儴鏈堝彴锛�1=鍚敤鏈堝彴 2=閰嶇疆鎴戠殑鏈堝彴", required = false)
+ })
+ @GetMapping("/getPlatformGroupList")
+ public ApiResponse<List<PlatformGroup>> getPlatformGroupList (@RequestParam Integer queryType, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ return ApiResponse.success(platformGroupService.getAllPlatformGroup(queryType,getLoginUser(token)));
+ }
+
+ @ApiOperation("鏇存柊鏈堝彴閰嶇疆淇℃伅")
+ @GetMapping("/updUserPlatformConfig")
+ public ApiResponse updUserPlatformConfig (@RequestBody List<Integer> ids, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ platformShowParamService.updUserConfig(ids,getLoginUser(token));
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/join/PlatformJobJoinMapper.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/join/PlatformJobJoinMapper.java
new file mode 100644
index 0000000..887c38a
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/join/PlatformJobJoinMapper.java
@@ -0,0 +1,13 @@
+package com.doumee.dao.business.join;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.doumee.dao.business.model.PlatformJob;
+import com.github.yulichang.base.mapper.MPJJoinMapper;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2024/06/28 10:03
+ */
+public interface PlatformJobJoinMapper extends MPJJoinMapper<PlatformJob> {
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/join/PlatformJoinMapper.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/join/PlatformJoinMapper.java
new file mode 100644
index 0000000..c4d0062
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/join/PlatformJoinMapper.java
@@ -0,0 +1,12 @@
+package com.doumee.dao.business.join;
+
+import com.doumee.dao.business.model.Platform;
+import com.github.yulichang.base.MPJBaseMapper;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2024/06/28 10:03
+ */
+public interface PlatformJoinMapper extends MPJBaseMapper<Platform> {
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java
index ca20201..8063798 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java
@@ -11,6 +11,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
import java.math.BigDecimal;
+import java.util.List;
/**
* 鏈堝彴淇℃伅琛�
@@ -48,6 +49,7 @@
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
private Integer isdeleted;
+
@ApiModelProperty(value = "鍚嶇О")
@ExcelColumn(name="鍚嶇О")
@@ -162,4 +164,16 @@
@TableField(exist = false)
private String broadcaseNames;
+ @ApiModelProperty(value = "浣滀笟涓帓闃熻溅杈�", example = "1")
+ @TableField(exist = false)
+ private List<PlatformJob> workJobList;
+
+ @ApiModelProperty(value = "宸茬鍒版帓闃熻溅杈�", example = "1")
+ @TableField(exist = false)
+ private List<PlatformJob> signJobList;
+
+ @ApiModelProperty(value = "閰嶇疆鏄剧ず")
+ @TableField(exist = false)
+ private Boolean showConfig = false;
+
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformGroup.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformGroup.java
index 6ff8f36..f15c611 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformGroup.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformGroup.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -9,6 +10,7 @@
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
+import java.util.List;
/**
* 鏈堝彴_鍒嗙粍淇℃伅琛�
@@ -63,4 +65,7 @@
@ExcelColumn(name="鎺掑簭鐮�")
private Integer sortnum;
+ @ApiModelProperty(value = "鏈堝彴缁勪笅鐨勬湀鍙�")
+ @TableField(exist = false)
+ private List<Platform> platformList;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java
index e2cd5a2..b5a6f17 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java
@@ -268,6 +268,10 @@
@TableField(exist = false)
private Long lineUpNum;
+ @ApiModelProperty(value = "鍏宠仈鏈堝彴缁勭紪鐮侊紙鍏宠仈platform_group琛級", example = "1")
+ @TableField(exist = false)
+ private Integer groupId;
+
@ApiModelProperty(value = "浣滀笟鏈堝彴鍚嶇О")
@TableField(exist = false)
private String platformName ;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/LineUpDetailDTO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/LineUpDetailDTO.java
new file mode 100644
index 0000000..e83da18
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/LineUpDetailDTO.java
@@ -0,0 +1,33 @@
+package com.doumee.dao.web.reqeust;
+
+import com.doumee.core.model.LoginUserInfo;
+import com.doumee.dao.business.model.PlatformJob;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @Author : Rk
+ * @create 2023/12/7 11:19
+ */
+@Data
+@Api(tags = "鎺掗槦鎯呭喌璇锋眰绫�" )
+public class LineUpDetailDTO {
+
+ @ApiModelProperty(value = "鏌ヨ绫诲埆锛�0=鎵嬫満鍙凤紱1=浠诲姟涓婚敭")
+ private Integer queryType;
+
+ @ApiModelProperty(value = "鎵嬫満鍙�")
+ private String mobile;
+
+ @ApiModelProperty(value = "浠诲姟涓婚敭")
+ private Integer jobId;
+
+ @ApiModelProperty(value = "鐢ㄦ埛", hidden = true)
+ private LoginUserInfo loginUserInfo;
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/LineUpVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/LineUpVO.java
new file mode 100644
index 0000000..3c7b6c7
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/LineUpVO.java
@@ -0,0 +1,28 @@
+package com.doumee.dao.web.response;
+
+import com.doumee.core.model.LoginUserInfo;
+import com.doumee.dao.business.model.Platform;
+import com.doumee.dao.business.model.PlatformJob;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @Author : Rk
+ * @create 2023/12/7 11:19
+ */
+@Data
+@Api(tags = "鎺掗槦鎯呭喌" )
+public class LineUpVO {
+
+ @ApiModelProperty(value = "鏈堝彴缁勪俊鎭�")
+ private List<Platform> platformList;
+
+ @ApiModelProperty(value = "鐢ㄦ埛", hidden = true)
+ private LoginUserInfo loginUserInfo;
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformGroupService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformGroupService.java
index 386eac0..5a4b617 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformGroupService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformGroupService.java
@@ -1,5 +1,6 @@
package com.doumee.service.business;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.PlatformGroup;
@@ -94,4 +95,17 @@
* @return long
*/
long count(PlatformGroup platformGroup);
+
+ /**
+ * 鑾峰彇鏈堝彴缁勪俊鎭�
+ * @param queryType
+ * @param loginUserInfo
+ * @return
+ */
+ List<PlatformGroup> getAllPlatformGroup(Integer queryType, LoginUserInfo loginUserInfo);
+
+
+
+
+
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformJobService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformJobService.java
index 8d88a16..e663954 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformJobService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformJobService.java
@@ -4,8 +4,10 @@
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.PlatformJob;
import com.doumee.dao.web.reqeust.JobDetailDTO;
+import com.doumee.dao.web.reqeust.LineUpDetailDTO;
import com.doumee.dao.web.reqeust.SignInDTO;
import com.doumee.dao.web.response.DriverHomeVO;
+import com.doumee.dao.web.response.LineUpVO;
import java.util.List;
@@ -114,5 +116,10 @@
*/
PlatformJob getDetail(JobDetailDTO jobDetailDTO);
-
+ /**
+ * 鎺掗槦鎯呭喌
+ * @param lineUpDetailDTO
+ * @return
+ */
+ LineUpVO lineUpDetail(LineUpDetailDTO lineUpDetailDTO);
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformShowParamService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformShowParamService.java
index 96cc3ea..3798e7d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformShowParamService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformShowParamService.java
@@ -1,5 +1,6 @@
package com.doumee.service.business;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.PlatformShowParam;
@@ -94,4 +95,12 @@
* @return long
*/
long count(PlatformShowParam platformShowParam);
+
+
+ /**
+ * 鏇存柊鏈堝彴寮�鍚厤缃�
+ * @param showIdList
+ * @param loginUserInfo
+ */
+ void updUserConfig(List<Integer> showIdList, LoginUserInfo loginUserInfo);
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java
index 7258755..3895a97 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java
@@ -1,20 +1,29 @@
package com.doumee.service.business.impl;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.PlatformGroupMapper;
+import com.doumee.dao.business.PlatformShowParamMapper;
+import com.doumee.dao.business.join.PlatformJoinMapper;
+import com.doumee.dao.business.model.Platform;
import com.doumee.dao.business.model.PlatformGroup;
+import com.doumee.dao.business.model.PlatformShowParam;
import com.doumee.service.business.PlatformGroupService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
/**
* 鏈堝彴_鍒嗙粍淇℃伅琛⊿ervice瀹炵幇
@@ -26,6 +35,12 @@
@Autowired
private PlatformGroupMapper platformGroupMapper;
+
+ @Autowired
+ private PlatformJoinMapper platformJoinMapper;
+
+ @Autowired
+ private PlatformShowParamMapper platformShowParamMapper;
@Override
public Integer create(PlatformGroup platformGroup) {
@@ -118,4 +133,52 @@
QueryWrapper<PlatformGroup> wrapper = new QueryWrapper<>(platformGroup);
return platformGroupMapper.selectCount(wrapper);
}
+
+
+ @Override
+ public List<PlatformGroup> getAllPlatformGroup(Integer queryType,LoginUserInfo loginUserInfo) {
+ List<PlatformGroup> platformGroups = platformGroupMapper.selectList(
+ new QueryWrapper<PlatformGroup>()
+ .lambda().eq(PlatformGroup::getIsdeleted, Constants.ZERO)
+ .orderByAsc(PlatformGroup::getSortnum)
+ );
+ //鏌ヨ鏈堝彴缁勪笅鎵�鏈夋湀鍙�
+ List<Platform> allPlatformList = platformJoinMapper.selectJoinList(Platform.class,
+ new MPJLambdaWrapper<Platform>()
+ .selectAll(Platform.class)
+ .eq(Platform::getIsdeleted, Constants.ZERO)
+ //TODO 寰呯‘璁ゆ湀鍙扮姸鎬佸瓧娈�
+ .eq(Objects.nonNull(queryType)&&!Constants.equalsInteger(queryType,Constants.ZERO),Platform::getStatus,Constants.ZERO)
+ );
+ //澶勭悊鎴戠殑鏈堝彴淇℃伅 鏄惁閰嶇疆闅愯棌
+ if(Constants.equalsInteger(queryType,Constants.TWO)){
+ List<PlatformShowParam> platformShowParamList = platformShowParamMapper.selectList(new QueryWrapper<PlatformShowParam>()
+ .lambda()
+ .eq(PlatformShowParam::getIsdeleted, Constants.ZERO)
+ .eq(PlatformShowParam::getMemberId,loginUserInfo.getMemberId())
+ );
+ //濡傛灉鏈厤缃鏁版嵁 鍒欏叏閮ㄦ樉绀�
+ if(CollectionUtils.isEmpty(platformShowParamList)){
+ for (Platform platform:allPlatformList) {
+ platform.setShowConfig(true);
+ }
+ }else{
+ //鏍规嵁閰嶇疆鏄剧ず鏁版嵁
+ for (PlatformShowParam platformShowParam:platformShowParamList) {
+ for (Platform platform:allPlatformList) {
+ if(Constants.equalsInteger(platform.getId(),platformShowParam.getPlatformId())){
+ platform.setShowConfig(true);
+ break;
+ }
+ }
+ }
+ }
+ }
+ for (PlatformGroup platformGroup:platformGroups) {
+ platformGroup.setPlatformList(allPlatformList.stream().filter(m->Constants.equalsInteger(m.getGroupId(),platformGroup.getId())).collect(Collectors.toList()));
+ }
+ return platformGroups;
+ }
+
+
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
index 84fb6c9..f8860db 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
@@ -13,17 +13,22 @@
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.PlatformJobMapper;
import com.doumee.dao.business.PlatformMapper;
+import com.doumee.dao.business.join.PlatformJobJoinMapper;
import com.doumee.dao.business.model.Platform;
import com.doumee.dao.business.model.PlatformBooks;
import com.doumee.dao.business.model.PlatformJob;
+import com.doumee.dao.business.model.PlatformReason;
import com.doumee.dao.web.reqeust.JobDetailDTO;
+import com.doumee.dao.web.reqeust.LineUpDetailDTO;
import com.doumee.dao.web.reqeust.SignInDTO;
import com.doumee.dao.web.response.DriverHomeVO;
+import com.doumee.dao.web.response.LineUpVO;
import com.doumee.service.business.PlatformJobService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -34,6 +39,7 @@
import java.util.Date;
import java.util.List;
import java.util.Objects;
+import java.util.stream.Collectors;
/**
* 鏈堝彴璋冨害浣滀笟淇℃伅琛⊿ervice瀹炵幇
@@ -45,6 +51,9 @@
@Autowired
private PlatformJobMapper platformJobMapper;
+
+ @Autowired
+ private PlatformJobJoinMapper platformJobJoinMapper;
@Autowired
private SystemDictDataBiz systemDictDataBiz;
@@ -328,7 +337,78 @@
+ @Override
+ public LineUpVO lineUpDetail(LineUpDetailDTO lineUpDetailDTO){
+ if(Objects.isNull(lineUpDetailDTO)
+ || Objects.isNull(lineUpDetailDTO.getQueryType())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ LineUpVO lineUpVO = new LineUpVO();
+ //鏌ヨ鎵�鏈変换鍔�
+ List<PlatformJob> platformJobList = platformJobJoinMapper.selectJoinList(PlatformJob.class,
+ new MPJLambdaWrapper<PlatformJob>()
+ .selectAll(PlatformJob.class)
+ .selectAs(PlatformReason::getGroupId,PlatformJob::getGroupId)
+ .leftJoin(PlatformBooks.class,PlatformBooks::getJobId,PlatformJob::getId)
+ .leftJoin(PlatformReason.class,PlatformReason::getId,PlatformBooks::getReasonId)
+ .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+ .eq(Constants.equalsInteger(lineUpDetailDTO.getQueryType(),Constants.ZERO)
+ ,PlatformJob::getDrivierPhone,lineUpDetailDTO.getMobile())
+ .eq(Constants.equalsInteger(lineUpDetailDTO.getQueryType(),Constants.ONE)
+ ,PlatformJob::getId,lineUpDetailDTO.getJobId())
+ .in(PlatformJob::getStatus,Constants.PlatformJobStatus.WAIT_CALL.getKey(),
+ Constants.PlatformJobStatus.IN_WAIT.getKey(),
+ Constants.PlatformJobStatus.CALLED.getKey())
+ .orderByAsc(PlatformJob::getSignDate)
+ );
+ //鑾峰彇鎵�鏈夋湀鍙�
+ List<Integer> platformIdList = platformJobList.stream().map(m->m.getGroupId()).collect(Collectors.toList());
+ List<Platform> platformList = platformMapper.selectList(new QueryWrapper<Platform>().lambda()
+ .eq(Platform::getIsdeleted,Constants.ZERO)
+ .in(Platform::getId,platformIdList));
+ for (Platform platform:platformList) {
+ //鏌ヨ鏈湀鍙颁笅 鑷繁鐨勬暟鎹� 鏈�鏃╃鍒扮殑
+ PlatformJob platformJob = platformJobList.stream().filter(i->Constants.equalsInteger(i.getGroupId(),platform.getId())).findFirst().orElse(null);
+ //鏌ヨ鍦ㄥ綋鍓嶆湀鍙颁笅 绛惧埌鎺掗槦杞﹁締鏁版嵁
+ List<PlatformJob> platformJobSignInList = platformJobJoinMapper.selectJoinList(PlatformJob.class,
+ new MPJLambdaWrapper<PlatformJob>()
+ .selectAll(PlatformJob.class)
+ .selectAs(PlatformReason::getGroupId,PlatformJob::getGroupId)
+ .leftJoin(PlatformBooks.class,PlatformBooks::getJobId,PlatformJob::getId)
+ .leftJoin(PlatformReason.class,PlatformReason::getId,PlatformBooks::getReasonId)
+ .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+ .ge(Objects.nonNull(platformJob),PlatformJob::getSignDate,DateUtil.getDate(platformJob.getSignDate(),"yyyy-MM-dd HH:mm:ss"))
+ .in(PlatformJob::getStatus,Constants.PlatformJobStatus.WAIT_CALL.getKey(),
+ Constants.PlatformJobStatus.IN_WAIT.getKey(),
+ Constants.PlatformJobStatus.CALLED.getKey())
+ .orderByDesc(PlatformJob::getSignDate));
+ platform.setSignJobList(platformJobSignInList);
+ //鏌ヨ褰撳墠鏈堝彴涓�
+ List<PlatformJob> platformJobWorkList = platformJobJoinMapper.selectJoinList(PlatformJob.class,
+ new MPJLambdaWrapper<PlatformJob>()
+ .selectAll(PlatformJob.class)
+ .selectAs(PlatformReason::getGroupId,PlatformJob::getGroupId)
+ .leftJoin(PlatformBooks.class,PlatformBooks::getJobId,PlatformJob::getId)
+ .leftJoin(PlatformReason.class,PlatformReason::getId,PlatformBooks::getReasonId)
+ .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+ .eq(PlatformJob::getStatus,Constants.PlatformJobStatus.WORKING.getKey())
+ .orderByDesc(PlatformJob::getSignDate));
+ platform.setSignJobList(platformJobSignInList);
+ platform.setWorkJobList(platformJobWorkList);
+ }
+
+
+
+
+
+
+
+ lineUpVO.setPlatformList(platformList);
+
+
+ return lineUpVO;
+ }
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformShowParamServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformShowParamServiceImpl.java
index d18bfe7..168ed88 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformShowParamServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformShowParamServiceImpl.java
@@ -1,7 +1,10 @@
package com.doumee.service.business.impl;
+import com.doumee.core.exception.BusinessException;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.PlatformShowParamMapper;
import com.doumee.dao.business.model.PlatformShowParam;
@@ -12,8 +15,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
+import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
/**
@@ -118,4 +124,27 @@
QueryWrapper<PlatformShowParam> wrapper = new QueryWrapper<>(platformShowParam);
return platformShowParamMapper.selectCount(wrapper);
}
+
+
+ @Override
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
+ public void updUserConfig(List<Integer> showIdList, LoginUserInfo loginUserInfo){
+ platformShowParamMapper.delete(new QueryWrapper<PlatformShowParam>()
+ .lambda().eq(PlatformShowParam::getMemberId,loginUserInfo.getMemberId())
+ );
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(showIdList)){
+ List<PlatformShowParam> platformShowParamList = new ArrayList<>();
+ for (Integer id:showIdList) {
+ PlatformShowParam platformShowParam = new PlatformShowParam();
+ platformShowParam.setCreateDate(new Date());
+ platformShowParam.setMemberId(loginUserInfo.getMemberId());
+ platformShowParam.setIsdeleted(Constants.ZERO);
+ platformShowParam.setPlatformId(id);
+ platformShowParamList.add(platformShowParam);
+ }
+ platformShowParamMapper.insert(platformShowParamList);
+ }
+ }
+
+
}
--
Gitblit v1.9.3