wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-07-12 10:43:26 +08:00
parent 64e82a94fa 44abdc3c2f
commit 4e063c2408
34 changed files with 207 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
renren-admin/src/main/java/io/renren/common/annotation/LogOperation.java
View File

@ -16,4 +16,5 @@ import java.lang.annotation.Target;
public @interface LogOperation {
String value() default "";
String operationTable() default "";
}

2
renren-admin/src/main/java/io/renren/common/aspect/LogOperationAspect.java
View File

@ -67,6 +67,8 @@ public class LogOperationAspect {
if(annotation != null){
//注解上的描述
log.setOperation(annotation.value());
//操作数据库表
log.setOperationTable(annotation.operationTable());
}
//登录用户信息

1
renren-admin/src/main/java/io/renren/common/controller/AbilityCenterController.java
View File

@ -108,6 +108,7 @@ public class AbilityCenterController {
tAbilityApplicationDTO.setUserId(abilityBatchApplicationDTO.getUserId());
tAbilityApplicationDTO.setApproveStatus("审核中");
tAbilityApplicationDTO.setDelFlag(0);
tAbilityApplicationDTO.setEnclosureName(abilityBatchApplicationDTO.getEnclosureName());
// 仿照请求接口 /processForm/tabilityapplication
ValidatorUtils.validateEntity(tAbilityApplicationDTO, AddGroup.class, DefaultGroup.class);
tAbilityApplicationService.save(tAbilityApplicationDTO); // 写能力申请数据

1
renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV2.java
View File

@ -121,6 +121,7 @@ public class AbilityCenterControllerV2 {
tAbilityApplicationDTO.setApplicationScene(abilityBatchApplicationDTO.getApplicationScene());
tAbilityApplicationDTO.setApplicationSystem(abilityBatchApplicationDTO.getApplicationSystem());
tAbilityApplicationDTO.setEffectWish(abilityBatchApplicationDTO.getEffectWish());
tAbilityApplicationDTO.setEnclosureName(abilityBatchApplicationDTO.getEnclosureName());
// 归为同一次申请
tAbilityApplicationDTO.setApplyFlag(abilityBatchApplicationDTO.getApplyFlag());

1
renren-admin/src/main/java/io/renren/common/controller/RejectController.java
View File

@ -1,6 +1,5 @@
package io.renren.common.controller;
import com.alibaba.fastjson.JSON;
import io.renren.common.annotation.LogOperation;
import io.renren.common.utils.Result;

3
renren-admin/src/main/java/io/renren/modules/demanData/dto/TDemandDataDTO.java
View File

@ -64,6 +64,9 @@ public class TDemandDataDTO extends AuditingBaseDTO implements Serializable {
@ApiModelProperty(value = "评论数目")
private Long commentCount = 0l;
@ApiModelProperty(value = "申请单号")
private String applyNumber;
public TDemandDataDTO() {
this.flag = TDemandDataEntityFlag.INIT.getFlag();
this.visits = 0l;

4
renren-admin/src/main/java/io/renren/modules/demanData/entity/TDemandDataEntity.java
View File

@ -82,4 +82,8 @@ public class TDemandDataEntity extends BaseEntity {
* 实例ID
*/
private String instanceId;
/**
* 申请单号
*/
private String applyNumber;
}

3
renren-admin/src/main/java/io/renren/modules/demandComment/dto/TDemandCommentDTO.java
View File

@ -49,4 +49,7 @@ public class TDemandCommentDTO extends AuditingBaseDTO implements Serializable {
@ApiModelProperty(value = "评论所属需求主题")
private TDemandDataDTO demandDataDTO;
@ApiModelProperty(value = "申请单号")
private String applyNumber;
}

4
renren-admin/src/main/java/io/renren/modules/demandComment/entity/TDemandCommentEntity.java
View File

@ -58,4 +58,8 @@ public class TDemandCommentEntity extends BaseEntity {
* 删除标志：0:正常；1:已删除；2:待审核；3:审核中；9其他
*/
private Integer delFlag;
/**
* 申请单号
*/
private String applyNumber;
}

3
renren-admin/src/main/java/io/renren/modules/log/controller/SysLogOperationController.java
View File

@ -47,7 +47,8 @@ public class SysLogOperationController {
@ApiImplicitParam(name = "creatorName", value = "操作人", paramType = "query", dataType="String"),
@ApiImplicitParam(name = "startDate", value = "开始时间", paramType = "query", dataType="String"),
@ApiImplicitParam(name = "endDate", value = "结束时间", paramType = "query", dataType="String"),
@ApiImplicitParam(name = "operation", value = "操作名称", paramType = "query", dataType="String")
@ApiImplicitParam(name = "operation", value = "操作名称", paramType = "query", dataType="String"),
@ApiImplicitParam(name = "operationType", value = "操作类型", paramType = "query", dataType="String")
})
// @RequiresPermissions("sys:log:operation")
public Result<PageData<SysLogOperationDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){

5
renren-admin/src/main/java/io/renren/modules/log/dto/SysLogOperationDTO.java
View File

@ -50,4 +50,9 @@ public class SysLogOperationDTO implements Serializable {
@ApiModelProperty(value = "创建时间")
private Date createDate;
@ApiModelProperty(value = "返回结果")
private String resultData;
@ApiModelProperty(value = "操作数据库表")
private String operationTable;
}

4
renren-admin/src/main/java/io/renren/modules/log/entity/SysLogOperationEntity.java
View File

@ -56,4 +56,8 @@ public class SysLogOperationEntity extends BaseEntity {
* 返回结果
*/
private String resultData;
/**
* 操作数据库表
*/
private String operationTable;
}

23
renren-admin/src/main/java/io/renren/modules/log/service/impl/SysLogOperationServiceImpl.java
View File

@ -49,14 +49,25 @@ public class SysLogOperationServiceImpl extends BaseServiceImpl<SysLogOperationD
String operation = (String) params.get("operation");
String startDate = (String) params.get("startDate");
String endDate = (String) params.get("endDate");
QueryWrapper<SysLogOperationEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(status), "status", status)
String operationType = (String) params.get("operationType");
QueryWrapper<SysLogOperationEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(StringUtils.isNotBlank(status), "status", status)
.eq(StringUtils.isNotBlank(creatorName), "creator_name", creatorName)
.like(StringUtils.isNotBlank(operation), "operation", operation)
.between(StringUtils.isNotBlank(startDate), "", startDate, endDate);
return wrapper;
.between(StringUtils.isNotBlank(startDate), "create_date", startDate, endDate);
if ("all".equals(operationType)) {
queryWrapper.ne("request_uri", "/renren-admin/resource/updateVisits");
queryWrapper.and(wrapper ->
wrapper.like("request_uri", "/renren-admin/resource%/insert")
.or()
.like("request_uri", "/renren-admin/resource%/update")
.or()
.like("request_uri", "/renren-admin/resource%/delete"));
} else {
queryWrapper.ne("request_uri", "/renren-admin/resource/updateVisits");
queryWrapper.like(StringUtils.isNotBlank(operationType),"request_uri", operationType);
}
return queryWrapper;
}
@Override

44
renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java
View File

@ -3,6 +3,7 @@ package io.renren.modules.processForm.controller;
import io.renren.common.annotation.LogOperation;
import io.renren.common.constant.Constant;
import io.renren.common.page.PageData;
import io.renren.common.utils.ConvertUtils;
import io.renren.common.utils.ExcelUtils;
import io.renren.common.utils.Result;
import io.renren.common.validator.AssertUtils;
@ -10,9 +11,14 @@ import io.renren.common.validator.ValidatorUtils;
import io.renren.common.validator.group.AddGroup;
import io.renren.common.validator.group.DefaultGroup;
import io.renren.common.validator.group.UpdateGroup;
import io.renren.modules.activiti.dto.HistoryDetailDTO;
import io.renren.modules.activiti.service.ActivitiService;
import io.renren.modules.processForm.dto.TAbilityApplicationDTO;
import io.renren.modules.processForm.dto.TAbilityApplicationV2DTO;
import io.renren.modules.processForm.excel.TAbilityApplicationExcel;
import io.renren.modules.processForm.service.TAbilityApplicationService;
import io.renren.modules.resource.dto.ResourceDTO;
import io.renren.modules.resource.service.ResourceService;
import io.renren.modules.security.user.SecurityUser;
import io.renren.modules.security.user.UserDetail;
import io.renren.modules.sys.dto.SysDeptDTO;
@ -43,6 +49,10 @@ import java.util.stream.Collectors;
public class TAbilityApplicationController {
@Autowired
private TAbilityApplicationService tAbilityApplicationService;
@Autowired
private ResourceService resourceService;
@Autowired
private ActivitiService activitiService;
/**
@ -71,7 +81,7 @@ public class TAbilityApplicationController {
@GetMapping("getByApplyFlag/{applyFlag}")
@ApiOperation("根据申请标识获取能力申请信息")
@LogOperation("根据申请标识获取能力申请信息")
public Result<Map<String, List<TAbilityApplicationDTO>>> getByApplyFlag(@PathVariable("applyFlag") String applyFlag) {
public Result<TAbilityApplicationV2DTO> getByApplyFlag(@PathVariable("applyFlag") String applyFlag) {
final UserDetail user = SecurityUser.getUser();
Map<String, Object> params = new HashMap<String, Object>() {
{
@ -89,7 +99,37 @@ public class TAbilityApplicationController {
return sysDeptDTO.getName();
}
}));
return new Result<Map<String, List<TAbilityApplicationDTO>>>().ok(result);
if (applicationDTOS.isEmpty()) {
return new Result<TAbilityApplicationV2DTO>().ok(null);
}
TAbilityApplicationV2DTO tAbilityApplicationV2DTO = ConvertUtils.sourceToTarget(applicationDTOS.get(0), TAbilityApplicationV2DTO.class);
Map<String, List<Map<String, Object>>> re =
result.keySet().stream().map(index -> {
final List<TAbilityApplicationDTO> tAbilityApplicationDTOList = result.get(index);
List<ResourceDTO> resourceDTOS =
tAbilityApplicationDTOList.stream()
.filter(tAbilityApplicationDTO -> !tAbilityApplicationDTO.getResourceId().equals("8888888880000000001")) // 过滤非摄像头申请
.map(tAbilityApplicationDTO -> resourceService.get(Long.valueOf(tAbilityApplicationDTO.getResourceId()))).collect(Collectors.toList());
List<HistoryDetailDTO> taskHandleDetailInfo = activitiService.getTaskHandleDetailInfo(tAbilityApplicationDTOList.get(0).getInstanceId());
Map<String, Object> resourceApplication = new HashMap<String, Object>() {
{
put("instanceId", tAbilityApplicationDTOList.get(0).getInstanceId()); // 流程id
put("resourceOwnerDept", tAbilityApplicationDTOList.get(0).getResourceOwnerDept()); // 资源所属部门信息
put("resources", resourceDTOS);//申请的该部门的能力资源
put("taskHandleDetailInfo", taskHandleDetailInfo); // 流程详情
}
};
return resourceApplication;
}).collect(Collectors.groupingBy(t -> {
SysDeptDTO sysDeptDTO = (SysDeptDTO) t.get("resourceOwnerDept");
if (sysDeptDTO == null) {
return "无部门信息"; // 无部门信息
} else {
return sysDeptDTO.getName();
}
}));
tAbilityApplicationV2DTO.setResourceApplication(re);
return new Result<TAbilityApplicationV2DTO>().ok(tAbilityApplicationV2DTO);
}
@GetMapping("page")

6
renren-admin/src/main/java/io/renren/modules/processForm/dto/TAbilityApplicationDTO.java
View File

@ -54,6 +54,9 @@ public class TAbilityApplicationDTO extends AuditingBaseDTO implements Serializa
@ApiModelProperty(value = "附件")
private String enclosure;
@ApiModelProperty(value = "附件文件名")
private String enclosureName;
@ApiModelProperty(value = "摄像头ID")
private String cameraList;
@ -78,4 +81,7 @@ public class TAbilityApplicationDTO extends AuditingBaseDTO implements Serializa
@ApiModelProperty(value = "资源所属部门信息")
private SysDeptDTO resourceOwnerDept;
@ApiModelProperty(value = "申请单号")
private String applyNumber;
}

62
renren-admin/src/main/java/io/renren/modules/processForm/dto/TAbilityApplicationV2DTO.java Normal file
View File

@ -0,0 +1,62 @@
package io.renren.modules.processForm.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
/**
* 批量申请时 返回本次申请用dto
*/
@Data
@ApiModel(value = "批量申请时 返回本次申请用dto")
public class TAbilityApplicationV2DTO implements Serializable {
private Long id;
@ApiModelProperty(value = "申请人")
private String user;
@ApiModelProperty(value = "申请人电话")
private String phone;
@ApiModelProperty(value = "申请人单位")
private String unit;
@ApiModelProperty(value = "申请人所在地区")
private String area;
@ApiModelProperty(value = "申请应用系统")
private String system;
@ApiModelProperty(value = "申请场景")
private String scene;
@ApiModelProperty(value = "申请依据")
private String basis;
@ApiModelProperty(value = "申请附件")
private String attachment;
@ApiModelProperty(value = "附件")
private String enclosure;
@ApiModelProperty(value = "附件文件名")
private String enclosureName;
@ApiModelProperty(value = "摄像头ID")
private String cameraList;
@ApiModelProperty(value = "能力申请标题")
private String title;
@ApiModelProperty(value = "应用系统")
private String applicationSystem;
@ApiModelProperty(value = "应用场景")
private List<String> applicationScene;
@ApiModelProperty(value = "应用背景")
private String applicationBackground;
@ApiModelProperty(value = "能力应用期望效果")
private String effectWish;
@ApiModelProperty(value = "申请单标识(同一次的申请标识)")
private String applyFlag;
// 以上为申请时公共信息
@ApiModelProperty(value = "资源申请情况(包含资源信息和流程流转)")
private Map<String, List<Map<String, Object>>> resourceApplication;
public TAbilityApplicationV2DTO() {
}
}

3
renren-admin/src/main/java/io/renren/modules/processForm/dto/TAbilityBatchApplicationDTO.java
View File

@ -49,6 +49,9 @@ public class TAbilityBatchApplicationDTO extends AuditingBaseDTO implements Seri
@ApiModelProperty(value = "附件")
private String enclosure;
@ApiModelProperty(value = "附件文件名")
private String enclosureName;
@ApiModelProperty(value = "摄像头ID数组")
private String cameraList;

25
renren-admin/src/main/java/io/renren/modules/processForm/entity/TAbilityApplicationEntity.java
View File

@ -58,28 +58,22 @@ public class TAbilityApplicationEntity implements Serializable {
* 申请附件
*/
private String attachment;
/**
* 实例ID
*/
private String instanceId;
/**
* 资源id
*/
private String resourceId;
/**
* 用户id
*/
private String userId;
/**
* 审核状态：审核中，通过，不通过
*/
private String approveStatus;
/**
* 删除标记：0:正常使用；1:已删除；9:其他
*/
@ -89,53 +83,52 @@ public class TAbilityApplicationEntity implements Serializable {
* 附件
*/
private String enclosure;
/**
* 附件文件名
*/
private String enclosureName;
/**
* 流程通过后api网关注册的认证code，用于三方接口调用
*/
private String gatewayCode;
/**
* 摄像头列表
*/
private String cameraList;
/**
* 能力申请标题
*/
private String title;
/**
* 应用系统
*/
private String applicationSystem;
/**
* 应用场景
*/
@TableField(value = "`application_scene`", typeHandler = FastjsonTypeHandler.class)
private List<String> applicationScene;
/**
* 应用背景
*/
private String applicationBackground;
/**
* 能力应用期望效果
*/
private String effectWish;
/**
* 申请单标识(同一次的申请标识)
*/
private String applyFlag;
/**
* 资源所属部门信息
*/
@TableField(value = "`resource_owner_dept`", typeHandler = FastjsonTypeHandler.class)
private SysDeptDTO resourceOwnerDept;
/**
* 申请单号
*/
private String applyNumber;
}

10
renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java
View File

@ -116,7 +116,7 @@ public class ResourceController {
@GetMapping("/page")
@ApiOperation("分页查询资源信息")
@LogOperation("分页查询资源信息")
@LogOperation(value = "分页查询资源信息")
@ApiImplicitParams({
@ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType = "int"),
@ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query", required = true, dataType = "int"),
@ -135,7 +135,7 @@ public class ResourceController {
@PostMapping("/pageWithAttrs")
@ApiOperation("分页查询资源信息2")
// @LogOperation("分页查询资源信息2")
@LogOperation("分页查询资源信息2")
public Result pageWithAttrs(@RequestBody JSONObject jsonObject) {
ResourceDTO resourceDTO = JSON.toJavaObject(jsonObject, ResourceDTO.class);
return new Result<>().ok(resourceService.pageWithAttrs(jsonObject, resourceService.selectDTOPageSpecilTotal(resourceDTO)));
@ -223,7 +223,7 @@ public class ResourceController {
@PostMapping("/insert")
@ApiOperation("保存")
@LogOperation("保存")
@LogOperation(value = "保存", operationTable = "tb_data_resource;tb_data_attr;")
@ApiImplicitParams({
@ApiImplicitParam(name = "source", value = "请求来源", paramType = "string", dataType = "string")
})
@ -287,7 +287,7 @@ public class ResourceController {
@PutMapping("/update")
@ApiOperation("修改")
@LogOperation("修改")
@LogOperation(value = "修改", operationTable = "tb_data_resource;tb_data_attr;")
//@RequiresPermissions("resource:resource:update")
public Result update(@RequestBody ResourceDTO dto) {
//效验数据
@ -300,7 +300,7 @@ public class ResourceController {
@PostMapping("/delete")
@ApiOperation("删除")
@LogOperation("删除")
@LogOperation(value = "删除", operationTable = "tb_data_resource;tb_data_attr;")
//@RequiresPermissions("resource:resource:delete")
public Result delete(@RequestBody JSONObject jsonObject) {
resourceService.deleteWithAttrs(jsonObject);

4
renren-admin/src/main/java/io/renren/modules/resourceBrowse/controller/ResourceBrowseController.java
View File

@ -77,7 +77,7 @@ public class ResourceBrowseController {
@PostMapping("/insert")
@ApiOperation("保存浏览记录")
@LogOperation("保存浏览记录")
@LogOperation(value = "保存浏览记录", operationTable = "tb_resource_browse;tb_data_resource;")
//@RequiresPermissions("resourceBrowse:resourcebrowse:save")
public Result save(@RequestBody ResourceBrowseDTO dto) {
//效验数据
@ -111,7 +111,7 @@ public class ResourceBrowseController {
@DeleteMapping("/delete")
@ApiOperation("批量删除浏览记录")
@LogOperation("批量删除浏览记录")
@LogOperation(value = "批量删除浏览记录", operationTable = "tb_resource_browse;")
//@RequiresPermissions("resourceBrowse:resourcebrowse:delete")
public Result delete(@RequestBody Long[] ids) {
//效验数据

6
renren-admin/src/main/java/io/renren/modules/resourceCar/controller/ResourceCarController.java
View File

@ -66,7 +66,7 @@ public class ResourceCarController {
@PostMapping("/insert")
@ApiOperation("添加申购车")
@LogOperation("添加申购车")
@LogOperation(value = "添加申购车", operationTable = "tb_resource_car;")
//@RequiresPermissions("resourceCar:resourcecar:save")
public Result save(@RequestBody ResourceCarDTO dto){
//效验数据
@ -80,8 +80,8 @@ public class ResourceCarController {
}
@DeleteMapping("/delete")
@ApiOperation("删除申购")
@LogOperation("删除申购")
@ApiOperation("删除申购记录")
@LogOperation(value = "删除申购记录", operationTable = "tb_resource_car;")
//@RequiresPermissions("resourceCar:resourcecar:delete")
public Result delete(@RequestBody JSONObject jsonObject){
resourceCarService.deleteByIds(jsonObject);

6
renren-admin/src/main/java/io/renren/modules/resourceCollection/controller/ResourceCollectionController.java
View File

@ -61,7 +61,7 @@ public class ResourceCollectionController {
@PostMapping("/insert")
@ApiOperation("新增收藏")
@LogOperation("新增收藏")
@LogOperation(value = "新增收藏", operationTable = "tb_resource_collection;tb_data_resource;")
//@RequiresPermissions("resourceCollection:resourcecollection:save")
public Result save(@RequestBody List<ResourceCollectionEntity> list){
//效验数据
@ -74,7 +74,7 @@ public class ResourceCollectionController {
@PutMapping("/update")
@ApiOperation("修改")
@LogOperation("修改")
@LogOperation(value = "修改", operationTable = "tb_resource_collection;")
//@RequiresPermissions("resourceCollection:resourcecollection:update")
public Result update(@RequestBody ResourceCollectionDTO dto){
//效验数据
@ -87,7 +87,7 @@ public class ResourceCollectionController {
@DeleteMapping("/delete")
@ApiOperation("取消收藏")
@LogOperation("取消收藏")
@LogOperation(value = "取消收藏", operationTable = "tb_resource_collection;tb_data_resource;")
//@RequiresPermissions("resourceCollection:resourcecollection:delete")
public Result delete(@RequestBody Long[] resourceIds){
//效验数据

2
renren-admin/src/main/java/io/renren/modules/resourceCollection/service/impl/ResourceCollectionServiceImpl.java
View File

@ -100,7 +100,7 @@ public class ResourceCollectionServiceImpl extends CrudServiceImpl<ResourceColle
jdbcTemplate.update(sql);
} else {
collectionEntities.stream().forEach(index -> {
collectionEntities.forEach(index -> {
index.setUpdateDate(new Date());
resourceCollectionDao.updateById(index);
});

3
renren-admin/src/main/java/io/renren/modules/resourceMountApply/dto/TResourceMountApplyDTO.java
View File

@ -47,6 +47,9 @@ public class TResourceMountApplyDTO extends AuditingBaseDTO implements Serializa
@ApiModelProperty(value = "资源id")
private Long resourceId;
@ApiModelProperty(value = "申请单号")
private String applyNumber;
public ResourceDTO getResourceDTO() {
if (this.resourceDTO != null) {
return this.resourceDTO;

1
renren-admin/src/main/java/io/renren/modules/resourceMountApply/dto/TResourceUndercarriageApplyDTO.java
View File

@ -9,7 +9,6 @@ import java.io.Serializable;
import java.util.List;
import java.util.Map;
@Data
@ApiModel(value = "资源下架申请表单")
public class TResourceUndercarriageApplyDTO extends AuditingBaseDTO implements Serializable {

5
renren-admin/src/main/java/io/renren/modules/resourceMountApply/entity/TResourceMountApplyEntity.java
View File

@ -68,4 +68,9 @@ public class TResourceMountApplyEntity extends BaseEntity {
@TableField(value = "resource_dto", typeHandler = FastjsonTypeHandler.class)
private ResourceDTO resourceDTO;
/**
* 申请单号
*/
private String applyNumber;
}

12
renren-admin/src/main/java/io/renren/modules/resourceScore/controller/ResourceScoreController.java
View File

@ -66,8 +66,8 @@ public class ResourceScoreController {
}
@PostMapping("/insert")
@ApiOperation("新增能力评分")
@LogOperation("新增能力评分")
@ApiOperation("新增能力评价")
@LogOperation(value = "新增能力评价", operationTable = "tb_resource_score;")
//@RequiresPermissions("resourceScore:resourcescore:save")
public Result save(@RequestBody ResourceScoreDTO dto){
//效验数据
@ -81,8 +81,8 @@ public class ResourceScoreController {
}
@PutMapping("/update")
@ApiOperation("修改能力评分")
@LogOperation("修改能力评分")
@ApiOperation("修改能力评价")
@LogOperation(value = "修改能力评价", operationTable = "tb_resource_score")
//@RequiresPermissions("resourceScore:resourcescore:update")
public Result update(@RequestBody ResourceScoreDTO dto){
//效验数据
@ -92,8 +92,8 @@ public class ResourceScoreController {
}
@DeleteMapping("/delete")
@ApiOperation("删除能力评分")
@LogOperation("删除能力评分")
@ApiOperation("删除能力评价")
@LogOperation(value = "删除能力评价", operationTable = "tb_resource_score")
//@RequiresPermissions("resourceScore:resourcescore:delete")
public Result delete(@RequestBody Long[] ids){
//效验数据

1
renren-admin/src/main/java/io/renren/modules/workDynamics/service/impl/WorkDynamicsServiceImpl.java
View File

@ -68,6 +68,7 @@ public class WorkDynamicsServiceImpl extends CrudServiceImpl<WorkDynamicsDao, Wo
List<Long> userIdList=sysUserList.stream().map(user->user.getId()).collect(Collectors.toList());
QueryWrapper<WorkDynamicsEntity> wrapper = new QueryWrapper<>();
wrapper.eq("del_flag", 0);
wrapper.orderByDesc("create_date");
if(userIdList.size()>0){
wrapper.in("creator", userIdList);
}

2
renren-admin/src/main/resources/application-dev.yml
View File

@ -36,7 +36,7 @@ spring:
pool-prepared-statements: true
max-pool-prepared-statement-per-connection-size: 20
time-between-eviction-runs-millis: 60000
min-evictable-idle-time-millis: 300000
min-evictable-idle-time-millis: 60000
#Oracle需要打开注释
validation-query: SELECT 1
test-while-idle: true

2
renren-admin/src/main/resources/application.yml
View File

@ -90,7 +90,7 @@ mybatis-plus:
cache-enabled: false
call-setters-on-nulls: true
jdbc-type-for-null: 'null'
# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
#系统上线日期，用于统计能力浏览记录
system:

3
renren-admin/src/main/resources/db/V3.3__ability_application_add_col.sql
View File

@ -1,2 +1,3 @@
alter table `t_ability_application` ADD COLUMN `apply_flag` varchar(255) NULL comment '申请单标识';
alter table `t_ability_application` ADD COLUMN `resource_owner_dept` json NULL comment '资源所属部门信息';
alter table `t_ability_application` ADD COLUMN `resource_owner_dept` json NULL comment '资源所属部门信息';
alter table `t_ability_application` ADD COLUMN `enclosure_name` longtext NULL comment '附件文件名';

4
renren-admin/src/main/resources/ehcache.xml
View File

@ -64,8 +64,8 @@
<cache name="getByToken"
maxElementsInMemory="10000"
eternal="false"
timeToIdleSeconds="60"
timeToLiveSeconds="600"
timeToIdleSeconds="30"
timeToLiveSeconds="60"
overflowToDisk="true"
diskPersistent="true"
memoryStoreEvictionPolicy="LRU"/>

2
renren-admin/src/main/resources/mapper/processForm/TAbilityApplicationDao.xml
View File

@ -19,6 +19,7 @@
<result property="approveStatus" column="approve_status"/>
<result property="delFlag" column="del_flag"/>
<result property="enclosure" column="enclosure"/>
<result property="enclosureName" column="enclosure_name"/>
<result property="gatewayCode" column="gateway_code"/>
<result property="cameraList" column="camera_list"/>
<result property="applicationScene" column="application_scene"
@ -43,6 +44,7 @@
<result property="approveStatus" column="approve_status"/>
<result property="delFlag" column="del_flag"/>
<result property="enclosure" column="enclosure"/>
<result property="enclosureName" column="enclosure_name"/>
<result property="cameraList" column="camera_list"/>
<result property="applicationScene" column="application_scene"
typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>

2
renren-admin/src/main/resources/mapper/resourceCar/ResourceCarDao.xml
View File

@ -125,7 +125,7 @@
AND car.resource_id = res.id
AND car.resource_id = 8888888880000000001
AND car.user_id = #{userId}
AND res.dept_id = 1067246875800000066
AND res.dept_id = #{deptId}
AND car.del_flag = 0)
LIMIT ${pageNum}, ${pageSize}
</select>