Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java

@@ -1234,4 +1234,47 @@ public class ImppEnumUtil {
             return null;
         }
     }
+
+    /**
+     * 密码策略
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CHECK_TEXT {
+        PASSWORD_VERIFY(1, "保存策略"),
+        PASSWORD_LOGIN(2, "登录策略");
+        private int value;
+        private String description;
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        private CHECK_TEXT(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static CHECK_TEXT valueOfEnum(int val) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+    }
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MdmEnumUtil.java

@@ -123,7 +123,7 @@ public class MdmEnumUtil {
     public enum MDM_SYNC_TYPE{
         INSERT(1,  "新增"),
         UPDATE(2,  "修改"),
-        DELETE(2,  "删除");
+        DELETE(3,  "删除");
 
         private int value;
         private String description;

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java

@@ -70,8 +70,9 @@ public class MesEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WORK_MODULE_TYPE {
         MONITOR_MODULE(10, "监听组件"),
-        REVEAL_MODULE(10, "展示组件"),
-        BUTTON_MODULE(30, "按钮组件");
+        REVEAL_MODULE(20, "展示组件"),
+        BUTTON_MODULE(30, "按钮组件"),
+        TIMING_MODULE(40, "定时组件");
 
         private int value;
         private String description;
@@ -1903,7 +1904,8 @@ public class MesEnumUtil {
         MES_KPSN_RULE(410, "kpsnRuleExcelService", "关键件条码校验规则，支持编辑"),
         MES_QUEUE_JIT_ACTUAL(420, "queueJitActualExcelService", "客户JIT生产队列"),
         MES_PART_BOM_IMPORT(430, "partBomExcelService", "散件BOM导入"),
-        MES_PLAN_ORDER_BATCH_COMPILE(440, "planOrderBatchCompileExcelService", "生产计划批量编制，支持编辑");
+        MES_PLAN_ORDER_BATCH_COMPILE(440, "planOrderBatchCompileExcelService", "生产计划批量编制，支持编辑"),
+        MES_WORK_ORDER_PAINT(450, "workOrderPaintExcelService", "生产工单-涂装");
 
         private int value;
         private String service;

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java

@@ -18,8 +18,9 @@ public class MesPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WORK_MODULE_TYPE {
         MONITOR_MODULE(10, "监听组件"),
-        REVEAL_MODULE(10, "展示组件"),
-        BUTTON_MODULE(30, "按钮组件");
+        REVEAL_MODULE(20, "展示组件"),
+        BUTTON_MODULE(30, "按钮组件"),
+        TIMING_MODULE(40, "定时组件");
 
         private int value;
         private String description;
@@ -4073,6 +4074,52 @@ public class MesPcnEnumUtil {
     }
 
     /**
+     * 停机类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum STOP_MACHINE_TYPE {
+        TIMER_TIME_OUT(10, "计时器超时停机"),
+        DELAY_HELP(20, "延时帮助停机"),
+        URGENT_STOP(30, "急停停机");
+
+        private int value;
+        private String description;
+
+        STOP_MACHINE_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
      * plc状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java

@@ -76,6 +76,10 @@ public class BfElement extends BaseBean {
     @ApiParam(value = "是否编辑")
     private Integer isObjectEdit;
 
+    @Column(name = "IS_READ_ONLY_SHOW")
+    @ApiParam(value = "是否只读显示")
+    private Integer isReadOnlyShow;
+
     @Column(name = "IS_OBJECT_DEL")
     @ApiParam(value = "是否删除")
     private Integer isObjectDel;

modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java

@@ -30,12 +30,13 @@ public abstract class BaseMdmBean extends BaseBean {
 
     @Transient
     @ApiModelProperty("是否主数据")
-    @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
+    @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,hidden = true)
     public static Integer isMdmMaster = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue();
 
     @Column(name = "MDM_VERSION")
     @ApiModelProperty("mdm数据版本")
     @JsonSerialize(using = ToStringSerializer.class)
+    @AnnoOutputColumn(hidden = true)
     private Long mdmVersion;
 
     public long getMdmVersionVal() {
@@ -50,21 +51,26 @@ public abstract class BaseMdmBean extends BaseBean {
 
     @Column(name = "IS_MDM_PUBLISHED")
     @ApiModelProperty("是否发布")
-    @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
+    @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,hidden = true)
     private Integer isMdmPublished;
 
     @Column(name = "MDM_OPERATE_TYPE")
     @ApiModelProperty("操作类型")
-    @AnnoOutputColumn(refClass = MdmEnumUtil.MDM_OPERATE_TYPE.class)
+    @AnnoOutputColumn(refClass = MdmEnumUtil.MDM_OPERATE_TYPE.class,hidden = true)
     private Integer mdmOperateType;
 
     public Integer getMdmOperateTypeVal() {
         return mdmOperateType == null ? MdmEnumUtil.MDM_OPERATE_TYPE.INSERT.getValue() : mdmOperateType;
     }
 
+    public String getMdmOperateTypeTxt(){
+        return MdmEnumUtil.MDM_OPERATE_TYPE.valueOfDescription(getMdmOperateTypeVal());
+    }
+
     @Column(name = "MDM_REF_ID")
     @ApiModelProperty("关联id")
     @JsonSerialize(using = ToStringSerializer.class)
+    @AnnoOutputColumn(hidden = true)
     private Long mdmRefId;
 
     //排序方式

modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java

@@ -28,22 +28,22 @@ public class BaseMdmBusiExtdBean extends BaseMdmBean {
 
     @Transient
     @ApiModelProperty("是否主数据")
-    @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
+    @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,hidden = true)
     public static Integer isMdmMaster  = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
 
     @Transient
     @ApiModelProperty("主数据Class")
-    @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
-    public static Class<BaseMdmBean> mdmMasterClass  = BaseMdmBean.class;
+    @AnnoOutputColumn(hidden = true)
+    protected static Class<BaseMdmBean> mdmMasterClass  = BaseMdmBean.class;
 
     @Transient
     @ApiModelProperty("软件模块")
-    @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
-    public static Integer mdmSoftType;
+    @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,hidden = true)
+    protected static Integer mdmSoftType;
 
     @Column(name = "MDM_MASTER_ID")
     @ApiModelProperty("主数据id")
     @JsonSerialize(using = ToStringSerializer.class)
-    private Long mdmMasterId;
+    public Long mdmMasterId;
 
 }

modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiModelBean.java

@@ -11,6 +11,11 @@ import io.swagger.annotations.ApiModelProperty;
  **/
 public abstract class BaseMdmBusiModelBean<M extends BaseMdmBean, B extends BaseMdmBusiExtdBean> {
 
+    public BaseMdmBusiModelBean(M mdmMasterBean, B mdmBusiBean) {
+        this.mdmMasterBean = mdmMasterBean;
+        this.mdmBusiBean = mdmBusiBean;
+    }
+
     @ApiModelProperty("主数据")
     private M mdmMasterBean;
 
@@ -20,11 +25,6 @@ public abstract class BaseMdmBusiModelBean<M extends BaseMdmBean, B extends Base
     public BaseMdmBusiModelBean() {
     }
 
-    public BaseMdmBusiModelBean(M mdmMasterBean, B mdmBusiBean) {
-        this.mdmMasterBean = mdmMasterBean;
-        this.mdmBusiBean = mdmBusiBean;
-    }
-
     /**
      * 获取主数据m
      *

modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java

@@ -31,10 +31,18 @@ public class MdmSyncData implements Serializable {
         return syncType == null ? MdmEnumUtil.MDM_SYNC_TYPE.INSERT.getValue() : syncType;
     }
 
+    public String getSyncTypeTxt(){
+        return syncType == null ? "无":MdmEnumUtil.MDM_SYNC_TYPE.valueOfDescription(syncType);
+    }
+
     @ApiModelProperty("同步模块")
     @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class)
     private Integer syncSoftType;
 
+    public String getSyncSoftTypeTxt(){
+        return syncSoftType == null ? "无":CommonEnumUtil.SOFT_TYPE.valueOfDescription(syncSoftType);
+    }
+
     @ApiModelProperty("是否是主数据")
     @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
     private Integer isMasterData;
@@ -43,6 +51,10 @@ public class MdmSyncData implements Serializable {
         return isMasterData == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isMasterData;
     }
 
+    public String getIsMasterDataTxt(){
+        return isMasterData == null ? "无":CommonEnumUtil.TRUE_OR_FALSE.valueOfDescription(isMasterData);
+    }
+
     @ApiModelProperty("同步数据class")
     private String syncDataClass;
 

modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/core/MdmGearCoreBusiExtd.java

@@ -36,12 +36,12 @@ public class MdmGearCoreBusiExtd extends BaseMdmBusiExtdBean {
 
     @Transient
     @ApiModelProperty("主数据Class")
-    @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
+    @AnnoOutputColumn(hidden = true)
     public static Class mdmMasterClass  = MdmGear.class;
 
     @Transient
     @ApiModelProperty("软件模块")
-    @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
+    @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,hidden = true)
     public static Integer mdmSoftType = CommonEnumUtil.SOFT_TYPE.CORE.getValue();
 
     @Column(name = "CORE_NUM")

modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/MdmHqlPack.java

@@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBean;
+import cn.estsh.i3plus.pojo.mdm.bean.busi.core.MdmGearCoreBusiExtd;
 import cn.estsh.i3plus.pojo.mdm.bean.master.MdmGear;
 
 import java.util.List;
@@ -43,7 +44,17 @@ public class MdmHqlPack {
 
         DdlPreparedPack.getNumEqualPack(mdmGear.getId(),"id",ddlPackBean);
         DdlPreparedPack.getStringLikerPack(mdmGear.getName(),"name",ddlPackBean);
-        DdlPreparedPack.timeBuilder(mdmGear.getCreateDatetime(),"createDatetime",ddlPackBean,false,true);
+        DdlPreparedPack.timeBuilder(mdmGear.getModifyDatetime(),"modifyDatetime",ddlPackBean,false,true);
+
+        return ddlPackBean;
+    }
+
+    public static DdlPackBean packHqlMdmGearCoreExtd(MdmGearCoreBusiExtd mdmGear) {
+        DdlPackBean ddlPackBean = getMdmPackBean(mdmGear);
+
+        DdlPreparedPack.getNumEqualPack(mdmGear.getId(),"id",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(mdmGear.getMdmMasterId(),"mdmMasterId",ddlPackBean);
+        DdlPreparedPack.timeBuilder(mdmGear.getModifyDatetime(),"modifyDatetime",ddlPackBean,false,true);
 
         return ddlPackBean;
     }

modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/sqlpack/DdlMdmModelPreparedPack.java

@@ -527,7 +527,7 @@ public class DdlMdmModelPreparedPack {
     public static void getInPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) {
         if (data != null) {
             packBean.addColumnQuery(entityType, "in_"+columnName,
-                    " and " + entityType.getAlias() + "." + columnName + " in (:" + entityType.getAlias() + "_in_" + columnName + ")", data);
+                    " and " + entityType.getAlias() + "." + columnName + " in ( :" + entityType.getAlias() + "_in_" + columnName + " ) ", data);
         }
     }
 

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

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
@@ -56,4 +57,15 @@ public class MesPartCheck extends BaseBean implements Serializable {
     @ApiParam("校验表达式描述")
     private String recordNumDesc;
 
+    @Transient
+    @ApiParam("复核结果")
+    private Integer reviewResult = 1;
+
+    @Transient
+    @ApiParam("对象名称")
+    private String objectCodeName;
+
+    @Transient
+    @ApiParam("产线")
+    private String workCenterCode;
 }

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

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 import java.io.Serializable;
 
@@ -79,6 +80,7 @@ public class MesPcnTask extends BaseBean implements Serializable {
     @ApiParam("任务周期描述")
     private String taskCycleDescription;
 
+    @Lob
     @Column(name = "TASK_PARAM")
     @ApiParam("任务参数")
     private String taskParam;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java

@@ -25,16 +25,4 @@ public class DataReviewModel {
     @ApiParam("对象代码")
     private String objectCode;
 
-    @ApiParam("对象名称")
-    private String objectCodeName;
-
-    @ApiParam("产线")
-    private String workCenterCode;
-
-    @ApiParam("复核结果")
-    private Integer reviewResult;
-
-    @ApiParam("补录操作")
-    private Integer supplementaryOperate;
-
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java

@@ -138,6 +138,15 @@ public class StationRequestBean implements Serializable {
     @ApiParam("工步弹框状态")
     private Boolean stepDialogStatus = false;
 
+    @ApiParam("是否按时完成")
+    private Integer isOnTimeComplete;
+
+    @ApiParam("工位剩余时间")
+    private Long remainWorkTime;
+
+    @ApiParam("是否操作超时")
+    private Integer isTimeOut;
+
     @ApiParam("特殊展示数据")
     private Map<String, Object> specialDisplayMap  = new HashMap<>();
 

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java

@@ -54,10 +54,16 @@ public class SysUser extends BaseBean {
     @ApiParam(value ="工号")
     private String userEmpNo;
 
+    @Deprecated // 废弃密码新 , 使用ID作为密码信息, 改密码作为数据传输使用
     @Column(name="USER_LOGIN_PASSWORD")
     @ApiParam(value ="登陆密码")
     private String userLoginPassword;
 
+    @Column(name="USER_LOGIN_PASSWORD_ID")
+    @ApiParam(value ="密码ID" , example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long userLoginPasswordId;
+
     @Column(name="USER_TYPE")
     @ApiParam(value ="账号类型（枚举，待定）" , example ="-1")
     private Integer userType;
@@ -78,6 +84,7 @@ public class SysUser extends BaseBean {
     @ApiParam(value ="登录次数",example = "0")
     private Integer userLoginNum;
 
+    @Deprecated
     @Column(name="USER_LOGIN_LAST_DATE_TIME")
     @ApiParam(value ="账号最后登录时间")
     private String userLoginLastDateTime;

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserPassword.java

@@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.platform.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+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.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 20-6-4 下午3:38
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="SYS_USER_PASSWORD")
+@Api(value="账号密码")
+public class SysUserPassword extends BaseBean {
+    private static final long serialVersionUID = 4536854582252378921L;
+
+    @Column(name="USER_ID")
+    @ApiParam(value ="人员ID" , example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long userId;
+
+    @Column(name="USER_PASSWORD")
+    @ApiParam(value ="用户密码")
+    private String userPassword;
+
+    @Column(name="USER_LOGIN_LAST_DATE_TIME")
+    @ApiParam(value ="账号最后登录时间")
+    private String userLoginLastDateTime;
+
+    public SysUserPassword() {
+    }
+
+    public SysUserPassword(Long userId, String userPassword) {
+        this.userId = userId;
+        this.userPassword = userPassword;
+    }
+}

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

@@ -10,9 +10,9 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
+import org.springframework.data.mongodb.core.mapping.Document;
 
 import javax.persistence.Column;
-import javax.persistence.Entity;
 import javax.persistence.Table;
 
 /**
@@ -23,7 +23,7 @@ import javax.persistence.Table;
  * @Modify:
  **/
 @Data
-@Entity
+@Document
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)

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

