From 5df732ffe16b3f162422c2db61a78458e28c7f8d Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期五, 10 十月 2025 14:45:29 +0800
Subject: [PATCH] 钥匙柜开发 天气预警通知
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkVersionServiceImpl.java | 138 +++++++++++++++++++++++++++------------------
1 files changed, 82 insertions(+), 56 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkVersionServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkVersionServiceImpl.java
index 9a360c2..7bc2a7c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkVersionServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkVersionServiceImpl.java
@@ -1,5 +1,14 @@
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.utils.Constants;
+import com.doumee.core.utils.DateUtil;
+import com.doumee.dao.business.model.JkCabinet;
+import com.doumee.dao.business.model.JkCabinetLog;
+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 +19,16 @@
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 lombok.extern.java.Log;
+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,15 +41,39 @@
@Autowired
private JkVersionMapper jkVersionMapper;
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
+
+
@Override
public Integer create(JkVersion jkVersion) {
+ if(Objects.isNull(jkVersion)
+ || Objects.isNull(jkVersion.getType())
+ || Objects.isNull(jkVersion.getIsForce())
+ || StringUtils.isBlank(jkVersion.getVersionInfo())
+ || StringUtils.isBlank(jkVersion.getFileUrl())
+ || Objects.isNull(jkVersion.getFileSize())
+ || StringUtils.isBlank(jkVersion.getName())
+ || StringUtils.isBlank(jkVersion.getContent())
+ ){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED);
+ }
+ LoginUserInfo loginUserInfo = jkVersion.getLoginUserInfo();
+ jkVersion.setCreateDate(new Date());
+ jkVersion.setCreator(loginUserInfo.getId());
+ jkVersion.setEditDate(jkVersion.getCreateDate());
+ jkVersion.setEditor(jkVersion.getCreator());
+ jkVersion.setIsdeleted(Constants.ZERO);
jkVersionMapper.insert(jkVersion);
return jkVersion.getId();
}
@Override
public void deleteById(Integer id) {
- jkVersionMapper.deleteById(id);
+ jkVersionMapper.update(null,new UpdateWrapper<JkVersion>().lambda()
+ .set(JkVersion::getIsdeleted,Constants.ONE)
+ .eq(JkVersion::getId,id));
+// jkVersionMapper.deleteById(id);
}
@Override
@@ -54,6 +92,21 @@
@Override
public void updateById(JkVersion jkVersion) {
+ if(Objects.isNull(jkVersion)
+ || Objects.isNull(jkVersion.getId())
+ || Objects.isNull(jkVersion.getType())
+ || Objects.isNull(jkVersion.getIsForce())
+ || StringUtils.isBlank(jkVersion.getVersionInfo())
+ || StringUtils.isBlank(jkVersion.getFileUrl())
+ || Objects.isNull(jkVersion.getFileSize())
+ || StringUtils.isBlank(jkVersion.getName())
+ || StringUtils.isBlank(jkVersion.getContent())
+ ){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED);
+ }
+ LoginUserInfo loginUserInfo = jkVersion.getLoginUserInfo();
+ jkVersion.setEditDate(new Date());
+ jkVersion.setEditor(loginUserInfo.getId());
jkVersionMapper.updateById(jkVersion);
}
@@ -67,9 +120,18 @@
}
}
+
+
+
@Override
public JkVersion findById(Integer id) {
- return jkVersionMapper.selectById(id);
+ JkVersion jkVersion = jkVersionMapper.selectById(id);
+ if(Objects.nonNull(jkVersion)&&StringUtils.isNotBlank(jkVersion.getFileUrl())){
+ String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_LOCAL_RESOURCE_PATH).getCode()
+ +systemDictDataBiz.queryByCode(Constants.FTP,Constants.APP_FILE).getCode();
+ jkVersion.setFullFileUrl(path + jkVersion.getFileUrl());
+ }
+ return jkVersion;
}
@Override
@@ -87,63 +149,27 @@
@Override
public PageData<JkVersion> findPage(PageWrap<JkVersion> pageWrap) {
IPage<JkVersion> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<JkVersion> queryWrapper = new QueryWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
- if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().eq(JkVersion::getId, pageWrap.getModel().getId());
- }
- if (pageWrap.getModel().getCreator() != null) {
- queryWrapper.lambda().eq(JkVersion::getCreator, pageWrap.getModel().getCreator());
- }
- if (pageWrap.getModel().getCreateDate() != null) {
- queryWrapper.lambda().ge(JkVersion::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
- queryWrapper.lambda().le(JkVersion::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
- }
- if (pageWrap.getModel().getEditor() != null) {
- queryWrapper.lambda().eq(JkVersion::getEditor, pageWrap.getModel().getEditor());
- }
- if (pageWrap.getModel().getEditDate() != null) {
- queryWrapper.lambda().ge(JkVersion::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
- queryWrapper.lambda().le(JkVersion::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
- }
- if (pageWrap.getModel().getIsdeleted() != null) {
- queryWrapper.lambda().eq(JkVersion::getIsdeleted, pageWrap.getModel().getIsdeleted());
- }
- if (pageWrap.getModel().getInfo() != null) {
- queryWrapper.lambda().eq(JkVersion::getInfo, pageWrap.getModel().getInfo());
- }
- if (pageWrap.getModel().getVersionInfo() != null) {
- queryWrapper.lambda().eq(JkVersion::getVersionInfo, pageWrap.getModel().getVersionInfo());
- }
- if (pageWrap.getModel().getFileUrl() != null) {
- queryWrapper.lambda().eq(JkVersion::getFileUrl, pageWrap.getModel().getFileUrl());
- }
- if (pageWrap.getModel().getName() != null) {
- queryWrapper.lambda().eq(JkVersion::getName, pageWrap.getModel().getName());
- }
- if (pageWrap.getModel().getContent() != null) {
- queryWrapper.lambda().eq(JkVersion::getContent, pageWrap.getModel().getContent());
- }
- if (pageWrap.getModel().getSortnum() != null) {
- queryWrapper.lambda().eq(JkVersion::getSortnum, pageWrap.getModel().getSortnum());
- }
- if (pageWrap.getModel().getTitle() != null) {
- queryWrapper.lambda().eq(JkVersion::getTitle, pageWrap.getModel().getTitle());
- }
- if (pageWrap.getModel().getIsForce() != null) {
- queryWrapper.lambda().eq(JkVersion::getIsForce, pageWrap.getModel().getIsForce());
- }
- if (pageWrap.getModel().getType() != null) {
- queryWrapper.lambda().eq(JkVersion::getType, pageWrap.getModel().getType());
- }
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
+ JkVersion model = pageWrap.getModel();
+ MPJLambdaWrapper<JkVersion> wrapper = new MPJLambdaWrapper<JkVersion>()
+ .selectAll(JkVersion.class)
+ .selectAs(SystemUser::getRealname,JkVersion::getCreateUserName)
+ .select(" ROUND( t.file_size / 1024, 2) ", JkVersion::getFileSizeMb)
+ .leftJoin(SystemUser.class,SystemUser::getId,JkVersion::getCreator)
+ .eq(JkVersion::getIsdeleted,Constants.ZERO)
+ .eq(Objects.nonNull(model.getIsForce()),JkVersion::getIsForce,model.getIsForce())
+ .like(StringUtils.isNotBlank(model.getVersionInfo()),JkVersion::getVersionInfo,model.getVersionInfo())
+ .orderByDesc(JkVersion::getVersionInfo,JkVersion::getCreateDate)
+ ;
+ IPage<JkVersion> iPage = jkVersionMapper.selectJoinPage(page,JkVersion.class,wrapper);
+ String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_LOCAL_RESOURCE_PATH).getCode()
+ +systemDictDataBiz.queryByCode(Constants.FTP,Constants.APP_FILE).getCode();
+ for (JkVersion jkVersion:iPage.getRecords()) {
+ if(Objects.nonNull(jkVersion)&&StringUtils.isNotBlank(jkVersion.getFileUrl())){
+ jkVersion.setFullFileUrl(path + jkVersion.getFileUrl());
}
}
- return PageData.from(jkVersionMapper.selectPage(page, queryWrapper));
+ return PageData.from(iPage);
}
@Override
--
Gitblit v1.9.3