增加审核相关基础类

application-facade/src/main/java/com/factory/web/controller/pad/InitialPlanPadController.java → application-facade/src/main/java/com/factory/controller/pad/InitialPlanPadController.java

@@ -1,4 +1,4 @@
-package com.factory.web.controller.pad;
+package com.factory.controller.pad;
 
 
 import com.factory.base.entity.aggregates.ResponseBean;
@@ -74,7 +74,7 @@ public class InitialPlanPadController {
     @ApiOperation(value = "异常列表")
     @PostMapping("/abnormalList")
     @ApiOperationSupport(order = 1)
-    public ResponseBean<abnormalListRes> abnormalList() {
+    public ResponseBean<List<abnormalListRes>> abnormalList() {
 
        return versionService.abnormalList();
     }

application-facade/src/main/java/com/factory/web/controller/web/initial/InitialPlanWebController.java → application-facade/src/main/java/com/factory/controller/web/InitialPlanWebController.java

@@ -1,4 +1,4 @@
-package com.factory.web.controller.web.initial;
+package com.factory.controller.web;
 
 
 import com.factory.base.config.validateGroup.GroupOne;

application-facade/src/main/java/com/factory/web/mapper/BentelerExpectedResponsePlanMapper.java

@@ -0,0 +1,17 @@
+package com.factory.web.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.factory.base.entity.po.benteler.BentelerExpectedResponsePlan;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * Initial计划未响应信息
+ * 
+ * @author chenshun
+ * @email sunlightcs@gmail.com
+ * @date 2021-07-02 17:46:48
+ */
+@Mapper
+public interface BentelerExpectedResponsePlanMapper extends BaseMapper<BentelerExpectedResponsePlan> {
+	
+}

application-facade/src/main/java/com/factory/web/mapper/BentelerIssueAuditMapper.java

@@ -0,0 +1,17 @@
+package com.factory.web.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.factory.base.entity.po.benteler.BentelerIssueAudit;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 问题审核记录
+ * 
+ * @author chenshun
+ * @email sunlightcs@gmail.com
+ * @date 2021-07-02 17:46:48
+ */
+@Mapper
+public interface BentelerIssueAuditMapper extends BaseMapper<BentelerIssueAudit> {
+	
+}

application-facade/src/main/java/com/factory/web/mapper/BentelerIssueMapper.java

@@ -0,0 +1,17 @@
+package com.factory.web.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.factory.base.entity.po.benteler.BentelerIssue;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 计划 - 问题记录表
+ * 
+ * @author chenshun
+ * @email sunlightcs@gmail.com
+ * @date 2021-07-02 17:46:47
+ */
+@Mapper
+public interface BentelerIssueMapper extends BaseMapper<BentelerIssue> {
+	
+}

application-facade/src/main/java/com/factory/web/mapper/BentelerMessageMapper.java

@@ -0,0 +1,17 @@
+package com.factory.web.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.factory.base.entity.po.benteler.BentelerMessage;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * Initial通知消息
+ * 
+ * @author chenshun
+ * @email sunlightcs@gmail.com
+ * @date 2021-07-02 17:46:48
+ */
+@Mapper
+public interface BentelerMessageMapper extends BaseMapper<BentelerMessage> {
+	
+}

application-facade/src/main/java/com/factory/web/mapper/ini/BentelerIniAbnormalMapper.java

@@ -0,0 +1,17 @@
+package com.factory.web.mapper.ini;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.factory.base.entity.po.benteler.BentelerIniAbnormal;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 首件异常统计
+ * 
+ * @author chenshun
+ * @email sunlightcs@gmail.com
+ * @date 2021-07-02 17:46:48
+ */
+@Mapper
+public interface BentelerIniAbnormalMapper extends BaseMapper<BentelerIniAbnormal> {
+	
+}

application-facade/src/main/java/com/factory/web/service/BentelerExpectedResponsePlanService.java

@@ -0,0 +1,18 @@
+package com.factory.web.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.factory.base.entity.po.benteler.BentelerExpectedResponsePlan;
+
+import java.util.Map;
+
+/**
+ * Initial计划未响应信息
+ *
+ * @author chenshun
+ * @email sunlightcs@gmail.com
+ * @date 2021-07-02 17:46:48
+ */
+public interface BentelerExpectedResponsePlanService extends IService<BentelerExpectedResponsePlan> {
+
+}
+

application-facade/src/main/java/com/factory/web/service/BentelerIssueAuditService.java

@@ -0,0 +1,18 @@
+package com.factory.web.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.factory.base.entity.po.benteler.BentelerIssueAudit;
+
+import java.util.Map;
+
+/**
+ * 问题审核记录
+ *
+ * @author chenshun
+ * @email sunlightcs@gmail.com
+ * @date 2021-07-02 17:46:48
+ */
+public interface BentelerIssueAuditService extends IService<BentelerIssueAudit> {
+
+}
+

application-facade/src/main/java/com/factory/web/service/BentelerIssueService.java

@@ -0,0 +1,18 @@
+package com.factory.web.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.factory.base.entity.po.benteler.BentelerIssue;
+
+import java.util.Map;
+
+/**
+ * 计划 - 问题记录表
+ *
+ * @author chenshun
+ * @email sunlightcs@gmail.com
+ * @date 2021-07-02 17:46:47
+ */
+public interface BentelerIssueService extends IService<BentelerIssue> {
+
+}
+

application-facade/src/main/java/com/factory/web/service/BentelerMessageService.java

@@ -0,0 +1,18 @@
+package com.factory.web.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.factory.base.entity.po.benteler.BentelerMessage;
+
+import java.util.Map;
+
+/**
+ * Initial通知消息
+ *
+ * @author chenshun
+ * @email sunlightcs@gmail.com
+ * @date 2021-07-02 17:46:48
+ */
+public interface BentelerMessageService extends IService<BentelerMessage> {
+
+}
+

application-facade/src/main/java/com/factory/web/service/impl/BentelerExpectedResponsePlanServiceImpl.java

@@ -0,0 +1,19 @@
+package com.factory.web.service.impl;
+
+import com.factory.base.entity.po.benteler.BentelerExpectedResponsePlan;
+import com.factory.web.mapper.BentelerExpectedResponsePlanMapper;
+import com.factory.web.service.BentelerExpectedResponsePlanService;
+import org.springframework.stereotype.Service;
+import java.util.Map;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
+
+
+@Service("bentelerExpectedResponsePlanService")
+@Transactional(rollbackFor = Exception.class)
+public class BentelerExpectedResponsePlanServiceImpl extends ServiceImpl<BentelerExpectedResponsePlanMapper, BentelerExpectedResponsePlan> implements BentelerExpectedResponsePlanService {
+
+
+}

application-facade/src/main/java/com/factory/web/service/impl/BentelerIssueAuditServiceImpl.java

@@ -0,0 +1,19 @@
+package com.factory.web.service.impl;
+
+import com.factory.base.entity.po.benteler.BentelerIssueAudit;
+import com.factory.web.mapper.BentelerIssueAuditMapper;
+import com.factory.web.service.BentelerIssueAuditService;
+import org.springframework.stereotype.Service;
+import java.util.Map;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
+
+
+@Service("bentelerIssueAuditService")
+@Transactional(rollbackFor = Exception.class)
+public class BentelerIssueAuditServiceImpl extends ServiceImpl<BentelerIssueAuditMapper, BentelerIssueAudit> implements BentelerIssueAuditService {
+
+
+}

application-facade/src/main/java/com/factory/web/service/impl/BentelerIssueServiceImpl.java

@@ -0,0 +1,19 @@
+package com.factory.web.service.impl;
+
+import com.factory.base.entity.po.benteler.BentelerIssue;
+import com.factory.web.mapper.BentelerIssueMapper;
+import com.factory.web.service.BentelerIssueService;
+import org.springframework.stereotype.Service;
+import java.util.Map;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
+
+
+@Service("bentelerIssueService")
+@Transactional(rollbackFor = Exception.class)
+public class BentelerIssueServiceImpl extends ServiceImpl<BentelerIssueMapper, BentelerIssue> implements BentelerIssueService {
+
+
+}

application-facade/src/main/java/com/factory/web/service/impl/BentelerMessageServiceImpl.java

@@ -0,0 +1,19 @@
+package com.factory.web.service.impl;
+
+import com.factory.base.entity.po.benteler.BentelerMessage;
+import com.factory.web.mapper.BentelerMessageMapper;
+import com.factory.web.service.BentelerMessageService;
+import org.springframework.stereotype.Service;
+import java.util.Map;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
+
+
+@Service("bentelerMessageService")
+@Transactional(rollbackFor = Exception.class)
+public class BentelerMessageServiceImpl extends ServiceImpl<BentelerMessageMapper, BentelerMessage> implements BentelerMessageService {
+
+
+}

application-facade/src/main/java/com/factory/web/service/impl/ini/BentelerIniAbnormalServiceImpl.java

@@ -0,0 +1,19 @@
+package com.factory.web.service.impl.ini;
+
+import com.factory.base.entity.po.benteler.BentelerIniAbnormal;
+import com.factory.web.mapper.ini.BentelerIniAbnormalMapper;
+import com.factory.web.service.ini.BentelerIniAbnormalService;
+import org.springframework.stereotype.Service;
+import java.util.Map;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
+
+
+@Service("bentelerIniAbnormalService")
+@Transactional(rollbackFor = Exception.class)
+public class BentelerIniAbnormalServiceImpl extends ServiceImpl<BentelerIniAbnormalMapper, BentelerIniAbnormal> implements BentelerIniAbnormalService {
+
+
+}

application-facade/src/main/java/com/factory/web/service/impl/ini/BentelerIniVersionServiceImpl.java

@@ -74,6 +74,8 @@ public class BentelerIniVersionServiceImpl extends ServiceImpl<BentelerIniVersio
     @Autowired
     private BentelerIniCheckItemService checkItemService;
     @Autowired
+    private BentelerIniAbnormalService iniAbnormalService;
+    @Autowired
     private BentelerIniCheckTypeService checkTypeService;
 
     @Override
@@ -777,13 +779,22 @@ public class BentelerIniVersionServiceImpl extends ServiceImpl<BentelerIniVersio
     public List<getCheckResutGreadRes> getCheckResutGread(getCheckResutGreadReq req) {
         Long versionId = req.getVersionId();
         LocalDate localDate = req.getLocalDate();
-        List<getCheckResutGreadRes> version_checkResutGread = versionMapper.getVersion_CheckResutGread(versionId, localDate);
-        return version_checkResutGread;
+        return versionMapper.getVersion_CheckResutGread(versionId, localDate);
     }
 
     @Override
-    public ResponseBean<abnormalListRes> abnormalList() {
+    public ResponseBean<List<abnormalListRes>> abnormalList() {
+        List<BentelerIniAbnormal> abnormals = iniAbnormalService.list(Wrappers.<BentelerIniAbnormal>lambdaQuery()
+                .eq(BentelerIniAbnormal::getSolveFlag, false)
+                .like(BentelerIniAbnormal::getOpenTime, LocalDate.now())
+        );
 
-        return null;
+        Map<Long, List<BentelerIniAbnormal>> versionid_ab_map = abnormals.stream().collect(Collectors.groupingBy(BentelerIniAbnormal::getVersionId));
+        List<abnormalListRes> resList = versionid_ab_map.entrySet().stream().map(item -> {
+            BentelerIniVersion version = versionService.getById(item.getKey());
+            BentelerPlan plan = planService.getById(version.getPlanId());
+            return abnormalListRes.builder().name(plan.getName()).versionId(version.getId()).build();
+        }).collect(Collectors.toList());
+        return ResponseBeanBuilder.ok(resList);
     }
 }

application-facade/src/main/java/com/factory/web/service/ini/BentelerIniAbnormalService.java

@@ -0,0 +1,18 @@
+package com.factory.web.service.ini;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.factory.base.entity.po.benteler.BentelerIniAbnormal;
+
+import java.util.Map;
+
+/**
+ * 首件异常统计
+ *
+ * @author chenshun
+ * @email sunlightcs@gmail.com
+ * @date 2021-07-02 17:46:48
+ */
+public interface BentelerIniAbnormalService extends IService<BentelerIniAbnormal> {
+
+}
+

application-facade/src/main/java/com/factory/web/service/ini/BentelerIniVersionService.java

@@ -76,6 +76,6 @@ public interface BentelerIniVersionService extends IService<BentelerIniVersion>
 
     List<getCheckResutGreadRes> getCheckResutGread(getCheckResutGreadReq req);
 
-    ResponseBean<abnormalListRes> abnormalList();
+    ResponseBean<List<abnormalListRes>> abnormalList();
 }
 

common-base/src/main/java/com/factory/base/entity/po/benteler/BentelerExpectedResponsePlan.java

@@ -0,0 +1,56 @@
+package com.factory.base.entity.po.benteler;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * Initial计划未响应信息
+ *
+ * @author dl
+ * @date 2021-07-02 17:46:48
+ */
+@Data
+@TableName("benteler_expected_response_plan")
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonInclude()
+public class BentelerExpectedResponsePlan implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.AUTO)
+
+    @ApiModelProperty(value = "主键id")
+    private Long id;
+
+    @ApiModelProperty(value = "计划id")
+    private Long planId;
+
+    @TableField(fill = FieldFill.INSERT)
+    @ApiModelProperty(value = "创建时间", hidden = true)
+    private LocalDateTime createdTime;
+
+    @ApiModelProperty(value = "最近更新时间")
+    private LocalDateTime expiredTime;
+
+    @ApiModelProperty(value = "状态:1未响应2已发送3已过期")
+    private Integer expectedStatus;
+
+    @ApiModelProperty(value = "频次:1、首件2、200件3、中断；1日2周3月")
+    private Integer frequency;
+
+    @ApiModelProperty(value = "处理人")
+    private Integer handleUserId;
+
+    @ApiModelProperty(value = "处理时间")
+    private LocalDateTime handleTime;
+
+}

