更新动态多条件查询

src/main/java/com/xkrs/util/DataDictQuery.java

@@ -0,0 +1,45 @@
+package com.xkrs.util;
+
+import com.xkrs.dao.DataDictDao;
+import com.xkrs.model.entity.DataDict;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author: XinYi Song
+ * @Date: 2022/1/19 13:56
+ */
+@Component
+public class DataDictQuery {
+
+    @Resource
+    private DataDictDao dataDictDao;
+
+    /**
+     * 动态多条件查询字典信息
+     *
+     * @return
+     */
+    public List<DataDict> selectDataDict(String inspectionItemName, String inspectionItemCode) {
+        Specification<DataDict> specification = (root, criteriaQuery, criteriaBuilder) -> {
+            List<Predicate> list = new ArrayList<>();
+            if (inspectionItemName != null && !"".equals(inspectionItemName)) {
+                list.add(criteriaBuilder.equal(root.get("inspectionItemName").as(String.class), inspectionItemName));
+            }
+            if (inspectionItemCode != null && !"".equals(inspectionItemCode)) {
+                list.add(criteriaBuilder.equal(root.get("inspectionItemCode").as(String.class), inspectionItemCode));
+            }
+            Predicate[] predicates = new Predicate[list.size()];
+            return criteriaBuilder.and(list.toArray(predicates));
+        };
+        return dataDictDao.findAll(specification);
+    }
+}

src/main/java/com/xkrs/util/DataSourceQuery.java

@@ -0,0 +1,52 @@
+package com.xkrs.util;
+
+import com.xkrs.dao.DataSourceDao;
+import com.xkrs.model.entity.DataSource;
+import org.apache.http.util.TextUtils;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.persistence.criteria.Predicate;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author: XinYi Song
+ * @Date: 2022/1/19 13:56
+ */
+@Component
+public class DataSourceQuery {
+
+    @Resource
+    private DataSourceDao dataSourceDao;
+
+    /**
+     * 动态多条件查询采集数据信息
+     *
+     * @return
+     */
+    public List<DataSource> selectDataSource(String lotNo, String machineNo, String materialNo, String modelNo, String partNo) {
+        Specification<DataSource> specification = (root, criteriaQuery, criteriaBuilder) -> {
+            List<Predicate> list = new ArrayList<>();
+            if (!TextUtils.isEmpty(lotNo)) {
+                list.add(criteriaBuilder.equal(root.get("lotNo").as(String.class), lotNo));
+            }
+            if (!TextUtils.isEmpty(machineNo)) {
+                list.add(criteriaBuilder.equal(root.get("machineNo").as(String.class), machineNo));
+            }
+            if (!TextUtils.isEmpty(materialNo)) {
+                list.add(criteriaBuilder.equal(root.get("materialNo").as(String.class), materialNo));
+            }
+            if (!TextUtils.isEmpty(modelNo)) {
+                list.add(criteriaBuilder.equal(root.get("modelNo").as(String.class), modelNo));
+            }
+            if (!TextUtils.isEmpty(partNo)) {
+                list.add(criteriaBuilder.equal(root.get("partNo").as(String.class), partNo));
+            }
+            Predicate[] predicates = new Predicate[list.size()];
+            return criteriaBuilder.and(list.toArray(predicates));
+        };
+        return dataSourceDao.findAll(specification);
+    }
+}

src/main/java/com/xkrs/util/ExcelUploadUtil.java

