From ae7e870dd6af10a131b4a571ba0ac280c8d85321 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 23 十二月 2024 17:31:54 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderNoFinishListRequest.java | 18 ++++++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/TmsService.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/TMSContants.java | 17 +++++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 23 +++++--
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java | 8 +-
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/WholeProvinceController.java | 19 ++---
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderNoFinishListResponse.java | 4 +
screen/src/views/videoUrl/Videos.vue | 9 +-
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderNoFinishListParamRequest.java | 20 ++++++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java | 4 +
screen/src/views/TaskEfficiency.vue | 6 +-
11 files changed, 95 insertions(+), 35 deletions(-)
diff --git a/screen/src/views/TaskEfficiency.vue b/screen/src/views/TaskEfficiency.vue
index d1a3280..ccacc0f 100644
--- a/screen/src/views/TaskEfficiency.vue
+++ b/screen/src/views/TaskEfficiency.vue
@@ -165,9 +165,9 @@
<div class="modal_bg" v-if="showWorkModal" @click="showWorkModal = false"></div>
</div>
<div class="center_box_two">
- <!-- <div v-if="data4.videoIndexCodes && data4.videoIndexCodes.length > 0" class="videos">
+ <div v-if="data4.videoIndexCodes && data4.videoIndexCodes.length > 0" class="videos">
<Videos :href="data4.videoPluginUrl" :indexCodes="data4.videoIndexCodes" />
- </div> -->
+ </div>
<div class="list">
<div class="line header">
<div>鏈堝彴鍚嶇О</div>
@@ -1636,4 +1636,4 @@
object-fit: cover;
z-index: -1;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/screen/src/views/videoUrl/Videos.vue b/screen/src/views/videoUrl/Videos.vue
index 0f1719a..c6b1d03 100644
--- a/screen/src/views/videoUrl/Videos.vue
+++ b/screen/src/views/videoUrl/Videos.vue
@@ -29,7 +29,7 @@
width.value = rect.width
height.value = rect.height
console.log('rect', rect);
-
+
initPlugin()
window.addEventListener('resize', function () { // 鎵ц
if (oWebControl.value) {
@@ -72,7 +72,7 @@
cbIntegrationCallBack: cbIntegrationCallBack
})// 鍚姩鎻掍欢鏈嶅姟鎴愬姛
console.log('----',width.value, height.value);
-
+
oWebControl.value.JS_CreateWnd("playWnd", width.value, height.value).then(function () { //JS_CreateWnd鍒涘缓瑙嗛鎾斁绐楀彛锛屽楂樺彲璁惧畾锛宐oxWidth, boxHeight瀹瑰櫒
// oWebControl.value.JS_CreateWnd("playWnd").then(function () { //JS_CreateWnd鍒涘缓瑙嗛鎾斁绐楀彛锛屽楂樺彲璁惧畾锛宐oxWidth, boxHeight瀹瑰櫒
init() // 鍒涘缓鎾斁瀹炰緥鎴愬姛鍚庡垵濮嬪寲
@@ -127,8 +127,9 @@
let layout = "1x4" //playMode鎸囧畾妯″紡鐨勫竷灞�
let enableHTTPS = 1 //鏄惁鍚敤HTTPS鍗忚涓庣患鍚堝畨闃茬鐞嗗钩鍙颁氦浜掞紝杩欓噷鎬绘槸濉�1
let encryptedFields = 'secret' //鍔犲瘑瀛楁锛岄粯璁ゅ姞瀵嗛鍩熶负secret
- let showToolbar = 1 //鏄惁鏄剧ず宸ュ叿鏍忥紝0-涓嶆樉绀猴紝闈�0-鏄剧ず
+ let showToolbar = 0 //鏄惁鏄剧ず宸ュ叿鏍忥紝0-涓嶆樉绀猴紝闈�0-鏄剧ず
let showSmart = 0 //鏄惁鏄剧ず鏅鸿兘淇℃伅锛堝閰嶇疆绉诲姩渚︽祴鍚庣敾闈笂鐨勭嚎妗嗭級锛�0-涓嶆樉绀猴紝闈�0-鏄剧ず
+ let buttonIDs =""
// let buttonIDs = "0,16,256,257,258,259,260,513,514,515,516,517,768" //鑷畾涔夊伐鍏锋潯鎸夐挳
oWebControl.value.JS_RequestInterface({
funcName: "init",
@@ -233,4 +234,4 @@
height: 100%;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/WholeProvinceController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/WholeProvinceController.java
index d3609e3..802483c 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/WholeProvinceController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/WholeProvinceController.java
@@ -3,10 +3,7 @@
import com.doumee.api.BaseController;
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.model.ApiResponse;
-import com.doumee.core.tms.model.request.TmsOrderInfoRequest;
-import com.doumee.core.tms.model.request.TmsOrderListPagerRequest;
-import com.doumee.core.tms.model.request.TmsOrderListParamRequest;
-import com.doumee.core.tms.model.request.TmsOrderListRequest;
+import com.doumee.core.tms.model.request.*;
import com.doumee.core.tms.model.response.TmsBasePageResponse;
import com.doumee.core.tms.model.response.TmsOrderInfoResponse;
import com.doumee.core.tms.model.response.TmsOrderListResponse;
@@ -52,7 +49,7 @@
@ApiImplicitParams({
@ApiImplicitParam(paramType = "query", dataType = "String", name = "factoryCode", value = "鏌ヨ绫诲瀷鍘傚尯缂栫爜", required = false)
})
- public ApiResponse<WholeProvinceBoardVO> centerData(@RequestParam String factoryCode) {
+ public ApiResponse<WholeProvinceBoardVO> centerData(@RequestParam(required = false) String factoryCode) {
WholeProvinceBoardVO data = boardService.centerProvinceData( factoryCode);
return ApiResponse.success(data);
}
@@ -64,7 +61,7 @@
@ApiImplicitParams({
@ApiImplicitParam(paramType = "query", dataType = "String", name = "factoryCode", value = "鏌ヨ绫诲瀷鍘傚尯缂栫爜", required = false)
})
- public ApiResponse<List<LastSevenDaysOrderVo>> arriveGoodsList(@RequestParam String factoryCode) {
+ public ApiResponse<List<LastSevenDaysOrderVo>> arriveGoodsList(@RequestParam(required = false) String factoryCode) {
List<LastSevenDaysOrderVo> list = boardService.arriveGoodsList(factoryCode);
return ApiResponse.success(list);
}
@@ -77,7 +74,7 @@
@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "type", value = "鏌ヨ绫诲瀷 0鏈湀 1鏈懆 2鏈勾", required = false),
@ApiImplicitParam(paramType = "query", dataType = "String", name = "factoryCode", value = "鏌ヨ绫诲瀷鍘傚尯缂栫爜", required = false)
})
- public ApiResponse<TotalOutQtyNumVO> totalOutQtyNum(@RequestParam Integer type,@RequestParam String factoryCode) {
+ public ApiResponse<TotalOutQtyNumVO> totalOutQtyNum(@RequestParam Integer type,@RequestParam(required = false) String factoryCode) {
TotalOutQtyNumVO result = boardService.totalOutQtyNum(type,factoryCode);
return ApiResponse.success(result);
@@ -120,7 +117,7 @@
@ApiImplicitParams({
@ApiImplicitParam(paramType = "query", dataType = "String", name = "factoryCode", value = "鏌ヨ绫诲瀷鍘傚尯缂栫爜", required = false)
})
- public ApiResponse<List<WholeProvinceMapVO>> mapYearAndMonthOutList( @RequestParam String factoryCode) {
+ public ApiResponse<List<WholeProvinceMapVO>> mapYearAndMonthOutList( @RequestParam(required = false) String factoryCode) {
List<WholeProvinceMapVO> list = boardService.mapYearAndMonthOutList(factoryCode);
return ApiResponse.success(list);
}
@@ -128,12 +125,12 @@
@ApiOperation("璁㈠崟浠诲姟鍚堝悓鍒楄〃鎺ュ彛")
@LoginNoRequired
- @GetMapping("/orderList")
+ @PostMapping("/orderList")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "query", dataType = "String", name = "factoryCode", value = "鏌ヨ绫诲瀷鍘傚尯缂栫爜", required = false)
})
- public ApiResponse<List<TmsOrderNoFinishListResponse>> orderNoFinishList(@RequestParam String factoryCode) {
- List<TmsOrderNoFinishListResponse> list = boardService.orderNoFinishList(factoryCode);
+ public ApiResponse<TmsBasePageResponse<TmsOrderNoFinishListResponse>> orderNoFinishList(@RequestBody TmsOrderNoFinishListRequest param ) {
+ TmsBasePageResponse<TmsOrderNoFinishListResponse> list = boardService.orderNoFinishList(param);
return ApiResponse.success(list);
}
@ApiOperation("鍚堝悓璇︽儏鎺ュ彛")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/TMSContants.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/TMSContants.java
index 6941b1c..eabface 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/TMSContants.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/TMSContants.java
@@ -57,7 +57,17 @@
this.chileIndexList = chileIndexList;
this.name = name;
}
-
+ public static String getNameByKey(Integer key ) {
+ if(key == null){
+ return null;
+ }
+ for (TopStatusLevel c : TopStatusLevel.values()) {
+ if (c.getKey() == key) {
+ return c.getName();
+ }
+ }
+ return null;
+ }
public int getKey() {
return key;
}
@@ -141,7 +151,10 @@
this.orderStatus = orderStatus;
this.parentIndex = parentIndex;
}
- public static Integer getParentIndexByStatus(int orderStatus) {
+ public static Integer getParentIndexByStatus(Integer orderStatus) {
+ if(orderStatus == null){
+ return null;
+ }
for (ChildStatusLevel c : ChildStatusLevel.values()) {
if (c.getOrderStatus() == orderStatus) {
return c.parentIndex;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderNoFinishListParamRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderNoFinishListParamRequest.java
new file mode 100644
index 0000000..3785935
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderNoFinishListParamRequest.java
@@ -0,0 +1,20 @@
+package com.doumee.core.tms.model.request;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2023/11/23 14:03
+ */
+@Data
+@ApiModel("tms鍚堝悓鏈畬鎴愬垪琛ㄨ姹傚弬鏁�")
+public class TmsOrderNoFinishListParamRequest {
+
+
+ private List<String> facrotyCodeList; //鏄� 鍘傚尯code闆嗗悎
+ private String contractNumber;//鍚堝悓鍙�
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderNoFinishListRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderNoFinishListRequest.java
new file mode 100644
index 0000000..5461766
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderNoFinishListRequest.java
@@ -0,0 +1,18 @@
+package com.doumee.core.tms.model.request;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2023/11/23 14:03
+ */
+@Data
+@ApiModel("tms鍚堝悓鏈畬鎴愯鍗曞垪琛ㄥ垎椤佃姹傚弬鏁�")
+public class TmsOrderNoFinishListRequest {
+
+
+ private TmsOrderNoFinishListParamRequest parameters; //鏄� 闆嗗悎 鍖哄煙ID闆嗗悎
+ private TmsOrderListPagerRequest pager; // 鍚� 闆嗗悎 鍚堝悓鍙烽泦鍚�
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderNoFinishListResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderNoFinishListResponse.java
index 8c0a945..cff2395 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderNoFinishListResponse.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderNoFinishListResponse.java
@@ -20,7 +20,9 @@
@ApiModelProperty(value = "杩愯緭杞﹁締" )
private String plateNumber;// 瀛楃涓� 杩愯緭杞﹁締
@ApiModelProperty(value = "鐘舵��" )
- private String status;// 瀛楃涓� 鐘舵��
+ private Integer status;// 瀛楃涓� 鐘舵��
+ @ApiModelProperty(value = "鐘舵�佹弿杩�" )
+ private String statusDesc;// 瀛楃涓� 鐘舵��
@ApiModelProperty(value = "浠诲姟涓嬭揪鏃堕棿" )
private String transportDate;// 瀛楃涓� 浠诲姟涓嬭揪鏃堕棿
@ApiModelProperty(value = "璁㈠崟鍒涘缓鏃ユ湡" )
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
index 28bf9dd..396aa3e 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -18,6 +18,7 @@
import com.doumee.core.haikang.service.HKService;
import com.doumee.core.tms.model.TMSContants;
import com.doumee.core.tms.model.request.TmsFacrotyCodeListRequest;
+import com.doumee.core.tms.model.request.TmsOrderNoFinishListRequest;
import com.doumee.core.tms.model.request.TmsOutQtyAndVehicleQtyRequest;
import com.doumee.core.tms.model.request.TmsSevenArrivalDetailsRequest;
import com.doumee.core.tms.model.response.*;
@@ -1572,7 +1573,8 @@
for (int i = 0; i < 12; i++) {
Date tempDate = DateUtil.increaseMonth(lastMonth,i);
EnergyDataVO data = new EnergyDataVO();
- data.setTimeData(DateUtil.getFomartDate(tempDate,(i+1)+"鏈�"));
+ data.setTimeData(DateUtil.getFomartDate(tempDate,"YYYY-MM"));
+// data.setTimeData(DateUtil.getFomartDate(tempDate,(i+1)+"鏈�"));
data.setEnergy(new BigDecimal(0));
energyDataVOList.add(data);
}
@@ -2284,13 +2286,14 @@
* @return TmsBaseResponse
*/
@Override
- public List<TmsOrderNoFinishListResponse> orderNoFinishList(String code){
- TmsFacrotyCodeListRequest param = new TmsFacrotyCodeListRequest();
- if(StringUtils.isNotBlank(code)){
- param.setFacrotyCodeList(new ArrayList<>());
- param.getFacrotyCodeList().add(code);//鏌ヨ鎸囧畾鍘傚尯
+ public TmsBasePageResponse<TmsOrderNoFinishListResponse> orderNoFinishList(TmsOrderNoFinishListRequest param){
+ TmsBasePageResponse<TmsOrderNoFinishListResponse> infoList = tmsService.getNotFinishOrderList(param);//鏌ヨ鍑哄簱閲�
+ if(infoList!=null && infoList.getRows()!=null){
+ for(TmsOrderNoFinishListResponse model :infoList.getRows()){
+ model.setStatusDesc(TMSContants.TopStatusLevel.getNameByKey(TMSContants.ChildStatusLevel.getParentIndexByStatus(model.getStatus())));
+
+ }
}
- List<TmsOrderNoFinishListResponse> infoList = tmsService.getNotFinishOrderList(param);//鏌ヨ鍑哄簱閲�
return infoList;
}
/**
@@ -2305,13 +2308,17 @@
param.setFacrotyCodeList(new ArrayList<>());
param.getFacrotyCodeList().add(code);//鏌ヨ鎸囧畾鍘傚尯
}
- List<TmsSevenArrivalStatusAndDetailsResponse> infoList = tmsService.getSevenArrivalStatusAndDetails(param);//鏌ヨ鍑哄簱閲�
Date date = new Date();
+ Date startDate = DateUtil.addDaysToDate(date,-7);
+ param.setNcCreateDateFrom(DateUtil.getShortTime(startDate));
+ param.setNcCreateDateThrough(DateUtil.getShortTime(date));
+ List<TmsSevenArrivalStatusAndDetailsResponse> infoList = tmsService.getSevenArrivalStatusAndDetails(param);//鏌ヨ鍑哄簱閲�
for (int i = 0; i < 7; i++) {
LastSevenDaysOrderVo model = new LastSevenDaysOrderVo();
Date td = DateUtil.addDaysToDate(date,-i);
model.setDateStr(DateUtil.getShortTime(td));
dealGoodsListFromResponse(model,infoList);
+ list.add(model);
}
return list;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java
index 4aa255f..540ce25 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java
@@ -196,13 +196,13 @@
* @return TmsBaseResponse
*/
@Override
- public List<TmsOrderNoFinishListResponse> getNotFinishOrderList(TmsFacrotyCodeListRequest param){
+ public TmsBasePageResponse<TmsOrderNoFinishListResponse> getNotFinishOrderList(TmsOrderNoFinishListRequest param){
String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
+TMSContants.InterfacePath.getNotFinishOrderList[0];
- TmsBaseResponse<List<TmsOrderNoFinishListResponse> > response = sendHttpRequest(url,TMSContants.InterfacePath.getNotFinishOrderList[1],JSONObject.toJSONString(param)
- ,new TypeReference< TmsBaseResponse<List<TmsOrderNoFinishListResponse>> >(){});
+ TmsBaseResponse<TmsBasePageResponse<TmsOrderNoFinishListResponse> > response = sendHttpRequest(url,TMSContants.InterfacePath.getNotFinishOrderList[1],JSONObject.toJSONString(param)
+ ,new TypeReference< TmsBaseResponse<TmsBasePageResponse<TmsOrderNoFinishListResponse>> >(){});
if(response ==null || response.getData() == null){
- return new ArrayList<>();
+ return new TmsBasePageResponse<>();
}
return response.getData();
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java
index ef4ca5d..82403aa 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java
@@ -2,6 +2,8 @@
import com.doumee.core.haikang.model.cars.response.CarsAlarmResultListResponse;
import com.doumee.core.haikang.model.param.respose.*;
+import com.doumee.core.tms.model.request.TmsOrderNoFinishListRequest;
+import com.doumee.core.tms.model.response.TmsBasePageResponse;
import com.doumee.core.tms.model.response.TmsOrderNoFinishListResponse;
import com.doumee.dao.business.model.PlatformWarnEvent;
import com.doumee.dao.business.model.TmsFactoryParam;
@@ -108,5 +110,5 @@
List<LastSevenDaysOrderVo> arriveGoodsList(String factoryid);
- List<TmsOrderNoFinishListResponse> orderNoFinishList(String factoryCode);
+ TmsBasePageResponse<TmsOrderNoFinishListResponse> orderNoFinishList(TmsOrderNoFinishListRequest param);
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/TmsService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/TmsService.java
index 5c37535..3be3e39 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/TmsService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/TmsService.java
@@ -30,7 +30,7 @@
*/
TmsBasePageResponse<TmsOrderListResponse> orderList(TmsOrderListRequest param);
List<TmsGisListResponse> gisList(TmsGisListRequest param);
- List<TmsOrderNoFinishListResponse> getNotFinishOrderList(TmsFacrotyCodeListRequest param);
+ TmsBasePageResponse<TmsOrderNoFinishListResponse> getNotFinishOrderList(TmsOrderNoFinishListRequest param);
List<TmsCircleStatusResultListResponse> getCicleStatusList(TmsCircleStatusListRequest param);
/**
* 鍚堝悓璇︽儏鎺ュ彛
--
Gitblit v1.9.3