Merge branch 'test' into ext-dev

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesUnlockPassword.java

@@ -0,0 +1,45 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @Description :解锁密码
+ * @Reference :
+ * @Author : dominic
+ * @CreateDate : 2021-10-08
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "MES_UNLOCK_PASSWORD")
+@Api("mes解锁密码表")
+public class MesUnlockPassword extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -3534232746289126115L;
+
+    @Column(name = "EMPLOYEE_NUMBER")
+    @ApiParam("员工编号")
+    private String employeeNumber;
+
+    @Column(name = "EMPLOYEE_NAME")
+    @ApiParam("员工姓名")
+    private String employeeName;
+
+    @Column(name = "UNLOCK_PASSWORD")
+    @ApiParam("解锁密码")
+    private String unlockPassword;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesUnlockPasswordRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesUnlockPassword;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-10-11
+ * @Modify:
+ **/
+@Repository
+public interface MesUnlockPasswordRepository extends BaseRepository<MesUnlockPassword, Long> {
+}

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/job/repository/SysLogTaskTimeRepository.java

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.platform.job.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author ns
+ * @create 2021/10/12 0012 下午 16:21
+ */
+@Repository
+public interface SysLogTaskTimeRepository extends BaseRepository<SysLogTaskTime,Long> {
+}

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java

@@ -13,6 +13,9 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Lob;
+import javax.persistence.Table;
 
 /**
  * @Description : 定时任务执行记录
@@ -22,10 +25,12 @@ import javax.persistence.Column;
  * @Modify      :
  **/
 @Data
-@DynamicInsert
+//@DynamicInsert
-@DynamicUpdate
+//@DynamicUpdate
+@Entity
 @EqualsAndHashCode(callSuper = true)
 @Api(value="定时任务执行日志",description = "定时任务执行记录")
+@Table(name = "SYS_LOG_TASK_TIME")
 public class SysLogTaskTime extends BaseBean {
 
     private static final long serialVersionUID = -841008177433745529L;
@@ -76,6 +81,36 @@ public class SysLogTaskTime extends BaseBean {
         return taskStatus == null ? CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue() : taskStatus;
     }
 
+    @Lob
     @ApiParam(value ="任务异常日志")
     private String taskLogError;
+
+    @ApiParam(value ="job类名")
+    private String jobClass;
+
+
+    @ApiParam(value ="触发器名称")
+    private String triggerName;
+
+    @ApiParam(value ="描述")
+    private String description;
+
+    @ApiParam(value ="触发时间")
+    private String fireTime;
+
+    @ApiParam(value ="下次触发时间")
+    private String nextFireTime;
+
+    @ApiParam(value ="上次触发时间")
+    private String prevFireTime;
+
+    @ApiParam(value ="上次触发时间")
+    private String scheduleName;
+
+    @ApiParam(value ="执行开始时间")
+    private String executeStartTime;
+
+    @ApiParam(value ="执行结束时间")
+    private String executeEndTime;
 }
+