From a58e10712eff439bd06fedd1613168ab72db00da Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 28 四月 2025 16:20:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java | 12 ++++++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java | 13 ++++++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java | 3 +
server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/PCWorkPlatformDataVO.java | 4 ++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java | 5 +-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWarnEventServiceImpl.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 58 +++++++++++++++++++++-------
server/visits/admin_timer/src/main/java/com/doumee/api/PlatformJobController.java | 6 ++
10 files changed, 86 insertions(+), 19 deletions(-)
diff --git a/server/visits/admin_timer/src/main/java/com/doumee/api/PlatformJobController.java b/server/visits/admin_timer/src/main/java/com/doumee/api/PlatformJobController.java
index 77485ef..614a051 100644
--- a/server/visits/admin_timer/src/main/java/com/doumee/api/PlatformJobController.java
+++ b/server/visits/admin_timer/src/main/java/com/doumee/api/PlatformJobController.java
@@ -4,6 +4,7 @@
import com.doumee.service.business.PlatformJobService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -13,6 +14,7 @@
* @author 姹熻箘韫�
* @date 2023/11/30 15:33
*/
+@Slf4j
@Api(tags = "鏈堝彴浣滀笟瀹氭椂")
@RestController
@RequestMapping("/timer/platformJob")
@@ -52,10 +54,12 @@
}
- @ApiOperation("鏈堝彴浠婃棩浣滀笟澶栧畬鎴愰�氱煡瀹氭椂")
+ @ApiOperation("鏈堝彴浠婃棩浣滀笟鏈畬鎴愰�氱煡瀹氭椂")
@GetMapping("/sendUnFinishNotice")
public ApiResponse sendUnFinishNotice() {
+ log.error("========鏈堝彴浠婃棩浣滀笟鏈畬鎴愰�氱煡瀹氭椂============寮�濮�"+System.currentTimeMillis()+"");
platformJobService.sendUnFinishNotice();
+ log.error("========鏈堝彴浠婃棩浣滀笟鏈畬鎴愰�氱煡瀹氭椂============缁撴潫"+System.currentTimeMillis()+"");
return ApiResponse.success("鏈堝彴浠婃棩浣滀笟澶栧畬鎴愰�氱煡瀹氭椂");
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
index 5722e30..4a93cf7 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
@@ -1202,8 +1202,9 @@
menuId = HKConstants.MenuPageId.kqdbcl;
}else if(Constants.equalsInteger(type,Constants.SIX)){
//https://10.50.250.253:443/xauthplus-plugin/thirdLogin?type=third&componentId=cems&componentMenuId=010200
- componentId = HKConstants.MenuPageId.componentIds[2];
- menuId = HKConstants.MenuPageId.xfzx;
+ return "https://10.50.250.253:443/xauthplus-plugin/thirdLogin?type=third&service=https://10.50.250.253:443/cems/config/generalCard&token="+token;
+// componentId = HKConstants.MenuPageId.componentIds[2];
+// menuId = HKConstants.MenuPageId.xfzx;
}
log.info("銆愭捣搴疯幏鍙栧伐浣滃彴鑿滃崟鍏嶅瘑鐧婚檰璋冩暣鍦板潃銆�================寮�濮�====menuId:"+menuId+"==token:"+token);
try {
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/PCWorkPlatformDataVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/PCWorkPlatformDataVO.java
index 73e4b8b..24a1925 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/PCWorkPlatformDataVO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/PCWorkPlatformDataVO.java
@@ -58,6 +58,10 @@
@ApiModelProperty(value = "闀挎湡鐩稿叧鏂圭浉鍏虫柟鍒嗗竷 top 5")
private List<InterestedListVO> lwList;
+ @ApiModelProperty(value = "鍐呴儴浜哄憳鍒嗗竷 top 5")
+ private List<InterestedListVO> internalList;
+
+
@ApiModelProperty(value = "杩戜竷鏃ヨ瀹㈢粺璁�")
private List<InterestedListVO> weekVisitList;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
index b37d60e..c1bcb97 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
@@ -331,4 +331,16 @@
@TableField(exist = false)
private ApproveDataVO approveDateVO;
+
+ @ApiModelProperty(value = "鏌ヨ鏃堕棿寮�濮� 鏃ユ湡鏍煎紡锛歽yyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @TableField(exist = false)
+ private Date queryStarttime;
+
+ @ApiModelProperty(value = "鏌ヨ鏃堕棿缁撴潫 鏃ユ湡鏍煎紡锛歽yyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @TableField(exist = false)
+ private Date queryEndtime;
+
+
}
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 dadaac3..2efeca7 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
@@ -270,6 +270,7 @@
.eq(Platform::getIsdeleted, Constants.ZERO)
.eq(Objects.nonNull(platformDataDTO.getQueryType())&&!Constants.equalsInteger(platformDataDTO.getQueryType(),Constants.ZERO),
Platform::getStatus,Constants.ZERO)
+ .orderByAsc(Platform::getSortnum)
);
//澶勭悊鎴戠殑鏈堝彴淇℃伅 鏄惁閰嶇疆闅愯棌
if(Constants.equalsInteger(platformDataDTO.getQueryType(),Constants.ONE)){
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 547151c..dbd6259 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
@@ -131,6 +131,8 @@
@Autowired
private PlatformWarnEventServiceImpl platformWarnEventService;
@Autowired
+ private PlatformWarnEventMapper platformWarnEventMapper;
+ @Autowired
private MemberMapper memberMapper;
@Autowired
private WxNoticeConfigMapper wxNoticeConfigMapper;
@@ -1141,6 +1143,11 @@
if(Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.DONE.getKey())){
//濡傛灉宸蹭笅鍙戞垚鍔燂紝鏍囪宸叉巿鏉冪鍥姸鎬�
platformJob.setStatus(Constants.PlatformJobStatus.AUTHED_LEAVE.getKey());
+ //鍒犻櫎鎶ヨ淇℃伅
+ platformWarnEventMapper.update(new UpdateWrapper<PlatformWarnEvent>().lambda()
+ .set(PlatformWarnEvent::getIsdeleted,Constants.ONE)
+ .eq(PlatformWarnEvent::getPlatformId,platformJob.getId())
+ );
}
}else{
platformJob.setInHkstatus(Constants.THREE);
@@ -1605,6 +1612,12 @@
//瀛樺偍鎿嶄綔鏃ュ織
savePlatformLog(Constants.PlatformJobLogType.DONE.getKey(),oldPlatformJob,platformJob ,
Constants.PlatformJobLogType.DONE.getInfo());
+
+ //鍒犻櫎鎶ヨ淇℃伅
+ platformWarnEventMapper.update(new UpdateWrapper<PlatformWarnEvent>().lambda()
+ .set(PlatformWarnEvent::getIsdeleted,Constants.ONE)
+ .eq(PlatformWarnEvent::getPlatformId,platformJob.getId())
+ );
if(Constants.equalsInteger(platformJob.getType(),Constants.THREE)){
// 澶栧崗杞﹁璐� 鏌ヨTMS 鐢靛瓙閿佹儏鍐�
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java
index 45d200c..a5992cd 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java
@@ -132,6 +132,9 @@
platform.setEditor(platform.getLoginUserInfo().getId());
platform.setEditDate(new Date());
Platform model = platformMapper.selectById(platform.getId());
+ if(Objects.isNull(platform.getSortnum())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
if(model ==null || Constants.equalsInteger(model.getIsdeleted(),Constants.ONE)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWarnEventServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWarnEventServiceImpl.java
index dcadef0..8b74790 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWarnEventServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWarnEventServiceImpl.java
@@ -202,6 +202,7 @@
platformWarnEvent.setIsdeleted(Constants.ZERO);
platformWarnEvent.setPlatformId(savePlatformWarnEventDTO.getPlatformId());
platformWarnEvent.setCarCode(savePlatformWarnEventDTO.getCarCode());
+ platformWarnEvent.setPlatformId(savePlatformWarnEventDTO.getPlatformJobId());
Constants.PlatformWarnEvent cPl = Constants.PlatformWarnEvent.STOP_TIMEOUT;
if(Constants.equalsInteger(savePlatformWarnEventDTO.getEventType(),Constants.ZERO)){
if(Objects.isNull(savePlatformWarnEventDTO.getPlatformJobId())){
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
index 42227d5..d69678e 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
@@ -1321,6 +1321,9 @@
queryWrapper.isNull(Visits::getParentId);
queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getMemberId()),Visits::getMemberId,pageWrap.getModel().getMemberId());
queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getReceptMemberId()),Visits::getReceptMemberId,pageWrap.getModel().getReceptMemberId());
+ queryWrapper.ge(Objects.nonNull(pageWrap.getModel().getQueryStarttime()),Visits::getStarttime,Utils.Date.getStart(pageWrap.getModel().getQueryStarttime()));
+ queryWrapper.le(Objects.nonNull(pageWrap.getModel().getQueryEndtime()),Visits::getStarttime,Utils.Date.getEnd(pageWrap.getModel().getQueryEndtime()));
+
if(Objects.nonNull(pageWrap.getModel().getBusinessStatus())){
if(Constants.equalsInteger(pageWrap.getModel().getBusinessStatus(),Constants.TWO)){
@@ -1839,6 +1842,7 @@
List<InterestedListVO> weekVisitList = new ArrayList<>();
List<InterestedListVO> weekCarList = new ArrayList<>();
List<InterestedListVO> lwList = new ArrayList<>();
+ List<InterestedListVO> internalList = new ArrayList<>();
//鏌ヨ涓冨ぉ鍓嶇殑璁垮璁板綍鏁伴噺
List<Visits> visitsList = visitsMapper.selectList(new QueryWrapper<Visits>().lambda().in(Visits::getStatus,
Constants.VisitStatus.signin,Constants.VisitStatus.signout)
@@ -1893,25 +1897,49 @@
.eq(Company::getIsdeleted,Constants.ZERO)
);
+
+
if(CollectionUtils.isNotEmpty(companyList)){
- List<Integer> companyIds = companyList.stream().map(i->i.getId()).collect(Collectors.toList());
- List<Retention> retentionList = retentionMapper.selectList(
- new QueryWrapper<Retention>().lambda()
- .eq(Retention::getType,Constants.TWO)
- .in(Retention::getCompanyId,companyIds)
- );
- for (Company company:companyList) {
- Integer count = retentionList.stream().filter(i->Constants.equalsInteger(i.getCompanyId(),company.getId())).collect(Collectors.toList()).size();
- if(count>0){
- InterestedListVO lw = new InterestedListVO();
- lw.setNum(count);
- lw.setName(company.getName());
- lwList.add(lw);
+ List<Company> lwCompanyList = companyList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ZERO)).collect(Collectors.toList());
+ if(CollectionUtils.isNotEmpty(lwCompanyList)){
+ List<Integer> lwCompanyIds = lwCompanyList.stream().map(i->i.getId()).collect(Collectors.toList());
+ List<Retention> retentionList = retentionMapper.selectList(
+ new QueryWrapper<Retention>().lambda()
+ .eq(Retention::getType,Constants.TWO)
+ .in(Retention::getCompanyId,lwCompanyIds)
+ );
+ for (Company company:lwCompanyList) {
+ Integer count = retentionList.stream().filter(i->Constants.equalsInteger(i.getCompanyId(),company.getId())).collect(Collectors.toList()).size();
+ if(count>0){
+ InterestedListVO lw = new InterestedListVO();
+ lw.setNum(count);
+ lw.setName(company.getName());
+ lwList.add(lw);
+ }
+ }
+ }
+
+ List<Company> internalCompanyList = companyList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)).collect(Collectors.toList());
+ if(CollectionUtils.isNotEmpty(internalCompanyList)){
+ List<Integer> internalCompanyIds = internalCompanyList.stream().map(i->i.getId()).collect(Collectors.toList());
+ List<Retention> retentionList = retentionMapper.selectList(
+ new QueryWrapper<Retention>().lambda()
+ .eq(Retention::getType,Constants.TWO)
+ .in(Retention::getCompanyId,internalCompanyIds)
+ );
+ for (Company company:internalCompanyList) {
+ Integer count = retentionList.stream().filter(i->Constants.equalsInteger(i.getCompanyId(),company.getId())).collect(Collectors.toList()).size();
+ if(count>0){
+ InterestedListVO lw = new InterestedListVO();
+ lw.setNum(count);
+ lw.setName(company.getName());
+ internalList.add(lw);
+ }
}
}
}
-
- pcWorkPlatformDataVO.setLwList(lwList );
+ pcWorkPlatformDataVO.setInternalList(internalList);
+ pcWorkPlatformDataVO.setLwList(lwList);
}else if(Constants.equalsInteger(queryType,Constants.THREE)) {
if (Objects.isNull(loginUserInfo.getMemberId())) {
pcWorkPlatformDataVO.setNoticesList(new ArrayList<>());
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 a8ef908..93e4c90 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
@@ -2031,7 +2031,7 @@
.in(PlatformJob ::getStatus,new Integer[]{Constants.PlatformJobStatus.WORKING.getKey(),Constants.PlatformJobStatus.CALLED.getKey() })
// .leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)
.orderByDesc(PlatformJob::getStatus )
- .orderByAsc(PlatformJob::getId )
+ .orderByAsc(PlatformJob::getSortnum )
);
List<PlatformDevice> platformDevices = platformDeviceMapper.selectList(new QueryWrapper<PlatformDevice>().lambda().eq(PlatformDevice::getType,Constants.ONE)
.eq(PlatformDevice::getIsdeleted,Constants.ZERO).isNotNull(PlatformDevice::getDeviceId));
--
Gitblit v1.9.3