代码修改

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

@@ -18,17 +18,14 @@ 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.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.*;
import java.util.Map;
/**
 * Created by zhangdan on 2018/4/17.
 */
@Controller
@RestController
@RequestMapping(ApiVersion.Version1_0)
@Api(value = "admin/surveyQuestion", description = "问题题库数据接口", tags = {"云门户-问卷调查"})
public class PortalSurveyQuestionAdminController extends EnvelopRestEndpoint {
@@ -39,7 +36,6 @@ public class PortalSurveyQuestionAdminController extends EnvelopRestEndpoint {
    private SurveyQuestionOptionService surveyQuestionOptionService;
    @RequestMapping(value = ServiceApi.SurveyAdminManage.GetSurveyQuestionList, method = RequestMethod.POST)
    @ResponseBody
    @ApiOperation(value = "问题列表数据")
    public Envelop searchQuestionList(
            @ApiParam(name = "title", value = "标题",defaultValue = "")
@@ -56,7 +52,6 @@ public class PortalSurveyQuestionAdminController extends EnvelopRestEndpoint {
    @RequestMapping(value = ServiceApi.SurveyAdminManage.SaveSurveyQuestion, method = RequestMethod.POST)
    @ResponseBody
    @ApiOperation(value = "新增问题（可批量新增）")
    public Envelop addQuestions(@ApiParam(name = "jsonData", value = "新增json",defaultValue = "")
                                @RequestParam(value = "jsonData", required = true) String jsonData)throws Exception {
@@ -66,7 +61,6 @@ public class PortalSurveyQuestionAdminController extends EnvelopRestEndpoint {
    }
    @RequestMapping(value =ServiceApi.SurveyAdminManage.GetQuestionById, method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "根据id获取单个问题")
    public Envelop getQuestion(@ApiParam(name = "id", value = "问题id",defaultValue = "1")
                               @RequestParam(value = "id", required = true) String id)throws Exception {
@@ -83,7 +77,6 @@ public class PortalSurveyQuestionAdminController extends EnvelopRestEndpoint {
    @RequestMapping(value = ServiceApi.SurveyAdminManage.GetQuestionsByIds, method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "根据ids获取多个问题")
    public ObjEnvelop getQuestions(@ApiParam(name = "ids", value = "问题ids",defaultValue = "1")
                              @RequestParam(value = "ids", required = true) String  ids)throws Exception {
@@ -92,7 +85,6 @@ public class PortalSurveyQuestionAdminController extends EnvelopRestEndpoint {
    }
    @RequestMapping(value = ServiceApi.SurveyAdminManage.DelQuestion, method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "根据id删除单个问题")
    public Envelop delQuestion(@ApiParam(name = "id", value = "问题id",defaultValue = "1")
                              @RequestParam(value = "id", required = true) String id)throws Exception {
@@ -101,7 +93,6 @@ public class PortalSurveyQuestionAdminController extends EnvelopRestEndpoint {
    }
    @RequestMapping(value = ServiceApi.SurveyAdminManage.DelQuestions, method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "批量删除")
    public Envelop delQuestions(@ApiParam(name = "ids", value = "问题ids",defaultValue = "1;2;3")
                              @RequestParam(value = "ids", required = true) String ids)throws Exception {
@@ -113,7 +104,6 @@ public class PortalSurveyQuestionAdminController extends EnvelopRestEndpoint {
    }
    /*@RequestMapping(value = ServiceApi.SurveyAdminManage.updateQuestion, method = RequestMethod.POST)
    @ResponseBody
    @ApiOperation(value = "更新问题")
    public Result updQuestion(@ApiParam(name = "questionData", value = "问题json",defaultValue = "{}")
                               @RequestParam(value = "questionData", required = true) String questionData) {

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

@@ -3,7 +3,6 @@ package com.yihu.jw.basic.portal.controller;
import com.yihu.jw.basic.dict.service.SystemDictEntryService;
import com.yihu.jw.basic.dict.service.SystemDictService;
import com.yihu.jw.basic.portal.service.SurveyTemplateService;
import com.yihu.jw.entity.ehr.user.User;
import com.yihu.ehr.constants.ApiVersion;
import com.yihu.ehr.constants.ServiceApi;
import com.yihu.jw.restmodel.web.ListEnvelop;
@@ -17,10 +16,8 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang3.StringUtils;
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.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
@@ -31,7 +28,7 @@ import java.util.Map;
/**
 * Created by zhangdan on 2018/4/13.
 */
@Controller
@RestController
@RequestMapping(ApiVersion.Version1_0)
@Api(value = "survey", description = "问卷/满意度调查后台配置问题和答案", tags = {"云门户-问卷调查后台配置"})
public class PortalSurveyTemplateAdminController extends EnvelopRestEndpoint {
@@ -44,25 +41,8 @@ public class PortalSurveyTemplateAdminController extends EnvelopRestEndpoint {
    @Autowired
    private SystemDictEntryService systemDictEntryService;
    private HttpServletRequest request;
    /*//---问卷模板管理列表---
    @RequestMapping(value = "initial", method = RequestMethod.GET)
    public String initTeamList(){
        return "questionnaire/template/template_list";
    }
    //跳转到问题查看页
    @RequestMapping(value = "importQuestion", method = RequestMethod.GET)
    @ApiIgnore
    @ApiOperation(value = "跳转到问题查看页")
    public String importQuestion() {
        return "questionnaire/template/import_question";
    }*/
    @RequestMapping(value = ServiceApi.SurveyAdminManage.GetSurveyTemplateList, method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "获取所有问卷模板列表", notes = "管理界面展示所有的模板问卷")
    public PageEnvelop list(
            @ApiParam(name = "title", value = "标题",defaultValue = "")
@@ -99,7 +79,6 @@ public class PortalSurveyTemplateAdminController extends EnvelopRestEndpoint {
    @RequestMapping(value = ServiceApi.SurveyAdminManage.GetSurveyTemplateOptionsList, method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "获取所有问题选项列表", notes = "管理界面展示所有的问题的选项")
    public PageEnvelop listOption(
            @ApiParam(name = "q", value = "标题",defaultValue = "")
@@ -147,7 +126,6 @@ public class PortalSurveyTemplateAdminController extends EnvelopRestEndpoint {
    @RequestMapping(value = ServiceApi.SurveyAdminManage.GetTemplateLabel, method = RequestMethod.POST)
    @ResponseBody
    @ApiOperation(value = "获取问卷类型", notes = "获取所有问卷类型")
    public Envelop getTemplateLabel(@ApiParam(name = "phoneticCode", value = "拼音编码", required = true)
                                         @PathVariable(value = "phoneticCode") String phoneticCode){
@@ -172,7 +150,6 @@ public class PortalSurveyTemplateAdminController extends EnvelopRestEndpoint {
    //---保存标签---
    @RequestMapping(value = ServiceApi.SurveyAdminManage.SaveLabelInfo, method = RequestMethod.POST)
    @ResponseBody
    @ApiOperation(value = "保存标签", notes = "保存标签")
    public Envelop editLabel(@ApiParam(name = "模板id", value = "模板id",defaultValue = "0") @RequestParam(value = "templateId", required = true) String templateId,
                            @ApiParam(name = "标签JSON", value = "标签JSON",defaultValue = "") @RequestParam(value = "jsonData", required = true) String jsonData)throws Exception{
@@ -181,7 +158,6 @@ public class PortalSurveyTemplateAdminController extends EnvelopRestEndpoint {
    }
    @RequestMapping(value = ServiceApi.SurveyAdminManage.SaveTemplate, method = RequestMethod.POST)
    @ResponseBody
    @ApiOperation(value = "保存问卷模板", notes = "保存问卷模板")
    public Envelop saveTemplate(@ApiParam(name = "jsonData", value = "新增json",defaultValue = "") @RequestParam(value = "jsonData", required = true) String jsonData,
                               @ApiParam(name = "userId", value = "用户id",defaultValue = "") @RequestParam(value = "userId", required = false) String userId,
@@ -192,7 +168,6 @@ public class PortalSurveyTemplateAdminController extends EnvelopRestEndpoint {
    @RequestMapping(value = ServiceApi.SurveyAdminManage.GetTemplateById, method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "根据id获取模板详情", notes = "根据id获取模板详情")
    public Envelop getTemplate(@ApiParam(name = "id", value = "模板id",defaultValue = "0") @RequestParam(value = "id", required = true) String id,
                              @ApiParam(name = "question", value = "是否加载问题",defaultValue = "0") @RequestParam(value = "question", required = false) String question,
@@ -202,14 +177,12 @@ public class PortalSurveyTemplateAdminController extends EnvelopRestEndpoint {
    }
    @RequestMapping(value = "/template/title", method = RequestMethod.GET)
    @ResponseBody
    public Envelop getTemplate(@ApiParam(name = "title", value = "模板title",defaultValue = "")
                              @RequestParam(value = "title", required = true) String  title){
        return success(surveyTemplateService.findByTitle(title));
    }
    @RequestMapping(value = ServiceApi.SurveyAdminManage.DelTemplate, method = RequestMethod.POST)
    @ResponseBody
    @ApiOperation(value = "根据id删除模板", notes = "根据id删除模板")
    public Envelop delete(@ApiParam(name = "模板ID", value = "模板ID",defaultValue = "0") @RequestParam(value = "templateId", required = true) String templateId)throws Exception{
        surveyTemplateService.deleteTemplate(Long.valueOf(templateId));

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

@@ -2,9 +2,6 @@ package com.yihu.jw.basic.standard.controller;
import com.yihu.jw.basic.standard.service.adapter.AdapterDatasetService;
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.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -12,31 +9,21 @@ import io.swagger.annotations.ApiParam;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.io.UnsupportedEncodingException;
/**
 * Created by LLH on 2016/1/6.
 */
@RestController("AdapterDatasetController")
@RequestMapping("/adapterCenter")
@Api(protocols = "https", value = "AdapterDatasetController", description = "适配数据集管理", tags = {"适配数据集"})
@Api(protocols = "https", value = "AdapterDatasetController",  tags = {"适配数据集"})
public class AdapterDatasetController extends EnvelopRestEndpoint {
    @Resource(name = AdapterDatasetService.BEAN_ID)
    private AdapterDatasetService datasetService;
    /**
     * 查询数据集列表信息（get）
     * @param adapterVersion
     * @param condition
     * @param order
     * @param rows
     * @param page
     * @return
     * @throws Exception
     */
    @GetMapping(value = "/searchDatasetList")
    @ApiOperation(value = "获取数据集列表", produces = "application/json", notes = "获取数据集列表")
    public PageEnvelop getDatasetList(
    public Envelop getDatasetList(
            @ApiParam(name = "adapterVersion", value = "适配方案版本号")
            @RequestParam(value = "adapterVersion") String adapterVersion,
            @ApiParam(name = "condition", value = "查询条件：编码或名称")
@@ -53,7 +40,7 @@ public class AdapterDatasetController extends EnvelopRestEndpoint {
    @GetMapping("/getForDatasetId")
    @ApiOperation(value = "获取适配数据集", produces = "application/json", notes = "获取适配数据集")
    public ObjEnvelop getForDatasetId(
    public Envelop getForDatasetId(
            @ApiParam(name = "adapterVersion", value = "适配版本号")
            @RequestParam(value = "adapterVersion") String adapterVersion,
            @ApiParam(name = "datasetId", value = "适配数据集ID")
@@ -74,7 +61,7 @@ public class AdapterDatasetController extends EnvelopRestEndpoint {
    @PostMapping(value = "/updateDataset")
    @ApiOperation(value = "修改适配数据集", produces = "application/json", notes = "修改适配数据集")
    public ObjEnvelop modify(
    public Envelop modify(
            @ApiParam(name = "adapterVersion", value = "适配版本号")
            @RequestParam(value = "adapterVersion") String adapterVersion,
            @ApiParam(name = "dataset", value = "数据集,JSON")
@@ -84,7 +71,7 @@ public class AdapterDatasetController extends EnvelopRestEndpoint {
    @PostMapping(value = "/addDataset")
    @ApiOperation(value = "保存适配数据集", produces = "application/json", notes = "保存数据集")
    public ObjEnvelop add(
    public Envelop add(
            @ApiParam(name = "adapterVersion", value = "适配版本号")
            @RequestParam(value = "adapterVersion") String adapterVersion,
            @ApiParam(name = "dataset", value = "数据集信息")
@@ -94,7 +81,7 @@ public class AdapterDatasetController extends EnvelopRestEndpoint {
    @GetMapping(value = "/getAdapterDataset")
    @ApiOperation(value = "获取定制数据集列表",  responseContainer = "List",produces = "application/json", notes = "获取数据集列表")
    public ListEnvelop getDatasetCustomize(
    public Envelop getDatasetCustomize(
            @ApiParam(name = "adapterVersion", value = "适配版本号")
            @RequestParam(value = "adapterVersion") String adapterVersion,
            @ApiParam(name = "stdVersion", value = "标准版本号")
@@ -114,7 +101,7 @@ public class AdapterDatasetController extends EnvelopRestEndpoint {
            @ApiParam(name = "datasetIdStr", value = "适配数据集信息")
            @RequestParam(value = "datasetIdStr") String datasetIdStr,
            @ApiParam(name = "metaDataIdStr", value = "适配数据元信息")
            @RequestParam(value = "metaDataIdStr") String metaDataIdStr) throws UnsupportedEncodingException {
            @RequestParam(value = "metaDataIdStr") String metaDataIdStr){
        return datasetService.updateCustomize(schemeId, adapterVersion, stdVersion, datasetIdStr,metaDataIdStr);
    }
}

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

@@ -4,7 +4,6 @@ import com.yihu.jw.basic.standard.match.dictionary.DictItemStrategyExecute;
import com.yihu.jw.basic.standard.service.adapter.AdapterDictService;
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 io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -18,24 +17,15 @@ import javax.annotation.Resource;
 */
@RestController("AdapterDictController")
@RequestMapping("/adapterCenter")
@Api(protocols = "https", value = "AdapterDictController", description = "适配字典管理", tags = {"适配字典"})
@Api(protocols = "https", value = "AdapterDictController", tags = {"适配字典"})
public class AdapterDictController extends EnvelopRestEndpoint {
    @Resource(name = AdapterDictService.BEAN_ID)
    private AdapterDictService dictService;
    /**
     * 查询字典列表信息（get）
     * @param adapterVersion
     * @param condition
     * @param order
     * @param rows
     * @param page
     * @return
     * @throws Exception
     */
    @GetMapping(value = "/searchDictList")
    @ApiOperation(value = "获取字典列表", produces = "application/json", notes = "获取字典列表")
    public PageEnvelop searchDictList(
    public Envelop searchDictList(
            @ApiParam(name = "adapterVersion", value = "适配标准版本号")
            @RequestParam(value = "adapterVersion") String adapterVersion,
            @ApiParam(name = "condition", value = "查询条件：编码或名称")
@@ -51,7 +41,7 @@ public class AdapterDictController extends EnvelopRestEndpoint {
    @GetMapping(value = "/getForDictId")
    @ApiOperation(value = "获取字典", produces = "application/json", notes = "获取字典")
    public ObjEnvelop get(
    public Envelop get(
            @ApiParam(name = "adapterVersion", value = "标准版本号")
            @RequestParam(value = "adapterVersion") String adapterVersion,
            @ApiParam(name = "dictId", value = "字典ID")
@@ -71,7 +61,7 @@ public class AdapterDictController extends EnvelopRestEndpoint {
    
    @PostMapping(value = "/updateDict")
    @ApiOperation(value = "修改字典", produces = "application/json", notes = "修改字典")
    public ObjEnvelop updateDict(
    public Envelop updateDict(
            @ApiParam(name = "adapterVersion", value = "标准版本号")
            @RequestParam(value = "adapterVersion") String adapterVersion,
            @ApiParam(name = "dict", value = "字典")
@@ -81,7 +71,7 @@ public class AdapterDictController extends EnvelopRestEndpoint {
    @PostMapping(value = "/addDict")
    @ApiOperation(value = "保存字典", produces = "application/json", notes = "保存字典")
    public ObjEnvelop addDict(
    public Envelop addDict(
            @ApiParam(name = "adapterVersion", value = "标准版本号")
            @RequestParam(value = "adapterVersion") String adapterVersion,
            @ApiParam(name = "dict", value = "字典")
@@ -101,13 +91,7 @@ public class AdapterDictController extends EnvelopRestEndpoint {
        }
    }
    /**
     * 智能匹配
     *
     * @param version
     * @return
     * @throws Exception
     */
    @RequestMapping(value = "/strategyDic", method = RequestMethod.POST)
    @ApiOperation(value = "智能匹配", produces = "application/json", notes = "智能匹配")
    public Envelop strategyDic(

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

@@ -2,9 +2,6 @@ package com.yihu.jw.basic.standard.controller;
import com.yihu.jw.basic.standard.service.adapter.AdapterDictEntryService;
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.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -18,24 +15,15 @@ import javax.annotation.Resource;
 */
@RestController("AdapterDictEntryController")
@RequestMapping("/adapterCenter")
@Api(protocols = "https", value = "AdapterDictEntryController", description = "适配字典项管理", tags = {"适配字典项"})
@Api(protocols = "https", value = "AdapterDictEntryController",  tags = {"适配字典项"})
public class AdapterDictEntryController extends EnvelopRestEndpoint {
    @Resource(name = AdapterDictEntryService.BEAN_ID)
    private AdapterDictEntryService dictentryService;
    /**
     * 查询字典项列表信息（get）
     * @param adapterVersion
     * @param condition
     * @param order
     * @param rows
     * @param page
     * @return
     * @throws Exception
     */
    @GetMapping(value = "/searchDictEntryList")
    @ApiOperation(value = "获取字典项列表",  produces = "application/json", notes = "获取字典项列表")
    public PageEnvelop getDictEntryList(
    public Envelop getDictEntryList(
            @ApiParam(name = "adapterVersion", value = "适配版本号")
            @RequestParam(value = "adapterVersion") String adapterVersion,
            @ApiParam(name = "condition", value = "查询条件")
@@ -45,13 +33,13 @@ public class AdapterDictEntryController extends EnvelopRestEndpoint {
            @ApiParam(name = "rows", value = "Limit the size of result set. Must be an integer")
            @RequestParam(value = "rows", required = false) Integer rows,
            @ApiParam(name = "page", value = "Start position of result set. Must be an integer")
            @RequestParam(value = "page", required = false) Integer page) throws Exception{
            @RequestParam(value = "page", required = false) Integer page){
        return dictentryService.getDetailResult(adapterVersion, condition, order, rows, page);
    }
    @GetMapping(value = "/getForDictEntryId")
    @ApiOperation(value = "获取字典项",  produces = "application/json", notes = "获取字典项")
    public ObjEnvelop get(
    public Envelop get(
            @ApiParam(name = "adapterVersion", value = "标准版本号")
            @RequestParam(value = "adapterVersion") String adapterVersion,
            @ApiParam(name = "dictEntryId", value = "字典项ID")
@@ -61,7 +49,7 @@ public class AdapterDictEntryController extends EnvelopRestEndpoint {
    @PostMapping(value = "/updateDictEntry")
    @ApiOperation(value = "修改字典项", produces = "application/json", notes = "修改字典项")
    public ObjEnvelop updateDictEntry(
    public Envelop updateDictEntry(
            @ApiParam(name = "adapterVersion", value = "标准版本号")
            @RequestParam(value = "adapterVersion") String adapterVersion,
            @ApiParam(name = "dictEntry", value = "字典项")
@@ -71,7 +59,7 @@ public class AdapterDictEntryController extends EnvelopRestEndpoint {
    @PostMapping(value = "/addDictEntry")
    @ApiOperation(value = "保存字典项", produces = "application/json", notes = "保存字典项")
    public ObjEnvelop add(
    public Envelop add(
            @ApiParam(name = "adapterVersion", value = "标准版本号")
            @RequestParam(value = "adapterVersion") String adapterVersion,
            @ApiParam(name = "dictEntry", value = "字典项")
@@ -81,7 +69,7 @@ public class AdapterDictEntryController extends EnvelopRestEndpoint {
    @PostMapping("/updateDictEntrys")
    @ApiOperation(value = "保存字典项",  produces = "application/json", notes = "保存数据元")
    public ListEnvelop updateDictEntrys(
    public Envelop updateDictEntrys(
            @ApiParam(name = "adapterVersion", value = "标准版本号")
            @RequestParam(value = "adapterVersion") String adapterVersion,
            @ApiParam(name = "list", value = "字典项列表")

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

@@ -5,9 +5,7 @@ import com.yihu.jw.basic.standard.service.adapter.AdapterDatasetService;
import com.yihu.jw.basic.standard.service.adapter.AdapterMetadataService;
import com.yihu.jw.basic.standard.service.bo.AdapterVersion;
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.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -21,7 +19,7 @@ import javax.annotation.Resource;
 */
@RestController("AdapterMetadataController")
@RequestMapping("/adapterCenter")
@Api(protocols = "https", value = "AdapterMetadataController", description = "适配字典管理", tags = {"适配字典"})
@Api(protocols = "https", value = "AdapterMetadataController",  tags = {"适配字典"})
public class AdapterMetadataController extends EnvelopRestEndpoint {
    @Resource(name = AdapterMetadataService.BEAN_ID)
    private AdapterMetadataService metadataService;
@@ -30,7 +28,7 @@ public class AdapterMetadataController extends EnvelopRestEndpoint {
    @GetMapping("/searchMetadataList")
    @ApiOperation(value = "查询数据元列表信息",  produces = "application/json", notes = "获取数据元列表")
    public PageEnvelop getMetadataList(
    public Envelop getMetadataList(
            @ApiParam(name = "adapterVersion", value = "标准版本号")
            @RequestParam(value = "adapterVersion") String adapterVersion,
            @ApiParam(name = "condition", value = "查询条件")
@@ -46,7 +44,7 @@ public class AdapterMetadataController extends EnvelopRestEndpoint {
    @GetMapping("/getForMetadataId")
    @ApiOperation(value = "获取数据元", produces = "application/json", notes = "获取数据元")
    public ObjEnvelop get(
    public Envelop get(
            @ApiParam(name = "adapterVersion", value = "标准版本号")
            @RequestParam(value = "adapterVersion") String adapterVersion,
            @ApiParam(name = "metadataId", value = "数据元ID")
@@ -57,7 +55,7 @@ public class AdapterMetadataController extends EnvelopRestEndpoint {
    @PostMapping("/updateMetadata")
    @ApiOperation(value = "修改数据元",  produces = "application/json", notes = "修改数据元")
    public ObjEnvelop updateMetadata(
    public Envelop updateMetadata(
            @ApiParam(name = "adapterVersion", value = "标准版本号")
            @RequestParam(value = "adapterVersion") String adapterVersion,
            @ApiParam(name = "metadata", value = "数据元")
@@ -67,7 +65,7 @@ public class AdapterMetadataController extends EnvelopRestEndpoint {
    @PostMapping("/addMetadata")
    @ApiOperation(value = "保存数据元",  produces = "application/json", notes = "保存数据元")
    public ObjEnvelop addMetadata(
    public Envelop addMetadata(
            @ApiParam(name = "adapterVersion", value = "标准版本号")
            @RequestParam(value = "adapterVersion") String adapterVersion,
            @ApiParam(name = "metadata", value = "数据元")
@@ -77,7 +75,7 @@ public class AdapterMetadataController extends EnvelopRestEndpoint {
    @PostMapping("/updateMetadatas")
    @ApiOperation(value = "修改数据元",  produces = "application/json", notes = "保存数据元")
    public ListEnvelop updateMetadatas(
    public Envelop updateMetadatas(
            @ApiParam(name = "adapterVersion", value = "标准版本号")
            @RequestParam(value = "adapterVersion") String adapterVersion,
            @ApiParam(name = "list", value = "数据元列表")
@@ -112,13 +110,7 @@ public class AdapterMetadataController extends EnvelopRestEndpoint {
        }
    }
    /**
     * 智能匹配
     *
     * @param version
     * @return
     * @throws Exception
     */
    @RequestMapping(value = "/strategy", method = RequestMethod.POST)
    @ApiOperation(value = "智能匹配", produces = "application/json", notes = "智能匹配")
    public Envelop strategy(

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

@@ -1,7 +1,7 @@
package com.yihu.jw.basic.standard.controller;
import com.yihu.jw.basic.standard.service.adapter.AdapterDictService;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -18,7 +18,7 @@ import javax.annotation.Resource;
 */
@RestController("InitController")
@RequestMapping("/init")
@Api(protocols = "https", value = "AdapterDictController", description = "适配字典管理", tags = {"适配字典"})
@Api(protocols = "https", value = "AdapterDictController", tags = {"适配字典管理"})
public class InitController extends EnvelopRestEndpoint {
    @Resource(name = AdapterDictService.BEAN_ID)
@@ -26,7 +26,7 @@ public class InitController extends EnvelopRestEndpoint {
    @GetMapping(value = "/searchDictList")
    @ApiOperation(value = "获取字典列表",  produces = "application/json", notes = "获取字典列表")
    public PageEnvelop searchDictList(
    public Envelop searchDictList(
            @ApiParam(name = "adapterVersion", value = "适配标准版本号")
            @RequestParam(value = "adapterVersion") String adapterVersion,
            @ApiParam(name = "condition", value = "查询条件：编码或名称")

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

@@ -1,8 +1,7 @@
package com.yihu.jw.basic.standard.controller;
import com.yihu.jw.basic.standard.service.standard.StdPublisherService;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -19,20 +18,15 @@ import javax.annotation.Resource;
 */
@RestController("PublisherController")
@RequestMapping("/standardCenter")
@Api(protocols = "https", value = "PublisherController", description = "发布者管理", tags = {"发布者"})
@Api(protocols = "https", value = "PublisherController", tags = {"发布者管理"})
public class PublisherController extends EnvelopRestEndpoint {
    @Resource(name = StdPublisherService.BEAN_ID)
    private StdPublisherService stdPublisherService;
    /**
     * 根据标准ID获取发布机构（get）
     * @param publisherId
     * @return
     * @throws Exception
     */
    @GetMapping(value = "/getForPublisherId")
    @ApiOperation(value = "获取发布机构",  produces = "application/json", notes = "获取发布机构")
    public ObjEnvelop get(
    @ApiOperation(value = "根据标准ID获取发布机构",  produces = "application/json", notes = "获取发布机构")
    public Envelop get(
            @ApiParam(name = "publisherId", value = "机构ID")
            @RequestParam(value = "publisherId") String publisherId) {
        return stdPublisherService.get(publisherId);
@@ -40,18 +34,14 @@ public class PublisherController extends EnvelopRestEndpoint {
    @GetMapping(value = "/getStandardPublisher")
    @ApiOperation(value = "获取发布机构",  produces = "application/json", notes = "获取发布机构")
    public ObjEnvelop getStandardPublisher(){
    public Envelop getStandardPublisher(){
        return stdPublisherService.getStandardPublisher();
    }
    /**
     * 获取发布机构名称列表
     * @return
     * @throws Exception
     */
    @GetMapping(value = "/getPublishers")
    @ApiOperation(value = "获取发布机构列表",  produces = "application/json", notes = "获取发布机构列表")
    public ListEnvelop getPublishers(
    public Envelop getPublishers(
            @ApiParam(name = "condition", value = "Must be Json")
            @RequestParam(value = "condition", required = false) String condition,
            @ApiParam(name = "order", value = "Must be Json")

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

@@ -13,8 +13,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.beanutils.BeanUtils;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -26,25 +24,19 @@ import java.util.List;
 * 质控规则管理
 *
 * @author CD
 * @vsrsion 1.0
 * Created at 2017/05/05.
 */
@RequestMapping("/rule")
@RestController
@Api(description = "质控规则接口", tags = {"质控规则--质控规则接口"})
@Api( tags = {"质控规则管理--质控规则接口"})
public class RuleController extends EnvelopRestEndpoint {
    @Resource(name = RuleService.BEAN_ID)
    private RuleService ruleService;
    /**
     * 新增质控规则s信息
     *
     * @param request
     * @return
     */
    @ApiOperation(value = "新增质控规则信息")
    @RequestMapping("addRule")
    @ResponseBody
    public Result addRule(HttpServletRequest request) {
        try {
            RuleModel obj = new RuleModel();
@@ -63,7 +55,6 @@ public class RuleController extends EnvelopRestEndpoint {
     * @return
     */
    @RequestMapping("/deleteRule")
    @ResponseBody
    public Result deleteRule(HttpServletRequest request) {
        try {
@@ -84,7 +75,6 @@ public class RuleController extends EnvelopRestEndpoint {
     * @return
     */
    @RequestMapping("/deleteRuleBatch")
    @ResponseBody
    public Result deleteRuleBatch(HttpServletRequest request) {
        try {
            String idList = request.getParameter("idList");
@@ -106,7 +96,6 @@ public class RuleController extends EnvelopRestEndpoint {
     * 修改质控规则信息
     */
    @RequestMapping("updateRule")
    @ResponseBody
    public Result updateRule(HttpServletRequest request) {
        try {
            RuleModel obj = new RuleModel();
@@ -124,7 +113,6 @@ public class RuleController extends EnvelopRestEndpoint {
     */
    @ApiOperation(" 根据数集ID&数据元编码绑定质控规则")
    @RequestMapping(value = "bindQcRule", method = RequestMethod.POST)
    @ResponseBody
    public Envelop bindQcRule(
            @RequestParam(name = "stdVersion") String stdVersion,
            @RequestParam(name = "stdDataSetId") Long stdDataSetId,
@@ -147,7 +135,6 @@ public class RuleController extends EnvelopRestEndpoint {
     */
    @ApiOperation("根据数据元编码批量绑定质控规则")
    @RequestMapping(value = "bindQcRuleBatch", method = RequestMethod.POST)
    @ResponseBody
    public Envelop bindQcRuleBatch(
            @RequestParam(name = "stdVersion") String stdVersion,
            @RequestParam(name = "dataElement") String dataElement,
@@ -170,7 +157,6 @@ public class RuleController extends EnvelopRestEndpoint {
     */
    @ApiOperation(" 根据数集编码&数据元编码绑定质控规则")
    @RequestMapping(value = "bindQcRuleByCode", method = RequestMethod.POST)
    @ResponseBody
    public Envelop bindQcRule(
            @RequestParam(name = "stdVersion") String stdVersion,
            @RequestParam(name = "stdDataSetCode") String stdDataSetCode,
@@ -194,7 +180,6 @@ public class RuleController extends EnvelopRestEndpoint {
     * 获取绑定质控规则
     */
    @RequestMapping(value = "bindQcRule", method = RequestMethod.GET)
    @ResponseBody
    public Envelop getBindQcRule(
            @RequestParam(name = "stdVersion") String stdVersion,
            @RequestParam(name = "stdDataSetId") Integer stdDataSetId,
@@ -216,7 +201,6 @@ public class RuleController extends EnvelopRestEndpoint {
     * 获取绑定质控规则
     */
    @RequestMapping(value = "bindQcRuleByCode", method = RequestMethod.GET)
    @ResponseBody
    public Envelop bindQcRuleByCode(
            @RequestParam(name = "stdVersion") String stdVersion,
            @RequestParam(name = "stdDataSetCode") String stdDataSetCode,
@@ -236,7 +220,6 @@ public class RuleController extends EnvelopRestEndpoint {
    @ApiOperation("根据数据集，绑定其所有数据元的质控规则")
    @RequestMapping(value = "bindQcRuleByDataSet", method = RequestMethod.POST)
    @ResponseBody
    public Envelop bindQcRuleByDataSet(
            @ApiParam(name = "stdVersion", value = "标准版本号", required = true)
            @RequestParam(name = "stdVersion") String stdVersion,
@@ -256,7 +239,6 @@ public class RuleController extends EnvelopRestEndpoint {
    @ApiOperation("根据标准版本，绑定其所有数据元的质控规则")
    @RequestMapping(value = "bindQcRuleByStdVersion", method = RequestMethod.POST)
    @ResponseBody
    public Envelop bindQcRuleByStdVersion(
            @ApiParam(name = "stdVersion", value = "标准版本", required = true)
            @RequestParam(name = "stdVersion") String stdVersion) {
@@ -275,7 +257,6 @@ public class RuleController extends EnvelopRestEndpoint {
    @ApiOperation("根据标准版本，删除其所有数据元的质控规则")
    @RequestMapping(value = "delQcRuleByStdVersion", method = RequestMethod.DELETE)
    @ResponseBody
    public Envelop delQcRuleByStdVersion(
            @ApiParam(name = "stdVersion", value = "标准版本", required = true)
            @RequestParam(name = "stdVersion") String stdVersion) {
@@ -291,12 +272,9 @@ public class RuleController extends EnvelopRestEndpoint {
        return envelop;
    }
    /**
     * 获取绑定质控规则
     */
    @ApiOperation("获取数据元绑定质控规则(返回单个数据元）")
    @RequestMapping(value = "metaDataRule", method = RequestMethod.GET)
    @ResponseBody
    public Envelop metaDataRule(
            @RequestParam(name = "stdVersion") String stdVersion,
            @RequestParam(name = "stdDataSetCode") String stdDataSetCode,
@@ -314,12 +292,9 @@ public class RuleController extends EnvelopRestEndpoint {
    }
    /**
     * 获取数据集下有绑定质控规则的数据元
     */
    @ApiOperation("获取数据集下有绑定质控规则的数据元")
    @RequestMapping(value = "metaDatas", method = RequestMethod.GET)
    @ResponseBody
    public Envelop getMetaDatasByDataSet(
            @RequestParam(name = "stdVersion") String stdVersion,
            @RequestParam(name = "stdDataSetCode") String stdDataSetCode) {

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

@@ -14,16 +14,11 @@ import javax.annotation.Resource;
@RestController("SchemeController")
@RequestMapping("/adapterCenter")
@Api(protocols = "https", value = "SchemeController", description = "适配方案管理", tags = {"适配方案"})
@Api(protocols = "https", value = "SchemeController",  tags = {"适配方案"})
public class SchemeController extends EnvelopRestEndpoint {
    @Resource(name = AdapterSchemeService.BEAN_ID)
    private AdapterSchemeService adapterSchemeService;
    /**
     * 查询适配方案首页信息（get）
     * @param condition
     * @return
     * @throws Exception
     */
    @GetMapping(value = "/searchScheme")
    @ApiOperation(value = "获取方案列表",  responseContainer = "List", notes = "获取方案列表")
    public ListEnvelop searchScheme(
@@ -46,12 +41,7 @@ public class SchemeController extends EnvelopRestEndpoint {
        return adapterSchemeService.get(schemeId);
    }
    /**
     * 修改适配（PUT）
     * @param scheme
     * @return
     * @throws Exception
     */
    @PostMapping("/updateScheme")
    @ApiOperation(value = "修改适配方案",  produces = "application/json", notes = "修改适配方案")
    public ObjEnvelop modify(
@@ -60,12 +50,7 @@ public class SchemeController extends EnvelopRestEndpoint {
        return adapterSchemeService.update(scheme);
    }
    /**
     * 新增适配（POST）
     * @param scheme
     * @return
     * @throws Exception
     */
    @PostMapping(value = "/addScheme")
    @ApiOperation(value = "保存适配方案",  produces = "application/json", notes = "保存适配方案")
    public ObjEnvelop add(
@@ -74,12 +59,7 @@ public class SchemeController extends EnvelopRestEndpoint {
        return adapterSchemeService.add(scheme);
    }
    /**
     * 删除适配（DELETE）
     * @param  schemeId
     * @return
     * @throws Exception
     */
    @PostMapping(value = "/deleteScheme")
    @ApiOperation(value = "删除适配方案",  produces = "application/json", notes = "删除适配方案")
    public Envelop delete(

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

@@ -15,30 +15,20 @@ import javax.annotation.Resource;
@RestController("SchemeVersionController")
@RequestMapping("/adapterCenter")
@Api(protocols = "https", value = "SchemeVersionController", description = "适配版本管理", tags = {"适配版本"})
@Api(protocols = "https", value = "SchemeVersionController", tags = {"适配版本"})
public class SchemeVersionController extends EnvelopRestEndpoint {
    @Resource(name = AdapterSchemeVersionService.BEAN_ID)
    private AdapterSchemeVersionService adapterSchemeVersion;
    /**
     * 根据版本id获取适配方案信息（get）
     * @param versionId
     * @return
     * @throws Exception
     */
    @GetMapping("/getForVersionId")
    @ApiOperation(value = "获取适配版本",  produces = "application/json", notes = "获取适配版本")
    @ApiOperation(value = "根据版本id获取适配方案信息",  produces = "application/json", notes = "获取适配版本")
    public ObjEnvelop get(
            @ApiParam(name = "versionId", value = "适配版本ID")
            @RequestParam(value = "versionId") Integer versionId) {
        return adapterSchemeVersion.get(versionId);
    }
    /**
     * 新增版本（post）
     * @param version
     * @return
     * @throws Exception
     */
    @PostMapping("/addVersion")
    @ApiOperation(value = "保存适配版本", produces = "application/json", notes = "保存适配版本")
    public ObjEnvelop add(
@@ -47,12 +37,7 @@ public class SchemeVersionController extends EnvelopRestEndpoint {
        return adapterSchemeVersion.add(version);
    }
    /**
     * 修改版本（put）
     * @param version
     * @return
     * @throws Exception
     */
    @PostMapping("/updateVersion")
    @ApiOperation(value = "修改适配版本",  produces = "application/json", notes = "修改适配版本")
    public ObjEnvelop modify(
@@ -61,12 +46,7 @@ public class SchemeVersionController extends EnvelopRestEndpoint {
        return adapterSchemeVersion.update(version);
    }
    /**
     * 发布版本（put）
     * @param versionId
     * @return
     * @throws Exception
     */
    @PostMapping("/publishVersion")
    @ApiOperation(value = "发布适配版本",  produces = "application/json", notes = "发布适配版本")
    public ObjEnvelop publish(
@@ -77,12 +57,7 @@ public class SchemeVersionController extends EnvelopRestEndpoint {
        return adapterSchemeVersion.publish(versionId, publisher);
    }
    /**
     * 删除版本（put）
     * @param versionId
     * @return
     * @throws Exception
     */
    @PostMapping("/deleteVersion")
    @ApiOperation(value = "删除版本",  produces = "application/json", notes = "删除版本")
    public Envelop delete(
@@ -111,12 +86,7 @@ public class SchemeVersionController extends EnvelopRestEndpoint {
        }
    }
    /**
     * 获取基础版本列表
     * @param schemeId
     * @return
     * @throws Exception
     */
    @GetMapping(value = "/getVersions")
    @ApiOperation(value = "获取适配方案版本列表", produces = "application/json", notes = "获取标准版本列表")
    public ListEnvelop getList(

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

@@ -16,17 +16,12 @@ import javax.annotation.Resource;
@RestController("StandardController")
@RequestMapping("/standardCenter")
@Api(protocols = "https", value = "StandardController", description = "标准管理", tags = {"标准"})
@Api(protocols = "https", value = "StandardController", tags = {"标准管理"})
public class StandardController extends EnvelopRestEndpoint {
    @Resource(name = StandardService.BEAN_ID)
    private StandardService standardService;
    /**
     * 查询集成标准首页信息（get）
     * @param condition
     * @return
     * @throws Exception
     */
    @GetMapping("/searchStandard")
    @ApiOperation(value = "获取标准树列表", responseContainer = "List", notes = "获取标准列表")
    public ListEnvelop searchStandard(
@@ -43,26 +38,16 @@ public class StandardController extends EnvelopRestEndpoint {
        return ObjEnvelop.getSuccess("获取成功",standardParamResultModel);
    }
    /**
     * 根据标准ID获取集成标准信息（get）
     * @param standardId
     * @return
     * @throws Exception
     */
    @GetMapping("/getForStandardId")
    @ApiOperation(value = "获取标准",  produces = "application/json", notes = "获取标准")
    @ApiOperation(value = "根据标准ID获取集成标准信息",  produces = "application/json", notes = "获取标准")
    public ObjEnvelop getForStandardId(
            @ApiParam(name = "standardId", value = "标准ID")
            @RequestParam(value = "standardId") Integer standardId){
        return standardService.get(standardId);
    }
    /**
     * 修改标准信息（PUT）
     * @param standard
     * @return
     * @throws Exception
     */
    @PostMapping("/updateStandard")
    @ApiOperation(value = "修改标准",  produces = "application/json", notes = "修改标准")
    public ObjEnvelop modify(
@@ -71,12 +56,7 @@ public class StandardController extends EnvelopRestEndpoint {
        return standardService.update(standard);
    }
    /**
     * 新增标准信息（POST）
     * @param standard
     * @return
     * @throws Exception
     */
    @PostMapping("/addStandard")
    @ApiOperation(value = "保存标准",  produces = "application/json", notes = "保存标准")
    public ObjEnvelop add(
@@ -85,12 +65,7 @@ public class StandardController extends EnvelopRestEndpoint {
        return standardService.add(standard);
    }
    /**
     * 删除标准信息（DELETE）
     * @param  standardId
     * @return
     * @throws Exception
     */
    @PostMapping("/deleteStandard")
    @ApiOperation(value = "删除标准",  produces = "application/json", notes = "删除标准")
    public Envelop delete(
@@ -99,14 +74,9 @@ public class StandardController extends EnvelopRestEndpoint {
        return standardService.delete(standardId);
    }
    /**
     * 获取平台标准名称/应用标准名称列表
     * @param condition
     * @return
     * @throws Exception
     */
    @GetMapping(value = "/getStandards")
    @ApiOperation(value = "获取标准列表",  produces = "application/json", notes = "获取标准列表")
    @ApiOperation(value = "获取平台标准名称/应用标准名称列表",  produces = "application/json", notes = "获取标准列表")
    public ListEnvelop getStandardList(
            @ApiParam(name = "condition", value = "Must be Json,其中type为区分集成与应用标准")
            @RequestParam(value = "condition", required = false) String condition,

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

@@ -18,16 +18,11 @@ import javax.annotation.Resource;
 */
@RestController("StandardVersionController")
@RequestMapping("/standardCenter")
@Api(protocols = "https", value = "StandardVersionController", description = "标准版本管理", tags = {"标准版本"})
@Api(protocols = "https", value = "StandardVersionController",  tags = {"标准版本管理"})
public class StandardVersionController extends EnvelopRestEndpoint {
    @Resource(name = StandardVersionService.BEAN_ID)
    private StandardVersionService standardVersionService;
    /**
     * 根据版本id获取标准版本信息（get）
     * @param versionId
     * @return
     * @throws Exception
     */
    @GetMapping("/getForVersionId")
    @ApiOperation(value = "获取标准版本", produces = "application/json", notes = "获取标准版本")
    public ObjEnvelop getForVersionId(
@@ -36,12 +31,7 @@ public class StandardVersionController extends EnvelopRestEndpoint {
        return standardVersionService.get(versionId);
    }
    /**
     * 新增版本（post）
     * @param version
     * @return
     * @throws Exception
     */
    @PostMapping("/addVersion")
    @ApiOperation(value = "保存标准版本",  produces = "application/json", notes = "保存标准版本")
    public ObjEnvelop addVersion(
@@ -50,12 +40,7 @@ public class StandardVersionController extends EnvelopRestEndpoint {
        return standardVersionService.add(version);
    }
    /**
     * 修改版本（put）
     * @param version
     * @return
     * @throws Exception
     */
    @PostMapping("/updateVersion")
    @ApiOperation(value = "修改版本", produces = "application/json", notes = "修改版本")
    public ObjEnvelop updateVersion(
@@ -64,13 +49,7 @@ public class StandardVersionController extends EnvelopRestEndpoint {
        return standardVersionService.update(version);
    }
    /**
     * 发布版本（post）
     * @param versionId
     * @param publisher
     * @return
     * @throws Exception
     */
    @PostMapping("/publishVersion")
    @ApiOperation(value = "发布版本", produces = "application/json", notes = "发布版本")
    public ObjEnvelop publish(
@@ -81,12 +60,7 @@ public class StandardVersionController extends EnvelopRestEndpoint {
        return standardVersionService.publish(versionId, publisher);
    }
    /**
     * 删除版本（put）
     * @param versionId
     * @return
     * @throws Exception
     */
    @PostMapping("/deleteVersion")
    @ApiOperation(value = "删除版本", produces = "application/json", notes = "删除版本")
    public Envelop delete(
@@ -97,12 +71,7 @@ public class StandardVersionController extends EnvelopRestEndpoint {
        return standardVersionService.delete(versionId,version);
    }
    /**
     * 获取基础版本名称列表
     * @param standardId
     * @return
     * @throws Exception
     */
    @GetMapping("/getVersions")
    @ApiOperation(value = "获取标准版本列表",  produces = "application/json", notes = "获取标准版本列表")
    public ListEnvelop getVersions(
@@ -118,14 +87,7 @@ public class StandardVersionController extends EnvelopRestEndpoint {
            @RequestParam(value = "page", required = false) Integer page) {
        return standardVersionService.getDetailResultModelList(standardId, condition, order, rows, page);
    }
    /**
     * 根据类型文件上传保存对应的数据
     *
     * @param type
     * @param file
     * @return
     * @throws Exception
     */
    @RequestMapping(value = "/importFile", method = RequestMethod.POST)
    @ApiOperation(value = "根据type导入数据接口", response = Object.class, produces = "application/json", notes = "导入数据接口")
    public Envelop importFile(@ApiParam(value = "类型（1:数据集 2:字典 3:机构数据 4：机构字典）", required = true) @RequestParam("type") String type,
@@ -133,7 +95,6 @@ public class StandardVersionController extends EnvelopRestEndpoint {
                             @ApiParam(value = "项目版本", required = true) @RequestParam("standardId") Long standardId,
                             @ApiParam(value = "文件", required = true, allowMultiple = true) @RequestParam("file") MultipartFile file){
        try {
            String id = "";
            //根據类别判断上传的文件1:数据集 2:字典
            if("1".equals(type)){
                version = standardVersionService.saveDatasetExcel(file, version,standardId);
@@ -160,13 +121,7 @@ public class StandardVersionController extends EnvelopRestEndpoint {
        }
    }
    /**
     * 根据类型和主键删除数据
     *
     * @param type
     * @return
     * @throws Exception
     */
    @RequestMapping(value = "/deleteByType", method = RequestMethod.POST)
    @ApiOperation(value = "文件上传成功后的删除",  produces = "application/json", notes = "文件上传成功后的删除")
    public Envelop deleteByType(

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

@@ -2,7 +2,6 @@ package com.yihu.jw.basic.standard.controller;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.cfg.ContextAttributes;
import com.yihu.fastdfs.FastDFSUtil;
import com.yihu.jw.basic.standard.model.BaseCDADataSetRelationship;
import com.yihu.jw.basic.standard.model.BaseCDADocument;
@@ -10,7 +9,6 @@ import com.yihu.jw.basic.standard.model.CDADocument;
import com.yihu.jw.basic.standard.service.bo.StandardVersion;
import com.yihu.jw.basic.standard.service.document.CDADataSetRelationshipManager;
import com.yihu.jw.basic.standard.service.document.CDADocumentService;
import com.yihu.jw.basic.standard.service.standard.StdCDAService;
import com.yihu.jw.entity.ehr.id.BizObject;
import com.yihu.jw.restmodel.ehr.standard.CDAModel;
import com.yihu.jw.restmodel.ehr.standard.CdaDataSetRelationshipModel;
@@ -23,19 +21,14 @@ import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.util.common.LogService;
import com.yihu.jw.util.sql.ErrorCode;
import com.yihu.jw.util.date.DateUtil;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
@@ -48,10 +41,9 @@ import java.util.List;
@RequestMapping(value = "/cda", produces = "application/json;charset=utf-8")
@RestController
@Api(value = "StdCdaController", tags = {"cda"})
public class StdCdaController extends EnvelopRestEndpoint {
    @Autowired
    private StdCDAService stdCDAService;
    @Resource(name = CDADocumentService.BEAN_ID)
    private CDADocumentService cdaDocumentService;
    @Autowired
@@ -149,7 +141,7 @@ public class StdCdaController extends EnvelopRestEndpoint {
                cdaDataSetRelationshipModels.add(cdaDataSetRelationshipModel);
            }
            if (cdaDataSetRelationshipModels != null) {
            if (cdaDataSetRelationshipModels.size() > 0) {
                return ListEnvelop.getSuccess("查询成功",cdaDataSetRelationshipModels);
            } else {
                return failed("查询失败");
@@ -161,7 +153,7 @@ public class StdCdaController extends EnvelopRestEndpoint {
    }
    @RequestMapping("SaveCdaInfo")
    public Envelop SaveCdaInfo(String cdaJson,String version,HttpServletRequest request) throws IOException {
    public Envelop SaveCdaInfo(String cdaJson,String version) throws IOException {
        CDADocument cdaModel = objectMapper.readValue(cdaJson, CDADocument.class);
        try {
            if(StringUtils.isEmpty(cdaModel.getId())) {
@@ -286,7 +278,7 @@ public class StdCdaController extends EnvelopRestEndpoint {
                cdaDataSetRelationshipModels.add(cdaDataSetRelationshipModel);
            }
            if (cdaDataSetRelationshipModels != null) {
            if (cdaDataSetRelationshipModels.size() > 0) {
                return ListEnvelop.getSuccess("查询成功",cdaDataSetRelationshipModels);
            } else {
                return failed("查询失败");
@@ -315,7 +307,6 @@ public class StdCdaController extends EnvelopRestEndpoint {
     * @param cdaId
     * @param versionCode
     * @return XML信息
     * @version 1.0.1 将临时目录转移至fastDFS。
     */
    @RequestMapping("/getCdaXmlFileInfo")
    public Envelop getCdaXmlFileInfo(String cdaId, String versionCode) {
@@ -377,10 +368,6 @@ public class StdCdaController extends EnvelopRestEndpoint {
        CDAModel cdaModel = convertToModel(mcdaDocument, CDAModel.class);
        cdaModel.setCreateDate(DateUtil.dateToStr(mcdaDocument.getCreateDate(), DateUtil.YYYY_MM_DD_HH_MM));
        cdaModel.setUpdateDate(DateUtil.dateToStr(mcdaDocument.getUpdateDate(), DateUtil.YYYY_MM_DD_HH_MM));
//        MSTDVersion versionModel = versionClient.getVersion(mcdaDocument.getVersionCode());
//        cdaModel.setStaged(versionModel.isInStage() ? "1" : "0");
        return cdaModel;
    }
}

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

@@ -26,7 +26,7 @@
// * Created by AndyCai on 2015/12/14.
// */
//@RequestMapping(value = "/cdatype", produces = "application/json;charset=utf-8")
//@Controller
//@RestController
//@SessionAttributes(SessionAttributeKeys.CurrentUser)
//public class StdCdaTypeController extends BaseUIController {
//
@@ -36,22 +36,8 @@
//    @Autowired
//    ObjectMapper objectMapper;
//
//    @RequestMapping("index")
//    public String cdaTypeInitial(Model model) {
//        model.addAttribute("contentPage", "std/cdaType/index");
//        return "pageView";
//    }
//
//    @RequestMapping("typeupdate")
//    public String typeupdate(Model model, HttpServletRequest request) {
//        SystemUser user = (SystemUser)request.getSession().getAttribute(ContextAttributes.USER_INFO);
//        model.addAttribute("UserId", user.getId());
//        model.addAttribute("contentPage", "std/cdaType/CdaTypeDetail");
//        return "pageView";
//    }
//
//    @RequestMapping("getTreeGridData")
//    @ResponseBody
//    //获取TreeData 用于初始页面显示嵌套model
//    public Object getTreeGridData(String codeName) {
//        Envelop envelop = new Envelop();
@@ -72,7 +58,6 @@
//    }
//
//    @RequestMapping("GetCdaTypeList")
//    @ResponseBody
//    public Object getCdaTypeList(String strKey, Integer page, Integer rows) {
//        Envelop envelop = new Envelop();
//        String filters = "";
@@ -91,7 +76,6 @@
//    }
//
//    @RequestMapping("getCdaTypeById")
//    @ResponseBody
//    public Object getCdaTypeById(String strIds) {
//        Envelop envelop = new Envelop();
//        try{
@@ -106,7 +90,6 @@
//    }
//
//    @RequestMapping("delteCdaTypeInfo")
//    @ResponseBody
//    /**
//     * 删除CDA类别，若该类别存在子类别，将一并删除子类别
//     * 先根据当前的类别ID获取全部子类别ID，再进行删除
@@ -138,7 +121,6 @@
//    }
//
//    @RequestMapping("SaveCdaType")
//    @ResponseBody
//    //新增、修改的保存合二为一
//    public Object SaveCdaType(String dataJson,HttpServletRequest request) {
//        Envelop envelop = new Envelop();
@@ -195,7 +177,6 @@
//     * @return
//     */
//    @RequestMapping("getCdaTypeExcludeSelfAndChildren")
//    @ResponseBody
//    public Object getCdaTypeExcludeSelfAndChildren(String strId, String codeName) {
//        //页面新增修改访问的是同个接口
//        Envelop envelop = new Envelop();
@@ -222,7 +203,6 @@
//    }
//
//    @RequestMapping("getCDATypeListByParentId")
//    @ResponseBody
//    //根据父级ID获取下一级cda类别（不含子类的子类。。）
//    public Object getCDATypeListByParentId(String ids) {
//        Envelop envelop = new Envelop();
@@ -244,7 +224,6 @@
//     * @return
//     */
//    @RequestMapping("isExitRelativeCDA")
//    @ResponseBody
//    public Object isExitRelativeCDA(String ids){
//        Envelop envelop = new Envelop();
//        try{

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

@@ -23,21 +23,12 @@ import java.util.Map;
 */
@RestController("StdDatasetController")
@RequestMapping("/standardCenter")
@Api(protocols = "https", value = "StdDatasetController", description = "标准数据集管理", tags = {"标准数据集"})
@Api(protocols = "https", value = "StdDatasetController", tags = {"标准数据集管理"})
public class StdDatasetController extends EnvelopRestEndpoint {
    @Resource(name = StdDatasetService.BEAN_ID)
    private StdDatasetService stdDatasetService;
    /**
     * 查询数据集列表信息（get）
     * @param stdVersion
     * @param condition
     * @param order
     * @param rows
     * @param page
     * @return
     * @throws Exception
     */
    @GetMapping("/searchDatasetList")
    @ApiOperation(value = "获取数据集列表",  produces = "application/json", notes = "获取数据集列表")
    public PageEnvelop searchDatasetList(
@@ -104,9 +95,9 @@ public class StdDatasetController extends EnvelopRestEndpoint {
    public PageEnvelop getSelectList(
            @ApiParam(name = "stdVersion", value = "标准版本号")
            @RequestParam(value = "stdVersion") String stdVersion,
            @ApiParam(name = "q", value = "数据集名称或编码", required = false)
            @ApiParam(name = "q", value = "数据集名称或编码")
            @RequestParam(value = "q", required = false) String q,
            @ApiParam(name = "initVal", value = "初始化数据集名称或编码", required = false)
            @ApiParam(name = "initVal", value = "初始化数据集名称或编码")
            @RequestParam(value = "initVal", required = false) String initVal,
            @ApiParam(name = "order", value = "Order param,Must be json.ascending:asc,descending:desc")
            @RequestParam(value = "order", required = false) String order,
@@ -114,7 +105,7 @@ public class StdDatasetController extends EnvelopRestEndpoint {
            @RequestParam(value = "rows", required = false) Integer rows,
            @ApiParam(name = "page", value = "Start position of result set. Must be an integer")
            @RequestParam(value = "page", required = false) Integer page) {
        Map<String,String> condition = new HashMap<String,String>();
        Map<String,String> condition = new HashMap<>();
        ObjectMapper mapper = new ObjectMapper();
        if(!StringUtil.isEmpty(q)){
            condition.put("name", q);

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

@@ -24,20 +24,11 @@ import java.util.Map;
 */
@RestController("StdDictController")
@RequestMapping("/standardCenter")
@Api(protocols = "https", value = "StdDictController", description = "标准字典管理", tags = {"标准字典"})
@Api(protocols = "https", value = "StdDictController",  tags = {"标准字典管理"})
public class StdDictController extends EnvelopRestEndpoint {
    @Resource(name = StdDictService.BEAN_ID)
    StdDictService stdDictService;
    /**
     * 查询字典列表信息（get）
     * @param stdVersion
     * @param condition
     * @param order
     * @param rows
     * @param page
     * @return
     * @throws Exception
     */
    @GetMapping("/searchDictList")
    @ApiOperation(value = "获取字典列表",produces = "application/json", notes = "获取字典列表")
    public PageEnvelop getDictList(
@@ -110,7 +101,7 @@ public class StdDictController extends EnvelopRestEndpoint {
            @ApiParam(name = "page", value = "Start position of result set. Must be an integer")
            @RequestParam(value = "page", required = false) Integer page) {
        Map<String,String> condition = new HashMap<String,String>();
        Map<String,String> condition = new HashMap<>();
        if(!StringUtil.isEmpty(q)){
            condition.put("name", q);
        }
@@ -129,12 +120,7 @@ public class StdDictController extends EnvelopRestEndpoint {
        return stdDictService.getDictSelectList(dictList);
    }
    /**
     * 获取对应字典/参考字典列表
     * @param stdVersion
     * @return
     * @throws Exception
     */
    @GetMapping("/getDicts")
    @ApiOperation(value = "获取字典列表",  produces = "application/json", notes = "获取字典列表")
    public ListEnvelop getList(

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

@@ -21,21 +21,11 @@ import java.util.Map;
 */
@RestController("StdDictEntryController")
@RequestMapping("/standardCenter")
@Api(protocols = "https", value = "StdDictEntryController", description = "标准字典项管理", tags = {"标准字典项"})
@Api(protocols = "https", value = "StdDictEntryController",  tags = {"标准字典项管理"})
public class StdDictEntryController extends EnvelopRestEndpoint {
    @Resource(name = StdDictEntryService.BEAN_ID)
    StdDictEntryService stdDictEntryService;
    /**
     * 查询字典项列表信息（get）
     * @param stdVersion
     * @param dictId
     * @param condition
     * @param order
     * @param rows
     * @param page
     * @return
     * @throws Exception
     */
    @GetMapping("/searchDictEntryList")
    @ApiOperation(value = "获取字典项列表",  responseContainer = "List",produces = "application/json", notes = "获取字典项列表")
    public PageEnvelop getDictEntryList(
@@ -101,9 +91,9 @@ public class StdDictEntryController extends EnvelopRestEndpoint {
            @RequestParam(value = "stdVersion") String stdVersion,
            @ApiParam(name = "dictId", value = "数据集ID")
            @RequestParam(value = "dictId") Long dictId,
            @ApiParam(name = "q", value = "字典名称或编码", required = false)
            @ApiParam(name = "q", value = "字典名称或编码")
            @RequestParam(value = "q", required = false) String q,
            @ApiParam(name = "initDictValue", value = "初始化字典名称或编码", required = false)
            @ApiParam(name = "initDictValue", value = "初始化字典名称或编码")
            @RequestParam(value = "initDictValue", required = false) String initDictValue,
            @ApiParam(name = "order", value = "Order param,Must be json.ascending:asc,descending:desc")
            @RequestParam(value = "order", required = false) String order,
@@ -112,7 +102,7 @@ public class StdDictEntryController extends EnvelopRestEndpoint {
            @ApiParam(name = "page", value = "Start position of result set. Must be an integer")
            @RequestParam(value = "page", required = false) Integer page) {
        Map<String,String> condition = new HashMap<String,String>();
        Map<String,String> condition = new HashMap<>();
        if (StringUtil.isEmpty(initDictValue)) {
            initDictValue = "";
        }

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

@@ -2,11 +2,8 @@ package com.yihu.jw.basic.standard.controller;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.basic.standard.service.standard.StdDictService;
import com.yihu.jw.basic.standard.service.standard.StdMetadataService;
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.StringUtil;
import io.swagger.annotations.Api;
@@ -23,26 +20,14 @@ import java.util.Map;
 */
@RestController("StdMetadataController")
@RequestMapping("/standardCenter")
@Api(protocols = "https", value = "StdMetadataController", description = "标准数据元管理", tags = {"标准数据元"})
@Api(protocols = "https", value = "StdMetadataController",  tags = {"标准数据元"})
public class StdMetadataController extends EnvelopRestEndpoint {
    @Resource(name = StdMetadataService.BEAN_ID)
    StdMetadataService stdMetadataService;
    @Resource(name = StdDictService.BEAN_ID)
    StdDictService stdDictService;
    /**
     * 查询数据元列表信息（get）
     * @param stdVersion
     * @param datasetId
     * @param condition
     * @param order
     * @param rows
     * @param page
     * @return
     * @throws Exception
     */
    @GetMapping("/searchMetadataList")
    @ApiOperation(value = "获取数据元列表",  produces = "application/json", notes = "获取数据元列表")
    public PageEnvelop getMetadataList(
    public Envelop getMetadataList(
            @ApiParam(name = "stdVersion", value = "标准版本号")
            @RequestParam(value = "stdVersion") String stdVersion,
            @ApiParam(name = "datasetId", value = "数据集ID")
@@ -60,7 +45,7 @@ public class StdMetadataController extends EnvelopRestEndpoint {
    @GetMapping("/getForMetadataId")
    @ApiOperation(value = "获取数据元",  produces = "application/json", notes = "获取数据元")
    public ObjEnvelop getForMetadataId(
    public Envelop getForMetadataId(
            @ApiParam(name = "stdVersion", value = "stdVersion")
            @RequestParam(value = "stdVersion") String stdVersion,
            @ApiParam(name = "metadataId", value = "数据元ID")
@@ -80,7 +65,7 @@ public class StdMetadataController extends EnvelopRestEndpoint {
    @PostMapping("/updateMetadata")
    @ApiOperation(value = "修改数据元",  produces = "application/json", notes = "修改数据元")
    public ObjEnvelop updateMetadata(
    public Envelop updateMetadata(
            @ApiParam(name = "stdVersion", value = "stdVersion")
            @RequestParam(value = "stdVersion") String stdVersion,
            @ApiParam(name = "metadata", value = "数据元")
@@ -90,7 +75,7 @@ public class StdMetadataController extends EnvelopRestEndpoint {
    @PostMapping("/addMetadata")
    @ApiOperation(value = "保存数据元",  produces = "application/json", notes = "保存数据元")
    public ObjEnvelop addMetadata(
    public Envelop addMetadata(
            @ApiParam(name = "stdVersion", value = "stdVersion")
            @RequestParam(value = "stdVersion") String stdVersion,
            @ApiParam(name = "metadata", value = "数据元")
@@ -101,14 +86,14 @@ public class StdMetadataController extends EnvelopRestEndpoint {
    @GetMapping(value="/getMetadataCodeValues")
    @ApiOperation(value = "获取数据元下拉框信息",  produces = "application/json", notes = "获取机构数据元下拉框信息")
    public PageEnvelop getSelectList(
    public Envelop getSelectList(
            @ApiParam(name = "stdVersion", value = "标准版本号")
            @RequestParam(value = "stdVersion") String stdVersion,
            @ApiParam(name = "datasetId", value = "数据集ID")
            @RequestParam(value = "datasetId") Long datasetId,
            @ApiParam(name = "q", value = "数据元名称或编码", required = false)
            @ApiParam(name = "q", value = "数据元名称或编码")
            @RequestParam(value = "q", required = false) String q,
            @ApiParam(name = "initMetadataNm", value = "初始化数据元名称或编码", required = false)
            @ApiParam(name = "initMetadataNm", value = "初始化数据元名称或编码")
            @RequestParam(value = "initMetadataNm", required = false) String initMetadataNm,
            @ApiParam(name = "order", value = "Order param,Must be json.ascending:asc,descending:desc")
            @RequestParam(value = "order", required = false) String order,
@@ -116,7 +101,7 @@ public class StdMetadataController extends EnvelopRestEndpoint {
            @RequestParam(value = "rows", required = false) Integer rows,
            @ApiParam(name = "page", value = "Start position of result set. Must be an integer")
            @RequestParam(value = "page", required = false) Integer page) {
        Map<String,String> condition = new HashMap<String,String>();
        Map<String,String> condition = new HashMap<>();
        if (StringUtil.isEmpty(initMetadataNm)) {
            initMetadataNm = "";
        }
@@ -132,6 +117,6 @@ public class StdMetadataController extends EnvelopRestEndpoint {
        } catch (JsonProcessingException e) {
            e.printStackTrace();
        }
        return stdMetadataService.getMetadataSelectList(stdVersion, datasetId, conditionStr, order, rows, 0);
        return stdMetadataService.getMetadataSelectList(stdVersion, datasetId, conditionStr, order, rows, page);
    }
}

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

@@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.*;
 * @author hzp add at 20170425
 */
@RestController
@Api(value = "Redis", description = "Redis数据缓存服务")
@Api(value = "Redis", tags = "Redis数据缓存服务")
public class StdRedisEndPoint extends EnvelopRestEndpoint {
    @Autowired
@@ -32,18 +32,18 @@ public class StdRedisEndPoint extends EnvelopRestEndpoint {
    @ApiOperation("通过StdDataSet版本和id获取标准数据集编码")
    @RequestMapping(value = ServiceApi.Redis.StdDataSetCode, method = RequestMethod.GET)
    public String getDataSetCode(@ApiParam(value = "version", defaultValue = "")
    public String getDataSetCode(@ApiParam(value = "version")
                                 @RequestParam("version") String version,
                                 @ApiParam(value = "id", defaultValue = "")
                                 @ApiParam(value = "id")
                                 @RequestParam("id") String id){
        return stdRedisService.getDataSetCode(version, id);
    }
    @ApiOperation("通过StdDataSet版本和id获取标准数据集名称")
    @RequestMapping(value = ServiceApi.Redis.StdDataSetName, method = RequestMethod.GET)
    public String getDataSetName(@ApiParam(value = "version", defaultValue = "")
    public String getDataSetName(@ApiParam(value = "version")
                                     @RequestParam("version") String version,
                                 @ApiParam(value = "id", defaultValue = "")
                                 @ApiParam(value = "id")
                                 @RequestParam("id") String id){
        return stdRedisService.getDataSetName(version, id);
    }
@@ -51,9 +51,9 @@ public class StdRedisEndPoint extends EnvelopRestEndpoint {
    @ApiOperation("通过StdDataSet版本和编码获取标准数据集名称")
    @RequestMapping(value = ServiceApi.Redis.StdDataSetNameByCode, method = RequestMethod.GET)
    public String getDataSetNameByCode(@ApiParam(value = "version", defaultValue = "")
    public String getDataSetNameByCode(@ApiParam(value = "version")
                                           @RequestParam("version") String version,
                                       @ApiParam(value = "code", defaultValue = "")
                                       @ApiParam(value = "code")
                                           @RequestParam("code") String code){
        return stdRedisService.getDataSetNameByCode(version, code);
    }
@@ -61,9 +61,9 @@ public class StdRedisEndPoint extends EnvelopRestEndpoint {
    @ApiOperation("通过StdDataSet版本和编码获取标准数据集主从表信息")
    @RequestMapping(value = ServiceApi.Redis.StdDataSetMultiRecord, method = RequestMethod.GET)
    public Boolean getDataSetMultiRecord(@ApiParam(value = "version", defaultValue = "")
    public Boolean getDataSetMultiRecord(@ApiParam(value = "version")
                                            @RequestParam("version") String version,
                                        @ApiParam(value = "code", defaultValue = "")
                                        @ApiParam(value = "code")
                                            @RequestParam("code") String code){
        return stdRedisService.getDataSetMultiRecord(version, code);
    }
@@ -71,11 +71,11 @@ public class StdRedisEndPoint extends EnvelopRestEndpoint {
    @ApiOperation("通过StdDataSet版本、编码以及标准数据元的内部编码获取标准数据元对应类型")
    @RequestMapping(value = ServiceApi.Redis.StdMetadataType, method = RequestMethod.GET)
    public String getMetaDataType(@ApiParam(value = "version", defaultValue = "")
    public String getMetaDataType(@ApiParam(value = "version")
                                      @RequestParam("version") String version,
                                  @ApiParam(value = "dataSetCode", defaultValue = "")
                                  @ApiParam(value = "dataSetCode")
                                  @RequestParam("dataSetCode") String dataSetCode,
                                  @ApiParam(value = "innerCode", defaultValue = "")
                                  @ApiParam(value = "innerCode")
                                  @RequestParam("innerCode") String innerCode) {
        return stdRedisService.getMetaDataType( version, dataSetCode , innerCode);
@@ -83,11 +83,11 @@ public class StdRedisEndPoint extends EnvelopRestEndpoint {
    @ApiOperation("通过StdDataSet版本、编码以及标准数据元的内部编码获取标准数据元字典ID")
    @RequestMapping(value = ServiceApi.Redis.StdMetadataDict, method = RequestMethod.GET)
    public String getMetaDataDict(@ApiParam(value = "version", defaultValue = "")
    public String getMetaDataDict(@ApiParam(value = "version")
                                      @RequestParam("version") String version,
                                  @ApiParam(value = "dataSetCode", defaultValue = "")
                                  @ApiParam(value = "dataSetCode")
                                      @RequestParam("dataSetCode") String dataSetCode,
                                  @ApiParam(value = "innerCode", defaultValue = "")
                                  @ApiParam(value = "innerCode")
                                      @RequestParam("innerCode") String innerCode) {
        return stdRedisService.getMetaDataDict(version, dataSetCode, innerCode);
    }
@@ -95,11 +95,11 @@ public class StdRedisEndPoint extends EnvelopRestEndpoint {
    @ApiOperation("通过StdDataSet版本、标准数据元字典ID以及标准数据元字典项编码获取标准数据元字典项值")
    @RequestMapping(value = ServiceApi.Redis.StdDictEntryValue, method = RequestMethod.GET)
    public String getDictEntryValue(@ApiParam(value = "version", defaultValue = "")
    public String getDictEntryValue(@ApiParam(value = "version")
                                        @RequestParam("version") String version,
                                    @ApiParam(value = "dictId", defaultValue = "")
                                    @ApiParam(value = "dictId")
                                    @RequestParam("dictId") String dictId,
                                    @ApiParam(value = "entryCode", defaultValue = "")
                                    @ApiParam(value = "entryCode")
                                    @RequestParam("entryCode") String entryCode) {
        return stdRedisService.getDictEntryValue(version, dictId , entryCode);
@@ -108,42 +108,42 @@ public class StdRedisEndPoint extends EnvelopRestEndpoint {
    @ApiOperation("通过版本号,数据集code查找数据元,返回通过,分隔的数据元字符串")
    @RequestMapping(value = ServiceApi.Redis.StdMetadataCodes, method = RequestMethod.GET)
    public String getMetadataCodes(@ApiParam(value = "version", defaultValue = "")
    public String getMetadataCodes(@ApiParam(value = "version")
                                   @RequestParam("version") String version,
                                   @ApiParam(value = "datasetCode", defaultValue = "")
                                   @ApiParam(value = "datasetCode")
                                   @RequestParam("datasetCode") String datasetCode){
        return stdRedisService.getMetadataCodes(version, datasetCode);
    }
    @ApiOperation("通过版本号、标准数据集code和数据元code 获取标准数据元名称")
    @RequestMapping(value = ServiceApi.Redis.StdMetadataName, method = RequestMethod.GET)
    public String getMetadataName(@ApiParam(value = "version", defaultValue = "")
    public String getMetadataName(@ApiParam(value = "version")
                                   @RequestParam("version") String version,
                                   @ApiParam(value = "datasetCode", defaultValue = "")
                                   @ApiParam(value = "datasetCode")
                                   @RequestParam("datasetCode") String datasetCode,
                                  @ApiParam(value = "metadataCode", defaultValue = "")
                                  @ApiParam(value = "metadataCode")
                                  @RequestParam("metadataCode") String metadataCode){
        return stdRedisService.getMetadataName(version, datasetCode,metadataCode);
    }
    @ApiOperation("通过版本号、标准数据集code和数据元code 获取标准数据元是否为空")
    @RequestMapping(value = ServiceApi.Redis.StdMetadataNullable, method = RequestMethod.GET)
    public boolean isMetaDataNullable(@ApiParam(value = "version", defaultValue = "")
    public boolean isMetaDataNullable(@ApiParam(value = "version")
                                  @RequestParam("version") String version,
                                  @ApiParam(value = "datasetCode", defaultValue = "")
                                  @ApiParam(value = "datasetCode")
                                  @RequestParam("datasetCode") String datasetCode,
                                  @ApiParam(value = "metadataCode", defaultValue = "")
                                  @ApiParam(value = "metadataCode")
                                  @RequestParam("metadataCode") String metadataCode){
        return stdRedisService.isMetaDataNullable(version, datasetCode,metadataCode);
    }
    @ApiOperation("通过版本号、标准数据集code和数据元code 获取标准数据元是否为空")
    @RequestMapping(value = ServiceApi.Redis.StdMetadataFormat, method = RequestMethod.GET)
    public String getMetadataFormat(@ApiParam(value = "version", defaultValue = "")
    public String getMetadataFormat(@ApiParam(value = "version")
                                      @RequestParam("version") String version,
                                      @ApiParam(value = "datasetCode", defaultValue = "")
                                      @ApiParam(value = "datasetCode")
                                      @RequestParam("datasetCode") String datasetCode,
                                      @ApiParam(value = "metadataCode", defaultValue = "")
                                      @ApiParam(value = "metadataCode")
                                      @RequestParam("metadataCode") String metadataCode){
        return stdRedisService.getMetadataFormat(version, datasetCode,metadataCode);
    }
@@ -164,11 +164,11 @@ public class StdRedisEndPoint extends EnvelopRestEndpoint {
    @ApiOperation("通过StdDataSet版本、标准数据元字典ID以及标准数据元字典项编码判断编码是否存在")
    @RequestMapping(value = ServiceApi.Redis.StdDictEntryCodeExist, method = RequestMethod.GET)
    public Boolean isDictCodeExist(
            @ApiParam(value = "version", defaultValue = "")
            @ApiParam(value = "version")
            @RequestParam("version") String version,
            @ApiParam(value = "dictId", defaultValue = "")
            @ApiParam(value = "dictId")
            @RequestParam("dictId") String dictId,
            @ApiParam(value = "entryCode", defaultValue = "")
            @ApiParam(value = "entryCode")
            @RequestParam("entryCode") String entryCode) {
        return stdRedisService.isDictCodeExist(version, dictId, entryCode);
    }

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

@@ -33,21 +33,21 @@ public class StdRelationController extends EnvelopRestEndpoint {
    @ApiOperation("获取列表数据(分页)")
    @RequestMapping(value = ServiceApi.StdRelation.List, method = RequestMethod.GET)
    public Envelop getList(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段", defaultValue = "")
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件", defaultValue = "")
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档", defaultValue = "")
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
            @RequestParam(value = "sorts", required = false) String sorts,
            @ApiParam(name = "rows", value = "分页大小", defaultValue = "15")
            @RequestParam(value = "rows", required = false) int rows,
            @ApiParam(name = "page", value = "页码", defaultValue = "1")
            @RequestParam(value = "page", required = false) int page,
            @ApiParam(name = "version", value = "版本", defaultValue = "")
            @ApiParam(name = "version", value = "版本")
            @RequestParam(value = "version") String version) throws IOException {
        List<StdDatasetRelation> responseEntity = stdRelationService.searchPage(StdIndex.class, StandardVersion.StdIndexTable,version, filters, sorts, page, rows,true);
        List<StdDatasetRelation> all = stdRelationService.searchPage(StdIndex.class, StandardVersion.StdIndexTable,version, filters, sorts, null, null,true);
        Long count = Long.valueOf(all.size());
        Long count = (long) all.size();
        List<MStdDatasetRelation> list = (List<MStdDatasetRelation>) convertToModels(responseEntity, new ArrayList<MStdDatasetRelation>(responseEntity.size()), MStdDatasetRelation.class, null);
        return PageEnvelop.getSuccessListWithPage("查询成功",list,page,rows,count);
@@ -56,13 +56,13 @@ public class StdRelationController extends EnvelopRestEndpoint {
    @ApiOperation("获取列表数据(不分页)")
    @RequestMapping(value = ServiceApi.StdRelation.ListNoPage, method = RequestMethod.GET)
    public Envelop getListNoPage(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段", defaultValue = "")
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件", defaultValue = "")
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档", defaultValue = "")
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
            @RequestParam(value = "sorts", required = false) String sorts,
            @ApiParam(name = "version", value = "版本", defaultValue = "")
            @ApiParam(name = "version", value = "版本")
            @RequestParam(value = "version") String version) throws IOException {
        List<StdDatasetRelation> responseEntity = stdRelationService.searchPage(StdDatasetRelation.class, StandardVersion.StdRelationTable,version, filters, sorts, null, null,true);
        List<MStdDatasetRelation> list = (List<MStdDatasetRelation>) convertToModels(responseEntity, new ArrayList<MStdDatasetRelation>(responseEntity.size()), MStdDatasetRelation.class, null);

svr/svr-basic/src/main/java/com/yihu/jw/basic/user/controller/RolesEndPoint.java

@@ -33,7 +33,6 @@ import java.util.Map;
 * Created by yww on 2016/7/7.
 */
@RestController
@Controller
@RequestMapping(ApiVersion.Version1_0)
@Api(value = "roles", description = "角色管理", tags = {"安全管理-角色管理"})
public class RolesEndPoint extends EnvelopRestEndpoint {