common-base/src/main/java/com/factory/base/entity/po/benteler/BentelerIniAbnormal.java

@@ -14,8 +14,10 @@ import java.io.Serializable;
 import java.time.LocalDateTime;
 
 /**
+ * 首件异常统计
+ *
  * @author dl
- * @date 2021-06-29 14:31:47
+ * @date 2021-07-02 17:46:48
  */
 @Data
 @TableName("benteler_ini_abnormal")
@@ -37,15 +39,18 @@ public class BentelerIniAbnormal implements Serializable {
     @ApiModelProperty(value = "版本id")
     private Long versionId;
 
+    @ApiModelProperty(value = "工作站id")
+    private Long workstationId;
+
+    @ApiModelProperty(value = "检查项id")
+    private Long versionItem;
+
     @ApiModelProperty(value = "检查结果id")
     private Long checkResultId;
 
     @ApiModelProperty(value = "检查项日结果id")
     private Long checkItem;
 
-    @ApiModelProperty(value = "检查项id")
-    private Long versionItem;
-
     @ApiModelProperty(value = "0未解决 1已解决")
     private Boolean solveFlag;
 

common-base/src/main/java/com/factory/base/entity/po/benteler/BentelerIniVersion.java

@@ -9,7 +9,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
-import java.sql.Time;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
@@ -104,7 +103,6 @@ public class BentelerIniVersion implements Serializable {
     private LocalDateTime updatedTime;
 
 
-
     @TableField(exist = false)
     @ApiModelProperty(value = "工作站")
     private List<BentelerIniWorkstation> workstations;

common-base/src/main/java/com/factory/base/entity/po/benteler/BentelerIniVersionItem.java

@@ -11,7 +11,6 @@ import lombok.NoArgsConstructor;
 import javax.validation.Valid;
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.sql.Time;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.util.List;
@@ -135,5 +134,4 @@ public class BentelerIniVersionItem implements Serializable {
     private List<@Valid BentelerIniCheckItem> checkItems;
 
 
-
 }

common-base/src/main/java/com/factory/base/entity/po/benteler/BentelerIniWorkstation.java

@@ -62,8 +62,8 @@ public class BentelerIniWorkstation implements Serializable {
     @ApiModelProperty(value = "最近更新时间", hidden = true)
     private LocalDateTime updatedTime;
 
-	@TableField(exist = false)
-	@ApiModelProperty(value = "点检项")
-	private List<BentelerIniVersionItem> versionItems;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "点检项")
+    private List<BentelerIniVersionItem> versionItems;
 
 }

common-base/src/main/java/com/factory/base/entity/po/benteler/BentelerIssue.java

@@ -0,0 +1,69 @@
+package com.factory.base.entity.po.benteler;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 计划 - 问题记录表
+ *
+ * @author dl
+ * @date 2021-07-02 17:46:47
+ */
+@Data
+@TableName("benteler_issue")
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonInclude()
+public class BentelerIssue implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.AUTO)
+
+    @ApiModelProperty(value = "主键id")
+    private Long id;
+
+    @ApiModelProperty(value = "计划类型 1首件 2防错")
+    private Integer checkType;
+
+    @ApiModelProperty(value = "检测分项结果id")
+    private Long checkSubId;
+
+    @ApiModelProperty(value = "当前负责角色")
+    private String principal;
+
+    @ApiModelProperty(value = "是否放行0未放行1已放行2最终未放行")
+    private Integer discharged;
+
+    @TableField(fill = FieldFill.INSERT)
+    @ApiModelProperty(value = "逻辑删除", hidden = true)
+    private Integer deleted;
+
+    @TableField(fill = FieldFill.INSERT)
+    @ApiModelProperty(value = "创建人", hidden = true)
+    private Long createdUserId;
+
+    @TableField(fill = FieldFill.INSERT)
+    @ApiModelProperty(value = "创建时间", hidden = true)
+    private LocalDateTime createdTime;
+
+    @TableField(fill = FieldFill.UPDATE)
+    @ApiModelProperty(value = "最近更新人", hidden = true)
+    private Long updatedUserId;
+
+    @TableField(fill = FieldFill.UPDATE)
+    @ApiModelProperty(value = "最近更新时间", hidden = true)
+    private LocalDateTime updatedTime;
+
+    @ApiModelProperty(value = "乐观锁")
+    private Integer versionLock;
+
+}

