From 4507bf23a1acbe0aab1c7f3eb31776727e695b86 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 19 八月 2024 14:30:23 +0800
Subject: [PATCH] 最新版本
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java | 9 ----
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java | 8 +--
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java | 62 ++++++++++++++++++++++++++++++-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformGroupService.java | 2 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java | 23 +++++++----
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformGroup.java | 3 +
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformGroupCloudController.java | 6 ++-
7 files changed, 86 insertions(+), 27 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformGroupCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformGroupCloudController.java
index 150f083..a614144 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformGroupCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformGroupCloudController.java
@@ -35,6 +35,7 @@
@PostMapping("/create")
@CloudRequiredPermission("business:platformgroup:create")
public ApiResponse create(@RequestBody PlatformGroup platformGroup,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ platformGroup.setLoginUserInfo(this.getLoginUser(token));
return ApiResponse.success(platformGroupService.create(platformGroup));
}
@@ -42,7 +43,7 @@
@GetMapping("/delete/{id}")
@CloudRequiredPermission("business:platformgroup:delete")
public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
- platformGroupService.deleteById(id);
+ platformGroupService.deleteById(id,this.getLoginUser(token));
return ApiResponse.success(null);
}
@@ -50,7 +51,7 @@
@GetMapping("/delete/batch")
@CloudRequiredPermission("business:platformgroup:delete")
public ApiResponse deleteByIdInBatch(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
- platformGroupService.deleteByIdInBatch(this.getIdList(ids));
+ platformGroupService.deleteByIdInBatch(this.getIdList(ids),this.getLoginUser(token));
return ApiResponse.success(null);
}
@@ -58,6 +59,7 @@
@PostMapping("/updateById")
@CloudRequiredPermission("business:platformgroup:update")
public ApiResponse updateById(@RequestBody PlatformGroup platformGroup,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ platformGroup.setLoginUserInfo(this.getLoginUser(token));
platformGroupService.updateById(platformGroup);
return ApiResponse.success(null);
}
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 cbd58c9..364d303 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
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -20,7 +21,7 @@
@Data
@ApiModel("鏈堝彴_鍒嗙粍淇℃伅琛�")
@TableName("`platform_group`")
-public class PlatformGroup {
+public class PlatformGroup extends LoginUserModel {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
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 b5a6f17..7859656 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
@@ -113,6 +113,9 @@
@ApiModelProperty(value = "鏈�杩戝垎閰嶆湀鍙扮紪鐮侊紙鍏宠仈platform)", example = "1")
@ExcelColumn(name="鏈�杩戝垎閰嶆湀鍙扮紪鐮侊紙鍏宠仈platform)")
private Integer platformId;
+ @ApiModelProperty(value = "鏈堝彴鍒嗙粍缂栫爜锛堝叧鑱攑latform_group)", example = "1")
+ @ExcelColumn(name="鏈堝彴鍒嗙粍缂栫爜锛堝叧鑱攑latform_group)")
+ private Integer platformGroupId;
@ApiModelProperty(value = "閫氱煡鍏ュ洯绛夊緟鏃堕棿")
@ExcelColumn(name="閫氱煡鍏ュ洯绛夊緟鏃堕棿")
@@ -138,17 +141,14 @@
@ApiModelProperty(value = "寮�濮嬩綔涓氭椂闂�")
@ExcelColumn(name="寮�濮嬩綔涓氭椂闂�")
-
private Date startDate;
@ApiModelProperty(value = "浣滀笟瀹屾垚鏃堕棿锛堟渶缁堟椂闂达級")
@ExcelColumn(name="浣滀笟瀹屾垚鏃堕棿锛堟渶缁堟椂闂达級")
-
private Date doneDate;
@ApiModelProperty(value = "寮傚父鎸傝捣鏃堕棿")
@ExcelColumn(name="寮傚父鎸傝捣鏃堕棿")
-
private Date errorDate;
@ApiModelProperty(value = "寮傚父鎸傝捣浜虹紪鐮�", example = "1")
@@ -208,7 +208,6 @@
@ApiModelProperty(value = "杞﹁締杩涘巶涓嬪彂鏃堕棿")
@ExcelColumn(name="杞﹁締杩涘巶涓嬪彂鏃堕棿")
-
private Date inHkdate;
@ApiModelProperty(value = "浣滀笟绫诲瀷 0鑷湁杞﹀嵏璐� 1鑷湁杞﹁璐� 2澶栧崗杞﹀嵏璐� 3澶栧崗杞﹁璐� 4甯傚叕鍙稿鍗忚溅鍗歌揣", example = "1")
@@ -233,7 +232,6 @@
@ApiModelProperty(value = "浣滃簾鏃堕棿")
@ExcelColumn(name="浣滃簾鏃堕棿")
-
private Date cancelDate;
@ApiModelProperty(value = "浣滃簾澶勭悊浜虹紪鐮�", example = "1")
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 5a4b617..5f98d89 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
@@ -27,6 +27,7 @@
* @param id 涓婚敭
*/
void deleteById(Integer id);
+ void deleteById(Integer id,LoginUserInfo user);
/**
* 鍒犻櫎
@@ -41,6 +42,7 @@
* @param ids 涓婚敭闆�
*/
void deleteByIdInBatch(List<Integer> ids);
+ void deleteByIdInBatch(List<Integer> ids,LoginUserInfo user);
/**
* 涓婚敭鏇存柊
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 3895a97..227a194 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,5 +1,7 @@
package com.doumee.service.business.impl;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
@@ -21,6 +23,7 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
@@ -44,13 +47,43 @@
@Override
public Integer create(PlatformGroup platformGroup) {
+ if(platformGroup.getType() ==null
+ || platformGroup.getType()>2
+ || platformGroup.getType()<0){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ if(platformGroupMapper.selectCount(new QueryWrapper<PlatformGroup>().lambda()
+ .eq(PlatformGroup::getIsdeleted,Constants.ZERO)
+ .eq(PlatformGroup::getType,platformGroup.getType())
+ )>0){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ョ被鍨嬪垎缁勫凡缁忓垱寤猴紝璇疯繑鍥炲埛鏂伴〉闈㈡煡鐪嬶紒");
+ }
+
+ platformGroup.setIsdeleted(Constants.ZERO);
+ platformGroup.setCreator(platformGroup.getLoginUserInfo().getId());
+ platformGroup.setCreateDate(new Date());
+ platformGroup.setEditDate(platformGroup.getEditDate());
+ platformGroup.setEditor(platformGroup.getCreator());
platformGroupMapper.insert(platformGroup);
return platformGroup.getId();
}
@Override
public void deleteById(Integer id) {
- platformGroupMapper.deleteById(id);
+ PlatformGroup param = new PlatformGroup();
+ param.setId(id);
+ param.setIsdeleted(Constants.ONE);
+ platformGroupMapper.updateById(param);
+ }
+ @Override
+ public void deleteById(Integer id,LoginUserInfo user) {
+// platformGroupMapper.deleteById(id);
+ PlatformGroup param = new PlatformGroup();
+ param.setId(id);
+ param.setIsdeleted(Constants.ONE);
+ param.setEditor(user.getId());
+ param.setEditDate(new Date());
+ platformGroupMapper.updateById(param);
}
@Override
@@ -64,11 +97,36 @@
if (CollectionUtils.isEmpty(ids)) {
return;
}
- platformGroupMapper.deleteBatchIds(ids);
+ for(Integer id : ids){
+ deleteById(id);
+ }
+ }
+ @Override
+ public void deleteByIdInBatch(List<Integer> ids,LoginUserInfo user) {
+ if (CollectionUtils.isEmpty(ids)) {
+ return;
+ }
+ for(Integer id : ids){
+ deleteById(id,user);
+ }
}
@Override
public void updateById(PlatformGroup platformGroup) {
+ if(platformGroup.getType() ==null
+ || platformGroup.getType()>2
+ || platformGroup.getType()<0){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ if(platformGroupMapper.selectCount(new QueryWrapper<PlatformGroup>().lambda()
+ .eq(PlatformGroup::getIsdeleted,Constants.ZERO)
+ .eq(PlatformGroup::getType,platformGroup.getType())
+ .ne(PlatformGroup::getId,platformGroup.getId())
+ )>0){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ョ被鍨嬪垎缁勫凡缁忓垱寤猴紝璇疯繑鍥炲埛鏂伴〉闈㈡煡鐪嬶紒");
+ }
+ platformGroup.setEditDate(platformGroup.getEditDate());
+ platformGroup.setEditor(platformGroup.getCreator());
platformGroupMapper.updateById(platformGroup);
}
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 f8860db..a5ec104 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
@@ -397,16 +397,7 @@
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/wms/WmsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java
index 86f8137..d4d4d4b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java
@@ -6,14 +6,8 @@
import com.doumee.core.wms.model.request.*;
import com.doumee.core.wms.model.response.WmsBaseDataResponse;
import com.doumee.core.wms.model.response.WmsBaseResponse;
-import com.doumee.dao.business.CarsMapper;
-import com.doumee.dao.business.PlatformJobMapper;
-import com.doumee.dao.business.PlatformWmsDetailMapper;
-import com.doumee.dao.business.PlatformWmsJobMapper;
-import com.doumee.dao.business.model.Cars;
-import com.doumee.dao.business.model.PlatformJob;
-import com.doumee.dao.business.model.PlatformWmsDetail;
-import com.doumee.dao.business.model.PlatformWmsJob;
+import com.doumee.dao.business.*;
+import com.doumee.dao.business.model.*;
import com.doumee.service.business.WmsService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,6 +27,8 @@
public class WmsServiceImpl implements WmsService {
@Autowired
private PlatformWmsJobMapper platformWmsJobMapper;
+ @Autowired
+ private PlatformGroupMapper platformGroupMapper;
@Autowired
private CarsMapper carsMapper;
@Autowired
@@ -68,6 +64,7 @@
.last("limit 1" ));
if(job == null){
+
PlatformJob model =dealJobBizInbound(param);
job = new PlatformWmsJob();
job.setCreateDate(new Date());
@@ -146,6 +143,11 @@
job.setStatus(Constants.PlatformJobStatus.WAIT_CALL.getKey());//鍦ㄥ洯鏃犱綔涓氱姸鎬侊紝鍒欒嚜鍔ㄣ�愬凡绛惧埌銆戝鐞�
}
}
+ PlatformGroup group = platformGroupMapper.selectOne(new QueryWrapper<PlatformGroup>().lambda()
+ .eq(PlatformGroup::getIsdeleted,Constants.ZERO)
+ .eq(PlatformGroup::getType,Constants.ONE)
+ .last("limit 1") );//鏌ヨ鍗歌揣鏈堝彴缁勭紪鐮�
+ job.setPlatformGroupId(group!=null?group.getId():null);
platformJobMapper.insert(job);
return job;
}
@@ -170,6 +172,11 @@
job.setStatus(Constants.PlatformJobStatus.WAIT_CALL.getKey());//鍦ㄥ洯鏃犱綔涓氱姸鎬侊紝鍒欒嚜鍔ㄣ�愬凡绛惧埌銆戝鐞�
}
}
+ PlatformGroup group = platformGroupMapper.selectOne(new QueryWrapper<PlatformGroup>().lambda()
+ .eq(PlatformGroup::getIsdeleted,Constants.ZERO)
+ .eq(PlatformGroup::getType,Constants.ZERO)
+ .last("limit 1") );//鏌ヨ瑁呰揣鏈堝彴缁勭紪鐮�
+ job.setPlatformGroupId(group!=null?group.getId():null);
platformJobMapper.insert(job);
return job;
}
--
Gitblit v1.9.3