代码修改

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

@@ -9,17 +9,17 @@ import com.yihu.jw.entity.ehr.resource.RsResourceMetadata;
import com.yihu.jw.restmodel.ehr.resource.MRsMetadata;
import com.yihu.jw.restmodel.ehr.resource.MRsResourceMetadata;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.util.http.HttpClientUtil;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.domain.Page;
import org.springframework.ui.Model;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import java.util.*;
@@ -29,6 +29,7 @@ import java.util.*;
 */
@RestController
@RequestMapping("/resourceConfiguration")
@Api(tags = {"网关-资源配置服务控制器","网关-资源配置服务控制器"})
public class ResourceConfigurationController extends EnvelopRestEndpoint {
    @Autowired
@@ -38,7 +39,7 @@ public class ResourceConfigurationController extends EnvelopRestEndpoint {
    @Autowired
    private RsMetadataService metadataService;
    @RequestMapping("searchResourceConfiguration")
    @GetMapping("searchResourceConfiguration")
    public Object searchResourceConfiguration(String searchNm, int page, int rows) {
        Map<String, Object> params = new HashMap<>();
        String metaDataUrl = "/resources/metadata";
@@ -77,7 +78,7 @@ public class ResourceConfigurationController extends EnvelopRestEndpoint {
    }
    @RequestMapping("searchSelResourceConfiguration")
    @GetMapping("searchSelResourceConfiguration")
    public Object searchSelResourceConfiguration(String searchNm, String resourcesId, int page, int rows) {
        Map<String, Object> params = new HashMap<>();
        String ResourceMetadataUrl = "/resources/rs_metadata";
@@ -119,15 +120,17 @@ public class ResourceConfigurationController extends EnvelopRestEndpoint {
    }
    @RequestMapping("/saveResourceConfiguration")
    @PostMapping("/saveResourceConfiguration")
    public Envelop saveResourceConfiguration(String addRowDatas, String delRowDatas) {
        Map<String, Object> params = new HashMap<>();
        String resultStr = "";
        String metaDataUrl = "/resources/rs_metadata/batch";
        try {
            if (!StringUtils.isEmpty(delRowDatas)) {
                //执行删除操作
                rsMetadataDao.deleteById(delRowDatas);
                String ids[] = delRowDatas.split(",");
                for (String id:ids){
                    rsMetadataDao.deleteById(id);
                }
                return success("删除成功");
            }
            if (!StringUtils.isEmpty(addRowDatas)) {
@@ -137,7 +140,7 @@ public class ResourceConfigurationController extends EnvelopRestEndpoint {
                    metadata.setId(getObjectId(BizObject.ResourceMetadata));
                }
                List<RsResourceMetadata> metadataList = rsMetadataService.saveMetadataBatch(rsMetadata);
                return success("新增成功");
                return ListEnvelop.getSuccess("新增成功",metadataList);
            }
        } catch (Exception e) {
            e.printStackTrace();