admin/src/views/business/retention.vue
@@ -57,10 +57,14 @@ <el-table-column prop="idcardNo" label="身份证号" min-width="130px"></el-table-column> <el-table-column prop="deviceName" label="进场门禁" min-width="100px"></el-table-column> <el-table-column prop="eventDate" label="进场时间" min-width="100px"></el-table-column> <el-table-column label="进场抓拍照片" min-width="100px"> <template slot-scope="{row}"> <el-image style="width: 80px; height: 80px;" :src="row.faceImg"></el-image> </template> <el-table-column label="人脸照片" min-width="100px"> <template slot-scope="{row}"> <el-image v-if="row.faceImgFull!=null" style="width: 80px; height: 80px" :src="row.faceImgFull" :preview-src-list="[row.faceImgFull]"> </el-image> </template> </el-table-column> </el-table> <pagination admin/src/views/business/visitEvent.vue
@@ -51,7 +51,7 @@ > <el-table-column prop="personName" label="姓名" min-width="100px"></el-table-column> <el-table-column prop="phone" label="手机号码" min-width="100px"></el-table-column> <el-table-column prop="idNo" label="身份证号码" min-width="100px"></el-table-column> <el-table-column prop="idcardDecode" label="身份证号码" min-width="100px"></el-table-column> <el-table-column prop="visitorWorkUint" label="公司" min-width="100px"></el-table-column> <el-table-column prop="carNo" label="车牌号" min-width="100px"></el-table-column> <el-table-column prop="beVisitedPersonName" label="被访人" min-width="100px"></el-table-column> server/dmvisit_admin/src/main/java/com/doumee/api/business/ParkBookController.java
@@ -66,6 +66,13 @@ parkBookService.updateById(parkBook); return ApiResponse.success(null); } @ApiOperation("重新下发") @PostMapping("/reUpdate") @RequiresPermissions("business:parkbook:update") public ApiResponse reUpdate(@RequestBody ParkBook parkBook) { parkBookService.reUpdate(parkBook); return ApiResponse.success(null); } @ApiOperation("分页查询") @PostMapping("/page") server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java
@@ -8,6 +8,7 @@ import com.doumee.service.business.MemberService; import com.doumee.service.business.impl.hksync.HkSyncEmpowerServiceImpl; import com.doumee.service.business.impl.hksync.HkSyncImgServiceImpl; import com.doumee.service.business.impl.hksync.HkSyncParkServiceImpl; import com.doumee.service.business.impl.hksync.ferp.HkSyncOrgUserToHKServiceImpl; import com.doumee.service.business.impl.hksync.HkSyncVisitServiceImpl; import com.doumee.service.business.impl.hksync.fhk.HkSyncVehicleFromHKServiceImpl; @@ -29,6 +30,8 @@ @EnableScheduling public class ScheduleTool { @Autowired private HkSyncParkServiceImpl hkSyncParkService; @Autowired private HkSyncImgServiceImpl hkSyncImgService; @Autowired @@ -147,7 +150,7 @@ */ @Scheduled(fixedDelay= 60*1000) public void syncParkBookData() { hkSyncImgService.syncParkBookData(); hkSyncParkService.syncParkBookData(); }
@@ -32,16 +32,14 @@ @ApiModelProperty(value = "创建时间") @ExcelColumn(name="创建时间") @JsonFormat(pattern = "yyyy-MM-dd") private Date createDate; @ApiModelProperty(value = "更新人编码") @ExcelColumn(name="更新人编码") private String edirot; private Integer editor; @ApiModelProperty(value = "更新时间") @ExcelColumn(name="更新时间") @JsonFormat(pattern = "yyyy-MM-dd") private Date editDate; @ApiModelProperty(value = "是否删除0否 1是", example = "1") server/dmvisit_service/src/main/java/com/doumee/service/business/ParkBookService.java
@@ -94,4 +94,6 @@ * @return long */ long count(ParkBook parkBook); void reUpdate(ParkBook parkBook); } server/dmvisit_service/src/main/java/com/doumee/service/business/ext/HkSyncService.java
@@ -7,6 +7,7 @@ import com.doumee.core.haikang.model.param.request.event.acs.EventAcsRequest; import com.doumee.core.haikang.model.param.request.event.parks.EventParkRequest; import com.doumee.core.haikang.model.param.request.event.visit.EventVisitRequest; import com.doumee.dao.business.model.ParkBook; import javax.servlet.http.HttpServletResponse; import java.util.Date; @@ -68,6 +69,7 @@ void syncVisitData(); void syncEmpowerData(); void syncParkBookData(); void syncParkBookBySingleModel(ParkBook c); void syncEmpowerResultData(); void syncEmpowerDetailData(); } server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParkBookServiceImpl.java
@@ -1,5 +1,8 @@ package com.doumee.service.business.impl; import com.doumee.core.constants.ResponseStatus; import com.doumee.core.exception.BusinessException; import com.doumee.core.model.LoginUserInfo; import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; import com.doumee.core.utils.Constants; @@ -12,12 +15,15 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.doumee.service.business.impl.hksync.HkSyncParkServiceImpl; import com.github.yulichang.wrapper.MPJLambdaWrapper; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import java.util.Date; import java.util.List; /** @@ -30,6 +36,8 @@ @Autowired private ParkBookMapper parkBookMapper; @Autowired private HkSyncParkServiceImpl hkSyncParkService; @Autowired private ParkBookJoinMapper parkBookJoinMapper; @@ -44,7 +52,15 @@ @Override public void deleteById(Integer id) { parkBookMapper.deleteById(id); LoginUserInfo user =(LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); ParkBook parkBook = new ParkBook(); parkBook.setIsdeleted(Constants.ZERO); parkBook.setEditDate(new Date()); parkBook.setParkId(id); parkBook.setEditor(user.getId()); parkBook.setHkStatus(Constants.ZERO); parkBook.setRemark("待同步安防平台"); parkBookMapper.updateById(parkBook); } @Override @@ -80,6 +96,22 @@ public ParkBook findById(Integer id) { return parkBookMapper.selectById(id); } @Override public void reUpdate(ParkBook param) { MPJLambdaWrapper<ParkBook> queryWrapper = new MPJLambdaWrapper<>(); queryWrapper.selectAll(ParkBook.class); queryWrapper.selectAs(Parks::getHkId,ParkBook::getParkHkId); queryWrapper.leftJoin(Parks.class,Parks::getId,ParkBook::getParkId); queryWrapper.selectAs(Device::getHkId,Empower::getDeviceIndexCode); queryWrapper.eq(ParkBook::getHkStatus,Constants.ZERO) .eq(ParkBook::getIsdeleted,Constants.ZERO) .eq(ParkBook::getId,param.getId()); ParkBook model = parkBookJoinMapper.selectJoinOne(ParkBook.class,queryWrapper); if(model== null){ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"该记录当前不支持重新下发条件！"); } hkSyncParkService.syncParkBookBySingleModel(model); } @Override public ParkBook findOne(ParkBook parkBook) { @@ -98,7 +130,7 @@ IPage<ParkBook> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity()); MPJLambdaWrapper<ParkBook> queryWrapper = new MPJLambdaWrapper<>(); queryWrapper.selectAll(Cars.class); queryWrapper.selectAll(ParkBook.class); queryWrapper.selectAs(Parks::getName,Cars::getParksName); queryWrapper.selectAs(Member::getType,Cars::getMemberType); queryWrapper.selectAs(Member::getName,Cars::getMemberName); @@ -109,7 +141,8 @@ queryWrapper.leftJoin(Member.class,Member::getId,ParkBook::getMemberId); queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId); queryWrapper.eq(ParkBook::getIsdeleted, Constants.ZERO) queryWrapper // .eq(ParkBook::getIsdeleted, Constants.ZERO) .and(StringUtils.isNotBlank(pageWrap.getModel().getMemberName()), ms->ms.like(Member::getPhone,pageWrap.getModel().getMemberName()) .or().like(Member::getName,pageWrap.getModel().getMemberName())); queryWrapper.eq(StringUtils.isNotBlank(pageWrap.getModel().getCarCode()),ParkBook::getCarCode,pageWrap.getModel().getCarCode()); server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
@@ -1007,6 +1007,9 @@ ||StringUtils.isBlank(param.getCarCode())){ throw new BusinessException(ResponseStatus.BAD_REQUEST); } if(param.getValidStartTime()!=null && param.getValidEndTime()!=null&¶m.getValidStartTime().getTime()> param.getValidEndTime().getTime()){ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，有效期时间不合法！"); } Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getErpId,param.getUserId()).last("limit 1")); if(Objects.isNull(member)){ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，用户信息不存在！"); server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncBaseServiceImpl.java
@@ -11,6 +11,7 @@ import com.doumee.core.haikang.model.param.respose.TaskAdditionResponse; import com.doumee.core.haikang.service.HKService; import com.doumee.dao.business.model.Device; import com.doumee.dao.business.model.ParkBook; import com.doumee.service.business.ext.HkSyncService; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; @@ -112,6 +113,9 @@ public void syncParkBookData() { } @Override public void syncParkBookBySingleModel(ParkBook c) { } @Override public void syncEmpowerResultData() { } @Override server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncParkServiceImpl.java
@@ -55,8 +55,10 @@ && StringUtils.isNotBlank(c.getCarCode())){ boolean result = cancelParkBookHk(c); c.setHkStatus(result?Constants.ONE:Constants.TWO); c.setRemark(result?"取消包期成功":"取消包期失败"); }else{ c.setHkStatus(Constants.TWO);//下发失败 c.setRemark("取消包期失败"); } c.setHkDate(date); parkBookMapper.updateById(c); @@ -73,8 +75,10 @@ && StringUtils.isNotBlank(c.getCarCode())){ boolean result = addParkBookHk(c); c.setHkStatus(result?Constants.ONE:Constants.TWO); c.setRemark(result?"包期成功":"包期失败"); }else{ c.setHkStatus(Constants.TWO); c.setRemark("包期失败~"); } c.setHkDate(date); parkBookMapper.updateById(c); @@ -86,13 +90,43 @@ } } @Override public void syncParkBookBySingleModel(ParkBook c) { if(Constants.equalsObject(c.getIsdeleted(),Constants.ONE)){ //如果取消预约，则进行取消包期 if(StringUtils.isNotBlank(c.getParkHkId()) && StringUtils.isNotBlank(c.getCarCode())){ boolean result = cancelParkBookHk(c); c.setHkStatus(result?Constants.ONE:Constants.TWO); c.setRemark(result?"取消包期成功":"取消包期失败"); }else{ c.setHkStatus(Constants.TWO);//下发失败 c.setRemark("取消包期失败"); } c.setHkDate(new Date()); parkBookMapper.updateById(c); }else { //处理所有需要包期的车辆数据记录 //数据不合法，直接提示下发失败 if (StringUtils.isNotBlank(c.getParkHkId()) && StringUtils.isNotBlank(c.getCarCode())) { boolean result = addParkBookHk(c); c.setHkStatus(result ? Constants.ONE : Constants.TWO); c.setRemark(result ? "包期成功" : "包期失败"); } else { c.setHkStatus(Constants.TWO); c.setRemark("包期失败~"); } c.setHkDate(new Date()); parkBookMapper.updateById(c); } } private boolean addParkBookHk(ParkBook c) { CarChargeAddRequest param = new CarChargeAddRequest(); param.setPlateNo(c.getCarCode()); param.setParkSyscode(c.getParkHkId()); param.setStartTime(DateUtil.getISO8601Timestamp(c.getStartTime())); param.setEndTime(DateUtil.getISO8601Timestamp(c.getEndTime())); param.setStartTime(DateUtil.getShortTime(c.getStartTime())); param.setEndTime(DateUtil.getShortTime(c.getEndTime())); BaseResponse response = HKService.carChargeAddtion(param); if(response!=null && StringUtils.equals(response.getCode(),HKConstants.RESPONSE_SUCCEE)){ @@ -120,7 +154,7 @@ queryWrapper.selectAs(Parks::getHkId,ParkBook::getParkHkId); queryWrapper.leftJoin(Parks.class,Parks::getId,ParkBook::getParkId); queryWrapper.selectAs(Device::getHkId,Empower::getDeviceIndexCode); List<ParkBook> list = parkBookMapper.selectJoinList(ParkBook.class,queryWrapper); List<ParkBook> list = parkBookMapper.selectJoinList(ParkBook.class,queryWrapper.eq(ParkBook::getHkStatus,Constants.ZERO)); return list; } /** server/dmvisit_service/src/main/resources/application-testYL.yml
@@ -38,7 +38,7 @@ title: ${project.name}接口文档 description: ${project.name}接口文档 enabled: true context-path: context-path: /erp_api # 禁用swagger时的重定向地址 redirect-uri: /
