Browse Source

新增删除头天天气预报,没一小时删除整点报时

wsl 2 years ago
parent
commit
7f2a50674a

+ 7 - 3
business/base-service/src/main/java/com/yihu/jw/hospital/message/dao/SystemMessageDao.java

@ -1,15 +1,12 @@
package com.yihu.jw.hospital.message.dao;
package com.yihu.jw.hospital.message.dao;
import com.yihu.jw.entity.care.device.BaseSleepPlanDetail;
import com.yihu.jw.entity.hospital.message.SystemMessageDO;
import com.yihu.jw.entity.hospital.message.SystemMessageDO;
import org.hibernate.annotations.SQLUpdate;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.util.Date;
import java.util.List;
import java.util.List;
@ -25,6 +22,13 @@ public interface SystemMessageDao extends PagingAndSortingRepository<SystemMessa
    @Query("from SystemMessageDO p where p.id = ?1")
    @Query("from SystemMessageDO p where p.id = ?1")
    SystemMessageDO queryById(String id);
    SystemMessageDO queryById(String id);
    @Modifying
    @Query("delete from SystemMessageDO a where a.type = '996'")
    int delPushTimeIntegerPoint();
    @Query("delete from SystemMessageDO a where  a.type = '995' and a.createTime<=?1 ")
    int delWeatherForecast(String date);
    @Modifying
    @Modifying
    @Query("delete from SystemMessageDO a   where a.receiver = ?1 and a.relationCode = ?2 and a.type ='407'")
    @Query("delete from SystemMessageDO a   where a.receiver = ?1 and a.relationCode = ?2 and a.type ='407'")
    int orderMessageDel(String doctor, String orderId);
    int orderMessageDel(String doctor, String orderId);

+ 1 - 1
svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/doctor/DoctorBirthdayWishesEndpoint.java

