From f6ba5de2578c58a738f35b29a708c523ccb518ba Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 05 十二月 2024 09:20:07 +0800
Subject: [PATCH] 最新版本541200007
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 2
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/EnergyController.java | 4
server/visits/dmvisit_admin/src/main/resources/bootstrap.yml | 2
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/StagingCloudController.java | 10 +
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/ErpVisitDTO.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/core/wms/model/response/WmsBaseResponse.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InitServiceImpl.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/BoardJobCenterDataVO.java | 3
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/RegionTreeVO.java | 4
server/system_gateway/src/main/resources/bootstrap-pro.yml | 1
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/SecurityController.java | 4
server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java | 34 +++-
server/visits/admin_timer/src/main/java/com/doumee/api/WxTokenTimerController.java | 29 +++
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/FightingAdminController.java | 13 -
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ext/ERPSyncService.java | 3
server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java | 12
server/system_service/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java | 18 ++
server/system_service/src/main/java/com/doumee/dao/system/dto/LoginDTO.java | 3
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsJob.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 98 +++++++++----
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java | 6
server/system_service/src/main/java/com/doumee/api/cloud/SystemDictDataCloudController.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/BoardCarsListVO.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/core/erp/ErpTool.java | 2
server/meeting/meeting_service/src/main/java/com/doumee/service/business/UtilService.java | 4
server/system_gateway/src/main/resources/bootstrap.yml | 2
server/system_gateway/src/main/resources/logback-spring.xml | 61 ++++++++
server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatConfig.java | 6
server/meeting/meeting_service/src/main/java/com/doumee/core/wx/SendWxMessage.java | 8
server/system_service/src/main/java/com/doumee/biz/system/SystemDictDataBiz.java | 3
admin/src/views/index.vue | 2
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/CarsJobAndContractVO.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/DeviceService.java | 2
admin/src/views/task/index.vue | 16 ++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 9 -
server/system_gateway/src/main/java/com/doumee/api/gateway/JwtAuthController.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/CarmeraListVO.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/ApproveNoticeRequest.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java | 7 -
41 files changed, 257 insertions(+), 142 deletions(-)
diff --git a/admin/src/views/index.vue b/admin/src/views/index.vue
index b08c1a4..0de3d22 100644
--- a/admin/src/views/index.vue
+++ b/admin/src/views/index.vue
@@ -133,7 +133,7 @@
<div class="task">
<div class="header df_sb">
<div class="home_title df">
- <span @click="getNoticeList">寰呭姙浜嬮」</span>
+ <span >寰呭姙浜嬮」</span>
<span class="num" v-if="taskTotal">{{ taskTotal }}</span>
</div>
<div class="df_ac more" @click="jumpPage('/task/index')">
diff --git a/admin/src/views/task/index.vue b/admin/src/views/task/index.vue
index ac5d8d1..97d8c7f 100644
--- a/admin/src/views/task/index.vue
+++ b/admin/src/views/task/index.vue
@@ -109,6 +109,7 @@
import OperaVisitsDesWindow from '@/components/business/OperaVisitsDesWindow'
import dayjs from 'dayjs'
import {
+ getAppHeaderNav,
taskCenterHeadPC,
taskCenterPage,
taskSignRead
@@ -196,7 +197,22 @@
this[str] = false
this.getTaskList()
},
+ handleTest (row) {
+ getAppHeaderNav(5).then(res => {
+ if (res === undefined || res == null) {
+ return
+ }
+ const myWindow = window.open(res)
+ setTimeout(() => {
+ myWindow.postMessage('{"method":"goToApp","argument":' + row.param5 + '}', '*')
+ }, 3000)
+ })
+ },
handleDetail (row) {
+ if (row.type === 7) {
+ this.handleTest(row);
+ return
+ }
if (this.filters.queryType == 3) {
taskSignRead({
noticesId: row.id,
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/core/wx/SendWxMessage.java b/server/meeting/meeting_service/src/main/java/com/doumee/core/wx/SendWxMessage.java
index afe036d..a0064d6 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/core/wx/SendWxMessage.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/core/wx/SendWxMessage.java
@@ -41,7 +41,8 @@
*/
public void bookingsStart(SystemUser systemUser, Bookings bookings, Rooms rooms){
RestTemplate restTemplate = new RestTemplate();
- String accessToken = systemDictDataBiz.queryCodeById(106);
+ String accessToken = systemDictDataBiz.getWxAccessToken();
+
log.info("寰俊灏忕▼搴� 浼氳寮�濮嬭闃呮秷鎭彂閫佹棩蹇� -> accessToken锛歿}",accessToken);
//杩欓噷绠�鍗曡捣瑙佹垜浠瘡娆￠兘鑾峰彇鏈�鏂扮殑access_token锛堟椂闂村紑鍙戜腑锛屽簲璇ュ湪access_token蹇繃鏈熸椂鍐嶉噸鏂拌幏鍙栵級
String url = "https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token="+accessToken;
@@ -67,6 +68,7 @@
log.info("寰俊灏忕▼搴�-> 鍙栨秷閫氱煡璁㈤槄娑堟伅鍙戦�佹棩蹇楋細{}",JSONObject.toJSONString(responseEntity));
}
+
/**
* 浼氳鍙栨秷閫氱煡
* @param systemUser 鐢ㄦ埛
@@ -75,7 +77,7 @@
*/
public void bookingsCancel(SystemUser systemUser, Bookings bookings, Rooms rooms){
RestTemplate restTemplate = new RestTemplate();
- String accessToken = systemDictDataBiz.queryCodeById(106);
+ String accessToken =systemDictDataBiz.getWxAccessToken() ;
log.info("寰俊灏忕▼搴� 浼氳寮�濮嬭闃呮秷鎭彂閫佹棩蹇� -> accessToken锛歿}",accessToken);
//杩欓噷绠�鍗曡捣瑙佹垜浠瘡娆￠兘鑾峰彇鏈�鏂扮殑access_token锛堟椂闂村紑鍙戜腑锛屽簲璇ュ湪access_token蹇繃鏈熸椂鍐嶉噸鏂拌幏鍙栵級
String url = "https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token="+accessToken;
@@ -114,7 +116,7 @@
*/
public void bookingsReservation(SystemUser systemUser, Bookings bookings, Rooms rooms){
RestTemplate restTemplate = new RestTemplate();
- String accessToken = systemDictDataBiz.queryCodeById(106);
+ String accessToken = systemDictDataBiz.getWxAccessToken() ;
log.info("寰俊灏忕▼搴� 浼氳寮�濮嬭闃呮秷鎭彂閫佹棩蹇� -> accessToken锛歿}",accessToken);
//杩欓噷绠�鍗曡捣瑙佹垜浠瘡娆￠兘鑾峰彇鏈�鏂扮殑access_token锛堟椂闂村紑鍙戜腑锛屽簲璇ュ湪access_token蹇繃鏈熸椂鍐嶉噸鏂拌幏鍙栵級
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/UtilService.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/UtilService.java
index 33c632a..bafe3ee 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/UtilService.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/UtilService.java
@@ -35,7 +35,7 @@
public String generate(@RequestParam Integer bookingsId, @RequestParam Integer userId) {
- String accessToken = systemDictDataBiz.queryCodeById(106);
+ String accessToken = systemDictDataBiz.getWxAccessToken() ;
//鐢熸垚鍥剧墖涓婁紶OSS
Map<String,Object> body = new HashMap<>();
// 鍦烘櫙鐮侊紝涓庡墠绔害瀹氾紝鏈�缁堟槸闇�瑕佸墠绔В鏋�
@@ -88,7 +88,7 @@
}
public InputStream generateImgStream(Integer bookingsId, Integer userId) {
- String accessToken = systemDictDataBiz.queryCodeById(106);
+ String accessToken = systemDictDataBiz.getWxAccessToken() ;
log.info("寰俊灏忕▼搴�-> accessToken锛歿}",accessToken);
//鐢熸垚鍥剧墖涓婁紶OSS
Map<String,Object> body = new HashMap<>();
diff --git a/server/system_gateway/src/main/java/com/doumee/api/gateway/JwtAuthController.java b/server/system_gateway/src/main/java/com/doumee/api/gateway/JwtAuthController.java
index 83fcdca..274dc49 100644
--- a/server/system_gateway/src/main/java/com/doumee/api/gateway/JwtAuthController.java
+++ b/server/system_gateway/src/main/java/com/doumee/api/gateway/JwtAuthController.java
@@ -147,7 +147,6 @@
}catch (Exception e){
return ApiResponse.failed(ResponseStatus.SERVER_ERROR);
}
-
}
/**
* 鍒锋柊JWT浠ょ墝,鐢ㄦ棫鐨勪护鐗屾崲鏂扮殑浠ょ墝
diff --git a/server/system_gateway/src/main/resources/bootstrap-pro.yml b/server/system_gateway/src/main/resources/bootstrap-pro.yml
index 34383f4..2254fe4 100644
--- a/server/system_gateway/src/main/resources/bootstrap-pro.yml
+++ b/server/system_gateway/src/main/resources/bootstrap-pro.yml
@@ -90,5 +90,6 @@
url: 1
email: 1
license:
+
name: Apache 2.0
url: https://www.apache.org/licenses/LICENSE-2.0.html
diff --git a/server/system_gateway/src/main/resources/bootstrap.yml b/server/system_gateway/src/main/resources/bootstrap.yml
index 8ecd0a5..099da4a 100644
--- a/server/system_gateway/src/main/resources/bootstrap.yml
+++ b/server/system_gateway/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- active: dev
+ active: pro
application:
name: system_gateway
# 瀹夊叏閰嶇疆
diff --git a/server/system_gateway/src/main/resources/logback-spring.xml b/server/system_gateway/src/main/resources/logback-spring.xml
new file mode 100644
index 0000000..8cf921f
--- /dev/null
+++ b/server/system_gateway/src/main/resources/logback-spring.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+ <appender name="consoleLog" class="ch.qos.logback.core.ConsoleAppender">
+ <layout class="ch.qos.logback.classic.PatternLayout">
+ <pattern>%highlight(%date{yyyy-MM-dd HH:mm:ss}) | %highlight(%-5level) | %highlight(%thread) | %highlight(%logger) | %msg%n</pattern>
+ </layout>
+ </appender>
+ <property name="log.path" value="logs/system_gateway"></property>
+ <property name="log.fileSize" value="100MB"></property>
+ <property name="log.historyDays" value="7"></property>
+
+ <appender name="fileInfoLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <filter class="ch.qos.logback.classic.filter.LevelFilter">
+ <level>ERROR</level>
+ <!--鍖归厤灏辫垗鍘�-->
+ <onMatch>DENY</onMatch>
+ <onMismatch>ACCEPT</onMismatch>
+ </filter>
+ <encoder>
+ <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+ </encoder>
+ <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+ <!--璺緞-->
+ <fileNamePattern>${log.path}/info.%d.%i.log</fileNamePattern>
+ <maxFileSize>${log.fileSize}</maxFileSize>
+ <maxHistory>${log.historyDays}</maxHistory>
+ <totalSizeCap>1GB</totalSizeCap>
+ </rollingPolicy>
+ </appender>
+
+ <appender name="fileErrorLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+ <level>ERROR</level>
+ </filter>
+ <encoder>
+ <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+ </encoder>
+ <!--婊氬姩绛栫暐-->
+ <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+ <!--璺緞-->
+ <fileNamePattern>${log.path}/error.%d.%i.log</fileNamePattern>
+ <maxFileSize>${log.fileSize}</maxFileSize>
+ <maxHistory>${log.historyDays}</maxHistory>
+ <totalSizeCap>1GB</totalSizeCap>
+ </rollingPolicy>
+ </appender>
+ <!-- 寮傛鍐欏叆鏃ュ織 -->
+ <appender name ="ASYNC" class= "ch.qos.logback.classic.AsyncAppender">
+ <!-- 涓嶄涪澶辨棩蹇�.榛樿鐨�,濡傛灉闃熷垪鐨�80%宸叉弧,鍒欎細涓㈠純TRACT銆丏EBUG銆両NFO绾у埆鐨勬棩蹇� -->
+ <discardingThreshold >0</discardingThreshold>
+ <!-- 鏇存敼榛樿鐨勯槦鍒楃殑娣卞害,璇ュ�间細褰卞搷鎬ц兘.榛樿鍊间负256 -->
+ <queueSize>512</queueSize>
+ <!-- 娣诲姞闄勫姞鐨刟ppender,鏈�澶氬彧鑳芥坊鍔犱竴涓� -->
+ <appender-ref ref ="fileInfoLog"/>
+ </appender>
+ <root level="info">
+ <appender-ref ref="consoleLog"/>
+ <appender-ref ref="fileInfoLog"/>
+ <appender-ref ref="fileErrorLog"/>
+ </root>
+</configuration>
\ No newline at end of file
diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemDictDataCloudController.java b/server/system_service/src/main/java/com/doumee/api/cloud/SystemDictDataCloudController.java
index 38ce34c..5911a59 100644
--- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemDictDataCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/api/cloud/SystemDictDataCloudController.java
@@ -79,6 +79,7 @@
systemDictData.setLoginUserInfo(this.getLoginUser(token));
systemDictData.setUpdateUser(systemDictData.getLoginUserInfo().getId());
systemDictDataBiz.updateById(systemDictData);
+ systemDictDataBiz.refreshCache();
return ApiResponse.success(null);
}
diff --git a/server/system_service/src/main/java/com/doumee/biz/system/SystemDictDataBiz.java b/server/system_service/src/main/java/com/doumee/biz/system/SystemDictDataBiz.java
index 46844ea..9ef7f39 100644
--- a/server/system_service/src/main/java/com/doumee/biz/system/SystemDictDataBiz.java
+++ b/server/system_service/src/main/java/com/doumee/biz/system/SystemDictDataBiz.java
@@ -36,4 +36,7 @@
String getPreFixPath(String resourceCode, String targetCode);
+ void refreshCache();
+
+ String getWxAccessToken();
}
diff --git a/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java b/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java
index a9d3ae1..88b83ce 100644
--- a/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java
+++ b/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java
@@ -11,14 +11,12 @@
import com.doumee.service.system.SystemDictService;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
-import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
-import java.util.Optional;
@Service
public class SystemDictDataBizImpl implements SystemDictDataBiz {
@@ -139,6 +137,22 @@
}
@Override
+ public void refreshCache() {
+ /* HKCarOpenService.ACCESS_KEY= queryByCode(Constants.HK_PARAM, Constants.HK_CARS_OPENAPI_ACCESS_KEY).getCode();
+ HKCarOpenService.BASE_URL= queryByCode(Constants.HK_PARAM, Constants.HK_CARS_OPENAPI_URL).getCode();
+ HKCarOpenService.ACCESS_SECRET= queryByCode(Constants.HK_PARAM, Constants.HK_CARS_OPENAPI_ACCESS_SECRET).getCode();
+ ArtemisConfig.host = queryByCode(Constants.HK_PARAM, Constants.HK_HOST).getCode();
+ ArtemisConfig.appKey = queryByCode(Constants.HK_PARAM, Constants.HK_APPKEY).getCode();
+ ArtemisConfig.appSecret = queryByCode(Constants.HK_PARAM, Constants.HK_APPSECRET).getCode();
+ HKConstants.https = queryByCode(Constants.HK_PARAM, Constants.HK_HTTPS).getCode();*/
+ }
+ @Override
+ public String getWxAccessToken(){
+
+ return queryByCode(Constants.WX_PLATFORM, Constants.WX_PLATFORM_ACCESS_TOKEN).getCode();
+ }
+
+ @Override
public String getPreFixPath(String resourceCode, String targetCode) {
if (StringUtils.isBlank(resourceCode) || StringUtils.isBlank(targetCode)){
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 03ca63c..83f3437 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
@@ -144,6 +144,8 @@
public static final String MYSQL_BACKUP_DIR ="MYSQL_BACKUP_DIR" ;
public static final String EVENT_FILES_PRIVATE_DOMAIN ="EVENT_FILES_PRIVATE_DOMAIN" ;
public static final String EVENT_FILES_PUBLIC_DOMAIN ="EVENT_FILES_PUBLIC_DOMAIN" ;
+ public static final String HK_WXTOKEN_CONFIGID ="HK_WXTOKEN_CONFIGID" ;
+ public static final String HK_WXTOKEN_TAGID ="HK_WXTOKEN_TAGID" ;
public static final String WMS_TOTAL_STOCK_NUM ="WMS_TOTAL_STOCK_NUM" ;
public static boolean DEALING_HK_SYNCPRIVILEGE= false;
public static boolean DEALING_HK_SYNCDEVICE = false;
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/dto/LoginDTO.java b/server/system_service/src/main/java/com/doumee/dao/system/dto/LoginDTO.java
index a617b61..4e53960 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/dto/LoginDTO.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/dto/LoginDTO.java
@@ -19,6 +19,9 @@
@ApiModelProperty(value = "鐢ㄦ埛鍚�")
private String username;
+ @ApiModelProperty(value = "寰俊openId")
+ private String openid;
+
@NotBlank(message = "瀵嗙爜涓嶈兘涓虹┖")
@ApiModelProperty(value = "瀵嗙爜")
private String password;
diff --git a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
index b9b8bf2..f698a75 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
@@ -1,6 +1,7 @@
package com.doumee.service.system.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.doumee.config.jwt.JwtTokenUtil;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
@@ -11,6 +12,7 @@
import com.doumee.dao.business.dao.SmsEmailMapper;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.SmsEmail;
+import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.dto.LoginByOpenidDTO;
import com.doumee.dao.system.dto.LoginDTO;
import com.doumee.dao.system.dto.LoginPhoneDTO;
@@ -47,6 +49,8 @@
@Lazy
@Autowired
private SystemUserService systemUserService;
+ @Autowired
+ private SystemUserMapper systemUserMapper;
@Autowired
private SmsEmailMapper smsEmailMapper;
@@ -83,7 +87,7 @@
loginLog.setLoginTime(new Date());
loginLog.setSystemVersion(systemVersion);
loginLog.setIp(Utils.User_Client.getIP(request));
- loginLog.setLocation(Utils.Location.getLocationString(loginLog.getIp()));
+// loginLog.setLocation(Utils.Location.getLocationString(loginLog.getIp()));
loginLog.setPlatform(Utils.User_Client.getPlatform(request));
loginLog.setClientInfo(Utils.User_Client.getBrowser(request));
loginLog.setOsInfo(Utils.User_Client.getOS(request));
@@ -124,7 +128,7 @@
loginLog.setLoginUsername(dto.getUsername());
loginLog.setLoginTime(new Date());
loginLog.setSystemVersion(systemVersion);
- loginLog.setLocation(Utils.Location.getLocationString(loginLog.getIp()));
+// loginLog.setLocation(Utils.Location.getLocationString(loginLog.getIp()));
if(request!=null&&request.getHeaders()!=null && request.getHeaders().size()>0){
loginLog.setIp(Utils.User_Client.getIP(request));
loginLog.setPlatform(Utils.User_Client.getPlatform(request));
@@ -132,7 +136,7 @@
loginLog.setOsInfo(Utils.User_Client.getOS(request));
}
loginLog.setServerIp(Utils.Server.getIP());
- if(isDebug == null || !isDebug && dto.getCheckCode()){
+// if(isDebug == null || !isDebug && dto.getCheckCode()){
// 鏍￠獙楠岃瘉鐮�
try {
captchaService.check(dto.getUuid(), dto.getCode());
@@ -143,7 +147,7 @@
systemLoginLogService.create(loginLog);
throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT.getCode(),"瀵逛笉璧凤紝楠岃瘉鐮佷笉姝ｇ‘锛�");
}
- }
+// }
// 鏍规嵁鐢ㄦ埛鍚嶆煡璇㈢敤鎴峰璞�
SystemUser queryDto = new SystemUser();
queryDto.setUsername(dto.getUsername());
@@ -160,6 +164,7 @@
if( !StringUtils.equals(pwd, user.getPassword())){
throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT);
}
+ dealOpenIdBiz(user,dto.getOpenid());
Company company = new Company();
if(Objects.nonNull(user.getCompanyId())){
company = companyMapper.selectById(user.getCompanyId());
@@ -177,8 +182,17 @@
return userInfo;
}
-
-
+ private void dealOpenIdBiz(SystemUser user, String openid) {
+ if(StringUtils.isNotBlank(openid)){
+ //濡傛灉openId涓嶄负绌�,缁戝畾璇ョ敤鎴穙penid
+ systemUserMapper.update(null,new UpdateWrapper<SystemUser>().lambda()
+ .set(SystemUser::getOpenid,null)
+ .eq(SystemUser::getType,user.getType()));
+ systemUserMapper.update(null,new UpdateWrapper<SystemUser>().lambda()
+ .set(SystemUser::getOpenid,openid)
+ .eq(SystemUser::getId,user.getId()));
+ }
+ }
@Override
@@ -187,7 +201,7 @@
loginLog.setLoginUsername(dto.getPhone());
loginLog.setLoginTime(new Date());
loginLog.setSystemVersion(systemVersion);
- loginLog.setLocation(Utils.Location.getLocationString(loginLog.getIp()));
+// loginLog.setLocation(Utils.Location.getLocationString(loginLog.getIp()));
if(request!=null&&request.getHeaders()!=null && request.getHeaders().size()>0){
loginLog.setIp(Utils.User_Client.getIP(request));
loginLog.setPlatform(Utils.User_Client.getPlatform(request));
@@ -258,8 +272,9 @@
SystemLoginLog loginLog = new SystemLoginLog();
loginLog.setLoginUsername(dto.getUsername());
loginLog.setLoginTime(new Date());
+ loginLog.setReason("銆愬叕浼楀彿銆戝徃鏈虹鐧婚檰锛歰penid="+dto.getOpenid());
loginLog.setSystemVersion(systemVersion);
- loginLog.setLocation(Utils.Location.getLocationString(loginLog.getIp()));
+// loginLog.setLocation(Utils.Location.getLocationString(loginLog.getIp()));
if(request!=null&&request.getHeaders()!=null && request.getHeaders().size()>0){
loginLog.setIp(Utils.User_Client.getIP(request));
loginLog.setPlatform(Utils.User_Client.getPlatform(request));
@@ -280,6 +295,7 @@
if( !StringUtils.equals(pwd, user.getPassword())){
throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT);
}
+ dealOpenIdBiz(user,dto.getOpenid());
Company company = new Company();
if(Objects.nonNull(user.getCompanyId())){
company = companyMapper.selectById(user.getCompanyId());
@@ -298,7 +314,7 @@
SystemLoginLog loginLog = new SystemLoginLog();
loginLog.setLoginTime(new Date());
loginLog.setSystemVersion(systemVersion);
- loginLog.setLocation(Utils.Location.getLocationString(loginLog.getIp()));
+// loginLog.setLocation(Utils.Location.getLocationString(loginLog.getIp()));
loginLog.setServerIp(Utils.Server.getIP());
// 鏍规嵁鐢ㄦ埛鍚嶆煡璇㈢敤鎴峰璞�
diff --git a/server/visits/admin_timer/src/main/java/com/doumee/api/WxTokenTimerController.java b/server/visits/admin_timer/src/main/java/com/doumee/api/WxTokenTimerController.java
index 19131de..d40d16b 100644
--- a/server/visits/admin_timer/src/main/java/com/doumee/api/WxTokenTimerController.java
+++ b/server/visits/admin_timer/src/main/java/com/doumee/api/WxTokenTimerController.java
@@ -2,21 +2,22 @@
import com.alibaba.fastjson.JSONObject;
import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.core.haikang.model.HKConstants;
+import com.doumee.core.haikang.model.param.BaseResponse;
+import com.doumee.core.haikang.service.HKService;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.HttpsUtil;
import com.doumee.core.wx.WXConstant;
import com.doumee.dao.system.model.SystemDictData;
-import com.doumee.service.business.impl.hksync.HkSyncVisitServiceImpl;
-import com.doumee.service.business.impl.hksync.fhk.HkSyncVisitFromHKServiceImpl;
import com.doumee.service.system.SystemDictDataService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.mgt.DefaultSecurityManager;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -45,7 +46,27 @@
@ApiOperation("寮�鍚畾鏃舵洿鏂板井淇″叕浼楀彿accesstoken")
@GetMapping("/updateWxAccessToken")
public ApiResponse updateWxAccessToken() {
- DefaultSecurityManager securityManager = new DefaultSecurityManager();
+ DefaultSecurityManager securityManager = new DefaultSecurityManager();
+ SecurityUtils.setSecurityManager(securityManager);
+ String token =null;
+ BaseResponse<String> result = HKService.wxAccessToken(systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_WXTOKEN_CONFIGID).getCode(),systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_WXTOKEN_TAGID).getCode());
+ if(StringUtils.equals(result.getCode(), HKConstants.RESPONSE_SUCCEE) ){
+ token= result.getData();
+ SystemDictData systemDictData = systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN);
+ if(!Objects.isNull(systemDictData)){
+ systemDictData.setCode(token);
+ systemDictData.setUpdateTime(new Date());
+ systemDictDataService.updateById(systemDictData);
+ }
+ }else{
+ return ApiResponse.success("寮�鍚畾鏃舵洿鏂板井淇″叕浼楀彿accesstoken澶辫触");
+ }
+ return ApiResponse.success("寮�鍚畾鏃舵洿鏂板井淇″叕浼楀彿accesstoken鎴愬姛");
+ }
+ @ApiOperation("寮�鍚畾鏃舵洿鏂板井淇″叕浼楀彿accesstoken")
+ @GetMapping("/updateWxAccessTokenOrigin")
+ public ApiResponse updateWxAccessTokenOrigin() {
+ DefaultSecurityManager securityManager = new DefaultSecurityManager();
SecurityUtils.setSecurityManager(securityManager);
String appId = systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_APPID).getCode();
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/StagingCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/StagingCloudController.java
index 751d022..e1ade6d 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/StagingCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/StagingCloudController.java
@@ -17,6 +17,7 @@
import com.doumee.service.business.ApproveService;
import com.doumee.service.business.MemberService;
import com.doumee.service.business.VisitsService;
+import com.doumee.service.business.impl.hksync.HkSyncNoticeServiceImpl;
import com.doumee.service.system.NoticesService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -46,6 +47,8 @@
@Autowired
private VisitsService visitsService;
+ @Autowired
+ private HkSyncNoticeServiceImpl hkSyncNoticeService;
@Autowired
private NoticesService noticesService;
@@ -90,6 +93,8 @@
@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "isDetail", value = " 鏄惁鏌ヨ璇︾粏 1鏄紱0鍚�", required = true),
})
public ApiResponse<InternalHomeVO> taskCenterHead(@RequestParam Integer isDetail,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ LoginUserInfo loginUserInfo = getLoginUser(token);
+ hkSyncNoticeService.syncHkNotices(loginUserInfo.getUsername());
return ApiResponse.success("鏌ヨ鎴愬姛",approveService.getHomeDataH5(getLoginUser(token).getMemberId(),isDetail));
}
@@ -98,6 +103,7 @@
@PostMapping("/taskCenterHeadPC")
public ApiResponse<InternalHomeVO> taskCenterHeadPC(@RequestBody NoticesDTO noticesDTO,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
LoginUserInfo loginUserInfo = getLoginUser(token);
+ hkSyncNoticeService.syncHkNotices(loginUserInfo.getUsername());
noticesDTO.setMemberId(loginUserInfo.getMemberId());
noticesDTO.setUserId(loginUserInfo.getId());
return ApiResponse.success("鏌ヨ鎴愬姛",approveService.getHomeDataPC(noticesDTO));
@@ -138,6 +144,10 @@
@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "queryType", value = "鏌ヨ绫诲瀷锛�1=鍦ㄥ洯浜烘暟锛�2=鎶ヨ〃鏁版嵁锛�3=寰呭姙浜嬮」锛�4=瓒呮椂棰勮", required = true),
})
public ApiResponse<PCWorkPlatformDataVO> pCWorkPlatformData (@RequestParam Integer queryType, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ if(queryType==Constants.THREE){
+ //鍚屾娴峰悍浠ｅ姙鏁版嵁
+ hkSyncNoticeService.syncHkNotices(this.getLoginUser(token).getUsername());
+ }
PCWorkPlatformDataVO pcWorkPlatformDataVO = visitsService.getPcWorkPlatformData(queryType,getLoginUser(token));
return ApiResponse.success("鏌ヨ鎴愬姛",pcWorkPlatformDataVO);
}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/EnergyController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/EnergyController.java
index 04171cd..4fae75e 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/EnergyController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/EnergyController.java
@@ -9,17 +9,13 @@
import com.doumee.service.business.third.BoardService;
import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
-import java.math.BigDecimal;
-import java.util.ArrayList;
import java.util.List;
-import java.util.Random;
/**
* Created by IntelliJ IDEA.
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/FightingAdminController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/FightingAdminController.java
index 29baf7c..e727bd7 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/FightingAdminController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/FightingAdminController.java
@@ -1,32 +1,19 @@
package com.doumee.cloud.board;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.doumee.api.BaseController;
import com.doumee.config.annotation.LoginNoRequired;
-import com.doumee.core.haikang.model.HKConstants;
-import com.doumee.core.haikang.model.param.BaseResponse;
-import com.doumee.core.haikang.model.param.request.FireDevStatusTotalRequest;
-import com.doumee.core.haikang.model.param.respose.FireDevStatusListResponse;
-import com.doumee.core.haikang.model.param.respose.MonthDataByMeterTypeResponse;
-import com.doumee.core.haikang.service.HKService;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.utils.Constants;
-import com.doumee.dao.business.PlatformLogMapper;
-import com.doumee.dao.business.model.PlatformLog;
import com.doumee.dao.web.response.platformReport.*;
import com.doumee.service.business.third.BoardService;
import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
-import java.util.ArrayList;
import java.util.List;
-import java.util.Random;
/**
* Created by IntelliJ IDEA.
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java
index 3e5d286..7db4ebd 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java
@@ -33,7 +33,7 @@
* @create 2024/10/28 13:42
*/
-@Api(tags = "銆愮湅鏉垮ぇ灞忋�戝洯鍖虹墿娴佽繍琛岃皟搴︾湅鏉�")
+@Api(tags = "銆愮湅鏉垮ぇ灞忋�戝洯鍖虹墿娴佽繍琛岃皟搴︾湅鏉跨湡瀹�")
@RestController
@Slf4j
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/board/api/platformJobRunAct")
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/SecurityController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/SecurityController.java
index 0ecd418..adb8c82 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/SecurityController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/SecurityController.java
@@ -1,15 +1,12 @@
package com.doumee.cloud.board;
import com.doumee.api.BaseController;
-import com.doumee.config.annotation.CloudRequiredPermission;
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.haikang.model.param.respose.PageRegionInfoResponse;
-import com.doumee.core.haikang.model.param.respose.RuleEventSearchResponse;
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.dao.admin.response.PCWorkPlatformDataVO;
import com.doumee.dao.business.model.Visits;
import com.doumee.dao.web.response.platformReport.*;
import com.doumee.service.business.VisitsService;
@@ -19,7 +16,6 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
diff --git a/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml b/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml
index 9dc10e9..2df12af 100644
--- a/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml
+++ b/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- active: dev
+ active: pro
application:
name: visitsAdmin
# 瀹夊叏閰嶇疆
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/erp/ErpTool.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/erp/ErpTool.java
index 17067e0..2e9c374 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/erp/ErpTool.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/erp/ErpTool.java
@@ -19,9 +19,7 @@
import com.doumee.core.utils.HttpsUtil;
import com.doumee.dao.business.InterfaceLogMapper;
import com.doumee.dao.business.model.InterfaceLog;
-import com.doumee.dao.business.model.Member;
import com.doumee.service.business.InterfaceLogService;
-import com.github.pagehelper.PageInfo;
import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.session.SqlSession;
import org.apache.ibatis.session.SqlSessionFactory;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/ApproveNoticeRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/ApproveNoticeRequest.java
index d40397e..9a3107b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/ApproveNoticeRequest.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/ApproveNoticeRequest.java
@@ -6,7 +6,6 @@
import lombok.Data;
import java.util.Date;
-import java.util.List;
/**
* 鍒嗙被淇℃伅琛�
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/wms/model/response/WmsBaseResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/wms/model/response/WmsBaseResponse.java
index 908cf5c..cf3064a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/wms/model/response/WmsBaseResponse.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/wms/model/response/WmsBaseResponse.java
@@ -1,11 +1,9 @@
package com.doumee.core.wms.model.response;
-import com.doumee.core.haikang.model.param.BaseRequst;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import java.math.BigDecimal;
import java.util.List;
/**
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatConfig.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatConfig.java
index 14cbdca..6cc72c9 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatConfig.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatConfig.java
@@ -17,13 +17,13 @@
* @Author : Rk
* @create 2023/12/27 9:30
*/
-@Configuration
+//@Configuration
public class WxPlatConfig {
@Autowired
private SystemDictDataBiz systemDictDataBiz;
- @Bean
+// @Bean
public WxMpConfigStorage wxMpConfigStorage() {
WxMpDefaultConfigImpl configStorage = new WxMpDefaultConfigImpl();
// 鍏紬鍙穉ppId
@@ -43,7 +43,7 @@
*
* @return
*/
- @Bean
+// @Bean
public WxMpService wxMpService() {
WxMpService wxMpService = new WxMpServiceImpl();
wxMpService.setWxMpConfigStorage(wxMpConfigStorage());
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java
index 90a9baf..39e54a7 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java
@@ -30,11 +30,11 @@
/**
* 寰俊鍏紬鍙稟PI鐨凷ervice
*/
- private final WxMpService wxMpService;
+ /* private final WxMpService wxMpService;
public WxPlatNotice(WxMpService wxMpService) {
this.wxMpService = wxMpService;
- }
+ }*/
/**
@@ -66,12 +66,12 @@
.addData(new WxMpTemplateData("thing2", visits.getName()))
.addData(new WxMpTemplateData("phone_number6", visits.getPhone()));
String msgId = null;
- try {
+/* try {
// 鍙戦�佹ā鏉挎秷鎭�
msgId = wxMpService.getTemplateMsgService().sendTemplateMsg(templateMessage);
} catch (WxErrorException e) {
e.printStackTrace();
- }
+ }*/
log.warn("路==++--路鎺ㄩ�佸井淇℃ā鏉夸俊鎭細{}路--++==路", msgId != null ? "鎴愬姛" : "澶辫触");
return msgId != null;
}
@@ -104,7 +104,7 @@
.addData(new WxMpTemplateData("thing4", visits.getReason()))
;
String msgId = null;
- try {
+ /* try {
for (String openId:openIds) {
templateMessage.setToUser(openId);
}
@@ -112,7 +112,7 @@
msgId = wxMpService.getTemplateMsgService().sendTemplateMsg(templateMessage);
} catch (WxErrorException e) {
e.printStackTrace();
- }
+ }*/
log.warn("路==++--路鎺ㄩ�佸井淇℃ā鏉夸俊鎭細{}路--++==路", msgId != null ? "鎴愬姛" : "澶辫触");
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 13d4b25..e4ebc9b 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
@@ -51,9 +51,9 @@
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
private Integer isdeleted;
- @ApiModelProperty(value = "浣滀笟鏉ユ簮锛�0鑷缓 1wms鎺ㄩ��", example = "1")
- @ExcelColumn(name="浣滀笟鏉ユ簮锛�0鑷缓 1wms鎺ㄩ��")
- private Integer origin;
+// @ApiModelProperty(value = "浣滀笟鏉ユ簮锛�0鑷缓 1wms鎺ㄩ��", example = "1")
+// @ExcelColumn(name="浣滀笟鏉ユ簮锛�0鑷缓 1wms鎺ㄩ��")
+// private Integer origin;
@ApiModelProperty(value = "澶囨敞")
@ExcelColumn(name="澶囨敞")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/ErpVisitDTO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/ErpVisitDTO.java
index c7f204b..aea6a3a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/ErpVisitDTO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/ErpVisitDTO.java
@@ -1,6 +1,5 @@
package com.doumee.dao.web.reqeust;
-import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.core.haikang.model.param.BaseRequst;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
@@ -8,7 +7,6 @@
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
-import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.Date;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/BoardCarsListVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/BoardCarsListVO.java
index a523f02..8b9b44f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/BoardCarsListVO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/BoardCarsListVO.java
@@ -4,7 +4,6 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import java.math.BigDecimal;
import java.util.List;
/**
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/BoardJobCenterDataVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/BoardJobCenterDataVO.java
index 5535006..2043610 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/BoardJobCenterDataVO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/BoardJobCenterDataVO.java
@@ -1,10 +1,7 @@
package com.doumee.dao.web.response.platformReport;
-import com.doumee.core.haikang.model.cars.response.CarsDeviceDetaisResponse;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
-import java.util.List;
/**
* 杩愯緭閲�
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/CarmeraListVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/CarmeraListVO.java
index 3161342..2546492 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/CarmeraListVO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/CarmeraListVO.java
@@ -1,13 +1,7 @@
package com.doumee.dao.web.response.platformReport;
-import com.doumee.core.haikang.model.param.respose.PageRegionInfoResponse;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import org.apache.commons.lang3.StringUtils;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
/**
* 鐩戞帶鐐归泦鍚�
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/CarsJobAndContractVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/CarsJobAndContractVO.java
index 72183e1..e42f4a8 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/CarsJobAndContractVO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/CarsJobAndContractVO.java
@@ -1,8 +1,6 @@
package com.doumee.dao.web.response.platformReport;
-import com.doumee.core.haikang.model.cars.response.CarsDeviceDetaisResponse;
import com.doumee.dao.business.model.PlatformLog;
-import com.doumee.dao.business.model.PlatformWmsDetail;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/RegionTreeVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/RegionTreeVO.java
index 9436d99..e0b5807 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/RegionTreeVO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/RegionTreeVO.java
@@ -1,13 +1,9 @@
package com.doumee.dao.web.response.platformReport;
-import com.doumee.config.DataSyncConfig;
import com.doumee.core.haikang.model.param.respose.PageRegionInfoResponse;
-import com.doumee.dao.business.model.Company;
-import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.lang3.StringUtils;
-import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/DeviceService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/DeviceService.java
index f752fd9..5ba9b71 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/DeviceService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/DeviceService.java
@@ -1,7 +1,5 @@
package com.doumee.service.business;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.doumee.core.haikang.model.param.request.AcsDeviceListRequest;
import com.doumee.core.haikang.model.param.request.TransparentChannelSingleRequest;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ext/ERPSyncService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ext/ERPSyncService.java
index 72c55b6..aaea1d2 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ext/ERPSyncService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ext/ERPSyncService.java
@@ -1,9 +1,6 @@
package com.doumee.service.business.ext;
import com.doumee.core.erp.model.openapi.request.erp.*;
-import com.doumee.core.erp.model.openapi.response.erp.ApproveInfoResponse;
-import com.doumee.core.haikang.model.param.request.AcsDeviceListRequest;
-import com.doumee.core.haikang.model.param.request.PrivilegeGroupRequest;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.erp.model.openapi.request.*;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
index 57eeaa2..dcd27b0 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
@@ -1,13 +1,10 @@
package com.doumee.service.business.impl;
-import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.haikang.model.HKConstants;
-import com.doumee.core.haikang.model.param.BaseResponse;
-import com.doumee.core.haikang.model.param.request.*;
+import com.doumee.core.haikang.model.param.request.TransparentChannelSingleRequest;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
@@ -22,7 +19,6 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.doumee.service.business.impl.hksync.HkSyncPushServiceImpl;
-import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InitServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InitServiceImpl.java
index 918b813..77f4730 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InitServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InitServiceImpl.java
@@ -7,7 +7,6 @@
import com.doumee.service.business.InterfaceLogService;
import com.doumee.service.business.impl.hksync.HkSyncBaseServiceImpl;
import com.hikvision.artemis.sdk.config.ArtemisConfig;
-import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index a2446bb..cb86390 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -1697,6 +1697,7 @@
/**
* 寰俊鎺堟潈鎺ュ彛
* @param code
+ * 鏉ユ簮:0=鍙告満锛�1=璁垮锛�2=鍐呴儴鍛樺伐
* @return
*/
@Override
@@ -1716,42 +1717,73 @@
// String openId = "12345";
WxAuthorizeVO wxAuthorizeVO = new WxAuthorizeVO();
wxAuthorizeVO.setOpenid(openId);
- //鏍规嵁openId 鏌ヨ鐢ㄦ埛淇℃伅
- Member member = memberJoinMapper.selectJoinOne(Member.class,new MPJLambdaWrapper<Member>()
- .selectAll(Member.class)
- .selectAs(Company::getName,Member::getCompanyName)
- .leftJoin(Company.class,Company::getId,Member::getCompanyId)
- .eq(Member::getOpenid,openId)
- .eq(Member::getType,source)
- .eq(Member::getIsdeleted,Constants.ZERO)
- .orderByDesc(Member::getCreateDate)
- .last(" limit 1 ")
- );
- //闈炶瀹㈢敤鎴� 杩涜鍒ゆ柇鏄惁瀛樺湪鐢ㄦ埛
- if(!Objects.isNull(member)){
- if(member.getIsdeleted() == Constants.ONE){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸插垹闄�,璇疯仈绯荤鐞嗗憳");
- }
- if(member.getStatus() != Constants.ZERO){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸茬鐢�,璇疯仈绯荤鐞嗗憳");
- }
- if(StringUtils.isNotBlank(member.getIdcardNo())){
- member.setIdcardDecode(DESUtil.decrypt(Constants.EDS_PWD, member.getIdcardNo()));
- }
- String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() +
- systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
- member.setPrefixUrl(prefixUrl);
- wxAuthorizeVO.setMember(member);
- //鍙告満 涓� 鍐呴儴浜哄憳 鎻愪緵token
- if(Constants.equalsInteger(source,Constants.ZERO)||Constants.equalsInteger(source,Constants.TWO)){
- SystemUser systemUser = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda().eq(SystemUser::getMemberId,member.getId())
- .eq(SystemUser::getStatus,Constants.ZERO).last(" limit 1 "));
- if(Objects.nonNull(systemUser)){
- String token = systemLoginService.loginByUserId(systemUser.getId());
- wxAuthorizeVO.setToken(token);
+ if(source==1){
+ //鏍规嵁openId 鏌ヨ鐢ㄦ埛淇℃伅
+ Member member = memberJoinMapper.selectJoinOne(Member.class,new MPJLambdaWrapper<Member>()
+ .selectAll(Member.class)
+ .selectAs(Company::getName,Member::getCompanyName)
+ .leftJoin(Company.class,Company::getId,Member::getCompanyId)
+ .eq(Member::getOpenid,openId)
+ .eq(Member::getType,source)
+ .eq(Member::getIsdeleted,Constants.ZERO)
+ .orderByDesc(Member::getCreateDate)
+ .last(" limit 1 ")
+ );
+ //闈炶瀹㈢敤鎴� 杩涜鍒ゆ柇鏄惁瀛樺湪鐢ㄦ埛
+ if(!Objects.isNull(member)){
+ if(member.getIsdeleted() == Constants.ONE){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸插垹闄�,璇疯仈绯荤鐞嗗憳");
+ }
+ if(member.getStatus() != Constants.ZERO){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸茬鐢�,璇疯仈绯荤鐞嗗憳");
+ }
+ if(StringUtils.isNotBlank(member.getIdcardNo())){
+ member.setIdcardDecode(DESUtil.decrypt(Constants.EDS_PWD, member.getIdcardNo()));
+ }
+ String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() +
+ systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
+ member.setPrefixUrl(prefixUrl);
+ wxAuthorizeVO.setMember(member);
+ //鍙告満 涓� 鍐呴儴浜哄憳 鎻愪緵token
+ if(Constants.equalsInteger(source,Constants.ZERO)||Constants.equalsInteger(source,Constants.TWO)){
+ SystemUser systemUser = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda().eq(SystemUser::getMemberId,member.getId())
+ .eq(SystemUser::getStatus,Constants.ZERO).last(" limit 1 "));
+ if(Objects.nonNull(systemUser)){
+ String token = systemLoginService.loginByUserId(systemUser.getId());
+ wxAuthorizeVO.setToken(token);
+ }
}
}
+ }else{
+ //濡傛灉鏄徃鏈烘垨鑰呭唴閮ㄤ汉鍛橈紝鍒欎粠system_user鏌ヨ
+ SystemUser user = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
+ .eq(SystemUser::getOpenid,openId)
+ .eq(SystemUser::getType,source)
+ .eq(SystemUser::getDeleted,Boolean.FALSE)
+ .last(" limit 1 "));
+ //闈炶瀹㈢敤鎴� 杩涜鍒ゆ柇鏄惁瀛樺湪鐢ㄦ埛
+ if(!Objects.isNull(user)){
+ Member member = memberMapper.selectById(user.getId());
+ if(member.getIsdeleted() == Constants.ONE){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸插垹闄�,璇疯仈绯荤鐞嗗憳");
+ }
+ if(member.getStatus() != Constants.ZERO){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸茬鐢�,璇疯仈绯荤鐞嗗憳");
+ }
+ if(StringUtils.isNotBlank(member.getIdcardNo())){
+ member.setIdcardDecode(DESUtil.decrypt(Constants.EDS_PWD, member.getIdcardNo()));
+ }
+ String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() +
+ systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
+ member.setPrefixUrl(prefixUrl);
+ wxAuthorizeVO.setMember(member);
+ //鍙告満 涓� 鍐呴儴浜哄憳 鎻愪緵token
+ String token = systemLoginService.loginByUserId(user.getId());
+ wxAuthorizeVO.setToken(token);
+ }
}
+
+
return wxAuthorizeVO;
}
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 ad1dc0c..2574a90 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
@@ -1,20 +1,18 @@
package com.doumee.service.business.impl.thrid;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.haikang.model.HKConstants;
import com.doumee.core.haikang.model.cars.response.CarsDeviceDetaisResponse;
+import com.doumee.core.haikang.model.param.BaseListPageRequest;
import com.doumee.core.haikang.model.param.BaseListPageResponse;
import com.doumee.core.haikang.model.param.BaseResponse;
-import com.doumee.core.haikang.model.param.BaseListPageRequest;
import com.doumee.core.haikang.model.param.request.*;
import com.doumee.core.haikang.model.param.respose.*;
import com.doumee.core.haikang.service.HKCarOpenService;
import com.doumee.core.haikang.service.HKService;
-import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
@@ -26,9 +24,7 @@
import com.doumee.dao.business.*;
import com.doumee.dao.business.join.VisitsJoinMapper;
import com.doumee.dao.business.model.*;
-import com.doumee.dao.system.model.SystemDictData;
import com.doumee.dao.web.reqeust.CarsJobAndContractDTO;
-import com.doumee.dao.web.reqeust.SavePlatformWarnEventDTO;
import com.doumee.dao.web.response.platformReport.*;
import com.doumee.service.business.impl.PlatformJobServiceImpl;
import com.doumee.service.business.impl.VisitsServiceImpl;
@@ -36,15 +32,12 @@
import com.doumee.service.business.third.WmsService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
-import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
-import java.time.ZoneId;
import java.util.*;
import java.util.stream.Collectors;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java
index 018ff70..05bc494 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java
@@ -262,7 +262,7 @@
job.setPlateNumber(param.getPlateNumber());
job.setType(Constants.ZERO);
job.setIoCreatedate(param.getCreateDate());
- job.setOrigin(Constants.ONE);
+// job.setOrigin(Constants.ONE);
job.setJobId(model.getId());
job.setDriverPhone(param.getDriverPhone());
platformWmsJobMapper.insert(job);
@@ -333,6 +333,7 @@
job.setCarCodeFront(param.getPlateNumber());
job.setDrivierPhone(param.getDriverPhone());
job.setDriverName(param.getDriverName());
+ job.setOrigin(Constants.ONE);
//澶勭悊浣滀笟鐨勮溅杈嗐�佸徃鏈恒�佹湀鍙扮粍鍏宠仈鍏崇郴锛屽嵏璐�
dealCarPlatformAndDriverInfo(job,0);
// platformJobMapper.insert(job);
@@ -401,6 +402,7 @@
job.setCarCodeFront(param.getPlateNumber());
job.setDrivierPhone(param.getDriverPhone());
job.setDriverName(param.getDriverName());
+ job.setOrigin(Constants.ONE);
//澶勭悊浣滀笟鐨勮溅杈嗐�佸徃鏈恒�佹湀鍙扮粍鍏宠仈鍏崇郴锛岃璐�
dealCarPlatformAndDriverInfo(job,1);
return job;
@@ -453,7 +455,7 @@
job.setContractNum(param.getContractNum());
job.setDriverPhone(param.getDriverPhone());
job.setDriverName(param.getDriverName());
- job.setOrigin(Constants.ONE);
+// job.setOrigin(Constants.ONE);
platformWmsJobMapper.insert(job);
}
jobIdList.add(job.getId());
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 45ab758..9d9bde7 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
@@ -4,13 +4,6 @@
import com.doumee.core.haikang.model.param.respose.PageRegionInfoResponse;
import com.doumee.core.haikang.model.param.respose.PageSensorStatusResponse;
import com.doumee.core.haikang.model.param.respose.RegionEnergyListResponse;
-import com.doumee.core.tms.model.request.TmsLockStatusQueryRequest;
-import com.doumee.core.tms.model.request.TmsOrderInfoRequest;
-import com.doumee.core.tms.model.request.TmsOrderListRequest;
-import com.doumee.core.tms.model.response.TmsBaseResponse;
-import com.doumee.core.tms.model.response.TmsLockStatusQueryResponse;
-import com.doumee.core.tms.model.response.TmsOrderInfoResponse;
-import com.doumee.core.tms.model.response.TmsOrderListResponse;
import com.doumee.dao.business.model.PlatformWarnEvent;
import com.doumee.dao.web.reqeust.CarsJobAndContractDTO;
import com.doumee.dao.web.response.platformReport.*;
--
Gitblit v1.9.3