修改猪舍档案

shiwan/admin/src/main/java/com/huimv/admin/controller/secondary/DaLqdaController.java

@@ -2,40 +2,165 @@ package com.huimv.admin.controller.secondary;
 
 
 import com.huimv.admin.domain.secondary.DaLqda;
+import com.huimv.admin.domain.secondary.DaZsda;
+import com.huimv.admin.repo.secondary.DaLqdaRepository;
+import com.huimv.admin.repo.secondary.DaZsdaRepository;
 import com.huimv.admin.service.secondary.DaLqdaService;
 import com.huimv.admin.utils.Result;
+import com.huimv.admin.utils.ResultCode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.*;
+
 @RestController
 @CrossOrigin
 @RequestMapping("/DaLqda")
 public class DaLqdaController {
 
-	@Autowired
-	private DaLqdaService service;
+    @Autowired
+    private DaLqdaService service;
+
+    @Autowired
+    private DaZsdaRepository daZsdaRepository ;
+    @Autowired
+    private DaLqdaRepository DaLqdaRepository ;
+
+
+    @RequestMapping("/add")
+    public Result add(DaLqda childcareEntity, String tJtime) {
+        Date date = new Date();
+        //体重统计时间
+//        childcareEntity.setTztjsj(DateUtils.parseDate(tJtime, DateUtils.DATETIME_FORMAT));
+        childcareEntity.setXgsj(date);
+        System.out.println("收到数据");
+
+        return service.add(childcareEntity);
+    }
+
+
+
+    @RequestMapping("/remove")
+    public Result remove(Integer[] ids) {
+        return service.remove(ids);
+    }
+
+
+    @RequestMapping("/update")
+    public Result update(DaLqda childcareEntity) {
+        return service.update(childcareEntity);
+    }
+
 
-	@RequestMapping("/add")
-	public Result add(DaLqda childcareEntity){
-		return service.add(childcareEntity); }
+    @RequestMapping("/find")
+    public Result findAllById(String name, Integer pageNum, Integer pageSize) {
+        List<DaZsda> zsdaList =daZsdaRepository.findAll(name,pageNum,pageSize );  //findAlla();
+        List list02 = new ArrayList();
+        for (DaZsda daZsda : zsdaList) {
+            Map map = new HashMap();
+            List<DaLqda> allByZsid = DaLqdaRepository.findAllByZsid(daZsda.getId());
+            if (allByZsid != null && allByZsid.size()>0){
+                map.put("data", allByZsid.get(0));
+                map.put("zsmc", daZsda.getZsmc());
+                list02.add(map);
+            }
+        }
+        return new Result(ResultCode.SUCCESS,list02);
+    }
 
-	@RequestMapping("/remove")
-	public Result remove(Integer[] ids){ return service.remove(ids); }
 
-	@RequestMapping("/update")
-	public Result update(DaLqda childcareEntity){ return service.update(childcareEntity); }
 
-	@RequestMapping("/findAllById")
-	public Result findAllById(Integer id){ return service.findAllById(id); }
+   /* @RequestMapping("/findAll")  //查单个  栏期下面的所有记录数据   点开查看详细信息
+    //猪舍id
+    public Result findAll(String name, Integer pageNum, Integer pageSize) {
+            List<DaZsda> zsdaList = daZsdaRepository.findAll(name, pageNum, pageSize);  //findAlla();
+            List list02 = new ArrayList();
+            for (DaZsda daZsda : zsdaList) {
+                Map map = new HashMap();
+                List<DaLqda> allByZsid = DaLqdaRepository.findAllByZsid(daZsda.getId());
+                if (allByZsid != null && allByZsid.size() > 0) {
+                    map.put("data", allByZsid.get(0));
+                    map.put("zsmc", daZsda.getZsmc());
 
+                    list02.add(map);
+                }
+            }
+            int totalsize = list02.size();
+            int totalpage = totalsize / pageSize;
+            List<Object> list01 = pageBySubList(list02, pageSize, pageNum);
+            //总条数
+            Map<String, Object> map = new HashMap<>();
+            map.put("totalSize", totalsize);
+            map.put("totalPage", totalpage);
+            List<Object> list = new LinkedList<>();
+            list.add(list01);
+            list.add(map);
+            // 总页数
+            return new Result(ResultCode.SUCCESS, list);
+        }*/
 
+    @RequestMapping("/findAll")  //查单个  栏期下面的所有记录数据   点开查看详细信息
+    //猪舍id
+    public Result findAll(String name, Integer pageNum, Integer pageSize) {
+        List<DaZsda> listZsda = daZsdaRepository.findAlla();
+        List<Integer> zsdaId = new ArrayList();
+        for (DaZsda daZsda : listZsda) {
+            zsdaId.add(daZsda.getId());
+        }
+        Integer startPage = (pageNum-1) * pageSize;
 
-	@RequestMapping("/findAll")  //查单个  栏期下面的所有记录数据   点开查看详细信息
-	//猪舍id   现在改成牧场id来用
-	public Result findAll(String name ,Integer pageNum , Integer pageSize){
-		return service.findAll(name,pageNum,pageSize);
-	}
+        List<Map<String,Object>> allByZsids = DaLqdaRepository.findAllByZsids(zsdaId, name, startPage, pageSize);
+        Integer size = DaLqdaRepository.findAllByZsidAll(zsdaId,name);
+        Map map = new HashMap();
+        map.put("total",size);
+        map.put("data",getSelectLow(allByZsids));
 
+        return  new Result(ResultCode.SUCCESS,map);
+    }
+
+
+    public  List<Map<String, Object>> getSelectLow(List<Map<String, Object>> list){
+        List<Map<String, Object>> select = new ArrayList<>();
+
+        for (Map<String, Object> stringObjectMap : list) {
+            Map map =new HashMap();
+            for (String s : stringObjectMap.keySet()) {
+                map.put(s.toLowerCase(),stringObjectMap.get(s));
+            }
+            select.add(map);
+        }
+
+        return select;
+    }
+
+
+    //list 分页工具
+    public static List<Object> pageBySubList(List list, int pagesize,  int currentPage) {
+        int totalcount = list.size();
+        int pagecount = 0;
+        List<Object> subList;
+        int m = totalcount % pagesize;
+        if (m > 0) {
+            pagecount = totalcount / pagesize + 1;
+        } else {
+            pagecount = totalcount / pagesize;
+        }
+        if (m == 0) {
+            subList = list.subList((currentPage - 1) * pagesize, pagesize * (currentPage));
+        } else {
+            if (currentPage == pagecount) {
+                subList = list.subList((currentPage - 1) * pagesize, totalcount);
+            } else {
+                subList = list.subList((currentPage - 1) * pagesize, pagesize * (currentPage));
+            }
+        }
+        return subList;
+    }
 }
+
+
+
+
+

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

@@ -9,8 +9,8 @@ import java.util.List;
 
 public interface DaJqdaRepo extends JpaRepository<DaJqda, Integer>, JpaSpecificationExecutor<DaJqda> {
 
-    @Query(nativeQuery = true ,value = "SELECT MAX(id) FROM da_jqda ")
-    List<Integer> findMax();
+    @Query(nativeQuery = true ,value = "SELECT * FROM da_jqda order by id DESC ")
+    List<DaJqda> findMax();
 
     List<DaJqda> findAllByZSID(Integer ZSID);
 }

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

@@ -6,11 +6,11 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
 
 import java.util.List;
+import java.util.Map;
 
 public interface DaLqdaRepository extends JpaRepository<DaLqda, Integer>, JpaSpecificationExecutor<DaLqda> {
 
     @Query(nativeQuery = true ,value = "select * from da_lqda where zsid like %?1%   limit ?2 , ?3")
-
     List<DaLqda> findAll(String name, Integer startPage, Integer pageSize);
 
 
@@ -19,9 +19,20 @@ public interface DaLqdaRepository extends JpaRepository<DaLqda, Integer>, JpaSpe
     DaLqda  findlast();
 
 
+    @Query(nativeQuery = true ,value = "select * from da_lqda where zsid like %?1%  ORDER BY id DESC LIMIT 1")
+    List<DaLqda> findAllByZsid(Integer ZSID);
+
+    @Query(nativeQuery = true ,value = "SELECT lq.*,zs.ZSMC FROM `da_lqda` lq,`da_zsda` zs WHERE lq.ZSID = zs.ID and lq.ZSID in (?1) and lq.LQMC like %?2% limit ?3,?4")
+    List<Map<String,Object>> findAllByZsids(List<Integer> zsids, String name, Integer startPage, Integer pageSize);
+
+    @Query(nativeQuery = true , value = "select count(*) from da_lqda where ZSID in (?1) and LQMC like %?2%")
+    Integer findAllByZsidAll(List<Integer> zsids,String name);
+
 
+//    @Query(nativeQuery = true , value = "SELECT id,CGQID,lqid,dqaq,CJSJ,SCSJ FROM sj_hk_aq WHERE id IN(SELECT MAX(id) FROM sj_hk_aq WHERE lqid IN(?1) AND DATE_FORMAT(CJSJ,'%Y-%m-%d')=?2 GROUP BY lqid)")
+//    List<SjHkAqEntity> getLastAq(List<Integer> lqids,String todayDate);
 
-    @Query(nativeQuery = true ,value = "SELECT MAX(id) FROM da_zsda ")
-    List<Integer> findMax();
+    @Query(nativeQuery = true , value = "select LQMC from da_lqda where id = ?1")
+   String findBy(Integer dqlq);
 
 }

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