common-base/src/main/java/com/factory/base/entity/po/benteler/BentelerIssueAudit.java

@@ -0,0 +1,69 @@
+package com.factory.base.entity.po.benteler;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 问题审核记录
+ *
+ * @author dl
+ * @date 2021-07-02 17:46:48
+ */
+@Data
+@TableName("benteler_issue_audit")
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonInclude()
+public class BentelerIssueAudit implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.AUTO)
+
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
+    @ApiModelProperty(value = "问题id")
+    private Long issueId;
+
+    @ApiModelProperty(value = "责任人id")
+    private Integer principle;
+
+    @ApiModelProperty(value = "放行结果0待处理1放行2超时3未放行")
+    private Integer disposeResult;
+
+    @ApiModelProperty(value = "放行备注")
+    private String throughRemark;
+
+    @TableField(fill = FieldFill.INSERT)
+    @ApiModelProperty(value = "逻辑删除", hidden = true)
+    private Integer deleted;
+
+    @TableField(fill = FieldFill.INSERT)
+    @ApiModelProperty(value = "创建人", hidden = true)
+    private Long createdUserId;
+
+    @TableField(fill = FieldFill.INSERT)
+    @ApiModelProperty(value = "创建时间", hidden = true)
+    private LocalDateTime createdTime;
+
+    @TableField(fill = FieldFill.UPDATE)
+    @ApiModelProperty(value = "最近更新人", hidden = true)
+    private String updatedUserId;
+
+    @TableField(fill = FieldFill.UPDATE)
+    @ApiModelProperty(value = "最近更新时间", hidden = true)
+    private LocalDateTime updatedTime;
+
+    @ApiModelProperty(value = "乐观锁")
+    private Integer versionLock;
+
+}

