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)); } 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); 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) { server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java
@@ -378,12 +378,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()); } } //获取权限组集合 @@ -409,7 +411,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()+""); 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);
