From 43a54a8b6131f1b3384a70812b5cba68e65393e7 Mon Sep 17 00:00:00 2001 From: wangjingsheng Date: Sat, 12 Mar 2022 13:55:28 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E6=9E=84=E8=B0=83=E6=95=B4222222?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pms/ocp/common/aspectj/OperLogAspect.java | 23 +++-- .../ocp/controller/ModelBaseController.java | 47 ++++++----- ...lNoteMapper.java => ModelAuditMapper.java} | 5 +- ...eMapper.java => ModelSubscribeMapper.java} | 4 +- ...elIssueDTO.java => ModelSubscribeDTO.java} | 2 +- .../{ModelNote.java => ModelAudit.java} | 2 +- .../pms/ocp/model/entity/ModelClassify.java | 3 +- .../pms/ocp/model/entity/ModelProperty.java | 3 +- .../pms/ocp/model/entity/ModelRelation.java | 3 +- .../{ModelIssue.java => ModelSubscribe.java} | 9 +- .../ModelNoteVO.java => vo/ModelAuditVO.java} | 4 +- ...oteService.java => ModelAuditService.java} | 16 ++-- ...ervice.java => ModelSubscribeService.java} | 18 ++-- ...ceImpl.java => ModelAuditServiceImpl.java} | 27 +++--- .../service/impl/ModelIssueServiceImpl.java | 84 ------------------- .../impl/ModelSubscribeServiceImpl.java | 84 +++++++++++++++++++ 16 files changed, 170 insertions(+), 164 deletions(-) rename src/main/java/com/pms/ocp/mapper/{ModelNoteMapper.java => ModelAuditMapper.java} (62%) rename src/main/java/com/pms/ocp/mapper/{ModelIssueMapper.java => ModelSubscribeMapper.java} (66%) rename src/main/java/com/pms/ocp/model/dto/{ModelIssueDTO.java => ModelSubscribeDTO.java} (98%) rename src/main/java/com/pms/ocp/model/entity/{ModelNote.java => ModelAudit.java} (99%) rename src/main/java/com/pms/ocp/model/entity/{ModelIssue.java => ModelSubscribe.java} (88%) rename src/main/java/com/pms/ocp/model/{entity/ModelNoteVO.java => vo/ModelAuditVO.java} (98%) rename src/main/java/com/pms/ocp/service/{ModelNoteService.java => ModelAuditService.java} (68%) rename src/main/java/com/pms/ocp/service/{ModelIssueService.java => ModelSubscribeService.java} (60%) rename src/main/java/com/pms/ocp/service/impl/{ModelNoteServiceImpl.java => ModelAuditServiceImpl.java} (54%) delete mode 100644 src/main/java/com/pms/ocp/service/impl/ModelIssueServiceImpl.java create mode 100644 src/main/java/com/pms/ocp/service/impl/ModelSubscribeServiceImpl.java diff --git a/src/main/java/com/pms/ocp/common/aspectj/OperLogAspect.java b/src/main/java/com/pms/ocp/common/aspectj/OperLogAspect.java index 2fab759..8caf2b7 100644 --- a/src/main/java/com/pms/ocp/common/aspectj/OperLogAspect.java +++ b/src/main/java/com/pms/ocp/common/aspectj/OperLogAspect.java @@ -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) { diff --git a/src/main/java/com/pms/ocp/controller/ModelBaseController.java b/src/main/java/com/pms/ocp/controller/ModelBaseController.java index cfcdda6..ff88e54 100644 --- a/src/main/java/com/pms/ocp/controller/ModelBaseController.java +++ b/src/main/java/com/pms/ocp/controller/ModelBaseController.java @@ -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 opsVOList = modelService.getModelList(objId, modelCode); - PageInfo pageInfo = new PageInfo<>(opsVOList); + List modelList = modelService.getModelList(objId, modelCode); + PageInfo 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 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 modelSubscribeList = modelSubscribeService.getModelIssueList(objId, modelCode, subsCompanyCode); + PageInfo 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 modelNoteList = modelNoteService.getModelNoteList(modelCode); + List 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 modelNoteList = modelNoteService.getModelNoteList(modelCode); + List modelAuditList = modelAuditService.getModelNoteList(modelCode); //users集合转成export集合 - List exportVOList = modelNoteList.stream().map(modelNote -> { - ModelNoteVO vo = new ModelNoteVO(); + List 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(); } diff --git a/src/main/java/com/pms/ocp/mapper/ModelNoteMapper.java b/src/main/java/com/pms/ocp/mapper/ModelAuditMapper.java similarity index 62% rename from src/main/java/com/pms/ocp/mapper/ModelNoteMapper.java rename to src/main/java/com/pms/ocp/mapper/ModelAuditMapper.java index b0d7d9d..735ae37 100644 --- a/src/main/java/com/pms/ocp/mapper/ModelNoteMapper.java +++ b/src/main/java/com/pms/ocp/mapper/ModelAuditMapper.java @@ -1,8 +1,7 @@ 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 { +public interface ModelAuditMapper extends BaseMapper { } diff --git a/src/main/java/com/pms/ocp/mapper/ModelIssueMapper.java b/src/main/java/com/pms/ocp/mapper/ModelSubscribeMapper.java similarity index 66% rename from src/main/java/com/pms/ocp/mapper/ModelIssueMapper.java rename to src/main/java/com/pms/ocp/mapper/ModelSubscribeMapper.java index 4d5f32d..0f23d06 100644 --- a/src/main/java/com/pms/ocp/mapper/ModelIssueMapper.java +++ b/src/main/java/com/pms/ocp/mapper/ModelSubscribeMapper.java @@ -1,7 +1,7 @@ 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 { +public interface ModelSubscribeMapper extends BaseMapper { } diff --git a/src/main/java/com/pms/ocp/model/dto/ModelIssueDTO.java b/src/main/java/com/pms/ocp/model/dto/ModelSubscribeDTO.java similarity index 98% rename from src/main/java/com/pms/ocp/model/dto/ModelIssueDTO.java rename to src/main/java/com/pms/ocp/model/dto/ModelSubscribeDTO.java index 3e50e51..9b75540 100644 --- a/src/main/java/com/pms/ocp/model/dto/ModelIssueDTO.java +++ b/src/main/java/com/pms/ocp/model/dto/ModelSubscribeDTO.java @@ -16,7 +16,7 @@ import java.time.LocalDateTime; @ApiModel(value = "模型订阅DTO对象") @Data -public class ModelIssueDTO { +public class ModelSubscribeDTO { /** * 模型属性编号 diff --git a/src/main/java/com/pms/ocp/model/entity/ModelNote.java b/src/main/java/com/pms/ocp/model/entity/ModelAudit.java similarity index 99% rename from src/main/java/com/pms/ocp/model/entity/ModelNote.java rename to src/main/java/com/pms/ocp/model/entity/ModelAudit.java index f1233f0..0ba1f14 100644 --- a/src/main/java/com/pms/ocp/model/entity/ModelNote.java +++ b/src/main/java/com/pms/ocp/model/entity/ModelAudit.java @@ -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; diff --git a/src/main/java/com/pms/ocp/model/entity/ModelClassify.java b/src/main/java/com/pms/ocp/model/entity/ModelClassify.java index 888534c..4bcb250 100644 --- a/src/main/java/com/pms/ocp/model/entity/ModelClassify.java +++ b/src/main/java/com/pms/ocp/model/entity/ModelClassify.java @@ -1,5 +1,6 @@ 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; /** diff --git a/src/main/java/com/pms/ocp/model/entity/ModelProperty.java b/src/main/java/com/pms/ocp/model/entity/ModelProperty.java index 5934482..07d6833 100644 --- a/src/main/java/com/pms/ocp/model/entity/ModelProperty.java +++ b/src/main/java/com/pms/ocp/model/entity/ModelProperty.java @@ -1,5 +1,6 @@ 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; /** diff --git a/src/main/java/com/pms/ocp/model/entity/ModelRelation.java b/src/main/java/com/pms/ocp/model/entity/ModelRelation.java index cd074c0..66fb959 100644 --- a/src/main/java/com/pms/ocp/model/entity/ModelRelation.java +++ b/src/main/java/com/pms/ocp/model/entity/ModelRelation.java @@ -1,5 +1,6 @@ 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; /** diff --git a/src/main/java/com/pms/ocp/model/entity/ModelIssue.java b/src/main/java/com/pms/ocp/model/entity/ModelSubscribe.java similarity index 88% rename from src/main/java/com/pms/ocp/model/entity/ModelIssue.java rename to src/main/java/com/pms/ocp/model/entity/ModelSubscribe.java index a0d865d..c10d84a 100644 --- a/src/main/java/com/pms/ocp/model/entity/ModelIssue.java +++ b/src/main/java/com/pms/ocp/model/entity/ModelSubscribe.java @@ -1,5 +1,6 @@ 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; } diff --git a/src/main/java/com/pms/ocp/model/entity/ModelNoteVO.java b/src/main/java/com/pms/ocp/model/vo/ModelAuditVO.java similarity index 98% rename from src/main/java/com/pms/ocp/model/entity/ModelNoteVO.java rename to src/main/java/com/pms/ocp/model/vo/ModelAuditVO.java index da5cf82..8b1c4c9 100644 --- a/src/main/java/com/pms/ocp/model/entity/ModelNoteVO.java +++ b/src/main/java/com/pms/ocp/model/vo/ModelAuditVO.java @@ -1,4 +1,4 @@ -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 { /** * 模型事记编号 diff --git a/src/main/java/com/pms/ocp/service/ModelNoteService.java b/src/main/java/com/pms/ocp/service/ModelAuditService.java similarity index 68% rename from src/main/java/com/pms/ocp/service/ModelNoteService.java rename to src/main/java/com/pms/ocp/service/ModelAuditService.java index fe8489d..cfd13e3 100644 --- a/src/main/java/com/pms/ocp/service/ModelNoteService.java +++ b/src/main/java/com/pms/ocp/service/ModelAuditService.java @@ -1,6 +1,6 @@ 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 getModelNoteList(String modelCode); + List getModelNoteList(String modelCode); /** * 获取模型事记列表 @@ -50,7 +50,7 @@ public interface ModelNoteService { * @param modelId * @return */ - ModelNote getModelNote(String modelId); + ModelAudit getModelNote(String modelId); // /** // * 获取模型事记 diff --git a/src/main/java/com/pms/ocp/service/ModelIssueService.java b/src/main/java/com/pms/ocp/service/ModelSubscribeService.java similarity index 60% rename from src/main/java/com/pms/ocp/service/ModelIssueService.java rename to src/main/java/com/pms/ocp/service/ModelSubscribeService.java index 5bc4f98..d4f991c 100644 --- a/src/main/java/com/pms/ocp/service/ModelIssueService.java +++ b/src/main/java/com/pms/ocp/service/ModelSubscribeService.java @@ -1,7 +1,7 @@ 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 getModelIssueList(String objId, String modelCode, String subsCompanyCode); + List 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); } diff --git a/src/main/java/com/pms/ocp/service/impl/ModelNoteServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelAuditServiceImpl.java similarity index 54% rename from src/main/java/com/pms/ocp/service/impl/ModelNoteServiceImpl.java rename to src/main/java/com/pms/ocp/service/impl/ModelAuditServiceImpl.java index b3c355c..4ff3e4e 100644 --- a/src/main/java/com/pms/ocp/service/impl/ModelNoteServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ModelAuditServiceImpl.java @@ -1,10 +1,9 @@ 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 getModelNoteList(String modelCode) { + public List getModelNoteList(String modelCode) { - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.lambda().eq(ModelNote::getModelCode, modelCode); - return modelNoteMapper.selectList(wrapper); + QueryWrapper 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; } diff --git a/src/main/java/com/pms/ocp/service/impl/ModelIssueServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelIssueServiceImpl.java deleted file mode 100644 index 09593cf..0000000 --- a/src/main/java/com/pms/ocp/service/impl/ModelIssueServiceImpl.java +++ /dev/null @@ -1,84 +0,0 @@ -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 org.apache.commons.lang3.StringUtils; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.time.LocalDateTime; -import java.util.List; - -/** - * @Auther: wangjian - * @Date: 2022/2/22 16:22 - * @Description:模型订阅业务层实现 - */ - -@Service -public class ModelIssueServiceImpl implements ModelIssueService { - - @Autowired - private ModelIssueMapper modelIssueMapper; - - @Override - public Integer createModelIssue(ModelIssueDTO modelIssueDTO) { - - ModelIssue modelIssue = new ModelIssue(); - - BeanUtils.copyProperties(modelIssueDTO, modelIssue); - - modelIssue.setSubsCtime(LocalDateTime.now()); - - return modelIssueMapper.insert(modelIssue); - } - - @Override - public Integer deleteModelIssue(String modelId) { - return null; - } - - /** - * 批量删除模型订阅 - * - * @param ids - * @return - */ - @Override - public Integer deleteBatchModelIssue(List ids) { - return modelIssueMapper.deleteBatchIds(ids); - } - - @Override - public Integer updateModelIssue(ModelIssue modelIssue) { - return null; - } - - @Override - public List getModelIssueList(String objId, String modelCode, String subsCompanyCode) { - QueryWrapper queryWrapper = new QueryWrapper(); - - if (StringUtils.isNotEmpty(objId)) { - queryWrapper.lambda().eq(ModelIssue::getObjId, objId); - } - - if (StringUtils.isNotEmpty(modelCode)) { - queryWrapper.lambda().eq(ModelIssue::getModelCode, modelCode); - } - - if (StringUtils.isNotEmpty(subsCompanyCode)) { - queryWrapper.lambda().eq(ModelIssue::getSubsCompanyCode, subsCompanyCode); - } - - return modelIssueMapper.selectList(queryWrapper); - } - - @Override - public ModelIssueDTO getModelIssue(String modelId) { - return null; - } -} diff --git a/src/main/java/com/pms/ocp/service/impl/ModelSubscribeServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelSubscribeServiceImpl.java new file mode 100644 index 0000000..478a8eb --- /dev/null +++ b/src/main/java/com/pms/ocp/service/impl/ModelSubscribeServiceImpl.java @@ -0,0 +1,84 @@ +package com.pms.ocp.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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; +import org.springframework.stereotype.Service; + +import java.time.LocalDateTime; +import java.util.List; + +/** + * @Auther: wangjian + * @Date: 2022/2/22 16:22 + * @Description:模型订阅业务层实现 + */ + +@Service +public class ModelSubscribeServiceImpl implements ModelSubscribeService { + + @Autowired + private ModelSubscribeMapper modelSubscribeMapper; + + @Override + public Integer createModelIssue(ModelSubscribeDTO modelSubscribeDTO) { + + ModelSubscribe modelSubscribe = new ModelSubscribe(); + + BeanUtils.copyProperties(modelSubscribeDTO, modelSubscribe); + + modelSubscribe.setSubsCtime(LocalDateTime.now()); + + return modelSubscribeMapper.insert(modelSubscribe); + } + + @Override + public Integer deleteModelIssue(String modelId) { + return null; + } + + /** + * 批量删除模型订阅 + * + * @param ids + * @return + */ + @Override + public Integer deleteBatchModelIssue(List ids) { + return modelSubscribeMapper.deleteBatchIds(ids); + } + + @Override + public Integer updateModelIssue(ModelSubscribe modelSubscribe) { + return null; + } + + @Override + public List getModelIssueList(String objId, String modelCode, String subsCompanyCode) { + QueryWrapper queryWrapper = new QueryWrapper(); + + if (StringUtils.isNotEmpty(objId)) { + queryWrapper.lambda().eq(ModelSubscribe::getObjId, objId); + } + + if (StringUtils.isNotEmpty(modelCode)) { + queryWrapper.lambda().eq(ModelSubscribe::getModelCode, modelCode); + } + + if (StringUtils.isNotEmpty(subsCompanyCode)) { + queryWrapper.lambda().eq(ModelSubscribe::getSubsCompanyCode, subsCompanyCode); + } + + return modelSubscribeMapper.selectList(queryWrapper); + } + + @Override + public ModelSubscribeDTO getModelIssue(String modelId) { + return null; + } +} -- 2.26.0