对每次称重数据的日期进行格式化处理

huimv-farm-produce/src/main/java/com/huimv/produce/produce/repo/ProdWeightRepo.java

@@ -10,7 +10,7 @@ import java.util.Date;
 
 public interface ProdWeightRepo extends JpaRepository<ProdWeightEntity, Integer>, JpaSpecificationExecutor<ProdWeightEntity> {
     //
-    @Query(nativeQuery = true,value = "SELECT * FROM prod_weight WHERE farm_id=?1 AND DATE_FORMAT(add_time,'%Y-%m-%d')>=DATE_FORMAT(?2,'%Y-%m-%d') AND DATE_FORMAT(add_time,'%Y-%m-%d')<=DATE_FORMAT(?3,'%Y-%m-%d') ORDER BY id DESC",
+    @Query(nativeQuery = true,value = "SELECT id,DATE_FORMAT(add_time,'%Y-%m-%d %H:%i:%S') AS add_time,gross_weight,tare_weight,net_weight,farm_id,batch_id FROM prod_weight WHERE farm_id=?1 AND DATE_FORMAT(add_time,'%Y-%m-%d')>=DATE_FORMAT(?2,'%Y-%m-%d') AND DATE_FORMAT(add_time,'%Y-%m-%d')<=DATE_FORMAT(?3,'%Y-%m-%d') ORDER BY id DESC",
             countQuery = "SELECT COUNT(*) FROM prod_weight WHERE farm_id=?1 AND DATE_FORMAT(add_time,'%Y-%m-%d')>=DATE_FORMAT(?2,'%Y-%m-%d') AND DATE_FORMAT(add_time,'%Y-%m-%d')<=DATE_FORMAT(?3,'%Y-%m-%d')")
     Page<ProdWeightEntity> findWeightByFarmIdAndStartDateAndEndDate(Integer farmId, Date startDate, Date endDate, Pageable pageable);
 

huimv-farm-produce/src/main/java/com/huimv/produce/produce/service/impl/WeightImpl.java

@@ -238,11 +238,6 @@ public class WeightImpl implements IWeight {
     @Override
     public Result getEveryTimeWeightOnPage(Integer farmId, Date startDate, Date endDate, Integer pageNo, Integer pageSize) throws ParseException {
         Pageable pageable = PageRequest.of(pageNo - 1, pageSize, Sort.Direction.DESC, "id");
-        System.out.println("farmId>>"+farmId);
-        System.out.println("startDate>>"+dateUtil.formatDateText(startDate));
-        System.out.println("endDate>>"+dateUtil.formatDateText(endDate));
-        System.out.println("pageNo>>"+pageNo);
-        System.out.println("pageSize>>"+pageSize);
         //
         return new Result(ResultCode.SUCCESS, weightRepo.findWeightByFarmIdAndStartDateAndEndDate(farmId, startDate, endDate, pageable));
     }

huimv-farm-produce/src/main/resources/application-prod.yml

@@ -2,7 +2,7 @@ server:
   port: 8094
 spring:
   application:
-    name: pigfarm-local-device
+    name: huimv-farm-produce
   #------DataSource-----
   datasource:
     url: jdbc:mysql://47.96.4.54:10052/huimv-farm-center?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai