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/service/impl/AllocationServiceImpl.java |   66 +++++++++++++++++++++++++++++++++
 1 files changed, 66 insertions(+), 0 deletions(-)

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