@@ -10,6 +10,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 import org.springframework.data.mongodb.core.index.Indexed;
+import org.springframework.data.mongodb.core.mapping.Document;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -23,7 +24,7 @@ import javax.persistence.Table;
  * @Modify      :
  **/
 @Data
-@Entity
+@Document
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)

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

@@ -13,6 +13,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 import org.springframework.data.mongodb.core.index.Indexed;
+import org.springframework.data.mongodb.core.mapping.Document;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -26,7 +27,7 @@ import javax.persistence.Table;
  * @Modify      :
  **/
 @Data
-@Entity
+@Document
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)

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

@@ -13,6 +13,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 import org.springframework.data.mongodb.core.index.Indexed;
+import org.springframework.data.mongodb.core.mapping.Document;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -26,7 +27,7 @@ import javax.persistence.Table;
  * @Modify      :
  **/
 @Data
-@Entity
+@Document
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)

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

@@ -12,9 +12,9 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 import org.springframework.data.mongodb.core.index.Indexed;
+import org.springframework.data.mongodb.core.mapping.Document;
 
 import javax.persistence.Column;
-import javax.persistence.Entity;
 import javax.persistence.Table;
 
 /**
@@ -25,7 +25,7 @@ import javax.persistence.Table;
  * @Modify      :
  **/
 @Data
