日志 卡口管理

wl

2022-10-17 14c749da4021ee0c3d1697547a24fa97cb8eed8d

日志 卡口管理

 ycl-common/src/main/java/com/ycl/aspect/LogAspect.java

@@ -57,7 +57,11 @@
        }else {
            loginLog.setUserAgent("Web端");
        }
        loginLog.setOperationType(annotation.operationType());
        if (annotation.operationType().equals("")){
            loginLog.setOperationType("其他操作");
        }else {
            loginLog.setOperationType(annotation.operationType());
        }
        loginLog.setContain(annotation.contain());
        umsAdminLoginLogMapper.insert(loginLog);
    }

 ycl-common/src/main/java/com/ycl/controller/user/UmsAdminLogController.java

@@ -49,8 +49,8 @@
                        .eq(StringUtils.isNotBlank(logQueryParams.getPortEquipment()), UmsAdminLoginLog::getUserAgent, logQueryParams.getPortEquipment())
                        .eq(logQueryParams.getId() != null, UmsAdminLoginLog::getAdminId, logQueryParams.getId())
                        .between(logQueryParams.getStartTime() != null && logQueryParams.getEndTime() != null, UmsAdminLoginLog::getCreateTime, logQueryParams.getStartTime(), logQueryParams.getEndTime())
                        .orderBy(logQueryParams.getSort() == 0, true, UmsAdminLoginLog::getCreateTime)
                        .orderBy(logQueryParams.getSort() == 1, false, UmsAdminLoginLog::getCreateTime));
                        .orderBy(logQueryParams.getSort()!=null&&logQueryParams.getSort() == 0, true, UmsAdminLoginLog::getCreateTime)
                        .orderBy(logQueryParams.getSort()!=null&&logQueryParams.getSort() == 1, false, UmsAdminLoginLog::getCreateTime));
        List<UmsAdminLogVO> umsAdminLogVOList = page.getRecords().stream()
                .map(item -> {
                    UmsAdminLogVO umsAdminlogVO = new UmsAdminLogVO();
@@ -114,8 +114,8 @@
                                .like(StringUtils.isNotBlank(logQueryParams.getContent()), UmsAdminLoginLog::getContain, logQueryParams.getContent())
                                .eq(StringUtils.isNotBlank(logQueryParams.getOperationType()), UmsAdminLoginLog::getOperationType, logQueryParams.getOperationType())
                                .between(logQueryParams.getStartTime() != null && logQueryParams.getEndTime() != null, UmsAdminLoginLog::getCreateTime, logQueryParams.getStartTime(), logQueryParams.getEndTime())
                                .orderBy(logQueryParams.getSort() == 0, true, UmsAdminLoginLog::getCreateTime)
                                .orderBy(logQueryParams.getSort() == 1, false, UmsAdminLoginLog::getCreateTime))
                                .orderBy(logQueryParams.getSort()!=null&&logQueryParams.getSort() == 0, true, UmsAdminLoginLog::getCreateTime)
                                .orderBy(logQueryParams.getSort()!=null&&logQueryParams.getSort() == 1, false, UmsAdminLoginLog::getCreateTime))
                        .getRecords()
                        .stream()
                        .map(item -> {

 ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java

@@ -1,15 +1,29 @@
package com.ycl.controller.epuipment;


import com.alibaba.excel.EasyExcel;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.annotation.LogSave;
import com.ycl.api.CommonResult;
import com.ycl.controller.BaseController;
import com.ycl.entity.video.VideoPoint;
import com.ycl.entity.dict.DataDictionary;
import com.ycl.entity.equipment.EquipmentBayonet;
import com.ycl.service.dict.IDataDictionaryService;
import com.ycl.service.equipment.IEquipmentBayonetService;
import com.ycl.vo.equipment.EquipmentBayonetVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.SneakyThrows;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import java.net.URLEncoder;
import java.time.LocalDateTime;
import java.util.stream.Collectors;

/**
 * <p>
@@ -21,9 +35,87 @@
 */
@RestController
@RequestMapping("/equipment_bayonet")
@Api(tags = "卡口管理")
public class EquipmentBayonetController extends BaseController {

    @Autowired
    IEquipmentBayonetService iEquipmentBayonetService;
    @Autowired
    IDataDictionaryService iDataDictionaryService;

    @GetMapping("/query")
    @ApiOperation("查询")
    @LogSave
    public CommonResult search(@RequestParam(required = false) Integer size,
                               @RequestParam(required = false) Integer current,
                               @RequestParam(required = false) String bayonetName) {
        Page<EquipmentBayonet> equipmentBayonetPage = new Page<>();
        equipmentBayonetPage.setCurrent(current);
        equipmentBayonetPage.setSize(size);
        return CommonResult.success(iEquipmentBayonetService
                .page(equipmentBayonetPage, new LambdaQueryWrapper<EquipmentBayonet>()
                        .like(StringUtils.isNotBlank(bayonetName), EquipmentBayonet::getBayonetName, bayonetName))
                .getRecords()
                .stream()
                .map(item -> {
                    EquipmentBayonetVO equipmentBayonetVO = new EquipmentBayonetVO();
                    BeanUtils.copyProperties(item, equipmentBayonetVO);
                    equipmentBayonetVO.setFrontEndType(iDataDictionaryService.getOne(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getId, item.getFrontEndType())).getName());
                    equipmentBayonetVO.setInOutCityType(iDataDictionaryService.getOne(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getId, item.getInOutCityType())).getName());
                    return equipmentBayonetVO;
                }).collect(Collectors.toList()));
    }

    @PostMapping("/addition")
    @ApiOperation("添加")
    @LogSave(operationType = "卡口管理",contain = "添加卡口")
    public CommonResult add(@RequestBody EquipmentBayonet equipmentBayonet) {
        return CommonResult.success(iEquipmentBayonetService.save(equipmentBayonet));
    }

    @PutMapping("/modification")
    @ApiOperation("修改")
    @LogSave(operationType = "卡口管理",contain = "修改卡口")
    public CommonResult modify(@RequestBody EquipmentBayonet equipmentBayonet) {
        return CommonResult.success(iEquipmentBayonetService.updateById(equipmentBayonet));
    }

    @GetMapping("/export")
    @ApiOperation("导出")
    @SneakyThrows
    @LogSave(operationType = "卡口管理",contain = "删除卡口")
    public void export(HttpServletResponse response,
                       @RequestParam(required = false) Integer size,
                       @RequestParam(required = false) Integer current,
                       @RequestParam(required = false) String bayonetName) {
        Page<EquipmentBayonet> equipmentBayonetPage = new Page<>();
        equipmentBayonetPage.setCurrent(current);
        equipmentBayonetPage.setSize(size);
        StringBuilder fileName = new StringBuilder();
        fileName.append(LocalDateTime.now().getYear())
                .append("-")
                .append(LocalDateTime.now().getMonthValue())
                .append("-")
                .append(LocalDateTime.now().getDayOfMonth())
                .append("卡口数据");
        response.setContentType("application/vnd.ms-excel");
        response.setCharacterEncoding("utf-8");
        String file = URLEncoder.encode(fileName.toString(), "UTF-8").replaceAll("\\+", "%20");
        response.setHeader("Content-disposition", "attachment;filename=" + file + ".xlsx");
        EasyExcel.write(response.getOutputStream(), EquipmentBayonetVO.class)
                .sheet("数据")
                .doWrite(iEquipmentBayonetService
                        .page(equipmentBayonetPage, new LambdaQueryWrapper<EquipmentBayonet>()
                                .like(StringUtils.isNotBlank(bayonetName), EquipmentBayonet::getBayonetName, bayonetName))
                        .getRecords()
                        .stream()
                        .map(item -> {
                            EquipmentBayonetVO equipmentBayonetVO = new EquipmentBayonetVO();
                            BeanUtils.copyProperties(item, equipmentBayonetVO);
                            equipmentBayonetVO.setFrontEndType(iDataDictionaryService.getOne(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getId, item.getFrontEndType())).getName());
                            equipmentBayonetVO.setInOutCityType(iDataDictionaryService.getOne(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getId, item.getInOutCityType())).getName());
                            return equipmentBayonetVO;
                        }).collect(Collectors.toList()));
    }

}

 ycl-platform/src/main/java/com/ycl/entity/equipment/EquipmentBayonet.java

