修复预警数据的提示日期。

huimv-hy-production/huimv.hy.erp.datasource/src/main/java/com/huimv/production/datasource/controller/ErpDataController.java

@@ -46,10 +46,10 @@ public class ErpDataController {
      */
     @RequestMapping("/getPsy")
     public Result getPsy(@Param(value="farmID") String farmID,@Param(value="startDate") String startDate,@Param(value="endDate") String endDate,@RequestParam(value = "accessToken",required = true) String accessToken){
-        System.out.println("farmID="+farmID);
-        System.out.println("startDate="+startDate);
-        System.out.println("endDate="+endDate);
-        System.out.println("accessToken="+accessToken);
+//        System.out.println("farmID="+farmID);
+//        System.out.println("startDate="+startDate);
+//        System.out.println("endDate="+endDate);
+//        System.out.println("accessToken="+accessToken);
         // 验证token
         Result result = tokenUtil.verifyToken(accessToken);
         if(!result.isSuccess()){

huimv-hy-production/huimv.hy.erp.datasource/src/main/java/com/huimv/production/datasource/dao/repo/TDeliveryRepo.java

@@ -1210,10 +1210,10 @@ public interface TDeliveryRepo extends JpaRepository<TDeliveryEntity, String>, J
      */
     @Query(nativeQuery = true,value ="SELECT  TML.FMESSAGESTR AS '消息内容', TML.FDATETIPS AS '提示日期'\n" +
             "  FROM TMessageLog AS TML,TMessageAndUserData AS TAUD  ,TWarnigRules AS TWR WHERE  TWR.FID = TML.WARNINGRULESDID \n" +
-            "  AND  TAUD.FISTREATMENTE =0 AND TML.FID= TAUD.MESSAGELOGDID  and DATEDIFF(day,TML.FDATETIPS,getDate())<=3\n" +
+            "  AND  TAUD.FISTREATMENTE =0 AND TML.FID= TAUD.MESSAGELOGDID  and DATEDIFF(day,TML.FDATETIPS,getDate())<=?1 \n" +
             "   group by TML.FMESSAGESTR, TML.FDATETIPS\n" +
             "   ORDER BY TML.FDATETIPS")
-    List<Object[]> getWarningMessage();
+    List<Object[]> getWarningMessage(Integer days);
 
     /**
      * @Method      : getWorkPlan

huimv-hy-production/huimv.hy.erp.datasource/src/main/java/com/huimv/production/datasource/service/impl/ErpDataServiceImpl.java

@@ -495,8 +495,9 @@ public class ErpDataServiceImpl implements IErpDataService {
 
     @Override
     public Result getWarningMessage() {
+        int days = 5;
         //
-        List<Object[]> stockList = tDeliveryRepo.getWarningMessage();
+        List<Object[]> stockList = tDeliveryRepo.getWarningMessage(days);
         JSONArray produceJa = new JSONArray();
         for(int a=0;a<stockList.size();a++){
             Object[] stockObj = (Object[]) stockList.get(a);
@@ -505,8 +506,9 @@ public class ErpDataServiceImpl implements IErpDataService {
             //消息内容
             dataJo.put("xxnr", stockObj[0]);
             //提示日期
-            dataJo.put("tsrq", stockObj[1]);
+            dataJo.put("tsrq",  stockObj[1].toString());
         }
+        System.out.println("###############　produceJa>>"+produceJa);
         return new Result(ResultCode.SUCCESS,produceJa);
     }
 
@@ -580,7 +582,7 @@ public class ErpDataServiceImpl implements IErpDataService {
     public Result getSales() {
         //
         List<Object[]> salesList = tDeliveryRepo.getSales();
-        System.out.println("salesList.size="+salesList.size());
+//        System.out.println("salesList.size="+salesList.size());
         JSONArray produceJa = new JSONArray();
         for(int a=0;a<salesList.size();a++){
             Object[] salesObj = (Object[]) salesList.get(a);

huimv-hy-production/huimv.hy.erp.datasource/src/main/java/com/huimv/production/datasource/utils/DateUtils.java

@@ -35,6 +35,13 @@ public class DateUtils {
 	/** 时间格式(yyyy-MM-dd HH:mm:ss) */
 	public final static String DATE_TIME_PATTERN = "yyyy-MM-dd HH:mm:ss";
 
+	//格式化日期(Long --> Date)
+    public String formatLongToDate(Long longDate){
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date date= new Date(longDate);
+        return df.format(date);
+    }
+
 	//解析日期
 	public Date parseDate(String textDate){
         //将String转换为Date