1736-MES数据权限模块开发

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

@@ -11,6 +11,75 @@ import com.fasterxml.jackson.annotation.JsonFormat;
  **/
 
 public class MesEnumUtil {
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum HQL_EXPRESSION {
+        GT(10,">","大于"),
+        LT(20,"<","小于"),
+        EQ(30,"=","等于"),
+        NEQ(40,"!=","不等于"),
+        GTE(50,">=","大于等于"),
+        LTE(60,"<=","小于等于"),
+        LIKE(70,"like","LIKE"),
+        IN(80,"in","包含");
+
+        private int value;
+        private String code;
+        private String description;
+
+        HQL_EXPRESSION(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        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 codeOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].code;
+                }
+            }
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
+
     /**
      * 作业程序组件类型
      */

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

@@ -0,0 +1,61 @@
+package cn.estsh.i3plus.pojo.mes.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;
+import javax.persistence.Transient;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description :数据权限
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-26
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_DATA_AUTH")
+@Api("数据权限")
+public class MesDataAuth extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -8665559475167190408L;
+    @Column(name = "ROLE_ID")
+    @ApiParam("角色编号")
+    private Long roleId;
+
+    @Column(name = "ROLE_NAME")
+    @ApiParam("角色名称")
+    private String roleName;
+
+    @Column(name = "DATA_OBJECT")
+    @ApiParam("数据对象")
+    private String dataObject;
+
+    @Column(name = "DATA_OBJECT_NAME")
+    @ApiParam("数据对象名称")
+    private String dataObjectName;
+
+    @Column(name = "FILTER_RULE", columnDefinition = "TEXT")
+    @ApiParam("过滤规则")
+    private String filterRule;
+
+    public long getRoleIdVal() {
+        return this.roleId == null ? 0 : this.roleId.longValue();
+    }
+
+}

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

@@ -0,0 +1,11 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class FilterGroup {
+    private String andOr;
+    private List<FilterRuleAndOr> groups;
+}

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

@@ -0,0 +1,10 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import lombok.Data;
+
+@Data
+public class FilterRule {
+    private String filed;
+    private String op;
+    private String value;
+}

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

@@ -0,0 +1,11 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class FilterRuleAndOr {
+    private String andOr;
+    private List<FilterRule> rules;
+}

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

@@ -0,0 +1,48 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description : PojoField模型
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2020-04-28
+ * @Modify:
+ * @Modify:
+ **/
+@Data
+public class PojoFieldModel implements Serializable {
+    private static final long serialVersionUID = 6761788924707802928L;
+
+    @ApiParam(value ="属性名")
+    private String fieldName;
+
+    @ApiParam(value ="属性类型")
+    private String fieldType;
+
+    @ApiParam(value ="属性描述")
+    private String fieldDesc;
+
+    @ApiParam(value ="字段名称")
+    private String fieldColumnName;
+
+    @ApiParam(value = "数据来源")
+    private String dataSrc;
+
+    @ApiParam(value = "开窗列表显示列名称")
+    private String listColumnName;
+
+    @ApiParam(value = "开窗搜索列名称")
+    private String searchColumnName;
+
+    @ApiParam(value = "回显列名")
+    private String explicitColumnName;
+
+    @ApiParam(value = "下拉框规则")
+    private Integer selectRule;
+}

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

@@ -0,0 +1,38 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description : Pojo模型
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2020-04-28
+ * @Modify:
+ **/
+@Data
+public class PojoModel implements Serializable {
+    private static final long serialVersionUID = -3617516560880011259L;
+    @ApiParam(value ="包名")
+    private String packageName;
+
+    @ApiParam(value ="POJO类名")
+    private String simpleName;
+
+    @ApiParam(value ="POJO类全名")
+    private String fullName;
+
+    @ApiParam(value ="表名称名")
+    private String tableName;
+
+    @ApiParam(value ="POJO类描述")
+    private String pojoDesc;
+
+    @ApiParam(value ="属性集合")
+    private List<PojoFieldModel> fieldList;
+}

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

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesBom;
+import cn.estsh.i3plus.pojo.mes.bean.MesDataAuth;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesDataAuthRepository extends BaseRepository<MesDataAuth, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -2625,4 +2625,15 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    public static DdlPackBean getDataAuthCondition(MesDataAuth dataAuth, String organizeCode) {
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
+        if (!StringUtils.isEmpty(dataAuth.getDataObject())) {
+            DdlPreparedPack.getStringLikerPack(dataAuth.getDataObject(), "dataObject", packBean);
+        }
+        if (dataAuth.getRoleIdVal() > 0) {
+            DdlPreparedPack.getNumEqualPack(dataAuth.getRoleIdVal(), "roleId", packBean);
+        }
+        return packBean;
+    }
 }