代码修改

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

@@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.OutputStream;
import java.text.DecimalFormat;
@@ -33,15 +34,16 @@ import java.util.*;
@Api( tags = {"网关-报表"})
public class ReportController extends EnvelopRestEndpoint {
    @Autowired
    @Resource
    QcQuotaResultService qcQuotaResultService;
    CalculatePointUtil calculatePointUtil=new CalculatePointUtil();
    //所有指标统计结果查询,初始化查询
    @GetMapping("/getQcOverAllIntegrity")
    public Envelop searchQcOverAllIntegrity(String location,String startTime,String endTime){
        PageEnvelop result = new PageEnvelop();
        List<Object> quotaList = new ArrayList<Object>();
        List<Object> quotaList;
        List<QcQuotaResult> newQuotaList = new ArrayList<QcQuotaResult>();
        Date startDate = DateUtil.formatYMDToYMDHMS(startTime);
        Date endDate = DateUtil.formatYMDToYMDHMS(endTime);
@@ -53,8 +55,8 @@ public class ReportController extends EnvelopRestEndpoint {
        //按区域查询统计结果集
        quotaList = qcQuotaResultService.getQuotaListByLocation(location, startDate, endDate);
        if(null!=quotaList&&quotaList.size() > 0){
            for (int i = 0; i < quotaList.size(); i++) {
                Object[] obj = (Object[]) quotaList.get(i);
            for (Object o : quotaList) {
                Object[] obj = (Object[]) o;
                //json处理
                qc = new QcQuotaResult();
                //指标Id
@@ -101,7 +103,7 @@ public class ReportController extends EnvelopRestEndpoint {
    @GetMapping("/getQcOverAllOrgIntegrity")
    public Envelop searchQcOverAllOrgIntegrity(String location,String orgCode,String startTime,String endTime){
        PageEnvelop result = new PageEnvelop();
        List<Object> quotaList = new ArrayList<Object>();
        List<Object> quotaList;
        List<QcQuotaResult> newQuotaList = new ArrayList<QcQuotaResult>();
        Date startDate = DateUtil.formatYMDToYMDHMS(startTime);
        Date endDate =DateUtil.formatYMDToYMDHMS(endTime);
@@ -131,16 +133,16 @@ public class ReportController extends EnvelopRestEndpoint {
                String value = "";
                if (obj[4] != null && obj[5] != null && obj[6] != null && obj[7] != null) {
                    //实收数 （数据元的实收为 应收 - 错误数（标识为空的错误code））
                    totalNum = Integer.valueOf(obj[4].toString());
                    totalNum = Integer.parseInt(obj[4].toString());
                    qc.setTotalNum(totalNum);
                    //应收数
                    realNum = Integer.valueOf(obj[5].toString());
                    realNum = Integer.parseInt(obj[5].toString());
                    qc.setRealNum(realNum);
                    //错误数量（该字段只针对数据元的准确性统计）
                    errorNum = Integer.valueOf(obj[6].toString());
                    errorNum = Integer.parseInt(obj[6].toString());
                    qc.setErrorNum(errorNum);
                    //及时采集的档案数量
                    timelyNum = Integer.valueOf(obj[7].toString());
                    timelyNum = Integer.parseInt(obj[7].toString());
                    qc.setTimelyNum(timelyNum);
                    value = calculatePointUtil.calculatePoint(quotaId, realNum, totalNum, errorNum, timelyNum);
                }
@@ -164,7 +166,7 @@ public class ReportController extends EnvelopRestEndpoint {
    @GetMapping("/getQcQuotaIntegrity")
    public Envelop searchQcQuotaIntegrity(String location,String quotaId,String startTime,String endTime){
        PageEnvelop result = new PageEnvelop();
        List<Object> quotaList = new ArrayList<Object>();
        List<Object> quotaList;
        List<MQcDailyReportQuotaResult> newQuotaList = new ArrayList<MQcDailyReportQuotaResult>();
        Date startDate = DateUtil.formatYMDToYMDHMS(startTime);
        Date endDate =DateUtil.formatYMDToYMDHMS(endTime);

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

@@ -5,6 +5,7 @@ import com.yihu.jw.entity.ehr.report.ReportCategoryAppRelation;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -15,6 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
 */
@RestController
@RequestMapping("/resource/reportCategoryApp")
@Api(tags = {"网关-报表应用分类"})
public class ReportCategoryAppRelationController extends EnvelopRestEndpoint {
    @Autowired

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

@@ -15,6 +15,7 @@ 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 io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -35,6 +36,7 @@ import java.util.Map;
 */
@RestController
@RequestMapping("/resource/reportCategory")
@Api(tags = {"网关-报表分类"})
public class ReportCategoryController extends EnvelopRestEndpoint {
    @Autowired

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

@@ -346,8 +346,7 @@ public class ReportController extends EnvelopRestEndpoint {
     * 获取报表模版内容及其各个图形数据
     */
    @GetMapping("getTemplateData")
    public Object getTemplateData(@RequestParam String reportCode, HttpServletRequest request) {
        Envelop envelop = new Envelop();
    public Object getTemplateData(@RequestParam String reportCode) {
        Map<String, Object> params = new HashMap<>();
        Map<String, Object> resultMap = new HashMap<>();
        List<Map<String, Object>> viewInfos = new ArrayList<>();
@@ -432,33 +431,31 @@ public class ReportController extends EnvelopRestEndpoint {
    }
    private List<Map<String,String>>  getTjQuotaSynthesiseDimension(String quotaCodes) {
        List<TjQuotaDimensionMain> tjQuotaDimensionMains = null;
        List<TjQuotaDimensionSlave> tjQuotaDimensionSlaves = null;
        List<TjQuotaDimensionMain> tjQuotaDimensionMains;
        List<TjQuotaDimensionSlave> tjQuotaDimensionSlaves;
        //保存指标的 ID 和 所有维度的集合
        Map<String,Map<String,String>> dimensionMap = new LinkedHashMap();
        String [] quotaCode = quotaCodes.split(",");
        for(int i=0 ; i < quotaCode.length ;i++){
            Map<String,String> map = new LinkedHashMap<>();
            tjQuotaDimensionMains = tjQuotaDimensionMainService.getTjQuotaDimensionMainByCode(quotaCode[i]);
//            int main = 1;
            for(TjQuotaDimensionMain tjQuotaDimensionMain : tjQuotaDimensionMains){
        for (String s : quotaCode) {
            Map<String, String> map = new LinkedHashMap<>();
            tjQuotaDimensionMains = tjQuotaDimensionMainService.getTjQuotaDimensionMainByCode(s);
            for (TjQuotaDimensionMain tjQuotaDimensionMain : tjQuotaDimensionMains) {
                TjDimensionMain tjDimensionMain = tjDimensionMainService.getTjDimensionMainByCode(tjQuotaDimensionMain.getMainCode());
                if(tjDimensionMain !=null){
                    map.put(tjDimensionMain.getCode(),tjDimensionMain.getName() + "-" + tjDimensionMain.getCode());
                if (tjDimensionMain != null) {
                    map.put(tjDimensionMain.getCode(), tjDimensionMain.getName() + "-" + tjDimensionMain.getCode());
                }
//                main ++;
            }
            tjQuotaDimensionSlaves = tjQuotaDimensionSlaveService.getTjQuotaDimensionSlaveByCode(quotaCode[i]);
            tjQuotaDimensionSlaves = tjQuotaDimensionSlaveService.getTjQuotaDimensionSlaveByCode(s);
            int slave = 1;
            for(TjQuotaDimensionSlave tjQuotaDimensionSlave : tjQuotaDimensionSlaves){
                TjDimensionSlave tjDimensionSlave =  tjDimensionSlaveService.getTjDimensionSlaveByCode(tjQuotaDimensionSlave.getSlaveCode());
                if(tjDimensionSlave != null){
                    map.put(tjDimensionSlave.getCode(), tjDimensionSlave.getName()+"-slaveKey" + slave);//第几个维度
            for (TjQuotaDimensionSlave tjQuotaDimensionSlave : tjQuotaDimensionSlaves) {
                TjDimensionSlave tjDimensionSlave = tjDimensionSlaveService.getTjDimensionSlaveByCode(tjQuotaDimensionSlave.getSlaveCode());
                if (tjDimensionSlave != null) {
                    map.put(tjDimensionSlave.getCode(), tjDimensionSlave.getName() + "-slaveKey" + slave);//第几个维度
                }
                slave ++;
                slave++;
            }
            dimensionMap.put(quotaCode[i],map);
            dimensionMap.put(s, map);
        }
        //取出第一个指标的所有维度
@@ -592,8 +589,8 @@ public class ReportController extends EnvelopRestEndpoint {
            }
        } else if (type == 2) {
            // 指标视图场合
            for (int i = 0; i < queryList.size(); i ++) {
                Map<String, String> filter = objectMapper.readValue(queryList.get(i).getParamValue(), Map.class);
            for (RsResourceDefaultParam rsResourceDefaultParam : queryList) {
                Map<String, String> filter = objectMapper.readValue(rsResourceDefaultParam.getParamValue(), Map.class);
                if (filter.get("startTime") != null) {
                    // 起始日期
                    String date = filter.get("startTime").toString();
@@ -624,9 +621,6 @@ public class ReportController extends EnvelopRestEndpoint {
    /**
     * 生成模板
     * @param id
     * @param content
     * @return
     */
    @RequestMapping("/uploadTemplate")
    public Envelop uploadTemplate(Integer id, String content, String reportData, String position) {
@@ -674,7 +668,6 @@ public class ReportController extends EnvelopRestEndpoint {
    @GetMapping("/getTemplateContent")
    public Envelop getTemplateContent(String reportCode) {
        Map<String, Object> params = new HashMap<>();
        try {
            // 获取报表模版内容
            RsReport rsReport = rsReportService.getByCode(reportCode);
@@ -700,8 +693,7 @@ public class ReportController extends EnvelopRestEndpoint {
     */
    private List<RsCategoryTypeTreeModel> getRsCategoryTreeModelChild(List<RsResourceCategory> info) {
        List<RsCategoryTypeTreeModel> treeInfo = new ArrayList<>();
        for (int i = 0; i < info.size(); i++) {
            RsResourceCategory typeInfo = info.get(i);
        for (RsResourceCategory typeInfo : info) {
            RsCategoryTypeTreeModel tree = convertToModel(typeInfo, RsCategoryTypeTreeModel.class);
            List<RsResourceCategory> categoryListChild = rsCategoryService.getRsCategoryByPid(typeInfo.getId());
            List<RsCategoryTypeTreeModel> listChildTree = getRsCategoryTreeModelChild(categoryListChild);
@@ -714,8 +706,6 @@ public class ReportController extends EnvelopRestEndpoint {
    /**
     * 递归不满足的父级类别集合的子集中满足条件TreeModel集合的方法
     * @param mRsCategories 不符合的父级类别的集合
     * @param name
     * @return
     */
    private List<RsCategoryTypeTreeModel> getRsCategoryTreeModelByName(List<RsResourceCategory> mRsCategories, String name) throws ParseException {
        //结构：treeList 包含treeModel，treeModel包含listOfParent

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

@@ -7,16 +7,13 @@ import com.yihu.jw.entity.ehr.id.BizObject;
import com.yihu.jw.entity.ehr.resource.RsMetadata;
import com.yihu.jw.entity.ehr.resource.RsResourceMetadata;
import com.yihu.jw.restmodel.ehr.resource.MRsMetadata;
import com.yihu.jw.restmodel.ehr.resource.MRsResourceMetadata;
import com.yihu.jw.restmodel.web.Envelop;
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.http.HttpClientUtil;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.http.ResponseEntity;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
@@ -42,7 +39,6 @@ public class ResourceConfigurationController extends EnvelopRestEndpoint {
    public Object searchResourceConfiguration(String searchNm, int page, int rows) {
        Map<String, Object> params = new HashMap<>();
        String metaDataUrl = "/resources/metadata";
        String resultStr = "";
        params.put("filters", "");
        String filters ="valid=1";
        if (!StringUtils.isEmpty(searchNm)){
@@ -142,7 +138,6 @@ public class ResourceConfigurationController extends EnvelopRestEndpoint {
                for (String id:ids){
                    rsMetadataDao.deleteById(id);
                }
                return success("删除成功");
            }
            if (!StringUtils.isEmpty(addRowDatas)) {
                //执行新增操作
@@ -151,8 +146,8 @@ public class ResourceConfigurationController extends EnvelopRestEndpoint {
                    metadata.setId(getObjectId(BizObject.ResourceMetadata));
                }
                List<RsResourceMetadata> metadataList = rsMetadataService.saveMetadataBatch(rsMetadata);
                return ListEnvelop.getSuccess("新增成功",metadataList);
            }
            return success("超做成功");
        } catch (Exception e) {
            e.printStackTrace();
        }

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

@@ -11,10 +11,12 @@ import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import io.swagger.annotations.Api;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -27,14 +29,13 @@ import java.util.Map;
@Api(tags = {"网关-资源默认参数"})
public class ResourceDefaultParamController extends EnvelopRestEndpoint {
    @Autowired
    @Resource
    private RsResourceDefaultParamService resourceDefaultParamService;
    @Autowired
    @Resource
    private RsResourceDefaultParamDao resourceDefaultParamDao;
    @RequestMapping("/infoInitial")
    @GetMapping("/infoInitial")
    public Envelop rsDefaultParamInfoInitial(String id,String resourcesId,String resourcesCode,String mode,String rowIndex){
        Envelop envelop = new Envelop();
        try {
            if(StringUtils.equals(mode,"new")){
                return success();
@@ -49,7 +50,7 @@ public class ResourceDefaultParamController extends EnvelopRestEndpoint {
    }
    //新增、修改
    @RequestMapping("/update")
    @PostMapping("/update")
    public Envelop addOrUpdate(String dataJson,String mode){
        if(StringUtils.isEmpty(mode)){
            return failed("操作类别不能为空！");
@@ -86,7 +87,7 @@ public class ResourceDefaultParamController extends EnvelopRestEndpoint {
        }
    }
    //删除
    @RequestMapping("/delete")
    @PostMapping("/delete")
    public Envelop delete(String id){
        try{
            if(id == null){
@@ -100,7 +101,7 @@ public class ResourceDefaultParamController extends EnvelopRestEndpoint {
        }
    }
    //查看不分页
    @RequestMapping("/searchList")
    @GetMapping("/searchList")
    public Envelop searchList(String resourcesId){
        try{
            if(StringUtils.isEmpty(resourcesId)){
@@ -117,7 +118,7 @@ public class ResourceDefaultParamController extends EnvelopRestEndpoint {
    }
    //参数值唯一性验证
    @RequestMapping("/isKeyValueExistence")
    @GetMapping("/isKeyValueExistence")
    public Envelop isExistenceRsParamKeyValue(String resourcesId,String paramKey,String paramValue){
        try{
            String url = ServiceApi.Resources.ParamKeyValueExistence;

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

@@ -25,6 +25,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
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.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
@@ -63,7 +64,7 @@ public class ResourceIntegratedController extends EnvelopRestEndpoint {
     * @param filters
     * @return
     */
    @RequestMapping("/getMetadataList")
    @GetMapping("/getMetadataList")
    public Envelop getMetadataList(String filters, HttpServletRequest request) throws Exception {
        String url = "/resource/api/v1.0/resources/integrated/metadata_list";
        //标准分类
@@ -81,7 +82,7 @@ public class ResourceIntegratedController extends EnvelopRestEndpoint {
     * @return
     * @throws Exception
     */
    @RequestMapping("/category")
    @GetMapping("/category")
    public Envelop getCategory() throws Exception {
        String url = "/resource/api/v1.0/resources/integrated/category";
        Map<String, Object> params = new HashMap<>();
@@ -96,7 +97,7 @@ public class ResourceIntegratedController extends EnvelopRestEndpoint {
     * @param filters
     * @return
     */
    @RequestMapping("/metadata")
    @GetMapping("/metadata")
    public Envelop getMetadataList(String categoryId, String filters, HttpServletRequest request) throws Exception {
        String url = "/resource/api/v1.0/resources/integrated/metadata";
        //标准分类
@@ -176,7 +177,7 @@ public class ResourceIntegratedController extends EnvelopRestEndpoint {
     * @param filters
     * @return
     */
    @RequestMapping("/getQuotaList")
    @GetMapping("/getQuotaList")
    public Envelop getQuotaList(String filters) throws Exception {
        String url = "/resource/api/v1.0/resources/integrated/quota_list";
        List<Map<String, Object>> list = resourcesIntegratedService.getQuotaList(filters);
@@ -376,7 +377,7 @@ public class ResourceIntegratedController extends EnvelopRestEndpoint {
     * @param request
     * @return
     */
    @RequestMapping("/getResourceList")
    @GetMapping("/getResourceList")
    public Envelop getResourceList(int page, int size, HttpServletRequest request) throws Exception {
        String url = "/resources/page";
        //从Session中获取用户的角色和和授权视图列表作为查询参数

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

@@ -11,6 +11,8 @@ import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -31,7 +33,7 @@ public class ResourceInterfaceController extends EnvelopRestEndpoint {
    @Autowired
    private RsInterfaceDao rsInterfaceDao;
    @RequestMapping("/infoInitial")
    @GetMapping("/infoInitial")
    public Envelop resourceInterfaceInfoInitial(String id,String mode){
        Envelop envelop = new Envelop();
        String envelopStr = "";
@@ -47,7 +49,7 @@ public class ResourceInterfaceController extends EnvelopRestEndpoint {
        }
    }
    @RequestMapping("/searchRsInterfaces")
    @GetMapping("/searchRsInterfaces")
    public Envelop searchRsInterfaces(String searchNm, int page, int rows) {
        Envelop envelop = new Envelop();
        String envelopStr = "";
@@ -64,7 +66,7 @@ public class ResourceInterfaceController extends EnvelopRestEndpoint {
        }
    }
    @RequestMapping("/getResourceInterface")
    @GetMapping("/getResourceInterface")
    public Envelop getResourceInterface(String id){
        Envelop envelop = new Envelop();
        try{
@@ -91,7 +93,7 @@ public class ResourceInterfaceController extends EnvelopRestEndpoint {
        }
    }
    //新增、修改
    @RequestMapping("/update")
    @PostMapping("/update")
    public Envelop updateResourceInterface(String dataJson,String mode){
        Envelop envelop = new Envelop();
        String url = "/resources/interfaces";
@@ -125,7 +127,7 @@ public class ResourceInterfaceController extends EnvelopRestEndpoint {
    }
    //删除
    @RequestMapping("/delete")
    @PostMapping("/delete")
    public Envelop deleteRsInterface(String id){
        Envelop envelop = new Envelop();
        try{
@@ -137,7 +139,7 @@ public class ResourceInterfaceController extends EnvelopRestEndpoint {
        }
    }
    @RequestMapping("/isNameExist")
    @GetMapping("/isNameExist")
    public Envelop isNameExist(String name){
        Envelop envelop = new Envelop();
        try{

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

@@ -17,17 +17,14 @@ import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.util.common.LogService;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
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.RestController;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.client.RestClientException;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -41,25 +38,23 @@ import java.util.Map;
@Api(tags = {"网关-视图管理控制器"})
public class ResourceManageController extends EnvelopRestEndpoint {
    @Autowired
    @Resource
    private RsResourceCategoryService rsCategoryService;
    @Autowired
    @Resource
    private RsResourceService rsResourceService;
    @Autowired
    @Resource
    private RsAppResourceService rsAppResourceService;
    @Autowired
    @Resource
    private RsResourceDao rsResourceDao;
    @Autowired
    @Resource
    private RsResourceQuotaService resourceQuotaService;
    @Autowired
    @Resource
    private RsResourceGrantService rsGrantService;
    @Autowired
    @Resource
    private RsReportViewService rsReportViewService;
    @RequestMapping("/infoInitial")
    @GetMapping("/infoInitial")
    public Envelop resourceInterfaceInfoInitial(String id,String mode,String categoryId, String name, String dataSource){
        Envelop envelop = new Envelop();
        String envelopStr = "";
        String categoryName = "";
        try{
            if(!StringUtils.isEmpty(categoryId)) {
@@ -82,7 +77,7 @@ public class ResourceManageController extends EnvelopRestEndpoint {
        }
    }
    @RequestMapping(value = "/resourceInfo", method = RequestMethod.GET)
    @GetMapping(value = "/resourceInfo")
    public Envelop getResourceInfo(String id) throws Exception {
        RsResource  rsResource = rsResourceService.getResourceById(id);
        return ObjEnvelop.getSuccess("查询成功",rsResource);
@@ -91,13 +86,9 @@ public class ResourceManageController extends EnvelopRestEndpoint {
    /**
     * 配置授权浏览页面跳转
     * @param resourceId
     * @return
     */
    @RequestMapping("/switch")
    @GetMapping("/switch")
    public Envelop switchToPage(String resourceId){
        Envelop envelop = new Envelop();
        String envelopStr = "";
        try{
            if (!StringUtils.isEmpty(resourceId)) {
                RsResource  rsResource = rsResourceService.getResourceById(resourceId);
@@ -112,16 +103,10 @@ public class ResourceManageController extends EnvelopRestEndpoint {
    /**
     * 资源分页查询 -- 弃用
     * @param searchNm
     * @param categoryId
     * @param page
     * @param rows
     * @return
     */
    @RequestMapping("/resources")
    @GetMapping("/resources")
    public Envelop searchResources(String searchNm, String categoryId, String rolesId, String appId, Integer dataSource, int page, int rows){
        String url = "/resources";
        String resultStr = "";
        Envelop envelop = new Envelop();
        Map<String, Object> params = new HashMap<>();
        StringBuffer stringBuffer = new StringBuffer();
@@ -180,9 +165,8 @@ public class ResourceManageController extends EnvelopRestEndpoint {
     * 视图资源列表树
     * @param filters 过滤查询条件
     * @param dataSource 1 档案视图 2 指标视图
     * @return
     */
    @RequestMapping("/resources/tree")
    @GetMapping("/resources/tree")
    public Envelop getResourceTree(String filters, Integer dataSource, HttpServletRequest request) throws Exception {
        String url = "/resource/api/v1.0/resources/tree";
        //从Session中获取用户的角色和和授权视图列表作为查询参数
@@ -199,13 +183,9 @@ public class ResourceManageController extends EnvelopRestEndpoint {
    /**
     * 创建或更新资源
     * @param dataJson
     * @param mode
     * @return
     */
    @RequestMapping("/update")
    public Envelop updateResource(String dataJson, String mode, HttpServletRequest request){
        Envelop envelop = new Envelop();
    @PostMapping("/update")
    public Envelop updateResource(String dataJson, String mode){
        String url = "/resources";
        try{
            //RsResourcesModel model = objectMapper.readValue(dataJson, RsResourcesModel.class);
@@ -247,14 +227,10 @@ public class ResourceManageController extends EnvelopRestEndpoint {
    /**
     * 删除资源
     * @param id
     * @return
     */
    @RequestMapping("/delete")
    @PostMapping("/delete")
    public Envelop deleteResource(String id) {
        String url = "/resources/" + id;
        String resultStr = "";
        Envelop result = new Envelop();
        Map<String, Object> params = new HashMap<>();
        params.put("id", id);
        try {
@@ -277,12 +253,9 @@ public class ResourceManageController extends EnvelopRestEndpoint {
    /**
     * 资源编码唯一性验证
     * @param code
     * @return
     */
    @RequestMapping("/isExistCode")
    @GetMapping("/isExistCode")
    public Envelop isExistCode(String code){
        Envelop envelop = new Envelop();
        String url = "/resources/isExistCode/"+code;
        try{
            RsResource rsResource = rsResourceDao.findByCode(code);
@@ -296,12 +269,9 @@ public class ResourceManageController extends EnvelopRestEndpoint {
    /**
     * 资源名称唯一性验证
     * @param name
     * @return
     */
    @RequestMapping("/isExistName")
    @GetMapping("/isExistName")
    public Envelop isExistName(String name){
        Envelop envelop = new Envelop();
        String url = "/resources/isExistName";
        try{
            RsResource rsResource = rsResourceDao.findByName(name);
@@ -314,13 +284,11 @@ public class ResourceManageController extends EnvelopRestEndpoint {
    /**
     * 资源分类树-页面初始化时
     * @return
     */
    @RequestMapping("/categories")
    @GetMapping("/categories")
    public Envelop getCategories(){
        try{
            String filters = "";
            String envelopStr = "";
            String url = "/resources/categories/all";
            List<RsResourceCategory> resources = rsCategoryService.search(filters);
            return ListEnvelop.getSuccess("查询成功",resources);
@@ -332,16 +300,10 @@ public class ResourceManageController extends EnvelopRestEndpoint {
    /**
     * 带检索分页的查找资源分类方法,新增资源时
     * @param searchParm
     * @param page
     * @param rows
     * @return
     */
    @RequestMapping("/rsCategory")
    @GetMapping("/rsCategory")
    public Envelop searchRsCategory(String searchParm, HttpServletRequest request, int page, int rows){
        Envelop envelop = new Envelop();
        String url = "/resources/categories/search";
        String envelopStrGet = "";
        try {
            Map<String, Object> params = new HashMap<>();
            StringBuffer stringBuffer = new StringBuffer();
@@ -356,12 +318,12 @@ public class ResourceManageController extends EnvelopRestEndpoint {
            long total = 0;
            if (StringUtils.isEmpty(filters)) {
                Page<RsResourceCategory> rsCatePage = null;
                Page<RsResourceCategory> rsCatePage;
                rsCatePage = rsCategoryService.getRsCategories(null, reducePage(page), rows);
                total = rsCatePage.getTotalElements();
                return PageEnvelop.getSuccessListWithPage("查询成功",rsCatePage.toList(),page,rows,total);
            } else {
                List<RsResourceCategory> rsCateList = null;
                List<RsResourceCategory> rsCateList;
                    rsCateList = rsCategoryService.search(null, filters, null, page, rows);
                total = rsCateList.size();
                return PageEnvelop.getSuccessListWithPage("查询成功",rsCateList,page,rows,total);
@@ -395,11 +357,9 @@ public class ResourceManageController extends EnvelopRestEndpoint {
//        }
//    }
    @RequestMapping(value = "/addResourceQuota")
    public Envelop addResourceQuota(String resourceId, String jsonModel, HttpServletRequest request) throws IOException {
    @PostMapping(value = "/addResourceQuota")
    public Envelop addResourceQuota(String resourceId, String jsonModel) throws IOException {
        String url = "/resourceQuota/batchAddResourceQuota";
        String resultStr = "";
        Envelop result = new Envelop();
        if (!StringUtils.isEmpty(resourceId)) {
            resourceQuotaService.deleteByResourceId(resourceId);
            return success("删除成功");
@@ -410,8 +370,8 @@ public class ResourceManageController extends EnvelopRestEndpoint {
            if (list != null && list.size() > 0) {
                resourceQuotaService.deleteByResourceId(list.get(0).getResourceId());
            }
            for (int i=0; i<list.size(); i++) {
                resourceQuotaService.save(list.get(i));
            for (RsResourceQuota rsResourceQuota : list) {
                resourceQuotaService.save(rsResourceQuota);
            }
            return ListEnvelop.getSuccess("操作成功",list);
        } catch (RestClientException e) {
@@ -487,49 +447,31 @@ public class ResourceManageController extends EnvelopRestEndpoint {
    /**
     * 判断资源是否已被授权
     * @param resourceId
     * @return
     * @throws Exception
     */
    public boolean isRsInUse(String resourceId) throws Exception{
        String url = "/resources/grants/no_paging";
        Map<String,Object> params = new HashMap<>();
        params.put("filters","resourceId=" + resourceId);
        List<RsAppResource> rsGrant = rsGrantService.search("resourceId=" + resourceId);
        if (rsGrant!=null&&rsGrant.size()>0) {
            return true;
        } else {
            return false;
        }
        return rsGrant != null && rsGrant.size() > 0;
    }
    /**
     * 判断资源报表是否关联相关资源
     * @param resourceId
     * @return
     * @throws Exception
     */
    public boolean isRsReportInUse(String resourceId) throws Exception {
        String url = "/resources/reportView/existByResourceId";
        List<RsReportView> rsReportViewList = rsReportViewService.findByResourceId(resourceId);
        if (rsReportViewList == null || rsReportViewList.size() <= 0) {
            return false;
        }else {
            return true;
        }
        return rsReportViewList != null && rsReportViewList.size() > 0;
    }
    public Boolean isSetReport(String resourceId) throws Exception{
        List<RsReportView> list = rsReportViewService.findByResourceId(resourceId);
        if (list != null && list.size() > 0) {
            return true;
        }
        return false;
        return list != null && list.size() > 0;
    }
    @RequestMapping(value = "/getQuotaByResourceId")
    @GetMapping(value = "/getQuotaByResourceId")
    public Envelop getQuotaByResourceId(String resourceId){
        Envelop envelop = new Envelop();
        String url = "/resourceQuota/getQuotaByResourceId";
        Map<String,Object> params = new HashMap<>();
        params.put("resourceId",resourceId);
@@ -542,9 +484,8 @@ public class ResourceManageController extends EnvelopRestEndpoint {
        }
    }
    @RequestMapping(value = "/updateResourceQuota")
    @PostMapping(value = "/updateResourceQuota")
    public Envelop updateResourceQuota(String jsonModel){
        Envelop envelop = new Envelop();
        String url = "/resourceQuota/updateResourceQuota";
        try{
            List<ResourceQuotaJson> list = objectMapper.readValue(jsonModel, new TypeReference<List<ResourceQuotaJson>>() {

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

@@ -7,6 +7,7 @@ import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -29,7 +30,7 @@ public class ResourceMonitorTypeReportController extends EnvelopRestEndpoint {
    /**
     * 报表分页查询
     */
    @RequestMapping("/search")
    @GetMapping("/search")
    public Envelop search(String searchNm, int page, int rows) {
        StringBuffer filters = new StringBuffer();
@@ -93,7 +94,7 @@ public class ResourceMonitorTypeReportController extends EnvelopRestEndpoint {
//    }
//    //监测类型配置报表列表查询
//    @RequestMapping("/monitorTypeReportList")
//    @GetMapping("/monitorTypeReportList")
//    public Envelop getMonitorTypeReportList(String searchNm,int page,int rows){
//        if(org.apache.commons.lang.StringUtils.isEmpty(searchNm)){
//            return failed("监测类型id不能为空！");
@@ -114,7 +115,7 @@ public class ResourceMonitorTypeReportController extends EnvelopRestEndpoint {
//    }
//
//    //获取监测类型配置的所有 报表
//    @RequestMapping("/monitorTypeReportByMonitorTypeId")
//    @GetMapping("/monitorTypeReportByMonitorTypeId")
//    public Envelop getMonitorTypeReportByMonitorTypeId(String monitorTypeId){
//        if(org.apache.commons.lang.StringUtils.isEmpty(monitorTypeId)){
//            return failed("监测类型id不能为空！");

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

@@ -15,6 +15,7 @@ import jxl.write.WritableSheet;
import jxl.write.WritableWorkbook;
import org.springframework.beans.factory.annotation.Autowired;
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.RestController;
@@ -38,7 +39,7 @@ public class ResourceViewController extends EnvelopRestEndpoint {
    @Autowired
    private SystemDictEntryService systemDictEntryService;
    @RequestMapping("/searchResource")
    @GetMapping("/searchResource")
    public Envelop searchResource(String ids) {
        return resourceBrowseControllerService.getCategories(ids);
    }
@@ -50,7 +51,7 @@ public class ResourceViewController extends EnvelopRestEndpoint {
     * @param dictId
     * @return
     */
    @RequestMapping("/getGridCloumnNames")
    @GetMapping("/getGridCloumnNames")
    public Envelop getGridCloumnNames(String dictId) {
        Envelop envelop = new Envelop();
        Map<String, Object> params = new HashMap<>();
@@ -66,7 +67,7 @@ public class ResourceViewController extends EnvelopRestEndpoint {
        }
    }
    @RequestMapping("/searchDictEntryList")
    @GetMapping("/searchDictEntryList")
    public Envelop getDictEntryList(String dictId) {
        List<MRsColumnsModel> rsBrowseModelList = new ArrayList<>();
        try {

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

@@ -1,6 +1,5 @@
package com.yihu.jw.basic.agadmin.controller.resource;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.basic.resource.model.RsCategoryTypeTreeModel;
import com.yihu.jw.basic.resource.service.RsResourceCategoryService;
import com.yihu.jw.entity.ehr.id.BizObject;
@@ -17,9 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
 * 视图分类控制器
@@ -84,8 +81,7 @@ public class RsResourceCategoryController extends EnvelopRestEndpoint {
     */
    private List<RsCategoryTypeTreeModel> getRsCategoryTreeModelChild(List<RsResourceCategory> info) {
        List<RsCategoryTypeTreeModel> treeInfo = new ArrayList<>();
        for (int i = 0; i < info.size(); i++) {
            RsResourceCategory typeInfo = info.get(i);
        for (RsResourceCategory typeInfo : info) {
            RsCategoryTypeTreeModel tree = convertToModel(typeInfo, RsCategoryTypeTreeModel.class);
            List<RsResourceCategory> categoryListChild = rsCategoryService.getRsCategoryByPid(typeInfo.getId());
            List<RsCategoryTypeTreeModel> listChildTree = getRsCategoryTreeModelChild(categoryListChild);
@@ -98,8 +94,6 @@ public class RsResourceCategoryController extends EnvelopRestEndpoint {
    /**
     * 递归不满足的父级类别集合的子集中满足条件TreeModel集合的方法
     * @param mRsCategories 不符合的父级类别的集合
     * @param name
     * @return
     */
    private List<RsCategoryTypeTreeModel> getRsCategoryTreeModelByName(List<RsResourceCategory> mRsCategories, String name) throws ParseException {
        //结构：treeList 包含treeModel，treeModel包含listOfParent
@@ -137,19 +131,15 @@ public class RsResourceCategoryController extends EnvelopRestEndpoint {
    /**
     * 新增或者更新
     * @param dataJson
     * @return
     */
    @RequestMapping("/saveCateType")
    public Envelop SaveCdaType(String dataJson) {
        Map<String,Object> params = new HashMap<>();
        String url = "/resources/category/update";
        try {
            RsResourceCategory rsCategory = toEntity(dataJson, RsResourceCategory.class);
            if(StringUtils.isEmpty(rsCategory.getName())){
                return failed("类别名称不能为空！");
            }
            params.put("resourceCategory",dataJson);
            if(StringUtils.isNotBlank(rsCategory.getId())) {
                rsCategoryService.createOrUpdRsCategory(rsCategory);
            }else{
@@ -165,12 +155,9 @@ public class RsResourceCategoryController extends EnvelopRestEndpoint {
    /**
     * 删除
     * @param id
     * @return
     */
    @RequestMapping("/delteCateTypeInfo")
    public Envelop delteCdaTypeInfo(String id) {
        Envelop result = new Envelop();
        if (StringUtils.isEmpty(id)){
            return failed("请选择要删除的数据");
        }
@@ -186,14 +173,9 @@ public class RsResourceCategoryController extends EnvelopRestEndpoint {
    /**
     * 删除辅助接口，如有下级分类，前端给出不可删除警告
     * @param id
     * @return
     */
    @RequestMapping("/getCateTypeByPid")
    public Envelop getCateTypeByPid(String id) {
        Envelop envelop = new Envelop();
        ObjectMapper mapper = new ObjectMapper();
        Map<String,Object> params = new HashMap<>();
        String url = "/resources/categories/pid/";
        try {
            List<RsResourceCategory> categoryList = rsCategoryService.getRsCategoryByPid(id);
@@ -206,12 +188,9 @@ public class RsResourceCategoryController extends EnvelopRestEndpoint {
    /**
     * 根据ID查找分类信息
     * @param strIds
     * @return
     */
    @RequestMapping("/getCateTypeById")
    public ObjEnvelop getCdaTypeById(String strIds) {
        Envelop envelop = new Envelop();
    public Envelop getCdaTypeById(String strIds) {
        String url = "/resources/category/" + strIds;
        try{
            RsResourceCategory rsResourceCategory = rsCategoryService.getRsCategoryById(strIds);
@@ -224,16 +203,12 @@ public class RsResourceCategoryController extends EnvelopRestEndpoint {
    /**
     * 获取可以作为父类别的cate类别列表
     * @param strId
     * @return
     */
    @RequestMapping("/getCateTypeExcludeSelfAndChildren")
    public Envelop getCdaTypeExcludeSelfAndChildren(String strId) {
        //页面新增修改访问的是同个接口
        Envelop envelop = new Envelop();
        try {
            String urlGetAll =  "/resources/categories/all";
            Map<String,Object> params = new HashMap<>();
            List<RsResourceCategory> resources;
            if(!StringUtils.isEmpty(strId)){
                List<RsResourceCategory> parentTypes = rsCategoryService.getRsCategoryByPid(strId);
@@ -251,12 +226,11 @@ public class RsResourceCategoryController extends EnvelopRestEndpoint {
    }
    private String getChildIncludeSelfByParentsAndChildrenIds(List<RsResourceCategory> parentTypes,String childrenIds) {
        for (int i = 0; i < parentTypes.size(); i++) {
            RsResourceCategory typeInfo = parentTypes.get(i);
            childrenIds+=typeInfo.getId()+",";
        for (RsResourceCategory typeInfo : parentTypes) {
            childrenIds += typeInfo.getId() + ",";
            List<RsResourceCategory> listChild = rsCategoryService.getRsCategoryByPid(typeInfo.getId());
            if(listChild.size()>0){
                childrenIds = getChildIncludeSelfByParentsAndChildrenIds(listChild,childrenIds);
            if (listChild.size() > 0) {
                childrenIds = getChildIncludeSelfByParentsAndChildrenIds(listChild, childrenIds);
            }
        }
        return childrenIds;

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

@@ -11,11 +11,10 @@ import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
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.web.bind.annotation.*;
import java.util.ArrayList;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -29,7 +28,7 @@ import java.util.Map;
@Api( tags = {"网关-资源适配管理"})
public class SchemeAdaptController extends EnvelopRestEndpoint {
    @Autowired
    @Resource
    private RsAdapterSchemeService schemaService;
    public static final String SCHEME_PLATFORM="1";//平台类型
@@ -70,13 +69,9 @@ public class SchemeAdaptController extends EnvelopRestEndpoint {
    }
    /**
     * 资源适配：新增、修改窗口
     * @param mode
     * @return
     */
    @GetMapping("gotoModify")
    public Object adapterSchemeTemplate(String id,String mode) {
        String resultStr = "";
        Envelop result = new Envelop();
        Map<String, Object> params = new HashMap<>();
        params.put("id",id);
        try {
@@ -93,14 +88,9 @@ public class SchemeAdaptController extends EnvelopRestEndpoint {
    /**
     * 资源适配：新增、修改窗口
     * @param dataJson
     * @return
     */
    @PostMapping("save")
    public Object updateSchemeAdpat(String dataJson) {
        Envelop result = new Envelop();
        String resultStr = "";
        Map<String, Object> params = new HashMap<>();
    public Envelop updateSchemeAdpat(String dataJson) {
        try{
            RsAdapterScheme mRsAdapterSchema = toEntity(dataJson, RsAdapterScheme.class);
            if (StringUtils.isEmpty(mRsAdapterSchema.getType())) {
@@ -112,13 +102,12 @@ public class SchemeAdaptController extends EnvelopRestEndpoint {
            if (StringUtils.isEmpty(mRsAdapterSchema.getCode())) {
                return failed("方案编码不能为空");
            }
            if (StringUtils.isEmpty(mRsAdapterSchema.getAdapterVersion())&&this.SCHEME_PLATFORM.equals(mRsAdapterSchema.getType())) {
            if (StringUtils.isEmpty(mRsAdapterSchema.getAdapterVersion())&& SCHEME_PLATFORM.equals(mRsAdapterSchema.getType())) {
                return failed("版本号不能为空");
            }
            if(StringUtils.isEmpty(mRsAdapterSchema.getAdapterVersion())&&this.SCHEME_TP.equals(mRsAdapterSchema.getType())){
            if(StringUtils.isEmpty(mRsAdapterSchema.getAdapterVersion())&& SCHEME_TP.equals(mRsAdapterSchema.getType())){
                return failed("标准名称不能为空！");
            }
            params.put("adapterSchema",toJson(mRsAdapterSchema));
            String url = ServiceApi.Adaptions.Schemes;
            if(StringUtils.isNotBlank(mRsAdapterSchema.getId())){
                schemaService.save(mRsAdapterSchema);
@@ -134,8 +123,7 @@ public class SchemeAdaptController extends EnvelopRestEndpoint {
    }
    @PostMapping("delete")
    public Object deleteScheme(String schemeId) {
        Envelop result = new Envelop();
    public Envelop deleteScheme(String schemeId) {
        String url = "/adaptions/schemas/"+schemeId;
        try{
            schemaService.deleteById(schemeId);

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

@@ -12,14 +12,11 @@ import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
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.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.HashMap;
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
/**
 * 资源适配管理方案适配管理
@@ -31,17 +28,14 @@ import java.util.Map;
@Api( tags = {"网关-资源适配管理方案适配管理"})
public class SchemeAdaptDataSetController extends EnvelopRestEndpoint {
    @Autowired
    @Resource
    private RsAdapterSchemeService schemaService;
    @Autowired
    @Resource
    private RsAdapterMetadataService metadataService;
    @GetMapping("/initial")
    public Envelop gotoList(String dataModel,String version){
        String url = "/adaptions/schemas/"+dataModel;
        String resultStr = "";
        Envelop result = new Envelop();
        Map<String, Object> params = new HashMap<>();
        try {
            return ObjEnvelop.getSuccess("查询成功",schemaService.getAdapterSchemeById(dataModel));
        }catch (Exception e){
@@ -51,8 +45,7 @@ public class SchemeAdaptDataSetController extends EnvelopRestEndpoint {
    }
    @GetMapping("/metaDataList")
    public Object searchmetaData(String adapterSchemeId, String code, int page, int rows) {
        Envelop envelop = new Envelop();
    public Envelop searchmetaData(String adapterSchemeId, String code, int page, int rows) {
        StringBuffer stringBuffer = new StringBuffer();
        if(StringUtils.isNotBlank(adapterSchemeId)){
            stringBuffer.append("schemeId=").append(adapterSchemeId).append(";");
@@ -89,16 +82,10 @@ public class SchemeAdaptDataSetController extends EnvelopRestEndpoint {
    /**
     * 资源适配：新增、修改窗口
     * @param dataJson
     * @return
     */
    @PostMapping("save")
    public Object updatesSchemeAdpatDataset(String dataJson) {
        Envelop result = new Envelop();
        String resultStr = "";
        Map<String, Object> params = new HashMap<>();
    public Envelop updatesSchemeAdpatDataset(String dataJson) {
        try{
            params.put("adapterMetadata",dataJson);
            String url = ServiceApi.Adaptions.SchemaMetadataList;
            RsAdapterMetadata metadata = toEntity(dataJson,RsAdapterMetadata.class);
            metadata = metadataService.saveAdapterMetadata(metadata);

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

@@ -3,7 +3,6 @@ package com.yihu.jw.basic.agadmin.controller.resource;
import com.yihu.jw.basic.resource.service.RsAdapterDictionaryService;
import com.yihu.jw.entity.ehr.resource.RsAdapterDictionary;
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;
@@ -12,10 +11,7 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
 *
@@ -32,8 +28,6 @@ public class SchemeAdaptDictController extends EnvelopRestEndpoint {
    @GetMapping("/dictlist")
    public Object searchmetaData(String adapterSchemeId, String code, int page, int rows) {
        Envelop envelop = new Envelop();
        Map<String, Object> params = new HashMap<String, Object>();
        StringBuffer stringBuffer = new StringBuffer();
        if(StringUtils.isNotBlank(adapterSchemeId)){
            stringBuffer.append("schemeId=").append(adapterSchemeId).append(";");
@@ -43,18 +37,11 @@ public class SchemeAdaptDictController extends EnvelopRestEndpoint {
        if(StringUtils.isNotBlank(code)){
            stringBuffer.append("srcDictCode=").append(code).append(" g1").append(";");
        }
        params.put("filters", "");
        params.put("page", page);
        params.put("size", rows);
        String filters = stringBuffer.toString();
        if(filters.lastIndexOf(";")>0){
            filters = filters.substring(0,filters.lastIndexOf(";"));
        }
        if (!StringUtils.isEmpty(filters)) {
            params.put("filters", filters);
        }
        try {
            String resultStr ="";
            String url = "/adaptions/adapter/dictionaries";
            List<RsAdapterDictionary> adapterDictionaries = adapterDictionaryService.search(null, filters, null, page, rows);
            return PageEnvelop.getSuccessListWithPage("查询成功",adapterDictionaries,page,rows,adapterDictionaryService.getCount(filters));
@@ -66,17 +53,10 @@ public class SchemeAdaptDictController extends EnvelopRestEndpoint {
    /**
     * 资源适配：新增、修改窗口
     * @param model
     * @param dataJson
     * @return
     */
    @PostMapping("/save")
    public Object updatesSchemeAdpatDict(String dataJson) {
        Envelop result = new Envelop();
        String resultStr = "";
        Map<String, Object> params = new HashMap<>();
        try{
            params.put("jsonData",dataJson);
            String url = "/adaptions/adapter/dictionaries";
            RsAdapterDictionary adapterDictionary = toEntity(dataJson, RsAdapterDictionary.class);
            adapterDictionary = adapterDictionaryService.save(adapterDictionary);