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 2fab759f31de1b55a2ff96a75d80ae26e164de98..8caf2b7e06b38ea1fe32aad0a5c4ceb119bd34c1 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/common/utils/DataStructureHandleUtils.java b/src/main/java/com/pms/ocp/common/utils/DataStructureHandleUtils.java new file mode 100644 index 0000000000000000000000000000000000000000..d23dd3b63140087cdda860643a923e950f070ac9 --- /dev/null +++ b/src/main/java/com/pms/ocp/common/utils/DataStructureHandleUtils.java @@ -0,0 +1,79 @@ +package com.pms.ocp.common.utils; + +import org.apache.commons.lang3.StringUtils; + +import java.lang.reflect.Field; +import java.math.BigDecimal; +import java.sql.Date; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +/** + * @Auther: wangjian + * @Date: 2022/3/12 13:29 + * @Description:数据结构处理工具类 + */ +public class DataStructureHandleUtils { + /** + * List> 到 List 数据转换 + */ + public static List setList(final List> srcList, Class clazz) { + List list = new ArrayList<>(); + for (int i = 0; i < srcList.size(); i++) { + try { + T t = clazz.newInstance(); + Field[] fields = t.getClass().getDeclaredFields(); + for (Field field : fields) { + if (!"serialVersionUID".equals(field.getName())) { + //设置对象的访问权限，保证对private的属性的访问 + field.setAccessible(true); + //读取配置转换字段名，并从map中取出数据 + Object v = srcList.get(i).get(field.getName()); + field.set(t, convert(v, field.getType())); + } + } + list.add(t); + } catch (Exception ex) { + ex.toString(); + } + + } + ; + return list; + } + + /** + * 字段类型转换 + */ + private static T convert(Object obj, Class type) throws ParseException { + if (obj != null && StringUtils.isNotBlank(obj.toString())) { + if (type.equals(String.class)) { + return (T) obj.toString(); + } else if (type.equals(BigDecimal.class)) { + return (T) new BigDecimal(obj.toString()); + } else if (type.equals(Double.class)) { + return (T) Double.valueOf(obj.toString()); + } else if (type.equals(Integer.class)) { + return (T) Integer.valueOf(obj.toString()); + } else if (type.equals(Date.class)) { + if (obj != null) { + String timeStr = String.valueOf(obj); + String s[] = timeStr.split("T"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + return (T) sdf.parse(s[0] + " " + s[1]); + } else { + return null; + } + } else { + //其他类型转换 + return (T) obj.toString(); + } + + } + return null; + } + +} diff --git a/src/main/java/com/pms/ocp/common/utils/MapUtils.java b/src/main/java/com/pms/ocp/common/utils/MapUtils.java deleted file mode 100644 index 26dc69c0cfaee8ab3c83b067f7080a057cbaf56b..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/common/utils/MapUtils.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.pms.ocp.common.utils; - -import java.util.*; - -/** - * @Author: admin - * @Description: - * @Date: 2021/12/8 9:31 - * @Version: V1.0 - */ -public class MapUtils { - - /** - * Map 排序 - * - * @param map - * @return Map - */ - public static Map> treeMapDesc(Map> map) { - Map> treeMapDesc = new TreeMap<>(new Comparator() { - - @Override - public int compare(Date o1, Date o2) { - return o2.compareTo(o1); - } - }); - for (Map.Entry> e : map.entrySet()) { - treeMapDesc.put(e.getKey(), e.getValue()); - } - return treeMapDesc; - } -} diff --git a/src/main/java/com/pms/ocp/common/utils/PageRequest.java b/src/main/java/com/pms/ocp/common/utils/PageRequest.java index ad0c4bdb2902d1cc779061201f3f12d79c5af9db..3c6b58167316abd87413c3902f4a850c2e5860a6 100644 --- a/src/main/java/com/pms/ocp/common/utils/PageRequest.java +++ b/src/main/java/com/pms/ocp/common/utils/PageRequest.java @@ -10,7 +10,7 @@ import lombok.Data; * @author admin */ @Data -@ApiModel(value = "分页工具类",description = "分页工具类") +@ApiModel(value = "分页工具类", description = "分页工具类") public class PageRequest { private static final long serialVersionUID = 8167917284229912157L; diff --git a/src/main/java/com/pms/ocp/common/utils/RandomStringUtil.java b/src/main/java/com/pms/ocp/common/utils/RandomStringUtils.java similarity index 87% rename from src/main/java/com/pms/ocp/common/utils/RandomStringUtil.java rename to src/main/java/com/pms/ocp/common/utils/RandomStringUtils.java index c90e3e445660af38a92aba009f587c990917ad3b..40c89cd5db23af686181c8361bb62c3a0fd7a50a 100644 --- a/src/main/java/com/pms/ocp/common/utils/RandomStringUtil.java +++ b/src/main/java/com/pms/ocp/common/utils/RandomStringUtils.java @@ -1,15 +1,12 @@ package com.pms.ocp.common.utils; - -import org.apache.commons.lang3.RandomStringUtils; - import java.util.Random; /** * @author zhaochengming * 随机生成字符串 */ -public class RandomStringUtil { +public class RandomStringUtils { /** * length 字符串长度 diff --git a/src/main/java/com/pms/ocp/controller/ModelBaseController.java b/src/main/java/com/pms/ocp/controller/ModelBaseController.java index 61c4932598ad1e5a49387891e12c5982fed9f9b6..ff88e54531281fdb6a411b42ccf1fbee2ca1904c 100644 --- a/src/main/java/com/pms/ocp/controller/ModelBaseController.java +++ b/src/main/java/com/pms/ocp/controller/ModelBaseController.java @@ -1,19 +1,23 @@ package com.pms.ocp.controller; +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.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.*; import org.springframework.web.multipart.MultipartFile; @@ -21,8 +25,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; - -import static com.pms.ocp.common.constants.CodeEnum.REQUIRED_PARAMETER_EMPTY; +import java.util.stream.Collectors; /** * @Auther: wangjian @@ -43,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; @@ -71,8 +74,15 @@ public class ModelBaseController { @ApiOperation("模型-查询") @GetMapping("/get/model") public ResponseVO getModel(@ApiParam(value = "模型订阅编号") @RequestParam(value = "objId", required = false) String objId, - @ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode) { - return ResponseVO.ok(modelService.getModelList(objId, modelCode)); + @ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode, + @ApiParam(value = "当前页") @RequestParam(value = "currentPage", required = false) Integer currentPage, + @ApiParam(value = "每页数量") @RequestParam(value = "pageSize", required = false) Integer pageSize) { + + PageHelper.startPage(currentPage, pageSize); + List modelList = modelService.getModelList(objId, modelCode); + PageInfo pageInfo = new PageInfo<>(modelList); + + return ResponseVO.ok(pageInfo); } /** @@ -139,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)); } /** @@ -151,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)); } /** @@ -163,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); } /** @@ -176,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); } /** @@ -201,9 +218,17 @@ public class ModelBaseController { @PostMapping("export/model/note") public ResponseVO exportModelNote(HttpServletResponse response, @ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode) throws IOException { -// 查询要导出的数据 - List modelNoteList = modelNoteService.getModelNoteList(modelCode); - ExcelUtils.exportExcel(response, "测试导出模型事记", "测试导出模型事记", "测试导出模型事记.xlsx", modelNoteList, ModelNote.class); + // 查询要导出的数据 + List modelAuditList = modelAuditService.getModelNoteList(modelCode); + + //users集合转成export集合 + List exportVOList = modelAuditList.stream().map(modelNote -> { + ModelAuditVO vo = new ModelAuditVO(); + BeanUtils.copyProperties(modelNote, vo); + return vo; + }).collect(Collectors.toList()); + + 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 b0d7d9d18342abdc58c1ee6821c2c7b770a3adb5..735ae37ed245e68fe08d8aa161697351d90e8a4c 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 4d5f32d3277eb56f2633344bfa64a00c10bb984d..0f23d06d2966022e21a2169baae81a42f03f6008 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 3e50e510d7ae5191ca7bb0a2ad98f8595d4b9608..9b7554024e6b53f69bc9c8cc47c5cbd83cbb06a9 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/Model.java b/src/main/java/com/pms/ocp/model/entity/Model.java index 152c3dd7c39b4893191dadb5ae02d2f3527ae624..e79793328f275bc5446b11ff599002b614d97511 100644 --- a/src/main/java/com/pms/ocp/model/entity/Model.java +++ b/src/main/java/com/pms/ocp/model/entity/Model.java @@ -1,6 +1,8 @@ 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; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; @@ -24,7 +26,7 @@ public class Model { * 模型关系编号 * 主键 */ - @TableField("obj_id") + @TableId(value = "obj_id", type = IdType.ASSIGN_ID) private String objId; /** 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 f1233f023811742f993d5d4e951d66b56e59d8a7..0ba1f14e871e5f3a125da42bb558e23fb43a9d81 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 888534cfd2abe5a38ad0825d3392232278be212d..4bcb25033250587c7ab303c714668ac78bfa6079 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 5934482ae4e5bca1ab6fcd07fda1cb7cda65d485..07d6833042b549b6ccd4145930205f0cc28e6bff 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 cd074c00bef0ed539dfd0ea65a18ecf8a46c7e53..66fb95916ddc8440dc997e1f990fd41bef655fd3 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 a0d865d104b5a170c65edbdbd5d35e3dcf0bdb10..c10d84aafdaa30ad0768198ee1ae506ddd922bf8 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/vo/ModelAuditVO.java b/src/main/java/com/pms/ocp/model/vo/ModelAuditVO.java new file mode 100644 index 0000000000000000000000000000000000000000..8b1c4c938f3662fdcfc216a6447e1210cdc84054 --- /dev/null +++ b/src/main/java/com/pms/ocp/model/vo/ModelAuditVO.java @@ -0,0 +1,131 @@ +package com.pms.ocp.model.vo; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDateTime; + +/** + * @Auther: wangjian + * @Date: 2022/2/22 16:52 + * @Description:模型事记记录对象VO + */ + +@ApiModel(value = "模型事记VO对象") +@Data +public class ModelAuditVO { + + /** + * 模型事记编号 + */ + @ApiModelProperty(value = "模型事记编号") + @TableId(value = "obj_id", type = IdType.ASSIGN_ID) + private String objId; + + /** + * 模型编码 + */ + @ApiModelProperty(value = "模型事记编号") + private int modelCode; + + /** + * 属性编码 + */ + @ApiModelProperty(value = "属性代码") + private int propCode; + + /** + * 事记类型 0:人工操作,1:流程管控,3:总部下发 + */ + @ApiModelProperty(value = "事记类型 0:人工操作,1:流程管控,3:总部下发") + private int auditType; + + /** + * 模型异动详情 + */ + @ApiModelProperty(value = "模型异动详情") + private String auditMessageJson; + + /** + * 异动类型 0:新增,1:迭代 + */ + @ApiModelProperty(value = "异动类型 0:新增,1:迭代") + private int operStatus; + + /** + * 异动申请人编号 + */ + @ApiModelProperty(value = "异动申请人编号") + private String applyUserId; + + /** + * 异动申请人姓名 + */ + @ApiModelProperty(value = "异动申请人姓名") + private String applyUserName; + + /** + * 异动时间 + */ + @ApiModelProperty(value = "异动时间") + private long applyTime; + + /** + * 版本 + */ + @ApiModelProperty(value = "版本") + private String applyVersion; + + /** + * 新增时间 + */ + @ApiModelProperty(value = "新增时间") + private LocalDateTime auditCtime; + + /** + * 异动公司编码 + */ + @ApiModelProperty(value = "异动公司编码") + private String auditCompanyCode; + + /** + * 提交人编号 + */ + @ApiModelProperty(value = "提交人编号") + private String auditUserId; + + /** + * 提交人姓名 + */ + @ApiModelProperty(value = "提交人姓名") + private String auditUserName; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "模型事记修改时间") + private LocalDateTime auditMtime; + +} + +// +// COMMENT ON COLUMN public.ocp_model_audit.obj_id IS '主键是'; +// COMMENT ON COLUMN public.ocp_model_audit.model_code IS '模型代码是'; +// COMMENT ON COLUMN public.ocp_model_audit.prop_code IS '属性代码'; +// COMMENT ON COLUMN public.ocp_model_audit.oper_status IS '异动类型0:新增,1:迭代'; +// COMMENT ON COLUMN public.ocp_model_audit.oper_target IS '操作对象0:表，1:属性'; +// COMMENT ON COLUMN public.ocp_model_audit.audit_type IS '事记类型0:人工操作,1:流程管控,3:总部下发'; +// COMMENT ON COLUMN public.ocp_model_audit.audit_message_json IS '模型异动详情'; +// COMMENT ON COLUMN public.ocp_model_audit.apply_user_id IS '异动申请人id'; +// COMMENT ON COLUMN public.ocp_model_audit.apply_user_name IS '异动申请人'; +// COMMENT ON COLUMN public.ocp_model_audit.apply_time IS '异动时间'; +// COMMENT ON COLUMN public.ocp_model_audit.audit_ctime IS '申请时间'; +// COMMENT ON COLUMN public.ocp_model_audit.audit_mtime IS '修改时间'; +// COMMENT ON COLUMN public.ocp_model_audit.apply_version IS '版本'; +// COMMENT ON COLUMN public.ocp_model_audit.audit_company_code IS '异动公司code'; +// COMMENT ON COLUMN public.ocp_model_audit.audit_user_id IS '提交人id'; +// COMMENT ON COLUMN public.ocp_model_audit.audit_user_name IS '提交人姓名'; 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 fe8489d72091d43b55cb57377c3a05fd1671594b..cfd13e3422f8df4ae336f5bdfd21e21b0197a3ed 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 5bc4f985a5ef3be8d77da6e4e0daf6b2ae8f80ad..d4f991c905a8a3fd5dab28141d3e258b98e90f86 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 b3c355cd06b0fc84a1f5f64fb54e0284206e84cb..4ff3e4e3e0f0f027556ebf9f82609090c5f1f8d4 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/ModelClassifyServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelClassifyServiceImpl.java index f4be2d57375c9c32aee0d20da95e063593bdb41a..3fccfd52c569bb748ddf6130060cd8e0d6d69662 100644 --- a/src/main/java/com/pms/ocp/service/impl/ModelClassifyServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ModelClassifyServiceImpl.java @@ -136,7 +136,6 @@ public class ModelClassifyServiceImpl implements ModelClassifyService { return childList; } - /** * 构建树节点 * @author huxiuwu 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 09593cf56f6d60158380e603b9291716f8ac823d..0000000000000000000000000000000000000000 --- 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 0000000000000000000000000000000000000000..478a8ebabe0cc31daa1f2888bc381a671c29783d --- /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; + } +} diff --git a/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java index cdb045d581621843fcc3156cc6863636344112df..e2b12a5624163fe73716b9c3b5ed01c2a7b4d0af 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java @@ -5,11 +5,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pms.ocp.common.utils.RandomStringUtil; +import com.pms.ocp.common.utils.RandomStringUtils; import com.pms.ocp.mapper.OcpApiBaseMapper; import com.pms.ocp.mapper.OcpApiTreeMapper; import com.pms.ocp.model.dto.*; -import com.pms.ocp.model.entity.OcpApiBase; import com.pms.ocp.model.entity.OcpApiGroup; import com.pms.ocp.service.OcpApiTreeService; @@ -19,11 +18,9 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.sql.Date; import java.sql.Timestamp; import java.util.ArrayList; import java.util.List; -import java.util.function.Consumer; @Service @@ -162,7 +159,7 @@ public class OcpApiTreeServiceImpl extends ServiceImpl ocpApiGroups = mapper.selectList(null); for (OcpApiGroup ocpApiGroup : ocpApiGroups) { diff --git a/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java index 1ecc1c1188ed04788646f9ab42d7bab11ad959ab..84f6119f6433b62ea3536100aaff2f68b28be550 100644 --- a/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java @@ -3,15 +3,12 @@ package com.pms.ocp.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pms.ocp.common.utils.RandomStringUtil; +import com.pms.ocp.common.utils.RandomStringUtils; import com.pms.ocp.mapper.TenantBasicManagementMapper; import com.pms.ocp.mapper.TenantMapper; import com.pms.ocp.model.dto.*; -import com.pms.ocp.model.entity.OcpApiGroup; -import com.pms.ocp.model.entity.OcpTenantAudit; import com.pms.ocp.model.entity.OcpTenantBase; import com.pms.ocp.model.entity.OcpTenantGroup; import com.pms.ocp.service.TenantService; @@ -118,7 +115,7 @@ public class TenantServiceImpl extends ServiceImpl break; } } - String randomString = RandomStringUtil.getRandomString(6); + String randomString = RandomStringUtils.getRandomString(6); Timestamp timestamp = new Timestamp(System.currentTimeMillis()); OcpTenantGroup ocpTenantGroup = new OcpTenantGroup(); BeanUtils.copyProperties(tenanBaseDto,ocpTenantGroup);