From 20c644e44d92fa02b873fb6189eee71615bc12d2 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 13 Oct 2023 14:28:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-manage/src/main/java/com/moral/api/service/impl/ResponsibilityUnitServiceImpl.java | 89 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 73 insertions(+), 16 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..14fd4c3 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,30 @@
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.ArrayList;
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.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
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 +46,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());
@@ -44,8 +56,14 @@
if (ObjectUtils.isEmpty(units)){
responsibilityUnit.setIsDel(Constants.NOT_DELETE);
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());
+ responsibilityUnit.setValue(JSONArray.toJSONString(responsibilityUnit.getParentCodeList()));
responsibilityUnitMapper.insert(responsibilityUnit);
return 200;
}
@@ -63,22 +81,33 @@
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);
for (ResponsibilityUnit record : responsibilityUnitPage.getRecords()) {
Integer areaCode = record.getAreaCode();
- SysArea areaName = sysAreaService.select(areaCode);
+ SysArea sysArea= sysAreaService.select(areaCode);
Integer parentCode = record.getParentCode();
- SysArea parentName = sysAreaService.select(parentCode);
- if (ObjectUtils.isEmpty(areaName) || ObjectUtils.isEmpty(parentName)){
+ SysArea parentArea = sysAreaService.select(parentCode);
+ if (ObjectUtils.isEmpty(sysArea) || ObjectUtils.isEmpty(parentArea)){
continue;
}
- record.setAreaName(areaName.getAreaName());
- record.setParentName(parentName.getAreaName());
+ record.setAreaName(sysArea.getAreaName());
+ record.setParentName(parentArea.getAreaName());
+ record.setParentCodeList(JSONObject.parseObject(record.getValue(),List.class));
}
Map<String, Object> result = new LinkedHashMap<>();
result.put("total", pageList.getTotal());
@@ -100,10 +129,17 @@
public Integer updateUnit(ResponsibilityUnit responsibilityUnit) {
QueryWrapper<ResponsibilityUnit> wrapper = new QueryWrapper<>();
wrapper.eq("unit_name",responsibilityUnit.getUnitName());
- List<ResponsibilityUnit> units = responsibilityUnitMapper.selectList(wrapper);
- if (ObjectUtils.isEmpty(units)){
- responsibilityUnitMapper.updateById(responsibilityUnit);
- return 200;
+ wrapper.eq("area_code",responsibilityUnit.getAreaCode());
+ ResponsibilityUnit responsibilityUnit2 = responsibilityUnitMapper.selectOne(wrapper);
+ if (ObjectUtils.isEmpty(responsibilityUnit2)){
+ AccountInfoDTO account = getAccount();
+ responsibilityUnit.setUpdateId(account.getAccount().getId());
+ responsibilityUnit.setUpdateName(account.getAccount().getUserName());
+ responsibilityUnit.setUpdateTime(new Date());
+ responsibilityUnit.setValue(JSONArray.toJSONString(responsibilityUnit.getParentCodeList()));
+// responsibilityUnit.setParentCodeList(JSONObject.parseObject(responsibilityUnit.getValue(),List.class));
+ responsibilityUnitMapper.updateById(responsibilityUnit);
+ return 200;
}
return -1;
}
@@ -114,26 +150,47 @@
*
*/
@Override
- public void updateState(Integer id) {
- ResponsibilityUnit responsibilityUnit = responsibilityUnitMapper.selectById(id);
- responsibilityUnit.setState(1);
+ public void updateState(Integer unitId) {
+ ResponsibilityUnit responsibilityUnit = responsibilityUnitMapper.selectById(unitId);
+ responsibilityUnit.setState(Constants.NOT_DELETE);
+ AccountInfoDTO account = getAccount();
+ responsibilityUnit.setUpdateId(account.getAccount().getId());
+ responsibilityUnit.setUpdateName(account.getAccount().getUserName());
+ responsibilityUnit.setUpdateTime(new Date());
responsibilityUnitMapper.updateById(responsibilityUnit);
}
/**
* ������������
- * @param id
+ * @param unitId
* @param code
*/
@Override
- public void updateInvalid(Integer id, String code) {
- ResponsibilityUnit responsibilityUnit = responsibilityUnitMapper.selectById(id);
+ public void updateInvalid(Integer unitId, String code) {
+ ResponsibilityUnit responsibilityUnit = responsibilityUnitMapper.selectById(unitId);
+
responsibilityUnit.setIsInvalid(1);
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);
}
+
+
+ /**
+ * ������������������
+ * @return
+ */
+ 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