blame | history | patch | commit | commitdiff | ignore whitespace
jinpengyong
2022-11-30 143d5a9187196d30131838874ba306bfb79ebe77 
 screen-manage/src/main/java/com/moral/api/service/impl/SpecialDeviceHistoryServiceImpl.java


@@ -47,8 +47,9 @@


    @Autowired(required = false)


    private OrganizationMapper organizationMapper;




    @Autowired


    LogUtils logUtils;


    @Autowired(required = false)


    private GovMonitorPointMapper govMonitorPointMapper;






    @Override


    public Map<String, Object> getDataByCondition(Map map) {


@@ -82,6 +83,20 @@


            String updateTime = SDF.format(specialDeviceHistory.getUpdateTime());


            specialDeviceHistoryMap.put("createTime",createTime);


            specialDeviceHistoryMap.put("updateTime",updateTime);


            Map<String,Object> govMonitorPointMap = new HashMap<>();


            if (!ObjectUtils.isEmpty(specialDeviceHistory.getGuid()) && specialDeviceHistory.getGuid()!=null && !"".equals(specialDeviceHistory.getGuid())){


                String  guid = specialDeviceHistory.getGuid().toString();


                QueryWrapper<GovMonitorPoint> wapper_govMonitorPoint = new QueryWrapper<>();


                wapper_govMonitorPoint.eq("is_delete",Constants.NOT_DELETE);


                wapper_govMonitorPoint.eq("guid",guid);


                GovMonitorPoint govMonitorPoint = govMonitorPointMapper.selectOne(wapper_govMonitorPoint);


                if (!ObjectUtils.isEmpty(govMonitorPoint)){


                    govMonitorPointMap.put("id",govMonitorPoint.getId());


                    govMonitorPointMap.put("guid",govMonitorPoint.getGuid());


                    govMonitorPointMap.put("name",govMonitorPoint.getName());


                }


            }


            specialDeviceHistoryMap.put("govMonitorPoint",govMonitorPointMap);


            List<Map<String,Object>> operateList = new ArrayList<>();


            if (!ObjectUtils.isEmpty(specialDeviceHistory.getOperateIds()) && specialDeviceHistory.getOperateIds()!=null){


                String operateIds = specialDeviceHistory.getOperateIds();


@@ -94,6 +109,7 @@


                    QueryWrapper<ManageAccount> wapper_manageAccount = new QueryWrapper<>();


                    wapper_manageAccount.eq("is_delete",Constants.NOT_DELETE);


                    wapper_manageAccount.in("id",operateIdList);


                    wapper_manageAccount.select("id", "user_name");


                    List<ManageAccount> manageAccounts = manageAccountMapper.selectList(wapper_manageAccount);


                    for (ManageAccount manageAccount:manageAccounts) {


                        Map<String,Object> operateMap = new HashMap<>();


@@ -169,6 +185,6 @@


        HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();


        StringBuilder content = new StringBuilder();


        content.append("删除了历史特殊设备：").append(specialDeviceHistory.getName()).append(";").append("mac：").append(mac);


        logUtils.saveOperationForManage(request, content.toString(), Constants.DELETE_OPERATE_TYPE);


        LogUtils.saveOperationForManage(request, content.toString(), Constants.DELETE_OPERATE_TYPE);


    }


}