chenxudong
/
electromagnetic-data
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

解决合并冲突

This commit is contained in:
石璞臻 2024-11-15 09:36:37 +08:00
parent 4fb0aee4f2 8d24442c52
commit 6fda9c1b21
53 changed files with 774 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bootstrap/src/main/java/com/electromagnetic/industry/software/data/manage/controller/EDDataController.java
View File

@ -22,7 +22,6 @@ public class EDDataController {
@ApiOperation(value = "新建文件夹",notes = "")
@RequestMapping(value = "/createFolder",method = RequestMethod.POST)
public ElectromagneticResult<?> createFolder(@RequestBody EDDataRequest request){
//return ElectromagneticResultUtil.success("新建文件夹接口");
return edDataFacade.createFolder(request);
}
@ -30,15 +29,20 @@ public class EDDataController {
@ApiOperation(value = "获取文件信息列表",notes = "")
@RequestMapping(value = "/getFileInfoList",method = RequestMethod.POST)
public ElectromagneticResult<?> getFileInfoList(@RequestBody EDDataRequest request){
//return ElectromagneticResultUtil.success("获取文件信息列表");
return edDataFacade.getDataInfoList(request);
}
@ApiOperation(value = "更新文件占用状态",notes = "")
@RequestMapping(value = "/updateFileStatus",method = RequestMethod.POST)
public ElectromagneticResult<?> updateFileStatus(@RequestBody EDDataRequest request){
return edDataFacade.updateFileStatus(request);
}
@ApiOperation(value = "上传",notes = "")
@RequestMapping(value = "/upload",method = RequestMethod.POST)
public ElectromagneticResult<?> upload(@RequestBody EDDataRequest request){
//return ElectromagneticResultUtil.success("上传");
return edDataFacade.upload(request);
}
@ -46,7 +50,6 @@ public class EDDataController {
@ApiOperation(value = "下载",notes = "")
@RequestMapping(value = "/download",method = RequestMethod.POST)
public ElectromagneticResult<?> download(@RequestBody EDDataRequest request){
//return ElectromagneticResultUtil.success("下载");
return edDataFacade.download(request);
}

11
bootstrap/src/main/java/com/electromagnetic/industry/software/data/manage/controller/user/UserController.java
View File

@ -2,9 +2,10 @@ package com.electromagnetic.industry.software.data.manage.controller.user;
import com.electromagnetic.industry.software.data.manage.facade.user.UserFacade;
import com.electromagnetic.industry.software.data.manage.request.user.UserPublishRequest;
import com.electromagnetic.industry.software.data.manage.request.user.UserLoginRequest;
import com.electromagnetic.industry.software.data.manage.request.user.UserRequest;
import electromagnetic.data.framework.share.model.BaseResult;
import electromagnetic.data.framework.share.model.ElectromagneticResult;
import electromagnetic.data.framework.share.result.BaseResult;
import electromagnetic.data.framework.share.result.LoginResult;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
@ -17,6 +18,12 @@ public class UserController {
@Resource
private UserFacade userFacade;
@ApiOperation(value = "登录", notes = "")
@PostMapping("/login")
public LoginResult<?> login(@RequestBody UserLoginRequest loginRequest) {
return userFacade.login(loginRequest);
}
@ApiOperation(value = "新增用户信息", notes = "")
@PostMapping
public BaseResult<?> createUser(@RequestBody UserRequest userRequest) {

5
domain/pom.xml
View File

@ -47,6 +47,11 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<!--Token生成与解析-->
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId>
</dependency>
</dependencies>
</project>

1
domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/model/EDDataPage.java
View File

@ -7,7 +7,6 @@ import com.github.pagehelper.PageInfo;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* 分页综合返回

5
domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/parames/EDDataParams.java
View File

@ -3,7 +3,6 @@ package com.electromagnetic.industry.software.data.manage.domain.boardservice.in
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@Data
public class EDDataParams implements Serializable {
@ -32,4 +31,8 @@ public class EDDataParams implements Serializable {
* 文件数据编码
*/
private String dataId;
/**
* 文件数据状态
*/
private String dataStatus;
}

14
domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/repository/EDDataRepository.java
View File

@ -4,14 +4,9 @@
package com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.repository;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.EDDataInfo;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCard;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCardExtend;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.EDDataParams;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.IndicatorCardParams;
import com.github.pagehelper.PageInfo;
import java.util.List;
/**
* @author
* @version $Id: EDDataRepos.java, v 0.1 2024-07-29 19:02
@ -20,7 +15,7 @@ public interface EDDataRepository {
/**
* 创建文件夹
* @param parames
* @param edDataInfo
* @return
*/
Boolean createFolder(EDDataInfo edDataInfo);
@ -32,6 +27,13 @@ public interface EDDataRepository {
*/
PageInfo<EDDataInfo> getDataInfoList(EDDataParams parames);
/**
* 更新文件占用状态
* @param parames
* @return
*/
Boolean updateFileStatus(EDDataParams parames);
/**
* 上传
* @param parames

14
domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/service/EDDataService.java
View File

@ -1,15 +1,8 @@
package com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.service;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.EDDataInfo;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCard;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.EDDataPage;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.EDDataParams;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.IndicatorCardParams;
import com.electromagnetic.industry.software.data.manage.request.indicator.EDDataRequest;
import electromagnetic.data.framework.share.model.ElectromagneticResult;
import electromagnetic.data.framework.share.model.ElectromagneticResultUtil;
import java.util.List;
public interface EDDataService {
@ -27,6 +20,13 @@ public interface EDDataService {
*/
EDDataPage getDataInfoList(EDDataParams parames);
/**
* 更新文件占用状态
* @param parames
* @return
*/
Boolean updateFileStatus(EDDataParams parames);
/**
* 上传
* @param parames

23
domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/service/impl/EDDataServiceImpl.java
View File

@ -3,28 +3,18 @@
*/
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.EDDataInfo;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCard;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.EDDataPage;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.EDDataParams;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.repository.EDDataRepository;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.service.EDDataService;
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
@ -41,7 +31,7 @@ public class EDDataServiceImpl implements EDDataService {
/**
* 创建文件夹
* @param parames
* @param edDataInfo
* @return
*/
public Boolean createFolder(EDDataInfo edDataInfo)
@ -64,6 +54,17 @@ public class EDDataServiceImpl implements EDDataService {
return edDataPage;
}
/**
* 更新文件占用状态
* @param parames
* @return
*/
public Boolean updateFileStatus(EDDataParams parames)
{
edDataRepository.updateFileStatus(parames);
return Boolean.TRUE;
}
/**
* 上传
* @param parames

38
domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/user/model/Token.java Normal file
View File

@ -0,0 +1,38 @@
package com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model;
import cn.hutool.core.date.DateTime;
import lombok.Data;
@Data
public class Token {
/**
* 主键ID
*/
private Long id;
/**
* 用户编码
*/
private String userId;
/**
* 令牌
*/
private String token;
/**
* 是否是长期令牌
*/
private int isLongTerm;
/**
* 创建时间
*/
private DateTime createdAt;
/**
* 过期时间
*/
private DateTime expireAt;
}

3
domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/user/model/User.java
View File

@ -1,6 +1,5 @@
package com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model;
import cn.hutool.core.date.DateTime;
import lombok.Data;
import java.util.Date;
@ -51,7 +50,7 @@ public class User {
/**
* 入职日期
*/
private DateTime joinTime;
private Date joinTime;
/**
* 工作状态

22
domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/user/model/UserLoginInfo.java Normal file
View File

@ -0,0 +1,22 @@
package com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model;
import lombok.Data;
@Data
public class UserLoginInfo {
/**
* 工号
*/
private String workNumber;
/**
* 用户密码
*/
private String userPwd;
/**
* 令牌
*/
private String token;
}

13
domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/user/repository/TokenRepository.java Normal file
View File

@ -0,0 +1,13 @@
package com.electromagnetic.industry.software.data.manage.domain.boardservice.user.repository;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.Token;
public interface TokenRepository {
/**
* 令牌插入
* @param token
* @return
*/
int insert(Token token);
}

7
domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/user/repository/UserRepository.java
View File

@ -17,4 +17,11 @@ public interface UserRepository {
* @return
*/
int publish(User user);
/**
* 通过工号查询用户
* @param workNumber
* @return
*/
User selectUserByWorkNumber(String workNumber);
}

23
domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/user/service/TokenService.java Normal file
View File

@ -0,0 +1,23 @@
package com.electromagnetic.industry.software.data.manage.domain.boardservice.user.service;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.Token;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.User;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.UserLoginInfo;
public interface TokenService {
/**
* 创建令牌
* @param loginInfo
* @return 令牌
*/
public String createToken(UserLoginInfo loginInfo);
/**
* 创建用户令牌
* @param user
* @param tokenStr
* @return
*/
public Boolean createUserToken (User user, String tokenStr);
}

16
domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/user/service/UserService.java
View File

@ -1,6 +1,7 @@
package com.electromagnetic.industry.software.data.manage.domain.boardservice.user.service;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.User;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.UserLoginInfo;
public interface UserService {
@ -17,4 +18,19 @@ public interface UserService {
* @return
*/
Boolean publishUser(User user);
/**
* 通过工号查询用户
* @param workNumber
* @return
*/
User getUserByWorkNumber(String workNumber);
/**
* 比较密码是否相同
* @param user
* @param password
* @return
*/
Boolean matchPassword(User user, String password);
}

59
domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/user/service/impl/TokenServiceImpl.java Normal file
View File

@ -0,0 +1,59 @@
package com.electromagnetic.industry.software.data.manage.domain.boardservice.user.service.impl;
import cn.hutool.core.date.DateTime;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.Token;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.User;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.UserLoginInfo;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.repository.TokenRepository;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.service.TokenService;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.util.UserConstant;
import io.jsonwebtoken.Jwts;
import io.jsonwebtoken.SignatureAlgorithm;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
import static cn.hutool.core.date.SystemClock.now;
@Service
public class TokenServiceImpl implements TokenService {
@Resource
TokenRepository tokenRepository;
/**
* 创建令牌
* @param loginInfo
* @return 令牌
*/
@Override
public String createToken(UserLoginInfo loginInfo){
String token = UUID.randomUUID().toString();
loginInfo.setToken(token);
Map<String, Object> claims = new HashMap<>();
claims.put(UserConstant.LOGIN_USER_KEY, loginInfo);
Jwts.builder()
.addClaims(claims)
.signWith(SignatureAlgorithm.HS512, UserConstant.SECRET_KEY)
.compact();
return token;
}
/**
* 创建用户令牌
* @param user
* @param tokenStr
* @return
*/
@Override
public Boolean createUserToken (User user, String tokenStr){
Token token = new Token();
token.setUserId(user.getUserId());
token.setToken(tokenStr);
token.setExpireAt(new DateTime(now()+UserConstant.DEFAULT_EXPIRE_TIME));
return tokenRepository.insert(token)>0;
}
}

24
domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/user/service/impl/UserServiceImpl.java
View File

@ -3,7 +3,9 @@ package com.electromagnetic.industry.software.data.manage.domain.boardservice.us
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.User;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.repository.UserRepository;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.service.UserService;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.util.UserConstant;
import electromagnetic.data.framework.share.exception.LoggerConstant;
import electromagnetic.data.framework.share.util.SignUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
@ -28,6 +30,28 @@ public class UserServiceImpl implements UserService {
return userRepository.insert(user)>0;
}
/**
* 通过工号查询用户
* @param workNumber
* @return
*/
@Override
public User getUserByWorkNumber(String workNumber){
return userRepository.selectUserByWorkNumber(workNumber);
}
/**
* 比较密码是否相同
* @param user
* @param password
*/
@Override
public Boolean matchPassword(User user, String password){
String salt = user.getSalt();
String encodePwd = SignUtils.MD5(UserConstant.DEFAULT_PASSWORD+salt);
return user.getUserPwd().equals(encodePwd);
}
/**
* 用户发布
* @param user

15
domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/user/util/UserConstant.java
View File

@ -11,4 +11,19 @@ public class UserConstant {
* 默认发布状态(未发布)
*/
public static final int DEFAULT_PUBLISH_STATUS = 0;
/**
* 默认令牌过期时间（7天）
*/
public static final long DEFAULT_EXPIRE_TIME = 7*24*60*60*1000;
/**
* 令牌密钥
*/
public static final String SECRET_KEY = "5JKRGV0QO4WK1WCWVK55YEU0A1NPOXOP";
/**
* 令牌前缀
*/
public static final String LOGIN_USER_KEY = "login_user_key";
}

8
electromagnetic-framework/pom.xml
View File

@ -63,6 +63,14 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk16</artifactId>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
</dependency>
</dependencies>
</project>

3
electromagnetic-framework/src/main/java/electromagnetic/data/framework/share/config/DefaultValidationTool.java
View File

@ -10,18 +10,17 @@ import electromagnetic.data.framework.share.util.Functions;
import electromagnetic.data.framework.share.util.Results;
import electromagnetic.data.framework.share.validation.ValidationResult;
import electromagnetic.data.framework.share.validation.ValidationTool;
import electromagnetic.data.framework.share.util.*;
import org.hibernate.validator.HibernateValidator;
import org.hibernate.validator.HibernateValidatorConfiguration;
import org.springframework.beans.factory.InitializingBean;
import javax.validation.ConstraintViolation;
import javax.validation.Validation;
import javax.validation.Validator;
import javax.validation.ValidatorFactory;
import java.util.Set;
import java.util.function.BiFunction;
import java.util.function.Consumer;
import javax.validation.Validator;
/**
* 默认的验证工具实现，支持函数化的编程方式

2
electromagnetic-framework/src/main/java/electromagnetic/data/framework/share/config/ValidationToolAutoConfiguration.java
View File

@ -3,9 +3,9 @@
*/
package electromagnetic.data.framework.share.config;
import electromagnetic.data.framework.share.util.DefaultSimpleValidationTool;
import electromagnetic.data.framework.share.validation.SimpleValidationTool;
import electromagnetic.data.framework.share.validation.ValidationTool;
import electromagnetic.data.framework.share.util.DefaultSimpleValidationTool;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;

2
electromagnetic-framework/src/main/java/electromagnetic/data/framework/share/log/ServiceResultHandleUtil.java
View File

@ -8,11 +8,11 @@ import electromagnetic.data.framework.share.enums.ElectromagneticCommonErrorEnum
import electromagnetic.data.framework.share.enums.ElectromagneticSceneIncidentEnum;
import electromagnetic.data.framework.share.exception.BizRuntimeException;
import electromagnetic.data.framework.share.exception.ElectromagneticBizRuntimeException;
import electromagnetic.data.framework.share.exception.IllegalParameterException;
import electromagnetic.data.framework.share.model.ElectromagneticPaginationResult;
import electromagnetic.data.framework.share.model.ElectromagneticResult;
import electromagnetic.data.framework.share.model.PageModel;
import electromagnetic.data.framework.share.result.CallbackResult;
import electromagnetic.data.framework.share.exception.IllegalParameterException;
import javax.xml.bind.ValidationException;
import java.util.Optional;

5
electromagnetic-framework/src/main/java/electromagnetic/data/framework/share/model/BaseResult.java → electromagnetic-framework/src/main/java/electromagnetic/data/framework/share/result/BaseResult.java
View File

@ -1,7 +1,4 @@
package electromagnetic.data.framework.share.model;
import electromagnetic.data.framework.share.result.Message;
import electromagnetic.data.framework.share.result.Result;
package electromagnetic.data.framework.share.result;
import java.io.Serializable;

100
electromagnetic-framework/src/main/java/electromagnetic/data/framework/share/result/LoginResult.java Normal file
View File

@ -0,0 +1,100 @@
package electromagnetic.data.framework.share.result;
import java.io.Serializable;
public class LoginResult<T> implements Serializable{
private static final long serialVersionUID = 1L;
/**
* 请求成功还是失败
*/
private Boolean success;
/**
* 错误码
*/
private String errorCode;
/**
* 错误消息
*/
private String errorMessage;
/**
* 令牌
*/
private String token;
public LoginResult() {
}
public LoginResult(Boolean success, String errorCode, String errorMessage, String token) {
this.success = success;
this.errorCode = errorCode;
this.errorMessage = errorMessage;
this.token = token;
}
/**
* Getter method for property <tt>success</tt>.
*
* @return property value of success
*/
public Boolean getSuccess() {
return success;
}
/**
* Setter method for property <tt>success</tt>.
*
* @param success value to be assigned to property success
*/
public void setSuccess(Boolean success) {
this.success = success;
}
/**
* Getter method for property <tt>errorCode</tt>.
*
* @return property value of errorCode
*/
public String getErrorCode() {
return errorCode;
}
/**
* Setter method for property <tt>errorCode</tt>.
*
* @param errorCode value to be assigned to property errorCode
*/
public void setErrorCode(String errorCode) {
this.errorCode = errorCode;
}
/**
* Getter method for property <tt>errorMsg</tt>.
*
* @return property value of errorMsg
*/
public String getErrorMessage() {
return errorMessage;
}
/**
* Setter method for property <tt>errorMsg</tt>.
*
* @param errorMessage value to be assigned to property errorMsg
*/
public void setErrorMessage(String errorMessage) {
this.errorMessage = errorMessage;
}
public String getToken() {
return token;
}
public void setToken(String token) {
this.token = token;
}
}

29
electromagnetic-framework/src/main/java/electromagnetic/data/framework/share/sign/AESUtils.java
View File

@ -14,6 +14,9 @@ import java.io.UnsupportedEncodingException;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.apache.tomcat.util.codec.binary.Base64;
import java.security.Security;
/**
* <p>Description: [AES对称加密和解密]</p>
@ -117,6 +120,32 @@ public class AESUtils {
return null;
}
/**
* 前端使用ECB，后端解密方法
* @param enc
* @param key
* @return
*/
public static String decrypt(String enc, String key) {
try{
SecretKeySpec secretKeySpec = new SecretKeySpec(key.getBytes(), "AES");
Security.addProvider(new BouncyCastleProvider());
Cipher cipher = Cipher.getInstance("AES/ECB/PKCS7Padding");
cipher.init(Cipher.DECRYPT_MODE, secretKeySpec);
return cipher.doFinal(Base64.decodeBase64(enc)).toString();
} catch (NoSuchPaddingException e) {
throw new RuntimeException(e);
} catch (IllegalBlockSizeException e) {
throw new RuntimeException(e);
} catch (NoSuchAlgorithmException e) {
throw new RuntimeException(e);
} catch (BadPaddingException e) {
throw new RuntimeException(e);
} catch (InvalidKeyException e) {
throw new RuntimeException(e);
}
}
// public static void main(String[] args) {
// try {
//

4
electromagnetic-framework/src/main/java/electromagnetic/data/framework/share/model/BaseResultUtil.java → electromagnetic-framework/src/main/java/electromagnetic/data/framework/share/util/BaseResultUtil.java
View File

@ -1,12 +1,12 @@
package electromagnetic.data.framework.share.model;
package electromagnetic.data.framework.share.util;
import electromagnetic.data.framework.share.enums.ErrorEnum;
import electromagnetic.data.framework.share.result.BaseResult;
import electromagnetic.data.framework.share.result.CallbackResult;
/**
* 返回结果转换工具类
*
* @version $Id: DataCenterResultUtil.java, v 0.1 2021-01-11 16:57 Exp $$
*/
public class BaseResultUtil {

2
electromagnetic-framework/src/main/java/electromagnetic/data/framework/share/util/DefaultSimpleValidationTool.java
View File

@ -3,9 +3,9 @@
*/
package electromagnetic.data.framework.share.util;
import electromagnetic.data.framework.share.exception.IllegalParameterException;
import electromagnetic.data.framework.share.validation.SimpleValidationTool;
import electromagnetic.data.framework.share.validation.ValidationTool;
import electromagnetic.data.framework.share.exception.IllegalParameterException;
/**
* @author wsk

39
electromagnetic-framework/src/main/java/electromagnetic/data/framework/share/util/LoginResultUtil.java Normal file
View File

@ -0,0 +1,39 @@
package electromagnetic.data.framework.share.util;
import electromagnetic.data.framework.share.enums.ErrorEnum;
import electromagnetic.data.framework.share.result.CallbackResult;
import electromagnetic.data.framework.share.result.LoginResult;
public class LoginResultUtil {
public static <T> LoginResult<T> convertToResult(CallbackResult<T> callbackResult) {
LoginResult<T> LoginResult = new LoginResult<>();
LoginResult.setSuccess(callbackResult.isSuccess());
LoginResult.setErrorCode(callbackResult.getResultCode());
LoginResult.setErrorMessage(callbackResult.getResultMessage());
return LoginResult;
}
public static <T> LoginResult<T> success(String token){
LoginResult<T> LoginResult = new LoginResult<>();
LoginResult.setSuccess(true);
LoginResult.setToken(token);
return LoginResult;
}
public static <T> LoginResult<T> fail(String code , String msg){
LoginResult<T> LoginResult = new LoginResult<>();
LoginResult.setSuccess(false);
LoginResult.setErrorCode(code);
LoginResult.setErrorMessage(msg);
return LoginResult;
}
public static <T> LoginResult fail(ErrorEnum errorEnum){
LoginResult<T> LoginResult = new LoginResult<>();
LoginResult.setSuccess(false);
LoginResult.setErrorCode(errorEnum.getCode());
LoginResult.setErrorMessage(errorEnum.getErrorMessage());
return LoginResult;
}
}

2
electromagnetic-framework/src/main/java/electromagnetic/data/framework/share/validation/config/ElectromagneticValidationToolAutoConfiguration.java
View File

@ -4,10 +4,10 @@
package electromagnetic.data.framework.share.validation.config;
import electromagnetic.data.framework.share.validation.ValidationTool;
import electromagnetic.data.framework.share.config.DefaultValidationTool;
import electromagnetic.data.framework.share.config.ValidationToolAutoConfiguration;
import electromagnetic.data.framework.share.validation.ElectromagneticSimpleValidationTool;
import electromagnetic.data.framework.share.validation.ValidationTool;
import electromagnetic.data.framework.share.validation.impl.ElectromagneticSimpleValidationToolImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;

2
electromagnetic-framework/src/main/java/electromagnetic/data/framework/share/validation/impl/ElectromagneticSimpleValidationToolImpl.java
View File

@ -4,9 +4,9 @@
package electromagnetic.data.framework.share.validation.impl;
import electromagnetic.data.framework.share.validation.ValidationTool;
import electromagnetic.data.framework.share.exception.IllegalParameterException;
import electromagnetic.data.framework.share.validation.ElectromagneticSimpleValidationTool;
import electromagnetic.data.framework.share.validation.ValidationTool;
/**
*/

10
facade/src/main/java/com/electromagnetic/industry/software/data/manage/facade/EDDataFacade.java
View File

@ -4,9 +4,6 @@ import com.electromagnetic.industry.software.data.manage.request.indicator.EDDat
import com.electromagnetic.industry.software.data.manage.response.indicator.EDDataPageResponse;
import electromagnetic.data.framework.share.model.ElectromagneticResult;
import java.util.List;
import java.util.Map;
public interface EDDataFacade {
/**
@ -24,6 +21,13 @@ public interface EDDataFacade {
*/
ElectromagneticResult<EDDataPageResponse> getDataInfoList(EDDataRequest request);
/**
* 更新文件占用状态
* @param request
* @return
*/
ElectromagneticResult<Boolean> updateFileStatus(EDDataRequest request);
/**
* 上传
* @param request

3
facade/src/main/java/com/electromagnetic/industry/software/data/manage/facade/IndicatorCardFacade.java
View File

@ -4,12 +4,11 @@
package com.electromagnetic.industry.software.data.manage.facade;
import electromagnetic.data.framework.share.model.ElectromagneticResult;
import com.electromagnetic.industry.software.data.manage.request.indicator.IndicatorCardRequest;
import com.electromagnetic.industry.software.data.manage.request.indicator.IndicatorDataRequest;
import com.electromagnetic.industry.software.data.manage.response.indicator.IndicatorCardDetailReponse;
import com.electromagnetic.industry.software.data.manage.response.indicator.IndicatorCardPageResponse;
import electromagnetic.data.framework.share.model.ElectromagneticResult;
import java.util.List;
import java.util.Map;

11
facade/src/main/java/com/electromagnetic/industry/software/data/manage/facade/user/UserFacade.java
View File

@ -1,11 +1,20 @@
package com.electromagnetic.industry.software.data.manage.facade.user;
import com.electromagnetic.industry.software.data.manage.request.user.UserPublishRequest;
import com.electromagnetic.industry.software.data.manage.request.user.UserLoginRequest;
import com.electromagnetic.industry.software.data.manage.request.user.UserRequest;
import electromagnetic.data.framework.share.model.BaseResult;
import electromagnetic.data.framework.share.result.BaseResult;
import electromagnetic.data.framework.share.result.LoginResult;
public interface UserFacade {
/**
* 用户登录
* @param loginRequest
* @return
*/
LoginResult<?> login(UserLoginRequest loginRequest);
/**
* 新增用户信息
* @param userRequest

10
facade/src/main/java/com/electromagnetic/industry/software/data/manage/request/indicator/EDDataRequest.java
View File

@ -3,8 +3,6 @@ package com.electromagnetic.industry.software.data.manage.request.indicator;
import electromagnetic.data.framework.share.model.BaseRequest;
import lombok.Data;
import java.util.Date;
@Data
public class EDDataRequest extends BaseRequest {
@ -24,10 +22,6 @@ public class EDDataRequest extends BaseRequest {
* 文件夹名称
*/
private String name;
/**
* 文件夹名称
*/
private String fileName;
/**
* 关键词
*/
@ -36,4 +30,8 @@ public class EDDataRequest extends BaseRequest {
* 文件数据编码
*/
private String dataId;
/**
* 文件数据状态
*/
private String dataStatus;
}

20
facade/src/main/java/com/electromagnetic/industry/software/data/manage/request/user/UserLoginRequest.java Normal file
View File

@ -0,0 +1,20 @@
package com.electromagnetic.industry.software.data.manage.request.user;
import electromagnetic.data.framework.share.model.BaseRequest;
import lombok.Data;
import java.io.Serializable;
@Data
public class UserLoginRequest extends BaseRequest implements Serializable {
/**
* 工号
*/
private String workNumber;
/**
* 用户密码
*/
private String userPwd;
}

3
facade/src/main/java/com/electromagnetic/industry/software/data/manage/response/indicator/EDDataPageResponse.java
View File

@ -8,7 +8,6 @@ import com.github.pagehelper.PageInfo;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* @author
@ -20,5 +19,5 @@ public class EDDataPageResponse implements Serializable {
/**
* 指电磁数据-文件信息数据
*/
private PageInfo<EDDataResponse> edDataPage;
private PageInfo<EDDataResponse> edDataInfo;
}

1
infrastructure/common/src/main/java/com/electromagnetic/industry/software/data/manage/repository/ObMybatisConfig.java
View File

@ -11,7 +11,6 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.jdbc.DataSourceBuilder;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.io.Resource;
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
import org.springframework.jdbc.core.JdbcTemplate;

18
infrastructure/repository/src/main/java/com/electromagnetic/industry/software/data/manage/repository/dao/EDDataMapper.java
View File

@ -1,11 +1,7 @@
package com.electromagnetic.industry.software.data.manage.repository.dao;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.EDDataInfo;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCard;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCardExtend;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.EDDataParams;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.IndicatorCardParams;
import com.github.pagehelper.PageInfo;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@ -14,11 +10,11 @@ import java.util.List;
public interface EDDataMapper {
/**
* 创建文件夹
* 创建文件/文件夹数据信息
* @param edDataInfo
* @return
*/
Boolean createFolder(EDDataInfo edDataInfo);
Boolean createDataInfo(EDDataInfo edDataInfo);
/**
* 获取文件信息列表
@ -28,17 +24,11 @@ public interface EDDataMapper {
List<EDDataInfo> getDataInfoList(EDDataParams parames);
/**
* 上传
* 更新文件占用状态
* @param parames
* @return
*/
Boolean upload(EDDataParams parames);
Boolean updateFileStatus(EDDataParams parames);
/**
* 下载
* @param parames
* @return
*/
Boolean download(EDDataParams parames);
}

15
infrastructure/repository/src/main/java/com/electromagnetic/industry/software/data/manage/repository/dao/TokenMapper.java Normal file
View File

@ -0,0 +1,15 @@
package com.electromagnetic.industry.software.data.manage.repository.dao;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.Token;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface TokenMapper {
/**
* 插入
* @param token
* @return
*/
int insert(Token token);
}

7
infrastructure/repository/src/main/java/com/electromagnetic/industry/software/data/manage/repository/dao/UserMapper.java
View File

@ -18,4 +18,11 @@ public interface UserMapper {
* @return
*/
int publish(User user);
/**
* 通过工号查询用户
* @param workNumber
* @return
*/
User selectUserByWorkNumber(String workNumber);
}

25
infrastructure/repository/src/main/java/com/electromagnetic/industry/software/data/manage/repository/impl/EDDataRepositoryImpl.java
View File

@ -4,10 +4,7 @@
package com.electromagnetic.industry.software.data.manage.repository.impl;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.EDDataInfo;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCard;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCardExtend;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.EDDataParams;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.IndicatorCardParams;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.repository.EDDataRepository;
import com.electromagnetic.industry.software.data.manage.repository.dao.EDDataMapper;
import com.github.pagehelper.PageHelper;
@ -30,13 +27,13 @@ public class EDDataRepositoryImpl implements EDDataRepository {
/**
* 创建文件夹
*
* @param parames
* @param edDataInfo
* @return
*/
@Override
public Boolean createFolder(EDDataInfo edDataInfo)
{
return edDataMapper.createFolder(edDataInfo);
return edDataMapper.createDataInfo(edDataInfo);
}
/**
@ -52,6 +49,17 @@ public class EDDataRepositoryImpl implements EDDataRepository {
return new PageInfo<>(edDataInfoList);
}
/**
* 更新文件占用状态
* @param parames
* @return
*/
@Override
public Boolean updateFileStatus(EDDataParams parames)
{
return edDataMapper.updateFileStatus(parames);
}
/**
* 上传
* @param parames
@ -60,7 +68,9 @@ public class EDDataRepositoryImpl implements EDDataRepository {
@Override
public Boolean upload(EDDataParams parames)
{
return edDataMapper.upload(parames);
//return edDataMapper.upload(parames);
//edDataMapper.createDataInfo(edDataInfo);
return Boolean.TRUE;
}
/**
@ -71,7 +81,8 @@ public class EDDataRepositoryImpl implements EDDataRepository {
@Override
public Boolean download(EDDataParams parames)
{
return edDataMapper.download(parames);
//return edDataMapper.download(parames);
return Boolean.TRUE;
}

25
infrastructure/repository/src/main/java/com/electromagnetic/industry/software/data/manage/repository/impl/TokenRepositoryImpl.java Normal file
View File

@ -0,0 +1,25 @@
package com.electromagnetic.industry.software.data.manage.repository.impl;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.Token;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.repository.TokenRepository;
import com.electromagnetic.industry.software.data.manage.repository.dao.TokenMapper;
import org.springframework.stereotype.Repository;
import javax.annotation.Resource;
@Repository
public class TokenRepositoryImpl implements TokenRepository {
@Resource
TokenMapper tokenMapper;
/**
* 令牌插入
* @param token
* @return
*/
@Override
public int insert(Token token){
return tokenMapper.insert(token);
}
}

10
infrastructure/repository/src/main/java/com/electromagnetic/industry/software/data/manage/repository/impl/UserRepositoryImpl.java
View File

@ -37,4 +37,14 @@ public class UserRepositoryImpl implements UserRepository {
public int publish(User user) {
return userMapper.publish(user);
}
/**
* 通过工号查询用户
* @param workNumber
* @return
*/
@Override
public User selectUserByWorkNumber(String workNumber) {
return userMapper.selectUserByWorkNumber(workNumber);
}
}

83
infrastructure/repository/src/main/resources/sqlmapper/EdDataInfoMapper.xml Normal file
View File

@ -0,0 +1,83 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.electromagnetic.industry.software.data.manage.repository.dao.EDDataMapper">
<resultMap id="BaseResultMap" type="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.EDDataInfo">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="category_id" jdbcType="VARCHAR" property="categoryId" />
<result column="data_id" jdbcType="VARCHAR" property="dataId" />
<result column="data_no" jdbcType="VARCHAR" property="dataNo" />
<result column="data_name" jdbcType="VARCHAR" property="dataName" />
<result column="data_type" jdbcType="VARCHAR" property="dataType" />
<result column="version" jdbcType="VARCHAR" property="version" />
<result column="content" jdbcType="VARCHAR" property="content" />
<result column="implant_json" jdbcType="VARCHAR" property="implantJson" />
<result column="data_status" jdbcType="VARCHAR" property="dataStatus" />
<result column="creator" jdbcType="VARCHAR" property="creator" />
<result column="creator_name" jdbcType="VARCHAR" property="creatorName" />
<result column="gmt_create" jdbcType="TIMESTAMP" property="gmtCreate" />
<result column="modifier" jdbcType="VARCHAR" property="modifier" />
<result column="modifier_name" jdbcType="VARCHAR" property="modifierName" />
<result column="gmt_modified" jdbcType="TIMESTAMP" property="gmtModified" />
<result column="effect_flag" jdbcType="TINYINT" property="effectFlag" />
</resultMap>
<sql id="Base_Column_list">
id,category_id,data_id,data_no,data_name,data_type,file_type,version,content,
implant_json,data_status,creator,creator_name,gmt_create,modifier,modifier_name,
gmt_modified,effect_flag
</sql>
<insert id="createDataInfo" parameterType="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.EDDataInfo">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
SELECT LAST_INSERT_ID()
</selectKey>
insert into ed_data_info (id, category_id,
data_id, data_no, data_name,
data_type, file_type,
version,content, implant_json, data_status,
creator, creator_name, gmt_create,
modifier, modifier_name, gmt_modified,
effect_flag
)
values (#{id,jdbcType=VARCHAR}, #{categoryId,jdbcType=VARCHAR},
#{dataId,jdbcType=VARCHAR}, #{dataNo,jdbcType=VARCHAR}, #{dataName,jdbcType=VARCHAR},
#{dataType,jdbcType=VARCHAR}, #{fileType,jdbcType=VARCHAR},
#{version,jdbcType=VARCHAR},#{content,jdbcType=VARCHAR}, #{implantJson,jdbcType=VARCHAR}, #{dataStatus,jdbcType=VARCHAR},
#{creator,jdbcType=VARCHAR}, #{creatorName,jdbcType=VARCHAR}, now(), #{modifier,jdbcType=VARCHAR},
#{modifierName,jdbcType=VARCHAR},now(),1
)
</insert>
<select id="getDataInfoList" resultMap="BaseResultMap"
parameterType="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.EDDataParams">
SELECT
<include refid="Base_Column_list"/>
FROM
ed_data_info
where
effect_flag = 1
<if test="parentId!=null and parentId!=''">
and category_id='${parentId}'
</if>
<if test="keyWord!=null and keyWord!=''">
and data_name LIKE '%${keyWord}%'
</if>
GROUP BY id
order by gmt_modified asc
</select>
<update id="updateFileStatus" parameterType="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.EDDataParams">
update ed_data_info
<set>
<if test="dataStatus != null and dataStatus!=''">
data_status = #{dataStatus,jdbcType=VARCHAR},
</if>
gmt_modified = now()
</set>
where data_id = #{dataId,jdbcType=VARCHAR} and effect_flag = 1
</update>
</mapper>

56
infrastructure/repository/src/main/resources/sqlmapper/IndicatorCardMapper.xml
View File

@ -1,61 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.electromagnetic.industry.software.data.manage.repository.dao.EDDataMapper">
<insert id="createFolder" parameterType="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.EDDataInfo">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
SELECT LAST_INSERT_ID()
</selectKey>
insert into ed_data_info (id, category_id,
data_id, data_no, data_name,
data_type, file_type,
version,content, implant_json, data_status,
creator, creator_name, gmt_create,
modifier, modifier_name, gmt_modified,
effect_flag
)
values (#{id,jdbcType=VARCHAR}, #{categoryId,jdbcType=VARCHAR},
#{dataId,jdbcType=VARCHAR}, #{dataNo,jdbcType=VARCHAR}, #{dataName,jdbcType=VARCHAR},
#{dataType,jdbcType=VARCHAR}, #{fileType,jdbcType=VARCHAR},
#{version,jdbcType=VARCHAR},#{content,jdbcType=VARCHAR}, #{implantJson,jdbcType=VARCHAR}, #{dataStatus,jdbcType=VARCHAR},
#{creator,jdbcType=VARCHAR}, #{creatorName,jdbcType=VARCHAR}, now(), #{modifier,jdbcType=VARCHAR},
#{modifierName,jdbcType=VARCHAR},now(),1
)
</insert>
<select id="getDataInfoList" resultMap="EDDataMapper" parameterType="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.EDDataParams">
SELECT
data.id,
data.category_id,
data.data_id,
data.data_no,
data.data_name,
data.data_type,
data.file_type,
data.version,
data.content,
data.implant_json,
data.data_status,
data.creator, card.creator_name, card.gmt_create, card.modifier,
data.modifier_name,card.gmt_modified,card.effect_flag
FROM
ed_data_info data
<where>
data.effect_flag = 1
<if test="parentId!=null and parentId!=''">
and data.category_id='${parentId}'
</if>
<if test="keyWord!=null and keyWord!=''">
and data.data_name LIKE '%${keyWord}%'
</if>
</where>
GROUP BY data.id
order by data.gmt_modified asc
</select>
</mapper>
<!--
<mapper namespace="com.electromagnetic.industry.software.data.manage.repository.dao.IndicatorCardMapper">
<resultMap id="BaseResultMap" type="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCard">
<id column="id" jdbcType="BIGINT" property="id" />
@ -252,4 +197,3 @@
</foreach>
</update>
</mapper>
-->

29
infrastructure/repository/src/main/resources/sqlmapper/TokenMapper.xml Normal file
View File

@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.electromagnetic.industry.software.data.manage.repository.dao.TokenMapper">
<resultMap id="TokenResultMap" type="com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.Token">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="user_id" jdbcType="VARCHAR" property="userId" />
<result column="token" jdbcType="VARCHAR" property="token" />
<result column="is_long_term" jdbcType="TINYINT" property="isLongTerm" />
<result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
<result column="expire_at" jdbcType="TIMESTAMP" property="expireAt" />
</resultMap>
<insert id="insert" parameterType="com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.Token">
insert into tokens(
<if test="userId != null and userId !='' ">user_id,</if>
<if test="token != null and token !='' ">token,</if>
is_long_term,
created_at,
<if test="expireAt != null">expire_at</if>
)
values (
<if test="userId != null and userId !='' ">#{userId},</if>
<if test="token != null and token !='' ">#{token},</if>
0,
now(),
<if test="expireAt !=null">#{expireAt}</if>
)
</insert>
</mapper>

12
infrastructure/repository/src/main/resources/sqlmapper/UserMapper.xml
View File

@ -24,6 +24,13 @@
<result column="effect_flag" jdbcType="TINYINT" property="effectFlag" />
</resultMap>
<sql id="selectUserVo">
select user_id, user_name, work_number, mobile, user_dept, user_title, user_pwd,
join_time, is_published, salt, user_status, internship_end_date,
creator, creator_name, gmt_create, modifier, modifier_name, gmt_modified, effect_flag
from ed_users
</sql>
<insert id="insert" parameterType="com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.User">
insert into ed_users(
<if test="userId != null and userId !='' ">user_id,</if>
@ -69,4 +76,9 @@
</trim>
where user_id = #{userId}
</update>
<select id="selectUserByWorkNumber" parameterType="String" resultMap="UserResultMap">
<include refid="selectUserVo" />
where work_number = #{workNumber}
</select>
</mapper>

12
pom.xml
View File

@ -40,6 +40,7 @@
<validation.version>2.0.1.Final</validation.version>
<hibernate.validator.version>6.0.18.Final</hibernate.validator.version>
<framework.version>1.0.2.1-SNAPSHOT</framework.version>
<jwt.version>0.9.0</jwt.version>
</properties>
<modules>
@ -239,6 +240,17 @@
<artifactId>hibernate-validator</artifactId>
<version>${hibernate.validator.version}</version>
</dependency>
<!--Token生成与解析-->
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId>
<version>${jwt.version}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk16</artifactId>
<version>1.46</version>
</dependency>
</dependencies>
</dependencyManagement>

6
service/pom.xml
View File

@ -41,6 +41,10 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk16</artifactId>
<version>1.46</version>
</dependency>
</dependencies>
</project>

35
service/src/main/java/com/electromagnetic/industry/software/data/manage/service/facade/EDDataFacadeImpl.java
View File

@ -8,10 +8,9 @@ import com.electromagnetic.industry.software.data.manage.facade.EDDataFacade;
import com.electromagnetic.industry.software.data.manage.request.indicator.EDDataRequest;
import com.electromagnetic.industry.software.data.manage.response.indicator.EDDataPageResponse;
import com.electromagnetic.industry.software.data.manage.service.mappers.EDDataMappers;
import com.electromagnetic.industry.software.data.manage.service.mappers.IndicatorCardMappers;
import electromagnetic.data.framework.share.id.IdWorker;
import electromagnetic.data.framework.share.model.ElectromagneticResult;
import electromagnetic.data.framework.share.model.ElectromagneticResultUtil;
import electromagnetic.data.framework.share.id.IdWorker;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@ -22,24 +21,6 @@ public class EDDataFacadeImpl implements EDDataFacade {
@Resource
private EDDataService edDataService;
///**
// * 获取用户列表
// * WISDOM_INDICATORCARDLISTCONFIG
// * /platform/api/dataplatform/wisdomdecision/indicator/card/getIndicatorCardListConfig
// * @param request
// * @return
// */
//@Override
//public ElectromagneticResult<UserPageResponse> getUserList(UserRequest request) {
// UserParams parames= UserMappers.INSTANCE.getUserParames(request);
// //获取中支指标配置列表
// UserPage userExtends = userService.getUserList(parames);
// //模型转换
// UserPageResponse userPageResponse = UserMappers.INSTANCE.getUserToModel(userExtends);
// return ElectromagneticResultUtil.success(userPageResponse);
//}
/**
* 创建文件夹
* WISDOM_CREATE_FOLDER
@ -88,6 +69,20 @@ public class EDDataFacadeImpl implements EDDataFacade {
return ElectromagneticResultUtil.success(edDataPageResponse);
}
/**
* 更新文件占用状态
* WISDOM_UPDATE_FILESTATUS
* /data/ed/file/updateFileStatus
* @param request
* @return
*/
public ElectromagneticResult<Boolean> updateFileStatus(EDDataRequest request)
{
EDDataParams parames= EDDataMappers.INSTANCE.getEDDataParames(request);
edDataService.updateFileStatus(parames);
return ElectromagneticResultUtil.success(Boolean.TRUE);
}
/**
* 上传
* WISDOM_UPLOAD

2
service/src/main/java/com/electromagnetic/industry/software/data/manage/service/facade/IndicatorCardFacadeImpl.java
View File

@ -3,13 +3,13 @@
*/
package com.electromagnetic.industry.software.data.manage.service.facade;
import com.electromagnetic.industry.software.data.manage.facade.IndicatorCardFacade;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.Indicator;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCard;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCardDetial;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCardPage;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.IndicatorCardParams;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.service.IndicatorCardService;
import com.electromagnetic.industry.software.data.manage.facade.IndicatorCardFacade;
import com.electromagnetic.industry.software.data.manage.request.indicator.IndicatorCardRequest;
import com.electromagnetic.industry.software.data.manage.request.indicator.IndicatorDataRequest;
import com.electromagnetic.industry.software.data.manage.response.indicator.IndicatorCardDetailReponse;

35
service/src/main/java/com/electromagnetic/industry/software/data/manage/service/facade/user/UserFacadeImpl.java
View File

@ -1,15 +1,23 @@
package com.electromagnetic.industry.software.data.manage.service.facade.user;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.User;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.UserLoginInfo;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.service.TokenService;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.service.UserService;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.util.UserConstant;
import com.electromagnetic.industry.software.data.manage.facade.user.UserFacade;
import com.electromagnetic.industry.software.data.manage.request.user.UserPublishRequest;
import com.electromagnetic.industry.software.data.manage.request.user.UserLoginRequest;
import com.electromagnetic.industry.software.data.manage.request.user.UserRequest;
import com.electromagnetic.industry.software.data.manage.service.mappers.UserMappers;
import electromagnetic.data.framework.share.id.IdWorker;
import electromagnetic.data.framework.share.model.BaseResult;
import electromagnetic.data.framework.share.model.BaseResultUtil;
import electromagnetic.data.framework.share.result.BaseResult;
import electromagnetic.data.framework.share.result.LoginResult;
import electromagnetic.data.framework.share.sign.AESUtils;
import electromagnetic.data.framework.share.util.BaseResultUtil;
import electromagnetic.data.framework.share.util.LoginResultUtil;
import electromagnetic.data.framework.share.util.SignUtils;
import org.apache.commons.lang3.RandomStringUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@ -19,6 +27,26 @@ public class UserFacadeImpl implements UserFacade {
@Resource
private UserService userService;
@Resource
private TokenService tokenService;
/**
* 用户登录
* @param loginRequest
* @return
*/
@Override
public LoginResult<Boolean> login(UserLoginRequest loginRequest) {
UserLoginInfo info = UserMappers.INSTANCE.getUserLoginRequestToModel(loginRequest);
String decodePwd = AESUtils.decrypt(info.getUserPwd(), UserConstant.SECRET_KEY);
User user = userService.getUserByWorkNumber(info.getWorkNumber());
if (user==null || userService.matchPassword(user, decodePwd)) {
String tokenStr = tokenService.createToken(info);
tokenService.createUserToken(user, tokenStr);
return LoginResultUtil.success(tokenStr);
}
return LoginResultUtil.fail("500","用户不存在/密码错误");
}
/**
* 新增用户信息
@ -28,8 +56,9 @@ public class UserFacadeImpl implements UserFacade {
@Override
public BaseResult<Boolean> createUser(UserRequest userRequest){
User user = UserMappers.INSTANCE.getUserRequestToModel(userRequest);
user.setSalt(RandomStringUtils.randomAlphanumeric(16));
user.setUserId(IdWorker.getSnowFlakeIdString());
user.setUserPwd(UserConstant.DEFAULT_PASSWORD);
user.setUserPwd(SignUtils.MD5(UserConstant.DEFAULT_PASSWORD+user.getSalt()));
user.setIsPublished(UserConstant.DEFAULT_PUBLISH_STATUS);
return BaseResultUtil.success(userService.createUser(user));
}

8
service/src/main/java/com/electromagnetic/industry/software/data/manage/service/mappers/UserMappers.java
View File

@ -5,6 +5,8 @@ package com.electromagnetic.industry.software.data.manage.service.mappers;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.User;
import com.electromagnetic.industry.software.data.manage.request.user.UserPublishRequest;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.UserLoginInfo;
import com.electromagnetic.industry.software.data.manage.request.user.UserLoginRequest;
import com.electromagnetic.industry.software.data.manage.request.user.UserRequest;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
@ -33,4 +35,10 @@ public interface UserMappers {
* @return
*/
User getUserPublishRequestToModel(UserPublishRequest userPublishRequest);
/**
* 用户登录Request转用户登录模型
* @param loginRequest
* @return
*/
UserLoginInfo getUserLoginRequestToModel(UserLoginRequest loginRequest);
}