From 8490eb11583ffdc586436f165860de5cfc39f915 Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Mon, 06 Jan 2025 09:18:29 +0800
Subject: [PATCH] fix：sql查询时间调整
---
screen-manage/src/main/java/com/moral/api/service/impl/DivisorServiceImpl.java | 47 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 41 insertions(+), 6 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/DivisorServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/DivisorServiceImpl.java
index 696939b..ae7a16f 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/DivisorServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/DivisorServiceImpl.java
@@ -15,11 +15,13 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.entity.Divisor;
+import com.moral.api.entity.ManageAccount;
import com.moral.api.mapper.DivisorMapper;
+import com.moral.api.pojo.redisBean.AccountInfoDTO;
import com.moral.api.service.DivisorService;
import com.moral.api.util.LogUtils;
import com.moral.constant.Constants;
-
+import com.moral.util.TokenUtils;
/**
@@ -42,9 +44,14 @@
*/
@Override
public void insert(Divisor divisor) {
+ HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
+ String token = request.getHeader("token");
+ AccountInfoDTO accountInfoDTO = (AccountInfoDTO) TokenUtils.getUserInfoByToken(token);
+ ManageAccount manageAccount = accountInfoDTO.getAccount();
divisor.setIsDel(Constants.NOT_DELETE);
divisor.setCreateTime(new Date());
divisor.setUpdateTime(new Date());
+ divisor.setCreateName(manageAccount.getUserName());
divisorMapper.insert(divisor);
}
@@ -56,13 +63,17 @@
@Override
@Transactional
public void update(Divisor divisor) {
+ HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
+ String token = request.getHeader("token");
+ AccountInfoDTO accountInfoDTO = (AccountInfoDTO) TokenUtils.getUserInfoByToken(token);
+ ManageAccount manageAccount = accountInfoDTO.getAccount();
Divisor divisor1 = divisorMapper.selectById(divisor.getId());
divisor.setUpdateTime(new Date());
+ divisor.setUpdateName(manageAccount.getUserName());
divisorMapper.updateById(divisor);
//������������������
- HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
StringBuilder content = new StringBuilder();
- content.append("���������"+divisor1.getMac()+"���������������������");
+ content.append("���������"+divisor1.getOrganizationId()+"���������������������");
content.append(ObjectUtils.isEmpty(divisor.getDustld())?",���������==>null":",���������==>"+divisor.getDustld());
content.append(ObjectUtils.isEmpty(divisor.getCo())?",co==>null":",co==>"+divisor.getCo());
content.append(ObjectUtils.isEmpty(divisor.getSo2())?",so2==>null":",so2==>"+divisor.getSo2());
@@ -73,6 +84,30 @@
content.append(ObjectUtils.isEmpty(divisor.getO3())?",o3==>null":",o3==>"+divisor.getO3());
LogUtils.saveOperationForManage(request, content.toString(), Constants.UPDATE_OPERATE_TYPE);
+ }
+
+ /**
+ * ������
+ *
+ * @param id
+ */
+ @Override
+ public void delete(Integer id) {
+ Divisor divisor = divisorMapper.selectById(id);
+ divisor.setIsDel(Constants.DELETE);
+ divisorMapper.updateById(divisor);
+ }
+
+ /**
+ * ������
+ *
+ * @param id
+ * @return
+ */
+ @Override
+ public Divisor queryById(Integer id) {
+ Divisor divisor = divisorMapper.selectById(id);
+ return divisor;
}
/**
@@ -88,9 +123,9 @@
HashMap<String, Object> result = new HashMap<>();
LambdaQueryWrapper<Divisor> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(Divisor::getIsDel,Constants.NOT_DELETE);
- if (!ObjectUtils.isEmpty(mac)){
- wrapper.like(Divisor::getMac,mac);
- }
+// if (!ObjectUtils.isEmpty(mac)){
+// wrapper.like(Divisor::getMac,mac);
+// }
Page<Divisor> PageList = new Page<>(Integer.parseInt(page), Integer.parseInt(size));
Page<Divisor> divisorPage = divisorMapper.selectPage(PageList, wrapper);
result.put("total", PageList.getTotal());
--
Gitblit v1.8.0