ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ruoyi-system/pom.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ruoyi-system/src/main/java/com/ruoyi/system/importExcel/TLocationImportExcel.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java
@@ -61,6 +61,6 @@ public UserDetails createLoginUser(SysUser user) { return new LoginUser(user.getUserId(), Long.valueOf(user.getDeptId()), user, permissionService.getMenuPermission(user)); return new LoginUser(user.getUserId(), user.getDeptId(), user, permissionService.getMenuPermission(user)); } } ruoyi-system/pom.xml
@@ -37,16 +37,21 @@ <artifactId>ruoyi-quartz</artifactId> </dependency> <!-- easypoi --> <dependency> <groupId>cn.afterturn</groupId> <artifactId>easypoi-spring-boot-starter</artifactId> <version>4.0.0</version> <exclusions> <exclusion> <artifactId>guava</artifactId> <groupId>com.google.guava</groupId> </exclusion> </exclusions> <artifactId>easypoi-base</artifactId> <version>3.0.3</version> </dependency> <dependency> <groupId>cn.afterturn</groupId> <artifactId>easypoi-web</artifactId> <version>3.0.3</version> </dependency> <dependency> <groupId>cn.afterturn</groupId> <artifactId>easypoi-annotation</artifactId> <version>3.0.3</version> </dependency> <!--mybatis-plus--> ruoyi-system/src/main/java/com/ruoyi/system/importExcel/TLocationImportExcel.java
@@ -1,7 +1,7 @@ package com.ruoyi.system.importExcel; import cn.afterturn.easypoi.excel.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -10,17 +10,31 @@ @ApiModel(value = "点位导入excel") public class TLocationImportExcel implements Serializable { @ApiModelProperty(value = "项目部编号") @Excel(name = "项目部编号") private String deptCode; @ApiModelProperty(value = "项目部名称") @Excel(name = "项目部名称") private String deptName; @ApiModelProperty(value = "基层管理员姓名 巡检员") @Excel(name = "基层管理员姓名 巡检员") private String nickName; // @ApiModelProperty(value = "保洁员部门编号") // private String nickName; // @ApiModelProperty(value = "基层管理员姓名 巡检员") // private String nickName; // @ApiModelProperty(value = "基层管理员姓名 巡检员") // private String nickName; @Excel(name = "保洁员部门编号") private String projectCodeClear; @Excel(name = "保洁员项目部编号") private String deptCodeClear; @Excel(name = "保洁员片区编号") private String cleanerCodeClear; @Excel(name = "路段总号") private String locationCode; @Excel(name = "点位类型") private String locationType; @Excel(name = "路段名(村名)") private String locationName; @Excel(name = "起点") private String locationAddress; @Excel(name = "终点") private String locationAddressEnd; @Excel(name = "起点(经纬度)") private String locationAddressLonLat; @Excel(name = "终点(经纬度)") private String locationAddressEndLonLat; }