From 4a8ff39b0fab0627ef8f7459587d514cc01c3676 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 20 十月 2025 10:52:02 +0800
Subject: [PATCH] Merge branch 'wuhuyancao' of http://139.186.142.91:10010/r/productDev/dmvisit into wuhuyancao
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkIccardServiceImpl.java | 149 +++++++++++++++++++++++++++++++++----------------
1 files changed, 101 insertions(+), 48 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkIccardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkIccardServiceImpl.java
index 0964dc4..8058914 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkIccardServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkIccardServiceImpl.java
@@ -1,5 +1,12 @@
package com.doumee.service.business.impl;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
+import com.doumee.core.utils.Constants;
+import com.doumee.core.utils.DateUtil;
+import com.doumee.dao.business.model.*;
+import com.doumee.dao.system.model.SystemUser;
+import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Utils;
@@ -10,11 +17,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.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.apache.commons.lang3.StringUtils;
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;
+import java.util.Objects;
/**
* 閽ュ寵鏌淚C鍗′俊鎭〃Service瀹炵幇
@@ -29,13 +40,39 @@
@Override
public Integer create(JkIccard jkIccard) {
+ if(Objects.isNull(jkIccard)
+ || StringUtils.isBlank(jkIccard.getCode())
+ || Objects.isNull(jkIccard.getStatus())
+ || Objects.isNull(jkIccard.getMemberId())
+ || Objects.isNull(jkIccard.getUserType())
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+
+ LoginUserInfo loginUserInfo = jkIccard.getLoginUserInfo();
+ jkIccard.setCreateDate(new Date());
+ jkIccard.setCreator(loginUserInfo.getId());
+ jkIccard.setEditDate(jkIccard.getCreateDate());
+ jkIccard.setEditor(jkIccard.getCreator());
+ jkIccard.setIsdeleted(Constants.ZERO);
+ //鏌ヨ缂栧彿鏄惁閲嶅
+ if(jkIccardMapper.selectCount(new QueryWrapper<JkIccard>().lambda().eq(JkIccard::getCode,jkIccard.getCode()).eq(JkIccard::getIsdeleted,Constants.ZERO))>Constants.ZERO){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"IC鍗″彿宸插瓨鍦紒");
+ }
jkIccardMapper.insert(jkIccard);
return jkIccard.getId();
}
@Override
public void deleteById(Integer id) {
- jkIccardMapper.deleteById(id);
+ JkIccard jkIccard = jkIccardMapper.selectById(id);
+ if(Objects.isNull(jkIccard)||Constants.equalsInteger(jkIccard.getIsdeleted(),Constants.ONE)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ if(Constants.equalsInteger(jkIccard.getStatus(),Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍚敤鏁版嵁鏃犳硶杩涜鍒犻櫎锛�");
+ }
+ jkIccardMapper.update(null,new UpdateWrapper<JkIccard>().lambda().set(JkIccard::getIsdeleted,Constants.ONE).eq(JkIccard::getId,jkIccard.getId()));
}
@Override
@@ -54,6 +91,25 @@
@Override
public void updateById(JkIccard jkIccard) {
+ if(Objects.isNull(jkIccard)
+ || Objects.isNull(jkIccard.getId())
+ || StringUtils.isBlank(jkIccard.getCode())
+ || Objects.isNull(jkIccard.getStatus())
+ || Objects.isNull(jkIccard.getMemberId())
+ || Objects.isNull(jkIccard.getUserType())
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ LoginUserInfo loginUserInfo = jkIccard.getLoginUserInfo();
+ jkIccard.setCreateDate(new Date());
+ jkIccard.setCreator(loginUserInfo.getId());
+ jkIccard.setEditDate(jkIccard.getCreateDate());
+ jkIccard.setEditor(jkIccard.getCreator());
+ jkIccard.setIsdeleted(Constants.ZERO);
+ //鏌ヨ缂栧彿鏄惁閲嶅
+ if(jkIccardMapper.selectCount(new QueryWrapper<JkIccard>().lambda().ne(JkIccard::getId,jkIccard.getId()).eq(JkIccard::getCode,jkIccard.getCode()).eq(JkIccard::getIsdeleted,Constants.ZERO))>Constants.ZERO){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"IC鍗″彿宸插瓨鍦紒");
+ }
jkIccardMapper.updateById(jkIccard);
}
@@ -87,54 +143,20 @@
@Override
public PageData<JkIccard> findPage(PageWrap<JkIccard> pageWrap) {
IPage<JkIccard> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<JkIccard> queryWrapper = new QueryWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
- if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().eq(JkIccard::getId, pageWrap.getModel().getId());
- }
- if (pageWrap.getModel().getCreator() != null) {
- queryWrapper.lambda().eq(JkIccard::getCreator, pageWrap.getModel().getCreator());
- }
- if (pageWrap.getModel().getCreateDate() != null) {
- queryWrapper.lambda().ge(JkIccard::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
- queryWrapper.lambda().le(JkIccard::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
- }
- if (pageWrap.getModel().getEditor() != null) {
- queryWrapper.lambda().eq(JkIccard::getEditor, pageWrap.getModel().getEditor());
- }
- if (pageWrap.getModel().getEditDate() != null) {
- queryWrapper.lambda().ge(JkIccard::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
- queryWrapper.lambda().le(JkIccard::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
- }
- if (pageWrap.getModel().getIsdeleted() != null) {
- queryWrapper.lambda().eq(JkIccard::getIsdeleted, pageWrap.getModel().getIsdeleted());
- }
- if (pageWrap.getModel().getInfo() != null) {
- queryWrapper.lambda().eq(JkIccard::getInfo, pageWrap.getModel().getInfo());
- }
- if (pageWrap.getModel().getMemberId() != null) {
- queryWrapper.lambda().eq(JkIccard::getMemberId, pageWrap.getModel().getMemberId());
- }
- if (pageWrap.getModel().getCode() != null) {
- queryWrapper.lambda().eq(JkIccard::getCode, pageWrap.getModel().getCode());
- }
- if (pageWrap.getModel().getStatus() != null) {
- queryWrapper.lambda().eq(JkIccard::getStatus, pageWrap.getModel().getStatus());
- }
- if (pageWrap.getModel().getName() != null) {
- queryWrapper.lambda().eq(JkIccard::getName, pageWrap.getModel().getName());
- }
- if (pageWrap.getModel().getCabinetId() != null) {
- queryWrapper.lambda().eq(JkIccard::getCabinetId, pageWrap.getModel().getCabinetId());
- }
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
- }
- }
- return PageData.from(jkIccardMapper.selectPage(page, queryWrapper));
+ JkIccard model = pageWrap.getModel();
+ MPJLambdaWrapper<JkIccard> wrapper = new MPJLambdaWrapper<JkIccard>()
+ .selectAll(JkIccard.class)
+ .selectAs(Member::getName,JkIccard::getMemberName)
+ .leftJoin(Member.class,Member::getId,JkIccard::getMemberId)
+ .eq(JkIccard::getIsdeleted,Constants.ZERO)
+ .eq(Objects.nonNull(model.getStatus()),JkIccard::getStatus,model.getStatus())
+ .like(StringUtils.isNotBlank(model.getCode()),JkIccard::getCode,model.getCode())
+ .like(StringUtils.isNotBlank(model.getMemberName()),Member::getName,model.getMemberName())
+ .orderByDesc(JkIccard::getCreateDate)
+ ;
+ IPage<JkIccard> iPage = jkIccardMapper.selectJoinPage(page,JkIccard.class,wrapper);
+ return PageData.from(iPage);
}
@Override
@@ -142,4 +164,35 @@
QueryWrapper<JkIccard> wrapper = new QueryWrapper<>(jkIccard);
return jkIccardMapper.selectCount(wrapper);
}
+
+ @Override
+ public void updateStatusById(JkIccard jkIccard) {
+ if(Objects.isNull(jkIccard)
+ || Objects.isNull(jkIccard.getId())
+ || Objects.isNull(jkIccard.getStatus())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ jkIccardMapper.update(null,new UpdateWrapper<JkIccard>()
+ .lambda().set(JkIccard::getStatus,jkIccard.getStatus())
+ .set(JkIccard::getEditDate, DateUtil.getCurrDateTime())
+ .eq(JkIccard::getId,jkIccard.getId()));
+ }
+
+
+ @Override
+ public Integer getMemberIdByCode(String code){
+ JkIccard jkIccard = jkIccardMapper.selectOne(new QueryWrapper<JkIccard>().lambda()
+ .eq(JkIccard::getIsdeleted,Constants.ZERO)
+ .eq(JkIccard::getStatus,Constants.ZERO)
+ .eq(JkIccard::getCode,code)
+ .last(" limit 1 ")
+ );
+ if(Objects.isNull(jkIccard)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ return jkIccard.getMemberId();
+
+ }
+
+
}
--
Gitblit v1.9.3