From 607613b5d0e3fd237c04dbd2ae8a65bb143fe598 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 13 Nov 2023 17:17:05 +0800
Subject: [PATCH] chore:立行立改pc端日志接口提交
---
screen-api/src/main/java/com/moral/api/mapper/AllocationLogMapper.java | 7 ++
screen-api/src/main/java/com/moral/api/entity/AllocationLog.java | 67 ++++++++++++++++++++++
screen-api/src/main/java/com/moral/api/service/AllocationService.java | 13 ++++
screen-api/src/main/java/com/moral/api/controller/AllocationController.java | 27 +++++++--
screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java | 66 ++++++++++++++++++++++
5 files changed, 174 insertions(+), 6 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/AllocationController.java b/screen-api/src/main/java/com/moral/api/controller/AllocationController.java
index 92cb30c..aa33336 100644
--- a/screen-api/src/main/java/com/moral/api/controller/AllocationController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/AllocationController.java
@@ -6,16 +6,16 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.collections4.CollectionUtils;
-import org.aspectj.apache.bcel.generic.RET;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.moral.api.entity.AllocationLog;
import com.moral.api.pojo.ext.allocation.AllocationExt;
import com.moral.api.pojo.ext.allocation.AllocationPageExt;
import com.moral.api.pojo.query.allocation.*;
import com.moral.api.pojo.query.allocationextension.AllocationExtensionAddCond;
-import com.moral.api.pojo.vo.allocation.AllocationFindVo;
+
import com.moral.api.pojo.vo.allocation.AllocationPageVo;
import com.moral.api.pojo.vo.allocation.AllocationVo;
-import com.moral.api.utils.BeanConverts;
+
import com.moral.constant.PageResult;
import io.swagger.annotations.*;
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,7 +23,6 @@
import org.springframework.web.bind.annotation.*;
-import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.List;
@@ -32,9 +31,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import com.moral.api.entity.Allocation;
import com.moral.api.entity.ResponsibilityUnit;
-import com.moral.api.pojo.dto.allocation.AllocationUnitViewDto;
+
import com.moral.api.service.AllocationService;
import com.moral.api.utils.EasyExcelUtils;
import com.moral.api.utils.NoModelWriteData;
@@ -202,6 +200,23 @@
}
}
+ @GetMapping("updataUnit")
+ @ApiOperation("������������������")
+ public ResultMessage updataUnit(@RequestParam @ApiParam(value = "id",name = "������id") Integer id,
+ @RequestParam @ApiParam(value = "unitId",name = "������������Id") Integer unitId,
+ @RequestParam @ApiParam(value = "polluteType",name = "������������Id") Integer polluteType){
+ allocationService.updataUnit(id,unitId,polluteType);
+ return ResultMessage.ok();
+ }
+
+
+
+ @GetMapping("getLog")
+ @ApiOperation("������������")
+ public ResultMessage getLog(@RequestParam @ApiParam(value = "allocationNum",name = "������������") String allocationNum){
+ List<AllocationLog> log = allocationService.getLog(allocationNum);
+ return ResultMessage.ok(log);
+ }
}
diff --git a/screen-api/src/main/java/com/moral/api/entity/AllocationLog.java b/screen-api/src/main/java/com/moral/api/entity/AllocationLog.java
new file mode 100644
index 0000000..fc3bbe5
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/entity/AllocationLog.java
@@ -0,0 +1,67 @@
+package com.moral.api.entity;
+
+
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class AllocationLog {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ������
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * ������������
+ */
+ private String content;
+
+ /**
+ * ���������������
+ */
+ private String account;
+
+ /**
+ * ���������������
+ */
+ private String userName;
+
+
+ /**
+ * ������������id
+ */
+ private Integer accountId;
+
+ /**
+ * Ip������
+ */
+ private String ip;
+
+ /**
+ * ������������
+ */
+ private String allocationNum;
+
+
+ private String polluteType;
+
+
+ /**
+ * ������������
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+
+}
diff --git a/screen-api/src/main/java/com/moral/api/mapper/AllocationLogMapper.java b/screen-api/src/main/java/com/moral/api/mapper/AllocationLogMapper.java
new file mode 100644
index 0000000..68ac2d6
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/mapper/AllocationLogMapper.java
@@ -0,0 +1,7 @@
+package com.moral.api.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.moral.api.entity.AllocationLog;
+
+public interface AllocationLogMapper extends BaseMapper<AllocationLog> {
+}
diff --git a/screen-api/src/main/java/com/moral/api/service/AllocationService.java b/screen-api/src/main/java/com/moral/api/service/AllocationService.java
index 218cbfc..2f36bcd 100644
--- a/screen-api/src/main/java/com/moral/api/service/AllocationService.java
+++ b/screen-api/src/main/java/com/moral/api/service/AllocationService.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.moral.api.entity.Allocation;
+import com.moral.api.entity.AllocationLog;
import com.moral.api.entity.ResponsibilityUnit;
import com.moral.api.pojo.ext.allocation.AllocationExt;
import com.moral.api.pojo.ext.allocation.AllocationListExt;
@@ -139,5 +140,17 @@
*/
AppAuthority authority(String allocationNum, Integer userId);
+ /**
+ * ������������������
+ * @param id
+ * @param unitId
+ */
+ void updataUnit(Integer id,Integer unitId,Integer polluteType);
+ /**
+ * ������������������
+ * @param allocationNum
+ * @return
+ */
+ List<AllocationLog> getLog(String allocationNum);
}
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
index 0b9da91..6a5a6d9 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
@@ -6,12 +6,15 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.config.Interceptor.UserHelper;
+import com.moral.api.controller.LogController;
import com.moral.api.entity.*;
import com.moral.api.exception.BusinessException;
+import com.moral.api.mapper.AllocationLogMapper;
import com.moral.api.mapper.AllocationMapper;
import com.moral.api.mapper.ResponsibilityUnitMapper;
import com.moral.api.mapper.SysDictDataMapper;
import com.moral.api.mapper.SysDictTypeMapper;
+import com.moral.api.mapper.UserLogMapper;
import com.moral.api.mapper.UserMapper;
import com.moral.api.pojo.bean.BaseInvalidEntity;
import com.moral.api.pojo.dto.allocation.AllocationUnitViewDto;
@@ -31,6 +34,8 @@
import com.moral.constant.Constants;
import com.moral.constant.RedisConstants;
import com.moral.util.DateUtils;
+import com.moral.util.WebUtils;
+
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.BeanUtils;
@@ -39,9 +44,13 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
import java.util.*;
import java.util.stream.Collectors;
+
+import javax.servlet.http.HttpServletRequest;
@Service
@@ -73,6 +82,8 @@
private SysDictTypeService sysDictTypeService;
@Autowired
private UserService userService;
+ @Autowired
+ private AllocationLogMapper allocationLogMapper;
/**
* ������������������������������������
@@ -913,6 +924,61 @@
return appAuthority;
}
+ /**
+ * ������������������
+ *
+ * @param id
+ * @param unitId
+ */
+ @Override
+ @Transactional
+ public void updataUnit(Integer id, Integer unitId,Integer polluteType) {
+ AllocationLog allocationLog = new AllocationLog();
+ //������������������
+ QxUser user = UserHelper.getCurrentUser();
+ Allocation allocation = allocationMapper.selectById(id);
+ if (!ObjectUtils.isEmpty(unitId)){
+ ResponsibilityUnit unitName1 = getUnitName(allocation.getUnitId());
+ ResponsibilityUnit unitName2 = getUnitName(unitId);
+ allocation.setUnitId(unitId);
+ allocationLog.setContent(unitName1.getUnitName()+"----���������----"+unitName2.getUnitName());
+
+ }
+ if (!ObjectUtils.isEmpty(polluteType)){
+ SysDictData sysDictData1 = sysDictTypeService.listOne(Constants.WU_RAN_LEI_XING,allocation.getPolluteType().toString());
+ SysDictData sysDictData2 = sysDictTypeService.listOne(Constants.WU_RAN_LEI_XING, polluteType.toString());
+ allocation.setPolluteType(polluteType);
+ allocationLog.setPolluteType(sysDictData1.getDataValue()+"----���������----"+sysDictData2.getDataValue());
+ }
+
+ allocationMapper.updateById(allocation);
+ //������
+ HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
+ allocationLog.setAllocationNum(allocation.getAllocationNum());
+ allocationLog.setIp(WebUtils.getIpAddr(request));
+ allocationLog.setAccountId(user.getUserId());
+ allocationLog.setAccount(user.getAccount());
+ allocationLog.setUserName(user.getUserName());
+ allocationLog.setCreateTime(new Date());
+ allocationLogMapper.insert(allocationLog);
+
+ }
+
+ /**
+ * ������������������
+ *
+ * @param allocationNum
+ * @return
+ */
+ @Override
+ public List<AllocationLog> getLog(String allocationNum) {
+ LambdaQueryWrapper<AllocationLog> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(AllocationLog::getAllocationNum,allocationNum);
+ wrapper.orderByAsc(AllocationLog::getCreateTime);
+ List<AllocationLog> allocationLogs = allocationLogMapper.selectList(wrapper);
+ return allocationLogs;
+ }
+
@Override
public List<Integer> unitResult() {
QxUser user = UserHelper.getCurrentUser();
--
Gitblit v1.8.0