代码格式化

main
admin 5 days ago
parent 42d78211b0
commit 82c884b7fd
  1. 3
      src/main/java/com/keyware/htey/controller/humanResourceManagement/HumanResourceManagementController.java
  2. 2
      src/main/java/com/keyware/htey/controller/user/AuditLogController.java
  3. 1
      src/main/java/com/keyware/htey/mybatis/itf/UserMapper.java
  4. 1
      src/main/java/com/keyware/htey/mybatis/itf/UserRoleMapper.java
  5. 1
      src/main/java/com/keyware/htey/mybatis/itf/UsersecretMapper.java
  6. 1
      src/main/java/com/keyware/htey/service/impl/DepartmentServiceImpl.java
  7. 4
      src/main/java/com/keyware/htey/service/impl/UserServiceImpl.java
  8. 1
      src/main/java/com/keyware/htey/service/impl/UsersecretServiceImpl.java
  9. 1
      src/main/java/com/keyware/htey/service/itf/DepartmentService.java
  10. 2
      src/main/java/com/keyware/htey/service/itf/UserService.java
  11. 1
      src/main/java/com/keyware/htey/service/itf/UsersecretService.java
  12. 1
      src/main/java/com/keyware/htey/utli/IdComposeListUtil.java

@ -27,7 +27,8 @@ public class HumanResourceManagementController {
@Autowired @Autowired
private AuditLogService auditLogService; private AuditLogService auditLogService;
@RequestMapping(value = {"/analysisExcl"},method = {RequestMethod.POST},produces = {"application/json; charset=utf-8"}) @RequestMapping(value = {"/analysisExcl"}, method = {RequestMethod.POST},
produces = {"application/json; charset=utf-8"})
@ResponseBody @ResponseBody
@Operation(summary = "用户列表导入", description = "返回导入信息") @Operation(summary = "用户列表导入", description = "返回导入信息")
@ApiResponse(responseCode = "200", description = "成功导入信息") @ApiResponse(responseCode = "200", description = "成功导入信息")

@ -8,11 +8,9 @@ import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
/** /**

@ -36,5 +36,6 @@ public interface UserMapper extends BaseMapper<User> {
int recovery(List var1); int recovery(List var1);
List<User> selectLogOutUser(@Param("userName") String var1, @Param("projectSource") String var2); List<User> selectLogOutUser(@Param("userName") String var1, @Param("projectSource") String var2);
int deleteByPrimaryKey(List<String> var1); int deleteByPrimaryKey(List<String> var1);
} }

@ -1,7 +1,6 @@
package com.keyware.htey.mybatis.itf; package com.keyware.htey.mybatis.itf;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.keyware.htey.entity.user.User;
import com.keyware.htey.entity.user.UserRole; import com.keyware.htey.entity.user.UserRole;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;

@ -14,5 +14,6 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper @Mapper
public interface UsersecretMapper extends BaseMapper<Usersecret> { public interface UsersecretMapper extends BaseMapper<Usersecret> {
int insertSelective(Usersecret var1); int insertSelective(Usersecret var1);
void deleteByPrimaryKey(List<String> var1); void deleteByPrimaryKey(List<String> var1);
} }

@ -26,6 +26,7 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
public Department selectByPrimaryKey(String id) { public Department selectByPrimaryKey(String id) {
return this.departmentMapper.selectByPrimaryKey(id); return this.departmentMapper.selectByPrimaryKey(id);
} }
@Override @Override
public List<Department> getParentId(String parentId, String isSys, String projectRsource) { public List<Department> getParentId(String parentId, String isSys, String projectRsource) {
return this.departmentMapper.getParentId(parentId, isSys, projectRsource); return this.departmentMapper.getParentId(parentId, isSys, projectRsource);

@ -20,6 +20,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
private static String projectName = "kdtr"; private static String projectName = "kdtr";
@Autowired @Autowired
private UserRoleMapper userRoleMapper; private UserRoleMapper userRoleMapper;
@Override @Override
public List<User> selectByUserInfo17suo(User user) { public List<User> selectByUserInfo17suo(User user) {
user.setProjectSource(projectName); user.setProjectSource(projectName);
@ -73,14 +74,17 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
public int recovery(List record) { public int recovery(List record) {
return this.userMapper.recovery(record); return this.userMapper.recovery(record);
} }
@Override @Override
public List<User> selectLogOutUser(String userName) { public List<User> selectLogOutUser(String userName) {
return this.userMapper.selectLogOutUser(userName, Constant.projectName); return this.userMapper.selectLogOutUser(userName, Constant.projectName);
} }
@Override @Override
public int deleteByPrimaryKey(List<String> id) { public int deleteByPrimaryKey(List<String> id) {
return this.userMapper.deleteByPrimaryKey(id); return this.userMapper.deleteByPrimaryKey(id);
} }
public void deleteUserRoleByUserId(String id) { public void deleteUserRoleByUserId(String id) {
this.userRoleMapper.deleteByUserId(id); this.userRoleMapper.deleteByUserId(id);
} }

@ -20,6 +20,7 @@ public class UsersecretServiceImpl extends ServiceImpl<UsersecretMapper, Usersec
public int insertSelective(Usersecret userSecret) { public int insertSelective(Usersecret userSecret) {
return this.usersecretMapper.insertSelective(userSecret); return this.usersecretMapper.insertSelective(userSecret);
} }
@Override @Override
public void deleteByPrimaryKey(List<String> id) { public void deleteByPrimaryKey(List<String> id) {
this.usersecretMapper.deleteByPrimaryKey(id); this.usersecretMapper.deleteByPrimaryKey(id);

@ -10,6 +10,5 @@ public interface DepartmentService extends IService<Department> {
Department selectByPrimaryKey(String var1); Department selectByPrimaryKey(String var1);
List<Department> getParentId(String var1, String var2, String var3); List<Department> getParentId(String var1, String var2, String var3);
} }

@ -28,6 +28,8 @@ public interface UserService extends IService<User> {
int recovery(List var1); int recovery(List var1);
List<User> selectLogOutUser(String var1); List<User> selectLogOutUser(String var1);
int deleteByPrimaryKey(List<String> var1); int deleteByPrimaryKey(List<String> var1);
void deleteUserRoleByUserId(String var1); void deleteUserRoleByUserId(String var1);
} }

@ -7,5 +7,6 @@ import com.keyware.htey.entity.usersecret.Usersecret;
public interface UsersecretService extends IService<Usersecret> { public interface UsersecretService extends IService<Usersecret> {
int insertSelective(Usersecret var1); int insertSelective(Usersecret var1);
void deleteByPrimaryKey(List<String> var1); void deleteByPrimaryKey(List<String> var1);
} }

@ -17,6 +17,7 @@ public class IdComposeListUtil {
String userIds = stringId(userList); String userIds = stringId(userList);
return Arrays.asList(userIds.split(",")); return Arrays.asList(userIds.split(","));
} }
public static String stringId(List<User> userList) { public static String stringId(List<User> userList) {
return userList.stream() return userList.stream()
.map(User::getId) .map(User::getId)

Loading…
Cancel
Save