From 0883b709d59a21fcd930208387be9ea07076886a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 21 八月 2024 17:11:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java | 3
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsJob.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java | 496 +++++++++++++++++++++++++++++++++++++++--
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java | 34 ++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformJobService.java | 50 ++++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java | 3
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/PdaPlatformController.java | 69 +++++
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/JobOperateDTO.java | 33 ++
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformLog.java | 6
11 files changed, 666 insertions(+), 38 deletions(-)
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 a7b492b..f76dfc4 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
@@ -5,6 +5,8 @@
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import io.swagger.models.auth.In;
+import org.apache.batik.util.Platform;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
@@ -921,6 +923,8 @@
T reqJson = mapper.readValue(json, clazz);
return reqJson;
}
+
+
/**
* 鍛樺伐淇℃伅缁存姢鎿嶄綔鍘嗗彶绫诲瀷 0瑙ｅ喕 1鍐荤粨 2鎷夐粦 3鎭㈠ 4璁句负鎷滆浜� 5鍙栨秷鎷滆浜� 6璁句负楂樼骇瀹℃壒浜� 7鍙栨秷楂樼骇瀹℃壒浜� 8鎵嬪姩绂诲満 9鍒犻櫎 10鏇存柊 11鎺堟潈闂ㄧ鏉冮檺 12绂昏亴 13鎭㈠鍦ㄨ亴
*/
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
index b9c77b5..8e81e40 100644
--- 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
@@ -21,6 +21,7 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -48,9 +49,6 @@
private PlatformJobService platformJobService;
@Autowired
- private PlatformBooksService platformBooksService;
-
- @Autowired
private PlatformGroupService platformGroupService;
@Autowired
@@ -58,9 +56,12 @@
+
+
+
@ApiOperation("鑾峰彇鏈堝彴缁勪俊鎭�")
@ApiImplicitParams({
- @ApiImplicitParam(name = "queryType", dataType = "Integer", value = "0=鍏ㄩ儴鏈堝彴锛�1=鍚敤鏈堝彴 2=閰嶇疆鎴戠殑鏈堝彴", required = false)
+ @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){
@@ -74,5 +75,65 @@
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
+ @ApiOperation("杞﹁締鎺掗槦鎯呭喌")
+ @PostMapping("/platformLineUpPage")
+ public ApiResponse<PageData<PlatformJob>> platformLineUpPage (@RequestBody PageWrap<PlatformJob> pageWrap) {
+ return ApiResponse.success(platformJobService.findPage(pageWrap));
+ }
+
+
+ @ApiOperation("鏈堝彴鍙彿")
+ @PostMapping("/platformCallNumber")
+ public ApiResponse platformCallNumber (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ jobOperateDTO.setLoginUserInfo(getLoginUser(token));
+ platformJobService.platformInPark(jobOperateDTO);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+
+ @ApiOperation("杞Щ鏈堝彴")
+ @PostMapping("/platformMove")
+ public ApiResponse platformMove (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ jobOperateDTO.setLoginUserInfo(getLoginUser(token));
+ platformJobService.platformInPark(jobOperateDTO);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+ @ApiOperation("鏈堝彴杩囧彿")
+ @PostMapping("/platformOverNumber")
+ public ApiResponse platformOverNumber (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ jobOperateDTO.setLoginUserInfo(getLoginUser(token));
+ platformJobService.platformInPark(jobOperateDTO);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+ @ApiOperation("寮傚父鎸傝捣")
+ @PostMapping("/platformErr")
+ public ApiResponse platformErr (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ jobOperateDTO.setLoginUserInfo(getLoginUser(token));
+ platformJobService.platformInPark(jobOperateDTO);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+ @ApiOperation("鎵嬪姩寮�濮嬩綔涓�")
+ @PostMapping("/beginWork")
+ public ApiResponse beginWork (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ jobOperateDTO.setLoginUserInfo(getLoginUser(token));
+ platformJobService.platformInPark(jobOperateDTO);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+
+ @ApiOperation("瀹屾垚浣滀笟")
+ @PostMapping("/finishWork")
+ public ApiResponse finishWork (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ jobOperateDTO.setLoginUserInfo(getLoginUser(token));
+ platformJobService.platformInPark(jobOperateDTO);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+
+
+
}
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 314f0df..7f6c4b6 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
@@ -180,4 +180,7 @@
@TableField(exist = false)
private Boolean showConfig = false;
+ @ApiModelProperty(value = "浣滀笟鐘舵�侊細0=绌洪棽锛�1=浣滀笟涓�")
+ @TableField(exist = false)
+ private Integer workStatus;
}
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 7859656..57cfc6d 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
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.core.utils.Constants;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -11,6 +12,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
import java.math.BigDecimal;
+import java.util.Objects;
/**
* 鏈堝彴璋冨害浣滀笟淇℃伅琛�
@@ -91,7 +93,6 @@
@ApiModelProperty(value = "绛惧埌鏃堕棿")
@ExcelColumn(name="绛惧埌鏃堕棿")
-
private Date signDate;
@ApiModelProperty(value = "绛惧埌鏂瑰紡 0app绛惧埌 1鎵爜绛惧埌", example = "1")
@@ -161,7 +162,6 @@
@ApiModelProperty(value = "鏈堝彴杞氦鏃堕棿")
@ExcelColumn(name="鏈堝彴杞氦鏃堕棿")
-
private Date transPlatformDate;
@ApiModelProperty(value = "鏈堝彴杞氦澶勭悊浜�", example = "1")
@@ -278,4 +278,34 @@
@TableField(exist = false)
private BigDecimal getDistance;
+
+ @ApiModelProperty(value = "涓氬姟瑙﹀彂鏃堕棿 鏃堕棿")
+ @TableField(exist = false)
+ private Long optTime;
+
+ @ApiModelProperty(value = "宸蹭綔涓氭椂闂�")
+ @TableField(exist = false)
+ private Long workTime;
+
+ @ApiModelProperty(value = "WMS浠诲姟淇℃伅")
+ @TableField(exist = false)
+ private PlatformWmsJob platformWmsJob;
+
+ public void dealTime(){
+ if(Constants.equalsInteger(this.getStatus(),Constants.PlatformJobStatus.WAIT_CONFIRM.getKey())
+ || Constants.equalsInteger(this.getStatus(),Constants.PlatformJobStatus.WART_SIGN_IN.getKey())
+ ){
+ return;
+ }
+ if(Constants.equalsInteger(this.getStatus(),Constants.PlatformJobStatus.WAIT_CALL.getKey())){
+ this.setOptTime(this.getSignDate().getTime());
+ }else if(Constants.equalsInteger(this.getStatus(),Constants.PlatformJobStatus.IN_WAIT.getKey())){
+ this.setOptTime(this.getInwaitDate().getTime());
+ }else if(Constants.equalsInteger(this.getStatus(),Constants.PlatformJobStatus.CALLED.getKey())){
+ this.setOptTime(this.getCallDate().getTime());
+ }else if(Constants.equalsInteger(this.getStatus(),Constants.PlatformJobStatus.WORKING.getKey())){
+ this.setOptTime(this.getStartDate().getTime());
+ }
+ }
+
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformLog.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformLog.java
index 972c60c..dc52393 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformLog.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformLog.java
@@ -79,15 +79,15 @@
@ExcelColumn(name="鎿嶄綔鍚庡唴瀹�")
private String afterContent;
- @ApiModelProperty(value = "鍙傛暟1")
+ @ApiModelProperty(value = "鍙傛暟1 寮�濮嬩綔涓氭椂闂�")
@ExcelColumn(name="鍙傛暟1")
private String param1;
- @ApiModelProperty(value = "鍙傛暟2")
+ @ApiModelProperty(value = "鍙傛暟2 缁撴潫浣滀笟鏃堕棿")
@ExcelColumn(name="鍙傛暟2")
private String param2;
- @ApiModelProperty(value = "鍙傛暟3")
+ @ApiModelProperty(value = "鍙傛暟3 鏈浣滀笟鑰楁椂 鍗曚綅锛� 绉�")
@ExcelColumn(name="鍙傛暟3")
private String param3;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsJob.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsJob.java
index 5b9a619..f3b22db 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsJob.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsJob.java
@@ -10,6 +10,7 @@
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
+import java.util.List;
/**
* 鏈堝彴_WMS浣滀笟閫氱煡鍗曡鏁版嵁
@@ -112,4 +113,7 @@
@TableField(exist = false)
private int isNew;
+ @ApiModelProperty(value = "鏈堝彴_WMS浣滀笟閫氱煡鍗曟槑缁�")
+ @TableField(exist = false)
+ private List<PlatformWmsDetail> platformWmsDetailList;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/JobOperateDTO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/JobOperateDTO.java
new file mode 100644
index 0000000..5af0cb3
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/JobOperateDTO.java
@@ -0,0 +1,33 @@
+package com.doumee.dao.web.reqeust;
+
+import com.doumee.core.model.LoginUserInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @Author : Rk
+ * @create 2023/12/7 11:19
+ */
+@Data
+@Api(tags = "鏈堝彴杞Щ涓氬姟" )
+public class JobOperateDTO {
+
+ @ApiModelProperty(value = "浠诲姟涓婚敭")
+ private Integer jobId;
+
+ @ApiModelProperty(value = "杞Щ鏈堝彴涓婚敭 杞Щ涓氬姟浣跨敤")
+ private Integer platformId;
+
+ @ApiModelProperty(value = "鍚庤溅鐗屽彿 鑷姩寮�濮嬩换鍔′娇鐢�")
+ private String carCodeBack;
+
+ @ApiModelProperty(value = "鏈堝彴鐩告満涓婚敭 鑷姩寮�濮嬩换鍔′娇鐢�")
+ private Integer deviceId;
+
+ @ApiModelProperty(value = "鐢ㄦ埛", hidden = true)
+ private 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 e663954..ac8a7a8 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,6 +4,7 @@
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.JobOperateDTO;
import com.doumee.dao.web.reqeust.LineUpDetailDTO;
import com.doumee.dao.web.reqeust.SignInDTO;
import com.doumee.dao.web.response.DriverHomeVO;
@@ -122,4 +123,53 @@
* @return
*/
LineUpVO lineUpDetail(LineUpDetailDTO lineUpDetailDTO);
+
+ /**
+ * 閫氱煡鍏ュ洯
+ * @param jobOperateDTO
+ */
+ void platformInPark(JobOperateDTO jobOperateDTO);
+
+ /**
+ * 鏈堝彴鍙彿
+ * @param jobOperateDTO
+ */
+ void platformCallNumber(JobOperateDTO jobOperateDTO);
+
+ /**
+ * 杞Щ鏈堝彴
+ * @param jobOperateDTO
+ */
+ void platformMove(JobOperateDTO jobOperateDTO);
+
+ /**
+ * 鏈堝彴杩囧彿
+ * @param jobOperateDTO
+ */
+ void platformOverNumber(JobOperateDTO jobOperateDTO);
+
+ /**
+ * 寮傚父鎸傝捣
+ * @param jobOperateDTO
+ */
+ void platformErr(JobOperateDTO jobOperateDTO);
+
+ /**
+ * 鎵嬪姩寮�濮嬩綔涓�
+ * @param jobOperateDTO
+ */
+ void beginWork(JobOperateDTO jobOperateDTO);
+
+ /**
+ * 鏈堝彴鐩告満 寮�濮嬩綔涓�
+ * @param jobOperateDTO
+ */
+ void cameraStartWork(JobOperateDTO jobOperateDTO);
+
+ /**
+ * 瀹屾垚浣滀笟
+ * @param jobOperateDTO
+ */
+ void finishWork(JobOperateDTO jobOperateDTO);
+
}
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 4742664..804ee30 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
@@ -1365,7 +1365,7 @@
platformLog.setCreateDate(new Date());
platformLog.setJobId(platformJob.getId());
platformLog.setIsdeleted(Constants.ZERO);
- platformLog.setObjType(Constants.ZERO);
+ platformLog.setObjType(Constants.PlatformJobStatus.WART_SIGN_IN.getKey());
platformLog.setObjId(platformJob.getId().toString());
platformLog.setAfterContent(JSONObject.toJSONString(platformJob));
platformLogMapper.insert(platformLog);
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 7700605..7dcc045 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
@@ -204,8 +204,9 @@
List<Platform> allPlatformList = platformJoinMapper.selectJoinList(Platform.class,
new MPJLambdaWrapper<Platform>()
.selectAll(Platform.class)
+ .select(" ( select count(1) from platform_job pj where t.id = pj.PLATFORM_ID and pj.STATUS = "+Constants.PlatformJobStatus.WORKING.getKey()+" ) as workStatus ")
.eq(Platform::getIsdeleted, Constants.ZERO)
- //TODO 寰呯‘璁ゆ湀鍙扮姸鎬佸瓧娈�
+ .eq(Platform::getStatus, Constants.ZERO)
.eq(Objects.nonNull(queryType)&&!Constants.equalsInteger(queryType,Constants.ZERO),Platform::getStatus,Constants.ZERO)
);
//澶勭悊鎴戠殑鏈堝彴淇℃伅 鏄惁閰嶇疆闅愯棌
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 a5ec104..d8e0284 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
@@ -1,24 +1,20 @@
package com.doumee.service.business.impl;
-import cn.hutool.crypto.asymmetric.Sign;
+import com.alibaba.fastjson.JSONObject;
import com.doumee.biz.system.SystemDictDataBiz;
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;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.PositionUtil;
import com.doumee.core.utils.Utils;
-import com.doumee.dao.business.PlatformJobMapper;
-import com.doumee.dao.business.PlatformMapper;
+import com.doumee.dao.business.*;
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.business.model.*;
import com.doumee.dao.web.reqeust.JobDetailDTO;
+import com.doumee.dao.web.reqeust.JobOperateDTO;
import com.doumee.dao.web.reqeust.LineUpDetailDTO;
import com.doumee.dao.web.reqeust.SignInDTO;
import com.doumee.dao.web.response.DriverHomeVO;
@@ -30,6 +26,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -53,6 +50,9 @@
private PlatformJobMapper platformJobMapper;
@Autowired
+ private PlatformDeviceMapper platformDeviceMapper;
+
+ @Autowired
private PlatformJobJoinMapper platformJobJoinMapper;
@Autowired
@@ -60,6 +60,15 @@
@Autowired
private PlatformMapper platformMapper;
+
+ @Autowired
+ private PlatformLogMapper platformLogMapper;
+
+ @Autowired
+ private PlatformWmsJobMapper platformWmsJobMapper;
+
+ @Autowired
+ private PlatformWmsDetailMapper platformWmsDetailMapper;
@Override
@@ -183,8 +192,8 @@
.ge(pageWrap.getModel().getInHkdate() != null, PlatformJob::getInHkdate, Utils.Date.getStart(pageWrap.getModel().getInHkdate()))
.le(pageWrap.getModel().getInHkdate() != null, PlatformJob::getInHkdate, Utils.Date.getEnd(pageWrap.getModel().getInHkdate()))
.eq(pageWrap.getModel().getType() != null, PlatformJob::getType, pageWrap.getModel().getType())
- .eq(pageWrap.getModel().getCarCodeFront() != null, PlatformJob::getCarCodeFront, pageWrap.getModel().getCarCodeFront())
- .eq(pageWrap.getModel().getCarCodeBack() != null, PlatformJob::getCarCodeBack, pageWrap.getModel().getCarCodeBack())
+ .like(pageWrap.getModel().getCarCodeFront() != null, PlatformJob::getCarCodeFront, pageWrap.getModel().getCarCodeFront())
+ .like(pageWrap.getModel().getCarCodeBack() != null, PlatformJob::getCarCodeBack, pageWrap.getModel().getCarCodeBack())
.eq(pageWrap.getModel().getCompanyId() != null, PlatformJob::getCompanyId, pageWrap.getModel().getCompanyId())
.eq(pageWrap.getModel().getCompanyNamePath() != null, PlatformJob::getCompanyNamePath, pageWrap.getModel().getCompanyNamePath())
.ge(pageWrap.getModel().getCancelDate() != null, PlatformJob::getCancelDate, Utils.Date.getStart(pageWrap.getModel().getCancelDate()))
@@ -197,7 +206,9 @@
.le(pageWrap.getModel().getArriveDate() != null, PlatformJob::getArriveDate, Utils.Date.getEnd(pageWrap.getModel().getArriveDate()))
.eq(pageWrap.getModel().getInType() != null, PlatformJob::getInType, pageWrap.getModel().getInType())
.eq(pageWrap.getModel().getTotalNum() != null, PlatformJob::getTotalNum, pageWrap.getModel().getTotalNum())
+ .eq(pageWrap.getModel().getPlatformGroupId() != null, PlatformJob::getPlatformGroupId, pageWrap.getModel().getPlatformGroupId())
;
+
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
queryWrapper.orderByDesc(sortData.getProperty());
@@ -205,8 +216,45 @@
queryWrapper.orderByAsc(sortData.getProperty());
}
}
- return PageData.from(platformJobMapper.selectPage(page, queryWrapper));
+
+ PageData<PlatformJob> pageData = PageData.from(platformJobMapper.selectPage(page, queryWrapper));
+ pageData.getRecords().forEach(i->{
+ i.dealTime();
+ this.getWmsJobData(i);
+ });
+ return pageData;
}
+
+
+ public void getWmsJobData(PlatformJob platformJob){
+ if(Constants.equalsInteger(platformJob.getType(),Constants.platformJobType.zycxh)
+ || Constants.equalsInteger(platformJob.getType(),Constants.platformJobType.zyczh)
+ || Constants.equalsInteger(platformJob.getType(),Constants.platformJobType.sgscxh)) {
+
+ PlatformWmsJob platformWmsJob = platformWmsJobMapper.selectOne(new QueryWrapper<PlatformWmsJob>().lambda()
+ .eq(PlatformWmsJob::getIsdeleted,Constants.ZERO)
+ .eq(PlatformWmsJob::getJobId,platformJob.getId())
+ .orderByDesc(PlatformWmsJob::getId)
+ .last(" limit 1")
+ );
+ if(Objects.isNull(platformWmsJob)){
+ return;
+ }
+ List<PlatformWmsDetail> platformWmsDetailList = platformWmsDetailMapper.selectList(new QueryWrapper<PlatformWmsDetail>().lambda()
+ .eq(PlatformWmsDetail::getIsdeleted,Constants.ZERO)
+ .eq(PlatformWmsDetail::getJobId,platformJob.getId()));
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(platformWmsDetailList)){
+ platformJob.setTotalNum(
+ platformWmsDetailList.stream().map(m->m.getIoQty()).reduce(BigDecimal.ZERO,BigDecimal::add)
+ );
+ platformWmsJob.setPlatformWmsDetailList(platformWmsDetailList);
+ platformJob.setPlatformWmsJob(platformWmsJob);
+ }
+ }
+
+
+ }
+
@Override
public long count(PlatformJob platformJob) {
@@ -251,6 +299,9 @@
if(!Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.WART_SIGN_IN.getKey())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓氬姟鐘舵�佸凡娴佽浆锛岃鍒锋柊鏌ョ湅");
}
+ PlatformJob oldPlatformJob = new PlatformJob();
+ BeanUtils.copyProperties(platformJob,oldPlatformJob);
+
if(Constants.equalsInteger(signInDTO.getSignType(),Constants.ZERO)){
this.distanceSignIn(signInDTO,platformJob);
}else if(Constants.equalsInteger(signInDTO.getSignType(),Constants.ONE)){
@@ -260,6 +311,8 @@
platformJob.setSingType(Constants.ZERO);
platformJob.setStatus(Constants.PlatformJobStatus.WAIT_CALL.getKey());
platformJobMapper.updateById(platformJob);
+ //瀛樺偍鎿嶄綔鏃ュ織
+ savePlatformLog(Constants.PlatformJobStatus.WAIT_CALL.getKey(),oldPlatformJob,platformJob);
}
@@ -331,7 +384,11 @@
if(Objects.nonNull(platform)){
platformJob.setPlatformName(platform.getName());
}
+
}
+ platformJob.dealTime();
+ this.getWorkTime(platformJob);
+ this.getWmsJobData(platformJob);
return platformJob;
}
@@ -348,9 +405,6 @@
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())
@@ -361,40 +415,35 @@
Constants.PlatformJobStatus.CALLED.getKey())
.orderByAsc(PlatformJob::getSignDate)
);
- //鑾峰彇鎵�鏈夋湀鍙�
- List<Integer> platformIdList = platformJobList.stream().map(m->m.getGroupId()).collect(Collectors.toList());
+ //鑾峰彇鎵�鏈夋湀鍙扮粍
+ List<Integer> platformIdList = platformJobList.stream().map(m->m.getPlatformGroupId()).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);
- //鏌ヨ鍦ㄥ綋鍓嶆湀鍙颁笅 绛惧埌鎺掗槦杞﹁締鏁版嵁
+ //鏌ヨ鏈湀鍙扮粍涓� 鑷繁鐨勬暟鎹� 鏈�鏃╃鍒扮殑
+ PlatformJob platformJob = platformJobList.stream().filter(i->Constants.equalsInteger(i.getPlatformId(),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)
+ .eq(PlatformJob::getPlatformGroupId,platform.getGroupId())
.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::getPlatformGroupId,platform.getGroupId())
.eq(PlatformJob::getStatus,Constants.PlatformJobStatus.WORKING.getKey())
.orderByDesc(PlatformJob::getSignDate));
- platform.setSignJobList(platformJobSignInList);
platform.setWorkJobList(platformJobWorkList);
}
lineUpVO.setPlatformList(platformList);
@@ -402,5 +451,398 @@
}
+ /**
+ * 鑾峰彇宸蹭綔涓氭椂闂�
+ * @param platformJob
+ */
+ public void getWorkTime(PlatformJob platformJob){
+ List<PlatformLog> platformLogList = platformLogMapper.selectList(new QueryWrapper<PlatformLog>()
+ .lambda().eq(PlatformLog::getIsdeleted,Constants.ZERO)
+ .eq(PlatformLog::getJobId,platformJob.getId())
+ .ne(PlatformLog::getParam3,"0")
+ );
+ Long optTime = 0L;
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(platformLogList)){
+ List<Long> param3List = platformLogList.stream().map(m->Long.valueOf(m.getParam3())).collect(Collectors.toList());
+ for (Long val:param3List) {
+ optTime = optTime + val;
+ }
+ }
+ if(Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.WORKING.getKey())){
+ //鏌ヨ鏈�鍚庝竴娆″紑濮嬬殑鏃ュ織鏁版嵁
+ PlatformLog lastBeginPlatform = platformLogMapper.selectOne(new QueryWrapper<PlatformLog>().lambda()
+ .eq(PlatformLog::getIsdeleted,Constants.ZERO)
+ .eq(PlatformLog::getObjType,Constants.PlatformJobStatus.WORKING.getKey())
+ .eq(PlatformLog::getJobId,platformJob.getId())
+ .orderByDesc(PlatformLog::getCreateDate)
+ .last(" limit 1 ")
+ );
+ if(Objects.nonNull(lastBeginPlatform)){
+ String v = Long.toString(System.currentTimeMillis() - lastBeginPlatform.getCreateDate().getTime() / 1000) ;
+ optTime = optTime + Long.valueOf(v);
+ }
+ }
+ platformJob.setWorkTime(optTime);
+ }
+
+ /**
+ * 閫氱煡鍏ュ洯
+ */
+ @Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
+ public void platformInPark(JobOperateDTO jobOperateDTO){
+ if(Objects.isNull(jobOperateDTO)
+ || Objects.isNull(jobOperateDTO.getJobId())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ PlatformJob platformJob = platformJobMapper.selectById(jobOperateDTO.getJobId());
+ 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.setInwaitDate(new Date());
+ platformJob.setInwaitUserId(jobOperateDTO.getLoginUserInfo().getId());
+ platformJob.setStatus(Constants.PlatformJobStatus.IN_WAIT.getKey());
+ platformJob.setEditDate(new Date());
+ platformJobMapper.updateById(platformJob);
+
+ if(Constants.equalsInteger(platformJob.getType(),Constants.TWO)
+ || Constants.equalsInteger(platformJob.getType(),Constants.THREE)
+ || Constants.equalsInteger(platformJob.getType(),Constants.FOUR)){
+ //TODO 涓嬪彂鍏ュ洯鏉冮檺
+
+ }
+
+ //瀛樺偍鎿嶄綔鏃ュ織
+ savePlatformLog(Constants.PlatformJobStatus.WAIT_CALL.getKey(),oldPlatformJob,platformJob);
+
+ }
+
+ /**
+ * 鏈堝彴鍙彿
+ */
+ @Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
+ public void platformCallNumber(JobOperateDTO jobOperateDTO){
+ if(Objects.isNull(jobOperateDTO)
+ || Objects.isNull(jobOperateDTO.getJobId())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ PlatformJob platformJob = platformJobMapper.selectById(jobOperateDTO.getJobId());
+ if(Objects.isNull(platformJob)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ if(!(Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.WAIT_CALL.getKey())
+ || Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.IN_WAIT.getKey())
+ || Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.TRANSFERING.getKey())
+ ) ){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧�,涓氬姟鐘舵�佸凡娴佽浆锛�");
+ }
+
+ PlatformJob oldPlatformJob = new PlatformJob();
+ BeanUtils.copyProperties(platformJob,oldPlatformJob);
+
+ platformJob.setCallDate(new Date());
+ platformJob.setCallUserId(jobOperateDTO.getLoginUserInfo().getId());
+ platformJob.setStatus(Constants.PlatformJobStatus.CALLED.getKey());
+ platformJob.setEditDate(new Date());
+ platformJobMapper.updateById(platformJob);
+ //瀛樺偍鎿嶄綔鏃ュ織
+ savePlatformLog(Constants.PlatformJobStatus.CALLED.getKey(),oldPlatformJob,platformJob);
+ }
+
+
+ /**
+ * 杞Щ鏈堝彴
+ * @param jobOperateDTO
+ */
+ @Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
+ public void platformMove(JobOperateDTO jobOperateDTO){
+ if(Objects.isNull(jobOperateDTO)
+ || Objects.isNull(jobOperateDTO.getJobId())
+ || Objects.isNull(jobOperateDTO.getPlatformId())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ PlatformJob platformJob = platformJobMapper.selectById(jobOperateDTO.getJobId());
+ if(Objects.isNull(platformJob)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ if( !( Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.WORKING.getKey())
+ || Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.EXCEPTION.getKey())
+ )){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧�,涓氬姟鐘舵�佸凡娴佽浆锛�");
+ }
+ if(Constants.equalsInteger(platformJob.getPlatformId(),jobOperateDTO.getPlatformId())){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏃犳硶杞Щ鏈湀鍙�");
+ }
+
+ PlatformJob oldPlatformJob = new PlatformJob();
+ BeanUtils.copyProperties(platformJob,oldPlatformJob);
+
+ platformJob.setTransPlatformDate(new Date());
+ platformJob.setTransPlatformUserId(jobOperateDTO.getLoginUserInfo().getId());
+ platformJob.setPlatformId(jobOperateDTO.getPlatformId());
+ platformJob.setStatus(Constants.PlatformJobStatus.TRANSFERING.getKey());
+ platformJob.setEditDate(new Date());
+ platformJobMapper.updateById(platformJob);
+
+ //TODO 璋冭捣WMS 閫氱煡鏈堝彴杞Щ
+ //瀛樺偍鎿嶄綔鏃ュ織
+ savePlatformLog(Constants.PlatformJobStatus.TRANSFERING.getKey(),oldPlatformJob,platformJob);
+ }
+
+
+ /**
+ * 鏈堝彴杩囧彿
+ */
+ @Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
+ public void platformOverNumber(JobOperateDTO jobOperateDTO){
+ if(Objects.isNull(jobOperateDTO)
+ || Objects.isNull(jobOperateDTO.getJobId())
+ || Objects.isNull(jobOperateDTO.getPlatformId())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ PlatformJob platformJob = platformJobMapper.selectById(jobOperateDTO.getJobId());
+ if(Objects.isNull(platformJob)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ if(!Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.WORKING.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.updateById(platformJob);
+ //瀛樺偍鎿嶄綔鏃ュ織
+ savePlatformLog(Constants.PlatformJobStatus.WART_SIGN_IN.getKey(),oldPlatformJob,platformJob);
+
+
+ }
+
+
+ /**
+ * 寮傚父鎸傝捣
+ */
+ @Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
+ public void platformErr(JobOperateDTO jobOperateDTO){
+ if(Objects.isNull(jobOperateDTO)
+ || Objects.isNull(jobOperateDTO.getJobId())
+ || Objects.isNull(jobOperateDTO.getPlatformId())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ PlatformJob platformJob = platformJobMapper.selectById(jobOperateDTO.getJobId());
+ if(Objects.isNull(platformJob)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ if(!Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.WORKING.getKey())){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧�,涓氬姟鐘舵�佸凡娴佽浆锛�");
+ }
+
+ PlatformJob oldPlatformJob = new PlatformJob();
+ BeanUtils.copyProperties(platformJob,oldPlatformJob);
+
+ platformJob.setErrorDate(new Date());
+ platformJob.setErrorUserId(jobOperateDTO.getLoginUserInfo().getId());
+ platformJob.setStatus(Constants.PlatformJobStatus.EXCEPTION.getKey());
+ platformJob.setEditDate(new Date());
+ platformJobMapper.updateById(platformJob);
+ //瀛樺偍鎿嶄綔鏃ュ織
+ savePlatformLog(Constants.PlatformJobStatus.EXCEPTION.getKey(),oldPlatformJob,platformJob);
+ }
+
+
+ /**
+ * 寮�濮嬩綔涓�
+ */
+ @Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
+ public void beginWork(JobOperateDTO jobOperateDTO){
+ if(Objects.isNull(jobOperateDTO)
+ || Objects.isNull(jobOperateDTO.getJobId())
+ || Objects.isNull(jobOperateDTO.getPlatformId())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ PlatformJob platformJob = platformJobMapper.selectById(jobOperateDTO.getJobId());
+ if(Objects.isNull(platformJob)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ if(!Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.CALLED.getKey())){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧�,涓氬姟鐘舵�佸凡娴佽浆锛�");
+ }
+ platformJobMapper.update(null,new UpdateWrapper<PlatformJob>()
+ .lambda()
+ .set(Objects.isNull(platformJob.getStartDate()),PlatformJob::getStartDate,new Date())
+ .set(PlatformJob::getEditDate,new Date())
+ .set(PlatformJob::getStatus,Constants.PlatformJobStatus.WORKING.getKey())
+ .eq(PlatformJob::getId,jobOperateDTO.getJobId())
+ );
+
+ PlatformJob oldPlatformJob = new PlatformJob();
+ BeanUtils.copyProperties(platformJob,oldPlatformJob);
+ if(Objects.isNull(platformJob.getStartDate())){
+ platformJob.setStartDate(new Date());
+ }
+ platformJob.setStatus(Constants.PlatformJobStatus.WORKING.getKey());
+ platformJob.setEditDate(new Date());
+ platformJobMapper.updateById(platformJob);
+ //瀛樺偍鎿嶄綔鏃ュ織
+ savePlatformLog(Constants.PlatformJobStatus.WORKING.getKey(),oldPlatformJob,platformJob);
+ }
+
+
+ /**
+ * 瀹屾垚浣滀笟
+ */
+ @Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
+ public void finishWork(JobOperateDTO jobOperateDTO){
+ if(Objects.isNull(jobOperateDTO)
+ || Objects.isNull(jobOperateDTO.getJobId())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ PlatformJob platformJob = platformJobMapper.selectById(jobOperateDTO.getJobId());
+ if(Objects.isNull(platformJob)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ if(!Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.WORKING.getKey())){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧�,涓氬姟鐘舵�佸凡娴佽浆锛�");
+ }
+ PlatformJob oldPlatformJob = new PlatformJob();
+ BeanUtils.copyProperties(platformJob,oldPlatformJob);
+
+ platformJob.setDoneDate(new Date());
+ platformJob.setStatus(Constants.PlatformJobStatus.EXCEPTION.getKey());
+ platformJob.setEditDate(new Date());
+ platformJobMapper.updateById(platformJob);
+ //瀛樺偍鎿嶄綔鏃ュ織
+ savePlatformLog(Constants.PlatformJobStatus.EXCEPTION.getKey(),oldPlatformJob,platformJob);
+
+ if(Constants.equalsInteger(platformJob.getType(),Constants.TWO)){
+ //TODO 澶栧崗杞﹁璐� 鏌ヨTMS 鐢靛瓙閿佹儏鍐�
+
+ }else if(Constants.equalsInteger(platformJob.getType(),Constants.ONE) || Constants.equalsInteger(platformJob.getType(),Constants.FOUR)){
+ //TODO 澶栧崗杞﹀嵏璐� 鎴栬�� 甯傚叕鍙歌溅鍗歌揣 鍒欐牴鎹换鍔℃儏鍐佃繘琛屼笅鍙戠鍥潈闄�
+
+ }
+ }
+
+
+ /**
+ * 鏈堝彴鐩告満鎺ㄩ�� 寮�濮嬩綔涓�
+ * @param jobOperateDTO
+ */
+ @Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
+ public void cameraStartWork(JobOperateDTO jobOperateDTO){
+ if(Objects.isNull(jobOperateDTO)
+ || Objects.isNull(jobOperateDTO.getDeviceId())
+ || StringUtils.isBlank(jobOperateDTO.getCarCodeBack())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ PlatformDevice platformDevice = platformDeviceMapper.selectOne(new QueryWrapper<PlatformDevice>().lambda()
+ .eq(PlatformDevice::getIsdeleted,Constants.ZERO)
+ .eq(PlatformDevice::getDeviceId,jobOperateDTO.getDeviceId())
+ .last(" limit 1")
+ );
+ if(Objects.isNull(platformDevice)){
+ return;
+ }
+ PlatformJob platformJob = platformJobMapper.selectOne(new QueryWrapper<PlatformJob>().lambda()
+ .eq(PlatformJob::getPlatformId,platformDevice.getPlatformId())
+ .eq(PlatformJob::getCarCodeBack,jobOperateDTO.getCarCodeBack())
+ .eq(PlatformJob::getStatus,Constants.PlatformJobStatus.CALLED.getKey())
+ .last(" limit 1 ")
+ );
+ if(Objects.isNull(platformJob)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ if(!Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.CALLED.getKey())){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧�,涓氬姟鐘舵�佸凡娴佽浆锛�");
+ }
+
+ PlatformJob oldPlatformJob = new PlatformJob();
+ BeanUtils.copyProperties(platformJob,oldPlatformJob);
+ if(Objects.isNull(platformJob.getStartDate())){
+ platformJob.setStartDate(new Date());
+ }
+ platformJob.setStatus(Constants.PlatformJobStatus.WORKING.getKey());
+ platformJob.setEditDate(new Date());
+ platformJobMapper.updateById(platformJob);
+ //瀛樺偍鎿嶄綔鏃ュ織
+ savePlatformLog(Constants.PlatformJobStatus.WORKING.getKey(),oldPlatformJob,platformJob);
+ }
+
+
+ /**
+ * 瀛樺偍鎿嶄綔鏃ュ織
+ * @param objType
+ * @param platformJobBefor
+ * @param platformJobAfter
+ */
+ public void savePlatformLog(Integer objType,PlatformJob platformJobBefor,PlatformJob platformJobAfter){
+ PlatformLog platformLog = new PlatformLog();
+ platformLog.setIsdeleted(Constants.ZERO);
+ platformLog.setCreateDate(new Date());
+ platformLog.setJobId(platformJobAfter.getId());
+ platformLog.setObjType(objType);
+ platformLog.setBeforeContent(JSONObject.toJSONString(platformJobBefor));
+ platformLog.setAfterContent(JSONObject.toJSONString(platformJobAfter));
+ platformLog.setObjId(platformJobAfter.getId().toString());
+ //鏌ヨ鏈�鍚庝竴娆″紑濮嬩綔涓氱殑鏃ュ織
+ PlatformLog lastBeginPlatform = platformLogMapper.selectOne(new QueryWrapper<PlatformLog>().lambda()
+ .eq(PlatformLog::getIsdeleted,Constants.ZERO)
+ .eq(PlatformLog::getObjType,Constants.PlatformJobStatus.WORKING.getKey())
+ .eq(PlatformLog::getJobId,platformLog.getJobId())
+ .orderByDesc(PlatformLog::getCreateDate)
+ .last(" limit 1 ")
+ );
+ if(Objects.isNull(lastBeginPlatform)){
+ return;
+ }
+ if(Constants.equalsInteger(objType,Constants.PlatformJobStatus.EXCEPTION.getKey())
+ || Constants.equalsInteger(objType,Constants.PlatformJobStatus.TRANSFERING.getKey())){
+ //寮傚父鎸傝捣 涓庤浆绉讳腑 璁板綍鏈 浣滀笟鏃堕棿
+ platformLog.setParam1(DateUtil.getDate(lastBeginPlatform.getCreateDate(),"yyyy-MM-dd HH:mm:ss"));
+ platformLog.setParam2(DateUtil.getDate(platformLog.getCreateDate(),"yyyy-MM-dd HH:mm:ss"));
+ String v = Long.toString(platformJobAfter.getDoneDate().getTime() - platformJobBefor.getStartDate().getTime() / 1000) ;
+ platformLog.setParam3(v);
+ }else if(Constants.equalsInteger(objType,Constants.PlatformJobStatus.DONE.getKey())){
+ //鏌ヨ鏈�鍚庝竴娆℃棩蹇楁槸鍚︿负寮傚父鎸傝捣锛屽紓甯告寕璧峰悗鍙繘琛岃浆绉� 濡傛灉杩涜杞Щ閭ｄ箞涓氬姟灏遍渶瑕侀噸鏂拌繘琛屽紑濮嬪氨涓嶉渶瑕佺壒娈婂鐞� 锛屽鏋滀笉鏄紓甯告寕璧疯繘琛屾暟鎹粨鏉� 鍒欑洿鎺ユ煡璇㈡渶鍚庝竴娆″紑濮嬬殑鏃堕棿
+ PlatformLog lastPlatformLog = platformLogMapper.selectOne(new QueryWrapper<PlatformLog>().lambda()
+ .eq(PlatformLog::getIsdeleted,Constants.ZERO)
+ .eq(PlatformLog::getJobId,platformLog.getJobId())
+ .orderByDesc(PlatformLog::getCreateDate)
+ .last(" limit 1 ")
+ );
+ if(Objects.nonNull(lastPlatformLog) && Constants.equalsInteger(lastPlatformLog.getObjType(),Constants.PlatformJobStatus.EXCEPTION.getKey())){
+ platformLog.setParam3("0");
+ }else{
+ //闈炲紓甯告寕璧� 鍒欑洿鎺ヨ繃鍘绘渶鍚庝竴娆″紑濮嬩綔涓氱殑鏃ュ織鐨勫紑濮嬫椂闂�
+ platformLog.setParam1(DateUtil.getDate(lastBeginPlatform.getCreateDate(),"yyyy-MM-dd HH:mm:ss"));
+ platformLog.setParam2(DateUtil.getDate(platformLog.getCreateDate(),"yyyy-MM-dd HH:mm:ss"));
+ String v = Long.toString(platformJobAfter.getDoneDate().getTime() - platformJobBefor.getStartDate().getTime() / 1000) ;
+ platformLog.setParam3(v);
+ }
+ }else{
+ platformLog.setParam3("0");
+ }
+ platformLogMapper.insert(platformLog);
+ }
+
+
+
+
+
}
--
Gitblit v1.9.3