料控管理

shiwan/admin/pom.xml

@@ -88,6 +88,7 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
+        <!--        spring session 与redis应用基本环境配置,需要开启redis后才可以使用，不然启动Spring boot会报错 -->
         <dependency>
             <groupId>org.springframework.session</groupId>
             <artifactId>spring-session-data-redis</artifactId>
@@ -110,28 +111,6 @@
             <scope>compile</scope>
         </dependency>
 
-
-        <dependency>
-            <groupId>com.baidu.aip</groupId>
-            <artifactId>java-sdk</artifactId>
-            <version>4.15.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-fileupload</groupId>
-            <artifactId>commons-fileupload</artifactId>
-            <version>1.3.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
-            <version>2.4.2</version>
-        </dependency>
-
     </dependencies>
 
     <build>

shiwan/admin/src/main/java/com/huimv/admin/repo/secondary/DaJqdaRepo.java

@@ -9,7 +9,6 @@ import java.util.List;
 
 public interface DaJqdaRepo extends JpaRepository<DaJqda, Integer>, JpaSpecificationExecutor<DaJqda> {
 
-
     @Query(nativeQuery = true ,value = "SELECT MAX(id) FROM da_jqda ")
     List<String> findMax();
 

shiwan/admin/src/main/java/com/huimv/admin/service/secondary/impl/DaZsdaServiceImpl.java

@@ -87,7 +87,7 @@ public class DaZsdaServiceImpl implements DaZsdaService {
 
 	@Override
 	public Result findAll(String name , Integer pageNum , Integer pageSize) {
-//		try {
+		try {
 			Map map = new HashMap();
 			Integer startPage = (pageNum-1) * pageSize;
 			List<DaZsda> all = rep.findAll(name,startPage,pageSize);
@@ -118,21 +118,15 @@ public class DaZsdaServiceImpl implements DaZsdaService {
 				map1.put("zsmc",daZsda.getZsmc());
 				map1.put("zsqy",daZsda.getZsqy());
 				map1.put("ssqy",daZsda.getSsqy());
-				List<DaJqda> allByZSID = jqdaRepo.findAllByZSID(id);
-				if (allByZSID != null && allByZSID.size()>0){
-					map1.put("jqid",allByZSID.get(0).getJQID());
-				}else {
-					map1.put("jqid",null);
-				}
-
+				map1.put("jqid",jqdaRepo.findAllByZSID(id).get(0).getJQID());
 				list.add(map1);
 			}
 			map.put("data",list);
-
+			
 			return new Result(ResultCode.SUCCESS,map);
-//		}catch (Exception e){
-//			return new Result(ResultCode.FAIL);
-//		}
+		}catch (Exception e){
+			return new Result(ResultCode.FAIL);
+		}
 	}
 
 	@Override