代码修改

svr/svr-basic/src/main/java/com/yihu/jw/basic/agadmin/controller/quota/TjDataSaveController.java

@@ -1,18 +1,13 @@
package com.yihu.jw.basic.agadmin.controller.quota;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.basic.quota.service.TjDataSaveService;
import com.yihu.jw.entity.ehr.quota.TjDataSave;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.util.http.HttpClientUtil;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.ui.Model;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;

svr/svr-basic/src/main/java/com/yihu/jw/basic/agadmin/controller/quota/TjDataSourceController.java

@@ -1,18 +1,13 @@
package com.yihu.jw.basic.agadmin.controller.quota;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.basic.quota.service.TjDataSourceService;
import com.yihu.jw.entity.ehr.quota.TjDataSource;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.util.http.HttpClientUtil;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.ui.Model;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;

svr/svr-basic/src/main/java/com/yihu/jw/basic/agadmin/controller/quota/TjQuotaController.java

@@ -19,7 +19,6 @@ import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.util.date.DateTimeUtil;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.ui.Model;
import org.apache.commons.lang3.StringUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -304,7 +303,7 @@ public class TjQuotaController extends EnvelopRestEndpoint {
     * 指标结果页
     */
    @GetMapping("initialResult")
    public Envelop initialResult(Model model, long tjQuotaId, String quotaCode, String quotaType, String name) throws Exception {
    public Envelop initialResult(long tjQuotaId, String quotaCode, String quotaType, String name) throws Exception {
        try {
            Map<String,String> map = new HashMap<>();
            List<TjQuotaDimensionSlave> slaveModelList = tjQuotaDimensionSlaveService.getTjQuotaDimensionSlaveByCode(quotaCode);

svr/svr-basic/src/main/java/com/yihu/jw/basic/agadmin/controller/report/ReportController.java

@@ -16,7 +16,6 @@ import jxl.format.CellFormat;
import jxl.write.*;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

svr/svr-basic/src/main/java/com/yihu/jw/basic/agadmin/controller/resource/MetaController.java

@@ -5,7 +5,6 @@
//import com.yihu.jw.restmodel.web.Envelop;
//import com.yihu.jw.util.excel.poi.AExcelReader;
//import org.springframework.stereotype.Controller;
//import org.springframework.ui.Model;
//import org.springframework.util.LinkedMultiValueMap;
//import org.springframework.util.MultiValueMap;
//import org.springframework.util.StringUtils;

svr/svr-basic/src/main/java/com/yihu/jw/basic/agadmin/controller/resource/ReportCategoryController.java

@@ -15,15 +15,10 @@ import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.util.common.LogService;
import com.yihu.jw.util.http.HttpClientUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
@@ -63,7 +58,7 @@ public class ReportCategoryController extends EnvelopRestEndpoint {
    }
    @RequestMapping("/appConfig")
    public Envelop appConfig(String id, String dialogType, Model model) {
    public Envelop appConfig(String id, String dialogType) {
        try {
            String appIds = rsReportCategoryAppService.getAppIdByCategory(id);
            return ObjEnvelop.getSuccess("获取成功",appIds);

svr/svr-basic/src/main/java/com/yihu/jw/basic/agadmin/controller/resource/ResourceBrowseController.java

@@ -18,15 +18,12 @@ import jxl.write.WritableWorkbook;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.ui.Model;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.OutputStream;
import java.util.*;
import java.util.regex.Matcher;

svr/svr-basic/src/main/java/com/yihu/jw/basic/agadmin/controller/resource/ResourceConfigurationController.java

@@ -15,9 +15,8 @@ import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.util.http.HttpClientUtil;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.domain.Page;
import org.springframework.ui.Model;
import org.springframework.http.ResponseEntity;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
@@ -85,39 +84,51 @@ public class ResourceConfigurationController extends EnvelopRestEndpoint {
        String selResourceMetadataListUrl = "/resources/" + resourcesId + "/metadata_list";
        String resultStr = "";
        try {
            if (searchNm.equals("selAll")) {
//                resultStr = HttpClientUtil.doGet(comUrl + selResourceMetadataListUrl, params, username, password);
            if ("selAll".equals(searchNm)) {
                List<RsResourceMetadata> metadataList = rsMetadataService.getRsMetadataByResourcesId(resourcesId);
                return ListEnvelop.getSuccess("查询成功",metadataList);
            } else {
                String filters = "";
                params.put("filters", "");
                if (!StringUtils.isEmpty(searchNm)) {
                    filters = "name?" + searchNm + " g1;id?" + searchNm + " g1";
                }
                params.put("resources_id", "");
                if (!StringUtils.isEmpty(resourcesId)) {
                    params.put("resources_id", resourcesId);
                }
                params.put("page", page);
                params.put("size", rows);
                params.put("fields", "");
                params.put("sorts", "");
                long total = 0;
                //过滤条件为空
                if (StringUtils.isEmpty(filters)) {
                List<RsResourceMetadata> rsMetadatas;
                if (StringUtils.isEmpty(resourcesId)) {
                    Page<RsResourceMetadata> dimensions = rsMetadataService.getResourceMetadata(null, reducePage(page), rows);
                    total = dimensions.getTotalElements();
                    return PageEnvelop.getSuccessListWithPage("查询成功",dimensions.toList(),page,rows,total);
                    rsMetadatas = dimensions.toList();
                } else {
                    List<RsResourceMetadata> dimensions = rsMetadataService.search(null, filters, null, page, rows);
                    total = rsMetadataService.getCount(filters);
                    return PageEnvelop.getSuccessListWithPage("查询成功",dimensions,page,rows,total);
                    rsMetadatas = rsMetadataService.search(null, "resourcesId=" + resourcesId, null, page, rows);
                    total = rsMetadataService.getCount("resourcesId=" + resourcesId);
                }
                List<RsResourceMetadata> rsResourceMetadataModels = getRsMetadata(rsMetadatas,filters,page,rows);
                return PageEnvelop.getSuccessListWithPage("查询成功",rsResourceMetadataModels,page,rows,total);
            }
        } catch (Exception e) {
            e.printStackTrace();
            return failed("查询失败");
        }
        return resultStr;
    }
    public List<RsResourceMetadata> getRsMetadata(List<RsResourceMetadata> rsMetadatas,String filters,int page,int size) throws Exception{
        String fs = null;
        for (RsResourceMetadata rsMetadataModel : rsMetadatas){
            fs = "id=" + rsMetadataModel.getMetadataId()+" g2;"+filters;
            List<RsMetadata> metadata = metadataService.search("",fs,"",page,size);
            if (metadata.size()>0) {
                rsMetadataModel.setName(metadata.get(0).getName());
                rsMetadataModel.setColumnType(metadata.get(0).getColumnType());
                rsMetadataModel.setStdCode(metadata.get(0).getId());
            }
        }
        return rsMetadatas;
    }
    @PostMapping("/saveResourceConfiguration")

svr/svr-basic/src/main/java/com/yihu/jw/basic/agadmin/controller/resource/ResourceDefaultParamController.java

@@ -1,6 +1,5 @@
package com.yihu.jw.basic.agadmin.controller.resource;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.ehr.constants.ServiceApi;
import com.yihu.jw.basic.resource.dao.RsResourceDefaultParamDao;
@@ -10,14 +9,10 @@ import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.util.common.LogService;
import com.yihu.jw.util.http.HttpClientUtil;
import io.swagger.annotations.Api;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import java.util.HashMap;
@@ -29,6 +24,7 @@ import java.util.Map;
 */
@RestController
@RequestMapping("/resource/rsDefaultParam")
@Api(tags = {"网关-资源默认参数"})
public class ResourceDefaultParamController extends EnvelopRestEndpoint {
    @Autowired

svr/svr-basic/src/main/java/com/yihu/jw/basic/agadmin/controller/resource/ResourceIntegratedController.java

@@ -15,9 +15,7 @@ import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.util.common.NumberUtil;
import com.yihu.jw.util.http.HttpClientUtil;
import com.yihu.jw.util.network.HttpResponse;
import com.yihu.jw.util.network.HttpUtils;
import io.swagger.annotations.Api;
import jxl.Cell;
import jxl.Workbook;
import jxl.write.Label;
@@ -26,12 +24,9 @@ import jxl.write.WritableWorkbook;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
@@ -47,6 +42,7 @@ import java.util.*;
 */
@RestController
@RequestMapping("/resourceIntegrated")
@Api(tags = {"网关-资源综合查询服务控制器"})
public class ResourceIntegratedController extends EnvelopRestEndpoint {
    private static final Logger logger = LoggerFactory.getLogger(ResourceIntegratedController.class);

svr/svr-basic/src/main/java/com/yihu/jw/basic/agadmin/controller/resource/ResourceManageController.java

@@ -1,9 +1,7 @@
package com.yihu.jw.basic.agadmin.controller.resource;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.yihu.ehr.constants.ServiceApi;
import com.yihu.jw.basic.resource.dao.RsResourceDao;
import com.yihu.jw.basic.resource.model.ResourceQuotaJson;
@@ -11,8 +9,6 @@ import com.yihu.jw.basic.resource.service.*;
import com.yihu.jw.entity.ehr.id.BizObject;
import com.yihu.jw.entity.ehr.quota.TjQuota;
import com.yihu.jw.entity.ehr.resource.*;
import com.yihu.jw.restmodel.ehr.resource.MChartInfoModel;
import com.yihu.jw.restmodel.ehr.resource.MRsCategory;
import com.yihu.jw.restmodel.ehr.resource.MRsResources;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
@@ -20,22 +16,16 @@ import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.util.common.LogService;
import com.yihu.jw.util.http.HttpClientUtil;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.client.RestClientException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
@@ -48,6 +38,7 @@ import java.util.Map;
 */
@RestController
@RequestMapping("/resource/resourceManage")
@Api(tags = {"网关-视图管理控制器"})
public class ResourceManageController extends EnvelopRestEndpoint {
    @Autowired

svr/svr-basic/src/main/java/com/yihu/jw/basic/agadmin/controller/resource/ResourceMonitorTypeReportController.java

@@ -1,16 +1,12 @@
package com.yihu.jw.basic.agadmin.controller.resource;
import com.yihu.ehr.constants.ServiceApi;
import com.yihu.jw.basic.resource.service.RsReportService;
import com.yihu.jw.entity.ehr.resource.RsReport;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.util.http.HttpClientUtil;
import org.apache.commons.lang3.StringUtils;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -24,6 +20,7 @@ import java.util.Map;
@RestController
@RequestMapping("/resource/monitorTypeReport")
@Api(tags = {"网关-监控报表"})
public class ResourceMonitorTypeReportController extends EnvelopRestEndpoint {
    @Autowired

svr/svr-basic/src/main/java/com/yihu/jw/basic/agadmin/controller/resource/ResourceViewController.java

@@ -8,17 +8,14 @@ import com.yihu.jw.restmodel.ehr.resource.MRsColumnsModel;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.util.http.HttpClientUtil;
import io.swagger.annotations.Api;
import jxl.Workbook;
import jxl.write.Label;
import jxl.write.WritableSheet;
import jxl.write.WritableWorkbook;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.ui.Model;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import java.io.File;
@@ -33,6 +30,7 @@ import java.util.Map;
@RestController
@RequestMapping("/resourceView")
@Api(tags = {"网关-资源视图"})
public class ResourceViewController extends EnvelopRestEndpoint {
    @Autowired

svr/svr-basic/src/main/java/com/yihu/jw/basic/agadmin/controller/resource/RsResourceCategoryController.java

@@ -5,23 +5,16 @@ import com.yihu.jw.basic.resource.model.RsCategoryTypeTreeModel;
import com.yihu.jw.basic.resource.service.RsResourceCategoryService;
import com.yihu.jw.entity.ehr.id.BizObject;
import com.yihu.jw.entity.ehr.resource.RsResourceCategory;
import com.yihu.jw.restmodel.ehr.resource.MRsCategory;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.util.http.HttpClientUtil;
import io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.HashMap;

svr/svr-basic/src/main/java/com/yihu/jw/basic/agadmin/controller/resource/SchemeAdaptController.java

@@ -5,17 +5,14 @@ import com.yihu.ehr.constants.ServiceApi;
import com.yihu.jw.basic.resource.service.RsAdapterSchemeService;
import com.yihu.jw.entity.ehr.id.BizObject;
import com.yihu.jw.entity.ehr.resource.RsAdapterScheme;
import com.yihu.jw.restmodel.ehr.resource.MRsAdapterSchema;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.util.http.HttpClientUtil;
import io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;

svr/svr-basic/src/main/java/com/yihu/jw/basic/agadmin/controller/resource/SchemeAdaptDataSetController.java

@@ -6,19 +6,14 @@ import com.yihu.ehr.constants.ServiceApi;
import com.yihu.jw.basic.resource.service.RsAdapterMetadataService;
import com.yihu.jw.basic.resource.service.RsAdapterSchemeService;
import com.yihu.jw.entity.ehr.resource.RsAdapterMetadata;
import com.yihu.jw.restmodel.ehr.resource.MRsAdapterMetadata;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.util.common.LogService;
import com.yihu.jw.util.http.HttpClientUtil;
import io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.domain.Page;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
@@ -42,9 +37,7 @@ public class SchemeAdaptDataSetController extends EnvelopRestEndpoint {
    private RsAdapterMetadataService metadataService;
    @GetMapping("/initial")
    public Envelop gotoList(Model model,String dataModel,String version){
        model.addAttribute("dataModel",dataModel);
        model.addAttribute("version",version);
    public Envelop gotoList(String dataModel,String version){
        String url = "/adaptions/schemas/"+dataModel;
        String resultStr = "";
        Envelop result = new Envelop();

svr/svr-basic/src/main/java/com/yihu/jw/basic/portal/controller/PortalSurveyQuestionAdminController.java

@@ -13,11 +13,8 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.*;
import java.util.Map;

svr/svr-basic/src/main/java/com/yihu/jw/basic/redis/schema/AdapterDataSetKeySchema.java

@@ -0,0 +1,36 @@
package com.yihu.jw.basic.redis.schema;
import com.yihu.jw.redis.schema.KeySchema;
import org.springframework.stereotype.Component;
@Component
public class AdapterDataSetKeySchema extends KeySchema {
    private String AdapterDatasetCode = "adapter_dataset_code";
    private String AdapterDatasetName = "adapter_dataset_name";
    /**
     * 清空当前表的所有缓存
     * @param table
     */
    public void delete(String table){
        redisClient.delete(makeKey(table , "*","*"));
    }
    public String getAdapterDatasetCode(String dataSetTableName, String stdDatasetCode) {
        return redisClient.get(makeKey(dataSetTableName , stdDatasetCode, AdapterDatasetCode));
    }
    public void setAdapterDataSetCode(String table, String id,String value){
        redisClient.set(makeKey(table , id, AdapterDatasetCode),value);
    }
    public String getAdapterDatasetName(String dataSetTableName, String stdDatasetCode) {
        return redisClient.get(makeKey(dataSetTableName, stdDatasetCode, AdapterDatasetName));
    }
    public void setAdapterDatasetName(String table, String stdDatasetCode, String value) {
        redisClient.set(makeKey(table, stdDatasetCode, AdapterDatasetName), value);
    }
}

svr/svr-basic/src/main/java/com/yihu/jw/basic/redis/schema/AdapterDictEntryKeySchema.java

@@ -0,0 +1,25 @@
package com.yihu.jw.basic.redis.schema;
import com.yihu.jw.redis.schema.KeySchema;
import org.springframework.stereotype.Component;
/**
 *  Created by hzp on 2017.04.25
 */
@Component
public class AdapterDictEntryKeySchema extends KeySchema {
    private String AdapterEntryCode = "adapter_entry_value";
    public void delete(String tableName) {
        redisClient.delete(makeKey(tableName , "*", "*"));
    }
    public void setAdapterDictEntryCode(String dictEntryTable, String stdDictCode, String stdEntryCode, String value) {
        redisClient.set(makeKey(dictEntryTable, stdDictCode + "." + stdEntryCode, AdapterEntryCode),value);
    }
    public String getAdapterDictEntryCode(String dictEntryTableName, String stdDictCode, String stdDictEntryCode) {
        return redisClient.get(makeKey(dictEntryTableName, stdDictCode + "." + stdDictEntryCode, AdapterEntryCode));
    }
}

svr/svr-basic/src/main/java/com/yihu/jw/basic/redis/schema/AdapterDictKeySchema.java

@@ -0,0 +1,25 @@
package com.yihu.jw.basic.redis.schema;
import com.yihu.jw.redis.schema.KeySchema;
import org.springframework.stereotype.Component;
/**
 *  Created by hzp on 2017.04.25
 */
@Component
public class AdapterDictKeySchema extends KeySchema {
    private String AdapterDictCode="adapter_dict_code";
    public void delete(String tableName) {
        redisClient.delete(makeKey(tableName , "*", "*"));
    }
    public void setAdapterDictCode(String dictTable, String stdDictCode, String adapterDictCode) {
        redisClient.set(makeKey(dictTable , stdDictCode, AdapterDictCode),adapterDictCode);
    }
    public String getAdapterDictCode(String dictTable, String stdDictCode) {
        return redisClient.get(makeKey(dictTable , stdDictCode, AdapterDictCode));
    }
}

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/controller/AdapterRedisEndPoint.java

@@ -0,0 +1,81 @@
package com.yihu.jw.basic.standard.controller;
import com.yihu.ehr.constants.ServiceApi;
import com.yihu.jw.basic.standard.service.redis.AdapterRedisService;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.util.thread.ContextAttributes;
import com.yihu.jw.util.thread.LocalContext;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
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;
@RestController
@Api(value = "Redis", description = "Redis数据缓存服务")
public class AdapterRedisEndPoint extends EnvelopRestEndpoint {
    @Autowired
    private AdapterRedisService adapterRedisService;
    @ApiOperation("Redis缓存适配方案")
    @RequestMapping(value = ServiceApi.Redis.InitAdapterVersions, method = RequestMethod.POST)
    public String cacheVersions(
            @ApiParam(name = "versions", value = "适配方案版本,多个用逗号分隔")
            @RequestParam("versions") String versions,
            @ApiParam(name = "force", value = "强制清除再缓存", defaultValue = "true")
            @RequestParam("force") boolean force) throws Exception {
        String schema = LocalContext.getContext().getAttachment(ContextAttributes.SCHEMA);
        adapterRedisService.cacheVersions(versions, force,schema);
        return "Redis适配方案缓存完成！";
    }
    @ApiOperation("根据适配版本号和目标数据集code,获取的源数据集code")
    @RequestMapping(value = ServiceApi.Redis.AdapterDataSetCode, method = RequestMethod.GET)
    public String getAdapterDatasetCode(
            @ApiParam(name = "version", value = "适配方案版本")
            @RequestParam("version") String version,
            @ApiParam(name = "stdDatasetCode", value = "标准数据集code")
            @RequestParam("stdDatasetCode") String stdDatasetCode){
        return adapterRedisService.getAdapterDatasetCode(version,stdDatasetCode);
    }
    @ApiOperation("根据适配版本号和目标数据集code,目标数据元code,获取的源数据元code")
    @RequestMapping(value = ServiceApi.Redis.AdapterMetadataCode, method = RequestMethod.GET)
    public String getAdapterMetadataCode(
            @ApiParam(name = "version", value = "适配方案版本")
            @RequestParam("version") String version,
            @ApiParam(name = "stdDatasetCode", value = "标准数据集code")
            @RequestParam("stdDatasetCode") String stdDatasetCode,
            @ApiParam(name = "stdMetadataCode", value = "标准数据元code")
            @RequestParam("stdMetadataCode") String stdMetadataCode){
        return adapterRedisService.getAdapterMetadataCode(version,stdDatasetCode,stdMetadataCode);
    }
    @ApiOperation("根据适配版本号和目标字典code,获取的源字典code")
    @RequestMapping(value = ServiceApi.Redis.AdapterDictCode, method = RequestMethod.GET)
    public String getAdapterDictCode(@ApiParam(name = "version", value = "适配方案版本")
                                     @RequestParam("version") String version,
                                     @ApiParam(name = "stdDictCode", value = "标准字典code")
                                     @RequestParam("stdDictCode") String stdDictCode){
        return adapterRedisService.getAdapterDictCode(version,stdDictCode);
    }
    @ApiOperation("根据适配版本号和目标字典code,目标字典项code,获取的源字典项code")
    @RequestMapping(value = ServiceApi.Redis.AdapterDictEntryCode, method = RequestMethod.GET)
    public String getAdapterDictEntryCode(@ApiParam(name = "version", value = "适配方案版本")
                                     @RequestParam("version") String version,
                                     @ApiParam(name = "stdDictCode", value = "标准字典code")
                                     @RequestParam("stdDictCode") String stdDictCode,
                                     @ApiParam(name = "stdDictEntryCode", value = "标准字典项code")
                                     @RequestParam("stdDictEntryCode") String stdDictEntryCode){
        return adapterRedisService.getAdapterDictEntryCode(version,stdDictCode,stdDictEntryCode);
    }
}

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/controller/StdCdaTypeController.java

@@ -12,7 +12,6 @@
//import com.yihu.hos.web.framework.util.controller.EnvelopRestEndpoint;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.stereotype.Controller;
//import org.springframework.ui.Model;
//import org.springframework.util.StringUtils;
//import org.springframework.web.bind.annotation.RequestMapping;
//import org.springframework.web.bind.annotation.ResponseBody;

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/service/redis/AdapterRedisService.java

@@ -0,0 +1,147 @@
package com.yihu.jw.basic.standard.service.redis;
import com.yihu.jw.basic.redis.schema.AdapterDataSetKeySchema;
import com.yihu.jw.basic.redis.schema.AdapterDictEntryKeySchema;
import com.yihu.jw.basic.redis.schema.AdapterDictKeySchema;
import com.yihu.jw.basic.redis.schema.AdapterMetaDataKeySchema;
import com.yihu.jw.basic.standard.service.bo.AdapterVersion;
import com.yihu.jw.basic.standard.task.AdapterRedisTask;
import com.yihu.jw.redis.client.RedisClient;
import com.yihu.jw.util.thread.ContextAttributes;
import com.yihu.jw.util.thread.LocalContext;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.AsyncResult;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.Future;
@Service
public class AdapterRedisService {
    @Resource(name = "jdbcTemplate")
    private JdbcTemplate jdbc;
    @Autowired
    private AdapterRedisTask adapterRedisTask;
    @Autowired
    private AdapterDataSetKeySchema adapterDataSetKeySchema;
    @Autowired
    private AdapterMetaDataKeySchema adapterMetaDataKeySchema;
    @Autowired
    private AdapterDictKeySchema adapterDictKeySchema;
    @Autowired
    private AdapterDictEntryKeySchema adapterDictEntryKeySchema;
    @Autowired
    private RedisClient redisClient;
    @Async
    public Future<Boolean> cacheVersions(String versions, boolean force,String schema) {
        LocalContext.getContext().setAttachment(ContextAttributes.SCHEMA,schema);
        for (String version : versions.split(",")) {
            List<Map<String, Object>> ver = jdbc.queryForList("select * from adapter_scheme_version where version='"+version+"'");
            if(!CollectionUtils.isEmpty(ver)){
                redisClient.set(version,ver.get(0).get("name")+"");
            }
            AdapterVersion adapterVersion = new AdapterVersion(version);
            String dataSetTable = adapterVersion.getDataSetTableName();
            String metaDataTable = adapterVersion.getMetaDataTableName();
            String dictTable = adapterVersion.getDictTableName();
            String dictEntryTable = adapterVersion.getDictEntryTableName();
            if(force) {
                adapterDataSetKeySchema.delete(dataSetTable);
                adapterMetaDataKeySchema.delete(metaDataTable);
                adapterDictKeySchema.delete(dictTable);
                adapterDictEntryKeySchema.delete(dictEntryTable);
            }
            String dataSetQuery = "SELECT std_dataset_id,std_dataset_code,std_dataset_name,adapter_dataset_id,adapter_dataset_code,adapter_dataset_name FROM data.set.table";
            List<Map<String,Object>> dataSetList = jdbc.queryForList(dataSetQuery.replace("data.set.table", dataSetTable));
            //缓存数据集和数据元
            Future<Boolean> datasetAndMetadataCache = adapterRedisTask.cacheDatasetAndMetadata(dataSetList, dataSetTable, metaDataTable,schema);
            //获取适配字典进行缓存
            List<Map<String,Object>> dictList = jdbc.queryForList("select * from "+dictTable);
            Map<String, String> stdDictMap = new HashMap<>();//目标字典map, key为目标字典id  value 为目标字典code
            Map<String, String> adapterDictMap = new HashMap<>();//源字典map, key为源字典id  value 为源字典code
            //缓存字典
            Future<Boolean> dictCache = adapterRedisTask.cacheDict(dictList, dictTable,schema);
            for (Map<String, Object> temDictMap: dictList) {
                String stdDictCode = (String) temDictMap.get("std_dict_code");
                String stdDictId = String.valueOf(temDictMap.get("std_dict_id"));
                String adapterDictId =  String.valueOf(temDictMap.get("adapter_dict_id"));
                String adapterDictCode = (String) temDictMap.get("adapter_dict_code");
                if(StringUtils.isEmpty(adapterDictCode)){
                    adapterDictCode="";
                }
                stdDictMap.put(stdDictId,stdDictCode);
                adapterDictMap.put(adapterDictId,adapterDictCode);
            }
            //获取字典项进行缓存
            List<Map<String,Object>> dictEntryList = jdbc.queryForList("select * from "+dictEntryTable);
            Future<Boolean> dictEntryCache = adapterRedisTask.cacheDictEntry(dictEntryList, dictEntryTable,stdDictMap,adapterDictMap,schema);
            //数据集,数据元,字典,字典项全部缓存好在进行下个适配版本的缓存
            for (;;) {
                if(datasetAndMetadataCache.isDone() && dictCache.isDone() && dictEntryCache.isDone()) {
                    // 三个任务都调用完成，退出循环等待
                    break;
                }
                try {
                    Thread.sleep(1000);
                } catch (InterruptedException e) {
                    e.printStackTrace();
                }
            }
        }
        return new AsyncResult<Boolean>(true);
    }
    /**
     * 根据适配版本号和数据集code,获取源数据集code
     * @param version 适配版本号
     * @param stdDatasetCode 数据集code
     * @return
     */
    public String getAdapterDatasetCode(String version, String stdDatasetCode) {
        AdapterVersion adapterVersion = new AdapterVersion(version);
        return adapterDataSetKeySchema.getAdapterDatasetCode(adapterVersion.getDataSetTableName(),stdDatasetCode);
    }
    /**
     * 根据适配版本号和目标数据集code,目标数据元code,获取源数据元code
     * @param version 适配版本号
     * @param stdDatasetCode 数据集code
     * @return
     */
    public String getAdapterMetadataCode(String version, String stdDatasetCode, String stdMetadataCode) {
        AdapterVersion adapterVersion = new AdapterVersion(version);
        return adapterMetaDataKeySchema.getAdapterMetaDataCode(adapterVersion.getMetaDataTableName(),stdDatasetCode,stdMetadataCode);
    }
    /**
     * 根据适配版本号和目标字典code,获取的源字典code
     * @param version  适配版本号
     * @param stdDictCode  目标字典code
     * @return
     */
    public String getAdapterDictCode(String version, String stdDictCode) {
        AdapterVersion adapterVersion = new AdapterVersion(version);
        return adapterDictKeySchema.getAdapterDictCode(adapterVersion.getDictTableName(),stdDictCode);
    }
    public String getAdapterDictEntryCode(String version, String stdDictCode, String stdDictEntryCode) {
        AdapterVersion adapterVersion = new AdapterVersion(version);
        return adapterDictEntryKeySchema.getAdapterDictEntryCode(adapterVersion.getDictEntryTableName(),stdDictCode,stdDictEntryCode);
    }
}

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/task/AdapterRedisTask.java

@@ -0,0 +1,150 @@
package com.yihu.jw.basic.standard.task;
import com.yihu.jw.basic.redis.schema.AdapterDataSetKeySchema;
import com.yihu.jw.basic.redis.schema.AdapterDictEntryKeySchema;
import com.yihu.jw.basic.redis.schema.AdapterDictKeySchema;
import com.yihu.jw.basic.redis.schema.AdapterMetaDataKeySchema;
import com.yihu.jw.util.thread.ContextAttributes;
import com.yihu.jw.util.thread.LocalContext;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.AsyncResult;
import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.Future;
@Component
public class AdapterRedisTask {
    @Resource(name = "jdbcTemplate")
    private JdbcTemplate jdbc;
    @Autowired
    private AdapterDataSetKeySchema adapterDataSetKeySchema;
    @Autowired
    private AdapterMetaDataKeySchema adapterMetaDataKeySchema;
    @Autowired
    private AdapterDictKeySchema adapterDictKeySchema;
    @Autowired
    private AdapterDictEntryKeySchema adapterDictEntryKeySchema;
    /**
     * 异步缓存适配的数据集和数据元
     * @param dataSetList
     * @param dataSetTable
     * @param metaDataTable
     * @return
     */
    @Async
    public Future<Boolean> cacheDatasetAndMetadata(List<Map<String,Object>> dataSetList, String dataSetTable, String metaDataTable,String schema){
        System.out.println("开始缓存适配的数据集,数据元");
        LocalContext.getContext().setAttachment(ContextAttributes.SCHEMA,schema);
        Map<Long, String> map = new HashMap<>();//key 为adapter_dataset_id,   value 为adapter_dataset_code
        for (Map<String, Object> tempMap: dataSetList) {
            String stdDatasetName = tempMap.get("std_dataset_name").toString();
            String stdDatasetCode = tempMap.get("std_dataset_code").toString();
            Integer stdDatasetId = (Integer)tempMap.get("std_dataset_id");
            String adapterDatasetIds = (String) tempMap.get("adapter_dataset_id");
            String adapterDatasetCodes = (String) tempMap.get("adapter_dataset_code");
            String adapterDatasetNames = (String) tempMap.get("adapter_dataset_name");
            if(!StringUtils.isEmpty(adapterDatasetIds)){
                String[] adapterDatasetIdArray = adapterDatasetIds.split(",");
                String[] adapterDatasetCodeArray = adapterDatasetCodes.split(",");
                for(int i =0;i<adapterDatasetIdArray.length;i++){
                    map.put(Long.valueOf(adapterDatasetIdArray[i]),adapterDatasetCodeArray[i]);
                }
            }
            //1. 缓存数据集
            if(StringUtils.isEmpty(adapterDatasetCodes)){
                adapterDatasetCodes="";
            }
            adapterDataSetKeySchema.setAdapterDataSetCode(dataSetTable, stdDatasetCode, adapterDatasetCodes);
            adapterDataSetKeySchema.setAdapterDatasetName(dataSetTable, stdDatasetCode, adapterDatasetNames);
            //获取数据元进行缓存
            List<Map<String,Object>> metadataList = jdbc.queryForList("select * from "+metaDataTable+" t where t.std_dataset_id="+stdDatasetId);
            for (Map<String, Object> tempMetadaMap: metadataList) {
                String adapterCode = "";
                String adapterName = "";
                String stdName = "";
                String stdMetadataCode = (String) tempMetadaMap.get("std_metadata_code");
                String adapterDatasetId = String.valueOf(tempMetadaMap.get("adapter_dataset_id"));
                if(!StringUtils.isEmpty(adapterDatasetId) && !"null".equals(adapterDatasetId)){
                    String adapterDatasetCode = map.get(Long.valueOf(adapterDatasetId));
                    String adapterMetadataCode = (String) tempMetadaMap.get("adapter_metadata_code");
                    String adapterMetadataName = (String) tempMetadaMap.get("adapter_metadata_name");
                    String stdMetadataName = (String) tempMetadaMap.get("std_metadata_name");
                    adapterCode = adapterDatasetCode + "." + adapterMetadataCode;
                    adapterName = adapterDatasetNames + "." + adapterMetadataName;
                    stdName = stdDatasetName + "." + stdMetadataName;
                }
                //缓存数据元
                adapterMetaDataKeySchema.setAdapterMetaDataCode(metaDataTable, stdDatasetCode, stdMetadataCode, adapterCode);
                adapterMetaDataKeySchema.setAdapterMetaDataName(metaDataTable, stdDatasetCode, stdMetadataCode, adapterName);
                adapterMetaDataKeySchema.setStdMetaDataName(metaDataTable, stdDatasetCode, stdMetadataCode, stdName);
            }
        }
        System.out.println("缓存适配的数据集,数据元完成");
        return new AsyncResult<Boolean>(true);
    }
    /**
     * 缓存适配的字典
     * @param dictList
     * @param dictTable
     * @return
     */
    @Async
    public Future<Boolean> cacheDict(List<Map<String,Object>> dictList, String dictTable,String schema){
        System.out.println("开始缓存适配的字典");
        LocalContext.getContext().setAttachment(ContextAttributes.SCHEMA,schema);
        for (Map<String, Object> temDictMap: dictList) {
            String stdDictCode = (String) temDictMap.get("std_dict_code");
            String adapterDictCode = (String) temDictMap.get("adapter_dict_code");
            if(StringUtils.isEmpty(adapterDictCode)){
                adapterDictCode="";
            }
            adapterDictKeySchema.setAdapterDictCode(dictTable,stdDictCode,adapterDictCode);
        }
        System.out.println("缓存适配的字典完成");
        return new AsyncResult<Boolean>(true);
    }
    /**
     * 缓存适配的字典项
     * @param dictEntryList
     * @param dictEntryTable
     * @param stdDictMap
     * @param adapterDictMap
     * @return
     */
    @Async
    public Future<Boolean> cacheDictEntry(List<Map<String,Object>> dictEntryList, String dictEntryTable,Map<String, String> stdDictMap,Map<String, String> adapterDictMap,String schema){
        System.out.println("开始缓存适配的字典项");
        LocalContext.getContext().setAttachment(ContextAttributes.SCHEMA,schema);
        for (Map<String, Object> temDictMap: dictEntryList) {
            String value="";
            String stdDictId = String.valueOf(temDictMap.get("std_dict_id"));
            String stdDictCode = stdDictMap.get(stdDictId);
            String adapterDictId = String.valueOf(temDictMap.get("adapter_dict_id"));
            String adapterDictCode = adapterDictMap.get(adapterDictId);
            String stdEntryCode = (String) temDictMap.get("std_entry_code");
            if(!StringUtils.isEmpty(adapterDictCode)){//
                String adapterEntryCode = (String) temDictMap.get("adapter_entry_code");
                value=adapterDictCode+"."+adapterEntryCode;
            }
            adapterDictEntryKeySchema.setAdapterDictEntryCode(dictEntryTable,stdDictCode,stdEntryCode,value);
        }
        System.out.println("缓存适配的字典项完成");
        return new AsyncResult<Boolean>(true);
    }
}

svr/svr-basic/src/main/java/com/yihu/jw/basic/system/controller/DatasourceController.java

@@ -11,7 +11,6 @@
//import org.apache.commons.beanutils.BeanUtils;
//import org.apache.commons.collections4.CollectionUtils;
//import org.springframework.stereotype.Controller;
//import org.springframework.ui.Model;
//import org.springframework.web.bind.annotation.RequestMapping;
//import org.springframework.web.bind.annotation.RequestMethod;
//import org.springframework.web.bind.annotation.RequestParam;

svr/svr-basic/src/main/java/com/yihu/jw/basic/system/controller/DictController.java

@@ -6,7 +6,6 @@
//import com.yihu.hos.web.framework.model.Result;
//import org.apache.commons.beanutils.BeanUtils;
//import org.springframework.stereotype.Controller;
//import org.springframework.ui.Model;
//import org.springframework.util.StringUtils;
//import org.springframework.web.bind.annotation.RequestMapping;
//import org.springframework.web.bind.annotation.ResponseBody;

svr/svr-basic/src/main/java/com/yihu/jw/basic/system/controller/FlowController.java

@@ -14,7 +14,6 @@
//import com.yihu.hos.web.framework.util.controller.BaseController;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.stereotype.Controller;
//import org.springframework.ui.Model;
//import org.springframework.util.StringUtils;
//import org.springframework.web.bind.annotation.RequestMapping;
//import org.springframework.web.bind.annotation.RequestMethod;

svr/svr-basic/src/main/java/com/yihu/jw/basic/system/controller/OrgController.java

@@ -7,7 +7,6 @@
//import com.yihu.hos.web.framework.util.controller.BaseController;
//import org.apache.commons.beanutils.BeanUtils;
//import org.springframework.stereotype.Controller;
//import org.springframework.ui.Model;
//import org.springframework.web.bind.annotation.RequestMapping;
//import org.springframework.web.bind.annotation.ResponseBody;
//

svr/svr-basic/src/main/java/com/yihu/jw/basic/system/controller/ParamController.java

@@ -6,7 +6,6 @@
//import com.yihu.hos.web.framework.util.controller.BaseController;
//import org.apache.commons.beanutils.BeanUtils;
//import org.springframework.stereotype.Controller;
//import org.springframework.ui.Model;
//import org.springframework.util.StringUtils;
//import org.springframework.web.bind.annotation.RequestMapping;
//import org.springframework.web.bind.annotation.RequestMethod;