@@ -8,12 +8,19 @@ import org.springframework.data.jpa.repository.Query;
 import java.util.List;
 
 public interface DaZsdaRepository extends JpaRepository<DaZsda, Integer>, JpaSpecificationExecutor<DaZsda> {
-    @Query(nativeQuery = true ,value = "select * from da_zsda where MCID = 11 and ZFBZ = 0")
+    @Query(nativeQuery = true ,value = "select * from da_zsda where MCID = 39 and ZFBZ = 0")
     List<DaZsda> findAlla();
 
-	@Query(nativeQuery = true ,value = "select * from da_zsda where ZSMC like %?1% and MCID = 11 and ZFBZ = 0  order by XGSJ DESC limit ?2 , ?3")
+	@Query(nativeQuery = true ,value = "select * from da_zsda where ZSMC like %?1% and MCID = 39 and ZFBZ = 0  order by XGSJ DESC limit ?2 , ?3")
     List<DaZsda> findAll(String name, Integer startPage, Integer pageSize);
 
     @Query(nativeQuery = true ,value = "SELECT MAX(id) FROM da_zsda ")
     List<Integer> findMax();
+
+
+    @Query(nativeQuery = true ,value = "select * from da_zsda where MCID = 39 and ZFBZ = 0 order by XGSJ DESC limit ?1 , ?2")
+    List<DaZsda> findAllb(Integer startPage, Integer pageSize);
+
+    @Query(nativeQuery = true ,value = "select count(*) from da_zsda where MCID = 39 and ZSMC like %?1% ")
+    Integer findAllc(String name);
 }

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

@@ -46,19 +46,19 @@ public interface MachineControlRepository extends JpaRepository<MachineControlEn
             "    ON zs.`ID` = jq.`ZSID`\n" +
             "  JOIN da_lkpz lk\n" +
             "    ON jq.`JQID` = lk.`jqid`\n" +
-            "WHERE zs.MCID = 11 and zs.ZFBZ = 0 and jq.ZFBZ = 0 and ZSMC LIKE CONCAT('%',?3,'%') LIMIT ?1,?2")
+            "WHERE zs.MCID = 39 and zs.ZFBZ = 0 and jq.ZFBZ = 0 and ZSMC LIKE CONCAT('%',?3,'%') LIMIT ?1,?2")
     List<Map> getMachineControlInfo(Integer start, Integer pageSize, String keyword);
 
 //    @Query(nativeQuery = true,value = "SELECT zs.`ZSMC`,lk.* FROM da_zsda  zs JOIN da_jqda  jq ON zs.`ID`=jq.`ZSID` JOIN da_lkpz lk ON jq.`JQID`=lk.`jqid` where zs.ZSMC like %?3% limit ?1,?2")
 //    List<Map> findMachineControlInfo(Integer start,Integer pageSize,String keyword);
 
