Skip to content

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

修改bug

parent 1ac99e9c
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 555 deletions
src/main/java/cn/wisenergy/chnmuseum/party/common/log/OperModule.java
View file @ a172cfd5
......@@ -2,9 +2,9 @@ package cn.wisenergy.chnmuseum.party.common.log;
public enum OperModule {
USER(1,"用户管理"),
ROLE(1,"角色管理"),
DEPT(1,"部门管理"),
ORG(1,"机构管理");
ROLE(2,"角色管理"),
DEPT(3,"部门管理"),
ORG(4,"机构管理");
// 错误编码
private Integer code;
......
src/main/java/cn/wisenergy/chnmuseum/party/common/log/OperType.java
View file @ a172cfd5
......@@ -13,7 +13,14 @@ public enum OperType {
ENABLE(5,"启用"),
DISABLE(6,"禁用"),
IMPORT(7,"导入"),
LOGIN(8,"登录");
LOGIN(8,"登录"),
AUDIT(9,"审核"),
UPPER(10,"上架"),
LOWER(11,"下架"),
CHANGE_PASSWORD(12,"修改密码"),
RESET_PASSWORD(13,"重置密码"),
VIDEO_EXPORT(14,"视频汇出")
;
// 错误编码
private Integer code;
......
src/main/java/cn/wisenergy/chnmuseum/party/common/log/SystemOperationLogService.java
View file @ a172cfd5
......@@ -105,10 +105,10 @@ class SystemOperationLogService extends ServiceImpl<SysLogMapper, SysLog> {
// resultMap.put("message", "用户未登录！");
// return resultMap;
// }
String methodName = user.getUserName() + "登录本系统";
if (user.getOrgName() != null) {
methodName += "，机构" + user.getOrgName();
}
// String methodName = user.getUserName() + "登录本系统";
// if (user.getOrgName() != null) {
// methodName += "，机构" + user.getOrgName();
// }
String packages = point.getThis().getClass().getName();
if (packages.indexOf("$$EnhancerByCGLIB$$") > -1) { // 如果是CGLIB动态生成的类
try {
......@@ -146,7 +146,7 @@ class SystemOperationLogService extends ServiceImpl<SysLogMapper, SysLog> {
sysLog.setOperator(user.getUserName());
sysLog.setOperationIp(ip);
sysLog.setOperationContent(methodName);
// sysLog.setOperationContent(methodName);
sysLog.setOperationTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis()));
// 处理设置注解上的参数
getControllerMethodDescription(methodLog, sysLog);
......@@ -207,7 +207,8 @@ class SystemOperationLogService extends ServiceImpl<SysLogMapper, SysLog> {
* @return
*/
public static String getIp(HttpServletRequest request) {
String ip = request.getHeader("x-forwarded-for");
// String ip = request.getHeader("x-forwarded-for");
String ip = ip = request.getRemoteAddr();
if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
ip = request.getHeader("Proxy-Client-IP");
}
......@@ -221,7 +222,7 @@ class SystemOperationLogService extends ServiceImpl<SysLogMapper, SysLog> {
ip = request.getHeader("HTTP_X_FORWARDED_FOR");
}
if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
ip = request.getRemoteAddr();
if ("127.0.0.1".equals(ip) || "0:0:0:0:0:0:0:1".equals(ip)) {
//根据网卡取本机配置的IP
InetAddress inet = null;
......
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TBoardPlayRankController.java deleted 100644 → 0
View file @ 1ac99e9c
//package cn.wisenergy.chnmuseum.party.web.controller;
//
//import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
//import com.baomidou.mybatisplus.core.toolkit.Wrappers;
//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
//import cn.wisenergy.chnmuseum.party.web.controller.base.BaseController;
//import cn.wisenergy.chnmuseum.party.model.TBoardPlayRank;
//import cn.wisenergy.chnmuseum.party.service.TBoardPlayRankService;
//import cn.wisenergy.chnmuseum.party.common.enums.AuditStatusEnum;
//import cn.wisenergy.chnmuseum.party.common.validator.groups.Add;
//import cn.wisenergy.chnmuseum.party.common.validator.groups.Update;
//import cn.wisenergy.chnmuseum.party.common.vo.GenericPageParam;
//
//import io.swagger.annotations.Api;
//import io.swagger.annotations.ApiImplicitParam;
//import io.swagger.annotations.ApiImplicitParams;
//import io.swagger.annotations.ApiOperation;
//
//import lombok.extern.slf4j.Slf4j;
//import org.apache.commons.lang3.StringUtils;
//import org.apache.shiro.authz.annotation.RequiresPermissions;
//import org.springframework.validation.annotation.Validated;
//import org.springframework.web.bind.annotation.*;
//import org.springframework.stereotype.Controller;
//
//import javax.annotation.Resource;
//import javax.validation.constraints.NotNull;
//import java.util.List;
//import java.util.Map;
//
///**
// * <pre>
// * 展板播放排行 前端控制器
// * </pre>
// *
// * @author Danny Lee
// * @since 2021-03-26
// */
//@Slf4j
//@RestController
//@RequestMapping("/tBoardPlayRank")
//@Api(tags = {"展板播放排行操作接口"})
//public class TBoardPlayRankController extends BaseController {
//
// @Resource
// private TBoardPlayRankService tBoardPlayRankService;
//
// @PostMapping("/batchSave")
// @RequiresPermissions("t:board:play:rank:batch:save")
// @ApiOperation(value = "批量添加展板播放排行", notes = "批量添加展板播放排行")
// public Map<String, Object> batchSaveTBoardPlayRank(@Validated(value = {Add.class}) List<TBoardPlayRank> tBoardPlayRankList) {
// // 保存业务节点信息
// boolean result = tBoardPlayRankService.saveBatch(tBoardPlayRankList);
// // 返回操作结果
// if (result) {
// return getSuccessResult();
// } else {
// // 保存失败
// return getFailResult();
// }
// }
//
// @PostMapping("/save")
// @RequiresPermissions("t:board:play:rank:save")
// @ApiOperation(value = "添加展板播放排行", notes = "添加展板播放排行")
// public Map<String, Object> saveTBoardPlayRank(@Validated(value = {Add.class}) TBoardPlayRank tBoardPlayRank) {
// // 保存业务节点信息
// boolean result = tBoardPlayRankService.save(tBoardPlayRank);
// // 返回操作结果
// if (result) {
// return getSuccessResult();
// } else {
// // 保存失败
// return getFailResult();
// }
// }
//
// @PutMapping("/update")
// @RequiresPermissions("t:board:play:rank:update")
// @ApiOperation(value = "修改展板播放排行信息", notes = "修改展板播放排行信息")
// public Map<String, Object> updateTBoardPlayRank(@Validated(value = {Update.class}) TBoardPlayRank tBoardPlayRank) {
// boolean flag = tBoardPlayRankService.updateById(tBoardPlayRank);
// if (flag) {
// return getSuccessResult();
// }
// return getFailResult();
// }
//
//// @PutMapping("/updateAuditStatus/{id}")
//// @RequiresPermissions("t:board:play:rank:update:audit:status")
//// @ApiOperation(value = "更新展板播放排行审核状态", notes = "更新展板播放排行审核状态")
//// @ApiImplicitParams(value = {
//// @ApiImplicitParam(name = "id", value = "标识ID", dataType = "String", paramType = "path"),
//// @ApiImplicitParam(name = "status", value = "状态", paramType = "query", dataType = "String")
//// })
//// public Map<String, Object> updateStatus(@NotNull(message = "展板播放排行ID不能为空") @PathVariable("id") String id, @RequestParam("status") AuditStatusEnum status) {
//// UpdateWrapper<TBoardPlayRank> updateWrapper = new UpdateWrapper<>();
//// updateWrapper.eq("id", id);
//// updateWrapper.eq("audit_status", status.name());
//// boolean flag = tBoardPlayRankService.update(updateWrapper);
//// if (flag) {
//// return getSuccessResult();
//// }
//// return getFailResult();
//// }
//
// @DeleteMapping("/delete/{id}")
// @RequiresPermissions("t:board:play:rank:delete")
// @ApiOperation(value = "根据ID删除展板播放排行", notes = "根据ID删除展板播放排行")
// @ApiImplicitParams(value = {
// @ApiImplicitParam(name = "id", value = "标识ID", paramType = "path", dataType = "String")
// })
// public Map<String, Object> deleteTBoardPlayRank(@PathVariable("id") String id) {
// boolean result = tBoardPlayRankService.removeById(id);
// if (result) {
// return getSuccessResult();
// }
// return getFailResult();
// }
//
// @GetMapping("/getList")
// @RequiresPermissions("t:board:play:rank:list")
// @ApiOperation(value = "获取展板播放排行全部列表(无分页)", notes = "获取展板播放排行全部列表(无分页)")
// @ApiImplicitParams(value = {
// @ApiImplicitParam(name = "auditStatus", value = "审核状态", paramType = "query", dataType = "String")
// })
// public Map<String, Object> getTBoardPlayRankList(@RequestParam(value = "auditStatus", defaultValue = "APPROVED_FINAL", required = false) AuditStatusEnum auditStatus) {
// List<TBoardPlayRank> tBoardPlayRankList = tBoardPlayRankService.list();
// return getResult(tBoardPlayRankList);
// }
//
// @ApiImplicitParams(value = {
// @ApiImplicitParam(name = "_index", value = "分页起始偏移量", paramType = "query", dataType = "Integer"),
// @ApiImplicitParam(name = "_size", value = "返回条数", paramType = "query", dataType = "Integer"),
// @ApiImplicitParam(name = "nameOrCode", value = "名称或编码", paramType = "query", dataType = "String"),
// @ApiImplicitParam(name = "startDate", value = "创建时间-开始", paramType = "query", dataType = "String"),
// @ApiImplicitParam(name = "endDate", value = "创建时间-结束", paramType = "query", dataType = "String")
// })
// @PostMapping("/getPageList")
// @RequiresPermissions("t:board:play:rank:page")
// @ApiOperation(value = "获取展板播放排行分页列表", notes = "获取展板播放排行分页列表")
// public Map<String, Object> getTBoardPlayRankPageList(GenericPageParam genericPageParam) {
// LambdaQueryWrapper<TBoardPlayRank> queryWrapper = new LambdaQueryWrapper<>();
//// // 对名称或编码模糊查询
//// if (StringUtils.isNotBlank(genericPageParam.getNameOrCode())) {
//// queryWrapper.like(TBoardPlayRank::getName, genericPageParam.getNameOrCode());
//// }
//// // 根据创建时间区间检索
//// if (genericPageParam.getStartDate() != null && genericPageParam.getEndDate() != null) {
//// queryWrapper.ge(TBoardPlayRank::getCreateTime, genericPageParam.getStartDate().atTime(0, 0, 0))
//// .le(TBoardPlayRank::getCreateTime, genericPageParam.getEndDate().atTime(23, 59, 59));
//// }
//// // 设置排序规则
//// queryWrapper.orderByDesc(TBoardPlayRank::getCreateTime);
//// // 设置查询内容
//// queryWrapper.select(
//// TBoardPlayRank::getId,
//// TBoardPlayRank::getName,
//// TBoardPlayRank::getAuditStatus,
//// TBoardPlayRank::getCreateTime,
//// TBoardPlayRank::getUpdateTime);
// Page<TBoardPlayRank> page = this.tBoardPlayRankService.page(getPage(), queryWrapper);
// for (TBoardPlayRank tBoardPlayRank : page.getRecords()) {
//
// }
// return getResult(page);
// }
//
// @ApiOperation(value = "获取展板播放排行详情", notes = "获取展板播放排行详情")
// @ApiImplicitParams({
// @ApiImplicitParam(name = "id", value = "标识ID", dataType = "String", paramType = "path")
// })
// @GetMapping("/get/{id}")
// @RequiresPermissions("t:board:play:rank:get:id")
// public Map<String, Object> getById(@PathVariable("id") String id) {
// TBoardPlayRank tBoardPlayRank = tBoardPlayRankService.getById(id);
// return getResult(tBoardPlayRank);
// }
//
//}
//
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TBoardPlayTrendController.java deleted 100644 → 0
View file @ 1ac99e9c
//package cn.wisenergy.chnmuseum.party.web.controller;
//
//import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
//import com.baomidou.mybatisplus.core.toolkit.Wrappers;
//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
//import cn.wisenergy.chnmuseum.party.web.controller.base.BaseController;
//import cn.wisenergy.chnmuseum.party.model.TBoardPlayTrend;
//import cn.wisenergy.chnmuseum.party.service.TBoardPlayTrendService;
//import cn.wisenergy.chnmuseum.party.common.enums.AuditStatusEnum;
//import cn.wisenergy.chnmuseum.party.common.validator.groups.Add;
//import cn.wisenergy.chnmuseum.party.common.validator.groups.Update;
//import cn.wisenergy.chnmuseum.party.common.vo.GenericPageParam;
//
//import io.swagger.annotations.Api;
//import io.swagger.annotations.ApiImplicitParam;
//import io.swagger.annotations.ApiImplicitParams;
//import io.swagger.annotations.ApiOperation;
//
//import lombok.extern.slf4j.Slf4j;
//import org.apache.commons.lang3.StringUtils;
//import org.apache.shiro.authz.annotation.RequiresPermissions;
//import org.springframework.validation.annotation.Validated;
//import org.springframework.web.bind.annotation.*;
//import org.springframework.stereotype.Controller;
//
//import javax.annotation.Resource;
//import javax.validation.constraints.NotNull;
//import java.util.List;
//import java.util.Map;
//
///**
// * <pre>
// * 展板播放趋势 前端控制器
// * </pre>
// *
// * @author Danny Lee
// * @since 2021-03-26
// */
//@Slf4j
//@RestController
//@RequestMapping("/tBoardPlayTrend")
//@Api(tags = {"展板播放趋势操作接口"})
//public class TBoardPlayTrendController extends BaseController {
//
// @Resource
// private TBoardPlayTrendService tBoardPlayTrendService;
//
// @PostMapping("/batchSave")
// @RequiresPermissions("t:board:play:trend:batch:save")
// @ApiOperation(value = "批量添加展板播放趋势", notes = "批量添加展板播放趋势")
// public Map<String, Object> batchSaveTBoardPlayTrend(@Validated(value = {Add.class}) List<TBoardPlayTrend> tBoardPlayTrendList) {
// // 保存业务节点信息
// boolean result = tBoardPlayTrendService.saveBatch(tBoardPlayTrendList);
// // 返回操作结果
// if (result) {
// return getSuccessResult();
// } else {
// // 保存失败
// return getFailResult();
// }
// }
//
// @PostMapping("/save")
// @RequiresPermissions("t:board:play:trend:save")
// @ApiOperation(value = "添加展板播放趋势", notes = "添加展板播放趋势")
// public Map<String, Object> saveTBoardPlayTrend(@Validated(value = {Add.class}) TBoardPlayTrend tBoardPlayTrend) {
// // 保存业务节点信息
// boolean result = tBoardPlayTrendService.save(tBoardPlayTrend);
// // 返回操作结果
// if (result) {
// return getSuccessResult();
// } else {
// // 保存失败
// return getFailResult();
// }
// }
//
// @PutMapping("/update")
// @RequiresPermissions("t:board:play:trend:update")
// @ApiOperation(value = "修改展板播放趋势信息", notes = "修改展板播放趋势信息")
// public Map<String, Object> updateTBoardPlayTrend(@Validated(value = {Update.class}) TBoardPlayTrend tBoardPlayTrend) {
// boolean flag = tBoardPlayTrendService.updateById(tBoardPlayTrend);
// if (flag) {
// return getSuccessResult();
// }
// return getFailResult();
// }
//
//// @PutMapping("/updateAuditStatus/{id}")
//// @RequiresPermissions("t:board:play:trend:update:audit:status")
//// @ApiOperation(value = "更新展板播放趋势审核状态", notes = "更新展板播放趋势审核状态")
//// @ApiImplicitParams(value = {
//// @ApiImplicitParam(name = "id", value = "标识ID", dataType = "String", paramType = "path"),
//// @ApiImplicitParam(name = "status", value = "状态", paramType = "query", dataType = "String")
//// })
//// public Map<String, Object> updateStatus(@NotNull(message = "展板播放趋势ID不能为空") @PathVariable("id") String id, @RequestParam("status") AuditStatusEnum status) {
//// UpdateWrapper<TBoardPlayTrend> updateWrapper = new UpdateWrapper<>();
//// updateWrapper.eq("id", id);
//// updateWrapper.eq("audit_status", status.name());
//// boolean flag = tBoardPlayTrendService.update(updateWrapper);
//// if (flag) {
//// return getSuccessResult();
//// }
//// return getFailResult();
//// }
//
// @DeleteMapping("/delete/{id}")
// @RequiresPermissions("t:board:play:trend:delete")
// @ApiOperation(value = "根据ID删除展板播放趋势", notes = "根据ID删除展板播放趋势")
// @ApiImplicitParams(value = {
// @ApiImplicitParam(name = "id", value = "标识ID", paramType = "path", dataType = "String")
// })
// public Map<String, Object> deleteTBoardPlayTrend(@PathVariable("id") String id) {
// boolean result = tBoardPlayTrendService.removeById(id);
// if (result) {
// return getSuccessResult();
// }
// return getFailResult();
// }
//
// @GetMapping("/getList")
// @RequiresPermissions("t:board:play:trend:list")
// @ApiOperation(value = "获取展板播放趋势全部列表(无分页)", notes = "获取展板播放趋势全部列表(无分页)")
// @ApiImplicitParams(value = {
// @ApiImplicitParam(name = "auditStatus", value = "审核状态", paramType = "query", dataType = "String")
// })
// public Map<String, Object> getTBoardPlayTrendList(@RequestParam(value = "auditStatus", defaultValue = "APPROVED_FINAL", required = false) AuditStatusEnum auditStatus) {
// List<TBoardPlayTrend> tBoardPlayTrendList = tBoardPlayTrendService.list();
// return getResult(tBoardPlayTrendList);
// }
//
// @ApiImplicitParams(value = {
// @ApiImplicitParam(name = "_index", value = "分页起始偏移量", paramType = "query", dataType = "Integer"),
// @ApiImplicitParam(name = "_size", value = "返回条数", paramType = "query", dataType = "Integer"),
// @ApiImplicitParam(name = "nameOrCode", value = "名称或编码", paramType = "query", dataType = "String"),
// @ApiImplicitParam(name = "startDate", value = "创建时间-开始", paramType = "query", dataType = "String"),
// @ApiImplicitParam(name = "endDate", value = "创建时间-结束", paramType = "query", dataType = "String")
// })
// @PostMapping("/getPageList")
// @RequiresPermissions("t:board:play:trend:page")
// @ApiOperation(value = "获取展板播放趋势分页列表", notes = "获取展板播放趋势分页列表")
// public Map<String, Object> getTBoardPlayTrendPageList(GenericPageParam genericPageParam) {
// LambdaQueryWrapper<TBoardPlayTrend> queryWrapper = new LambdaQueryWrapper<>();
// // 对名称或编码模糊查询
//// if (StringUtils.isNotBlank(genericPageParam.getNameOrCode())) {
//// queryWrapper.like(TBoardPlayTrend::getName, genericPageParam.getNameOrCode());
//// }
//// // 根据创建时间区间检索
//// if (genericPageParam.getStartDate() != null && genericPageParam.getEndDate() != null) {
//// queryWrapper.ge(TBoardPlayTrend::getCreateTime, genericPageParam.getStartDate().atTime(0, 0, 0))
//// .le(TBoardPlayTrend::getCreateTime, genericPageParam.getEndDate().atTime(23, 59, 59));
//// }
//// // 设置排序规则
//// queryWrapper.orderByDesc(TBoardPlayTrend::getCreateTime);
//// // 设置查询内容
//// queryWrapper.select(
//// TBoardPlayTrend::getId,
//// TBoardPlayTrend::getName,
//// TBoardPlayTrend::getAuditStatus,
//// TBoardPlayTrend::getCreateTime,
//// TBoardPlayTrend::getUpdateTime);
// Page<TBoardPlayTrend> page = this.tBoardPlayTrendService.page(getPage(), queryWrapper);
// for (TBoardPlayTrend tBoardPlayTrend : page.getRecords()) {
//
// }
// return getResult(page);
// }
//
// @ApiOperation(value = "获取展板播放趋势详情", notes = "获取展板播放趋势详情")
// @ApiImplicitParams({
// @ApiImplicitParam(name = "id", value = "标识ID", dataType = "String", paramType = "path")
// })
// @GetMapping("/get/{id}")
// @RequiresPermissions("t:board:play:trend:get:id")
// public Map<String, Object> getById(@PathVariable("id") String id) {
// TBoardPlayTrend tBoardPlayTrend = tBoardPlayTrendService.getById(id);
// return getResult(tBoardPlayTrend);
// }
//
//}
//
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TDistrictBoardStatisticController.java deleted 100644 → 0
View file @ 1ac99e9c
//package cn.wisenergy.chnmuseum.party.web.controller;
//
//import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
//import com.baomidou.mybatisplus.core.toolkit.Wrappers;
//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
//import cn.wisenergy.chnmuseum.party.web.controller.base.BaseController;
//import cn.wisenergy.chnmuseum.party.model.TDistrictBoardStatistic;
//import cn.wisenergy.chnmuseum.party.service.TDistrictBoardStatisticService;
//import cn.wisenergy.chnmuseum.party.common.enums.AuditStatusEnum;
//import cn.wisenergy.chnmuseum.party.common.validator.groups.Add;
//import cn.wisenergy.chnmuseum.party.common.validator.groups.Update;
//import cn.wisenergy.chnmuseum.party.common.vo.GenericPageParam;
//
//import io.swagger.annotations.Api;
//import io.swagger.annotations.ApiImplicitParam;
//import io.swagger.annotations.ApiImplicitParams;
//import io.swagger.annotations.ApiOperation;
//
//import lombok.extern.slf4j.Slf4j;
//import org.apache.commons.lang3.StringUtils;
//import org.apache.shiro.authz.annotation.RequiresPermissions;
//import org.springframework.validation.annotation.Validated;
//import org.springframework.web.bind.annotation.*;
//import org.springframework.stereotype.Controller;
//
//import javax.annotation.Resource;
//import javax.validation.constraints.NotNull;
//import java.util.List;
//import java.util.Map;
//
///**
// * <pre>
// * 地区看板播放统计 前端控制器
// * </pre>
// *
// * @author Danny Lee
// * @since 2021-03-26
// */
//@Slf4j
//@RestController
//@RequestMapping("/tDistrictBoardStatistic")
//@Api(tags = {"地区看板播放统计操作接口"})
//public class TDistrictBoardStatisticController extends BaseController {
//
// @Resource
// private TDistrictBoardStatisticService tDistrictBoardStatisticService;
//
// @PostMapping("/batchSave")
// @RequiresPermissions("t:district:board:statistic:batch:save")
// @ApiOperation(value = "批量添加地区看板播放统计", notes = "批量添加地区看板播放统计")
// public Map<String, Object> batchSaveTDistrictBoardStatistic(@Validated(value = {Add.class}) List<TDistrictBoardStatistic> tDistrictBoardStatisticList) {
// // 保存业务节点信息
// boolean result = tDistrictBoardStatisticService.saveBatch(tDistrictBoardStatisticList);
// // 返回操作结果
// if (result) {
// return getSuccessResult();
// } else {
// // 保存失败
// return getFailResult();
// }
// }
//
// @PostMapping("/save")
// @RequiresPermissions("t:district:board:statistic:save")
// @ApiOperation(value = "添加地区看板播放统计", notes = "添加地区看板播放统计")
// public Map<String, Object> saveTDistrictBoardStatistic(@Validated(value = {Add.class}) TDistrictBoardStatistic tDistrictBoardStatistic) {
// // 保存业务节点信息
// boolean result = tDistrictBoardStatisticService.save(tDistrictBoardStatistic);
// // 返回操作结果
// if (result) {
// return getSuccessResult();
// } else {
// // 保存失败
// return getFailResult();
// }
// }
//
// @PutMapping("/update")
// @RequiresPermissions("t:district:board:statistic:update")
// @ApiOperation(value = "修改地区看板播放统计信息", notes = "修改地区看板播放统计信息")
// public Map<String, Object> updateTDistrictBoardStatistic(@Validated(value = {Update.class}) TDistrictBoardStatistic tDistrictBoardStatistic) {
// boolean flag = tDistrictBoardStatisticService.updateById(tDistrictBoardStatistic);
// if (flag) {
// return getSuccessResult();
// }
// return getFailResult();
// }
//
//// @PutMapping("/updateAuditStatus/{id}")
//// @RequiresPermissions("t:district:board:statistic:update:audit:status")
//// @ApiOperation(value = "更新地区看板播放统计审核状态", notes = "更新地区看板播放统计审核状态")
//// @ApiImplicitParams(value = {
//// @ApiImplicitParam(name = "id", value = "标识ID", dataType = "String", paramType = "path"),
//// @ApiImplicitParam(name = "status", value = "状态", paramType = "query", dataType = "String")
//// })
//// public Map<String, Object> updateStatus(@NotNull(message = "地区看板播放统计ID不能为空") @PathVariable("id") String id, @RequestParam("status") AuditStatusEnum status) {
//// UpdateWrapper<TDistrictBoardStatistic> updateWrapper = new UpdateWrapper<>();
//// updateWrapper.eq("id", id);
//// updateWrapper.eq("audit_status", status.name());
//// boolean flag = tDistrictBoardStatisticService.update(updateWrapper);
//// if (flag) {
//// return getSuccessResult();
//// }
//// return getFailResult();
//// }
//
// @DeleteMapping("/delete/{id}")
// @RequiresPermissions("t:district:board:statistic:delete")
// @ApiOperation(value = "根据ID删除地区看板播放统计", notes = "根据ID删除地区看板播放统计")
// @ApiImplicitParams(value = {
// @ApiImplicitParam(name = "id", value = "标识ID", paramType = "path", dataType = "String")
// })
// public Map<String, Object> deleteTDistrictBoardStatistic(@PathVariable("id") String id) {
// boolean result = tDistrictBoardStatisticService.removeById(id);
// if (result) {
// return getSuccessResult();
// }
// return getFailResult();
// }
//
// @GetMapping("/getList")
// @RequiresPermissions("t:district:board:statistic:list")
// @ApiOperation(value = "获取地区看板播放统计全部列表(无分页)", notes = "获取地区看板播放统计全部列表(无分页)")
// @ApiImplicitParams(value = {
// @ApiImplicitParam(name = "auditStatus", value = "审核状态", paramType = "query", dataType = "String")
// })
// public Map<String, Object> getTDistrictBoardStatisticList(@RequestParam(value = "auditStatus", defaultValue = "APPROVED_FINAL", required = false) AuditStatusEnum auditStatus) {
// List<TDistrictBoardStatistic> tDistrictBoardStatisticList = tDistrictBoardStatisticService.list();
// return getResult(tDistrictBoardStatisticList);
// }
//
// @ApiImplicitParams(value = {
// @ApiImplicitParam(name = "_index", value = "分页起始偏移量", paramType = "query", dataType = "Integer"),
// @ApiImplicitParam(name = "_size", value = "返回条数", paramType = "query", dataType = "Integer"),
// @ApiImplicitParam(name = "nameOrCode", value = "名称或编码", paramType = "query", dataType = "String"),
// @ApiImplicitParam(name = "startDate", value = "创建时间-开始", paramType = "query", dataType = "String"),
// @ApiImplicitParam(name = "endDate", value = "创建时间-结束", paramType = "query", dataType = "String")
// })
// @PostMapping("/getPageList")
// @RequiresPermissions("t:district:board:statistic:page")
// @ApiOperation(value = "获取地区看板播放统计分页列表", notes = "获取地区看板播放统计分页列表")
// public Map<String, Object> getTDistrictBoardStatisticPageList(GenericPageParam genericPageParam) {
// LambdaQueryWrapper<TDistrictBoardStatistic> queryWrapper = new LambdaQueryWrapper<>();
// // 对名称或编码模糊查询
//// if (StringUtils.isNotBlank(genericPageParam.getNameOrCode())) {
//// queryWrapper.like(TDistrictBoardStatistic::getName, genericPageParam.getNameOrCode());
//// }
//// // 根据创建时间区间检索
//// if (genericPageParam.getStartDate() != null && genericPageParam.getEndDate() != null) {
//// queryWrapper.ge(TDistrictBoardStatistic::getCreateTime, genericPageParam.getStartDate().atTime(0, 0, 0))
//// .le(TDistrictBoardStatistic::getCreateTime, genericPageParam.getEndDate().atTime(23, 59, 59));
//// }
//// // 设置排序规则
//// queryWrapper.orderByDesc(TDistrictBoardStatistic::getCreateTime);
//// // 设置查询内容
//// queryWrapper.select(
//// TDistrictBoardStatistic::getId,
//// TDistrictBoardStatistic::getName,
//// TDistrictBoardStatistic::getAuditStatus,
//// TDistrictBoardStatistic::getCreateTime,
//// TDistrictBoardStatistic::getUpdateTime);
// Page<TDistrictBoardStatistic> page = this.tDistrictBoardStatisticService.page(getPage(), queryWrapper);
// for (TDistrictBoardStatistic tDistrictBoardStatistic : page.getRecords()) {
//
// }
// return getResult(page);
// }
//
// @ApiOperation(value = "获取地区看板播放统计详情", notes = "获取地区看板播放统计详情")
// @ApiImplicitParams({
// @ApiImplicitParam(name = "id", value = "标识ID", dataType = "String", paramType = "path")
// })
// @GetMapping("/get/{id}")
// @RequiresPermissions("t:district:board:statistic:get:id")
// public Map<String, Object> getById(@PathVariable("id") String id) {
// TDistrictBoardStatistic tDistrictBoardStatistic = tDistrictBoardStatisticService.getById(id);
// return getResult(tDistrictBoardStatistic);
// }
//
//}
//
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TUserController.java
View file @ a172cfd5
......@@ -229,6 +229,9 @@ public class TUserController extends BaseController {
resultMap.put("message", "机构已存在三个单位管理员！");
return resultMap;
}
ArrayList<String> strings = new ArrayList<>();
strings.add("2");
user.setRoleList(strings);
}
QueryWrapper<TUser> ew = new QueryWrapper<>();
if (StringUtils.isNoneBlank(user.getUserName())) {
......@@ -348,7 +351,7 @@ public class TUserController extends BaseController {
List<String> list = user.getRoleList();
if (list != null && list.size() > 0) {
if (list != null && list.size() > 0&&list.get(0)!=null) {
ArrayList<TUserRole> list1 = new ArrayList<>();
for (String r : list) {
TUserRole userRole = new TUserRole();
......@@ -381,6 +384,8 @@ public class TUserController extends BaseController {
logger.error("更新错误!", e);
}
// 500
resultMap.put("resultCode", "500");
resultMap.put("message", "服务器忙");
return resultMap;
}
......@@ -673,6 +678,12 @@ public class TUserController extends BaseController {
tBoxOperation.setUpdateTime(LocalDateTime.now());
ret = boxOperationService.save(tBoxOperation);
TUserRole userRole = new TUserRole();
userRole.setUserId(user.getId());
userRole.setRoleId("3");
userRole.setIsDeleted(false);
tUserRoleService.save(userRole);
if (!ret) {
// 新增失败, 500
resultMap.put("resultCode", "500");
......@@ -738,6 +749,12 @@ public class TUserController extends BaseController {
boolean ret = this.userService.save(user);
TUserRole userRole = new TUserRole();
userRole.setUserId(user.getId());
userRole.setRoleId("4");
userRole.setIsDeleted(false);
tUserRoleService.save(userRole);
if (!ret) {
// 新增失败, 500
resultMap.put("resultCode", "500");
......@@ -803,6 +820,13 @@ public class TUserController extends BaseController {
boolean ret = this.userService.save(user);
TUserRole userRole = new TUserRole();
userRole.setUserId(user.getId());
userRole.setRoleId("5");
userRole.setIsDeleted(false);
tUserRoleService.save(userRole);
if (!ret) {
// 新增失败, 500
resultMap.put("resultCode", "500");
......
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