From d5e01405a50c89966ae06363b09fd385b47f99f0 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期五, 24 十月 2025 16:47:55 +0800
Subject: [PATCH] 问题修改
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java | 140 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 129 insertions(+), 11 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java
index b0b1113..d8c35ca 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java
@@ -2,16 +2,18 @@
import com.alibaba.fastjson.JSONObject;
import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.dingTalk.DingTalk;
+import com.doumee.core.dingTalk.DingTalkStream;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.haikang.model.HKConstants;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.dao.business.*;
-import com.doumee.dao.business.dto.OptGridDTO;
-import com.doumee.dao.business.dto.CloseGridDTO;
-import com.doumee.dao.business.dto.GetDriverGridDTO;
-import com.doumee.dao.business.dto.OpenGridDriverDTO;
+import com.doumee.dao.business.dao.MemberMapper;
+import com.doumee.dao.business.dto.*;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.system.SystemUserMapper;
+import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.service.business.third.model.PageData;
import com.doumee.core.utils.Utils;
@@ -49,11 +51,24 @@
private JkKeysMapper jkKeysMapper;
@Autowired
+ private SystemUserMapper systemUserMapper;
+
+ @Autowired
private JkCabinetMapper jkCabinetMapper;
@Autowired
private JkCabinetLogMapper jkCabinetLogMapper;
+ @Autowired
+ private WarningMapper warningMapper;
+ @Autowired
+ private MemberMapper memberMapper;
+
+ @Autowired
+ private WarningRuleMapper warningRuleMapper;
+
+ @Autowired
+ private DingTalk dingTalk;
@Override
public Integer create(JkCabinetGrid jkCabinetGrid) {
@@ -293,7 +308,7 @@
.selectAs(JkKeys::getCarId,JkCabinetGrid::getCarId)
.leftJoin(JkKeys.class,JkKeys::getId,JkCabinetGrid::getKeyId)
.eq(JkCabinetGrid::getIsdeleted,Constants.ZERO)
- .eq(JkKeys::getStatus,Constants.ONE)
+ .eq(JkKeys::getStatus,Constants.TWO)
.eq(JkCabinetGrid::getWorkingStatus,Constants.ZERO)
.eq(JkCabinetGrid::getCabinetId,dto.getCabinetId())
.isNotNull(JkCabinetGrid::getKeyId)
@@ -303,7 +318,7 @@
for (JkCabinetGrid jkCabinetGrid:jkCabinetGridList) {
jkKeysMapper.update(null,new UpdateWrapper<JkKeys>().lambda()
.set(JkKeys::getEditDate,DateUtil.getCurrDateTime())
- .set(JkKeys::getStatus,Constants.TWO)
+ .set(JkKeys::getStatus,Constants.THREE)
.eq(JkKeys::getId,jkCabinetGrid.getKeyId())
);
}
@@ -400,7 +415,6 @@
|| Objects.isNull(dto.getCabinetId())
|| Objects.isNull(dto.getKeyStatus())
|| Objects.isNull(dto.getAuthType())
- || Objects.isNull(dto.getMemberId())
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
@@ -495,6 +509,7 @@
.selectAs(JkKeys::getCode,JkCabinetGrid::getKeyCode)
.selectAs(JkKeys::getCarCode,JkCabinetGrid::getCarCode)
.selectAs(JkKeys::getCarId,JkCabinetGrid::getCarId)
+ .selectAs(JkKeys::getStatus,JkCabinetGrid::getKeyStatus)
.leftJoin(JkKeys.class,JkKeys::getId,JkCabinetGrid::getKeyId)
.eq(JkCabinetGrid::getIsdeleted,Constants.ZERO)
.eq(JkCabinetGrid::getWorkingStatus,Constants.ZERO)
@@ -502,8 +517,14 @@
.in(Constants.equalsInteger(dto.getType(),Constants.ONE),JkKeys::getStatus,Constants.TWO,Constants.THREE)
.in(Constants.equalsInteger(dto.getType(),Constants.ZERO),JkKeys::getStatus,Constants.ONE)
.isNotNull(JkCabinetGrid::getKeyId)
- .apply(" t1.car_id in ( select c.CAR_ID from car_driver c left join cars c1 on c.car_id = c1.id where c.ISDELETED = 0 and c.TYPE != 0 and c.MEMBER_ID = "+dto.getMemberId()+" ) ")
+ .apply(" t1.car_id in ( select c.id from cars c where c.ISDELETED = 0 and c.MEMBER_ID = "+dto.getMemberId()+" ) ")
+ .orderByAsc(JkCabinetGrid::getCode)
);
+ for (JkCabinetGrid jkCabinetGrid:jkCabinetGridList) {
+ jkCabinetGrid.setBindStatus(Objects.isNull(jkCabinetGrid.getKeyId())?Constants.ZERO:Constants.ONE);
+ jkCabinetGrid.setKeyStatus(Objects.isNull(jkCabinetGrid.getKeyStatus())?Constants.ZERO:jkCabinetGrid.getKeyStatus());
+ }
+
}
return jkCabinetGridList;
}
@@ -523,15 +544,15 @@
if(Objects.isNull(jkCabinetGrid)){
return ;
}
- LoginUserInfo loginUserInfo = openGridDriverDTO.getLoginUserInfo();
+// LoginUserInfo loginUserInfo = openGridDriverDTO.getLoginUserInfo();
JkCabinetLog jkCabinetLog = new JkCabinetLog();
jkCabinetLog.setCreateDate(new Date());
- jkCabinetLog.setCreator(loginUserInfo.getId());
+// jkCabinetLog.setCreator(loginUserInfo.getId());
jkCabinetLog.setIsdeleted(Constants.ZERO);
jkCabinetLog.setCabinetId(openGridDriverDTO.getCabinetId());
jkCabinetLog.setGridId(jkCabinetGrid.getId());
jkCabinetLog.setAuthType(openGridDriverDTO.getAuthType());
- jkCabinetLog.setMemberId(loginUserInfo.getMemberId());
+ jkCabinetLog.setMemberId(openGridDriverDTO.getMemberId());
jkCabinetLog.setType(Constants.ZERO);
if(Objects.nonNull(jkCabinetGrid.getKeyId())){
JkKeys jkKeys = jkKeysMapper.selectById(jkCabinetGrid.getKeyId());
@@ -548,5 +569,102 @@
+ @Override
+ public void timeOutUnCloseAlarm(TimeOutCloseGridDTO dto){
+ if(Objects.nonNull(dto)
+ && Objects.nonNull(dto.getGridId())){
+ JkCabinetGrid jkCabinetGrid = jkCabinetGridMapper.selectJoinOne(JkCabinetGrid.class,
+ new MPJLambdaWrapper<JkCabinetGrid>().selectAll(JkCabinetGrid.class)
+ .selectAs(JkCabinet::getName,JkCabinetGrid::getCabinetName)
+ .leftJoin(JkCabinet.class,JkCabinet::getId,JkCabinetGrid::getCabinetId)
+ .eq(JkCabinetGrid::getIsdeleted,Constants.ZERO)
+ .eq(JkCabinetGrid::getId,dto.getGridId())
+ .last(" limit 1 ")
+ );
+
+// if(Objects.nonNull(jkCabinetGrid)){
+// log.error("鏌滄牸寮�闂ㄨ秴鏃舵湭鍏抽棴鍛婅淇℃伅锛歿}"+JSONObject.toJSONString(jkCabinetGrid));
+// Warning warning = warningMapper.selectOne(new QueryWrapper<Warning>().lambda()
+// .eq(Warning::getType,Constants.THREE).eq(Warning::getCode,Constants.WarningConfig.GRID_TIME_OUT_INFO.getKey()).eq(Warning::getIsdeleted,Constants.ZERO).last("limt 1"));
+// if(Objects.isNull(warning)){
+// return;
+// }
+// List<Member> memberList = this.getWarningList(warning);
+// if(CollectionUtils.isEmpty(memberList)){
+// return;
+// }
+// //瀛樺偍寮傚父鏃ュ織
+//
+//
+// }else{
+//
+// }
+ }
+ }
+
+
+ public List<Member> getWarningList(Warning warning){
+ if(Constants.equalsInteger(warning.getStatus(),Constants.ZERO)){
+ return null;
+ }
+ //鏌ヨ閫氱煡浜哄憳
+ List<WarningRule> warningRuleList = warningRuleMapper.selectList(new QueryWrapper<WarningRule>().lambda()
+ .eq(WarningRule::getIsdeleted,Constants.ZERO)
+ .apply(" id in ( select w.RULE_ID from warning_rule_detail w where w.WARNING_ID = '"+warning.getId()+"' and w.ISDELETED = 0 ) ")
+ );
+ List<Member> memberList = new ArrayList<>();
+ if(org.apache.commons.collections.CollectionUtils.isNotEmpty(warningRuleList)){
+ List<String> memberIdStr = warningRuleList.stream().map(i->i.getMemberIds()).collect(Collectors.toList());
+ if(org.apache.commons.collections.CollectionUtils.isNotEmpty(memberIdStr)){
+ List<String> memberIdList = new ArrayList<>();
+ for (String s:memberIdStr) {
+ memberIdList.addAll(
+ Arrays.asList(s.split(","))
+ );
+ }
+ memberList = memberMapper.selectList(new QueryWrapper<Member>().lambda().eq(Member::getIsdeleted,Constants.ZERO)
+ .notIn(Member::getErpId)
+ .in(Member::getId,memberIdList)
+ );
+ }
+ }
+ return memberList;
+
+
+
+ }
+
+
+
+ @Override
+ public void alcoholTestAlarm(AlcoholTestAlarmDTO dto){
+ if(Objects.nonNull(dto)
+ && Objects.nonNull(dto.getMemberId())){
+
+
+
+ SystemUser systemUser =
+ systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
+ .eq(SystemUser::getMemberId,dto.getMemberId())
+ .eq(SystemUser::getDeleted,Constants.ZERO)
+ .last(" limit 1 ")
+ );
+
+// Warning warning = warningMapper.selectOne(new QueryWrapper<Warning>().lambda()
+// .eq(Warning::getType,Constants.THREE).eq(Warning::getCode,Constants.WarningConfig.GRID_TIME_OUT_INFO.getKey()).eq(Warning::getIsdeleted,Constants.ZERO).last("limt 1"));
+// if(Objects.isNull(warning)){
+// return;
+// }
+// List<Member> memberList = this.getWarningList(warning);
+//
+//
+//
+// //瀛樺偍寮傚父鏃ュ織
+// if(Objects.nonNull(systemUser)){
+// log.error("鍙告満閰掔簿妫�娴嬶紝瓒呭嚭閰掔簿鍊煎憡璀︿俊鎭細{}"+JSONObject.toJSONString(systemUser));
+// }
+ }
+ }
+
}
--
Gitblit v1.9.3