-    @Query(nativeQuery = true,value = "SELECT count(*) FROM da_zsda  zs JOIN da_jqda  jq ON zs.`ID`=jq.`ZSID` and zs.MCID = 11 and zs.ZFBZ = 0 and jq.ZFBZ = 0 JOIN da_lkpz lk ON jq.`JQID`=lk.`jqid` where zs.ZSMC like %?1%")
+    @Query(nativeQuery = true,value = "SELECT count(*) FROM da_zsda  zs JOIN da_jqda  jq ON zs.`ID`=jq.`ZSID` and zs.MCID = 39 and zs.ZFBZ = 0 and jq.ZFBZ = 0 JOIN da_lkpz lk ON jq.`JQID`=lk.`jqid` where zs.ZSMC like %?1%")
     Long countTotalSize(String keyword);
 
     /**
      * 新增时的猪舍名称下拉框
      * @return
      */
-    @Query(nativeQuery = true,value = "SELECT zs.ZSMC,zs.id zsId,jq.JQID jqid  FROM da_zsda zs JOIN da_jqda jq ON zs.ID = jq.ZSID WHERE zs.MCID = 11 and zs.ZFBZ = 0 and jq.ZFBZ = 0 and jq.JQID NOT IN (SELECT jqid FROM da_lkpz lk)")
+    @Query(nativeQuery = true,value = "SELECT zs.ZSMC,zs.id zsId,jq.JQID jqid  FROM da_zsda zs JOIN da_jqda jq ON zs.ID = jq.ZSID WHERE zs.MCID = 39 and zs.ZFBZ = 0 and jq.ZFBZ = 0 and jq.JQID NOT IN (SELECT jqid FROM da_lkpz lk)")
     List<Map<String,Object>> selectZsList();
 }

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

@@ -45,6 +45,7 @@ public class DaLqdaServiceImpl implements DaLqdaService {
 			//查找到猪舍档案，存储当前栏期
 			DaZsda daZsda = daZsdaRepository.findById(zsid).get();
 			daZsda.setDqlq(ids+"");
+			daZsdaRepository.save(daZsda);
 
 			/*entity.setMcid(11);
 			Integer  id = rep.findMax().get(0);

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

@@ -2,13 +2,16 @@ package com.huimv.admin.service.secondary.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.huimv.admin.domain.secondary.DaJqda;
+import com.huimv.admin.domain.secondary.DaLqda;
 import com.huimv.admin.domain.secondary.DaZsda;
 import com.huimv.admin.repo.secondary.DaJqdaRepo;
+import com.huimv.admin.repo.secondary.DaLqdaRepository;
 import com.huimv.admin.repo.secondary.DaZsdaRepository;
 import com.huimv.admin.service.secondary.DaZsdaService;
 import com.huimv.admin.utils.Result;
 import com.huimv.admin.utils.ResultCode;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
@@ -23,28 +26,48 @@ public class DaZsdaServiceImpl implements DaZsdaService {
 	@Autowired
 	private DaJqdaRepo jqdaRepo;
 
+	@Autowired
+	private DaLqdaRepository lqdaRep;
+
+	@Value("${MCID}")
+	private  Integer MCID ;
+
+
 	@Override
 	public Result add(DaZsda entity){
 		if (entity == null){
 
 			return new Result(ResultCode.FAIL);
 		}
-		try {
+//		try {
 
-			entity.setMcid(11);
+		entity.setMcid(MCID);
 
-			entity.setXgsj(new Date());
-			rep.save(entity);
-			DaJqda daJqda =new DaJqda() ;
-			Integer  id = rep.findMax().get(0);
-			daJqda.setZSID(id);
-			jqdaRepo.save(daJqda);
+		entity.setZfbz(0);
+		entity.setXgsj(new Date());
+		rep.save(entity);
 
 
-			return new Result(ResultCode.SUCCESS);
-		}catch (Exception e){
-			return new Result(ResultCode.FAIL);
-		}
+		DaJqda daJqda1 = jqdaRepo.findMax().get(0);
+
+		String jqid = "000"+(Integer.parseInt(daJqda1.getJQID())+1);
+		DaJqda daJqda =new DaJqda() ;
+		Integer  id = rep.findMax().get(0);
+		daJqda.setZSID(id);
+		daJqda.setJQID(jqid);
+		daJqda.setXGSJ(new Date());
+		daJqda.setZFBZ(0);
+		jqdaRepo.save(daJqda);
+
+
+		return new Result(ResultCode.SUCCESS);
+
+
+
+
+//		}catch (Exception e){
+//			return new Result(ResultCode.FAIL);
+//		}
 	}
 
 
@@ -70,8 +93,9 @@ public class DaZsdaServiceImpl implements DaZsdaService {
 			return new Result(ResultCode.FAIL);
 		}
 		try {
-			entity.setMcid(11);
+			entity.setMcid(MCID);
 			entity.setXgsj(new Date());
+			entity.setZfbz(0);
 			rep.save(entity);
 			return new Result(ResultCode.SUCCESS);
 		}catch (Exception e){
@@ -81,11 +105,18 @@ public class DaZsdaServiceImpl implements DaZsdaService {
 
 	@Override
 	public Result findAll(String name , Integer pageNum , Integer pageSize) {
-		try {
+//		try {
 			Map map = new HashMap();
 			int size = rep.findAlla().size() ;
 			Integer startPage = (pageNum-1) * pageSize;
-			List<DaZsda> all = rep.findAll(name,startPage,pageSize);
+			List<DaZsda> all ;
+			if (name != null && !name.equals("")){
+				size = rep.findAllc(name);
+				all= rep.findAll(name,startPage,pageSize);
+			}else {
+				 all = rep.findAllb(startPage,pageSize);
+			}
+
 			map.put("total",size);
 			map.put("totalPageNum",(size  +  pageSize  - 1) / pageSize);
 
@@ -96,7 +127,14 @@ public class DaZsdaServiceImpl implements DaZsdaService {
 				map1.put("id",id);
 				map1.put("csq1",daZsda.getCsq1());
 				map1.put("csq2",daZsda.getCsq2());
-				map1.put("dqlq",daZsda.getDqlq());
+//				lqdaRep.findById(daZsda.getDqlq());
+				String dqlq = daZsda.getDqlq();
+				map1.put("dqlq",dqlq);
+				if (dqlq != null && !dqlq.equals("")){
+					map1.put("dqlq",lqdaRep.findBy(Integer.parseInt(dqlq)));
+				}
+
+
 				map1.put("flq",daZsda.getFlq());
 				map1.put("gly",daZsda.getGly());
 				map1.put("glyxm",daZsda.getGlyxm());
@@ -113,6 +151,7 @@ public class DaZsdaServiceImpl implements DaZsdaService {
 				map1.put("zsmc",daZsda.getZsmc());
 				map1.put("zsqy",daZsda.getZsqy());
 				map1.put("ssqy",daZsda.getSsqy());
+				map1.put("dqlqId",dqlq);
 				List<DaJqda> allByZSID = jqdaRepo.findAllByZSID(id);
 				if (allByZSID != null && allByZSID.size()>0){
 					map1.put("jqid",allByZSID.get(0).getJQID());
@@ -124,9 +163,9 @@ public class DaZsdaServiceImpl implements DaZsdaService {
 			}
 			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

shiwan/admin/src/main/resources/application.properties

@@ -1,4 +1,7 @@
 spring.profiles.active=test
 #spring.profiles.active=prod
 
+#MCID=11
+MCID=39
+
 

shiwan/admin/src/test/java/com/huimv/admin/AdminApplicationTests.java

@@ -23,4 +23,12 @@ class AdminApplicationTests {
 
     }
 
+    public static void main(String[] args) {
+        try {
+            System.out.println(Integer.parseInt(null));
+        }catch (Exception e){
+            System.out.println("s");
+        }
+
+    }
 }