Skip to content

C
chnmuseum-party
Commit 206ccdd9 authored by wzp's avatar wzp
Browse files
Options

修改用户管理

parent 730274bc
Hide whitespace changes
Inline Side-by-side
Showing with 247 additions and 40 deletions
src/main/java/cn/wisenergy/chnmuseum/party/mapper/TBoxOperationMapper.java
View file @ 206ccdd9
package cn.wisenergy.chnmuseum.party.mapper;
import cn.wisenergy.chnmuseum.party.model.TUser;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import cn.wisenergy.chnmuseum.party.model.TBoxOperation;
import org.apache.ibatis.annotations.Param;
import java.util.List;
......@@ -16,4 +18,6 @@ import java.util.List;
public interface TBoxOperationMapper extends BaseMapper<TBoxOperation> {
List<TBoxOperation> getList();
List<TBoxOperation> selectBoxPage(@Param("user") TUser user);
}
src/main/java/cn/wisenergy/chnmuseum/party/mapper/TUserMapper.java
View file @ 206ccdd9
......@@ -2,6 +2,7 @@ package cn.wisenergy.chnmuseum.party.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import cn.wisenergy.chnmuseum.party.model.TUser;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import java.util.List;
......@@ -21,4 +22,6 @@ public interface TUserMapper extends BaseMapper<TUser> {
List<TUser> getList(String userName);
TUser getById(String id);
List<TUser> selectBoxPage(TUser user);
}
src/main/java/cn/wisenergy/chnmuseum/party/model/TBoxOperation.java
View file @ 206ccdd9
......@@ -77,5 +77,9 @@ public class TBoxOperation implements Serializable {
@TableField(exist = false)
private String organName;
@ApiModelProperty("区域名")
@TableField(exist = false)
private String areaName;
}
src/main/java/cn/wisenergy/chnmuseum/party/model/TOrgan.java
View file @ 206ccdd9
......@@ -43,10 +43,10 @@ import com.baomidou.mybatisplus.annotation.TableField;
@ApiModel(value = "用户", description = "用户")
public class TOrgan implements Serializable {
private static final long serialVersionUID = 1L;
// private static final long serialVersionUID = 1L;
@ApiModelProperty("机构ID")
@TableId(value = "id", type = IdType.ASSIGN_ID)
@TableId(value = "id")
@NotNull(message = "机构IDID不能为空", groups = {Update.class})
private String id;
......
src/main/java/cn/wisenergy/chnmuseum/party/model/TUser.java
View file @ 206ccdd9
......@@ -57,16 +57,16 @@ public class TUser implements Serializable {
private String userName;
@TableField("password_hash")
@NotNull(message = "不能为空", groups = {Add.class, Update.class})
@NotNull(message = "不能为空", groups = {Add.class})
private byte[] passwordHash;
@TableField("password_salt")
@NotNull(message = "不能为空", groups = {Add.class, Update.class})
@NotNull(message = "不能为空", groups = {Add.class})
private byte[] passwordSalt;
@ApiModelProperty("创建时间")
@TableField(value = "create_time", fill = FieldFill.INSERT)
@NotNull(message = "创建时间不能为空", groups = {Add.class, Update.class})
@NotNull(message = "创建时间不能为空", groups = {Add.class})
private LocalDateTime createTime;
@ApiModelProperty("修改时间")
......
src/main/java/cn/wisenergy/chnmuseum/party/service/TBoxOperationService.java
View file @ 206ccdd9
package cn.wisenergy.chnmuseum.party.service;
import cn.wisenergy.chnmuseum.party.model.TBoxOperation;
import cn.wisenergy.chnmuseum.party.model.TUser;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
......@@ -16,4 +18,6 @@ import java.util.List;
public interface TBoxOperationService extends IService<TBoxOperation> {
List<TBoxOperation> getList();
Page<TBoxOperation> selectBoxPage(Page<TBoxOperation> page, TUser user);
}
src/main/java/cn/wisenergy/chnmuseum/party/service/impl/TBoxOperationServiceImpl.java
View file @ 206ccdd9
......@@ -2,7 +2,9 @@ package cn.wisenergy.chnmuseum.party.service.impl;
import cn.wisenergy.chnmuseum.party.model.TBoxOperation;
import cn.wisenergy.chnmuseum.party.mapper.TBoxOperationMapper;
import cn.wisenergy.chnmuseum.party.model.TUser;
import cn.wisenergy.chnmuseum.party.service.TBoxOperationService;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
......@@ -31,4 +33,9 @@ public class TBoxOperationServiceImpl extends ServiceImpl<TBoxOperationMapper, T
public List<TBoxOperation> getList() {
return tBoxOperationMapper.getList();
}
@Override
public Page<TBoxOperation> selectBoxPage(Page<TBoxOperation> page, TUser user) {
return page.setRecords(tBoxOperationMapper.selectBoxPage(user));
}
}
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/ChinaMobileRestApiController.java
View file @ 206ccdd9
......@@ -5,19 +5,14 @@ import cn.wisenergy.chnmuseum.party.auth.util.JwtTokenUtil;
import cn.wisenergy.chnmuseum.party.common.enums.LanguageEnum;
import cn.wisenergy.chnmuseum.party.common.util.TimeUtils;
import cn.wisenergy.chnmuseum.party.common.vo.GenericPageParam;
import cn.wisenergy.chnmuseum.party.model.Employee;
import cn.wisenergy.chnmuseum.party.model.ExhibitionBoard;
import cn.wisenergy.chnmuseum.party.model.RunLog;
import cn.wisenergy.chnmuseum.party.model.TUser;
import cn.wisenergy.chnmuseum.party.model.*;
import cn.wisenergy.chnmuseum.party.service.ExhibitionBoardService;
import cn.wisenergy.chnmuseum.party.service.RunLogService;
import cn.wisenergy.chnmuseum.party.service.impl.EmployeeServiceImpl;
import cn.wisenergy.chnmuseum.party.service.impl.RunLogServiceImpl;
import cn.wisenergy.chnmuseum.party.service.impl.TAreaServiceImpl;
import cn.wisenergy.chnmuseum.party.service.impl.TUserServiceImpl;
import cn.wisenergy.chnmuseum.party.service.impl.*;
import cn.wisenergy.chnmuseum.party.web.controller.base.BaseController;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
......@@ -68,6 +63,9 @@ public class ChinaMobileRestApiController extends BaseController {
@Resource
private TAreaServiceImpl areaService;
@Resource
private TBoxOperationServiceImpl boxOperationService;
@Resource
private ExhibitionBoardService exhibitionBoardService;
......@@ -206,7 +204,17 @@ public class ChinaMobileRestApiController extends BaseController {
resultMap.put("message", "用户名或密码不正确！");
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
}
TBoxOperation operation = boxOperationService.getOne(new UpdateWrapper<TBoxOperation>().eq("organ_id", user.getOrgId()));
if (operation==null||"".equals(operation.getMac())){
resultMap.put("status", 500);
resultMap.put("message", "用户未激活！");
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
}
if (!mac.equals(operation.getMac())){
resultMap.put("status", 500);
resultMap.put("message", "mac地址不正确！");
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
}
if ("2".equals(user.getStatus())) {
throw new DisabledAccountException("此帐号已禁用，请联系管理员！");
}
......@@ -243,7 +251,7 @@ public class ChinaMobileRestApiController extends BaseController {
jsonObject.put("orgName", user.getOrgName());
resultMap.put("resultCode", 200);
resultMap.put("message", "成功");
resultMap.put("message", "登录成功");
resultMap.put("data", jsonObject);
return ResponseEntity.status(HttpStatus.OK).body(resultMap);
} catch (Exception e) {
......
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TBoxOperationController.java
View file @ 206ccdd9
......@@ -54,6 +54,29 @@ public class TBoxOperationController extends BaseController {
@Resource
private TUserServiceImpl userService;
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "_index", value = "分页起始偏移量", paramType = "query", dataType = "Integer"),
@ApiImplicitParam(name = "_size", value = "返回条数", paramType = "query", dataType = "Integer"),
@ApiImplicitParam(name = "organId", value = "所属单位", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "status", value = "状态 1.未激活 2.已激活 3.故障", paramType = "query", dataType = "Integer"),
@ApiImplicitParam(name = "areaId", value = "区域", paramType = "query", dataType = "String")
})
@PostMapping("/selectPageList")
@RequiresPermissions("/boxOperation/selectPageList")
@ApiOperation(value = "获取机顶盒基础信息分页列表", notes = "获取机顶盒基础信息分页列表")
public Map<String, Object> selectPageList(String organId,String areaId) {
TUser user = new TUser();
if (StringUtils.isNotBlank(organId)) {
user.setOrgId(organId);
}
if (StringUtils.isNotBlank(areaId)) {
user.setAreaId(areaId);
}
Page<TBoxOperation> page = tBoxOperationService.selectBoxPage(getPage(), user);
return getResult(page);
}
@PostMapping("/add")
@RequiresPermissions("/boxOperation/add")
@ApiOperation(value = "添加机顶盒运维信息", notes = "添加机顶盒运维信息")
......
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TOrganController.java
View file @ 206ccdd9
......@@ -74,6 +74,7 @@ public class TOrganController extends BaseController {
organ.setUpdateTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis()));
String organCode = getOrganCode(organ.getParentId());
organ.setCode(organCode);
organ.setId(organCode);
// 保存业务节点信息
boolean result = tOrganService.save(organ);
// 返回操作结果
......@@ -140,7 +141,7 @@ public class TOrganController extends BaseController {
} catch (Exception e) {
e.printStackTrace();
}
List<TOrgan> tOrganList = tOrganService.list(Wrappers.<TOrgan>lambdaQuery().eq(TOrgan::getIsDeleted, 0).likeRight(TOrgan::getCode,user.getOrgCode()).orderByDesc(TOrgan::getCreateTime));
List<TOrgan> tOrganList = tOrganService.list(Wrappers.<TOrgan>lambdaQuery().eq(TOrgan::getIsDeleted, 0).likeRight(TOrgan::getId,user.getOrgId()).orderByDesc(TOrgan::getCreateTime));
return getResult(tOrganList);
}
......@@ -237,6 +238,11 @@ public class TOrganController extends BaseController {
private String getOrganCode(String parentId) {
TOrgan max = tOrganService.selectCodeMax(parentId);
if (max==null){
max = tOrganService.getById(parentId);
String s = max.getCode() + "001";
return s;
}
String s = max.getCode().substring(max.getCode().length() - 3);
String s1 = max.getCode().substring(0,max.getCode().length() - 3);
Integer integer = Integer.valueOf(s)+1;
......
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TUserController.java
View file @ 206ccdd9
......@@ -162,13 +162,6 @@ public class TUserController extends BaseController {
} else {
user.setPassword(StringUtils.trimToNull(user.getPassword()));
}
if (StringUtils.isBlank(user.getRealName())) {
resultMap.put("resultCode", 400);
resultMap.put("message", "姓名不能为空！");
return resultMap;
} else {
user.setRealName(StringUtils.trimToNull(user.getRealName()));
}
if (user.getRoleList() == null || user.getRoleList().size() < 1) {
resultMap.put("resultCode", 400);
......@@ -240,7 +233,7 @@ public class TUserController extends BaseController {
// 编辑用户信息
@OperationLog("修改成员信息")
@ApiOperation(value = "编辑用户信息(必须传 1username 2name 3roleId)")
@ApiOperation(value = "编辑用户信息")
@PutMapping(value = "/update")
@RequiresPermissions("/user/update")
@MethodLog(operModule = OperModule.USER, operType = OperType.UPDATE)
......@@ -255,9 +248,9 @@ public class TUserController extends BaseController {
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
}
user.setUserName(StringUtils.trimToNull(user.getUserName()));
user.setPassword(StringUtils.trimToNull(user.getPassword()));
user.setRealName(StringUtils.trimToNull(user.getRealName()));
// user.setUserName(StringUtils.trimToNull(user.getUserName()));
// user.setPassword(StringUtils.trimToNull(user.getPassword()));
// user.setRealName(StringUtils.trimToNull(user.getRealName()));
user.setUpdateTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis()));
ret = userService.updateById(user);
//查询当前用户拥有的角色
......@@ -293,9 +286,9 @@ public class TUserController extends BaseController {
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
}
// 204
resultMap.put("resultCode", 201);
resultMap.put("resultCode", 200);
resultMap.put("message", "更新成功");
return ResponseEntity.status(HttpStatus.CREATED).body(resultMap);
return ResponseEntity.ok(resultMap);
} catch (Exception e) {
logger.error("更新错误!", e);
}
......@@ -339,7 +332,7 @@ public class TUserController extends BaseController {
}
resultMap.put("resultCode", 201);
resultMap.put("message", "删除成功");
return ResponseEntity.status(HttpStatus.CREATED).body(resultMap);
return ResponseEntity.ok(resultMap);
} catch (Exception e) {
logger.error("删除用户出错!", e);
}
......@@ -381,9 +374,9 @@ public class TUserController extends BaseController {
resultMap.put("message", "禁用失败");
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
}
resultMap.put("resultCode", 201);
resultMap.put("resultCode", 200);
resultMap.put("message", "禁用成功");
return ResponseEntity.status(HttpStatus.CREATED).body(resultMap);
return ResponseEntity.ok(resultMap);
} catch (Exception e) {
logger.error("禁用用户出错!", e);
}
......@@ -407,13 +400,13 @@ public class TUserController extends BaseController {
entity.setUpdateTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis()));
boolean ret = this.userService.updateById(entity);
if (!ret) {
map.put("resultCode", "500");
map.put("resultCode", 500);
map.put("message", "服务器错误");
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(map);
}
map.put("resultCode", "201");
map.put("resultCode", 200);
map.put("message", "启用成功");
return ResponseEntity.status(HttpStatus.CREATED).body(map);
return ResponseEntity.ok(map);
} catch (Exception e) {
logger.error("用户启用出错!", e);
}
......@@ -455,7 +448,7 @@ public class TUserController extends BaseController {
}
resultMap.put("resultCode", 200);
resultMap.put("message", "修改成功");
return ResponseEntity.status(HttpStatus.OK).body(resultMap);
return ResponseEntity.ok(resultMap);
} catch (Exception e) {
logger.error("更新密码错误！", e);
}
......@@ -488,10 +481,10 @@ public class TUserController extends BaseController {
return ResponseEntity.status(HttpStatus.BAD_REQUEST).build();
}
stringRedisTemplate.delete(SHIRO_IS_LOCK + userService.getById(userId).getUserName());
map.put("resultCode", "201");
map.put("resultCode", "200");
map.put("message", "重置密码成功");
map.put("data", newPassword);
return ResponseEntity.status(HttpStatus.CREATED).body(map);
return ResponseEntity.ok(map);
} catch (Exception e) {
logger.error("重置密码出错!", e);
}
......@@ -526,8 +519,8 @@ public class TUserController extends BaseController {
//新增
@OperationLog("新增机顶盒账号")
@ApiOperation(value = "新增机顶盒账号")
@RequestMapping(value = "/BoxAdd", method = RequestMethod.POST)
@RequiresPermissions("/user/BoxAdd")
@RequestMapping(value = "/boxAdd", method = RequestMethod.POST)
@RequiresPermissions("/user/boxAdd")
// @MethodLog(operModule = OperModule.USER, operType = OperType.ADD)
public ResponseEntity<Map<String, Object>> BoxAdd(TUser user) {
Map<String, Object> resultMap = new LinkedHashMap<String, Object>();
......@@ -598,5 +591,141 @@ public class TUserController extends BaseController {
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
}
//新增
@OperationLog("新增运维账号")
@ApiOperation(value = "新增运维账号")
@RequestMapping(value = "/operationAdd", method = RequestMethod.POST)
@RequiresPermissions("/user/operationAdd")
// @MethodLog(operModule = OperModule.USER, operType = OperType.ADD)
public ResponseEntity<Map<String, Object>> operationAdd(TUser user) {
Map<String, Object> resultMap = new LinkedHashMap<String, Object>();
try {
if (StringUtils.isBlank(user.getUserName())) {
resultMap.put("resultCode", 400);
resultMap.put("message", "账号不能为空！");
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
} else {
user.setUserName(StringUtils.trimToNull(user.getUserName()));
}
user.setPassword("123456");
QueryWrapper<TUser> ew = new QueryWrapper<>();
if (StringUtils.isNoneBlank(user.getUserName())) {
user.setUserName(user.getUserName().trim());
ew.eq("is_deleted", 0);
ew.eq("user_name", user.getUserName());
TUser one = this.userService.getOne(ew);
if (one != null) {
resultMap.put("resultCode", 400);
resultMap.put("message", "账号已存在！");
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
}
}
byte[] passwordSalt = SecureRandomSaltService.generateSalt();
byte[] passwordHash = SHA256PasswordEncryptionService
.createPasswordHash(user.getPassword(), passwordSalt);
user.setPasswordSalt(passwordSalt);
user.setPasswordHash(passwordHash);
user.setCreateTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis()));
user.setUpdateTime(user.getCreateTime());
user.setIsDeleted(false);
user.setStatus("1");
user.setAuditStatus("4");
user.setType("4");
boolean ret = this.userService.save(user);
if (!ret) {
// 新增失败, 500
resultMap.put("resultCode", 500);
resultMap.put("message", "服务器忙");
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
.body(resultMap);
}
resultMap.put("resultCode", 200);
resultMap.put("message", "添加成功");
resultMap.put("data", user.getPassword());
// 201
return ResponseEntity.status(HttpStatus.CREATED).body(resultMap);
} catch (Exception e) {
resultMap.put("resultCode", 500);
resultMap.put("message", "服务器忙");
logger.error("新增成员错误!", e);
}
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
}
//新增
@OperationLog("新增统计账号")
@ApiOperation(value = "新增运维账号")
@RequestMapping(value = "/statisticsAdd", method = RequestMethod.POST)
@RequiresPermissions("/user/statisticsAdd")
// @MethodLog(operModule = OperModule.USER, operType = OperType.ADD)
public ResponseEntity<Map<String, Object>> statisticsAdd(TUser user) {
Map<String, Object> resultMap = new LinkedHashMap<String, Object>();
try {
if (StringUtils.isBlank(user.getUserName())) {
resultMap.put("resultCode", 400);
resultMap.put("message", "账号不能为空！");
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
} else {
user.setUserName(StringUtils.trimToNull(user.getUserName()));
}
user.setPassword("123456");
QueryWrapper<TUser> ew = new QueryWrapper<>();
if (StringUtils.isNoneBlank(user.getUserName())) {
user.setUserName(user.getUserName().trim());
ew.eq("is_deleted", 0);
ew.eq("user_name", user.getUserName());
TUser one = this.userService.getOne(ew);
if (one != null) {
resultMap.put("resultCode", 400);
resultMap.put("message", "账号已存在！");
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
}
}
byte[] passwordSalt = SecureRandomSaltService.generateSalt();
byte[] passwordHash = SHA256PasswordEncryptionService
.createPasswordHash(user.getPassword(), passwordSalt);
user.setPasswordSalt(passwordSalt);
user.setPasswordHash(passwordHash);
user.setCreateTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis()));
user.setUpdateTime(user.getCreateTime());
user.setIsDeleted(false);
user.setStatus("1");
user.setAuditStatus("4");
user.setType("5");
boolean ret = this.userService.save(user);
if (!ret) {
// 新增失败, 500
resultMap.put("resultCode", 500);
resultMap.put("message", "服务器忙");
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
.body(resultMap);
}
resultMap.put("resultCode", 200);
resultMap.put("message", "添加成功");
resultMap.put("data", user.getPassword());
// 201
return ResponseEntity.status(HttpStatus.CREATED).body(resultMap);
} catch (Exception e) {
resultMap.put("resultCode", 500);
resultMap.put("message", "服务器忙");
logger.error("新增成员错误!", e);
}
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
}
}
src/main/resources/mapper/TBoxOperationMapper.xml
View file @ 206ccdd9
......@@ -12,6 +12,7 @@
<result column="create_time" property="createTime"/>
<result column="update_time" property="updateTime"/>
<result column="organ_name" property="organName"/>
<result column="area_name" property="areaName"/>
</resultMap>
<!-- 通用查询结果列 -->
......@@ -24,4 +25,22 @@
FROM t_box_operation b
left join t_organ r on r.id = b.organ_id
</select>
<select id="selectBoxPage" resultMap="BaseResultMap">
select b.*,o.name organ_name,a.full_name area_name
from t_user u
left join t_organ o on o.id = u.org_id
left join t_area a on u.area_id = a.id
left join t_box_operation b on b.organ_id = o.id
where 1=1
<if test="user.orgId!= null and user.orgId != '' ">
and b.organ_id =#{user.orgId}
</if>
<if test="user.areaId!= null and user.areaId != '' ">
and b.area_id =#{user.areaId}
</if>
and u.is_deleted = false
and u.type = 3
order by b.create_time desc
</select>
</mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment