DZ/faw-report-library-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改以前的垃圾代码

Browse Source
This commit is contained in:
xuetao.li
2023-04-18 15:46:20 +08:00
parent e796a0000e
commit 4ce40d9553
528 changed files with 35 additions and 113978 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-sys/src/main/java/com/adc/da/sys/constant/SysConstants.java
+10
View File
@@ -0,0 +1,10 @@
package com.adc.da.sys.constant;
/**
* sys模块的常规变量
*/
public class SysConstants {
public static final String DEFAULT_PASSWORD = "catarc2013";
}
adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java
+2 -14
View File
@@ -5,6 +5,7 @@ import com.adc.da.excel.poi.excel.ExcelImportUtil;
import com.adc.da.excel.poi.excel.entity.ImportParams;
import com.adc.da.excel.poi.excel.entity.result.ExcelImportResult;
import com.adc.da.excel.poi.excel.entity.result.ExcelVerifyHanlderErrorResult;
import com.adc.da.sys.constant.SysConstants;
import com.adc.da.sys.entity.UserEO;
import com.adc.da.sys.service.iservice.IUserEoService;
import com.adc.da.sys.util.EncryptUtil;
@@ -74,7 +75,7 @@ public class UserEOController extends BaseController<UserEO> {
JsonElement element = parser.parse(data);
UserEO eo = gson.fromJson(element, UserEO.class);
eo.setPassword("catarc2013");
eo.setPassword(SysConstants.DEFAULT_PASSWORD);
if (StringUtils.isBlank(eo.getAccount())) {
return Result.error("用户名不能为空！");
}
@@ -110,12 +111,6 @@ public class UserEOController extends BaseController<UserEO> {
return Result.error("手机号不符合规则！");
}
}
//部门 非必填 <=20字符
if (StringUtils.isNotBlank(eo.getDepartment())) {
if (eo.getDepartment().length() > 50) {
return Result.error("部门不超过50字符！");
}
}
if (eo.getEmail() != null) {
eo.setEmail(eo.getEmail().replace("amp;", ""));
@@ -133,13 +128,6 @@ public class UserEOController extends BaseController<UserEO> {
return Result.success();
}
@ApiOperation("用户启用或禁用")
@PostMapping("/isUse/{usid}/{type}")
public ResponseMessage isUse(@PathVariable("usid") String usid, @PathVariable("type") String type) {
userEOService.setIsUse(usid, type);
return Result.success();
}
@ApiOperation("获取所有用户")
@GetMapping("/list")
public ResponseMessage list(int pageNo, int pageSize, String account, String roleName) {
adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java
-9
View File
@@ -58,7 +58,6 @@ public class UserEO extends BaseEntity implements Serializable {
/**
* 密码
*/
@TableField("PASSWORD")
private String password;
@@ -99,14 +98,6 @@ public class UserEO extends BaseEntity implements Serializable {
private String updateTime;
@TableField("ISUSE")
private String isUse;
@TableField("DEPARTMENT")
private String department;
@TableField("USNAME")
private String usname;
adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java
+8 -11
View File
@@ -3,6 +3,7 @@ package com.adc.da.sys.service;
import java.text.SimpleDateFormat;
import java.util.*;
import com.adc.da.sys.constant.SysConstants;
import com.adc.da.sys.constant.UserBelongEnum;
import com.adc.da.sys.dao.mysql.UserRoleEODao;
import com.adc.da.sys.entity.RoleEO;
@@ -81,7 +82,6 @@ public class UserEOServiceImpl implements IUserEoService {
eo.setUpdateTime(format.format(new Date()));
eo.setPassword(EncryptUtil.encrypt(eo.getPassword()));
eo.setCellPhoneNumber(EncryptUtil.encrypt(eo.getCellPhoneNumber()));
eo.setIsUse("1");
/**
* 区分本系统自建用户和同步过来的用户
* 1代表本系统自建用户
@@ -95,7 +95,6 @@ public class UserEOServiceImpl implements IUserEoService {
userEO.setUsname(eo.getUsname());
userEO.setCellPhoneNumber(EncryptUtil.encrypt(eo.getCellPhoneNumber()));
userEO.setEmail(EncryptUtil.encrypt(eo.getEmail()));
userEO.setDepartment(eo.getDepartment());
userEO.setPassword(StringUtils.isEmpty(eo.getPassword()) ? userEO.getPassword() : EncryptUtil.encrypt(eo.getPassword()));
userEO.setUpdateTime(format.format(new Date()));
userEO.setAccount(eo.getAccount());
@@ -121,12 +120,12 @@ public class UserEOServiceImpl implements IUserEoService {
}
@Override
public void setIsUse(String usid, String type) {
UserEO userEO = dao.selectById(usid);
userEO.setIsUse(type);
dao.updateById(userEO);
}
// @Override
// public void setIsUse(String usid, String type) {
// UserEO userEO = dao.selectById(usid);
// userEO.setIsUse(type);
// dao.updateById(userEO);
// }
@Override
public UserEO getUserById(String usid) {
@@ -210,7 +209,7 @@ public class UserEOServiceImpl implements IUserEoService {
userEO.setIsSelf(UserBelongEnum.LOCAL.getValue());
userEO.setUsid(com.adc.da.util.utils.UUID.randomUUID10());
userEO.setCellPhoneNumber(userImportVO.getCellPhoneNumber() == null ? EncryptUtil.encrypt("") : EncryptUtil.encrypt(userImportVO.getCellPhoneNumber()));
userEO.setPassword(EncryptUtil.encrypt("catarc2013"));
userEO.setPassword(EncryptUtil.encrypt(SysConstants.DEFAULT_PASSWORD));
userEO.setEmail(userImportVO.getEmail() == null ? EncryptUtil.encrypt("") : EncryptUtil.encrypt(userImportVO.getEmail()));
userEO.setCreateTime(simpleDateFormat.format(date));
userEO.setUpdateTime(simpleDateFormat.format(date));
@@ -244,8 +243,6 @@ public class UserEOServiceImpl implements IUserEoService {
userEO.setUsname(userImportVO.getUsname());
userEO.setCellPhoneNumber(userImportVO.getCellPhoneNumber() == null ? EncryptUtil.encrypt("") : EncryptUtil.encrypt(userImportVO.getCellPhoneNumber()));
userEO.setEmail(userImportVO.getEmail() == null ? EncryptUtil.encrypt("") : EncryptUtil.encrypt(userImportVO.getEmail()));
userEO.setDepartment(userImportVO.getDepartment());
userEO.setIsUse(userImportVO.getIsUse());
userEO.setUpdateTime(simpleDateFormat.format(date));
dao.updateById(userEO);
userIDList.add(userEO.getUsid());
adc-da-sys/src/main/java/com/adc/da/sys/service/iservice/IUserEoService.java
+1 -1
View File
@@ -28,7 +28,7 @@ public interface IUserEoService {
*/
void save(UserEO eo);
void setIsUse(String usid,String type);
// void setIsUse(String usid,String type);
UserEO getUserById(String usid);
adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml
+5 -7
View File
@@ -3,7 +3,7 @@
<mapper namespace="com.adc.da.sys.dao.mysql.UserEODao">
<select id="list" parameterType="string" resultType="map">
select * from(select t1.USID,t1.ACCOUNT,t1.USNAME,t1.CELLPHONE_NUMBER,t1.EMAIL,t1.ISUSE,t1.DEPARTMENT,t3.NAME ROLENAME,t3.id ROLEID,
select * from(select t1.USID,t1.ACCOUNT,t1.USNAME,t1.CELLPHONE_NUMBER,t1.EMAIL,t3.NAME ROLENAME,t3.id ROLEID,
date_format(t1.UPDATE_TIME,'%Y-%m-%d %H:%i:%S')CREATEDATE from TS_USER t1
left join TR_USER_ROLE t2 on t1.USID=t2.USER_ID
left JOIN TS_ROLE t3 on t2.ROLE_ID=t3.ID
@@ -44,9 +44,7 @@
</resultMap>
<resultMap id="UserRoleMap" extends="BaseResultMap" type="com.adc.da.sys.entity.UserEO">
<result column="department" property="department"></result>
<result column="usname" property="usname"></result>
<result column="isuse" property="isUse"></result>
<collection property = "roleIdList" ofType="string">
<id column="id" />
</collection>
@@ -89,19 +87,19 @@
<select id="getUserEOByAccountNotDeleted" resultMap="BaseResultMap" parameterType="java.lang.String">
select
<include refid="Base_Column_List"/>
from TS_USER where account = #{account} and del_flag != 1 and isuse=1
from TS_USER where account = #{account} and del_flag != 1
</select>
<insert id="insertUserBatch" parameterType="list">
insert into TS_USER(USID,ACCOUNT,DEL_FLAG,PASSWORD,USNAME,CELLPHONE_NUMBER,EMAIL,CREATE_TIME,UPDATE_TIME,ISUSE,DEPARTMENT,ISSELF) values
insert into TS_USER(USID,ACCOUNT,DEL_FLAG,PASSWORD,USNAME,CELLPHONE_NUMBER,EMAIL,CREATE_TIME,UPDATE_TIME,ISSELF) values
<foreach collection="userEOList" item="user" separator=",">
(#{user.usid},#{user.account},#{user.delFlag},#{user.password},#{user.usname},#{user.cellPhoneNumber},#{user.email},#{user.createTime},#{user.updateTime},#{user.isUse},#{user.department},#{user.isSelf})
(#{user.usid},#{user.account},#{user.delFlag},#{user.password},#{user.usname},#{user.cellPhoneNumber},#{user.email},#{user.createTime},#{user.updateTime},#{user.isSelf})
</foreach>
</insert>
<select id="allList" resultType="java.util.Map">
select * from(select t1.USID,t1.ACCOUNT,t1.USNAME,t1.CELLPHONE_NUMBER,t1.EMAIL,t1.ISUSE,t1.DEPARTMENT,t3.NAME ROLENAME,t3.id ROLEID,
select * from(select t1.USID,t1.ACCOUNT,t1.USNAME,t1.CELLPHONE_NUMBER,t1.EMAIL,t3.NAME ROLENAME,t3.id ROLEID,
date_format(t1.UPDATE_TIME,'%Y-%m-%d %H:%i:%S')CREATEDATE from TS_USER t1
left join TR_USER_ROLE t2 on t1.USID=t2.USER_ID
left JOIN TS_ROLE t3 on t2.ROLE_ID=t3.ID