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

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

@@ -53,7 +53,6 @@ public class InitializeDataJobService {
        /**********************push start**************************/
        saveDataPushJob.saveDevicePushLog(date);
        saveDataPushJob.saveSecurityMonitoringOrder(date,signOlderMap);
        saveDataPushJob.saveEmergencyAssistanceOrder(date,signOlderMap);
        saveDataPushJob.saveDoorCoachOrder(date,jkzlUserMap);
@@ -88,10 +87,7 @@ public class InitializeDataJobService {
        InitializeDataJobService initializeDataJobService = new InitializeDataJobService();
        /**********************del start*****************************/
        String[] sql = new String[20];
        sql[0]  = "DELETE from gsq_zhjd_zhylyjkglxt.wlyy_patient_device";
        sql[1] = "DELETE from gsq_zhjd_zhylyjkglxt.base_life_care_order";
       /* //患者设备表
        //患者设备表
        //厦门设备信息表
        sql[1] = "DELETE from gsq_zhjd_zhylyjkglxt.wlyy_devices";
        //服务项
@@ -125,7 +121,11 @@ public class InitializeDataJobService {
        //设备项目推送数据日志
        sql[16] ="DELETE from gsq_zhjd_zhylyjkglxt.device_data_push_log";
        //居民标签类别表
        sql[17] ="DELETE from gsq_zhjd_zhylyjkglxt.wlyy_patient_label";*/
        sql[17] ="DELETE from gsq_zhjd_zhylyjkglxt.wlyy_patient_label";
        sql[18]  = "DELETE from gsq_zhjd_zhylyjkglxt.wlyy_patient_device";
        sql[19] = "DELETE from gsq_zhjd_zhylyjkglxt.base_life_care_order";
        initializeDataJobService.executeList(sql);
        /**********************del end*****************************/
    }

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

@@ -333,7 +333,7 @@ public class JobController extends BaseController {
        }
    }
    @RequestMapping(value = "/deletePushData",method = RequestMethod.POST)
    //@RequestMapping(value = "/deletePushData",method = RequestMethod.POST)
    public String deletePushData(){
        try {
            initializeDataJobService.deletePushData();

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

@@ -1,12 +1,13 @@
package com.yihu.jw.care.zhylyjkglxt.entity;
import com.yihu.jw.entity.iot.gateway.IdEntity;
import com.yihu.jw.entity.AssignedIdentityEntity;
import javax.persistence.*;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
/**
 * Created by ysj on 2018/01/10.
@@ -15,7 +16,7 @@ import java.util.Map;
@Entity
@Table(name = "wlyy_devices")
@SequenceGenerator(name="id_generated", sequenceName="wlyy_devices")
public class ZhDeviceDetail extends IdEntity {
public class ZhDeviceDetail extends AssignedIdentityEntity {
    private String deviceName;//设备名称
    private String deviceModel;//型号
    private String deviceCode;//设备唯一标识