diff --git a/.idea/workspace.xml b/.idea/workspace.xml index f5d6061..60cc2f0 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -20,10 +20,13 @@ - - - + + + + + + @@ -152,58 +160,70 @@ - + - + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + @@ -218,9 +238,10 @@ - - + + + \ No newline at end of file diff --git a/bootstrap/src/main/java/com/electromagnetic/industry/software/data/manage/controller/UserController.java b/bootstrap/src/main/java/com/electromagnetic/industry/software/data/manage/controller/UserController.java index 057a16d..d2a013f 100644 --- a/bootstrap/src/main/java/com/electromagnetic/industry/software/data/manage/controller/UserController.java +++ b/bootstrap/src/main/java/com/electromagnetic/industry/software/data/manage/controller/UserController.java @@ -3,6 +3,7 @@ package com.electromagnetic.industry.software.data.manage.controller; import com.electromagnetic.industry.software.data.manage.facade.UserFacade; import com.electromagnetic.industry.software.data.manage.request.indicator.UserRequest; import com.electromagnetic.industry.software.data.manage.response.indicator.UserResponse; +import com.electromagnetic.industry.software.data.manage.response.indicator.UserPageResponse; import electromagnetic.data.framework.share.model.ElectromagneticResult; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.RequestBody; @@ -21,7 +22,7 @@ public class UserController { @ApiOperation(value = "获取用户信息列表",notes = "") @RequestMapping(value = "/getUserList",method = RequestMethod.POST) - public ElectromagneticResult getUserList(@RequestBody UserRequest request){ + public ElectromagneticResult getUserList(@RequestBody UserRequest request){ return userFacade.getUserList(request); } diff --git a/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/parames/UserParams.java b/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/parames/UserParams.java index 05d1210..a6db19c 100644 --- a/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/parames/UserParams.java +++ b/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/parames/UserParams.java @@ -1,8 +1,12 @@ package com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames; +import lombok.Data; + +import java.io.Serializable; import java.util.Date; -public class UserParams { +@Data +public class UserParams implements Serializable { private static final long serialVersionUID = -4835122199589863011L; /** * 主键ID @@ -40,4 +44,12 @@ public class UserParams { * 创建时间 */ private Date gmtCreate; + /** + * 当前页 + */ + private Integer pageIndex; + /** + * 每页数据 + */ + private Integer pageSize; } diff --git a/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/repository/UserRepository.java b/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/repository/UserRepository.java index a1147d4..84f99ac 100644 --- a/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/repository/UserRepository.java +++ b/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/repository/UserRepository.java @@ -21,13 +21,13 @@ public interface UserRepository { * @param parames * @return */ - PageInfo getIndicatorCardListConfig(UserParams parames); + PageInfo getUserList(UserParams parames); /** * 根据indicatorCardNo获取指标卡 * @param indicatorCardNo * @return */ - User getIndicatorCard(String userAccount); + User getUser(String userAccount); } \ No newline at end of file diff --git a/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/service/impl/UserServiceImpl.java b/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/service/impl/UserServiceImpl.java new file mode 100644 index 0000000..a052383 --- /dev/null +++ b/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/service/impl/UserServiceImpl.java @@ -0,0 +1,57 @@ +/** + * Copyright (c) 2004-2024 All Rights Reserved. + */ +package com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.service.impl; + +import com.electromagnetic.industry.software.data.manage.common.ElectromagneticErrorEnum; +import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.enums.EffectFlagEnum; +import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.enums.IndicatorCardHomeDisplayEnum; +import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.enums.IndicatorCardStatusEnum; +import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.*; +import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.UserParams; +import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.repository.UserRepository; +import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.service.UserService; +import com.github.pagehelper.PageInfo; +import electromagnetic.data.framework.share.enums.ElectromagneticSceneIncidentEnum; +import electromagnetic.data.framework.share.exception.ElectromagneticBizRuntimeException; +import electromagnetic.data.framework.share.exception.LoggerConstant; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * @author + * @version $Id: IndicatorCardServiceImpl.java, v 0.1 2024-07-26 17:20 + */ +@Service +public class UserServiceImpl implements UserService { + + private static final Logger LOGGER = LoggerFactory.getLogger(LoggerConstant.DOMAIN_SERVICE); + + @Resource + private UserRepository userRepository; + /** + * 获取中支指标配置列表 + * @param parames + * @return + */ + @Override + public UserPage getUserList(UserParams parames) { + UserPage userPage=new UserPage(); + //数据查询 + PageInfo pageInfo=userRepository.getUserList(parames); + List userStrings=new ArrayList<>(); + pageInfo.getList().forEach(e->userStrings.add(e.getUserAccount())); + //查询指标 + userPage.setUserExtends(pageInfo); + return userPage; + } + + + +} \ No newline at end of file diff --git a/facade/src/main/java/com/electromagnetic/industry/software/data/manage/response/indicator/UserResponse.java b/facade/src/main/java/com/electromagnetic/industry/software/data/manage/response/indicator/UserResponse.java index 91694a6..d4c8e6c 100644 --- a/facade/src/main/java/com/electromagnetic/industry/software/data/manage/response/indicator/UserResponse.java +++ b/facade/src/main/java/com/electromagnetic/industry/software/data/manage/response/indicator/UserResponse.java @@ -1,7 +1,10 @@ package com.electromagnetic.industry.software.data.manage.response.indicator; +import lombok.Data; + import java.util.Date; +@Data public class UserResponse { private static final long serialVersionUID = -4835122199589863011L; /** diff --git a/infrastructure/repository/src/main/java/com/electromagnetic/industry/software/data/manage/repository/dao/UserMapper.java b/infrastructure/repository/src/main/java/com/electromagnetic/industry/software/data/manage/repository/dao/UserMapper.java new file mode 100644 index 0000000..2671e46 --- /dev/null +++ b/infrastructure/repository/src/main/java/com/electromagnetic/industry/software/data/manage/repository/dao/UserMapper.java @@ -0,0 +1,31 @@ +package com.electromagnetic.industry.software.data.manage.repository.dao; + +import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.User; +import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.UserExtend; +import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.UserParams; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface UserMapper { + /** + * 插入 + * @param record + * @return + */ + int insert(User record); + /** + * 根据indicatorCardNo获取指标卡 + * @param indicatorCardNo + * @return + */ + User selectByPrimaryKey(String userNo); + + /** + * 获取中支指标配置列表 + * @return + */ + List getUserList(UserParams parames); + +} \ No newline at end of file diff --git a/infrastructure/repository/src/main/java/com/electromagnetic/industry/software/data/manage/repository/impl/UserRepositoryImpl.java b/infrastructure/repository/src/main/java/com/electromagnetic/industry/software/data/manage/repository/impl/UserRepositoryImpl.java new file mode 100644 index 0000000..edcbf51 --- /dev/null +++ b/infrastructure/repository/src/main/java/com/electromagnetic/industry/software/data/manage/repository/impl/UserRepositoryImpl.java @@ -0,0 +1,50 @@ +/** + * Copyright (c) 2004-2024 All Rights Reserved. + */ +package com.electromagnetic.industry.software.data.manage.repository.impl; + +import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.User; +import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.UserExtend; +import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.UserParams; +import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.repository.UserRepository; +import com.electromagnetic.industry.software.data.manage.repository.dao.UserMapper; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import org.springframework.stereotype.Repository; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @author + * @version $Id: IndicatorCardRepositoryImpl.java, v 0.1 2024-07-29 19:04 + */ +@Repository +public class UserRepositoryImpl implements UserRepository { + + @Resource + private UserMapper userMapper; + + /** + * 获取中支指标配置列表 + * @param parames + * @return + */ + @Override + public PageInfo getUserList(UserParams parames) { + PageHelper.startPage(parames.getPageIndex(), parames.getPageSize()); + List userExtends=userMapper.getUserList(parames); + return new PageInfo<>(userExtends); + } + + /** + * 根据indicatorCardNo获取指标卡 + * @param indicatorCardNo + * @return + */ + @Override + public User getUser(String userAccount) { + return userMapper.selectByPrimaryKey(userAccount); + } + +} \ No newline at end of file diff --git a/service/src/main/java/com/electromagnetic/industry/software/data/manage/service/facade/UserFacadelImpl.java b/service/src/main/java/com/electromagnetic/industry/software/data/manage/service/facade/UserFacadeImpl.java similarity index 97% rename from service/src/main/java/com/electromagnetic/industry/software/data/manage/service/facade/UserFacadelImpl.java rename to service/src/main/java/com/electromagnetic/industry/software/data/manage/service/facade/UserFacadeImpl.java index 6514151..8e42a38 100644 --- a/service/src/main/java/com/electromagnetic/industry/software/data/manage/service/facade/UserFacadelImpl.java +++ b/service/src/main/java/com/electromagnetic/industry/software/data/manage/service/facade/UserFacadeImpl.java @@ -15,7 +15,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; @Service -public class UserFacadelImpl implements UserFacade { +public class UserFacadeImpl implements UserFacade { @Resource private UserService userService; diff --git a/service/target/classes/META-INF/service.kotlin_module b/service/target/classes/META-INF/service.kotlin_module new file mode 100644 index 0000000..a49347a Binary files /dev/null and b/service/target/classes/META-INF/service.kotlin_module differ diff --git a/service/target/generated-sources/annotations/com/electromagnetic/industry/software/data/manage/service/mappers/IndicatorCardMappersImpl.java b/service/target/generated-sources/annotations/com/electromagnetic/industry/software/data/manage/service/mappers/IndicatorCardMappersImpl.java index 408c050..06b5afe 100644 --- a/service/target/generated-sources/annotations/com/electromagnetic/industry/software/data/manage/service/mappers/IndicatorCardMappersImpl.java +++ b/service/target/generated-sources/annotations/com/electromagnetic/industry/software/data/manage/service/mappers/IndicatorCardMappersImpl.java @@ -22,7 +22,7 @@ import javax.annotation.Generated; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2024-10-29T10:14:34+0800", + date = "2024-10-29T14:07:53+0800", comments = "version: 1.4.1.Final, compiler: javac, environment: Java 1.8.0_432 (Temurin)" ) public class IndicatorCardMappersImpl implements IndicatorCardMappers { diff --git a/service/target/generated-sources/annotations/com/electromagnetic/industry/software/data/manage/service/mappers/UserMappersImpl.java b/service/target/generated-sources/annotations/com/electromagnetic/industry/software/data/manage/service/mappers/UserMappersImpl.java new file mode 100644 index 0000000..e6477e2 --- /dev/null +++ b/service/target/generated-sources/annotations/com/electromagnetic/industry/software/data/manage/service/mappers/UserMappersImpl.java @@ -0,0 +1,147 @@ +package com.electromagnetic.industry.software.data.manage.service.mappers; + +import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.User; +import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.UserExtend; +import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.UserPage; +import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.UserParams; +import com.electromagnetic.industry.software.data.manage.request.indicator.UserRequest; +import com.electromagnetic.industry.software.data.manage.response.indicator.UserPageResponse; +import com.electromagnetic.industry.software.data.manage.response.indicator.UserResponse; +import com.github.pagehelper.PageInfo; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import javax.annotation.Generated; + +@Generated( + value = "org.mapstruct.ap.MappingProcessor", + date = "2024-10-29T14:07:53+0800", + comments = "version: 1.4.1.Final, compiler: javac, environment: Java 1.8.0_432 (Temurin)" +) +public class UserMappersImpl implements UserMappers { + + @Override + public UserPageResponse getUserToModel(UserPage userPage) { + if ( userPage == null ) { + return null; + } + + UserPageResponse userPageResponse = new UserPageResponse(); + + userPageResponse.setUserExtends( userExtendPageInfoToUserResponsePageInfo( userPage.getUserExtends() ) ); + userPageResponse.setUsers( userListToUserResponseList( userPage.getUsers() ) ); + + return userPageResponse; + } + + @Override + public UserParams getUserParames(UserRequest request) { + if ( request == null ) { + return null; + } + + UserParams userParams = new UserParams(); + + return userParams; + } + + protected UserResponse userExtendToUserResponse(UserExtend userExtend) { + if ( userExtend == null ) { + return null; + } + + UserResponse userResponse = new UserResponse(); + + userResponse.setId( userExtend.getId() ); + userResponse.setUserAccount( userExtend.getUserAccount() ); + userResponse.setUserName( userExtend.getUserName() ); + userResponse.setTitleType( userExtend.getTitleType() ); + userResponse.setJobNumber( userExtend.getJobNumber() ); + userResponse.setDepartment( userExtend.getDepartment() ); + userResponse.setGmtHire( userExtend.getGmtHire() ); + userResponse.setWorkState( userExtend.getWorkState() ); + userResponse.setGmtCreate( userExtend.getGmtCreate() ); + + return userResponse; + } + + protected List userExtendListToUserResponseList(List list) { + if ( list == null ) { + return null; + } + + List list1 = new ArrayList( list.size() ); + for ( UserExtend userExtend : list ) { + list1.add( userExtendToUserResponse( userExtend ) ); + } + + return list1; + } + + protected PageInfo userExtendPageInfoToUserResponsePageInfo(PageInfo pageInfo) { + if ( pageInfo == null ) { + return null; + } + + PageInfo pageInfo1 = new PageInfo(); + + pageInfo1.setPageNum( pageInfo.getPageNum() ); + pageInfo1.setPageSize( pageInfo.getPageSize() ); + pageInfo1.setSize( pageInfo.getSize() ); + pageInfo1.setStartRow( pageInfo.getStartRow() ); + pageInfo1.setEndRow( pageInfo.getEndRow() ); + pageInfo1.setTotal( pageInfo.getTotal() ); + pageInfo1.setPages( pageInfo.getPages() ); + pageInfo1.setList( userExtendListToUserResponseList( pageInfo.getList() ) ); + pageInfo1.setFirstPage( pageInfo.getFirstPage() ); + pageInfo1.setPrePage( pageInfo.getPrePage() ); + pageInfo1.setNextPage( pageInfo.getNextPage() ); + pageInfo1.setLastPage( pageInfo.getLastPage() ); + pageInfo1.setIsFirstPage( pageInfo.isIsFirstPage() ); + pageInfo1.setIsLastPage( pageInfo.isIsLastPage() ); + pageInfo1.setHasPreviousPage( pageInfo.isHasPreviousPage() ); + pageInfo1.setHasNextPage( pageInfo.isHasNextPage() ); + pageInfo1.setNavigatePages( pageInfo.getNavigatePages() ); + int[] navigatepageNums = pageInfo.getNavigatepageNums(); + if ( navigatepageNums != null ) { + pageInfo1.setNavigatepageNums( Arrays.copyOf( navigatepageNums, navigatepageNums.length ) ); + } + pageInfo1.setNavigateFirstPage( pageInfo.getNavigateFirstPage() ); + pageInfo1.setNavigateLastPage( pageInfo.getNavigateLastPage() ); + + return pageInfo1; + } + + protected UserResponse userToUserResponse(User user) { + if ( user == null ) { + return null; + } + + UserResponse userResponse = new UserResponse(); + + userResponse.setId( user.getId() ); + userResponse.setUserAccount( user.getUserAccount() ); + userResponse.setUserName( user.getUserName() ); + userResponse.setTitleType( user.getTitleType() ); + userResponse.setJobNumber( user.getJobNumber() ); + userResponse.setDepartment( user.getDepartment() ); + userResponse.setGmtHire( user.getGmtHire() ); + userResponse.setWorkState( user.getWorkState() ); + userResponse.setGmtCreate( user.getGmtCreate() ); + + return userResponse; + } + + protected List userListToUserResponseList(List list) { + if ( list == null ) { + return null; + } + + List list1 = new ArrayList( list.size() ); + for ( User user : list ) { + list1.add( userToUserResponse( user ) ); + } + + return list1; + } +}