From 36a11d78a2517b523fcf6b6ec622f3f0767f553f Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Tue, 26 Sep 2023 11:22:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into wb
---
screen-manage/src/main/java/com/moral/api/entity/ResponsibilityUnit.java | 16 +++++++-
screen-manage/src/main/java/com/moral/api/service/ResponsibilityUnitService.java | 4 +-
screen-manage/src/main/java/com/moral/api/controller/ResponsibilityUnitController.java | 24 ++++++------
screen-manage/src/main/java/com/moral/api/service/impl/ResponsibilityUnitServiceImpl.java | 53 ++++++++++++++++----------
4 files changed, 61 insertions(+), 36 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/controller/ResponsibilityUnitController.java b/screen-manage/src/main/java/com/moral/api/controller/ResponsibilityUnitController.java
index f0ae43f..5fc0a4e 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/ResponsibilityUnitController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/ResponsibilityUnitController.java
@@ -11,6 +11,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
@@ -68,7 +69,6 @@
*/
@PostMapping("update")
public ResultMessage updateUnit(@RequestBody ResponsibilityUnit responsibilityUnit){
-
Integer integer = responsibilityUnitService.updateUnit(responsibilityUnit);
if (integer<0){
return ResultMessage.fail(ResponseCodeEnum.ROLE_IS_EXIST.getCode(),ResponseCodeEnum.ROLE_IS_EXIST.getMsg());
@@ -78,41 +78,41 @@
/**
* ������������
- * @param id
+ * @param unitId
* @return
*/
@GetMapping("state")
- public ResultMessage state(Integer id){
- if (ObjectUtils.isEmpty(id)){
+ public ResultMessage state(Integer unitId){
+ if (ObjectUtils.isEmpty(unitId)){
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
- responsibilityUnitService.updateState(id);
+ responsibilityUnitService.updateState(unitId);
return ResultMessage.ok();
}
/**
* ������������
- * @param id
+ * @param unitId
* @param code
* @return
*/
@GetMapping("invalid")
- public ResultMessage invalid(Integer id,String code){
- if (ObjectUtils.isEmpty(id)){
+ public ResultMessage invalid(Integer unitId,String code){
+ if (ObjectUtils.isEmpty(unitId)){
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
- responsibilityUnitService.updateInvalid(id,code);
+ responsibilityUnitService.updateInvalid(unitId,code);
return ResultMessage.ok();
}
/**
* ������������
- * @param id
+ * @param unitId
* @return
*/
@GetMapping("delete")
- public ResultMessage delete(Integer id){
- responsibilityUnitService.removeById(id);
+ public ResultMessage delete(Integer unitId){
+ responsibilityUnitService.removeById(unitId);
return ResultMessage.ok();
}
}
diff --git a/screen-manage/src/main/java/com/moral/api/entity/ResponsibilityUnit.java b/screen-manage/src/main/java/com/moral/api/entity/ResponsibilityUnit.java
index 11ea7f0..b2d467c 100644
--- a/screen-manage/src/main/java/com/moral/api/entity/ResponsibilityUnit.java
+++ b/screen-manage/src/main/java/com/moral/api/entity/ResponsibilityUnit.java
@@ -5,8 +5,11 @@
import lombok.EqualsAndHashCode;
import java.util.Date;
+import java.util.List;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -14,7 +17,11 @@
@EqualsAndHashCode(callSuper = false)
public class ResponsibilityUnit extends Model<ResponsibilityUnit> {
+
+ private static final long serialVersionUID = 1L;
+
//������������id
+ @TableId(value = "unit_id", type = IdType.AUTO)
private Integer unitId;
/**
* ������������
@@ -29,13 +36,15 @@
*/
private Integer parentCode;
//0��������� 1���������
- private Integer state;
+ private String state;
//0��������� 1���������
private String isDel;
- //0������������ 1������������
+ //0������������ 1������������
private Integer isInvalid;
//������������
private String invalidReason;
+
+ private String value;
private Integer createId;
@@ -55,4 +64,7 @@
@TableField(exist = false)
private String parentName;
+
+ @TableField(exist = false)
+ private List<Object> parentCodeList;
}
diff --git a/screen-manage/src/main/java/com/moral/api/service/ResponsibilityUnitService.java b/screen-manage/src/main/java/com/moral/api/service/ResponsibilityUnitService.java
index d0d9ba0..d31a5d6 100644
--- a/screen-manage/src/main/java/com/moral/api/service/ResponsibilityUnitService.java
+++ b/screen-manage/src/main/java/com/moral/api/service/ResponsibilityUnitService.java
@@ -15,7 +15,7 @@
Integer updateUnit(ResponsibilityUnit responsibilityUnit);
- void updateState(Integer id);
+ void updateState(Integer unitId);
- void updateInvalid(Integer id,String code);
+ void updateInvalid(Integer unitId,String code);
}
\ No newline at end of file
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 8c018ed..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
@@ -7,12 +7,16 @@
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;
@@ -52,7 +56,6 @@
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());
@@ -60,6 +63,7 @@
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;
}
@@ -95,14 +99,15 @@
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());
@@ -124,14 +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)){
- AccountInfoDTO account = getAccount();
- responsibilityUnit.setUpdateId(account.getAccount().getId());
- responsibilityUnit.setUpdateName(account.getAccount().getUserName());
- responsibilityUnit.setUpdateTime(new Date());
- 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;
}
@@ -142,9 +150,9 @@
*
*/
@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());
@@ -155,12 +163,13 @@
/**
* ������������
- * @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);
@@ -174,6 +183,10 @@
}
+ /**
+ * ������������������
+ * @return
+ */
private AccountInfoDTO getAccount(){
HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
String token = request.getHeader("token");
--
Gitblit v1.8.0