From ee8f62695b005cfc965ec174a915e9b3e775d252 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 23 七月 2025 15:41:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberImport.java | 3 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 26 ++++++++++++-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 35 +++++++++++++++--
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/RuleEventSearchRequest.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java | 2
5 files changed, 59 insertions(+), 8 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/RuleEventSearchRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/RuleEventSearchRequest.java
index f0bffd4..03efa3b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/RuleEventSearchRequest.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/RuleEventSearchRequest.java
@@ -10,6 +10,7 @@
private String[] regionIds;// Array false 鍥尯瀵瑰簲鍖哄煙id淇℃伅,item 绫诲瀷: string锛屼紶绌簂ist鏌ュ叏閮�
private String includeBool;// Number false 鏄惁鍖呭惈涓嬬骇瀛愯妭鐐�,0-涓嶅寘鍚�,1-鍖呭惈
private List<RuleEventFiledOptionsRequest > filedOptions;// Array false 绛涢�夊瓧娈靛垪琛�>
+ private Boolean fetchImg;// 鏄惁杩斿洖鍥剧墖
private List<SortRequest > sorts;//鎺掑簭椁愬
}
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 3520756..c46e1bf 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
@@ -133,7 +133,7 @@
car_number7.put("value",StringUtils.isNotBlank(visits.getCarNos())?visits.getCarNos():"鏃�");
dataMap.put("car_number7",car_number7);
Map<String, Object> character_string6 = new HashMap<String,Object>();
- character_string6.put("value","1");
+ character_string6.put("value",Constants.equalsInteger(visits.getType(),Constants.TWO)?visits.getMemberNum()+"":"1");
Map<String, Object> thing4 = new HashMap<String,Object>();
thing4.put("value",visits.getReason());
dataMap.put("const9",const9);
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberImport.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberImport.java
index 42774e6..f792028 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberImport.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberImport.java
@@ -31,4 +31,7 @@
@ExcelColumn(name="宸ュ彿" , value = "code")
private String code;
+ @ExcelColumn(name="宀椾綅" , value = "code")
+ private String positionName;
+
}
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 a83804f..830c4fe 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
@@ -111,6 +111,8 @@
private MemberCardMapper memberCardMapper;
@Autowired
private CompanyMapper companyMapper;
+ @Autowired
+ private PositionMapper positionMapper;
@Autowired
private RedisTemplate<String, Object> redisTemplate;
@@ -2097,6 +2099,8 @@
);
List<Company> companyList = companyMapper.selectList(new QueryWrapper<Company>().lambda()
.eq(Company::getIsdeleted,Constants.ZERO));
+ List<Position> positionList = positionMapper.selectList(new QueryWrapper<Position>().lambda()
+ .eq(Position::getIsdeleted,Constants.ZERO));
List<Member> newList = new ArrayList<>();
for(int i=0;i<dataList.size();i++){
MemberImport model = dataList.get(i);
@@ -2108,7 +2112,7 @@
&&StringUtils.isBlank(model.getCompanyName())){
continue;
}
- Member member = checkModelParam(model,newList,i,loginUserInfo,list,companyList,companyType);
+ Member member = checkModelParam(model,newList,i,loginUserInfo,list,companyList,companyType,positionList);
newList.add(member);
}
if(newList == null || newList.size() ==0){
@@ -2162,7 +2166,8 @@
,LoginUserInfo loginUserInfo
,List<Member> memberList
,List<Company> companyList
- ,Integer companyType) {
+ ,Integer companyType
+ ,List<Position> positionList) {
if(StringUtils.isBlank(model.getName())
// ||StringUtils.isBlank(model.getIdcardNo())
||StringUtils.isBlank(model.getPhone())
@@ -2183,6 +2188,7 @@
}
}
+
for(Member member: newList){
if(StringUtils.isNotBlank(model.getIdcardNo())&&StringUtils.isNotBlank(member.getIdcardNo())) {
if (StringUtils.equals(model.getIdcardNo(), member.getIdcardNo())) {
@@ -2199,6 +2205,10 @@
}
if(companyType != null && !Constants.equalsInteger(companyType,company.getType())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+(index+3)+"琛岀粍缁囧悕绉般��"+model.getCompanyName()+"銆戠被鍨嬩笉姝ｇ‘锛岃妫�鏌ヨ〃鏍煎唴瀹癸紒");
+ }
+ Position position = findPositionFromList(model.getPositionName(),positionList);
+ if(Objects.isNull(position)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+(index+3)+"琛屽矖浣嶅悕绉般��"+model.getPositionName()+"銆戜笉瀛樺湪锛岃妫�鏌ヨ〃鏍煎唴瀹癸紒");
}
String candNo = DESUtil.encrypt(Constants.EDS_PWD, model.getIdcardNo());
if(StringUtils.isNotBlank(model.getIdcardNo())){
@@ -2231,6 +2241,18 @@
}
return null;
}
+
+ private Position findPositionFromList(String positionName, List<Position> positionList) {
+ if(positionList !=null){
+ for(Position position : positionList){
+ if(StringUtils.equals(positionName,position.getName())){
+ return position;
+ }
+ }
+ }
+ return null;
+ }
+
public static Member findMemberFromListByIdcard(String param, List<Member> list) {
if(list !=null){
for(Member member : list){
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 5bbc2d2..485dd99 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
@@ -490,6 +490,7 @@
}*/
return list;
}
+
@Override
public WaningEventDataVO warningEventData(Integer type){
WaningEventDataVO lastResult = new WaningEventDataVO();
@@ -499,16 +500,36 @@
request.setPageSize(1000);
request.setFiledOptions(new ArrayList<>());
request.setSorts(new ArrayList<>());
+ request.setFetchImg(true);
RuleEventFiledOptionsRequest file = new RuleEventFiledOptionsRequest();
file.setFieldName("event_type");
file.setFieldValue("131588,131593");//瀹夐槻鍛婅鍜屼汉鍛樺憡璀�
file.setType("in");
if(type == 1){
- file.setFieldValue("131588");//瀹夐槻鍛婅
+ file.setFieldValue("131588");//瀹夐槻鍛婅 鍖哄煙鍏ヤ镜
}else if(type == 2){
- file.setFieldValue("131593");//浜哄憳鍛婅
+ file.setFieldValue("131593");//浜哄憳鍛婅 鍗遍櫓琛屼负
}
request.getFiledOptions().add(file);
+
+ RuleEventFiledOptionsRequest fileLte = new RuleEventFiledOptionsRequest();
+ fileLte.setFieldName("happen_time");
+ fileLte.setFieldValue(DateUtil.formatDate(Utils.Date.getEnd(new Date()),"yyyy-MM-dd HH:mm:ss"));
+ fileLte.setType("lte");
+ request.getFiledOptions().add(fileLte);
+
+ RuleEventFiledOptionsRequest fileGte = new RuleEventFiledOptionsRequest();
+ fileGte.setFieldName("happen_time");
+ fileGte.setFieldValue(DateUtil.formatDate(Utils.Date.getStart(new Date()),"yyyy-MM-dd HH:mm:ss"));
+ fileGte.setType("gte");
+ request.getFiledOptions().add(fileGte);
+
+ RuleEventFiledOptionsRequest fileStatus = new RuleEventFiledOptionsRequest();
+ fileStatus.setFieldName("happen_time");
+ fileStatus.setFieldValue("99");
+ fileStatus.setType("neq");
+ request.getFiledOptions().add(fileStatus);
+
SortRequest sort = new SortRequest();
sort.setSortField("happen_time");
sort.setSortType("desc");
@@ -524,6 +545,9 @@
try {
if(DateUtil.getISO8601DateByStr(r.getHappen_time()).getTime() < Utils.Date.getStart(new Date()).getTime()){
continue;
+ }
+ if(StringUtils.equals(r.getStatus(),"99")){
+ continue;
}
}catch (Exception e){
}
@@ -1552,12 +1576,13 @@
data.setDeviceTypeList(list);
Long totalNum =hiddenDangerMapper.selectCount(new QueryWrapper<HiddenDanger>().lambda()
.eq(HiddenDanger::getIsdeleted,Constants.ZERO )
- .apply("to_days(create_date) = to_days(now())" ) );
+ .apply(" DATE_FORMAT(create_date, '%Y-%m') = DATE_FORMAT(now(), '%Y-%m') " ) );
data.setDangerTotalNum(totalNum !=null?totalNum.intValue():0);//浠婃棩闅愭偅鏁伴噺
totalNum =hiddenDangerMapper.selectCount(new QueryWrapper<HiddenDanger>().lambda()
.eq(HiddenDanger::getIsdeleted,Constants.ZERO )
- .in(HiddenDanger::getStatus,Constants.ONE,Constants.TWO )
- .apply("to_days(check_date) = to_days(now())" ) );
+// .in(HiddenDanger::getStatus,Constants.ONE,Constants.TWO )
+ .eq(HiddenDanger::getStatus,Constants.ZERO )
+ .apply(" DATE_FORMAT(check_date, '%Y-%m') = DATE_FORMAT(now(), '%Y-%m') " ) );
data.setDangerDealedNum(totalNum !=null?totalNum.intValue():0);//浠婃棩澶勭悊闅愭偅鏁伴噺
return data;
}
--
Gitblit v1.9.3