@@ -44,13 +44,13 @@ public class ExcelUploadUtil {
             String newName = UUID.randomUUID().toString() + suffix;
 
             //将图片保存到本地/usr/etc/images/Folder
-//            File file = new File("/Users/liuchengqian/Desktop/DaJiang/");
-            File file = new File("/home/sxy/server/industrial_measurement/" + subDir);
+            File file = new File("/Users/liuchengqian/Desktop/DaJiang/");
+//            File file = new File("/home/sxy/server/industrial_measurement/" + subDir);
             if (!file.exists()) {
                 file.mkdirs();
             }
-//            String path = "/Users/liuchengqian/Desktop/DaJiang/"+newName;
-            String path = "/home/sxy/server/industrial_measurement/" + subDir + newName;
+            String path = "/Users/liuchengqian/Desktop/DaJiang/"+newName;
+//            String path = "/home/sxy/server/industrial_measurement/" + subDir + newName;
             String uploadsImage = uploadPath + newName;
             //实现上传
             fileInput.transferTo(new File(path));

src/main/java/com/xkrs/util/PictureQuery.java

@@ -0,0 +1,52 @@
+package com.xkrs.util;
+
+import com.xkrs.dao.PictureDao;
+import com.xkrs.model.entity.PictureEntity;
+import org.apache.http.util.TextUtils;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.persistence.criteria.Predicate;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author: XinYi Song
+ * @Date: 2022/1/19 13:56
+ */
+@Component
+public class PictureQuery {
+
+    @Resource
+    private PictureDao pictureDao;
+
+    /**
+     * 动态多条件查询图片信息
+     *
+     * @return
+     */
+    public List<PictureEntity> selectPicture(String lotNo, String machineNo, String materialNo, String modelNo, String partNo) {
+        Specification<PictureEntity> specification = (root, criteriaQuery, criteriaBuilder) -> {
+            List<Predicate> list = new ArrayList<>();
+            if (!TextUtils.isEmpty(lotNo)) {
+                list.add(criteriaBuilder.equal(root.get("lotNo").as(String.class), lotNo));
+            }
+            if (!TextUtils.isEmpty(machineNo)) {
+                list.add(criteriaBuilder.equal(root.get("machineNo").as(String.class), machineNo));
+            }
+            if (!TextUtils.isEmpty(materialNo)) {
+                list.add(criteriaBuilder.equal(root.get("materialNo").as(String.class), materialNo));
+            }
+            if (!TextUtils.isEmpty(modelNo)) {
+                list.add(criteriaBuilder.equal(root.get("modelNo").as(String.class), modelNo));
+            }
+            if (!TextUtils.isEmpty(partNo)) {
+                list.add(criteriaBuilder.equal(root.get("partNo").as(String.class), partNo));
+            }
+            Predicate[] predicates = new Predicate[list.size()];
+            return criteriaBuilder.and(list.toArray(predicates));
+        };
+        return pictureDao.findAll(specification);
+    }
+}

src/main/java/com/xkrs/util/Query.java

@@ -1,48 +0,0 @@
-package com.xkrs.util;
-
-import com.xkrs.dao.DataDictDao;
-import com.xkrs.model.entity.DataDict;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @Author: XinYi Song
- * @Date: 2022/1/19 13:56
- */
-@Component
-public class Query {
-
-    @Resource
-    private DataDictDao dataDictDao;
-
-    /**
-     * 动态多条件查询字典信息
-     *
-     * @return
-     */
-    public List<DataDict> selectDataDict(String inspectionItemName, String inspectionItemCode) {
-        Specification<DataDict> specification = new Specification<DataDict>() {
-            @Override
-            public Predicate toPredicate(Root<DataDict> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
-                List<Predicate> list = new ArrayList<>();
-                if (inspectionItemName != null && !"".equals(inspectionItemName)) {
-                    list.add(criteriaBuilder.equal(root.get("inspectionItemName").as(String.class), inspectionItemName));
-                }
-                if (inspectionItemCode != null && !"".equals(inspectionItemCode)) {
-                    list.add(criteriaBuilder.equal(root.get("inspectionItemCode").as(String.class), inspectionItemCode));
-                }
-                Predicate[] predicates = new Predicate[list.size()];
-                return criteriaBuilder.and(list.toArray(predicates));
-            }
-        };
-        return dataDictDao.findAll(specification);
-    }
-}

src/main/java/com/xkrs/util/SpecQuery.java

@@ -0,0 +1,43 @@
+package com.xkrs.util;
+
+import com.xkrs.dao.SpecDao;
+import com.xkrs.model.entity.SpecEntity;
+import org.apache.http.util.TextUtils;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.persistence.criteria.Predicate;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author: XinYi Song
+ * @Date: 2022/1/19 13:56
+ */
+@Component
+public class SpecQuery {
+
+    @Resource
+    private SpecDao specDao;
+
+    /**
+     * 动态多条件查询规格信息
+     *
+     * @return
+     */
+    public List<SpecEntity> selectSpec(String partNo, String inspectionItemCode) {
+        Specification<SpecEntity> specification = (root, criteriaQuery, criteriaBuilder) -> {
+            List<Predicate> list = new ArrayList<>();
+            if (!TextUtils.isEmpty(partNo)) {
+                list.add(criteriaBuilder.equal(root.get("partNo").as(String.class), partNo));
+            }
+            if (!TextUtils.isEmpty(inspectionItemCode)) {
+                list.add(criteriaBuilder.equal(root.get("inspectionItemCode").as(String.class), inspectionItemCode));
+            }
+            Predicate[] predicates = new Predicate[list.size()];
+            return criteriaBuilder.and(list.toArray(predicates));
+        };
+        return specDao.findAll(specification);
+    }
+}