Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

 Conflicts:

	svr/svr-cloud-care/src/main/java/com/yihu/jw/care/util/MQTTKXClientUtil.java

	svr/svr-cloud-care/src/main/java/com/yihu/jw/care/util/PostConstructUtil.java

svr/svr-cloud-care/pom.xml

@@ -294,7 +294,7 @@
    </dependencies>
    <build>
        <finalName>svr-cloud-care</finalName>
        <finalName>svr-cloud-care-test</finalName>
        <plugins>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/wechat/WechatMenuController.java

@@ -40,7 +40,7 @@ public class WechatMenuController extends EnvelopRestEndpoint {
    private JdbcTemplate jdbcTemplate;
    @ApiOperation(value = "微信菜单创建-读数据库")
    @PostMapping(value = "/menu/createByMysql")
    @PostMapping(value = "/open/createByMysql")
    public String createByMysql() {
        try {
            WxAccessTokenDO wxAccessTokenDO = wxAccessTokenService.getWxAccessTokenById(wechatId);

svr/svr-cloud-care/src/main/resources/wechat/weixin_menu.txt

@@ -4,6 +4,13 @@
	  "name":"进入云照护",
	  "type":"view",
      "url":"https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx2c55f5b7b2f3cb56&redirect_uri=https%3A%2F%2Fzhyzh.gongshu.gov.cn%2Fmedical-care-patient%2Fhome%2Findex&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect"
   },
   {
   	  "name":"线上商城",
   	  "type":"miniprogram",
      "url":"http://mp.weixin.qq.com",
      "appid": "wxd845553a12f84efc",
      "pagepath": "pages/index/index"
   }
]
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/job/data/TimeApiJob.java

@@ -8,13 +8,11 @@ import org.quartz.JobExecutionException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
 * 验收需求调用组件接口 每天执行一次
 * Created by yeshijie on 2023/2/8.
 */
@Service
@DisallowConcurrentExecution
public class TimeApiJob implements Job {

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/service/device/InitializeDataJobService.java

@@ -1,7 +1,7 @@
package com.yihu.jw.care.service.device;
import com.yihu.jw.care.job.data.SaveDataPushJob;
import com.yihu.jw.care.service.data.SaveDataPushService;
import com.yihu.jw.care.zhylyjkglxt.dao.ZhDeviceDataPushLogDao;
import com.yihu.jw.care.zhylyjkglxt.entity.ZhDeviceDataPushLogDO;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,7 +20,7 @@ public class InitializeDataJobService {
    @Autowired
    JdbcTemplate jdbcTemplate;
    @Autowired
    SaveDataPushJob saveDataPushJob;
    SaveDataPushService saveDataPushJob;
    @Autowired
    ZhDeviceDataPushLogDao zhDeviceDataPushLogDao;

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/web/JobController.java

@@ -10,6 +10,7 @@ import com.yihu.jw.care.job.message.PatientSendUnreadJob;
import com.yihu.jw.care.service.BirthdayReminderService;
import com.yihu.jw.care.service.JobService;
import com.yihu.jw.care.service.WlyysimFlowVoiceService;
import com.yihu.jw.care.service.data.SaveDataPushService;
import com.yihu.jw.care.service.device.InitializeDataJobService;
import com.yihu.jw.care.service.device.WechatPushService;
import com.yihu.jw.care.service.hz.HzInterfaceService;
@@ -22,10 +23,7 @@ import io.swagger.annotations.ApiParam;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
@@ -53,7 +51,8 @@ public class JobController extends BaseController {
    private InitializeDataJobService initializeDataJobService;
    @Autowired
    private HzInterfaceService hzInterfaceService;
    @Autowired
    private SaveDataPushService saveDataPushService;
    @Autowired
    private ZhaohuiDailyService zhaohuiDailyService;
@@ -394,6 +393,18 @@ public class JobController extends BaseController {
        }
    }
    @ApiOperation("自动生成假数据，每月一条")
    @GetMapping(value = "/autoCreateDataPush")
    public String autoCreateDataPush(){
        try {
            saveDataPushService.autoCreateDataPush();
            return write(200,"成功");
        } catch (Exception e) {
            error(e);
            return error(-1,e.getMessage());
        }
    }
    //@RequestMapping(value = "/deletePushData",method = RequestMethod.POST)
    public String deletePushData(){
        try {

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/dao/ZhBaseDeviceHealthIndexDao.java

@@ -1,9 +1,12 @@
package com.yihu.jw.care.zhylyjkglxt.dao;
import com.yihu.jw.care.zhylyjkglxt.entity.ZhBaseDeviceHealthIndexDO;
import com.yihu.jw.care.zhylyjkglxt.entity.ZhBaseInfantInfoDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface ZhBaseDeviceHealthIndexDao extends PagingAndSortingRepository<ZhBaseDeviceHealthIndexDO,String>, JpaSpecificationExecutor<ZhBaseDeviceHealthIndexDO> {
    @Query(value = "select a.* from base_device_health_index a order by a.create_time desc limit 1 ",nativeQuery = true)
    ZhBaseDeviceHealthIndexDO findOneRecently();
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/dao/ZhBaseDoorCoachFeeDetailDao.java

@@ -1,12 +1,15 @@
package com.yihu.jw.care.zhylyjkglxt.dao;
import com.yihu.jw.care.zhylyjkglxt.entity.ZhBaseDoorCoachFeeDetailDO;
import com.yihu.jw.care.zhylyjkglxt.entity.ZhBaseDoorCoachOrderDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by yeshijie on 2022/1/20.
 */
public interface ZhBaseDoorCoachFeeDetailDao extends PagingAndSortingRepository<ZhBaseDoorCoachFeeDetailDO, String>, JpaSpecificationExecutor<ZhBaseDoorCoachFeeDetailDO> {
    @Query(value = "select a.* from base_door_coach_fee_detail a order by a.update_time desc limit 1 ",nativeQuery = true)
    ZhBaseDoorCoachFeeDetailDO findOneRecently();
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/dao/ZhBaseDoorCoachOrderDao.java

@@ -2,7 +2,11 @@ package com.yihu.jw.care.zhylyjkglxt.dao;
import com.yihu.jw.care.zhylyjkglxt.entity.ZhBaseDoorCoachOrderDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface ZhBaseDoorCoachOrderDao extends PagingAndSortingRepository<ZhBaseDoorCoachOrderDO, String>, JpaSpecificationExecutor<ZhBaseDoorCoachOrderDO> {
    @Query(value = "select a.* from base_door_coach_order a order by a.update_time desc limit 1 ",nativeQuery = true)
    ZhBaseDoorCoachOrderDO findOneRecently();
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/dao/ZhBaseInfantInfoDao.java

@@ -2,8 +2,10 @@ package com.yihu.jw.care.zhylyjkglxt.dao;
import com.yihu.jw.care.zhylyjkglxt.entity.ZhBaseInfantInfoDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface ZhBaseInfantInfoDao extends PagingAndSortingRepository<ZhBaseInfantInfoDO,String>, JpaSpecificationExecutor<ZhBaseInfantInfoDO> {
    @Query(value = "select a.* from base_infant_info a order by a.update_time desc limit 1 ",nativeQuery = true)
    ZhBaseInfantInfoDO findOneRecently();
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/dao/ZhBaseOrgDao.java

@@ -2,7 +2,10 @@ package com.yihu.jw.care.zhylyjkglxt.dao;
import com.yihu.jw.care.zhylyjkglxt.entity.ZhBaseOrgDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface ZhBaseOrgDao extends PagingAndSortingRepository<ZhBaseOrgDO,String>, JpaSpecificationExecutor<ZhBaseOrgDO> {
    @Query(value = "select a.* from base_org a order by a.update_time desc limit 1 ",nativeQuery = true)
    ZhBaseOrgDO findOneRecently();
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/dao/ZhBasePatientDao.java

@@ -1,9 +1,11 @@
package com.yihu.jw.care.zhylyjkglxt.dao;
import com.yihu.jw.care.zhylyjkglxt.entity.ZhBaseDoorCoachFeeDetailDO;
import com.yihu.jw.care.zhylyjkglxt.entity.ZhBasePatientDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface ZhBasePatientDao extends PagingAndSortingRepository<ZhBasePatientDO, String>, JpaSpecificationExecutor<ZhBasePatientDO> {
    @Query(value = "select a.* from base_patient a order by a.update_time desc limit 1 ",nativeQuery = true)
    ZhBasePatientDO findOneRecently();
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/dao/ZhBaseServicePackageSignRecordDao.java

@@ -2,9 +2,11 @@ package com.yihu.jw.care.zhylyjkglxt.dao;
import com.yihu.jw.care.zhylyjkglxt.entity.ZhBaseServicePackageSignRecordDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface ZhBaseServicePackageSignRecordDao extends PagingAndSortingRepository<ZhBaseServicePackageSignRecordDO,String>, JpaSpecificationExecutor<ZhBaseServicePackageSignRecordDO> {
    @Query(value = "select a.* from base_service_package_sign_record a order by a.start_time desc limit 1 ",nativeQuery = true)
    ZhBaseServicePackageSignRecordDO findOneRecently();
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/dao/ZhBaseSleepDeviceDao.java

@@ -2,7 +2,10 @@ package com.yihu.jw.care.zhylyjkglxt.dao;
import com.yihu.jw.care.zhylyjkglxt.entity.ZhBaseSleepDeviceDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface ZhBaseSleepDeviceDao extends PagingAndSortingRepository<ZhBaseSleepDeviceDO,String>, JpaSpecificationExecutor<ZhBaseSleepDeviceDO> {
    @Query(value = "select a.* from base_sleep_device a order by a.create_time desc limit 1 ",nativeQuery = true)
    ZhBaseSleepDeviceDO findOneRecently();
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/dao/ZhBaseSleepX1deviceDao.java

@@ -1,9 +1,11 @@
package com.yihu.jw.care.zhylyjkglxt.dao;
import com.yihu.jw.care.zhylyjkglxt.entity.ZhBaseSleepX1deviceDO;
import com.yihu.jw.care.zhylyjkglxt.entity.ZhBaseYxdeviceIndexDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface ZhBaseSleepX1deviceDao extends PagingAndSortingRepository<ZhBaseSleepX1deviceDO,String>, JpaSpecificationExecutor<ZhBaseSleepX1deviceDO> {
    @Query(value = "select a.* from base_sleep_x1device a order by a.create_time desc limit 1 ",nativeQuery = true)
    ZhBaseSleepX1deviceDO findOneRecently();
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/dao/ZhBaseVisitDao.java

@@ -2,7 +2,10 @@ package com.yihu.jw.care.zhylyjkglxt.dao;
import com.yihu.jw.care.zhylyjkglxt.entity.ZhBaseVisitDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface ZhBaseVisitDao extends PagingAndSortingRepository<ZhBaseVisitDO,String>, JpaSpecificationExecutor<ZhBaseVisitDO> {
    @Query(value = "select a.* from base_visit a order by a.create_time desc limit 1 ",nativeQuery = true)
    ZhBaseVisitDO findOneRecently();
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/dao/ZhBaseYxdeviceIndexDao.java

@@ -1,9 +1,11 @@
package com.yihu.jw.care.zhylyjkglxt.dao;
import com.yihu.jw.care.zhylyjkglxt.entity.ZhBaseServicePackageSignRecordDO;
import com.yihu.jw.care.zhylyjkglxt.entity.ZhBaseYxdeviceIndexDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface ZhBaseYxdeviceIndexDao extends PagingAndSortingRepository<ZhBaseYxdeviceIndexDO,String>, JpaSpecificationExecutor<ZhBaseYxdeviceIndexDO> {
    @Query(value = "select a.* from base_yxdevice_index a order by a.create_time desc limit 1 ",nativeQuery = true)
    ZhBaseYxdeviceIndexDO findOneRecently();
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/dao/ZhDeviceDataPushLogDao.java

@@ -2,8 +2,10 @@ package com.yihu.jw.care.zhylyjkglxt.dao;
import com.yihu.jw.care.zhylyjkglxt.entity.ZhDeviceDataPushLogDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface ZhDeviceDataPushLogDao extends PagingAndSortingRepository<ZhDeviceDataPushLogDO,String>, JpaSpecificationExecutor<ZhDeviceDataPushLogDO> {
    @Query(value = "select a.* from device_data_push_log a order by a.create_time desc limit 1 ",nativeQuery = true)
    ZhDeviceDataPushLogDO findOneRecently();
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/dao/ZhDeviceDetailDao.java

@@ -2,7 +2,10 @@ package com.yihu.jw.care.zhylyjkglxt.dao;
import com.yihu.jw.care.zhylyjkglxt.entity.ZhDeviceDetail;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface ZhDeviceDetailDao extends PagingAndSortingRepository<ZhDeviceDetail, String>, JpaSpecificationExecutor<ZhDeviceDetail> {
    @Query(value = "select a.* from wlyy_devices a order by a.apply_date desc limit 1 ",nativeQuery = true)
    ZhDeviceDetail findOneRecently();
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/dao/ZhDevicePatientDeviceDao.java

@@ -2,7 +2,10 @@ package com.yihu.jw.care.zhylyjkglxt.dao;
import com.yihu.jw.care.zhylyjkglxt.entity.ZhDevicePatientDevice;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface ZhDevicePatientDeviceDao extends PagingAndSortingRepository<ZhDevicePatientDevice, String>, JpaSpecificationExecutor<ZhDevicePatientDevice> {
    @Query(value = "select a.* from wlyy_patient_device a order by a.id desc limit 1 ",nativeQuery = true)
    ZhDevicePatientDevice findOneRecently();
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/dao/ZhEmergencyAssistanceDao.java

@@ -2,7 +2,10 @@ package com.yihu.jw.care.zhylyjkglxt.dao;
import com.yihu.jw.care.zhylyjkglxt.entity.ZhEmergencyAssistanceDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface ZhEmergencyAssistanceDao extends PagingAndSortingRepository<ZhEmergencyAssistanceDO, String>, JpaSpecificationExecutor<ZhEmergencyAssistanceDO> {
    @Query(value = "select a.* from base_emergency_assistance_order a order by a.update_time desc limit 1 ",nativeQuery = true)
    ZhEmergencyAssistanceDO findOneRecently();
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/dao/ZhInfantActivityDao.java

@@ -2,8 +2,10 @@ package com.yihu.jw.care.zhylyjkglxt.dao;
import com.yihu.jw.care.zhylyjkglxt.entity.ZhInfantActivityDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface ZhInfantActivityDao extends PagingAndSortingRepository<ZhInfantActivityDO,String>, JpaSpecificationExecutor<ZhInfantActivityDO> {
    @Query(value = "select a.* from base_infant_activity a order by a.update_time desc limit 1 ",nativeQuery = true)
    ZhInfantActivityDO findOneRecently();
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/dao/ZhLifeCareFeeDetailDao.java

@@ -2,7 +2,10 @@ package com.yihu.jw.care.zhylyjkglxt.dao;
import com.yihu.jw.care.zhylyjkglxt.entity.ZhLifeCareFeeDetailDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface ZhLifeCareFeeDetailDao extends PagingAndSortingRepository<ZhLifeCareFeeDetailDO, String>, JpaSpecificationExecutor<ZhLifeCareFeeDetailDO> {
    @Query(value = "select a.* from base_life_care_fee_detail a order by a.update_time desc limit 1 ",nativeQuery = true)
    ZhLifeCareFeeDetailDO findOneRecently();
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/dao/ZhLifeCareOrderDao.java

@@ -1,9 +1,11 @@
package com.yihu.jw.care.zhylyjkglxt.dao;
import com.yihu.jw.care.zhylyjkglxt.entity.ZhLifeCareOrderDO;
import com.yihu.jw.care.zhylyjkglxt.entity.ZhSecurityMonitoringOrderDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface ZhLifeCareOrderDao extends PagingAndSortingRepository<ZhLifeCareOrderDO, String>, JpaSpecificationExecutor<ZhLifeCareOrderDO> {
    @Query(value = "select a.* from base_life_care_order a order by a.update_time desc limit 1 ",nativeQuery = true)
    ZhLifeCareOrderDO findOneRecently();
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/dao/ZhSecurityMonitoringOrderDao.java

@@ -2,7 +2,12 @@ package com.yihu.jw.care.zhylyjkglxt.dao;
import com.yihu.jw.care.zhylyjkglxt.entity.ZhSecurityMonitoringOrderDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface ZhSecurityMonitoringOrderDao extends PagingAndSortingRepository<ZhSecurityMonitoringOrderDO, String>, JpaSpecificationExecutor<ZhSecurityMonitoringOrderDO> {
    @Query(value = "select a.* from base_security_monitoring_order a order by a.update_time desc limit 1 ",nativeQuery = true)
    ZhSecurityMonitoringOrderDO findOneRecently();
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/dao/ZhServicePackageItemDao.java

@@ -2,7 +2,10 @@ package com.yihu.jw.care.zhylyjkglxt.dao;
import com.yihu.jw.care.zhylyjkglxt.entity.ZhServicePackageItemDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface ZhServicePackageItemDao extends PagingAndSortingRepository<ZhServicePackageItemDO, String>, JpaSpecificationExecutor<ZhServicePackageItemDO> {
    @Query(value = "select a.* from base_service_package_item a order by a.create_time desc limit 1 ",nativeQuery = true)
    ZhServicePackageItemDO findOneRecently();
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/dao/ZhTeacherInfoDao.java

@@ -2,9 +2,11 @@ package com.yihu.jw.care.zhylyjkglxt.dao;
import com.yihu.jw.care.zhylyjkglxt.entity.ZhTeacherInfoDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface ZhTeacherInfoDao extends PagingAndSortingRepository<ZhTeacherInfoDO,String>, JpaSpecificationExecutor<ZhTeacherInfoDO> {
    @Query(value = "select a.* from wlyy_teacher_info a order by a.update_time desc limit 1 ",nativeQuery = true)
    ZhTeacherInfoDO findOneRecently();
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/dao/ZhWlyyPatientLabelDao.java

@@ -3,7 +3,10 @@ package com.yihu.jw.care.zhylyjkglxt.dao;
import com.yihu.jw.care.zhylyjkglxt.entity.ZhWlyyPatientLabel;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface ZhWlyyPatientLabelDao extends PagingAndSortingRepository<ZhWlyyPatientLabel,String>, JpaSpecificationExecutor<ZhWlyyPatientLabel> {
    @Query(value = "select a.* from wlyy_Patient_label a order by a.czrq desc limit 1 ",nativeQuery = true)
    ZhWlyyPatientLabel findOneRecently();
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/entity/ZhDeviceDataPushLogDO.java

@@ -2,18 +2,17 @@ package com.yihu.jw.care.zhylyjkglxt.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.AssignedIdentityEntity;
import com.yihu.jw.entity.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import java.util.Date;
@Entity
@Table(name = "device_data_push_log")
public class ZhDeviceDataPushLogDO extends AssignedIdentityEntity implements java.io.Serializable {
public class ZhDeviceDataPushLogDO extends IdEntity {
    private String patient; //
    private String patientName; //

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/entity/ZhDeviceDetail.java

@@ -1,7 +1,7 @@
package com.yihu.jw.care.zhylyjkglxt.entity;
import com.yihu.jw.entity.AssignedIdentityEntity;
import com.yihu.jw.entity.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -16,7 +16,7 @@ import java.util.Date;
@Entity
@Table(name = "wlyy_devices")
@SequenceGenerator(name="id_generated", sequenceName="wlyy_devices")
public class ZhDeviceDetail extends AssignedIdentityEntity {
public class ZhDeviceDetail extends IdEntity {
    private String deviceName;//设备名称
    private String deviceModel;//型号
    private String deviceCode;//设备唯一标识

svr/svr-cloud-job/src/main/resources/application.yml

@@ -240,4 +240,63 @@ pay:
sendTXMessage:
  flag: true
cloudCare:
  url: http://127.0.0.1:10301/
  url: http://127.0.0.1:10301/
---
spring:
  profiles: hzkxtest
  datasource:
    base:
      jdbcUrl: jdbc:mysql://172.26.0.16/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
      username: wlyy
      password: 4D^tK%!4
    zhylyjkglxt:
      jdbcUrl: jdbc:mysql://172.26.0.16/gsq_zhjd_zhylyjkglxt?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
      username: wlyy
      password: 4D^tK%!4
  activemq:
    broker-url: tcp://172.26.0.116:61616
    user: admin
    password: admin
  redis:
    host: 172.26.0.16 # Redis server host.
    port: 6380 # Redis server port.
    password: Kb6wKDQP1W4
fastDFS:
  fastdfs_file_url: http://172.26.0.16:8888/
fast-dfs:
  tracker-server: 172.26.0.16:22122 #服务器地址
demo:
  flag: true
hospital:
  url: https://wx.xmzsh.com
  mqUser: JKZL
  mqPwd: 123456
  SourceSysCode: S60
  TargetSysCode: S01
im:
  im_list_get: http://172.26.0.17:3000/
  data_base_name: im_internet_hospital
wlyy:
  url: http://ehr.yihu.com/wlyy/
wechat:
  appId: wxd03f859efdf0873d
  appSecret: 2935b54b53a957d9516c920a544f2537
  wechat_token: 27eb3bb24f149a7760cf1bb154b08040
  wechat_base_url: http%3a%2f%2fweixin.xmtyw.cn%2fwlyy-dev
  accId: gh_ffd64560fb21
  id: hz_yyyzh_wx  # base库中,wx_wechat 的id字段
  flag: false #演示环境  true走Mysql数据库  false走Oracle
cloudServer:
  server_url: http://172.26.0.17:10301/
pay:
  flag: true
cloudCare:
  url: http://172.26.0.17:10301/
##是否发送短信消息 无测试公众号测试线也不发送模板消息
sendTXMessage:
  flag: false