标准接口嗲用修改

src/main/java/com/yihu/hos/interceptor/WebMvcInterceptor.java

@@ -39,6 +39,8 @@ public class WebMvcInterceptor extends HandlerInterceptorAdapter {
                }
            }
            request.setAttribute(ContextAttributes.SCHEMA, LocalContext.getContext().getAttachment(ContextAttributes.SCHEMA));
        }
        return true;
    }

src/main/java/com/yihu/hos/standard/controller/AdapterDatasetController.java

@@ -1,5 +1,6 @@
package com.yihu.hos.standard.controller;
import com.yihu.hos.standard.model.adapter.AdapterDatasetModel;
import com.yihu.hos.standard.service.adapter.AdapterDatasetClient;
import com.yihu.hos.web.framework.model.DetailModelResult;
import com.yihu.hos.web.framework.model.Result;
@@ -52,7 +53,7 @@ public class AdapterDatasetController extends BaseController {
    @RequestMapping("/getForDatasetId")
    @ApiOperation(value = "获取适配数据集", response = Result.class, produces = "application/json", notes = "获取适配数据集")
    public Result getForDatasetId(
    public AdapterDatasetModel getForDatasetId(
            @ApiParam(name = "adapterVersion", value = "适配版本号")
            @RequestParam(value = "adapterVersion") String adapterVersion,
            @ApiParam(name = "datasetId", value = "适配数据集ID")
@@ -73,7 +74,7 @@ public class AdapterDatasetController extends BaseController {
    @RequestMapping(value = "/updateDataset")
    @ApiOperation(value = "修改适配数据集", response = Result.class, produces = "application/json", notes = "修改适配数据集")
    public Result modify(
    public AdapterDatasetModel modify(
            @ApiParam(name = "adapterVersion", value = "适配版本号")
            @RequestParam(value = "adapterVersion") String adapterVersion,
            @ApiParam(name = "dataset", value = "数据集,JSON")
@@ -83,7 +84,7 @@ public class AdapterDatasetController extends BaseController {
    @RequestMapping(value = "/addDataset")
    @ApiOperation(value = "保存适配数据集", response = Result.class, produces = "application/json", notes = "保存数据集")
    public Result add(
    public AdapterDatasetModel add(
            @ApiParam(name = "adapterVersion", value = "适配版本号")
            @RequestParam(value = "adapterVersion") String adapterVersion,
            @ApiParam(name = "dataset", value = "数据集信息")

src/main/java/com/yihu/hos/standard/controller/AdapterDictController.java

@@ -1,6 +1,7 @@
package com.yihu.hos.standard.controller;
import com.yihu.hos.standard.service.adapter.AdapterDictClient;
import com.yihu.hos.web.framework.model.ActionResult;
import com.yihu.hos.web.framework.model.DetailModelResult;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.util.controller.BaseController;
@@ -47,7 +48,7 @@ public class AdapterDictController extends BaseController {
    @RequestMapping(value = "/getForDictId")
    @ApiOperation(value = "获取字典", response = Result.class, produces = "application/json", notes = "获取字典")
    public Result get(
    public ActionResult get(
            @ApiParam(name = "adapterVersion", value = "标准版本号")
            @RequestParam(value = "adapterVersion") String adapterVersion,
            @ApiParam(name = "dictId", value = "字典ID")
@@ -67,7 +68,7 @@ public class AdapterDictController extends BaseController {
    
    @RequestMapping(value = "/updateDict")
    @ApiOperation(value = "修改字典", response = Result.class, produces = "application/json", notes = "修改字典")
    public Result updateDict(
    public ActionResult updateDict(
            @ApiParam(name = "adapterVersion", value = "标准版本号")
            @RequestParam(value = "adapterVersion") String adapterVersion,
            @ApiParam(name = "dict", value = "字典")
@@ -77,7 +78,7 @@ public class AdapterDictController extends BaseController {
    @RequestMapping(value = "/addDict")
    @ApiOperation(value = "保存字典", response = Result.class, produces = "application/json", notes = "保存字典")
    public Result addDict(
    public ActionResult addDict(
            @ApiParam(name = "adapterVersion", value = "标准版本号")
            @RequestParam(value = "adapterVersion") String adapterVersion,
            @ApiParam(name = "dict", value = "字典")
@@ -88,7 +89,7 @@ public class AdapterDictController extends BaseController {
    @RequestMapping(value = "/isStrategyDic", method = RequestMethod.POST , produces = "application/json")
    @ResponseBody
    @ApiOperation(value = "是否智能匹配", response = Object.class, produces = "application/json", notes = "是否智能匹配")
    public Result isStrategy(
    public ActionResult isStrategy(
            @ApiParam(value = "匹配version", required = true) @RequestParam("version") String version
    ) throws Exception {
        return adapterDictClient.isStrategy(version);
@@ -104,7 +105,7 @@ public class AdapterDictController extends BaseController {
    @ResponseBody
    @RequestMapping(value = "/strategyDic", method = RequestMethod.POST)
    @ApiOperation(value = "智能匹配", response = Object.class, produces = "application/json", notes = "智能匹配")
    public Result strategyDic(
    public ActionResult strategyDic(
            @ApiParam(value = "匹配version", required = true) @RequestParam("version") String version,
            @ApiParam(value = "平台标准version", required = true) @RequestParam("std_version") String std_version,
            @ApiParam(value = "适配方案版本号", required = true) @RequestParam("adapter_std_version") String adapter_std_version
@@ -115,7 +116,7 @@ public class AdapterDictController extends BaseController {
    @RequestMapping(value = "/getStrategyDicSize", method = RequestMethod.POST)
    @ResponseBody
    @ApiOperation(value = "智能匹配进行", response = Object.class, produces = "application/json", notes = "智能匹配进行")
    public Result getStrategyDicSize(
    public ActionResult getStrategyDicSize(
            @ApiParam(value = "匹配version", required = true) @RequestParam("version") String version
    ) throws Exception {
        return adapterDictClient.getStrategyDicSize(version);
@@ -124,7 +125,7 @@ public class AdapterDictController extends BaseController {
    @RequestMapping(value = "/endStrategyDic", method = RequestMethod.POST)
    @ResponseBody
    @ApiOperation(value = "智能匹配結束", response = Object.class, produces = "application/json", notes = "智能匹配結束")
    public Result endStrategyDic(
    public ActionResult endStrategyDic(
            @ApiParam(value = "匹配version", required = true) @RequestParam("version") String version
    ) throws Exception {
        return adapterDictClient.endStrategyDic(version);

src/main/java/com/yihu/hos/standard/controller/AdapterDictEntryController.java

@@ -1,5 +1,6 @@
package com.yihu.hos.standard.controller;
import com.yihu.hos.standard.model.adapter.AdapterDictEntryModel;
import com.yihu.hos.standard.service.adapter.AdapterDictEntryClient;
import com.yihu.hos.web.framework.model.DetailModelResult;
import com.yihu.hos.web.framework.model.Result;
@@ -49,7 +50,7 @@ public class AdapterDictEntryController extends BaseController {
    @RequestMapping(value = "/getForDictEntryId")
    @ApiOperation(value = "获取字典项", response = Result.class, produces = "application/json", notes = "获取字典项")
    public Result get(
    public AdapterDictEntryModel get(
            @ApiParam(name = "adapterVersion", value = "标准版本号")
            @RequestParam(value = "adapterVersion") String adapterVersion,
            @ApiParam(name = "dictEntryId", value = "字典项ID")
@@ -59,7 +60,7 @@ public class AdapterDictEntryController extends BaseController {
    @RequestMapping(value = "/updateDictEntry")
    @ApiOperation(value = "修改字典项", response = Result.class, produces = "application/json", notes = "修改字典项")
    public Result updateDictEntry(
    public AdapterDictEntryModel updateDictEntry(
            @ApiParam(name = "adapterVersion", value = "标准版本号")
            @RequestParam(value = "adapterVersion") String adapterVersion,
            @ApiParam(name = "dictEntry", value = "字典项")
@@ -69,7 +70,7 @@ public class AdapterDictEntryController extends BaseController {
    @RequestMapping(value = "/addDictEntry")
    @ApiOperation(value = "保存字典项", response = Result.class, produces = "application/json", notes = "保存字典项")
    public Result add(
    public AdapterDictEntryModel add(
            @ApiParam(name = "adapterVersion", value = "标准版本号")
            @RequestParam(value = "adapterVersion") String adapterVersion,
            @ApiParam(name = "dictEntry", value = "字典项")

src/main/java/com/yihu/hos/standard/controller/StandardController.java

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@@ -53,7 +54,7 @@ public class StandardController extends BaseController {
     * @return
     * @throws Exception
     */
    @RequestMapping("/getForStandardId")
    @RequestMapping(value = "/getForStandardId", method = RequestMethod.GET)
    @ApiOperation(value = "获取标准", response = Result.class, produces = "application/json", notes = "获取标准")
    public Result getForStandardId(
            @ApiParam(name = "standardId", value = "标准ID")
@@ -67,7 +68,7 @@ public class StandardController extends BaseController {
     * @return
     * @throws Exception
     */
    @RequestMapping("/updateStandard")
    @RequestMapping(value = "/updateStandard", method = RequestMethod.POST)
    @ApiOperation(value = "修改标准", response = Result.class, produces = "application/json", notes = "修改标准")
    public Result modify(
            @ApiParam(name = "standard", value = "标准基本信息")
@@ -81,7 +82,7 @@ public class StandardController extends BaseController {
     * @return
     * @throws Exception
     */
    @RequestMapping("/addStandard")
    @RequestMapping(value = "/addStandard", method = RequestMethod.POST)
    @ApiOperation(value = "保存标准", response = Result.class, produces = "application/json", notes = "保存标准")
    public Result add(
            @ApiParam(name = "standard", value = "标准基本信息")

src/main/java/com/yihu/hos/standard/service/adapter/AdapterDatasetClient.java

@@ -1,6 +1,7 @@
package com.yihu.hos.standard.service.adapter;
import com.yihu.hos.core.constants.MicroServices;
import com.yihu.hos.standard.model.adapter.AdapterDatasetModel;
import com.yihu.hos.web.framework.model.DetailModelResult;
import com.yihu.hos.web.framework.model.Result;
import io.swagger.annotations.ApiOperation;
@@ -31,7 +32,7 @@ public interface AdapterDatasetClient  {
    @RequestMapping("/getForDatasetId")
    @ApiOperation(value = "获取适配数据集", response = Result.class, produces = "application/json", notes = "获取适配数据集")
    public Result getForDatasetId(
    public AdapterDatasetModel getForDatasetId(
            @RequestParam(value = "adapterVersion") String adapterVersion,
            @RequestParam(value = "datasetId") Integer datasetId) ;
@@ -43,13 +44,13 @@ public interface AdapterDatasetClient  {
    @RequestMapping(value = "/updateDataset")
    @ApiOperation(value = "修改适配数据集", response = Result.class, produces = "application/json", notes = "修改适配数据集")
    public Result modify(
    public AdapterDatasetModel modify(
            @RequestParam(value = "adapterVersion") String adapterVersion,
            @RequestParam(value = "dataset") String dataset);
    @RequestMapping(value = "/addDataset")
    @ApiOperation(value = "保存适配数据集", response = Result.class, produces = "application/json", notes = "保存数据集")
    public Result add(
    public AdapterDatasetModel add(
            @RequestParam(value = "adapterVersion") String adapterVersion,
            @RequestParam(value = "dataset") String dataset) ;

src/main/java/com/yihu/hos/standard/service/adapter/AdapterDictClient.java

@@ -1,6 +1,7 @@
package com.yihu.hos.standard.service.adapter;
import com.yihu.hos.core.constants.MicroServices;
import com.yihu.hos.web.framework.model.ActionResult;
import com.yihu.hos.web.framework.model.DetailModelResult;
import com.yihu.hos.web.framework.model.Result;
import io.swagger.annotations.ApiOperation;
@@ -38,7 +39,7 @@ public interface AdapterDictClient {
    @RequestMapping(value = "/getForDictId")
    @ApiOperation(value = "获取字典", response = Result.class, produces = "application/json", notes = "获取字典")
    public Result get(
    public ActionResult get(
            @ApiParam(name = "adapterVersion", value = "标准版本号")
            @RequestParam(value = "adapterVersion") String adapterVersion,
            @ApiParam(name = "dictId", value = "字典ID")
@@ -54,7 +55,7 @@ public interface AdapterDictClient {
    
    @RequestMapping(value = "/updateDict")
    @ApiOperation(value = "修改字典", response = Result.class, produces = "application/json", notes = "修改字典")
    public Result updateDict(
    public ActionResult updateDict(
            @ApiParam(name = "adapterVersion", value = "标准版本号")
            @RequestParam(value = "adapterVersion") String adapterVersion,
            @ApiParam(name = "dict", value = "字典")
@@ -62,7 +63,7 @@ public interface AdapterDictClient {
    @RequestMapping(value = "/addDict")
    @ApiOperation(value = "保存字典", response = Result.class, produces = "application/json", notes = "保存字典")
    public Result addDict(
    public ActionResult addDict(
            @ApiParam(name = "adapterVersion", value = "标准版本号")
            @RequestParam(value = "adapterVersion") String adapterVersion,
            @ApiParam(name = "dict", value = "字典")
@@ -71,7 +72,7 @@ public interface AdapterDictClient {
    @RequestMapping(value = "/isStrategyDic", method = RequestMethod.POST , produces = "application/json")
    @ResponseBody
    @ApiOperation(value = "是否智能匹配", response = Object.class, produces = "application/json", notes = "是否智能匹配")
    public Result isStrategy(
    public ActionResult isStrategy(
            @ApiParam(value = "匹配version", required = true) @RequestParam("version") String version
    ) ;
@@ -85,7 +86,7 @@ public interface AdapterDictClient {
    @ResponseBody
    @RequestMapping(value = "/strategyDic", method = RequestMethod.POST)
    @ApiOperation(value = "智能匹配", response = Object.class, produces = "application/json", notes = "智能匹配")
    public Result strategyDic(
    public ActionResult strategyDic(
            @ApiParam(value = "匹配version", required = true) @RequestParam("version") String version,
            @ApiParam(value = "平台标准version", required = true) @RequestParam("std_version") String std_version,
            @ApiParam(value = "适配方案版本号", required = true) @RequestParam("adapter_std_version") String adapter_std_version
@@ -94,14 +95,14 @@ public interface AdapterDictClient {
    @RequestMapping(value = "/getStrategyDicSize", method = RequestMethod.POST)
    @ResponseBody
    @ApiOperation(value = "智能匹配进行", response = Object.class, produces = "application/json", notes = "智能匹配进行")
    public Result getStrategyDicSize(
    public ActionResult getStrategyDicSize(
            @ApiParam(value = "匹配version", required = true) @RequestParam("version") String version
    );
    @RequestMapping(value = "/endStrategyDic", method = RequestMethod.POST)
    @ResponseBody
    @ApiOperation(value = "智能匹配結束", response = Object.class, produces = "application/json", notes = "智能匹配結束")
    public Result endStrategyDic(
    public ActionResult endStrategyDic(
            @ApiParam(value = "匹配version", required = true) @RequestParam("version") String version
    );

src/main/java/com/yihu/hos/standard/service/adapter/AdapterDictEntryClient.java

@@ -1,6 +1,7 @@
package com.yihu.hos.standard.service.adapter;
import com.yihu.hos.core.constants.MicroServices;
import com.yihu.hos.standard.model.adapter.AdapterDictEntryModel;
import com.yihu.hos.web.framework.model.DetailModelResult;
import com.yihu.hos.web.framework.model.Result;
import org.springframework.cloud.netflix.feign.FeignClient;
@@ -27,17 +28,17 @@ public interface AdapterDictEntryClient  {
            @RequestParam(value = "page", required = false) Integer page);
    @RequestMapping(value = "/getForDictEntryId")
    public Result get(
    public AdapterDictEntryModel get(
            @RequestParam(value = "adapterVersion") String adapterVersion,
            @RequestParam(value = "dictEntryId") Integer dictentryId) ;
    @RequestMapping(value = "/updateDictEntry")
    public Result updateDictEntry(
    public AdapterDictEntryModel updateDictEntry(
            @RequestParam(value = "adapterVersion") String adapterVersion,
            @RequestParam(value = "dictEntry") String dictEntry);
    @RequestMapping(value = "/addDictEntry")
    public Result add(
    public AdapterDictEntryModel add(
            @RequestParam(value = "adapterVersion") String adapterVersion,
            @RequestParam(value = "dictEntry") String dictEntry) ;

src/main/java/com/yihu/hos/standard/service/adapter/AdapterMetadataClient.java

@@ -1,6 +1,8 @@
package com.yihu.hos.standard.service.adapter;
import com.yihu.hos.core.constants.MicroServices;
import com.yihu.hos.standard.model.adapter.AdapterMetadataModel;
import com.yihu.hos.web.framework.model.ActionResult;
import com.yihu.hos.web.framework.model.DetailModelResult;
import com.yihu.hos.web.framework.model.Result;
import io.swagger.annotations.ApiOperation;
@@ -30,17 +32,17 @@ public interface AdapterMetadataClient {
            @RequestParam(value = "page", required = false) Integer page) ;
    @RequestMapping("/getForMetadataId")
     public Result get(
     public AdapterMetadataModel get(
            @RequestParam(value = "adapterVersion") String adapterVersion,
            @RequestParam(value = "metadataId") Integer metadataId) ;
    @RequestMapping("/updateMetadata")
    public Result updateMetadata(
    public AdapterMetadataModel updateMetadata(
            @RequestParam(value = "adapterVersion") String adapterVersion,
            @RequestParam(value = "metadata") String metadata);
    @RequestMapping("/addMetadata")
    public Result addMetadata(
    public AdapterMetadataModel addMetadata(
            @RequestParam(value = "adapterVersion") String adapterVersion,
            @RequestParam(value = "metadata") String metadata) ;
@@ -58,7 +60,7 @@ public interface AdapterMetadataClient {
    @RequestMapping(value = "/isStrategy", method = RequestMethod.POST , produces = "application/json")
    @ResponseBody
    public Result isStrategy(
    public ActionResult isStrategy(
            @ApiParam(value = "匹配version", required = true) @RequestParam("version") String version
    );
@@ -72,7 +74,7 @@ public interface AdapterMetadataClient {
    @ResponseBody
    @RequestMapping(value = "/strategy", method = RequestMethod.POST)
    @ApiOperation(value = "智能匹配", response = Object.class, produces = "application/json", notes = "智能匹配")
    public Result strategy(
    public ActionResult strategy(
            @ApiParam(value = "匹配version", required = true) @RequestParam("version") String version,
            @ApiParam(value = "平台标准version", required = true) @RequestParam("std_version") String std_version,
            @ApiParam(value = "适配方案版本号", required = true) @RequestParam("adapter_std_version") String adapter_std_version
@@ -80,13 +82,13 @@ public interface AdapterMetadataClient {
    @RequestMapping(value = "/getStrategySize", method = RequestMethod.POST)
    @ResponseBody
    public Result getStrategySize(
    public ActionResult getStrategySize(
            @ApiParam(value = "匹配version", required = true) @RequestParam("version") String version
    ) ;
    @RequestMapping(value = "/endStrategy", method = RequestMethod.POST)
    @ResponseBody
    public Result endStrategy(
    public ActionResult endStrategy(
            @ApiParam(value = "匹配version", required = true) @RequestParam("version") String version
    ) ;
}

src/main/java/com/yihu/hos/standard/service/standard/PublisherClient.java

@@ -1,6 +1,7 @@
package com.yihu.hos.standard.service.standard;
import com.yihu.hos.core.constants.MicroServices;
import com.yihu.hos.standard.model.standard.resultModel.PublisherResultModel;
import com.yihu.hos.web.framework.model.DictionaryResult;
import com.yihu.hos.web.framework.model.Result;
import io.swagger.annotations.ApiOperation;
@@ -22,13 +23,13 @@ public interface PublisherClient  {
    @RequestMapping(value = "/getForPublisherId")
    @ApiOperation(value = "获取发布机构", response = Result.class, produces = "application/json", notes = "获取发布机构")
    public Result get(
    public PublisherResultModel get(
            @ApiParam(name = "publisherId", value = "机构ID")
            @RequestParam(value = "publisherId") String publisherId);
    @RequestMapping(value = "/getStandardPublisher")
    @ApiOperation(value = "获取发布机构", response = Result.class, produces = "application/json", notes = "获取发布机构")
    public Result getStandardPublisher();
    public PublisherResultModel getStandardPublisher();
    /**
     * 获取发布机构名称列表

src/main/java/com/yihu/hos/standard/service/standard/SchemeClient.java

@@ -1,6 +1,7 @@
package com.yihu.hos.standard.service.standard;
import com.yihu.hos.core.constants.MicroServices;
import com.yihu.hos.standard.model.adapter.AdapterSchemeModel;
import com.yihu.hos.web.framework.model.DetailModelResult;
import com.yihu.hos.web.framework.model.Result;
import io.swagger.annotations.ApiOperation;
@@ -29,7 +30,7 @@ public interface SchemeClient  {
     */
    @RequestMapping(value = "/getForSchemeId")
    @ApiOperation(value = "获取适配方案", response = Result.class, produces = "application/json", notes = "获取适配方案")
    public Result get(
    public AdapterSchemeModel get(
            @ApiParam(name = "schemeId", value = "标准版本ID")
            @RequestParam(value = "schemeId") Integer schemeId) ;
@@ -41,7 +42,7 @@ public interface SchemeClient  {
     */
    @RequestMapping("/updateScheme")
    @ApiOperation(value = "修改适配方案", response = Result.class, produces = "application/json", notes = "修改适配方案")
    public Result modify(
    public AdapterSchemeModel modify(
            @ApiParam(name = "scheme", value = "适配方案")
            @RequestParam(value = "scheme") String scheme) ;
@@ -53,7 +54,7 @@ public interface SchemeClient  {
     */
    @RequestMapping(value = "/addScheme")
    @ApiOperation(value = "保存适配方案", response = Result.class, produces = "application/json", notes = "保存适配方案")
    public Result add(
    public AdapterSchemeModel add(
            @ApiParam(name = "scheme", value = "适配方案信息")
            @RequestParam(value = "scheme") String scheme);

src/main/java/com/yihu/hos/standard/service/standard/SchemeVersionClient.java

@@ -1,6 +1,7 @@
package com.yihu.hos.standard.service.standard;
import com.yihu.hos.core.constants.MicroServices;
import com.yihu.hos.standard.model.adapter.AdapterSchemeVersionModel;
import com.yihu.hos.web.framework.model.DataGridResult;
import com.yihu.hos.web.framework.model.DictionaryResult;
import com.yihu.hos.web.framework.model.Result;
@@ -21,7 +22,7 @@ public interface SchemeVersionClient  {
    @RequestMapping("/getForVersionId")
    @ApiOperation(value = "获取适配版本", response = Result.class, produces = "application/json", notes = "获取适配版本")
    public Result get(
    public AdapterSchemeVersionModel get(
            @RequestParam(value = "versionId") Integer versionId);
    /**
@@ -32,7 +33,7 @@ public interface SchemeVersionClient  {
     */
    @RequestMapping("/addVersion")
    @ApiOperation(value = "保存适配版本", response = Result.class, produces = "application/json", notes = "保存适配版本")
    public Result add(
    public AdapterSchemeVersionModel add(
            @RequestParam(value = "version") String version) ;
    /**
@@ -43,7 +44,7 @@ public interface SchemeVersionClient  {
     */
    @RequestMapping("/updateVersion")
    @ApiOperation(value = "修改适配版本", response = Result.class, produces = "application/json", notes = "修改适配版本")
    public Result modify(
    public AdapterSchemeVersionModel modify(
            @RequestParam(value = "version") String version);
    /**
@@ -54,7 +55,7 @@ public interface SchemeVersionClient  {
     */
    @RequestMapping("/publishVersion")
    @ApiOperation(value = "发布适配版本", response = Result.class, produces = "application/json", notes = "发布适配版本")
    public Result publish(
    public AdapterSchemeVersionModel publish(
            @RequestParam(value = "versionId") Integer versionId,
            @RequestParam(value = "publisher", required = false) String publisher);

src/main/java/com/yihu/hos/standard/service/standard/StandardClient.java

@@ -1,12 +1,14 @@
package com.yihu.hos.standard.service.standard;
import com.yihu.hos.core.constants.MicroServices;
import com.yihu.hos.standard.model.standard.StandardModel;
import com.yihu.hos.standard.model.standard.resultModel.StandardParamResultModel;
import com.yihu.hos.web.framework.model.DetailModelResult;
import com.yihu.hos.web.framework.model.DictionaryResult;
import com.yihu.hos.web.framework.model.Result;
import org.springframework.cloud.netflix.feign.FeignClient;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import springfox.documentation.annotations.ApiIgnore;
@@ -39,7 +41,7 @@ public interface StandardClient {
     * @throws Exception
     */
    @RequestMapping("/getForStandardId")
    public Result getForStandardId(
    public StandardModel getForStandardId(
            @RequestParam(value = "standardId") Integer standardId);
    /**
@@ -48,8 +50,8 @@ public interface StandardClient {
     * @return
     * @throws Exception
     */
    @RequestMapping("/updateStandard")
    public Result modify(
    @RequestMapping(value = "/updateStandard", method = RequestMethod.POST)
    public StandardModel modify(
            @RequestParam(value = "standard") String standard);
    /**
@@ -58,8 +60,8 @@ public interface StandardClient {
     * @return
     * @throws Exception
     */
    @RequestMapping("/addStandard")
    public Result add(
    @RequestMapping(value = "/addStandard", method = RequestMethod.POST)
    public StandardModel add(
            @RequestParam(value = "standard") String standard);
    /**

src/main/java/com/yihu/hos/standard/service/standard/StandardVersionClient.java

@@ -1,6 +1,8 @@
package com.yihu.hos.standard.service.standard;
import com.yihu.hos.core.constants.MicroServices;
import com.yihu.hos.standard.model.standard.StandardVersionModel;
import com.yihu.hos.web.framework.model.ActionResult;
import com.yihu.hos.web.framework.model.DictionaryResult;
import com.yihu.hos.web.framework.model.Result;
import org.springframework.cloud.netflix.feign.FeignClient;
@@ -26,7 +28,7 @@ public interface StandardVersionClient {
     * @throws Exception
     */
    @RequestMapping("/getForVersionId")
    public Result getForVersionId(
    public StandardVersionModel getForVersionId(
            @RequestParam(value = "versionId") Integer versionId) ;
    /**
@@ -36,7 +38,7 @@ public interface StandardVersionClient {
     * @throws Exception
     */
    @RequestMapping("/addVersion")
    public Result addVersion(
    public StandardVersionModel addVersion(
            @RequestParam(value = "version") String version) ;
    /**
@@ -46,7 +48,7 @@ public interface StandardVersionClient {
     * @throws Exception
     */
    @RequestMapping("/updateVersion")
    public Result updateVersion(
    public StandardVersionModel updateVersion(
            @RequestParam(value = "version") String version) ;
    /**
@@ -57,7 +59,7 @@ public interface StandardVersionClient {
     * @throws Exception
     */
    @RequestMapping("/publishVersion")
    public Result publish(
    public StandardVersionModel publish(
            @RequestParam(value = "versionId") Integer versionId,
            @RequestParam(value = "publisher") String publisher) ;
@@ -95,14 +97,14 @@ public interface StandardVersionClient {
     */
   
    @RequestMapping(value = "/importFile", method = RequestMethod.POST)
    public Result importFile(@RequestParam("type") String type,
                            @RequestParam(value = "version") String version,
                             @RequestParam(value = "standardId") Integer standardId,
                            @RequestParam(value = "file") MultipartFile file);
    public ActionResult importFile(@RequestParam("type") String type,
                                   @RequestParam(value = "version") String version,
                                   @RequestParam(value = "standardId") Integer standardId,
                                   @RequestParam(value = "file") MultipartFile file);
   
    @RequestMapping(value = "/isUpdateDatasetAndDict", method = RequestMethod.POST)
    public Result isUpdateDatasetAndDict(
    public ActionResult isUpdateDatasetAndDict(
            @RequestParam(value = "version") String version) ;
    /**
@@ -114,7 +116,7 @@ public interface StandardVersionClient {
     */
   
    @RequestMapping(value = "/deleteByType", method = RequestMethod.POST)
    public Result deleteByType(
    public ActionResult deleteByType(
            @RequestParam(value = "type") String type,
             @RequestParam(value = "version") String version) ;

src/main/java/com/yihu/hos/standard/service/standard/StdDictClient.java

@@ -1,6 +1,7 @@
package com.yihu.hos.standard.service.standard;
import com.yihu.hos.core.constants.MicroServices;
import com.yihu.hos.standard.model.standard.StdDictionaryModel;
import com.yihu.hos.web.framework.model.DetailModelResult;
import com.yihu.hos.web.framework.model.DictionaryResult;
import com.yihu.hos.web.framework.model.Result;
@@ -36,7 +37,7 @@ public interface StdDictClient {
    @RequestMapping("/getForDictId")
    @ApiOperation(value = "获取字典", response = Result.class, produces = "application/json", notes = "获取字典")
    public Result get(
    public StdDictionaryModel get(
            @RequestParam(value = "stdVersion") String stdVersion,
            @RequestParam(value = "dictId") Integer dictId);
@@ -49,7 +50,7 @@ public interface StdDictClient {
    
    @RequestMapping("/updateDict")
    @ApiOperation(value = "修改字典", response = Result.class, produces = "application/json", notes = "修改字典")
    public Result modify(
    public StdDictionaryModel modify(
            @ApiParam(name = "stdVersion", value = "stdVersion")
            @RequestParam(value = "stdVersion") String stdVersion,
            @ApiParam(name = "dict", value = "字典")
@@ -57,7 +58,7 @@ public interface StdDictClient {
    @RequestMapping("/addDict")
    @ApiOperation(value = "保存字典", response = Result.class, produces = "application/json", notes = "保存字典")
    public Result addDict(
    public StdDictionaryModel addDict(
            @ApiParam(name = "stdVersion", value = "stdVersion")
            @RequestParam(value = "stdVersion") String stdVersion,
            @ApiParam(name = "dict", value = "字典")

src/main/java/com/yihu/hos/standard/service/standard/StdDictEntryClient.java

@@ -1,6 +1,7 @@
package com.yihu.hos.standard.service.standard;
import com.yihu.hos.core.constants.MicroServices;
import com.yihu.hos.standard.model.standard.StdDictionaryEntryModel;
import com.yihu.hos.web.framework.model.DetailModelResult;
import com.yihu.hos.web.framework.model.Result;
import io.swagger.annotations.ApiOperation;
@@ -30,7 +31,7 @@ public interface StdDictEntryClient {
    @RequestMapping("/getForDictEntryId")
    @ApiOperation(value = "获取字典", response = Result.class, produces = "application/json", notes = "获取字典")
    public Result get(
    public StdDictionaryEntryModel get(
            @RequestParam(value = "stdVersion") String stdVersion,
            @RequestParam(value = "dictEntryId") Integer dictEntryId);
@@ -42,13 +43,13 @@ public interface StdDictEntryClient {
    @RequestMapping("/updateDictEntry")
    @ApiOperation(value = "修改字典", response = Result.class, produces = "application/json", notes = "修改字典")
    public Result modify(
    public StdDictionaryEntryModel modify(
            @RequestParam(value = "stdVersion") String stdVersion,
            @RequestParam(value = "dictEntry") String dictEntry);
    @RequestMapping("/addDictEntry")
    @ApiOperation(value = "保存字典", response = Result.class, produces = "application/json", notes = "保存字典")
    public Result add(
    public StdDictionaryEntryModel add(
            @ApiParam(name = "stdVersion", value = "stdVersion")
            @RequestParam(value = "stdVersion") String stdVersion,
            @ApiParam(name = "dictEntry", value = "字典")

src/main/java/com/yihu/hos/standard/service/standard/StdMetadataClient.java

@@ -1,6 +1,7 @@
package com.yihu.hos.standard.service.standard;
import com.yihu.hos.core.constants.MicroServices;
import com.yihu.hos.standard.model.standard.StdMetaDataModel;
import com.yihu.hos.web.framework.model.DetailModelResult;
import com.yihu.hos.web.framework.model.Result;
import io.swagger.annotations.ApiOperation;
@@ -30,7 +31,7 @@ public interface StdMetadataClient{
    @RequestMapping("/getForMetadataId")
    @ApiOperation(value = "获取数据元", response = Result.class, produces = "application/json", notes = "获取数据元")
    public Result getForMetadataId(
    public StdMetaDataModel getForMetadataId(
            @RequestParam(value = "stdVersion") String stdVersion,
            @RequestParam(value = "metadataId") Integer metadataId) ;
@@ -42,13 +43,13 @@ public interface StdMetadataClient{
    @RequestMapping("/updateMetadata")
    @ApiOperation(value = "修改数据元", response = Result.class, produces = "application/json", notes = "修改数据元")
    public Result updateMetadata(
    public StdMetaDataModel updateMetadata(
            @RequestParam(value = "stdVersion") String stdVersion,
            @RequestParam(value = "metadata") String metadata) ;
    @RequestMapping("/addMetadata")
    @ApiOperation(value = "保存数据元", response = Result.class, produces = "application/json", notes = "保存数据元")
    public Result addMetadata(
    public StdMetaDataModel addMetadata(
            @RequestParam(value = "stdVersion") String stdVersion,
            @RequestParam(value = "metadata") String metadata) ;

src/main/resources/application.yml

@@ -17,7 +17,6 @@ spring:
    view:
      prefix: /WEB-INF/ehr/jsp/
      suffix: .jsp
---
spring:
  profiles: dev

src/main/webapp/WEB-INF/ehr/jsp/standard/integration/standardDetailJs.jsp

@@ -123,6 +123,7 @@
          }
          $.ajax({
              url: _url,
              type: "POST",
              dataType: "json",
              data:{standard: JSON.stringify(dataJson[0])},
              success: function (data) {