From 28923b3d67c58b032bc4ff128aa1d5e62d73dba1 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 02 Feb 2024 10:07:58 +0800
Subject: [PATCH] fix:提交实时在线率接口

---
 screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java |  153 +++++++++++++++++++++++++++++++++-----------------
 1 files changed, 101 insertions(+), 52 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..f588770 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,16 +6,20 @@
 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;
 import com.moral.api.pojo.enums.*;
+import com.moral.api.pojo.ext.allocation.AllocationExcelExt;
 import com.moral.api.pojo.ext.allocation.AllocationExt;
 import com.moral.api.pojo.ext.allocation.AllocationListExt;
 import com.moral.api.pojo.ext.allocation.AllocationPageExt;
@@ -28,9 +32,12 @@
 import com.moral.api.pojo.vo.app.AppAuthority;
 import com.moral.api.pojo.vo.user.QxUser;
 import com.moral.api.service.*;
+import com.moral.api.utils.BeanConverts;
 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 +46,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 +84,8 @@
     private SysDictTypeService sysDictTypeService;
     @Autowired
     private UserService userService;
+    @Autowired
+    private AllocationLogMapper allocationLogMapper;
 
     /**
      * ������������������������������������
@@ -211,47 +224,23 @@
             }
         }
 
-//        Map<String, Object> userInfo = (Map<String, Object>) TokenUtils.getUserInfo();
-//        Object unitId = userInfo.get("unitId");
-//        Map<String, Object> orgInfo = (Map<String, Object>) userInfo.get("organization");
-//        Integer orgId = (Integer) orgInfo.get("id");
-//        if (!ObjectUtils.isEmpty(map.get("unitId"))){
-//            wrapper.in("unit_id",map.get("unitId").toString());
-//        }else {
-//            if (orgId!=24){
-//                if (ObjectUtils.isEmpty(unitId)){
-//                    return null;
-//                }
-//                ResponsibilityUnit responsibilityUnit1 = responsibilityUnitMapper.selectById(Integer.parseInt(unitId.toString()));
-//                Integer areaCode = responsibilityUnit1.getAreaCode();
-//                List<ResponsibilityUnit> responsibilityUnits = responsibilityUnitService.selectUnit(areaCode);
-//                if (ObjectUtils.isEmpty(responsibilityUnits)){
-//                    List<ResponsibilityUnit> responsibilityUnits1 = responsibilityUnitService.selectAreaUnit(areaCode);
-//                    Map<Integer, List<ResponsibilityUnit>> collect = responsibilityUnits1.stream().collect(Collectors.groupingBy(o -> o.getUnitId()));
-//                    List<Integer> collect1 = collect.keySet().stream().collect(Collectors.toList());
-//                    wrapper.in("unit_id",collect1);
-//                }else {
-//                    Map<Integer, List<ResponsibilityUnit>> collect = responsibilityUnits.stream().collect(Collectors.groupingBy(o -> o.getUnitId()));
-//                    List<Integer> collect1 = collect.keySet().stream().collect(Collectors.toList());
-//                    wrapper.in("unit_id",collect1);
-//                }
-//            }
-//        }
+
 
         HashMap<String, Object> rsMap = new HashMap<>();
         ArrayList<Map<String, Object>> polluteArrayList = new ArrayList<>();
         ArrayList<Map<String, Object>> escalationTypeList = new ArrayList<>();
         ArrayList<AllocationUnitViewDto> allocationUnitViewDtos = new ArrayList<>();
 
-        Object number1 = map.get("number");
+        String number1 = map.get("number").toString();
         String startTime=null;
         String endTime=null;
         if (!ObjectUtils.isEmpty(map.get("startTime")) || !ObjectUtils.isEmpty(map.get("endTime"))){
              startTime = map.get("startTime").toString();
-             endTime = map.get("endTime").toString();
+//             endTime = map.get("endTime").toString();
+             endTime = DateUtils.getDateOfDay(map.get("endTime").toString(), 1, DateUtils.yyyy_MM_dd_EN);
 
         }
-        if (!ObjectUtils.isEmpty(number1)){
+        if (!number1.equals("0")){
             String s = "-"+number1;
             //������������������
             endTime = DateUtils.getCurDateTime();
@@ -394,29 +383,7 @@
                 }
             }
         }
-//        Map<String, Object> userInfo = (Map<String, Object>) TokenUtils.getUserInfo();
-//        Object unitId = userInfo.get("unitId");
-//        Map<String, Object> orgInfo = (Map<String, Object>) userInfo.get("organization");
-//        Integer orgId = (Integer) orgInfo.get("id");
-//
-//        if (ObjectUtils.isEmpty(unitId)){
-//            return null;
-//        }
-//        if (orgId!=24){
-//            ResponsibilityUnit responsibilityUnit1 = responsibilityUnitMapper.selectById(Integer.parseInt(unitId.toString()));
-//            Integer areaCode = responsibilityUnit1.getAreaCode();
-//            List<ResponsibilityUnit> responsibilityUnits = responsibilityUnitService.selectUnit(areaCode);
-//            if (ObjectUtils.isEmpty(responsibilityUnits)){
-//                List<ResponsibilityUnit> responsibilityUnits1 = responsibilityUnitService.selectAreaUnit(areaCode);
-//                Map<Integer, List<ResponsibilityUnit>> collect = responsibilityUnits1.stream().collect(Collectors.groupingBy(o -> o.getUnitId()));
-//                List<Integer> collect1 = collect.keySet().stream().collect(Collectors.toList());
-//                wrapper.in("unit_id",collect1);
-//            }else {
-//                Map<Integer, List<ResponsibilityUnit>> collect = responsibilityUnits.stream().collect(Collectors.groupingBy(o -> o.getUnitId()));
-//                List<Integer> collect1 = collect.keySet().stream().collect(Collectors.toList());
-//                wrapper.in("unit_id",collect1);
-//            }
-//        }
+
 
         ArrayList<Map<String, Object>> rsMap = new ArrayList<>();
         Object number1 = map.get("number");
@@ -485,6 +452,7 @@
 
     @Override
     public Page<AllocationPageExt> extPage(AllocationPageCond allocationPageCond) {
+        List<Integer> unitAuthority = this.getUnitAuthority(SysDictTypeEnum.SYS_AMEND.value);
         List<Integer> unitList = unitResult();
         Integer codeId =  unitAreaCode();
         allocationPageCond.setUnitList(unitList);
@@ -496,6 +464,7 @@
                 }else {
                     it.setIsApprove(0);
                 }
+                it.setIsCode(ObjectUtils.isEmpty(unitAuthority)?"2":"1");
             });
         }
         return page;
@@ -913,6 +882,74 @@
         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;
+    }
+
+    /**
+     * ������������������������������
+     *
+     * @param code
+     * @return
+     */
+    @Override
+    public List<Integer> getUnitAuthority(String code) {
+        QxUser user = UserHelper.getCurrentUser();
+        List<Integer> userList = responsibilityUnitMapper.selectCodeList(code,user.getUserId());
+        return userList;
+    }
+
     @Override
     public List<Integer>  unitResult() {
         QxUser user = UserHelper.getCurrentUser();
@@ -960,4 +997,16 @@
           return   responsibilityUnit;
     }
 
+    @Override
+    public List<AllocationExcelExt> listExcel(List<Integer> id) {
+        List<AllocationExcelExt> list = new ArrayList<>();
+        for(Integer i : id){
+            AllocationExt allocationExt = oneAllocation(i);
+            AllocationExcelExt allocationExcelExt = BeanConverts.convert(allocationExt,AllocationExcelExt.class);
+            allocationExcelExt.setFileBaseList(fileTableService.list(i,FileTableEnum.ALLOCATION_FOUNDATION.value,FileType.PICTURE.getValue()));
+            allocationExcelExt.setFileChangeList(fileTableService.list(i,FileTableEnum.ALLOCATION_RECTIFICATION.value,FileType.PICTURE.getValue()));
+            list.add(allocationExcelExt);
+        }
+        return list;
+    }
 }

--
Gitblit v1.8.0