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

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

@@ -32,7 +32,7 @@ public class PostConstructUtil {
    public void init(){
        logger.info("启动电表的mqtt订阅====");
        mqttClientUtil.start();
//        mqttClientUtil.start();//废弃电表用其他方式对接
        if("hzprod".equals(profiles)){
            logger.info("启动宇视人脸摄像头sdk====");

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

@@ -5,6 +5,8 @@ import org.quartz.DisallowConcurrentExecution;
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;
/**
@@ -13,13 +15,17 @@ import org.springframework.beans.factory.annotation.Autowired;
 */
@DisallowConcurrentExecution
public class SynElectricRecordsJob implements Job {
    Logger logger = LoggerFactory.getLogger(SynElectricRecordsJob.class);
    @Autowired
    private HzInterfaceService hzInterfaceService;
    @Override
    public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
        try {
            logger.info("SynElectricRecordsJob start");
            hzInterfaceService.electricityTable(null);
            logger.info("SynElectricRecordsJob end");
        }catch (Exception e){
            e.printStackTrace();
        }

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/job/order/DailyWaterJob.java

@@ -69,12 +69,12 @@ public class DailyWaterJob implements Job {
                    e.printStackTrace();
                }
            }
            sql = " update set dict_value='"+nowTime+"' from wlyy_hospital_sys_dict where dict_name='DAILY_WATER_LAST_TIME' and dict_code='DAILY_WATER_LAST_TIME'  ";
            sql = " update wlyy_hospital_sys_dict set dict_value='"+nowTime+"' where dict_name='DAILY_WATER_LAST_TIME' and dict_code='DAILY_WATER_LAST_TIME'  ";
            jdbcTemplate.execute(sql);
            logger.info("DAILY_WATER_JOB end");
        }catch (Exception e){
            String sql = " update set dict_value='"+nowTime+"' from wlyy_hospital_sys_dict where dict_name='DAILY_WATER_LAST_TIME' and dict_code='DAILY_WATER_LAST_TIME'  ";
            String sql = " update wlyy_hospital_sys_dict set dict_value='"+nowTime+"' where dict_name='DAILY_WATER_LAST_TIME' and dict_code='DAILY_WATER_LAST_TIME'  ";
            jdbcTemplate.execute(sql);
            logger.error("DAILY_WATER_JOB error....."+e.getMessage());
        }

svr/svr-cloud-job/src/main/resources/system.properties

@@ -37,4 +37,4 @@ DEVICE_DATA_FACE_JOB= 0 0 3 * * ? *
#\u4EBA\u8138\u8BB0\u5F55\u6BCF30\u5206\u949F\u8DD1\u4E00\u6B21
SYN_FACE_RECORD_JOB= 0 0/30 * * * ? *
#\u7535\u8868\u6BCF\u5929\u65E9\u4E0A\u4E0A8\u70B9\u8DD1\u4E00\u6B21
SYN_ELECTRIC_RECORD_JOB= 0 0 3 * * ? *
SYN_ELECTRIC_RECORD_JOB= 0 0 8 * * ? *