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

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/admin/CommonEndpoint.java

@@ -48,6 +48,16 @@ public class CommonEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private CommomService commomService;
    @GetMapping(value = "open/health")
    @ApiOperation(value = "测试应用是否可用")
    public Envelop health() {
        try {
            return success("查询成功");
        } catch (Exception e) {
            return failedException2(e);
        }
    }
    @GetMapping(value = "open/setRedisEnable")
    @ApiOperation(value = "设置是否开启拦截security:csrf:enable 1拦截")
    public Envelop setRedisEnable(String str) {

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

@@ -20,7 +20,7 @@ public class InitializeDataJobService {
    SaveDataPushJob saveDataPushJob;
    public Object initialize(String date){
    public Object initialize(String date,String type){
        String filterOrg = "";//排除的测试机构
        String sqlOgr = "SELECT dict_code from wlyy_hospital_sys_dict WHERE dict_name = 'jkzl_org' and dict_code is not null ";
@@ -53,26 +53,62 @@ public class InitializeDataJobService {
        /**********************push start**************************/
        saveDataPushJob.saveSecurityMonitoringOrder(date,signOlderMap);
        saveDataPushJob.saveEmergencyAssistanceOrder(date,signOlderMap);
        saveDataPushJob.saveDoorCoachOrder(date,jkzlUserMap);
        saveDataPushJob.saveDoorCoachFeeDetail(date);
        saveDataPushJob.saveLifeCareOrder(date,signOlderMap);
        saveDataPushJob.saveLifeCareFeeDetail(date);
        saveDataPushJob.saveOlderInfo(date,signOlderMap);
        saveDataPushJob.saveInfantInfo(date);
        saveDataPushJob.saveServicePackageItem(date);
        saveDataPushJob.savePatientDevice(date,signOlderMap);
        saveDataPushJob.saveWlyyDevice(date);
        saveDataPushJob.saveDevicePushLog(date); //"2022-01-07"
        saveDataPushJob.saveSignOlderInfo(date);
        saveDataPushJob.saveHospitalOrg(date,jkzlOrgMap);
        saveDataPushJob.saveOldOrg(date,jkzlOrgMap);
        saveDataPushJob.saveInfantOrg(date,jkzlOrgMap);
        saveDataPushJob.saveTeacherInfo(date);
        saveDataPushJob.saveActivity(date);
        saveDataPushJob.saveVisit(date);
        switch(type){
            case "1":
                //安防监护工单
                saveDataPushJob.saveSecurityMonitoringOrder(date,signOlderMap);
                break;
            case "2":
                //上门辅导工单
                saveDataPushJob.saveDoorCoachOrder(date,jkzlUserMap);
                //上门辅导 服务工单价格
                saveDataPushJob.saveDoorCoachFeeDetail(date);
                break;
            case "3":
                // 生活照料 工单
                saveDataPushJob.saveLifeCareOrder(date,signOlderMap);
                //生活照料 价格
                saveDataPushJob.saveLifeCareFeeDetail(date);
                break;
            case "4":
                //紧急救助工单
                saveDataPushJob.saveEmergencyAssistanceOrder(date,signOlderMap);
                break;
            case "5":
                //老人居民信息
                saveDataPushJob.saveOlderInfo(date,signOlderMap);
                //幼儿基本信息
                saveDataPushJob.saveInfantInfo(date);
                //服务项
                saveDataPushJob.saveServicePackageItem(date);
                break;
            case "6":
                //设备表
                saveDataPushJob.saveWlyyDevice(date);
                //老人签约信息
                saveDataPushJob.saveSignOlderInfo(date);
                //教师信息
                saveDataPushJob.saveTeacherInfo(date);
                break;
            case "7":
                //居民设备采集信息
                saveDataPushJob.saveDevicePushLog(date); //"2022-01-07"
                break;
            case "8":
                //机构
                saveDataPushJob.saveOldOrg(date,jkzlOrgMap);
                saveDataPushJob.saveHospitalOrg(date,jkzlOrgMap);
                saveDataPushJob.saveInfantOrg(date,jkzlOrgMap);
                break;
            case "9":
                //幼儿 活动 公艺 报名
                saveDataPushJob.saveActivity(date);
                //日常走访
                saveDataPushJob.saveVisit(date);
                break;
        }
        /**********************push end****************************/
        System.gc();
        return 1;
    }

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

@@ -323,9 +323,9 @@ public class JobController extends BaseController {
    }
    @RequestMapping(value = "/initialize",method = RequestMethod.POST)
    public String initializeDataJob(String date){
    public String initializeDataJob(String date,String type){
        try {
            initializeDataJobService.initialize(date);
            initializeDataJobService.initialize(date,type);
            return write(200,"成功");
        } catch (Exception e) {
            error(e);