Skip to content

O
operation-control-platform
Commit 43a54a8b authored by 王锦盛's avatar 王锦盛
Browse files
Options

结构调整222222

parent c8e3209f
Hide whitespace changes
Inline Side-by-side
Showing with 170 additions and 80 deletions
src/main/java/com/pms/ocp/common/aspectj/OperLogAspect.java
View file @ 43a54a8b
......@@ -2,9 +2,8 @@ package com.pms.ocp.common.aspectj;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.PropertyFilter;
import com.pms.ocp.model.entity.ModelNote;
import com.pms.ocp.service.ModelNoteService;
import com.sun.xml.internal.bind.v2.TODO;
import com.pms.ocp.model.entity.ModelAudit;
import com.pms.ocp.service.ModelAuditService;
import org.apache.commons.lang3.StringUtils;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.ProceedingJoinPoint;
......@@ -39,7 +38,7 @@ import java.time.LocalDateTime;
public class OperLogAspect {
@Autowired
private ModelNoteService modelNoteService;
private ModelAuditService modelAuditService;
private static Logger logger = LoggerFactory.getLogger(OperLogAspect.class);
......@@ -65,25 +64,25 @@ public class OperLogAspect {
private void saveSysLog(ProceedingJoinPoint point, long time, Object obj) {
MethodSignature signature = (MethodSignature) point.getSignature();
Method method = signature.getMethod();
ModelNote modelNote = new ModelNote();
ModelAudit modelAudit = new ModelAudit();
OperLog operLog = method.getAnnotation(OperLog.class);
if (operLog != null) {
String content = operLog.value();
modelNote.setAuditType(operLog.auditType());
modelNote.setAuditMessageJson(content);
modelAudit.setAuditType(operLog.auditType());
modelAudit.setAuditMessageJson(content);
}
//请求的方法名
// String className = point.getTarget().getClass().getName();
String methodName = signature.getName();
// dto.setMethod(className + "." + methodName + "()");
//设置操作类型
if (modelNote.getAuditType() == 3) {
modelNote.setOperStatus(getOperateType(methodName, operLog.operStatus()));
if (modelAudit.getAuditType() == 3) {
modelAudit.setOperStatus(getOperateType(methodName, operLog.operStatus()));
}
//获取request
HttpServletRequest request = getHttpServletRequest();
//请求的参数
modelNote.setAuditMessageJson(getRequestParams(request, point));
modelAudit.setAuditMessageJson(getRequestParams(request, point));
// //设置ip地址
// dto.setIp(getIpAddr(request));
//获取用户登录信息
......@@ -94,9 +93,9 @@ public class OperLogAspect {
// modelNote.setUsername(user.getPassWord());
// }
// modelNote.setCostTime(time);
modelNote.setAuditCtime(LocalDateTime.now());
modelAudit.setAuditCtime(LocalDateTime.now());
modelNoteService.createModelNote(modelNote);
modelAuditService.createModelNote(modelAudit);
}
private int getOperateType(String methodName, int operateType) {
......
src/main/java/com/pms/ocp/controller/ModelBaseController.java
View file @ 43a54a8b
......@@ -4,19 +4,19 @@ import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.pms.ocp.common.utils.ExcelUtils;
import com.pms.ocp.model.dto.ModelDTO;
import com.pms.ocp.model.dto.ModelIssueDTO;
import com.pms.ocp.model.dto.ModelSubscribeDTO;
import com.pms.ocp.model.dto.ModelPropertyDTO;
import com.pms.ocp.model.dto.ModelRelationDTO;
import com.pms.ocp.model.entity.Model;
import com.pms.ocp.model.entity.ModelNote;
import com.pms.ocp.model.entity.ModelNoteVO;
import com.pms.ocp.model.entity.ModelSubscribe;
import com.pms.ocp.model.entity.ModelAudit;
import com.pms.ocp.model.vo.ModelAuditVO;
import com.pms.ocp.model.vo.ResponseVO;
import com.pms.ocp.service.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
......@@ -27,8 +27,6 @@ import java.io.IOException;
import java.util.List;
import java.util.stream.Collectors;
import static com.pms.ocp.common.constants.CodeEnum.REQUIRED_PARAMETER_EMPTY;
/**
* @Auther: wangjian
* @Date: 2022/2/21 16:17
......@@ -48,10 +46,10 @@ public class ModelBaseController {
private ModelPropertyService modelPropertyService;
@Autowired
private ModelNoteService modelNoteService;
private ModelAuditService modelAuditService;
@Autowired
private ModelIssueService modelIssueService;
private ModelSubscribeService modelSubscribeService;
@Autowired
private ModelRelationService modelRelationService;
......@@ -81,8 +79,8 @@ public class ModelBaseController {
@ApiParam(value = "每页数量") @RequestParam(value = "pageSize", required = false) Integer pageSize) {
PageHelper.startPage(currentPage, pageSize);
List<Model> opsVOList = modelService.getModelList(objId, modelCode);
PageInfo<Model> pageInfo = new PageInfo<>(opsVOList);
List<Model> modelList = modelService.getModelList(objId, modelCode);
PageInfo<Model> pageInfo = new PageInfo<>(modelList);
return ResponseVO.ok(pageInfo);
}
......@@ -151,8 +149,8 @@ public class ModelBaseController {
*/
@ApiOperation("模型订阅-增加")
@PostMapping("/create/model/subscribe")
public ResponseVO createModelSubscribe(@RequestBody ModelIssueDTO modelIssueDTO) {
return ResponseVO.ok(modelIssueService.createModelIssue(modelIssueDTO));
public ResponseVO createModelSubscribe(@RequestBody ModelSubscribeDTO modelSubscribeDTO) {
return ResponseVO.ok(modelSubscribeService.createModelIssue(modelSubscribeDTO));
}
/**
......@@ -163,7 +161,7 @@ public class ModelBaseController {
@ApiOperation("模型订阅-删除/批量删除")
@PostMapping("/delete/model/subscribe")
public ResponseVO deleteModelSubscribe(@ApiParam(value = "订阅编号集合") @RequestBody List<String> ids) {
return ResponseVO.ok(modelIssueService.deleteBatchModelIssue(ids));
return ResponseVO.ok(modelSubscribeService.deleteBatchModelIssue(ids));
}
/**
......@@ -175,8 +173,15 @@ public class ModelBaseController {
@GetMapping("/get/model/subscribe")
public ResponseVO getModelSubscribe(@ApiParam(value = "模型订阅编号") @RequestParam(value = "objId", required = false) String objId,
@ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode,
@ApiParam(value = "订阅公司编码") @RequestParam(value = "subsCompanyCode", required = false) String subsCompanyCode) {
return ResponseVO.ok(modelIssueService.getModelIssueList(objId, modelCode, subsCompanyCode));
@ApiParam(value = "订阅公司编码") @RequestParam(value = "subsCompanyCode", required = false) String subsCompanyCode,
@ApiParam(value = "当前页") @RequestParam(value = "currentPage", required = false) Integer currentPage,
@ApiParam(value = "每页数量") @RequestParam(value = "pageSize", required = false) Integer pageSize) {
PageHelper.startPage(currentPage, pageSize);
List<ModelSubscribe> modelSubscribeList = modelSubscribeService.getModelIssueList(objId, modelCode, subsCompanyCode);
PageInfo<ModelSubscribe> pageInfo = new PageInfo<>(modelSubscribeList);
return ResponseVO.ok(pageInfo);
}
/**
......@@ -188,9 +193,9 @@ public class ModelBaseController {
@GetMapping("/get/model/note")
public ResponseVO getModelNote(@RequestParam(value = "modelCode") String modelCode) {
List<ModelNote> modelNoteList = modelNoteService.getModelNoteList(modelCode);
List<ModelAudit> modelAuditList = modelAuditService.getModelNoteList(modelCode);
return ResponseVO.ok(modelNoteList);
return ResponseVO.ok(modelAuditList);
}
/**
......@@ -214,16 +219,16 @@ public class ModelBaseController {
public ResponseVO exportModelNote(HttpServletResponse response,
@ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode) throws IOException {
// 查询要导出的数据
List<ModelNote> modelNoteList = modelNoteService.getModelNoteList(modelCode);
List<ModelAudit> modelAuditList = modelAuditService.getModelNoteList(modelCode);
//users集合转成export集合
List<ModelNoteVO> exportVOList = modelNoteList.stream().map(modelNote -> {
ModelNoteVO vo = new ModelNoteVO();
List<ModelAuditVO> exportVOList = modelAuditList.stream().map(modelNote -> {
ModelAuditVO vo = new ModelAuditVO();
BeanUtils.copyProperties(modelNote, vo);
return vo;
}).collect(Collectors.toList());
ExcelUtils.exportExcel(response, "测试导出模型事记", "测试导出模型事记", "测试导出模型事记.xlsx", exportVOList, ModelNoteVO.class);
ExcelUtils.exportExcel(response, "测试导出模型事记", "测试导出模型事记", "测试导出模型事记.xlsx", exportVOList, ModelAuditVO.class);
return ResponseVO.ok();
}
......
src/main/java/com/pms/ocp/mapper/ModelNoteMapper.java → src/main/java/com/pms/ocp/mapper/ModelAuditMapper.java
View file @ 43a54a8b
package com.pms.ocp.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.pms.ocp.model.entity.Model;
import com.pms.ocp.model.entity.ModelNote;
import com.pms.ocp.model.entity.ModelAudit;
import org.apache.ibatis.annotations.Mapper;
/**
......@@ -12,5 +11,5 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface ModelNoteMapper extends BaseMapper<ModelNote> {
public interface ModelAuditMapper extends BaseMapper<ModelAudit> {
}
src/main/java/com/pms/ocp/mapper/ModelIssueMapper.java → src/main/java/com/pms/ocp/mapper/ModelSubscribeMapper.java
View file @ 43a54a8b
package com.pms.ocp.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.pms.ocp.model.entity.ModelIssue;
import com.pms.ocp.model.entity.ModelSubscribe;
import org.apache.ibatis.annotations.Mapper;
/**
......@@ -11,5 +11,5 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface ModelIssueMapper extends BaseMapper<ModelIssue> {
public interface ModelSubscribeMapper extends BaseMapper<ModelSubscribe> {
}
src/main/java/com/pms/ocp/model/dto/ModelIssueDTO.java → src/main/java/com/pms/ocp/model/dto/ModelSubscribeDTO.java
View file @ 43a54a8b
......@@ -16,7 +16,7 @@ import java.time.LocalDateTime;
@ApiModel(value = "模型订阅DTO对象")
@Data
public class ModelIssueDTO {
public class ModelSubscribeDTO {
/**
* 模型属性编号
......
src/main/java/com/pms/ocp/model/entity/ModelNote.java → src/main/java/com/pms/ocp/model/entity/ModelAudit.java
View file @ 43a54a8b
......@@ -15,7 +15,7 @@ import java.time.LocalDateTime;
@Data
@TableName("ocp_model_audit")
public class ModelNote {
public class ModelAudit {
@TableId(value = "obj_id", type = IdType.ASSIGN_ID)
private String objId;
......
src/main/java/com/pms/ocp/model/entity/ModelClassify.java
View file @ 43a54a8b
package com.pms.ocp.model.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
......@@ -23,7 +24,7 @@ public class ModelClassify {
/**
* 模型分类编号
*/
@TableId
@TableId(value = "obj_id", type = IdType.ASSIGN_ID)
private String objId;
/**
......
src/main/java/com/pms/ocp/model/entity/ModelProperty.java
View file @ 43a54a8b
package com.pms.ocp.model.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
......@@ -27,7 +28,7 @@ public class ModelProperty{
/**
* 模型属性编号
*/
@TableId
@TableId(value = "obj_id", type = IdType.ASSIGN_ID)
private String objId;
/**
......
src/main/java/com/pms/ocp/model/entity/ModelRelation.java
View file @ 43a54a8b
package com.pms.ocp.model.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
......@@ -25,7 +26,7 @@ public class ModelRelation {
* 模型关系编号
* 主键
*/
@TableId(value = "obj_id")
@TableId(value = "obj_id", type = IdType.ASSIGN_ID)
private String objId;
/**
......
src/main/java/com/pms/ocp/model/entity/ModelIssue.java → src/main/java/com/pms/ocp/model/entity/ModelSubscribe.java
View file @ 43a54a8b
package com.pms.ocp.model.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
......@@ -19,12 +20,12 @@ import java.util.Date;
@Data
@Accessors(chain = true)
@TableName("ocp_model_subs")
public class ModelIssue {
public class ModelSubscribe {
/**
* 模型订阅编号
*/
@TableId(value = "obj_id")
@TableId(value = "obj_id", type = IdType.ASSIGN_ID)
private String objId;
/**
......@@ -56,14 +57,14 @@ public class ModelIssue {
* 订阅时间
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime subsCtime;
/**
* 修改时间
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime subsMtime;
}
......
src/main/java/com/pms/ocp/model/entity/ModelNoteVO.java → src/main/java/com/pms/ocp/model/vo/ModelAuditVO.java
View file @ 43a54a8b
package com.pms.ocp.model.entity;
package com.pms.ocp.model.vo;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
......@@ -17,7 +17,7 @@ import java.time.LocalDateTime;
@ApiModel(value = "模型事记VO对象")
@Data
public class ModelNoteVO {
public class ModelAuditVO {
/**
* 模型事记编号
......
src/main/java/com/pms/ocp/service/ModelNoteService.java → src/main/java/com/pms/ocp/service/ModelAuditService.java
View file @ 43a54a8b
package com.pms.ocp.service;
import com.pms.ocp.model.entity.ModelNote;
import com.pms.ocp.model.entity.ModelAudit;
import java.util.List;
......@@ -10,15 +10,15 @@ import java.util.List;
* @Description:模型事记业务层接口
*/
public interface ModelNoteService {
public interface ModelAuditService {
/**
* 创建模型事记
*
* @param modelNote
* @param modelAudit
* @return
*/
Integer createModelNote(ModelNote modelNote);
Integer createModelNote(ModelAudit modelAudit);
/**
* 删除模型事记
......@@ -31,10 +31,10 @@ public interface ModelNoteService {
/**
* 更新模型事记
*
* @param modelNote
* @param modelAudit
* @return
*/
Integer updateModelNote(ModelNote modelNote);
Integer updateModelNote(ModelAudit modelAudit);
/**
* 获取模型事记
......@@ -42,7 +42,7 @@ public interface ModelNoteService {
* @param
* @return
*/
List<ModelNote> getModelNoteList(String modelCode);
List<ModelAudit> getModelNoteList(String modelCode);
/**
* 获取模型事记列表
......@@ -50,7 +50,7 @@ public interface ModelNoteService {
* @param modelId
* @return
*/
ModelNote getModelNote(String modelId);
ModelAudit getModelNote(String modelId);
// /**
// * 获取模型事记
......
src/main/java/com/pms/ocp/service/ModelIssueService.java → src/main/java/com/pms/ocp/service/ModelSubscribeService.java
View file @ 43a54a8b
package com.pms.ocp.service;
import com.pms.ocp.model.dto.ModelIssueDTO;
import com.pms.ocp.model.entity.ModelIssue;
import com.pms.ocp.model.dto.ModelSubscribeDTO;
import com.pms.ocp.model.entity.ModelSubscribe;
import java.util.List;
......@@ -10,15 +10,15 @@ import java.util.List;
* @Date: 2022/2/22 16:07
* @Description:模型订阅业务层接口
*/
public interface ModelIssueService {
public interface ModelSubscribeService {
/**
* 创建模型订阅
*
* @param modelIssueDTO
* @param modelSubscribeDTO
* @return
*/
Integer createModelIssue(ModelIssueDTO modelIssueDTO);
Integer createModelIssue(ModelSubscribeDTO modelSubscribeDTO);
/**
* 删除模型订阅
......@@ -39,10 +39,10 @@ public interface ModelIssueService {
/**
* 更新模型订阅
*
* @param modelIssue
* @param modelSubscribe
* @return
*/
Integer updateModelIssue(ModelIssue modelIssue);
Integer updateModelIssue(ModelSubscribe modelSubscribe);
/**
* 获取模型订阅
......@@ -50,7 +50,7 @@ public interface ModelIssueService {
* @param
* @return
*/
List<ModelIssue> getModelIssueList(String objId, String modelCode, String subsCompanyCode);
List<ModelSubscribe> getModelIssueList(String objId, String modelCode, String subsCompanyCode);
/**
* 获取模型订阅列表
......@@ -58,5 +58,5 @@ public interface ModelIssueService {
* @param modelId
* @return
*/
ModelIssueDTO getModelIssue(String modelId);
ModelSubscribeDTO getModelIssue(String modelId);
}
src/main/java/com/pms/ocp/service/impl/ModelNoteServiceImpl.java → src/main/java/com/pms/ocp/service/impl/ModelAuditServiceImpl.java
View file @ 43a54a8b
package com.pms.ocp.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.pms.ocp.common.utils.ExcelUtils;
import com.pms.ocp.mapper.ModelNoteMapper;
import com.pms.ocp.model.entity.ModelNote;
import com.pms.ocp.service.ModelNoteService;
import com.pms.ocp.mapper.ModelAuditMapper;
import com.pms.ocp.model.entity.ModelAudit;
import com.pms.ocp.service.ModelAuditService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -17,14 +16,14 @@ import java.util.List;
*/
@Service
public class ModelNoteServiceImpl implements ModelNoteService {
public class ModelAuditServiceImpl implements ModelAuditService {
@Autowired
private ModelNoteMapper modelNoteMapper;
private ModelAuditMapper modelAuditMapper;
@Override
public Integer createModelNote(ModelNote modelNote) {
return modelNoteMapper.insert(modelNote);
public Integer createModelNote(ModelAudit modelAudit) {
return modelAuditMapper.insert(modelAudit);
}
@Override
......@@ -33,20 +32,20 @@ public class ModelNoteServiceImpl implements ModelNoteService {
}
@Override
public Integer updateModelNote(ModelNote modelNote) {
public Integer updateModelNote(ModelAudit modelAudit) {
return null;
}
@Override
public List<ModelNote> getModelNoteList(String modelCode) {
public List<ModelAudit> getModelNoteList(String modelCode) {
QueryWrapper<ModelNote> wrapper = new QueryWrapper<>();
wrapper.lambda().eq(ModelNote::getModelCode, modelCode);
return modelNoteMapper.selectList(wrapper);
QueryWrapper<ModelAudit> wrapper = new QueryWrapper<>();
wrapper.lambda().eq(ModelAudit::getModelCode, modelCode);
return modelAuditMapper.selectList(wrapper);
}
@Override
public ModelNote getModelNote(String modelId) {
public ModelAudit getModelNote(String modelId) {
return null;
}
......
src/main/java/com/pms/ocp/service/impl/ModelIssueServiceImpl.java → src/main/java/com/pms/ocp/service/impl/ModelSubscribeServiceImpl.java
View file @ 43a54a8b
package com.pms.ocp.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.pms.ocp.mapper.ModelIssueMapper;
import com.pms.ocp.model.dto.ModelIssueDTO;
import com.pms.ocp.model.entity.ModelIssue;
import com.pms.ocp.service.ModelIssueService;
import com.pms.ocp.mapper.ModelSubscribeMapper;
import com.pms.ocp.model.dto.ModelSubscribeDTO;
import com.pms.ocp.model.entity.ModelSubscribe;
import com.pms.ocp.service.ModelSubscribeService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -20,21 +20,21 @@ import java.util.List;
*/
@Service
public class ModelIssueServiceImpl implements ModelIssueService {
public class ModelSubscribeServiceImpl implements ModelSubscribeService {
@Autowired
private ModelIssueMapper modelIssueMapper;
private ModelSubscribeMapper modelSubscribeMapper;
@Override
public Integer createModelIssue(ModelIssueDTO modelIssueDTO) {
public Integer createModelIssue(ModelSubscribeDTO modelSubscribeDTO) {
ModelIssue modelIssue = new ModelIssue();
ModelSubscribe modelSubscribe = new ModelSubscribe();
BeanUtils.copyProperties(modelIssueDTO, modelIssue);
BeanUtils.copyProperties(modelSubscribeDTO, modelSubscribe);
modelIssue.setSubsCtime(LocalDateTime.now());
modelSubscribe.setSubsCtime(LocalDateTime.now());
return modelIssueMapper.insert(modelIssue);
return modelSubscribeMapper.insert(modelSubscribe);
}
@Override
......@@ -50,35 +50,35 @@ public class ModelIssueServiceImpl implements ModelIssueService {
*/
@Override
public Integer deleteBatchModelIssue(List<String> ids) {
return modelIssueMapper.deleteBatchIds(ids);
return modelSubscribeMapper.deleteBatchIds(ids);
}
@Override
public Integer updateModelIssue(ModelIssue modelIssue) {
public Integer updateModelIssue(ModelSubscribe modelSubscribe) {
return null;
}
@Override
public List<ModelIssue> getModelIssueList(String objId, String modelCode, String subsCompanyCode) {
QueryWrapper<ModelIssue> queryWrapper = new QueryWrapper();
public List<ModelSubscribe> getModelIssueList(String objId, String modelCode, String subsCompanyCode) {
QueryWrapper<ModelSubscribe> queryWrapper = new QueryWrapper();
if (StringUtils.isNotEmpty(objId)) {
queryWrapper.lambda().eq(ModelIssue::getObjId, objId);
queryWrapper.lambda().eq(ModelSubscribe::getObjId, objId);
}
if (StringUtils.isNotEmpty(modelCode)) {
queryWrapper.lambda().eq(ModelIssue::getModelCode, modelCode);
queryWrapper.lambda().eq(ModelSubscribe::getModelCode, modelCode);
}
if (StringUtils.isNotEmpty(subsCompanyCode)) {
queryWrapper.lambda().eq(ModelIssue::getSubsCompanyCode, subsCompanyCode);
queryWrapper.lambda().eq(ModelSubscribe::getSubsCompanyCode, subsCompanyCode);
}
return modelIssueMapper.selectList(queryWrapper);
return modelSubscribeMapper.selectList(queryWrapper);
}
@Override
public ModelIssueDTO getModelIssue(String modelId) {
public ModelSubscribeDTO getModelIssue(String modelId) {
return null;
}
}
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