@ -336,7 +336,7 @@ public class DoctorBirthdayWishesEndpoint extends BaseController {
                        messageDO.setData(one.getContent());
                        messageDO.setData(one.getContent());
                        messageDO.setDel("1");
                        messageDO.setDel("1");
                        messageDO.setCreateTime(new Date());
                        messageDO.setCreateTime(new Date());
                        String url = speechTtsUtil.wordToVoice(one.getContent());
                        String url = speechTtsUtil.wordToVoice(one.getContent().replace("<br>",""));
                        messageDO.setAudioUrl(url);
                        messageDO.setAudioUrl(url);
                        systemMessageDao.save(messageDO);
                        systemMessageDao.save(messageDO);
                        //推送socket
                        //推送socket

+ 8 - 0
svr/svr-cloud-job/src/main/java/com/yihu/jw/care/event/ApplicationEvent.java

@ -273,6 +273,14 @@ public class ApplicationEvent implements ApplicationListener<ContextRefreshedEve
            }else {
            }else {
                logger.info("PUSH_MESSAGE_WEATHER_FORECAST_JOB success");
                logger.info("PUSH_MESSAGE_WEATHER_FORECAST_JOB success");
            }
            }
            //删除天气预报:每天晚上12点删除
            if (!quartzHelper.isExistJob("DEL_PUSH_MESSAGE_WEATHER_FORECAST_JOB")){
                String trigger =  SystemConf.getInstance().getSystemProperties().getProperty("DEL_PUSH_MESSAGE_WEATHER_FORECAST_JOB");
                quartzHelper.addJob(PushWeatherForecastJob.class,trigger,"DEL_PUSH_MESSAGE_WEATHER_FORECAST_JOB",new HashMap<String,Object>());
                logger.info("DEL_PUSH_MESSAGE_WEATHER_FORECAST_JOB success");
            }else {
                logger.info("DEL_PUSH_MESSAGE_WEATHER_FORECAST_JOB success");
            }
        } catch (Exception e) {
        } catch (Exception e) {
            logger.info(" job start failed");
            logger.info(" job start failed");

+ 35 - 0
svr/svr-cloud-job/src/main/java/com/yihu/jw/care/job/pushRecord/DelPushWeatherForecastJob.java

@ -0,0 +1,35 @@
package com.yihu.jw.care.job.pushRecord;
import com.yihu.jw.care.service.message.PushWeatherForecastService;
import org.quartz.Job;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
/**
 * Created by wsl on 2022/8/5
 */
public class DelPushWeatherForecastJob implements Job {
    private static Logger logger = LoggerFactory.getLogger(DelPushWeatherForecastJob.class);
    @Autowired
    private PushWeatherForecastService pushWeatherForecastService;
    @Override
    public void execute(JobExecutionContext context) throws JobExecutionException {
        try {
                System.out.println("====================删除系统推送天气预报start==================");
                logger.info("DelPushWeatherForecastJob start");
                pushWeatherForecastService.delWeatherForecast();
                logger.info("DelPushWeatherForecastJob end");
                System.out.println("====================删除系统推送天气预报end==================");
        } catch (Exception e) {
            logger.info("DelPushWeatherForecastJob --ERROR MSG:" + e.getMessage());
            e.printStackTrace();
        }
    }
}

+ 1 - 1
svr/svr-cloud-job/src/main/java/com/yihu/jw/care/job/pushRecord/PushWeatherForecastJob.java

@ -28,7 +28,7 @@ public class PushWeatherForecastJob implements Job {
            if (deviceLostMessageUtil.messageOnOff(7)) {
            if (deviceLostMessageUtil.messageOnOff(7)) {
                System.out.println("====================系统推送天气预报start==================");
                System.out.println("====================系统推送天气预报start==================");
                logger.info("PushWeatherForecastJob start");
                logger.info("PushWeatherForecastJob start");
                pushWeatherForecastService.weatherForecastS();
                pushWeatherForecastService.weatherForecast();
                logger.info("PushWeatherForecastJob end");
                logger.info("PushWeatherForecastJob end");
                System.out.println("====================系统推送天气预报end==================");
                System.out.println("====================系统推送天气预报end==================");
            }
            }

+ 9 - 0
svr/svr-cloud-job/src/main/java/com/yihu/jw/care/service/message/PushTimeIntegerPointService.java

@ -6,7 +6,9 @@ import com.yihu.jw.care.util.SystemPushMessageUtil;
import com.yihu.jw.entity.hospital.message.SystemMessageDO;
import com.yihu.jw.entity.hospital.message.SystemMessageDO;
import com.yihu.jw.hospital.message.dao.SystemMessageDao;
import com.yihu.jw.hospital.message.dao.SystemMessageDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.ArrayList;
import java.util.Date;
import java.util.Date;
@ -26,10 +28,17 @@ public class PushTimeIntegerPointService {
    private DeviceLostMessageUtil deviceLostMessageUtil;
    private DeviceLostMessageUtil deviceLostMessageUtil;
    @Autowired
    @Autowired
    private SystemMessageDao systemMessageDao;
    private SystemMessageDao systemMessageDao;
    @Autowired
    private JdbcTemplate jdbcTemplate;
    private static String message = "现在是北京时间{Time}点整!";
    private static String message = "现在是北京时间{Time}点整!";
    @Transactional(rollbackFor = Exception.class)
    public void pushTimeIntegerPoint() {
    public void pushTimeIntegerPoint() {
        String sql = "delete from base_system_message  where type = '996'";
        jdbcTemplate.update(sql);
        //systemMessageDao.delPushTimeIntegerPoint();
        int i = DateUtil.integerTime();
        int i = DateUtil.integerTime();
        String content = message.replace("{Time}", i + "");
        String content = message.replace("{Time}", i + "");
        List<SystemMessageDO> systemMessageDOList = new ArrayList<>();
        List<SystemMessageDO> systemMessageDOList = new ArrayList<>();

+ 10 - 1
svr/svr-cloud-job/src/main/java/com/yihu/jw/care/service/message/PushWeatherForecastService.java

@ -1,5 +1,6 @@
package com.yihu.jw.care.service.message;
package com.yihu.jw.care.service.message;
import com.yihu.jw.care.util.DateUtil;
import com.yihu.jw.care.util.DeviceLostMessageUtil;
import com.yihu.jw.care.util.DeviceLostMessageUtil;
import com.yihu.jw.care.util.SystemPushMessageUtil;
import com.yihu.jw.care.util.SystemPushMessageUtil;
import com.yihu.jw.care.util.WeatherUtil;
import com.yihu.jw.care.util.WeatherUtil;
@ -9,6 +10,7 @@ import com.yihu.jw.hospital.message.dao.SystemMessageDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.ArrayList;
import java.util.Date;
import java.util.Date;
@ -39,7 +41,7 @@ public class PushWeatherForecastService {
    // ,"tem_night":"28","win":"东风","win_speed":"2级","win_meter":"7km\/h","air":"118","pressure":"999","humidity":"50%"}
    // ,"tem_night":"28","win":"东风","win_speed":"2级","win_meter":"7km\/h","air":"118","pressure":"999","humidity":"50%"}
    public void weatherForecastS(){
    public void weatherForecast(){
        List<SystemMessageDO> messageDOList = new ArrayList<>();
        List<SystemMessageDO> messageDOList = new ArrayList<>();
        String sql = "SELECT p.id,p.`name`,p.photo FROM  base_patient p " +
        String sql = "SELECT p.id,p.`name`,p.photo FROM  base_patient p " +
@ -68,5 +70,12 @@ public class PushWeatherForecastService {
    }
    }
    @Transactional(rollbackFor = Exception.class)
    public void delWeatherForecast(){
        //systemMessageDao.delWeatherForecast();
        String sql = "delete from base_system_message  where type = '995' and create_time<='"+DateUtil.getStringDate()+"'";
        jdbcTemplate.update(sql);
    }
}
}

+ 3 - 1
svr/svr-cloud-job/src/main/resources/system.properties

@ -49,4 +49,6 @@ DEVICE_WATCH_REMAINING_POWER_JOB= 0 0 8,14,21 * * ?
#\u65F6\u95F4\u6574\u70B9\u62A5\u65F6\uFF1A\u65E9\u4E0A10\u70B9\u5230\u4E0B\u534818\u70B9\u8FDB\u884C\u51C6\u70B9\u64AD\u62A5
#\u65F6\u95F4\u6574\u70B9\u62A5\u65F6\uFF1A\u65E9\u4E0A10\u70B9\u5230\u4E0B\u534818\u70B9\u8FDB\u884C\u51C6\u70B9\u64AD\u62A5
PUSH_MASSAGE_TIME_INTEGER_POINT_JOB= 0 0 10,11,12,13,14,15,16,17,18 * * ?
PUSH_MASSAGE_TIME_INTEGER_POINT_JOB= 0 0 10,11,12,13,14,15,16,17,18 * * ?
#\u5929\u6C14\u9884\u62A5\uFF1A\u6BCF\u5929\u65E9\u4E0A11\u70B9\u64AD\u62A5
#\u5929\u6C14\u9884\u62A5\uFF1A\u6BCF\u5929\u65E9\u4E0A11\u70B9\u64AD\u62A5
PUSH_MESSAGE_WEATHER_FORECAST_JOB= 0 0 11 * * ?
PUSH_MESSAGE_WEATHER_FORECAST_JOB= 0 0 11 * * ?
#\u665A\u4E0A12\u70B9\u5220\u9664\u4E4B\u524D\u7684\u5929\u6C14\u9884\u62A5
DEL_PUSH_MESSAGE_WEATHER_FORECAST_JOB = 0 5 0 * * ?