From 4e1d90d7cfaef3c7a2893e6fcb946ce7dabe938e Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 24 十月 2025 13:54:52 +0800
Subject: [PATCH] 最新版本541200007
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java | 46 ++++++++++++++++++++--
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformJobService.java | 1
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformJobCloudController.java | 11 +++++
server/startsh/admin_start.sh | 2
7 files changed, 57 insertions(+), 7 deletions(-)
diff --git a/server/startsh/admin_start.sh b/server/startsh/admin_start.sh
index 6810e77..c693288 100644
--- a/server/startsh/admin_start.sh
+++ b/server/startsh/admin_start.sh
@@ -15,7 +15,7 @@
nohup java -jar /usr/local/jars/meeting_admin.jar > /dev/null 2>&1 &
#tail -f /usr/local/jars/logs/visitsTimer/info.2025-10-20.1.log
-#tail -f /usr/local/jars/logs/visitsAdmin/info.2025-10-20.1.log
+#tail -f /usr/local/jars/logs/visitsAdmin/info.2025-10-24.1.log
#tail -f /usr/local/jars/logs/system_gateway/info.2025-10-20.1.log
#tail -f /usr/local/jars/logs/systemTimer/info.2025-10-20.1.log
#tail -f /usr/local/jars/logs/meetingAdmin/info.2025-10-20.1.log
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
index ae89d84..6497f8c 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -929,6 +929,7 @@
LEAVED(10, "宸茬鍥� ","杞﹁締浠巤data}绂诲満 " ),
OVER_NUMBER(11, "宸茶繃鍙�","瓒呮椂鏈埌鎸囧畾鏈堝彴鑷姩杩囧彿" ),
CHANGE_GROUP(12, "鏇存崲鏈堝彴缁�","浠庛�恵data}銆戞洿鎹㈠埌銆恵data1}銆�" ),
+ BACK_TO_WAIT_SIGNIN(13, "閲嶆柊绛惧埌","閲嶆柊绛惧埌" ),
;
// 鎴愬憳鍙橀噺
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformJobCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformJobCloudController.java
index 976577f..cb497da 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformJobCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformJobCloudController.java
@@ -6,6 +6,7 @@
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.dao.business.vo.PlatformJobExportVo;
+import com.doumee.dao.web.reqeust.JobOperateDTO;
import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
@@ -20,6 +21,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.models.auth.In;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -197,4 +199,13 @@
platformJobService.jobUrge(platformJob.getId(),getLoginUser(token));
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
+
+ @ApiOperation("绉婚櫎杞﹁締鎺掗槦闃熷垪锛堝洖鍒板緟绛惧埌锛�")
+ @PostMapping("/backToWatiSign")
+ @CloudRequiredPermission("business:platformjob:update")
+ public ApiResponse backToWatiSign (@RequestBody PlatformJob platformJob,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ platformJobService.backToWatiSign(platformJob.getId(),getLoginUser(token));
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
}
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 36c418c..2886ef7 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
@@ -26,7 +26,7 @@
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
- private Integer id;
+ private Integer id;
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
private Integer creator;
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 cac9921..4998b45 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
@@ -274,4 +274,5 @@
void autoCallInParkCar(WmsService wmsService);
void jobUrge(Integer jobId,LoginUserInfo loginUserInfo);
+ void backToWatiSign(Integer jobId,LoginUserInfo loginUserInfo);
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
index b352a5e..fa6995e 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
@@ -1812,6 +1812,7 @@
//鐢熸垚浠诲姟璁板綍
PlatformJob platformJob = platformBooks.toPlatformJob();
platformJob.setId(null);
+ platformJob.setOrigin(Constants.ZERO);
platformJob.setPlatformGroupId(platformReason.getGroupId().intValue());
if(Constants.equalsInteger(platformGroup.getType(),Constants.ZERO)){
platformJob.setType(Constants.platformJobType.wxcxh);
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 1a800e3..0c33cda 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
@@ -2638,8 +2638,10 @@
@Transactional
public void autoPlatformCallCar(WmsService wmsService){
//鏌ヨ褰撳墠寮�鍚殑鏈堝彴鏁版嵁
- List<PlatformGroup> allPlatformGroup = platformGroupMapper.selectList(new QueryWrapper<PlatformGroup>().lambda().eq(PlatformGroup::getStatus,Constants.ZERO)
- .eq(PlatformGroup::getIsdeleted,Constants.ZERO).eq(PlatformGroup::getAutoCall,Constants.ONE)
+ List<PlatformGroup> allPlatformGroup = platformGroupMapper.selectList(new QueryWrapper<PlatformGroup>().lambda()
+ .eq(PlatformGroup::getStatus,Constants.ZERO)
+ .eq(PlatformGroup::getIsdeleted,Constants.ZERO)
+ .eq(PlatformGroup::getAutoCall,Constants.ONE)
);
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(allPlatformGroup)){
log.error("========鏈堝彴鑷姩鍙彿============缁撴潫锛氭棤鑷姩鍙彿鏈堝彴缁�");
@@ -2672,6 +2674,7 @@
List<PlatformJob> noticeList = new ArrayList<>();
//寰幆鎵�鏈夎嚜鍔ㄥ彨鍙锋湀鍙�
for (PlatformGroup platformGroup:autoCallGroup) {
+ log.error("========鏈堝彴缁勮嚜鍔ㄥ彨鍙�============ --"+platformGroup.getName());
List<Platform> platforms = platformList.stream().filter(i->Constants.equalsInteger(i.getGroupId(),platformGroup.getId())).collect(Collectors.toList());
if(CollectionUtils.isEmpty(platforms)){
log.error("========鏈堝彴鑷姩鍙彿============缁撴潫锛氭棤鑷姩鍙彿鏈堝彴-"+platformGroup.getName());
@@ -2705,7 +2708,8 @@
Integer workNum = platformJobJoinMapper.selectCount(new QueryWrapper<PlatformJob>().lambda()
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
.eq(PlatformJob::getPlatformId,platform.getId())
- .eq(PlatformJob::getStatus,Constants.PlatformJobStatus.CALLED.getKey())).intValue();
+ .in(PlatformJob::getStatus,Constants.PlatformJobStatus.CALLED.getKey(),Constants.PlatformJobStatus.WORKING.getKey())
+ ) .intValue();
if(workNum>=workingNum){
log.error("========鏈堝彴鑷姩鍙彿============缁撴潫锛氳秴杩囪嚜鍔ㄥ彨鍙蜂綔涓氶檺鍒�-"+platform.getName());
continue;
@@ -2834,8 +2838,7 @@
if((((platforms.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)).collect(Collectors.toList()).size()>Constants.ZERO)?Constants.ONE:Constants.ZERO)
+
((platforms.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ZERO)).collect(Collectors.toList()).size()>Constants.ZERO)?Constants.ONE:Constants.ZERO)
- )==Constants.ONE
- ){
+ )==Constants.ONE ){
isDefaul = true;
}
}
@@ -2994,6 +2997,9 @@
typeParam = 1;//
}
}
+ }else{
+ //棰勭害杞﹀叏閮ㄦ暎浠�
+ typeParam = 1;
}
}
@@ -3030,6 +3036,36 @@
.eq(PlatformJob::getId,platformJob.getId())
);
}
+ @Override
+ public void backToWatiSign(Integer jobId,LoginUserInfo loginUserInfo){
+ if(Objects.isNull(jobId)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ PlatformJob platformJob = platformJobMapper.selectById(jobId);
+ if(Objects.isNull(platformJob)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ if(!Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.WAIT_CALL.getKey())){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝鐘舵�佸凡娴佽浆");
+ }
+
+ PlatformJob oldPlatformJob = new PlatformJob();
+ BeanUtils.copyProperties(platformJob,oldPlatformJob);
+
+ platformJob.setStatus(Constants.PlatformJobStatus.WART_SIGN_IN.getKey());
+ platformJob.setEditDate(new Date());
+ platformJobMapper.update(null,new UpdateWrapper<PlatformJob>().lambda()
+ .eq(PlatformJob::getId,platformJob.getId())
+ .set(PlatformJob::getEditor,loginUserInfo.getId())
+ .set(PlatformJob::getSignDate,null)
+ .set(PlatformJob::getSingType,null)
+ .set(PlatformJob::getSignDistance,null)
+ .set(PlatformJob::getStatus,platformJob.getStatus())
+ .set(PlatformJob::getEditDate,platformJob.getEditDate()));
+ //瀛樺偍鎿嶄綔鏃ュ織
+ savePlatformLog(Constants.PlatformJobLogType.BACK_TO_WAIT_SIGNIN.getKey(),oldPlatformJob,platformJob,
+ Constants.PlatformJobLogType.BACK_TO_WAIT_SIGNIN.getInfo());
+ }
--
Gitblit v1.9.3