From b96cc19f216ccd7451a5d2758055a4f174587ba9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 07 五月 2025 16:12:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/RetentionCarsVO.java | 2 +
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java | 3 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 3 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 72 +++++++++++++++++++-----------------
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java | 19 ++++++---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java | 6 ++-
6 files changed, 62 insertions(+), 43 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java
index 96dc344..2bbc57c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java
@@ -160,8 +160,9 @@
private Integer categoryId;
@ApiModelProperty(value = "鍏宠仈鍒嗙被鍚嶇О")
- @ExcelColumn(name="鍏宠仈鍒嗙被鍚嶇О")
+ @ExcelColumn(name="杞﹁締鍒嗙被" ,index = 8,width = 16)
private String categoryName;
+
@ApiModelProperty(value = "鍏宠仈鐖剁骇鍒嗙被缂栫爜锛堝叧鑱攃ategory)", example = "1")
@ExcelColumn(name="鍏宠仈鐖剁骇鍒嗙被缂栫爜锛堝叧鑱攃ategory)")
private Integer categoryParentId;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/RetentionCarsVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/RetentionCarsVO.java
index a52d58f..1f9b848 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/RetentionCarsVO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/RetentionCarsVO.java
@@ -55,4 +55,6 @@
private Date endTime;
@ApiModelProperty(value = "璁垮鍏徃鍚嶇О")
private String visitCompanyName;
+ @ApiModelProperty(value = "杞﹁締鍒嗙被")
+ private String categoryName;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
index d1d59d9..d276e6a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
@@ -809,10 +809,15 @@
if(CollectionUtils.isEmpty(hiddenDangerAllList)){
return hiddenDangerDataVO;
}
+ Integer nowYear = DateUtil.getNowYearNum();
+ Integer nowMonth = DateUtil.getNowMonthNum();
+ String nowDate = DateUtil.getFomartDate(new Date(),"yyyy-MM-dd");
for (int i = 1; i <=12 ; i++) {
GeneralDataVO generalDataVO = new GeneralDataVO();
generalDataVO.setName(Integer.toString(i));
- generalDataVO.setTotal(hiddenDangerAllList.stream().filter(j->Constants.equalsInteger(Integer.valueOf(generalDataVO.getName()),Integer.valueOf(DateUtil.formatDate(j.getCreateDate(),"MM")))).collect(Collectors.toList()).size());
+ generalDataVO.setTotal(
+ hiddenDangerAllList.stream().filter(j->Constants.equalsInteger(nowYear,Integer.valueOf(DateUtil.formatDate(j.getCreateDate(),"yyyy")))&&Constants.equalsInteger(Integer.valueOf(generalDataVO.getName()),
+ Integer.valueOf(DateUtil.formatDate(j.getCreateDate(),"MM")))).collect(Collectors.toList()).size());
generalDataVO.setName(generalDataVO.getName()+"鏈�");
yearDataList.add(generalDataVO);
}
@@ -827,7 +832,7 @@
hiddenDangerDataVO.setTodayNew(hiddenDangerAllList.stream().filter(i->DateUtil.formatDate(i.getCreateDate(),"yyyy-MM-dd").equals(DateUtil.formatDate(new Date(),"yyyy-MM-dd"))).collect(Collectors.toList()).size());
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(hiddenDangerAllList)){
- List<Integer> cateList = hiddenDangerAllList.stream().map(i->i.getCateId()).collect(Collectors.toList());
+ List<Integer> cateList = hiddenDangerAllList.stream().filter(i->DateUtil.formatDate(i.getCreateDate(),"yyyy-MM").equals(nowDate.substring(0,7))).map(i->i.getCateId()).collect(Collectors.toList());
//鍏ㄩ儴闅愭偅鍒嗙被鏁版嵁
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(cateList)){
List<GeneralDataVO> cateGeneralDataList = new ArrayList<>();
@@ -842,7 +847,7 @@
if(optionalHiddenDanger.isPresent()){
GeneralDataVO generalDataVO = new GeneralDataVO();
HiddenDangerParam hiddenDangerParam = optionalHiddenDanger.get();
- Integer total = hiddenDangerAllList.stream().filter(i->Constants.equalsInteger(i.getCateId(),hiddenDangerParam.getId())).collect(Collectors.toList()).size();
+ Integer total = hiddenDangerAllList.stream().filter(i->Constants.equalsInteger(i.getCateId(),hiddenDangerParam.getId())&& DateUtil.formatDate(i.getCreateDate(),"yyyy-MM").equals(nowDate.substring(0,7))).collect(Collectors.toList()).size();
generalDataVO.setName(hiddenDangerParam.getName());
generalDataVO.setTotal(total);
generalDataVO.setRata(
@@ -856,8 +861,10 @@
hiddenDangerDataVO.setCateList(cateGeneralDataList);
}
//鍏ㄩ儴闅愭偅鍖哄煙閮ㄩ棬鏁版嵁
- List<Integer> companyIdList = hiddenDangerAllList.stream().map(i->i.getAreaCompanyId()).collect(Collectors.toList());
- List<HiddenDangerCompanyVO> hiddenDangerCompanyVOList = hiddenDangerAllList.stream().map(i->new HiddenDangerCompanyVO(i.getAreaName(),i.getAreaCompanyId())).collect(Collectors.toList());
+
+ List<HiddenDangerCompanyVO> hiddenDangerCompanyVOList = hiddenDangerAllList.stream().
+ filter(i->DateUtil.formatDate(i.getCreateDate(),"yyyy-MM").equals(nowDate.substring(0,7)))
+ .map(i->new HiddenDangerCompanyVO(i.getAreaName(),i.getAreaCompanyId())).collect(Collectors.toList());
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(hiddenDangerCompanyVOList)){
List<GeneralDataVO> companyGeneralDataList = new ArrayList<>();
Set<HiddenDangerCompanyVO> companyIdSetList = new HashSet<>(hiddenDangerCompanyVOList);
@@ -873,7 +880,7 @@
if(optionalCompany.isPresent()){
GeneralDataVO generalDataVO = new GeneralDataVO();
Company company = optionalCompany.get();
- Integer total = hiddenDangerAllList.stream().filter(i->Constants.equalsInteger(i.getAreaCompanyId(),company.getId())).collect(Collectors.toList()).size();
+ Integer total = hiddenDangerAllList.stream().filter(i->DateUtil.formatDate(i.getCreateDate(),"yyyy-MM").equals(nowDate.substring(0,7))&&Constants.equalsInteger(i.getAreaCompanyId(),company.getId())).collect(Collectors.toList()).size();
generalDataVO.setName(company.getName());
generalDataVO.setTotal(total);
generalDataVO.setCategoryName(hiddenDangerCompanyVO.getCategoryName());
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
index 7ea1135..7a192b0 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
@@ -247,10 +247,12 @@
.and(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),
p-> p.like(Company::getName, pageWrap.getModel().getCompanyName())
.or().like(Member::getVisitCompanyName, pageWrap.getModel().getCompanyName()))
- .eq(Objects.nonNull(pageWrap.getModel().getCarType()),
- Retention::getCarType,pageWrap.getModel().getCarType())
+// .eq(Objects.nonNull(pageWrap.getModel().getCarType()),
+// Retention::getCarType,pageWrap.getModel().getCarType())
.like(Objects.nonNull(pageWrap.getModel().getCarNo()),
Retention::getCarNo,pageWrap.getModel().getCarNo())
+ .like(Objects.nonNull(pageWrap.getModel().getCategoryName()),
+ Retention::getCategoryName,pageWrap.getModel().getCategoryName())
.ge(Objects.nonNull(pageWrap.getModel().getStartTime()),
Retention::getCreateDate,pageWrap.getModel().getStartTime())
.le(Objects.nonNull(pageWrap.getModel().getEndTime()),
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 761adea..b20d203 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
@@ -896,38 +896,41 @@
List<Member> addList = new ArrayList<>();
List<Member> editList = new ArrayList<>();
//鐢宠浜轰俊鎭�
- Member m = getMemberListParam(visits.getIdcardNo(),visits,addList,editList);
+ Member m = getMemberListParam(visits.getPhone(),visits.getIdcardNo(),visits,addList,editList);
//闅忚浜哄憳淇℃伅澶勭悊
- if(visits.getWithUserList()!= null && visits.getWithUserList().size()>0){
- for(Visits model:visits.getWithUserList()){
- model.setBirthday(Constants.getBirthdyByCardNo(model.getIdcardNo()));
- model.setStarttime(visits.getStarttime());
- model.setEndtime(visits.getEndtime());
- //鏍￠獙闅忚浜哄憳濉姤鏁版嵁鍚堟硶鎬�
- isValidWithVisitParam(model,addList,editList);
- model.setCreateDate(visits.getCreateDate());
- Member visitsMember = getMemberListParam(model.getIdcardNo(),model,addList,editList);
- model.setMemberId(visitsMember.getId());
- }
- }
+// if(visits.getWithUserList()!= null && visits.getWithUserList().size()>0){
+// for(Visits model:visits.getWithUserList()){
+// model.setBirthday(Constants.getBirthdyByCardNo(model.getIdcardNo()));
+// model.setStarttime(visits.getStarttime());
+// model.setEndtime(visits.getEndtime());
+// //鏍￠獙闅忚浜哄憳濉姤鏁版嵁鍚堟硶鎬�
+// isValidWithVisitParam(model,addList,editList);
+// model.setCreateDate(visits.getCreateDate());
+// Member visitsMember = getMemberListParam(model.getIdcardNo(),model,addList,editList);
+// model.setMemberId(visitsMember.getId());
+// }
+// }
return m;
}
- private Member getMemberListParam(String cardno, Visits visits, List<Member> addList, List<Member> editList) {
+ private Member getMemberListParam(String phone,String cardno, Visits visits, List<Member> addList, List<Member> editList) {
if(StringUtils.isNotBlank(visits.getCarNos())
&&Objects.isNull(Constants.getVehiclePlateNo(visits.getCarNos()))
){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝杞︾墝鍙枫��"+visits.getCarNos()+"銆戜笉鍚堟硶锛岃鏍稿疄鍚庨噸璇晘");
}
- if(Constants.equalsInteger(Constants.ZERO, visits.getIdcardType())&&cardno.length()!=18
- //&&!IdcardUtil.isValidCard(cardno)
- ){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝韬唤璇併��"+cardno+"銆戝彿鐮佹湁璇紝璇锋牳瀹炲悗閲嶈瘯锛�");
- }
+
+// if(StringUtils.isNotBlank(cardno)&&Constants.equalsInteger(Constants.ZERO, visits.getIdcardType())&&cardno.length()!=18
+// //&&!IdcardUtil.isValidCard(cardno)
+// ){
+// throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝韬唤璇併��"+cardno+"銆戝彿鐮佹湁璇紝璇锋牳瀹炲悗閲嶈瘯锛�");
+// }
Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda()
.eq(Member::getType,Constants.memberType.visitor)
.eq(Member::getIdcardType,visits.getIdcardType())
- .eq(Member::getIdcardNo,DESUtil.encrypt(Constants.EDS_PWD, cardno)).last("limit 1" )
+ .eq(Member::getPhone,phone)
+// .eq(Member::getIdcardNo,DESUtil.encrypt(Constants.EDS_PWD, cardno))
+ .last("limit 1" )
);
if(member == null){
member = new Member();
@@ -935,12 +938,14 @@
member.setCreateDate(visits.getCreateDate());
member.setIsdeleted(Constants.ZERO);
member.setIdcardNo(visits.getIdcardNo());
- member.setBirthday(Constants.getBirthdyByCardNo(cardno));
member.setIdcardDecode(visits.getIdcardDecode());
- member.setIdcardNo(DESUtil.encrypt(Constants.EDS_PWD, cardno));//韬唤璇佸彿鍔犲瘑
- member.setIdcardDecode(Constants.getTuominStr(cardno));//鑴辨晱鎵嬫満鍙�
+ if(StringUtils.isNotBlank(cardno)){
+ member.setBirthday(Constants.getBirthdyByCardNo(cardno));
+ member.setIdcardNo(DESUtil.encrypt(Constants.EDS_PWD, cardno));//韬唤璇佸彿鍔犲瘑
+ member.setIdcardDecode(Constants.getTuominStr(cardno));//鑴辨晱鎵嬫満鍙�
+ member.setSex(Constants.getSexByCardNo(cardno));
+ }
member.setFaceImg(visits.getFaceImg());
- member.setSex(Constants.getSexByCardNo(cardno));
member.setImgurl(StringUtils.isNotBlank(visits.getImgurl())?visits.getImgurl():null);
member.setIdcardType(visits.getIdcardType());
member.setName(visits.getName());
@@ -948,7 +953,6 @@
member.setOpenid(visits.getOpenid());
member.setType(Constants.memberType.visitor);
member.setStatus(Constants.ZERO);
- member.setSex(Constants.getSexByCardNo(cardno));
member.setHkStatus(Constants.ZERO);
member.setErpStatus(Constants.ZERO);
member.setVisitCompanyName(visits.getCompanyName());
@@ -958,7 +962,7 @@
}else{
if(!Constants.equalsInteger(Constants.ZERO,member.getStatus() )){
//濡傛灉鐢ㄦ埛鐘舵�佸紓甯革紝鍒欐彁绀�
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝銆�"+member.getName()+"銆戣韩浠借瘉鍙枫��"+cardno+"銆戝湪榛戝悕鍗曞唴锛屾棤娉曠敵璇疯繘鍏ュ洯鍖�");
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝銆�"+member.getName()+"銆戝湪榛戝悕鍗曞唴锛屾棤娉曠敵璇疯繘鍏ュ洯鍖�");
}
//鏍告煡棰勭害鐢ㄦ埛鏄惁瀛樺湪鏈绂荤殑棰勭害璁板綍
// isExsitNoOutVisisRecord(member);
@@ -966,13 +970,15 @@
member.setImgurl(StringUtils.isNotBlank(visits.getImgurl())?visits.getImgurl():null);
member.setEditDate(visits.getCreateDate());
member.setIsdeleted(Constants.ZERO);
- member.setSex(Constants.getSexByCardNo(cardno));
- member.setIdcardNo(DESUtil.encrypt(Constants.EDS_PWD, cardno));//韬唤璇佸彿鍔犲瘑
- member.setIdcardDecode(Constants.getTuominStr(cardno));//鑴辨晱韬唤璇佸彿
+ if(StringUtils.isNotBlank(cardno)){
+ member.setBirthday(Constants.getBirthdyByCardNo(cardno));
+ member.setIdcardNo(DESUtil.encrypt(Constants.EDS_PWD, cardno));//韬唤璇佸彿鍔犲瘑
+ member.setIdcardDecode(Constants.getTuominStr(cardno));//鑴辨晱鎵嬫満鍙�
+ member.setSex(Constants.getSexByCardNo(cardno));
+ }
member.setName(visits.getName());
member.setPhone(visits.getPhone());
member.setOpenid(visits.getOpenid());
- member.setSex(Constants.getSexByCardNo(cardno));
member.setHkStatus(Constants.ZERO);
member.setErpStatus(Constants.ZERO);
member.setVisitCompanyName(visits.getCompanyName());
@@ -986,16 +992,14 @@
,Constants.VisitStatus.xfFail
,Constants.VisitStatus.signout
,Constants.VisitStatus.invalid)
- .eq(Visits::getIdcardDecode, Constants.getTuominStr(cardno))
- .and(ms -> ms.eq(Visits::getPhone, visits.getPhone())
- .or().eq(Visits::getIdcardDecode, Constants.getTuominStr(cardno)))
+ .and(ms -> ms.eq(Visits::getPhone, visits.getPhone()))
.and(ms -> ms.apply(" visits.STARTTIME <= '" + DateUtil.DateToStr(visits.getStarttime(),"yyyy-MM-dd HH:mm:ss") + "' and visits.ENDTIME >= '" + DateUtil.DateToStr(visits.getStarttime(),"yyyy-MM-dd HH:mm:ss") + "' ")
.or().apply(" visits.STARTTIME <= '" + DateUtil.DateToStr(visits.getEndtime(),"yyyy-MM-dd HH:mm:ss") + "' and visits.ENDTIME >= '" + DateUtil.DateToStr(visits.getEndtime(),"yyyy-MM-dd HH:mm:ss") + "' ")
.or().apply(" visits.STARTTIME >= '" + DateUtil.DateToStr(visits.getStarttime(),"yyyy-MM-dd HH:mm:ss") + "' and visits.STARTTIME <= '" + DateUtil.DateToStr(visits.getEndtime(),"yyyy-MM-dd HH:mm:ss") + "' ")
.or().apply(" visits.ENDTIME >= '" + DateUtil.DateToStr(visits.getStarttime(),"yyyy-MM-dd HH:mm:ss") + "' and visits.ENDTIME <= '" + DateUtil.DateToStr(visits.getEndtime(),"yyyy-MM-dd HH:mm:ss") + "' ")
)
) > Constants.ZERO) {
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝鎵嬫満鍙枫��"+member.getPhone()+"銆戞垨韬唤璇併��"+ member.getIdcardDecode() +"銆戝瓨鍦ㄩ绾︽椂闂村啿绐侊紝鏃犳硶鐢宠鍝︼紒");
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝鎵嬫満鍙枫��"+member.getPhone()+"銆戝瓨鍦ㄩ绾︽椂闂村啿绐侊紝鏃犳硶鐢宠鍝︼紒");
}
return member;
}
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 4ed6fa7..a87f967 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
@@ -658,6 +658,7 @@
MinitorDataSearchRequest param = new MinitorDataSearchRequest();
param.setResourceTypeCodes(new String[]{});
param.setRegionIndexCode("root000000");
+ //60-娑蹭綅 61-姘村帇
param.setResourceTypeCodes("60,61".split(","));
param.setIncludeDown("1");
param.setUserId("admin");
@@ -681,6 +682,8 @@
if(model.getValues()!=null){
List<MonitorDataInfoVO> dataList = new ArrayList<>();
for(MonitorDataValResponse v : model.getValues()){
+ //娑插帇鍥哄畾鍊硷細254001
+ //姘村帇鍥哄畾鍊硷細253958
if(Constants.equalsInteger(model.getType(),60)){
if(v.getMonitorTypeCode().equals("254001")){
MonitorDataInfoVO vm = new MonitorDataInfoVO();
--
Gitblit v1.9.3