From 20be31f2cbfab45fdae0fa8c6b887c5ecd6e30b4 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期五, 08 三月 2024 14:22:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java | 6 +++++-
server/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemsController.java | 11 ++++++-----
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java | 16 +++++++++++++---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 2 ++
server/dmvisit_web/src/main/java/com/doumee/api/web/PublicController.java | 3 ++-
5 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemsController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemsController.java
index 3d60a5e..f8b47a0 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemsController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemsController.java
@@ -10,6 +10,7 @@
import com.doumee.service.business.ProblemsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -32,14 +33,14 @@
@PreventRepeat
@ApiOperation("鏂板缓")
@PostMapping("/create")
- //@RequiresPermissions("business:problems:create")
+ @RequiresPermissions("business:problems:create")
public ApiResponse create(@RequestBody Problems problems) {
return ApiResponse.success(problemsService.create(problems));
}
@ApiOperation("鏍规嵁ID鍒犻櫎")
@GetMapping("/delete/{id}")
- //@RequiresPermissions("business:problems:delete")
+ @RequiresPermissions("business:problems:delete")
public ApiResponse deleteById(@PathVariable Integer id) {
problemsService.deleteById(id);
return ApiResponse.success(null);
@@ -47,7 +48,7 @@
@ApiOperation("鎵归噺鍒犻櫎")
@GetMapping("/delete/batch")
- //@RequiresPermissions("business:problems:delete")
+ @RequiresPermissions("business:problems:delete")
public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
String [] idArray = ids.split(",");
List<Integer> idList = new ArrayList<>();
@@ -60,7 +61,7 @@
@ApiOperation("鏍规嵁ID淇敼")
@PostMapping("/updateById")
- //@RequiresPermissions("business:problems:update")
+ @RequiresPermissions("business:problems:updateById")
public ApiResponse updateById(@RequestBody Problems problems) {
problemsService.updateById(problems);
return ApiResponse.success(null);
@@ -68,7 +69,7 @@
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
- //@RequiresPermissions("business:problems:query")
+ @RequiresPermissions("business:problems:query")
public ApiResponse<PageData<Problems>> findPage (@RequestBody PageWrap<Problems> pageWrap) {
return ApiResponse.success(problemsService.findPage(pageWrap));
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java
index dcbcda9..8bac41e 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java
@@ -66,9 +66,13 @@
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
public Integer create(MemberCard memberCard) {
LoginUserInfo userInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- if(Objects.isNull(memberCard.getMemberId())){
+ if(Objects.isNull(memberCard.getMemberId())
+ || StringUtils.isBlank(memberCard.getCode())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
+ if(memberCard.getCode().length()<=8){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鍗″彿闇�瑕佸ぇ浜�8浣�");
+ }
memberCard.setCreator(userInfo.getId());
memberCard.setCreateDate(new Date());
memberCard.setStatus(Constants.ONE);
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
index e340737..04fad2b 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
@@ -853,6 +853,8 @@
if (visitsMapper.selectCount(new QueryWrapper<Visits>().lambda()
.notIn(Visits::getStatus,Constants.VisitStatus.cancel,Constants.VisitStatus.noPass,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.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") + "' ")
)) > Constants.ZERO) {
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java
index 91ef13b..1b07b30 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java
@@ -383,12 +383,14 @@
request.setVisitStartTime(DateUtil.getISO8601Timestamp(c.getStarttime()));
request.setVisitEndTime(DateUtil.getISO8601Timestamp(c.getEndtime()));
request.setReceptionistId(c.getReceptMemberHkId());//琚浜烘捣搴风紪鐮�
- request.setVisitPurpose(c.getReason());
+
if(StringUtils.isNotBlank(c.getReason())){
char[] charArray = c.getReason().toCharArray();
int length = charArray.length;
if(length>32){
- request.setVisitPurpose(c.getReason().substring(32));
+ request.setVisitPurpose(c.getReason().substring(0,32));
+ }else{
+ request.setVisitPurpose(c.getReason());
}
}
//鑾峰彇鏉冮檺缁勯泦鍚�
@@ -414,7 +416,15 @@
return null;
}
info.setVisitorName(c.getName());
- info.setVisitorWorkUnit(c.getCompanyName());
+ if(StringUtils.isNotBlank(c.getCompanyName())){
+ char[] charArray = c.getCompanyName().toCharArray();
+ int length = charArray.length;
+ if(length>32){
+ info.setVisitorWorkUnit(c.getCompanyName().substring(0,32));
+ }else{
+ info.setVisitorWorkUnit(c.getCompanyName());
+ }
+ }
info.setPhoneNo(c.getPhone());
info.setPlateNo(c.getCarNos());
info.setGender(c.getSex()+"");
diff --git a/server/dmvisit_web/src/main/java/com/doumee/api/web/PublicController.java b/server/dmvisit_web/src/main/java/com/doumee/api/web/PublicController.java
index 97dc1b2..1e3743d 100644
--- a/server/dmvisit_web/src/main/java/com/doumee/api/web/PublicController.java
+++ b/server/dmvisit_web/src/main/java/com/doumee/api/web/PublicController.java
@@ -122,7 +122,8 @@
String date = DateUtil.getNowShortDate();
String fName = date+"/"+ UUID.randomUUID()+".jpg";
String fileName = folder+fName;
- boolean r = ftp.uploadInputstream(compressImg(is),fileName);
+// boolean r = ftp.uploadInputstream(compressImg(is),fileName);
+ boolean r = ftp.uploadInputstream(is,fileName);
if(r){
context.put("success", true);
context.put("code", 200);
--
Gitblit v1.9.3