冲突解决

Hos-resource/src/main/java/com/yihu/ehr/resource/controller/RsResourceController.java

@@ -71,11 +71,11 @@ public class RsResourceController extends BaseController {
     */
    @RequestMapping("/resourceTreeList")
    @ResponseBody
    public Result resourceTreeList() {
    public Result resourceTreeList(String name) {
        try {
            ActionResult actionResult = new ActionResult();
            actionResult.setData(resourceService.getResourceTreeList());
            actionResult.setData(resourceService.getResourceTreeList(name));
            return actionResult;
        } catch (Exception e) {
            e.printStackTrace();
@@ -85,10 +85,10 @@ public class RsResourceController extends BaseController {
    @RequestMapping("/resourceCategoryTreeList")
    @ResponseBody
    public Result resourceCategoryTreeList() {
    public Result resourceCategoryTreeList(String name) {
        try {
            ActionResult actionResult = new ActionResult();
            actionResult.setData(resourceService.resourceCategoryTreeList());
            actionResult.setData(resourceService.resourceCategoryTreeList(name));
            return actionResult;
        } catch (Exception e) {
            e.printStackTrace();

Hos-resource/src/main/java/com/yihu/ehr/resource/service/IRsResourceService.java

@@ -18,7 +18,7 @@ import java.util.Map;
 * Created by chenweida on 2015/12/15.
 */
public interface IRsResourceService {
    List<TreeResult> getResourceTreeList() throws Exception;
    List<TreeResult> getResourceTreeList(String name) throws Exception;
    DataGridResult getResourceList(Map<String, Object> conditionMap, Integer page, Integer rows) throws Exception;
@@ -34,7 +34,7 @@ public interface IRsResourceService {
    DataGridResult getResourceFiled(Map<String, Object> conditionMap, Integer page, Integer rows) throws Exception;
    List<TreeResult> resourceCategoryTreeList() throws Exception;
    List<TreeResult> resourceCategoryTreeList(String name) throws Exception;
    String searchRomoteResourceList(String code, Map<String, Object> params) throws Exception;

Hos-resource/src/main/java/com/yihu/ehr/resource/service/impl/RsResourceServiceImpl.java

@@ -53,43 +53,213 @@ public class RsResourceServiceImpl implements IRsResourceService {
    @Override
    public List<TreeResult> getResourceTreeList() throws Exception {
    public List<TreeResult> getResourceTreeList(String name) throws Exception {
        List<TreeResult> treeVOs = new ArrayList<TreeResult>();
        List<String> pidList = new ArrayList<>();
        List<String> pidList1 = new ArrayList<>();
        List<String> idList = new ArrayList<>();
        List<String> idList1 = new ArrayList<>();
        List<RsResourceCategory> rsCategorya = rsResourceCategoryDao.getAllRsResourceCategory();
        for (RsResourceCategory r : rsCategorya) {
            TreeResult treeVO = new TreeResult();
            treeVO.setId(r.getId());
            treeVO.setPid(r.getPid());
            treeVO.setText(r.getName());
            treeVO.setType("1");
            treeVOs.add(treeVO);
        if (name != null && name.length() > 0) {
            for (int i = 0; i < rsCategorya.size(); i++) {
                RsResourceCategory r = rsCategorya.get(i);
                TreeResult treeVO = new TreeResult();
                if (r.getName().contains(name)) {
                    treeVO.setId(r.getId());
                    treeVO.setPid(r.getPid());
                    pidList.add(r.getPid());
                    idList.add(r.getId());
                    treeVO.setText(r.getName());
                    treeVO.setType("1");
                    treeVOs.add(treeVO);
                    rsCategorya.remove(r);
                    i--;
                }
            }
        }
        return treeVOs;
        else {
            for (RsResourceCategory r : rsCategorya) {
                TreeResult treeVO = new TreeResult();
                treeVO.setId(r.getId());
                treeVO.setPid(r.getPid());
                treeVO.setText(r.getName());
                treeVO.setType("1");
                treeVOs.add(treeVO);
            }
        }
        while (pidList.size() > 0 || idList.size() > 0) {
            for (int i = 0; i < rsCategorya.size(); i++) {
                RsResourceCategory r1=rsCategorya.get(i);
                TreeResult treeVO = new TreeResult();
                if (pidList.contains(r1.getId())) {
                    treeVO.setId(r1.getId());
                    treeVO.setPid(r1.getPid());
                    pidList1.add(r1.getPid());
                    treeVO.setText(r1.getName());
                    treeVO.setType("1");
                    treeVOs.add(treeVO);
                    rsCategorya.remove(r1);
                    i--;
                }
                else if (idList.contains(r1.getPid())) {
                    treeVO.setId(r1.getId());
                    treeVO.setPid(r1.getPid());
                    idList1.add(r1.getId());
                    treeVO.setText(r1.getName());
                    treeVO.setType("1");
                    treeVOs.add(treeVO);
                    rsCategorya.remove(r1);
                    i--;
                }
            }
            pidList.clear();
            idList.clear();
            pidList.addAll(pidList1);
            idList.addAll(idList1);
            pidList1.clear();
            idList1.clear();
        }
            return treeVOs;
    }
    @Override
    public List<TreeResult> resourceCategoryTreeList() throws Exception {
    public List<TreeResult> resourceCategoryTreeList(String name) throws Exception {
        List<TreeResult> treeVOs = new ArrayList<TreeResult>();
        List<RsResourceCategory> rsCategorya = rsResourceCategoryDao.getAllRsResourceCategory();
        for (RsResourceCategory r : rsCategorya) {
            TreeResult treeVO = new TreeResult();
            treeVO.setId(r.getId());
            treeVO.setPid(r.getPid());
            treeVO.setText(r.getName());
            treeVO.setType("1");
            treeVO.setIcon("../develop/lib/ligerui/skins/Aqua/images/tree/folder.gif");
            treeVOs.add(treeVO);
        List<String > pidList=new ArrayList<>();
        List<String > pidList1=new ArrayList<>();
        List<String > idList=new ArrayList<>();
        List<String > idList1=new ArrayList<>();
        if(name!=null&&name.length()>0) {
            for (int i=0;i<rsCategorya.size();i++) {
                RsResourceCategory  r=rsCategorya.get(i);
                TreeResult treeVO = new TreeResult();
                if(r.getName().contains(name)) {
                    treeVO.setId(r.getId());
                    treeVO.setPid(r.getPid());
                    pidList.add(r.getPid());
                    idList.add(r.getId());
                    treeVO.setText(r.getName());
                    treeVO.setType("1");
                    treeVO.setIcon("../develop/lib/ligerui/skins/Aqua/images/tree/folder.gif");
                    treeVOs.add(treeVO);
                    rsCategorya.remove(r);
                    i--;
                }
            }
        }
        else{
            for (RsResourceCategory r : rsCategorya) {
                TreeResult treeVO = new TreeResult();
                treeVO.setId(r.getId());
                treeVO.setPid(r.getPid());
                treeVO.setText(r.getName());
                treeVO.setType("1");
                treeVO.setIcon("../develop/lib/ligerui/skins/Aqua/images/tree/folder.gif");
                treeVOs.add(treeVO);
            }
        }
        List<RsResource> rsResources = rsResourceDao.getAllRsResource();
        for (RsResource r : rsResources) {
            TreeResult treeVO = new TreeResult();
            treeVO.setId(r.getId());
            treeVO.setPid(r.getCategory());
            treeVO.setText(r.getName());
            treeVO.setType("2");
            treeVO.setIcon("../develop/lib/ligerui/skins/Aqua/images/tree/tree-leaf.gif");
            treeVOs.add(treeVO);
        if(name!=null&&name.length()>0) {
            for (int i=0;i<rsResources.size();i++) {
                RsResource r =rsResources.get(i);
                TreeResult treeVO = new TreeResult();
                if(r.getName().contains(name)) {
                    treeVO.setId(r.getId());
                    treeVO.setPid(r.getCategory());
                    pidList.add(r.getCategory());
                    idList.add(r.getId());
                    treeVO.setText(r.getName());
                    treeVO.setType("2");
                    treeVO.setIcon("../develop/lib/ligerui/skins/Aqua/images/tree/tree-leaf.gif");
                    treeVOs.add(treeVO);
                    rsResources.remove(r);
                    i--;
                }
            }
        }
        else {
            for (RsResource r : rsResources) {
                TreeResult treeVO = new TreeResult();
                treeVO.setId(r.getId());
                treeVO.setPid(r.getCategory());
                treeVO.setText(r.getName());
                treeVO.setType("2");
                treeVO.setIcon("../develop/lib/ligerui/skins/Aqua/images/tree/tree-leaf.gif");
                treeVOs.add(treeVO);
            }
        }
        while (pidList.size()>0 || idList.size()>0) {
            for (int i=0,j=0;i<rsCategorya.size()||j<rsResources.size();i++,j++) {
                RsResourceCategory r1=new RsResourceCategory();
                RsResource r=new RsResource();
                if(i<rsCategorya.size()) {
                   r1 = rsCategorya.get(i);
                }
                if(j<rsResources.size()) {
                   r = rsResources.get(j);
                }
                TreeResult treeVO = new TreeResult();
                if(pidList.contains(r.getId()) ){
                    treeVO.setId(r.getId());
                    treeVO.setPid(r.getCategory());
                    pidList1.add(r.getCategory());
                    treeVO.setText(r.getName());
                    treeVO.setType("2");
                    treeVO.setIcon("../develop/lib/ligerui/skins/Aqua/images/tree/tree-leaf.gif");
                    treeVOs.add(treeVO);
                    rsResources.remove(r);
                    j--;
                }
                else if(idList.contains(r.getCategory())){
                    treeVO.setId(r.getId());
                    treeVO.setPid(r.getCategory());
                    idList1.add(r.getId());
                    treeVO.setText(r.getName());
                    treeVO.setType("2");
                    treeVO.setIcon("../develop/lib/ligerui/skins/Aqua/images/tree/tree-leaf.gif");
                    treeVOs.add(treeVO);
                    rsResources.remove(r);
                    j--;
                }
                else if(pidList.contains(r1.getId())){
                    treeVO.setId(r1.getId());
                    treeVO.setPid(r1.getPid());
                    pidList1.add(r1.getPid());
                    treeVO.setText(r1.getName());
                    treeVO.setType("1");
                    treeVO.setIcon("../develop/lib/ligerui/skins/Aqua/images/tree/folder.gif");
                    treeVOs.add(treeVO);
                    rsCategorya.remove(r1);
                    i--;
                }
                else if( idList.contains(r1.getPid())){
                    treeVO.setId(r1.getId());
                    treeVO.setPid(r1.getPid());
                    idList1.add(r1.getId());
                    treeVO.setText(r1.getName());
                    treeVO.setType("1");
                    treeVO.setIcon("../develop/lib/ligerui/skins/Aqua/images/tree/folder.gif");
                    treeVOs.add(treeVO);
                    rsCategorya.remove(r1);
                    i--;
                }
            }
            pidList.clear();
            idList.clear();
            pidList.addAll(pidList1);
            idList.addAll(idList1);
            pidList1.clear();
            idList1.clear();
        }
        return treeVOs;
    }

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/datacollect/repeatDatacollectJs.jsp

@@ -37,13 +37,13 @@
                selectRowButtonOnly:true,
                height:'100%',
                columns: [
                    {display:'任务名称',name:'jobId', width: '20%',dict:true,dictName:'RS_JOB_CONFIG'},
                    {display:'任务名称',name:'jobId', width: '15%',dict:true,dictName:'RS_JOB_CONFIG'},
                    {display:'数据集名称',name:'jobDatasetName', width: '15%'},
                    {display:'采集开始时间',name:'startTime', width: '15%'},
                    {display:'采集结束时间',name:'endTime', width: '15%'},
                    {display:'采集状态',name:'jobStatus', width: '15%',dict:true,dictName:'JOB_STATUS'},
                    {display:'采集状态',name:'jobStatus', width: '10%',dict:true,dictName:'JOB_STATUS'},
                    {
                        display:'操作',name:'id',width: '20%',render:function(row){
                        display:'操作',name:'id',width: '10%',render:function(row){
                            var html = '<div class="m-inline-buttons" style="width:40px;">';
                        if(row.jobStatus == '0'){
                                html += '<a href="javascript:void(0)" onclick="javascript:repeatDatacollect.repeat(\''+row.id+'\')">补采</a>';
@@ -53,7 +53,8 @@
                            return html;
                        }
                    }
                    },
                    {display:'信息',name:'jobContent', width: '20%'},
                ]
            });

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/datacollect/trackJobJs.jsp

@@ -41,18 +41,19 @@
                selectRowButtonOnly:true,
                delayLoad:true,//初始化不加载
                columns: [
                    {display:'采集开始时间',name:'jobStartTime', width: '12%'},
                    {display:'采集结束时间',name:'jobEndTime', width: '12%'},
                    {display:'采集数据集数',name:'jobDatasetCount', width: '12%'},
                    {display:'成功数据集数',name:'jobDatasetSuccess', width: '12%'},
                    {display:'数据总数',name:'count', width: '12%'},
                    {display:'成功数据',name:'success', width: '12%'},
                    {display:'补采数据',name:'repeatNum', width: '12%'},
                    {display:'采集开始时间',name:'jobStartTime', width: '10%'},
                    {display:'采集结束时间',name:'jobEndTime', width: '10%'},
                    {display:'采集数据集数',name:'jobDatasetCount', width: '10%'},
                    {display:'成功数据集数',name:'jobDatasetSuccess', width: '10%'},
                    {display:'数据总数',name:'count', width: '10%'},
                    {display:'成功数据',name:'success', width: '10%'},
                    {display:'补采数据',name:'repeatNum', width: '10%'},
                    {
                        display:'操作',name:'id',width: '16%',render:function(row){
                        display:'操作',name:'id',width: '12%',render:function(row){
                            return '<a href="javascript:void(0)" onclick="javascript:trackJob.repeat()">补采</a>';
                        }
                    }
                    },
                    {display:'信息',name:'jobContent', width: '18%'}
                ],
                onSuccess:function(data)
                {

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourcebrowse/resourceJs.jsp

@@ -23,7 +23,8 @@
            resource.$searchBox = $("#div_wrapper_left_inp_search").ligerSearch({
                width: 180,onClick: function (value) {
                    if (value != "" && value != null && value != undefined && value.length > 0)
                        $.ligerui.get('ul_tree1').queryByTextInRe(value);
                        resource.treeInit(value);
                       //$.ligerui.get('ul_tree1').queryByText(value);
                }
            });
            resource.$condition = $('#resourceCondition').ligerCondition({
@@ -114,10 +115,11 @@
            $("#div_wrapper_right .l-layout-center").css({"border": "0px"});
            $("#div_wrapper_right .l-layout-top").css({"border": "0px"});
        },
        treeInit: function () {
        treeInit: function (name) {
            $.ajax({
                type: "POST",
                url: "${contextRoot}/resource/resourceCategoryTreeList",
                data:{name:name},
                success: function (msg) {
                    // 初始化树形菜单
                    $resourceTree = $('#ul_tree1').ligerTree({

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourceregister/rsResourceManageJs.jsp

@@ -37,7 +37,6 @@
            $.ajax({
                type: "POST",
                url: "${contextRoot}/resource/resourceTreeList",
                data: "name=John&location=Boston",
                success: function (msg) {
                    // 初始化树形菜单
                    resourceTree = resourceTree.ligerTree({
@@ -61,7 +60,28 @@
            this.$searchTreeBox.ligerSearch({
                width: 180,onClick: function (value) {
                    if (value != "" && value != null && value != undefined && value.length > 0)
                        $.ligerui.get('div_wrapper_left_ul_resourcetree').queryByText(value);
                        $.ajax({
                            type: "POST",
                            url: "${contextRoot}/resource/resourceTreeList",
                            data: {name:value},
                            success: function (msg) {
                                // 初始化树形菜单
                                resourceTree = $('#div_wrapper_left_ul_resourcetree').ligerTree({
                                    data: msg.data,
                                    idFieldName: 'id',
                                    nodeWidth: 200,
                                    parentIDFieldName: 'pid',
                                    isExpand: false,
                                    onClick: function (obj) {
                                        rsResoureManege.reloadGridTree(obj.data.id, rsResoureManege.$searchresourceName.val());
                                        rsResoureManege.$resourceTreeId=obj.data.id;
                                    },
                                    onSuccess: function (data) {
                                    }
                                });
                            }
                        });
                }
            });
            this.$searchresourceName.ligerSearch({onClick:function(value){