From 8b0fdfd069333f412e6a7cd73bf68cebec66f4ed Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 12 Apr 2021 15:52:05 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java | 116 +++++++++++++++++++++++++++++++++-------------------------
1 files changed, 66 insertions(+), 50 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
index 705f087..9a6a587 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
@@ -108,8 +108,8 @@
//������������������
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
StringBuilder content = new StringBuilder();
- content.append("������������������").append(organization.getName());
- logUtils.saveOperationForManage(request, content.toString());
+ content.append("������������������").append(organization.getName()+";");
+ logUtils.saveOperationForManage(request, content.toString(),Constants.INSERT_OPERATE_TYPE);
return organizationDTO;
}
@@ -169,50 +169,7 @@
organizationDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
//������������������
- HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
- StringBuilder content = new StringBuilder();
- content.append("������������������").append(organization.getName()).append(";");
- //������������������Map
- Map<String, Object> newParameters = JSONObject.parseObject(JSON.toJSONString(organizationUpdateForm), Map.class);
- Map<String, Object> oldParameters = JSONObject.parseObject(JSON.toJSONString(existOrganization), Map.class);
- Set<String> keys = organizationFormMap.keySet();
- for (String key : keys) {
- String value = organizationFormMap.get(key);
- if ("parentName".equals(key)) {//���������������������������
- if (organizationUpdateForm.getParentId() != null) {//������������������������������������
- String oldParentName = "���";
- String newParentName = "���";
- if (!existOrganization.getParentId().equals(0)) {
- oldParentName = organizationMapper.selectById(existOrganization.getParentId()).getName();
- }
- if (!organization.getParentId().equals(0)) {
- newParentName = organizationMapper.selectById(organization.getParentId()).getName();
- }
- content.append(value + ":" + oldParentName + "->" + newParentName + ";");
- }
- } else if ("expireTime".equals(key)) {//expireTime������������������������
- if (organizationUpdateForm.getExpireTime() != null) {
- Date oldExpireTime = existOrganization.getExpireTime();
- Date newExpireTime = organization.getExpireTime();
- String oldExpireTimeStr = DateUtils.dateToDateString(oldExpireTime, "yyyy-MM-dd");
- String newExpireTimeStr = DateUtils.dateToDateString(newExpireTime, "yyyy-MM-dd");
- content.append(value + ":" + oldExpireTimeStr + "->" + newExpireTimeStr + ";");
- }
- } else {//������������������
- if (newParameters.get(key) != null) {
- String newValue = "���";
- String oldValue = "���";
- if (newParameters.get(key) != null && !newParameters.get(key).equals(" ")) {
- newValue = String.valueOf(newParameters.get(key));
- }
- if (oldParameters.get(key) != null && !oldParameters.get(key).equals(" ")) {
- oldValue = String.valueOf(oldParameters.get(key));
- }
- content.append(value + ":" + oldValue + "->" + newValue + ";");
- }
- }
- }
- logUtils.saveOperationForManage(request, content.toString());
+ insertUpdateLog(organizationUpdateForm,organization,existOrganization);
return organizationDTO;
}
@@ -267,10 +224,10 @@
//������������������
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
StringBuilder content = new StringBuilder();
- content.append("������������������").append(existOrganization.getName());
+ content.append("������������������").append(existOrganization.getName()+";");
if(form.getDeleteChildren().equals(Constants.DELETE_CHILDREN_ORG))
- content.append("���������������������");
- logUtils.saveOperationForManage(request, content.toString());
+ content.append("���������������������;");
+ logUtils.saveOperationForManage(request, content.toString(),Constants.DELETE_OPERATE_TYPE);
return dto;
}
@@ -360,6 +317,7 @@
return dto;
}
+
/**
* @Description: ���organization���address���������provinceName cityName areaName������������
* @Param: [organization]
@@ -367,7 +325,7 @@
* @Author: ���������
* @Date: 2021/4/2
*/
- public void changeAddressByOrganization(Organization organization) {
+ private void changeAddressByOrganization(Organization organization) {
String provinceName = organization.getProvinceName();
String cityName = organization.getCityName();
String areaName = organization.getAreaName();
@@ -385,4 +343,62 @@
organization.setAddress(newAddress.toString());
}
+
+ /**
+ * @Description: ���������������������������
+ * @Param: [updateForm, newOrganization, oldOrganization]
+ * @return: void
+ * @Author: ���������
+ * @Date: 2021/4/8
+ */
+ private void insertUpdateLog(OrganizationUpdateForm updateForm,Organization newOrganization,Organization oldOrganization){
+ //������������������
+ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+ StringBuilder content = new StringBuilder();
+ content.append("������������������").append(oldOrganization.getName()).append(";");
+ //������������Map,���������������������������������
+ Map<String, Object> newParameters = JSONObject.parseObject(JSON.toJSONString(updateForm), Map.class);
+ Map<String, Object> oldParameters = JSONObject.parseObject(JSON.toJSONString(oldOrganization), Map.class);
+ //������������������������Map���������������������������
+ Set<String> keys = organizationFormMap.keySet();
+ for (String key : keys) {
+ String value = organizationFormMap.get(key);//���������������������
+ if ("parentName".equals(key)) {//���������������������������
+ if (updateForm.getParentId() != null) {//������������������������������������
+ String oldParentName = "���";
+ String newParentName = "���";
+ if (!oldOrganization.getParentId().equals(0)) {
+ oldParentName = organizationMapper.selectById(oldOrganization.getParentId()).getName();
+ }
+ if (!newOrganization.getParentId().equals(0)) {
+ newParentName = organizationMapper.selectById(newOrganization.getParentId()).getName();
+ }
+ content.append(value + ":" + oldParentName + "->" + newParentName + ";");
+ }
+ } else if ("expireTime".equals(key)) {//expireTime������������������������
+ if (updateForm.getExpireTime() != null) {
+ Date oldExpireTime = oldOrganization.getExpireTime();
+ Date newExpireTime = newOrganization.getExpireTime();
+ String oldExpireTimeStr = DateUtils.dateToDateString(oldExpireTime, "yyyy-MM-dd");
+ String newExpireTimeStr = DateUtils.dateToDateString(newExpireTime, "yyyy-MM-dd");
+ content.append(value + ":" + oldExpireTimeStr + "->" + newExpireTimeStr + ";");
+ }
+ } else {//������������������
+ if (newParameters.get(key) != null) {
+ String newValue = "���";
+ String oldValue = "���";
+ if (newParameters.get(key) != null && !newParameters.get(key).equals(" ")) {
+ newValue = String.valueOf(newParameters.get(key));
+ }
+ if (oldParameters.get(key) != null && !oldParameters.get(key).equals(" ")) {
+ oldValue = String.valueOf(oldParameters.get(key));
+ }
+ content.append(value + ":" + oldValue + "->" + newValue + ";");
+ }
+ }
+ }
+ logUtils.saveOperationForManage(request, content.toString(),Constants.UPDATE_OPERATE_TYPE);
+ }
+
+
}
--
Gitblit v1.8.0