-@Entity
+@Document
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)

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

@@ -1,14 +0,0 @@
-package cn.estsh.i3plus.pojo.platform.repository;
-
-import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime;
-
-/**
- * @Description : 定时任务执行记录
- * @Reference   :
- * @Author      : wei.peng
- * @Date        : 2018-10-22 12:03:01.409
- * @Modify      :
- **/
-public interface SysTaskTimeRecordingRepository extends BaseRepository<SysLogTaskTime, Long> {
-}

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.platform.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.platform.bean.SysUserPassword;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 20-6-4 下午3:46
+ * @Modify:
+ **/
+public interface SysUserPasswordRepository extends BaseRepository<SysUserPassword, Long> {
+}

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java

@@ -1051,6 +1051,7 @@ public class CoreHqlPack {
         DdlPreparedPack.getStringLeftLikerPack(bean.getRefClass(),"refClass",packBean);
         DdlPreparedPack.getStringLeftLikerPack(bean.getVersionMethodName(),"versionMethodName",packBean);
         DdlPreparedPack.getStringLikerPack(bean.getPojoCompare(),"pojoCompare",packBean);
+        DdlPreparedPack.timeBuilder(bean.getModifyDatetime(),"modifyDatetime",packBean,false,true);
 
         return packBean;
     }

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java

