From e8242c8c4b69a52bd49fd0b5b49333e1d227e405 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 22 Sep 2023 16:45:52 +0800
Subject: [PATCH] Merge branch 'cjl' of http://blit.7drlb.com:8888/r/moral into wb
---
screen-manage/src/main/java/com/moral/api/service/impl/ResponsibilityUnitServiceImpl.java | 46 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 45 insertions(+), 1 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/ResponsibilityUnitServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/ResponsibilityUnitServiceImpl.java
index c44af22..8c018ed 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/ResponsibilityUnitServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/ResponsibilityUnitServiceImpl.java
@@ -4,21 +4,26 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
import java.util.Date;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-
+import java.util.Objects;
+import javax.servlet.http.HttpServletRequest;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.entity.ResponsibilityUnit;
import com.moral.api.entity.SysArea;
import com.moral.api.mapper.ResponsibilityUnitMapper;
+import com.moral.api.pojo.redisBean.AccountInfoDTO;
import com.moral.api.service.ResponsibilityUnitService;
import com.moral.api.service.SysAreaService;
import com.moral.constant.Constants;
+import com.moral.util.TokenUtils;
@Service
public class ResponsibilityUnitServiceImpl extends ServiceImpl<ResponsibilityUnitMapper, ResponsibilityUnit> implements ResponsibilityUnitService {
@@ -37,6 +42,9 @@
*/
@Override
public Integer insert(ResponsibilityUnit responsibilityUnit) {
+ HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
+ String token = request.getHeader("token");
+ AccountInfoDTO accountInfoDTO = (AccountInfoDTO) TokenUtils.getUserInfoByToken(token);
QueryWrapper<ResponsibilityUnit> wrapper = new QueryWrapper<>();
wrapper.eq("unit_name",responsibilityUnit.getUnitName());
@@ -46,6 +54,12 @@
responsibilityUnit.setCreateTime(new Date());
responsibilityUnit.setState(0);
responsibilityUnit.setIsInvalid(0);
+ responsibilityUnit.setCreateId(accountInfoDTO.getAccount().getId());
+ responsibilityUnit.setCreateName(accountInfoDTO.getAccount().getUserName());
+ responsibilityUnit.setCreateTime(new Date());
+ responsibilityUnit.setUpdateId(accountInfoDTO.getAccount().getId());
+ responsibilityUnit.setUpdateName(accountInfoDTO.getAccount().getUserName());
+ responsibilityUnit.setUpdateTime(new Date());
responsibilityUnitMapper.insert(responsibilityUnit);
return 200;
}
@@ -63,9 +77,19 @@
wrapper.eq("is_del",Constants.NOT_DELETE);
int page = Integer.parseInt(parameters.get("page").toString());
int size = Integer.parseInt(parameters.get("size").toString());
+ Object parentName1 = parameters.get("parentCode");
+ Object areaName1 = parameters.get("areaCode");
//������������������
if (!ObjectUtils.isEmpty(parameters.get("name"))){
wrapper.like("unit_name",parameters.get("name").toString());
+ }
+ //������������������
+ if (!ObjectUtils.isEmpty(parentName1)){
+ wrapper.eq("parent_code",Integer.parseInt(parentName1.toString()));
+ }
+ //������������������
+ if (!ObjectUtils.isEmpty(areaName1)){
+ wrapper.eq("parent_code",Integer.parseInt(areaName1.toString()));
}
Page<ResponsibilityUnit> pageList = new Page<>(page, size);
Page<ResponsibilityUnit> responsibilityUnitPage = responsibilityUnitMapper.selectPage(pageList, wrapper);
@@ -102,6 +126,10 @@
wrapper.eq("unit_name",responsibilityUnit.getUnitName());
List<ResponsibilityUnit> units = responsibilityUnitMapper.selectList(wrapper);
if (ObjectUtils.isEmpty(units)){
+ AccountInfoDTO account = getAccount();
+ responsibilityUnit.setUpdateId(account.getAccount().getId());
+ responsibilityUnit.setUpdateName(account.getAccount().getUserName());
+ responsibilityUnit.setUpdateTime(new Date());
responsibilityUnitMapper.updateById(responsibilityUnit);
return 200;
}
@@ -117,6 +145,10 @@
public void updateState(Integer id) {
ResponsibilityUnit responsibilityUnit = responsibilityUnitMapper.selectById(id);
responsibilityUnit.setState(1);
+ AccountInfoDTO account = getAccount();
+ responsibilityUnit.setUpdateId(account.getAccount().getId());
+ responsibilityUnit.setUpdateName(account.getAccount().getUserName());
+ responsibilityUnit.setUpdateTime(new Date());
responsibilityUnitMapper.updateById(responsibilityUnit);
}
@@ -133,7 +165,19 @@
if (!ObjectUtils.isEmpty(code)){
responsibilityUnit.setInvalidReason(code);
}
+ AccountInfoDTO account = getAccount();
+ responsibilityUnit.setUpdateId(account.getAccount().getId());
+ responsibilityUnit.setUpdateName(account.getAccount().getUserName());
+ responsibilityUnit.setUpdateTime(new Date());
responsibilityUnitMapper.updateById(responsibilityUnit);
}
+
+
+ private AccountInfoDTO getAccount(){
+ HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
+ String token = request.getHeader("token");
+ AccountInfoDTO accountInfoDTO = (AccountInfoDTO) TokenUtils.getUserInfoByToken(token);
+ return accountInfoDTO;
+ }
}
--
Gitblit v1.8.0