@@ -1,5 +1,6 @@
package com.ycl.entity.equipment;

import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -35,18 +36,21 @@
     * 卡口名称
     */
    @TableField("bayonet_name")
    @ExcelProperty(index = 1, value = "卡口名称")
    private String bayonetName;

    /**
     * 卡口经度
     */
    @TableField("longitude")
    @ExcelProperty(index = 1, value = "卡口名称")
    private BigDecimal longitude;

    /**
     * 卡口纬度
     */
    @TableField("latitude")
    @ExcelProperty(index = 1, value = "卡口名称")
    private BigDecimal latitude;

    /**
@@ -66,4 +70,16 @@
     */
    @TableField("description")
    private String description;

    /**
     * 前端类型
     */
    @TableField("front_end_type")
    private Integer frontEndType;

    /**
     * 出入城类型
     */
    @TableField("in_out_city_type")
    private Integer inOutCityType;
}

 ycl-platform/src/main/java/com/ycl/service/equipment/IEquipmentBayonetService.java

@@ -2,6 +2,9 @@

import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.entity.equipment.EquipmentBayonet;
import com.ycl.vo.equipment.EquipmentBayonetVO;

import java.util.List;

/**
 * <p>
@@ -12,5 +15,4 @@
 * @since 2022-10-14
 */