@@ -1,122 +1,122 @@
-package cn.estsh.i3plus.pojo.report.bean;
-
-import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-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.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
-/**
- * @Description :
- * @Reference :
- * @Author : Adair Peng
- * @CreateDate : 2019-01-18 11:32
- * @Modify:
- **/
-@Data
-@Entity
-@DynamicInsert
-@DynamicUpdate
-@EqualsAndHashCode(callSuper = true)
-@Table(name="BR_POJO_ATTR")
-@Api(value="对象属性",description = "对象属性")
-public class BrPojoAttr extends BaseBean {
-
-    private static final long serialVersionUID = -9025365832485707583L;
-    @Column(name="TEMPLATE_ID")
-    @ApiParam(value ="模板编号" ,example = "-1")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long templateId;
-
-    @Column(name="SERVER_ID")
-    @ApiParam(value ="服务ID",example = "-1")
-    private Integer serverId;
-
-    @Column(name="POJO_ID")
-    @ApiParam(value ="模板对象ID" ,example = "-1")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long pojoId;
-
-    @Column(name="POJO_NAME")
-    @ApiParam(value ="对象名称")
-    private String pojoName;
-
-    @Column(name="PACKAGE_NAME_RDD")
-    @ApiParam(value ="主服务对象包名称" , access ="服务对象包名称")
-    private String packageNameRdd;
-
-    @Column(name="POJO_TABLE_NAME_ALIAS")
-    @ApiParam(value ="对象别名")
-    private String pojoTableNameAlias;
-
-    @Column(name="ATTR_COLUMN_NAME")
-    @ApiParam(value ="属性别名")
-    private String attrColumnName;
-
-    @Column(name="ATTR_COLUMN_NAME_ALIAS")
-    @ApiParam(value ="属性别名")
-    private String attrColumnNameAlias;
-
-    @Column(name="PARENT_ID")
-    @ApiParam(value ="上级ID",example = "-1")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long parentId;
-
-    @Column(name="ATTR_TYPE")
-    @ApiParam(value ="属性类型",example = "-1")
-    private Integer attrType;
-
-    @Column(name="ATTR_REF_TYPE")
-    @ApiParam(value ="关系类型",example = "-1")
-    private Integer attrRefType;
-
-    @Column(name="DATA_TYPE")
-    @ApiParam(value ="数据类型",example = "-1")
-    private Integer dataType;
-
-    @Column(name="CHART_ATTR_NAME")
-    @ApiParam(value ="图标属性名称")
-    private String chartAttrName;
-
-    @Column(name="AGGREGATION_TYPE")
-    @ApiParam(value ="聚合类型",example = "-1")
-    private Integer aggregationType;
-
-    @Column(name="AGGREGATION_ID")
-    @ApiParam(value ="聚合类型",example = "-1")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long aggregationId;
-
-    @Column(name="ATTR_SORT")
-    @ApiParam(value ="字段排序")
-    private Integer attrSort;
-
-    @Column(name="ATTR_DATA_SORT")
-    @ApiParam(value ="字段排序")
-    private Integer attrDataSort;
-
-    @Column(name="ATTR_STYLE")
-    @ApiParam(value ="字段样式")
-    private Integer attrStyle;
-
-    @Column(name="ATTR_STYLE_RDD")
-    @ApiParam(value ="字段样式")
-    private String attrStyleRdd;
-
-    @Column(name="ATTR_DEFAULT_VALUE")
-    @ApiParam(value ="属性默认值")
-    private String attrDefaultValue;
-
-    @Column(name="ATTR_SHOW")
-    @ApiParam(value ="属性是否显示",example = "-1")
-    private Integer attrShow;
-
-}
+//package cn.estsh.i3plus.pojo.report.bean;
+//
+//import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+//import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+//import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+//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.Column;
+//import javax.persistence.Entity;
+//import javax.persistence.Table;
+//
+///**
+// * @Description :
+// * @Reference :
+// * @Author : Adair Peng
+// * @CreateDate : 2019-01-18 11:32
+// * @Modify:
+// **/
+//@Data
+//@Entity
+//@DynamicInsert
+//@DynamicUpdate
+//@EqualsAndHashCode(callSuper = true)
+//@Table(name="BR_POJO_ATTR")
+//@Api(value="对象属性",description = "对象属性")
+//public class BrPojoAttr extends BaseBean {
+//
+//    private static final long serialVersionUID = -9025365832485707583L;
+//    @Column(name="TEMPLATE_ID")
+//    @ApiParam(value ="模板编号" ,example = "-1")
+//    @JsonSerialize(using = ToStringSerializer.class)
+//    private Long templateId;
+//
+//    @Column(name="SERVER_ID")
+//    @ApiParam(value ="服务ID",example = "-1")
+//    private Integer serverId;
+//
+//    @Column(name="POJO_ID")
+//    @ApiParam(value ="模板对象ID" ,example = "-1")
+//    @JsonSerialize(using = ToStringSerializer.class)
+//    private Long pojoId;
+//
+//    @Column(name="POJO_NAME")
+//    @ApiParam(value ="对象名称")
+//    private String pojoName;
+//
+//    @Column(name="PACKAGE_NAME_RDD")
+//    @ApiParam(value ="主服务对象包名称" , access ="服务对象包名称")
+//    private String packageNameRdd;
+//
+//    @Column(name="POJO_TABLE_NAME_ALIAS")
+//    @ApiParam(value ="对象别名")
+//    private String pojoTableNameAlias;
+//
+//    @Column(name="ATTR_COLUMN_NAME")
+//    @ApiParam(value ="属性别名")
+//    private String attrColumnName;
+//
+//    @Column(name="ATTR_COLUMN_NAME_ALIAS")
+//    @ApiParam(value ="属性别名")
+//    private String attrColumnNameAlias;
+//
+//    @Column(name="PARENT_ID")
+//    @ApiParam(value ="上级ID",example = "-1")
+//    @JsonSerialize(using = ToStringSerializer.class)
+//    private Long parentId;
+//
+//    @Column(name="ATTR_TYPE")
+//    @ApiParam(value ="属性类型",example = "-1")
+//    private Integer attrType;
+//
+//    @Column(name="ATTR_REF_TYPE")
+//    @ApiParam(value ="关系类型",example = "-1")
+//    private Integer attrRefType;
+//
+//    @Column(name="DATA_TYPE")
+//    @ApiParam(value ="数据类型",example = "-1")
+//    private Integer dataType;
+//
+//    @Column(name="CHART_ATTR_NAME")
+//    @ApiParam(value ="图标属性名称")
+//    private String chartAttrName;
+//
+//    @Column(name="AGGREGATION_TYPE")
+//    @ApiParam(value ="聚合类型",example = "-1")
+//    private Integer aggregationType;
+//
+//    @Column(name="AGGREGATION_ID")
+//    @ApiParam(value ="聚合类型",example = "-1")
+//    @JsonSerialize(using = ToStringSerializer.class)
+//    private Long aggregationId;
+//
+//    @Column(name="ATTR_SORT")
+//    @ApiParam(value ="字段排序")
+//    private Integer attrSort;
+//
+//    @Column(name="ATTR_DATA_SORT")
+//    @ApiParam(value ="字段排序")
+//    private Integer attrDataSort;
+//
+//    @Column(name="ATTR_STYLE")
+//    @ApiParam(value ="字段样式")
+//    private Integer attrStyle;
+//
+//    @Column(name="ATTR_STYLE_RDD")
+//    @ApiParam(value ="字段样式")
+//    private String attrStyleRdd;
+//
+//    @Column(name="ATTR_DEFAULT_VALUE")
+//    @ApiParam(value ="属性默认值")
+//    private String attrDefaultValue;
+//
+//    @Column(name="ATTR_SHOW")
+//    @ApiParam(value ="属性是否显示",example = "-1")
+//    private Integer attrShow;
+//
+//}

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoAttrRepository.java

@@ -1,15 +1,15 @@
-package cn.estsh.i3plus.pojo.report.repository;
-
-import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.report.bean.BrMenu;
-import cn.estsh.i3plus.pojo.report.bean.BrPojoAttr;
-
-/**
- * @Description :
- * @Reference :
- * @Author : Adair Peng
- * @CreateDate : 2019-01-18 15:03
- * @Modify:
- **/
-public interface BrPojoAttrRepository extends BaseRepository<BrPojoAttr,Long> {
-}
+//package cn.estsh.i3plus.pojo.report.repository;
+//
+//import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+//import cn.estsh.i3plus.pojo.report.bean.BrMenu;
+//import cn.estsh.i3plus.pojo.report.bean.BrPojoAttr;
+//
+///**
+// * @Description :
+// * @Reference :
+// * @Author : Adair Peng
+// * @CreateDate : 2019-01-18 15:03
+// * @Modify:
+// **/
+//public interface BrPojoAttrRepository extends BaseRepository<BrPojoAttr,Long> {
+//}