From b3059e1a596b4fb05a708f3c3ac0ff3bc369d06b Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 12 十二月 2024 16:03:27 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java | 11 +++++
server/visits/dmvisit_admin/src/main/java/com/doumee/api/common/PublicController.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWaterGas.java | 12 +++---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/request/PlatformGasImport.java | 13 +++---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/WebPublicController.java | 4 +-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 17 ++++++++
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java | 21 ++--------
server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java | 17 ++++----
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWaterGasServiceImpl.java | 9 ++--
11 files changed, 62 insertions(+), 47 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/common/PublicController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/common/PublicController.java
index c15776e..07a3be3 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/common/PublicController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/common/PublicController.java
@@ -131,7 +131,7 @@
String fileName = folder+fName;
boolean r = ftp.uploadInputstream(is,fileName);
if(r){
- if(Constants.equalsInteger(isFace,Constants.ZERO)){
+ if(Objects.nonNull(isFace) && Constants.equalsInteger(isFace,Constants.ZERO)){
//楠岃瘉浜鸿劯璇勫垎
//浜鸿劯璇勫垎
FacePictureCheckRequest param = new FacePictureCheckRequest();
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java
index cee28e5..d4504ec 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java
@@ -191,7 +191,7 @@
String fileName = folder+"/"+fName;
boolean r = ftp.uploadInputstream(is,fileName);
if(r){
- if(Constants.equalsInteger(isFace,Constants.ZERO)){
+ if(Objects.nonNull(isFace) && Constants.equalsInteger(isFace,Constants.ZERO)){
//楠岃瘉浜鸿劯璇勫垎
//浜鸿劯璇勫垎
FacePictureCheckRequest param = new FacePictureCheckRequest();
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java
index c41616f..3da8c70 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java
@@ -72,22 +72,6 @@
return ApiResponse.success("鏌ヨ鎴愬姛",wxAuthorizeVO);
}
-
- @LoginNoRequired
- @ApiOperation(value = "testSendNotice", notes = "testSendNotice")
- @GetMapping("/testSendNotice")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "query", dataType = "String", name = "openid", value = "openid", required = true),
- @ApiImplicitParam(paramType = "query", dataType = "String", name = "token", value = "token", required = true),
- })
- public ApiResponse wxAuthorize(@RequestParam String openid,String token) {
- WxPlatNotice wxPlatNotice = new WxPlatNotice();
- List<String> idList = Arrays.asList(openid.split(","));
- wxPlatNotice.testSendNotice(idList,token);
- return ApiResponse.success("鏌ヨ鎴愬姛");
- }
-
-
@ApiOperation(value = "鏌ヨ琚闂汉淇℃伅", notes = "鏌ヨ琚闂汉淇℃伅")
@PostMapping("/getVisitedMember")
public ApiResponse<List<MemberVO>> getVisitedMember(@Valid @RequestBody CheckVisitedDTO checkVisitedDTO) {
@@ -124,6 +108,11 @@
public ApiResponse<PageData<Visits>> visitPage (@RequestBody PageWrap<Visits> pageWrap) {
if(Objects.isNull(pageWrap.getModel()) || StringUtils.isBlank(pageWrap.getModel().getOpenid())){
pageWrap.getModel().setMemberId(0);
+ }else{
+ if(Objects.nonNull(pageWrap.getModel()) && Objects.nonNull(pageWrap.getModel().getStatus()) ){
+ pageWrap.getModel().setBusinessStatus(pageWrap.getModel().getStatus());
+ pageWrap.getModel().setStatus(null);
+ }
}
return ApiResponse.success(visitsService.findPage(pageWrap));
}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/WebPublicController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/WebPublicController.java
index c72da7d..b18bf11 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/WebPublicController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/WebPublicController.java
@@ -132,7 +132,7 @@
// boolean r = ftp.uploadInputstream(compressImg(is),fileName);
boolean r = ftp.uploadInputstream(is,fileName);
if(r){
- if(Constants.equalsInteger(isFace,Constants.ZERO)){
+ if(Objects.nonNull(isFace) && Constants.equalsInteger(isFace,Constants.ZERO)){
//楠岃瘉浜鸿劯璇勫垎
//浜鸿劯璇勫垎
FacePictureCheckRequest param = new FacePictureCheckRequest();
@@ -267,7 +267,7 @@
ALiYunUtil obs = new ALiYunUtil(endpoint,access_id, access_key);
if (obs.uploadOnlineObject(file.getInputStream(),bucketName, key,null)) {
// 绉诲姩鎴愬姛,杩斿洖鏂囦欢鍚�
- if(Constants.equalsInteger(isFace,Constants.ZERO)){
+ if(Objects.nonNull(isFace) && Constants.equalsInteger(isFace,Constants.ZERO)){
//楠岃瘉浜鸿劯璇勫垎
//浜鸿劯璇勫垎
FacePictureCheckRequest param = new FacePictureCheckRequest();
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 ddccf93..e94cb63 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
@@ -95,7 +95,7 @@
}
Constants.WxUrlParams wxUrlParams = Constants.WxUrlParams.VISIT_REPORT_RECORD_USER;
if(!Constants.equalsInteger(visits.getType(),Constants.TWO)){
- if(objCode.equals(WxPlatConstants.visitContent.visitUpload)){
+ if(!objCode.equals(WxPlatConstants.visitContent.visitWaitAudit)){
wxUrlParams = Constants.WxUrlParams.VISIT_RECORD_VISIT;
}else{
wxUrlParams = Constants.WxUrlParams.VISIT_RECORD_USER;
@@ -411,7 +411,7 @@
}else if(Constants.equalsInteger(platformBooks.getStatus(),Constants.TWO)){
const9.put("value","鐢宠宸插鏍搁�氳繃");
}else{
- const9.put("value","鐢宠鏈�氳繃");
+ const9.put("value","鐢宠宸插鏍搁┏鍥�");
}
}
//杞︾墝鍙�
@@ -610,17 +610,17 @@
Map<String, Object> const6 = new HashMap<String,Object>();
const6.put("value",wxNoticeConfig.getTitile());
//杞︾墝鍙�
- Map<String, Object> character_string1 = new HashMap<String,Object>();
- character_string1.put("value",platformJob.getCarCodeFront());
+ Map<String, Object> car_number3 = new HashMap<String,Object>();
+ car_number3.put("value",platformJob.getCarCodeFront());
//鏈堝彴鍙�
- Map<String, Object> thing3 = new HashMap<String,Object>();
- thing3.put("value", platformJob.getPlatformName());
+ Map<String, Object> character_string7 = new HashMap<String,Object>();
+ character_string7.put("value", "A001");
//鏃堕棿
Map<String, Object> time4 = new HashMap<String,Object>();
time4.put("value", DateUtil.getFomartDate(new Date(),"yyyy骞碝M鏈坉d鏃� HH:mm:ss") );
dataMap.put("const6",const6);
- dataMap.put("character_string1",character_string1);
- dataMap.put("thing3",thing3);
+ dataMap.put("car_number3",car_number3);
+ dataMap.put("character_string7",character_string7);
dataMap.put("time4",time4);
for (String openId:openIds) {
paramMap.clear();
@@ -629,6 +629,7 @@
paramMap.put("touser", openId);
paramMap.put("data", dataMap);
String response = HttpsUtil.postJson(postUrL, JSONObject.toJSONString(paramMap));
+ log.warn("路==++--路鎺ㄩ�佸井淇℃ā鏉夸俊鎭唴瀹癸細{}", JSONObject.toJSONString(paramMap));
if(StringUtils.isBlank(response)){
log.warn("路==++--路鎺ㄩ�佸井淇℃ā鏉夸俊鎭細{}路--++==路", "澶辫触");
}else{
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/request/PlatformGasImport.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/request/PlatformGasImport.java
index 1e27745..0fd8595 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/request/PlatformGasImport.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/request/PlatformGasImport.java
@@ -17,18 +17,17 @@
@ApiModel("娌硅�椾俊鎭鍏�")
public class PlatformGasImport {
+ @ExcelColumn(name="搴忓彿",value = "sn",index = 1)
+ private String sn;
+
@ExcelColumn(name="杞︾墝鍙�",value = "carCode",index = 1)
private String carCode;
- @ExcelColumn(name="鏃堕棿锛堝勾鏈堬級",value = "timeInfo",index = 2,dateFormat = "yyyy-MM-dd HH:mm:ss")
- private Date timeInfo;
+ @ExcelColumn(name="浣跨敤鏈堜唤",value = "timeInfo",index = 2)
+ private String timeInfo;
- @ExcelColumn(name="鏁伴噺",value = "num",index = 3)
+ @ExcelColumn(name="娌硅��(鍗�)",value = "num",index = 3)
private String num;
-
- @ExcelColumn(name="璇存槑",value = "content",index = 3)
- private String content;
-
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWaterGas.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWaterGas.java
index 4208907..d88be28 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWaterGas.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWaterGas.java
@@ -37,7 +37,7 @@
private Integer editor;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- @ExcelColumn(name="鏈�杩戞搷浣滄椂闂�",index = 5,dateFormat="yyyy-MM-dd HH:mm")
+ @ExcelColumn(name="鏈�杩戞搷浣滄椂闂�",index = 5, width = 18,dateFormat="yyyy-MM-dd HH:mm")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -47,26 +47,26 @@
private String remark;
@ApiModelProperty(value = "鏃堕棿锛堝勾鏈堬級")
- @ExcelColumn(name="浣跨敤鏈堜唤",index = 2,dateFormat="yyyy-MM")
+ @ExcelColumn(name="浣跨敤鏈堜唤",index = 2, width = 12,dateFormat="yyyy-MM")
private Date timeInfo;
@ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
private Integer sortnum;
@ApiModelProperty(value = "绫诲瀷 0鐢ㄦ按 1鐢ㄦ皵 2鐢ㄦ补 3", example = "1")
- @ExcelColumn(name="绫诲瀷",valueMapping = "0=鐢ㄦ按;1=鐢ㄦ皵;2=鐢ㄦ补;3=鐑熺;",index = 0)
+ @ExcelColumn(name="绫诲瀷",valueMapping = "0=鐢ㄦ按;1=鐢ㄦ皵;2=鐢ㄦ补;3=鐑熺;", width = 10,index = 0)
private Integer type;
@ApiModelProperty(value = "鏁伴噺 (鐢ㄧ數椤匡紝鐢ㄧ數搴︼紱 娌硅�桳锛�", example = "1")
- @ExcelColumn(name="鏁伴噺",index = 3)
+ @ExcelColumn(name="鏁伴噺",index = 3, width = 10)
private BigDecimal num;
@ApiModelProperty(value = "璇存槑")
- @ExcelColumn(name="璇存槑",index = 4)
+ @ExcelColumn(name="璇存槑",index = 4, width = 20)
private String content;
@ApiModelProperty(value = "杞︾墝鍙�")
- @ExcelColumn(name="杞︾墝鍙�",index = 1)
+ @ExcelColumn(name="杞︾墝鍙�",index = 1, width = 10)
private String carCode;
@ApiModelProperty(value = "寮�濮嬫椂闂�")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java
index 9622ddf..612951a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java
@@ -506,6 +506,7 @@
//澶勭悊寰呭姙淇℃伅
noticesJoinMapper.update(null,new UpdateWrapper<Notices>().lambda()
.set(Notices::getStatus,Constants.ONE)
+ .set(Notices::getInfo,"宸插彇娑�")
.eq(Notices::getType,Constants.TWO)
.eq(Notices::getObjId,carUseBook.getId())
);
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 322e44a..804bda2 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
@@ -889,9 +889,18 @@
.eq(SystemUser::getMobile,platformJob.getDrivierPhone())
.last(" limit 1 "));
if (Objects.nonNull(driver) && StringUtils.isNotBlank(driver.getOpenid())) {
+ PlatformJob p = platformJobJoinMapper.selectJoinOne(PlatformJob.class,
+ new MPJLambdaWrapper<PlatformJob>()
+ .selectAll(PlatformJob.class)
+ .selectAs(Platform::getCode,PlatformJob::getPlatformName)
+ .leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)
+ .eq(PlatformJob::getId,platformJob.getId())
+ .last(" limit 1")
+ );
+
WxPlatNotice wxPlatNotice = new WxPlatNotice();
wxPlatNotice.sendPlatformJobTemplateNotice(systemDictDataBiz,
- wxNoticeConfigMapper, platformJob,
+ wxNoticeConfigMapper, p,
objCode,
systemDictDataBiz.queryByCode(Constants.WX_PLATFORM, Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
Arrays.asList(driver.getOpenid().split(","))
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWaterGasServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWaterGasServiceImpl.java
index a8a7570..c6c6e11 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWaterGasServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWaterGasServiceImpl.java
@@ -349,7 +349,7 @@
ExcelImporter ie = null;
List<PlatformGasImport> dataList =null;
try {
- ie = new ExcelImporter(file,0,0);
+ ie = new ExcelImporter(file,1,0);
dataList = ie.getDataList(PlatformGasImport.class,null);
} catch (Exception e) {
e.printStackTrace();
@@ -374,15 +374,14 @@
}
if( platformWaterGasMapper.selectCount(new QueryWrapper<PlatformWaterGas>().lambda()
.eq(PlatformWaterGas::getIsdeleted, Constants.ZERO)
- .apply("to_days(time_info) = to_days('"+ DateUtil.getPlusTime2(model.getTimeInfo()) +"')")
+ .apply("to_days(time_info) = to_days('"+ model.getTimeInfo()+"-01" +"')")
.eq(PlatformWaterGas::getType,Constants.TWO)
.eq(PlatformWaterGas::getCarCode,model.getCarCode()))>0){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇"+DateUtil.getPlusTime2(model.getTimeInfo())+"]鏁版嵁宸插瓨鍦紝璇峰嬁閲嶆柊褰曞叆锛屽彲浠ュ皾璇曟悳绱㈠悗杩涜鏁版嵁淇敼锛�");
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇"+model.getTimeInfo()+"]鏁版嵁宸插瓨鍦紝璇峰嬁閲嶆柊褰曞叆锛屽彲浠ュ皾璇曟悳绱㈠悗杩涜鏁版嵁淇敼锛�");
}
- platformWaterGas.setTimeInfo(model.getTimeInfo());
+ platformWaterGas.setTimeInfo(DateUtil.StringToDate(model.getTimeInfo()+"-01","yyyy-MM-dd"));
platformWaterGas.setCarCode(model.getCarCode());
- platformWaterGas.setContent(model.getContent());
platformWaterGas.setIsdeleted(Constants.ZERO);
platformWaterGas.setType(Constants.TWO);
platformWaterGas.setCreator(loginUserInfo.getId());
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 f8ec745..b2be85b 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
@@ -1260,6 +1260,23 @@
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());
+
+ if(Objects.nonNull(pageWrap.getModel().getBusinessStatus())){
+ if(Constants.equalsInteger(pageWrap.getModel().getBusinessStatus(),Constants.TWO)){
+ queryWrapper.in(Visits::getStatus,
+ Constants.VisitStatus.xfSuccess,
+ Constants.VisitStatus.xfFail,
+ Constants.VisitStatus.signin,
+ Constants.VisitStatus.signout,
+ Constants.VisitStatus.invalid,
+ Constants.VisitStatus.pass
+ );
+ }else{
+ queryWrapper.eq(Visits::getStatus,pageWrap.getModel().getBusinessStatus());
+ }
+
+ }
+
queryWrapper.orderByDesc(Visits::getCreateDate);
IPage<Visits> result = visitsJoinMapper.selectJoinPage(page, Visits.class,queryWrapper);
--
Gitblit v1.9.3