public interface IEquipmentBayonetService extends IService<EquipmentBayonet> {

}

 ycl-platform/src/main/java/com/ycl/service/equipment/impl/EquipmentBayonetServiceImpl.java

@@ -1,10 +1,20 @@
package com.ycl.service.equipment.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.entity.dict.DataDictionary;
import com.ycl.entity.equipment.EquipmentBayonet;
import com.ycl.mapper.equipment.EquipmentBayonetMapper;
import com.ycl.service.equipment.IEquipmentBayonetService;
import com.ycl.vo.equipment.EquipmentBayonetVO;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.List;
import java.util.stream.Collectors;

/**
 * <p>
@@ -16,5 +26,4 @@
 */
@Service
public class EquipmentBayonetServiceImpl extends ServiceImpl<EquipmentBayonetMapper, EquipmentBayonet> implements IEquipmentBayonetService {

}

 ycl-platform/src/main/java/com/ycl/vo/equipment/EquipmentBayonetVO.java

New file
@@ -0,0 +1,84 @@
package com.ycl.vo.equipment;

import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;

/**
 * <p>
 * 卡口管理
 * </p>
 *
 * @author zhanghua
 * @since 2022-10-14
 */
@Data
@ApiModel(value = "卡口管理VO")
public class EquipmentBayonetVO {

    /**
     * 主键
     */
    @ExcelIgnore
    private Integer id;

    /**
     * 卡口名称
     */
    @ApiModelProperty(value = "卡口名称")
    @ExcelProperty(index = 0, value = "卡口名称")
    private String bayonetName;

    /**
     * 卡口经度
     */
    @ApiModelProperty(value = "卡口经度")
    @ExcelProperty(index = 1, value = "卡口经度")
    private BigDecimal longitude;

    /**
     * 卡口纬度
     */
    @ApiModelProperty(value = "卡口纬度")
    @ExcelProperty(index = 2, value = "卡口纬度")
    private BigDecimal latitude;

    /**
     * ip地址
     */
    @ApiModelProperty(value = "ip地址")
    @ExcelProperty(index = 3, value = "ip地址")
    private String ipAddress;

    /**
     * 端口号
     */
    @ApiModelProperty(value = "端口号")
    @ExcelProperty(index = 4, value = "端口号")
    private String port;

    /**
     * 描述
     */
    @ApiModelProperty(value = "描述")
    @ExcelProperty(index = 7, value = "描述")
    private String description;

    /**
     * 前端类型
     */
    @ApiModelProperty(value = "前端类型")
    @ExcelProperty(index = 5, value = "前端类型")
    private String frontEndType;

    /**
     * 出入城类型
     */
    @ApiModelProperty(value = "出入城类型")
    @ExcelProperty(index = 6, value = "出入城类型")
    private String inOutCityType;
}