common-base/src/main/java/com/factory/base/entity/po/benteler/BentelerMessage.java

@@ -0,0 +1,60 @@
+package com.factory.base.entity.po.benteler;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import springfox.documentation.spring.web.json.Json;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * Initial通知消息
+ *
+ * @author dl
+ * @date 2021-07-02 17:46:48
+ */
+@Data
+@TableName("benteler_message")
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonInclude()
+public class BentelerMessage implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.AUTO)
+
+    @ApiModelProperty(value = "主键id")
+    private Long id;
+
+    @ApiModelProperty(value = "消息接手人")
+    private Long toUserId;
+
+    @ApiModelProperty(value = "消息发送人")
+    private Long fromUserId;
+
+    @ApiModelProperty(value = "消息类型：1待响应计划通知2待审核计划通知3问题待审核通知")
+    private Integer messageType;
+
+    @ApiModelProperty(value = "状态:1未响应2已发送3已过期")
+    private Integer sendStatus;
+
+    @ApiModelProperty(value = "消息详情：json object")
+    private Json messageContent;
+
+    @ApiModelProperty(value = "消息标题")
+    private String messageTitle;
+
+    @TableField(fill = FieldFill.INSERT)
+    @ApiModelProperty(value = "创建时间", hidden = true)
+    private LocalDateTime createdTime;
+
+    @ApiModelProperty(value = "预计发送时间")
+    private LocalDateTime expectedTime;
+
+}

common-base/src/main/java/com/factory/base/entity/po/benteler/BentelerPlan.java

@@ -61,8 +61,6 @@ public class BentelerPlan implements Serializable {
     private LocalDateTime updatedTime;
 
 
-
-
     @TableField(exist = false)
     @ApiModelProperty(value = "版本", hidden = true)
     private BentelerIniVersion version;

common-user/src/main/java/com/factory/user/controller/UserController.java

@@ -54,4 +54,4 @@ public class UserController {
     }
 
 
-}
+}