From a28e0d402702e69e0e75b0c902835239d21bfb6f Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 21 十一月 2024 14:19:01 +0800
Subject: [PATCH] 设备、巡检任务业务
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolPointServiceImpl.java | 165 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 113 insertions(+), 52 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolPointServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolPointServiceImpl.java
index 0af2a22..948ccf5 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolPointServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolPointServiceImpl.java
@@ -1,21 +1,34 @@
package com.doumee.service.business.impl;
+import com.doumee.biz.system.SystemDictDataBiz;
+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;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.YwPatrolPointMapper;
+import com.doumee.dao.business.model.Category;
+import com.doumee.dao.business.model.YwDevice;
import com.doumee.dao.business.model.YwPatrolPoint;
+import com.doumee.dao.system.MultifileMapper;
+import com.doumee.dao.system.model.Multifile;
+import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.YwPatrolPointService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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;
/**
* 杩愮淮宸℃鐐逛俊鎭〃Service瀹炵幇
@@ -27,16 +40,50 @@
@Autowired
private YwPatrolPointMapper ywPatrolPointMapper;
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
+ @Autowired
+ private MultifileMapper multifileMapper;
@Override
public Integer create(YwPatrolPoint ywPatrolPoint) {
+ if(Objects.isNull(ywPatrolPoint)
+ || Objects.isNull(ywPatrolPoint.getCode())
+ || Objects.isNull(ywPatrolPoint.getName())
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ if(ywPatrolPointMapper.selectCount(new QueryWrapper<YwPatrolPoint>().lambda().eq(YwPatrolPoint::getIsdeleted,Constants.ZERO)
+ .eq(YwPatrolPoint::getCode,ywPatrolPoint.getCode()))>Constants.ZERO){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"宸℃鐐圭紪鐮侀噸澶�!");
+ }
+ LoginUserInfo loginUserInfo = ywPatrolPoint.getLoginUserInfo();
+ ywPatrolPoint.setCreateDate(new Date());
+ ywPatrolPoint.setCreator(loginUserInfo.getId());
+ ywPatrolPoint.setIsdeleted(Constants.ZERO);
+ ywPatrolPoint.setStatus(Constants.ZERO);
ywPatrolPointMapper.insert(ywPatrolPoint);
+
+
+ if(Objects.nonNull(ywPatrolPoint.getMultifile())){
+ ywPatrolPoint.getMultifile().setCreator(loginUserInfo.getId());
+ ywPatrolPoint.getMultifile().setCreateDate(new Date());
+ ywPatrolPoint.getMultifile().setIsdeleted(Constants.ZERO);
+ ywPatrolPoint.getMultifile().setObjType(Constants.MultiFile.FN_PATROL_POINT_FILE.getKey());
+ ywPatrolPoint.getMultifile().setObjId(ywPatrolPoint.getId());
+ multifileMapper.insert(ywPatrolPoint.getMultifile());
+ }
+
return ywPatrolPoint.getId();
}
@Override
public void deleteById(Integer id, LoginUserInfo user) {
- ywPatrolPointMapper.deleteById(id);
+ ywPatrolPointMapper.update(new UpdateWrapper<YwPatrolPoint>().lambda().set(YwPatrolPoint::getIsdeleted,Constants.ONE)
+ .set(YwPatrolPoint::getEditDate," now() ")
+ .set(YwPatrolPoint::getEditor,user.getId())
+ .eq(YwPatrolPoint::getId,user.getId())
+ );
}
@Override
@@ -55,7 +102,36 @@
@Override
public void updateById(YwPatrolPoint ywPatrolPoint) {
+ if(Objects.isNull(ywPatrolPoint)
+ || Objects.isNull(ywPatrolPoint.getId())
+ || Objects.isNull(ywPatrolPoint.getCode())
+ || Objects.isNull(ywPatrolPoint.getName())
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ if(ywPatrolPointMapper.selectCount(new QueryWrapper<YwPatrolPoint>().lambda().eq(YwPatrolPoint::getIsdeleted,Constants.ZERO)
+ .eq(YwPatrolPoint::getCode,ywPatrolPoint.getCode()).ne(YwPatrolPoint::getId,ywPatrolPoint.getId()))>Constants.ZERO){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"宸℃鐐圭紪鐮侀噸澶�!");
+ }
+ LoginUserInfo loginUserInfo = ywPatrolPoint.getLoginUserInfo();
+ ywPatrolPoint.setEditDate(new Date());
+ ywPatrolPoint.setEditor(loginUserInfo.getId());
ywPatrolPointMapper.updateById(ywPatrolPoint);
+
+ multifileMapper.delete(new QueryWrapper<Multifile>().lambda()
+ .eq(Multifile::getObjId,ywPatrolPoint.getId())
+ .eq(Multifile::getObjType,Constants.MultiFile.FN_PATROL_POINT_FILE.getKey())
+ );
+
+ if(Objects.nonNull(ywPatrolPoint.getMultifile())){
+ ywPatrolPoint.getMultifile().setCreator(loginUserInfo.getId());
+ ywPatrolPoint.getMultifile().setCreateDate(new Date());
+ ywPatrolPoint.getMultifile().setIsdeleted(Constants.ZERO);
+ ywPatrolPoint.getMultifile().setObjType(Constants.MultiFile.FN_PATROL_POINT_FILE.getKey());
+ ywPatrolPoint.getMultifile().setObjId(ywPatrolPoint.getId());
+ multifileMapper.insert(ywPatrolPoint.getMultifile());
+ }
+
}
@Override
@@ -74,6 +150,22 @@
}
@Override
+ public YwPatrolPoint getDetail(Integer id) {
+ YwPatrolPoint ywPatrolPoint = ywPatrolPointMapper.selectById(id);
+ Multifile multifile = multifileMapper.selectOne(new QueryWrapper<Multifile>().lambda().eq(Multifile::getObjId,id)
+ .eq(Multifile::getObjType,Constants.MultiFile.FN_PATROL_POINT_FILE).last(" limit 1"));
+ if(Objects.nonNull(multifile)){
+ String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
+ +systemDictDataBiz.queryByCode(Constants.FTP,Constants.YW_PATROL).getCode();
+ multifile.setFileurlFull(path + multifile.getFileurl());
+ ywPatrolPoint.setMultifile(multifile);
+ }
+ return ywPatrolPoint;
+ }
+
+
+
+ @Override
public YwPatrolPoint findOne(YwPatrolPoint ywPatrolPoint) {
QueryWrapper<YwPatrolPoint> wrapper = new QueryWrapper<>(ywPatrolPoint);
return ywPatrolPointMapper.selectOne(wrapper);
@@ -81,64 +173,33 @@
@Override
public List<YwPatrolPoint> findList(YwPatrolPoint ywPatrolPoint) {
- QueryWrapper<YwPatrolPoint> wrapper = new QueryWrapper<>(ywPatrolPoint);
+ QueryWrapper<YwPatrolPoint> wrapper = new QueryWrapper<>();
+ wrapper.lambda().eq(YwPatrolPoint::getIsdeleted,Constants.ZERO);
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(ywPatrolPoint.getIdLists())){
+ wrapper.lambda().notIn(YwPatrolPoint::getId,ywPatrolPoint.getIdLists());
+ }
return ywPatrolPointMapper.selectList(wrapper);
}
@Override
public PageData<YwPatrolPoint> findPage(PageWrap<YwPatrolPoint> pageWrap) {
IPage<YwPatrolPoint> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<YwPatrolPoint> queryWrapper = new QueryWrapper<>();
+ MPJLambdaWrapper<YwPatrolPoint> queryWrapper = new MPJLambdaWrapper<YwPatrolPoint>();
Utils.MP.blankToNull(pageWrap.getModel());
- if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().eq(YwPatrolPoint::getId, pageWrap.getModel().getId());
- }
- if (pageWrap.getModel().getCreator() != null) {
- queryWrapper.lambda().eq(YwPatrolPoint::getCreator, pageWrap.getModel().getCreator());
- }
- if (pageWrap.getModel().getCreateDate() != null) {
- queryWrapper.lambda().ge(YwPatrolPoint::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
- queryWrapper.lambda().le(YwPatrolPoint::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
- }
- if (pageWrap.getModel().getEditor() != null) {
- queryWrapper.lambda().eq(YwPatrolPoint::getEditor, pageWrap.getModel().getEditor());
- }
- if (pageWrap.getModel().getEditDate() != null) {
- queryWrapper.lambda().ge(YwPatrolPoint::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
- queryWrapper.lambda().le(YwPatrolPoint::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
- }
- if (pageWrap.getModel().getIsdeleted() != null) {
- queryWrapper.lambda().eq(YwPatrolPoint::getIsdeleted, pageWrap.getModel().getIsdeleted());
- }
- if (pageWrap.getModel().getName() != null) {
- queryWrapper.lambda().eq(YwPatrolPoint::getName, pageWrap.getModel().getName());
- }
- if (pageWrap.getModel().getRemark() != null) {
- queryWrapper.lambda().eq(YwPatrolPoint::getRemark, pageWrap.getModel().getRemark());
- }
- if (pageWrap.getModel().getStatus() != null) {
- queryWrapper.lambda().eq(YwPatrolPoint::getStatus, pageWrap.getModel().getStatus());
- }
- if (pageWrap.getModel().getSortnum() != null) {
- queryWrapper.lambda().eq(YwPatrolPoint::getSortnum, pageWrap.getModel().getSortnum());
- }
- if (pageWrap.getModel().getImgurl() != null) {
- queryWrapper.lambda().eq(YwPatrolPoint::getImgurl, pageWrap.getModel().getImgurl());
- }
- if (pageWrap.getModel().getAreaId() != null) {
- queryWrapper.lambda().eq(YwPatrolPoint::getAreaId, pageWrap.getModel().getAreaId());
- }
- if (pageWrap.getModel().getAddr() != null) {
- queryWrapper.lambda().eq(YwPatrolPoint::getAddr, pageWrap.getModel().getAddr());
- }
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
- }
- }
- return PageData.from(ywPatrolPointMapper.selectPage(page, queryWrapper));
+ YwPatrolPoint model = pageWrap.getModel();
+ queryWrapper.selectAll(YwPatrolPoint.class)
+ .selectAs(Category::getName,YwPatrolPoint::getAreaName)
+ .selectAs(YwDevice::getName,YwPatrolPoint::getDeviceName)
+ .leftJoin(Category.class,Category::getId,YwPatrolPoint::getAreaId)
+ .leftJoin(YwDevice.class,YwDevice::getId,YwPatrolPoint::getDeviceId)
+ .and(Objects.nonNull(model)&&StringUtils.isNotBlank(model.getName()),
+ i->i.like(YwPatrolPoint::getName,model.getName()).or().like(YwPatrolPoint::getCode,model.getName()))
+ .eq(Objects.nonNull(model.getAreaId()),YwPatrolPoint::getAreaId,model.getAreaId())
+ .eq(YwPatrolPoint::getIsdeleted,Constants.ZERO)
+ .orderByDesc(YwPatrolPoint::getCreateDate)
+ ;
+ IPage iPage = ywPatrolPointMapper.selectJoinPage(page,YwPatrolPoint.class,queryWrapper);
+ return PageData.from(iPage);
}
@Override
--
Gitblit v1.9.3