Merge branch '2.0' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into 2.0

common/commons-ehr-constants/src/main/java/com/yihu/ehr/constants/ServiceApi.java

@@ -29,6 +29,18 @@ public class ServiceApi {
        public static final String RsAdapterDictionary = "/adaptions/adapter/dictionaries/{id}";
    }
    public static class StdIndex {
        public static final String Create = "/stdIndex";
        public static final String Update = "/stdIndexUpd";
        public static final String GetById = "/stdIndex/{id}";
        public static final String DeleteById = "/stdIndex/{ids}";
        public static final String List = "stdIndex/list";
        public static final String IsUnique = "stdIndex/isUnique";
        public StdIndex() {
        }
    }
    /**
     * 资源管理中心接口
     */

svr/svr-basic/src/main/java/com/yihu/jw/basic/address/service/AddressService.java

@@ -4,7 +4,7 @@ package com.yihu.jw.basic.address.service;
import com.yihu.jw.basic.address.dao.AddressRepository;
import com.yihu.jw.entity.ehr.address.Address;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

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

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

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

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

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

@@ -15,6 +15,7 @@ import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -35,6 +36,7 @@ import java.util.Map;
 */
@RestController
@RequestMapping("/resource/reportCategory")
@Api(tags = {"网关-报表分类"})
public class ReportCategoryController extends EnvelopRestEndpoint {
    @Autowired

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

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

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

@@ -2,9 +2,13 @@ package com.yihu.jw.basic.agadmin.controller.resource;
import com.yihu.jw.basic.agadmin.service.ResourceBrowseControllerService;
import com.yihu.jw.basic.resource.service.ResourceBrowseService;
import com.yihu.jw.basic.resource.service.RsResourceService;
import com.yihu.jw.entity.ehr.resource.RsResource;
import com.yihu.jw.restmodel.ehr.resource.MRsColumnsModel;
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 com.yihu.jw.util.network.HttpResponse;
@@ -21,8 +25,10 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.io.OutputStream;
import java.util.*;
@@ -42,10 +48,14 @@ public class ResourceBrowseController extends EnvelopRestEndpoint {
    private static final Integer SINGLE_REQUEST_SIZE = 5000; //导出Excel时的单次请求量
    private static final Integer SINGLE_EXCEL_SIZE = 50000; //导出Excel时的单个文件数据量
    @Autowired
    @Resource
    ResourceBrowseControllerService resourceBrowseControllerService;
    @Autowired
    @Resource
    private ResourceIntegratedController resourceIntegratedController;
    @Resource
    private RsResourceService rsResourceService;
    @Resource
    private ResourceBrowseService resourceBrowseService;
//    @RequestMapping("/searchResourceList")
//    public Object searchResourceList() throws Exception {
@@ -76,46 +86,18 @@ public class ResourceBrowseController extends EnvelopRestEndpoint {
//        return envelop.getDetailModelList();
//    }
//
//    /**
//     * 动态获取GRID的列名
//     * @param dictId 资源编码
//     * @param request
//     * @return
//     */
//    @RequestMapping("/getGridCloumnNames")
//    @ResponseBody
//    public List<MRsColumnsModel> getGridColumnNames(String dictId, HttpServletRequest request) throws Exception {
//        return getColumns(dictId, request);
//    }
//
//    /**
//     * zuul
//     * @param resourceCode
//     * @param request
//     * @return
//     * @throws Exception
//     */
//    public  List<MRsColumnsModel> getColumns(String resourceCode, HttpServletRequest request) throws Exception {
//        List<MRsColumnsModel> result = new ArrayList<>();
//        //从Session中获取用户的角色信息作为查询参数
//        // 获取资源拥着信息
//        String urlGet = "/resource/api/v1.0/resources/byCode";
//        Map<String, Object> getParams = new HashMap<>();
//        getParams.put("code", resourceCode);
//        HttpResponse response = HttpUtils.doGet(adminInnerUrl + urlGet, getParams);
//        if (!response.isSuccessFlg()) {
//            return result;
//        }
//        Map<String, Object> rsObj = objectMapper.readValue(response.getContent(), Map.class);
//        String url = "/resource/api/v1.0/resources/query/getResourceMetadata";
//        Map<String, Object> params = new HashMap<>();
//        String userId = String.valueOf(request.getSession().getAttribute("userId"));
//        String creator = String.valueOf(rsObj.get("creator"));
//        params.put("roleId", "*");
//        params.put("resourcesCode", resourceCode);
//        response = HttpUtils.doGet(adminInnerUrl + url, params);
//        return toModel(response.getContent(), List.class);
//    }
    /**
     * 动态获取GRID的列名
     * @param dictId 资源编码
     * @return
     */
    @GetMapping("/getGridCloumnNames")
    public Envelop getGridColumnNames(String dictId) throws Exception {
        List<MRsColumnsModel> list = resourceBrowseService.getResourceMetadata(dictId, "*");
        return ListEnvelop.getSuccess("查询成功",list);
    }
//
//    /**
//     * 获取字典值
@@ -168,7 +150,7 @@ public class ResourceBrowseController extends EnvelopRestEndpoint {
        Envelop envelop = resourceBrowseControllerService.getResourceData(resourcesCode,"*","*","*",queryCondition,page,rows,null);
        if (envelop.getStatus()==200) {
            ListEnvelop listEnvelop = (ListEnvelop) envelop;
            PageEnvelop listEnvelop = (PageEnvelop) envelop;
            List<Map<String, Object>> envelopList = listEnvelop.getDetailModelList();
            List<Map<String, Object>> middleList = new ArrayList<>();
            for (Map<String, Object> envelopMap : envelopList) {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

svr/svr-basic/src/main/java/com/yihu/jw/basic/apps/service/AppService.java

@@ -16,7 +16,7 @@ import com.yihu.jw.entity.ehr.user.Roles;
import com.yihu.jw.entity.ehr.oauth2.OauthClientDetails;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.apache.commons.lang3.StringUtils;
import org.hibernate.SQLQuery;
import org.hibernate.query.NativeQuery;
import org.hibernate.transform.Transformers;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -171,7 +171,7 @@ public class AppService extends BaseJpaService<App, AppDao> {
        }
        sql += ") p ORDER BY p.id";
        SQLQuery query = currentSession().createSQLQuery(sql);
        NativeQuery query = currentSession().createSQLQuery(sql);
        query.setParameter("userId", userId);
        query.setParameter("catalog", catalog);
        if (!StringUtils.isEmpty(manageType)) {
@@ -275,7 +275,7 @@ public class AppService extends BaseJpaService<App, AppDao> {
        }
        sql += ") p ORDER BY p.id";
        SQLQuery query = currentSession().createSQLQuery(sql);
        NativeQuery query = currentSession().createSQLQuery(sql);
        query.setParameter("userId", userId);
        if (!StringUtils.isEmpty(doctorManageType)) {
            query.setParameter("doctorManageType", doctorManageType);

svr/svr-basic/src/main/java/com/yihu/jw/basic/dict/service/SystemDictEntryService.java

@@ -4,7 +4,7 @@ import com.yihu.jw.basic.dict.dao.SystemDictEntryRepository;
import com.yihu.jw.entity.ehr.dict.DictEntryKey;
import com.yihu.jw.entity.ehr.dict.SystemDictEntry;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.hibernate.SQLQuery;
import org.hibernate.query.NativeQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
@@ -151,7 +151,7 @@ public class SystemDictEntryService extends BaseJpaService<SystemDictEntry, Syst
     */
    public List getDictEntryCodeAndValueByDictId(String dict_id) {
        String sql = "SELECT code,value FROM system_dict_entries where dict_id=:dict_id";
        SQLQuery sqlQuery = currentSession().createSQLQuery(sql);
        NativeQuery sqlQuery = currentSession().createSQLQuery(sql);
        sqlQuery.setParameter("dict_id", dict_id);
        return sqlQuery.list();
    }

svr/svr-basic/src/main/java/com/yihu/jw/basic/org/service/OrgDeptDetailService.java

@@ -3,7 +3,7 @@ package com.yihu.jw.basic.org.service;
import com.yihu.jw.basic.org.dao.OrgDeptDetailRepository;
import com.yihu.jw.entity.ehr.org.OrgDeptDetail;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.hibernate.SQLQuery;
import org.hibernate.query.NativeQuery;
import org.hibernate.service.spi.ServiceException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -37,7 +37,7 @@ public class OrgDeptDetailService extends BaseJpaService<OrgDeptDetail, OrgDeptD
    public String searchByOrgNameAndDeptName(String orgName,String deptName){
        String orgDeptDetailPlace = "";
        String sql = "select odd.* from org_dept_detail odd JOIN org_dept od on odd.dept_id=od.id JOIN organizations o on od.org_id =o.id where o.full_name=:orgName AND  od.name =:deptName";
        SQLQuery query = currentSession().createSQLQuery(sql);
        NativeQuery query = currentSession().createSQLQuery(sql);
        query.setParameter("orgName", orgName);
        query.setParameter("deptName", deptName);
        List<Object> list  = query.list();

svr/svr-basic/src/main/java/com/yihu/jw/basic/org/service/OrgDeptImportService.java

@@ -5,7 +5,7 @@ import com.yihu.jw.basic.org.dao.OrgDeptRepository;
import com.yihu.jw.entity.ehr.org.OrgDept;
import com.yihu.jw.entity.ehr.org.OrgDeptDetail;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.hibernate.SQLQuery;
import org.hibernate.query.NativeQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
@@ -33,14 +33,14 @@ public class OrgDeptImportService extends BaseJpaService<OrgDept,OrgDeptReposito
    public List codeExistence(String[] code) {
        String sql = "SELECT code FROM Org_Dept WHERE code in(:code)";
        SQLQuery sqlQuery = currentSession().createSQLQuery(sql);
        NativeQuery sqlQuery = currentSession().createSQLQuery(sql);
        sqlQuery.setParameterList("code", code);
        return sqlQuery.list();
    }
    public List nameExistence(String[] name) {
        String sql = "SELECT name FROM Org_Dept WHERE name in(:name)";
        SQLQuery sqlQuery = currentSession().createSQLQuery(sql);
        NativeQuery sqlQuery = currentSession().createSQLQuery(sql);
        sqlQuery.setParameterList("name", name);
        return sqlQuery.list();
    }

svr/svr-basic/src/main/java/com/yihu/jw/basic/org/service/OrgMemberRelationService.java

@@ -5,7 +5,7 @@ import com.yihu.jw.entity.ehr.org.OrgMemberRelation;
import com.yihu.jw.basic.user.service.DoctorService;
import com.yihu.jw.basic.user.service.UserService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.hibernate.transform.Transformers;
import org.springframework.beans.factory.annotation.Autowired;

svr/svr-basic/src/main/java/com/yihu/jw/basic/org/service/OrgService.java

@@ -10,7 +10,7 @@ import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.entity.ehr.id.BizObject;
import com.yihu.jw.entity.ehr.id.ObjectId;
import org.apache.commons.lang.StringUtils;
import org.hibernate.SQLQuery;
import org.hibernate.query.NativeQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -127,7 +127,7 @@ public class OrgService extends BaseJpaService<Organization, OrganizationReposit
    public List orgCodeExistence(String[] orgCode) {
        String sql = "SELECT org_code FROM organizations WHERE org_code in(:orgCode)";
        SQLQuery sqlQuery = currentSession().createSQLQuery(sql);
        NativeQuery sqlQuery = currentSession().createSQLQuery(sql);
        sqlQuery.setParameterList("orgCode", orgCode);
        return sqlQuery.list();
    }
@@ -278,7 +278,7 @@ public class OrgService extends BaseJpaService<Organization, OrganizationReposit
     */
    public List orgExist(String[] org_codes) {
        String sql = "SELECT org_code, full_name FROM organizations WHERE org_code in(:org_codes)";
        SQLQuery sqlQuery = currentSession().createSQLQuery(sql);
        NativeQuery sqlQuery = currentSession().createSQLQuery(sql);
        sqlQuery.setParameterList("org_codes", org_codes);
        return sqlQuery.list();
    }
@@ -311,14 +311,14 @@ public class OrgService extends BaseJpaService<Organization, OrganizationReposit
     */
    public List getEhrOrgIdsByUserId(String userId) {
        String sql = "SELECT d.org_id FROM doctors d  JOIN  users u WHERE d.id = u.doctor_id AND u.id = :userId";
        SQLQuery sqlQuery = currentSession().createSQLQuery(sql);
        NativeQuery sqlQuery = currentSession().createSQLQuery(sql);
        sqlQuery.setParameter("userId", userId);
        return sqlQuery.list();
    }
    public List getJkzlOrgIdsByEhrOrgId(String[] orgIds) {
        String sql = "SELECT jkzl_org_id FROM organizations WHERE id in(:orgIds) AND  jkzl_org_id IS NOT NULL";
        SQLQuery sqlQuery = currentSession().createSQLQuery(sql);
        NativeQuery sqlQuery = currentSession().createSQLQuery(sql);
        sqlQuery.setParameterList("orgIds", orgIds);
        return sqlQuery.list();
    }
@@ -346,7 +346,7 @@ public class OrgService extends BaseJpaService<Organization, OrganizationReposit
        } else {
            sql = "SELECT org_code,full_name FROM organizations";
        }
        SQLQuery sqlQuery = currentSession().createSQLQuery(sql);
        NativeQuery sqlQuery = currentSession().createSQLQuery(sql);
        return sqlQuery.list();
    }

svr/svr-basic/src/main/java/com/yihu/jw/basic/patient/service/ArchiveRelationService.java

@@ -5,8 +5,6 @@ import com.yihu.jw.entity.ehr.patient.ArchiveRelation;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.hibernate.SQLQuery;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;

svr/svr-basic/src/main/java/com/yihu/jw/basic/patient/service/CardManager.java

@@ -7,9 +7,8 @@ import com.yihu.jw.entity.ehr.dict.SystemDictEntry;
import com.yihu.jw.entity.ehr.patient.AbstractCard;
import com.yihu.jw.entity.ehr.patient.PhysicalCard;
import com.yihu.jw.entity.ehr.patient.VirtualCard;
import com.yihu.ehr.constants.ErrorCode;
import com.yihu.jw.exception.ApiException;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

svr/svr-basic/src/main/java/com/yihu/jw/basic/patient/service/DemographicService.java

@@ -7,8 +7,8 @@ import com.yihu.jw.entity.ehr.patient.DemographicInfo;
import com.yihu.jw.util.date.DateTimeUtil;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.apache.commons.codec.digest.DigestUtils;
import org.hibernate.Query;
import org.hibernate.SQLQuery;
import org.hibernate.query.NativeQuery;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -396,7 +396,7 @@ public class DemographicService extends BaseJpaService {
                " '0-1','1-10','11-20','21-30','31-40','41-50','51-60','61-70','71-80','81-90','> 90') as age from ( "+
                " SELECT CASE when length(id)=15  then CONCAT('19',substr(id ,7,6)) ELSE substr(id ,7,8) end  id  from demographics t )t1 "+
                " )tt WHERE tt.age is not null  GROUP BY tt.age";
        SQLQuery query = session.createSQLQuery(sql);
        NativeQuery query = session.createSQLQuery(sql);
        return query.list();
    }

svr/svr-basic/src/main/java/com/yihu/jw/basic/portal/service/PortalFeedbackService.java

@@ -4,7 +4,7 @@ import com.yihu.jw.basic.portal.dao.PortalFeedbackRepository;
import com.yihu.jw.entity.ehr.portal.PortalFeedback;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.apache.commons.collections.map.HashedMap;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

svr/svr-basic/src/main/java/com/yihu/jw/basic/portal/service/SurveyTemplateService.java

@@ -16,7 +16,7 @@ import com.yihu.jw.restmodel.ehr.portal.MSurveyTemplate;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.lang3.StringUtils;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.BeanUtils;

svr/svr-basic/src/main/java/com/yihu/jw/basic/quota/service/TjDimensionMainService.java

@@ -5,7 +5,7 @@ import com.yihu.jw.basic.quota.dao.XTjDimensionMainRepository;
import com.yihu.jw.entity.ehr.quota.TjDimensionMain;
import com.yihu.jw.entity.ehr.quota.TjQuotaDimensionMain;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.hibernate.SQLQuery;
import org.hibernate.query.NativeQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.stereotype.Service;
@@ -53,7 +53,7 @@ public class TjDimensionMainService extends BaseJpaService<TjDimensionMain, XTjD
    public List tjDimensionMainIsExist(String[] values)
    {
        String sql =  "SELECT code FROM tj_dimension_main WHERE code in(:values)";
        SQLQuery sqlQuery = currentSession().createSQLQuery(sql);
        NativeQuery sqlQuery = currentSession().createSQLQuery(sql);
        sqlQuery.setParameterList("values", values);
        return sqlQuery.list();
    }

svr/svr-basic/src/main/java/com/yihu/jw/basic/quota/service/TjDimensionSlaveService.java

@@ -4,7 +4,7 @@ import com.yihu.jw.basic.quota.dao.XTjDimensionSlaveRepository;
import com.yihu.jw.entity.ehr.quota.TjDimensionSlave;
import com.yihu.jw.entity.ehr.quota.TjQuotaDimensionSlave;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.hibernate.SQLQuery;
import org.hibernate.query.NativeQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.stereotype.Service;
@@ -48,7 +48,7 @@ public class TjDimensionSlaveService extends BaseJpaService<TjDimensionSlave, XT
     */
    public List tjDimensionSlaveIsExist(String[] values) {
        String sql = "SELECT code FROM tj_dimension_slave WHERE code in(:values)";
        SQLQuery sqlQuery = currentSession().createSQLQuery(sql);
        NativeQuery sqlQuery = currentSession().createSQLQuery(sql);
        sqlQuery.setParameterList("values", values);
        return sqlQuery.list();
    }

svr/svr-basic/src/main/java/com/yihu/jw/basic/quota/service/TjQuotaCategoryService.java

@@ -3,7 +3,7 @@ package com.yihu.jw.basic.quota.service;
import com.yihu.jw.basic.quota.dao.XTjQuotaCategoryRepository;
import com.yihu.jw.entity.ehr.quota.TjQuotaCategory;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.hibernate.SQLQuery;
import org.hibernate.query.NativeQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -78,7 +78,7 @@ public class TjQuotaCategoryService extends BaseJpaService<TjQuotaCategory, XTjQ
    public List getQuotaCategoryByName(String[] names)
    {
        String sql = "SELECT name, id FROM tj_quota_category WHERE name in(:names)";
        SQLQuery sqlQuery = currentSession().createSQLQuery(sql);
        NativeQuery sqlQuery = currentSession().createSQLQuery(sql);
        sqlQuery.setParameterList("names", names);
        return sqlQuery.list();
    }

svr/svr-basic/src/main/java/com/yihu/jw/basic/quota/service/TjQuotaLogService.java

@@ -4,7 +4,7 @@ import com.yihu.jw.basic.quota.dao.XTjQuotaLogRepository;
import com.yihu.jw.entity.ehr.quota.TjQuotaLog;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.util.date.DateUtil;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

svr/svr-basic/src/main/java/com/yihu/jw/basic/quota/service/TjQuotaService.java

@@ -6,8 +6,8 @@ import com.yihu.jw.entity.ehr.quota.TjQuotaDataSave;
import com.yihu.jw.entity.ehr.quota.TjQuotaDataSource;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.util.date.DateUtil;
import org.hibernate.Query;
import org.hibernate.SQLQuery;
import org.hibernate.query.NativeQuery;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -105,7 +105,7 @@ public class TjQuotaService extends BaseJpaService<TjQuota, XTjQuotaRepository>
        }else{
            sql = "SELECT name FROM tj_quota WHERE name in(:values)";
        }
        SQLQuery sqlQuery = currentSession().createSQLQuery(sql);
        NativeQuery sqlQuery = currentSession().createSQLQuery(sql);
        sqlQuery.setParameterList("values", values);
        return sqlQuery.list();
    }
@@ -182,7 +182,7 @@ public class TjQuotaService extends BaseJpaService<TjQuota, XTjQuotaRepository>
     */
    public int getMaxIdNumber() {
        String sql = "SELECT MAX(CONVERT(case when ID is not null  then substring(ID,5) else '0' end ,SIGNED)) from rs_metadata";
        SQLQuery sqlQuery = currentSession().createSQLQuery(sql);
        NativeQuery sqlQuery = currentSession().createSQLQuery(sql);
        List list = sqlQuery.list();
        if(list != null && list.size() > 0){
            return Integer.valueOf(list.get(0).toString());

svr/svr-basic/src/main/java/com/yihu/jw/basic/report/service/JsonReportService.java

@@ -8,7 +8,7 @@ import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.util.common.LogService;
import org.apache.commons.lang.exception.ExceptionUtils;
import org.hibernate.HibernateException;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;

svr/svr-basic/src/main/java/com/yihu/jw/basic/report/service/QcDailyReportDatasetService.java

@@ -3,7 +3,7 @@ package com.yihu.jw.basic.report.service;
import com.yihu.jw.basic.report.dao.XQcDailyReportDatasetRepository;
import com.yihu.jw.entity.ehr.report.QcDailyReportDataset;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

svr/svr-basic/src/main/java/com/yihu/jw/basic/report/service/QcDailyReportDatasetsService.java

@@ -4,7 +4,7 @@ import com.yihu.jw.basic.report.dao.XQcDailyReportDatasetsRepository;
import com.yihu.jw.entity.ehr.report.QcDailyReportDatasets;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.util.date.DateUtil;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

svr/svr-basic/src/main/java/com/yihu/jw/basic/report/service/QcDailyReportDetailService.java

@@ -4,7 +4,7 @@ import com.yihu.jw.basic.report.dao.XQcDailyReportDetailRepository;
import com.yihu.jw.entity.ehr.report.QcDailyReportDetail;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.apache.commons.lang.StringUtils;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

svr/svr-basic/src/main/java/com/yihu/jw/basic/report/service/QcDailyReportMetadataService.java

@@ -3,7 +3,7 @@ package com.yihu.jw.basic.report.service;
import com.yihu.jw.basic.report.dao.XQcDailyReportMetaDataRepository;
import com.yihu.jw.entity.ehr.report.QcDailyReportMetadata;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

svr/svr-basic/src/main/java/com/yihu/jw/basic/report/service/QcDailyReportService.java

@@ -5,7 +5,7 @@ import com.yihu.jw.entity.ehr.report.QcDailyReport;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.util.date.DateUtil;
import org.apache.commons.lang.StringUtils;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/dao/ResourceBrowseDao.java

@@ -18,6 +18,7 @@ import com.yihu.jw.redis.schema.StdDataSetKeySchema;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.entity.ehr.resource.*;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -194,70 +195,70 @@ public class ResourceBrowseDao {
     * @return
     * @throws Exception
     */
//    public Envelop getEhrCenter (String resourcesCode, String roleId, String saas, String queryParams, Integer page, Integer size) throws Exception {
//        //获取Saas权限
//        StringBuilder q = new StringBuilder();
//        if (saas != null && !"*".equals(saas)) {
//            q.append(saas);
//        }
//        String fq = "";
//        final Map<String, String> sort = new HashMap<>();
//        Map<String, String> query = new HashMap<>();
//        if (queryParams != null) {
//            query = objectMapper.readValue(queryParams, Map.class);
//            if (query.containsKey("q") && !query.get("q").trim().equals("*:*")) {
//                if (q.length() > 0) {
//                    q.append(" AND (");
//                    q.append(query.get("q"));
//                    q.append(")");
//                } else {
//                    q.append(query.get("q"));
//                }
//            }
//            if (query.containsKey("fq")) {
//                fq = query.get("fq");
//            }
//            if (query.containsKey("sort")) {
//                Map<String, String> temp = objectMapper.readValue((String) query.get("sort"), Map.class);
//                temp.forEach((key, value) -> {
//                    sort.put(key, value);
//                });
//            }
//        }
//        //通过资源代码获取默认参数
//        List<RsResourceDefaultParam> paramsList = resourceDefaultParamDao.findByResourcesCode(resourcesCode);
//        for (RsResourceDefaultParam param : paramsList) {
//            if (param.getParamKey().equals("sort")) {
//                Map<String, String> temp = objectMapper.readValue(param.getParamValue(), Map.class);
//                temp.forEach((key, value) -> {
//                    sort.put(key, value);
//                });
//            }
//            if (param.getParamKey().equals("q")) {
//                List<QueryCondition> ql = parseCondition(param.getParamValue());
//                if (q.length() > 0) {
//                    q.append(" AND ");
    public Envelop getEhrCenter (String resourcesCode, String roleId, String saas, String queryParams, Integer page, Integer size) throws Exception {
        //获取Saas权限
        StringBuilder q = new StringBuilder();
        if (saas != null && !"*".equals(saas)) {
            q.append(saas);
        }
        String fq = "";
        final Map<String, String> sort = new HashMap<>();
        Map<String, String> query = new HashMap<>();
        if (queryParams != null) {
            query = objectMapper.readValue(queryParams, Map.class);
            if (query.containsKey("q") && !query.get("q").trim().equals("*:*")) {
                if (q.length() > 0) {
                    q.append(" AND (");
                    q.append(query.get("q"));
                    q.append(")");
                } else {
                    q.append(query.get("q"));
                }
            }
            if (query.containsKey("fq")) {
                fq = query.get("fq");
            }
            if (query.containsKey("sort")) {
                Map<String, String> temp = objectMapper.readValue((String) query.get("sort"), Map.class);
                temp.forEach((key, value) -> {
                    sort.put(key, value);
                });
            }
        }
        //通过资源代码获取默认参数
        List<RsResourceDefaultParam> paramsList = resourceDefaultParamDao.findByResourcesCode(resourcesCode);
        for (RsResourceDefaultParam param : paramsList) {
            if (param.getParamKey().equals("sort")) {
                Map<String, String> temp = objectMapper.readValue(param.getParamValue(), Map.class);
                temp.forEach((key, value) -> {
                    sort.put(key, value);
                });
            }
            if (param.getParamKey().equals("q")) {
                List<QueryCondition> ql = parseCondition(param.getParamValue());
                if (q.length() > 0) {
                    q.append(" AND ");
//                    q.append(solrQuery.conditionToString(ql));
//                } else {
                } else {
//                    q.append(solrQuery.conditionToString(ql));
//                }
//            }
//        }
//        if (resourcesCode != null) {
//            RsResource rsResources = rsResourceService.getResourceByCategory(resourcesCode,"standard");
//            //获取资源结构权限，该部分新增其他标准数据集的判断
//            List<DtoResourceMetadata> metadataList = getAccessMetadata(rsResources, roleId, new HashMap<>());
//            if (metadataList != null && metadataList.size() > 0) {
//                //数据元信息字段
//                List<String> metadataIdList = new ArrayList<>();
//                for (DtoResourceMetadata metadata : metadataList) {
//                    String id = metadata.getId();
//                    metadataIdList.add(id);
//                    String dictCode = metadata.getDictCode();
//                    if (!StringUtils.isEmpty(dictCode)) {
//                        metadataIdList.add(id + "_VALUE");
//                    }
//                }
                }
            }
        }
        if (resourcesCode != null) {
            RsResource rsResources = rsResourceService.getResourceByCategory(resourcesCode,"standard");
            //获取资源结构权限，该部分新增其他标准数据集的判断
            List<DtoResourceMetadata> metadataList = getAccessMetadata(rsResources, roleId, new HashMap<>());
            if (metadataList != null && metadataList.size() > 0) {
                //数据元信息字段
                List<String> metadataIdList = new ArrayList<>();
                for (DtoResourceMetadata metadata : metadataList) {
                    String id = metadata.getId();
                    metadataIdList.add(id);
                    String dictCode = metadata.getDictCode();
                    if (!StringUtils.isEmpty(dictCode)) {
                        metadataIdList.add(id + "_VALUE");
                    }
                }
//                Page<Map<String, Object>> result = hbaseQuery.queryBySolr(ResourceCore.MasterTable, q.toString(), objectMapper.writeValueAsString(sort), fq, StringUtils.join(ResourceCells.getMasterBasicCell(ProfileType.Standard), ","), StringUtils.join(metadataIdList, ","), page, size);
//                Envelop envelop = new Envelop();
//                envelop.setStatus(200);
@@ -265,17 +266,17 @@ public class ResourceBrowseDao {
//                envelop.setPageSize(result.getSize());
//                envelop.setTotalCount(new Long(result.getTotalElements()).intValue());
//                envelop.setDetailModelList(result.getContent());
//                return envelop;
//            }
//        } else {
//            String basicFl = "";
//            String dFl = "";
//            if (query.containsKey("basicFl")) {
//                basicFl = query.get("basicFl");
//            }
//            if (query.containsKey("dFl")) {
//                dFl = query.get("dFl");
//            }
                return PageEnvelop.getSuccess("");
            }
        } else {
            String basicFl = "";
            String dFl = "";
            if (query.containsKey("basicFl")) {
                basicFl = query.get("basicFl");
            }
            if (query.containsKey("dFl")) {
                dFl = query.get("dFl");
            }
//            Page<Map<String, Object>> result = hbaseQuery.queryBySolr(ResourceCore.MasterTable, q.toString(), objectMapper.writeValueAsString(sort), fq, basicFl, dFl, page, size);
//            Envelop envelop = new Envelop();
//            envelop.setStatus(200);
@@ -283,10 +284,10 @@ public class ResourceBrowseDao {
//            envelop.setPageSize(result.getSize());
//            envelop.setTotalCount(new Long(result.getTotalElements()).intValue());
//            envelop.setDetailModelList(result.getContent());
//            return envelop;
//        }
//        throw new ApiException("资源无相关数据元");
//    }
            return PageEnvelop.getSuccess("");
        }
        throw new ApiException("资源无相关数据元");
    }
    /**
     * @param resourcesCode 资源编码
@@ -298,77 +299,77 @@ public class ResourceBrowseDao {
     * @return
     * @throws Exception
     */
//    public Envelop getEhrCenterSub (String resourcesCode, String roleId, String saas, String queryParams, Integer page, Integer size) throws Exception {
//        //获取Saas权限
//        StringBuilder q = new StringBuilder();
//        if (saas != null && !"*".equals(saas)) {
//            q.append(saas);
//        }
//        String fq = "";
//        final Map<String, String> sort = new HashMap<>();
//        Map<String, String> query = new HashMap<>();
//        if (queryParams != null) {
//            query = objectMapper.readValue(queryParams, Map.class);
//            if (query.containsKey("q") && !query.get("q").trim().equals("*:*")) {
//                if (q.length() > 0) {
//                    q.append(" AND (");
//                    q.append(query.get("q"));
//                    q.append(")");
//                } else {
//                    q.append(query.get("q"));
//                }
//            }
//            if (query.containsKey("fq")) {
//                fq = query.get("fq");
//            }
//            if (query.containsKey("sort")) {
//                Map<String, String> temp = objectMapper.readValue((String) query.get("sort"), Map.class);
//                temp.forEach((key, value) -> {
//                    sort.put(key, value);
//                });
//            }
//        }
//        //通过资源代码获取默认参数
//        List<RsResourceDefaultParam> paramsList = resourceDefaultParamDao.findByResourcesCode(resourcesCode);
//        for (RsResourceDefaultParam param : paramsList) {
//            if (param.getParamKey().equals("sort")) {
//                Map<String, String> temp = objectMapper.readValue(param.getParamValue(), Map.class);
//                temp.forEach((key, value) -> {
//                    sort.put(key, value);
//                });
//            }
//            if (param.getParamKey().equals("table")) {
//                if (q.length() > 0) {
//                    q.append(" AND (rowkey:*$" + param.getParamValue() + "$*)");
//                } else {
//                    q.append("rowkey:*$" + param.getParamValue() + "$*");
//                }
//            }
//            if (param.getParamKey().equals("q")) {
//                List<QueryCondition> ql = parseCondition(param.getParamValue());
//                if (q.length() > 0) {
//                    q.append(" AND ");
    public Envelop getEhrCenterSub (String resourcesCode, String roleId, String saas, String queryParams, Integer page, Integer size) throws Exception {
        //获取Saas权限
        StringBuilder q = new StringBuilder();
        if (saas != null && !"*".equals(saas)) {
            q.append(saas);
        }
        String fq = "";
        final Map<String, String> sort = new HashMap<>();
        Map<String, String> query = new HashMap<>();
        if (queryParams != null) {
            query = objectMapper.readValue(queryParams, Map.class);
            if (query.containsKey("q") && !query.get("q").trim().equals("*:*")) {
                if (q.length() > 0) {
                    q.append(" AND (");
                    q.append(query.get("q"));
                    q.append(")");
                } else {
                    q.append(query.get("q"));
                }
            }
            if (query.containsKey("fq")) {
                fq = query.get("fq");
            }
            if (query.containsKey("sort")) {
                Map<String, String> temp = objectMapper.readValue((String) query.get("sort"), Map.class);
                temp.forEach((key, value) -> {
                    sort.put(key, value);
                });
            }
        }
        //通过资源代码获取默认参数
        List<RsResourceDefaultParam> paramsList = resourceDefaultParamDao.findByResourcesCode(resourcesCode);
        for (RsResourceDefaultParam param : paramsList) {
            if (param.getParamKey().equals("sort")) {
                Map<String, String> temp = objectMapper.readValue(param.getParamValue(), Map.class);
                temp.forEach((key, value) -> {
                    sort.put(key, value);
                });
            }
            if (param.getParamKey().equals("table")) {
                if (q.length() > 0) {
                    q.append(" AND (rowkey:*$" + param.getParamValue() + "$*)");
                } else {
                    q.append("rowkey:*$" + param.getParamValue() + "$*");
                }
            }
            if (param.getParamKey().equals("q")) {
                List<QueryCondition> ql = parseCondition(param.getParamValue());
                if (q.length() > 0) {
                    q.append(" AND ");
//                    q.append(solrQuery.conditionToString(ql));
//                } else {
                } else {
//                    q.append(solrQuery.conditionToString(ql));
//                }
//            }
//        }
//        if (resourcesCode != null) {
//            RsResource rsResources = rsResourceService.getResourceByCategory(resourcesCode,"standard");
//            //获取资源结构权限，该部分新增其他标准数据集的判断
//            List<DtoResourceMetadata> metadataList = getAccessMetadata(rsResources, roleId, new HashMap<>());
//            if (metadataList != null && metadataList.size() > 0) {
//                //数据元信息字段
//                List<String> metadataIdList = new ArrayList<>();
//                for (DtoResourceMetadata metadata : metadataList) {
//                    String id = metadata.getId();
//                    metadataIdList.add(id);
//                    String dictCode = metadata.getDictCode();
//                    if (!StringUtils.isEmpty(dictCode)) {
//                        metadataIdList.add(id + "_VALUE");
//                    }
//                }
                }
            }
        }
        if (resourcesCode != null) {
            RsResource rsResources = rsResourceService.getResourceByCategory(resourcesCode,"standard");
            //获取资源结构权限，该部分新增其他标准数据集的判断
            List<DtoResourceMetadata> metadataList = getAccessMetadata(rsResources, roleId, new HashMap<>());
            if (metadataList != null && metadataList.size() > 0) {
                //数据元信息字段
                List<String> metadataIdList = new ArrayList<>();
                for (DtoResourceMetadata metadata : metadataList) {
                    String id = metadata.getId();
                    metadataIdList.add(id);
                    String dictCode = metadata.getDictCode();
                    if (!StringUtils.isEmpty(dictCode)) {
                        metadataIdList.add(id + "_VALUE");
                    }
                }
//                Page<Map<String, Object>> result = hbaseQuery.queryBySolr(ResourceCore.SubTable, q.toString(), objectMapper.writeValueAsString(sort), fq, StringUtils.join(ResourceCells.getSubBasicCell(ProfileType.Standard), ","), StringUtils.join(metadataIdList, ","), page, size);
//                Envelop envelop = new Envelop();
//                envelop.setStatus(200);
@@ -376,17 +377,17 @@ public class ResourceBrowseDao {
//                envelop.setPageSize(result.getSize());
//                envelop.setTotalCount(new Long(result.getTotalElements()).intValue());
//                envelop.setDetailModelList(result.getContent());
//                return envelop;
//            }
//        } else {
//            String basicFl = "";
//            String dFl = "";
//            if (query.containsKey("basicFl")) {
//                basicFl = query.get("basicFl");
//            }
//            if (query.containsKey("dFl")) {
//                dFl = query.get("dFl");
//            }
                return PageEnvelop.getSuccess("");
            }
        } else {
            String basicFl = "";
            String dFl = "";
            if (query.containsKey("basicFl")) {
                basicFl = query.get("basicFl");
            }
            if (query.containsKey("dFl")) {
                dFl = query.get("dFl");
            }
//            Page<Map<String, Object>> result = hbaseQuery.queryBySolr(ResourceCore.SubTable, q.toString(), objectMapper.writeValueAsString(sort), fq, basicFl, dFl, page, size);
//            Envelop envelop = new Envelop();
//            envelop.setStatus(200);
@@ -394,10 +395,10 @@ public class ResourceBrowseDao {
//            envelop.setPageSize(result.getSize());
//            envelop.setTotalCount(new Long(result.getTotalElements()).intValue());
//            envelop.setDetailModelList(result.getContent());
//            return envelop;
//        }
//        throw new ApiException("资源无相关数据元");
//    }
            return PageEnvelop.getSuccess("");
        }
        throw new ApiException("资源无相关数据元");
    }
    /**
     * habse主表的solr分组统计
@@ -409,9 +410,11 @@ public class ResourceBrowseDao {
     * @return
     * @throws Exception
     */
//    public Page<Map<String, Object>> countEhrCenter(String queryParams, Integer page, Integer size) throws Exception {
//        String core = ResourceCore.MasterTable;
//        ObjectMapper objectMapper = new ObjectMapper();
    public Page<Map<String, Object>> countEhrCenter(String queryParams, Integer page, Integer size) throws Exception {
        String core = ResourceCore.MasterTable;
        ObjectMapper objectMapper = new ObjectMapper();
        List<Map<String, Object>> list = new ArrayList<>();
        return new PageImpl(list);
//        Map<String, Object> params = objectMapper.readValue(queryParams, Map.class);
//        String q = "";
//        String fq = "";
@@ -481,8 +484,8 @@ public class ResourceBrowseDao {
//                return solr.getGroupMult(core, groupFields, customGroup, q, fq);
//            }
//        }
//
//    }
    }
    /**
     * habse细表的solr分组统计
@@ -493,9 +496,11 @@ public class ResourceBrowseDao {
     * @return
     * @throws Exception
     */
//    public Page<Map<String, Object>> countEhrCenterSub (String queryParams, Integer page, Integer size) throws Exception {
//        String core = ResourceCore.SubTable;
//        ObjectMapper objectMapper = new ObjectMapper();
    public Page<Map<String, Object>> countEhrCenterSub (String queryParams, Integer page, Integer size) throws Exception {
        String core = ResourceCore.SubTable;
        ObjectMapper objectMapper = new ObjectMapper();
        List<Map<String, Object>> list = new ArrayList<>();
        return new PageImpl(list);
//        Map<String, String> params = objectMapper.readValue(queryParams, Map.class);
//
//        String q = "";
@@ -553,8 +558,8 @@ public class ResourceBrowseDao {
//                return solr.getGroupCount(core, groupFields, q, fq, page, size);
//            }
//        }
//
//    }
    }
    /**
     * 获取指标数据

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/PortalMessageTemplateService.java

@@ -4,7 +4,7 @@ import com.yihu.jw.entity.ehr.portal.PortalMessageTemplate;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.basic.resource.dao.PortalMessageTemplateDao;
import org.hibernate.FlushMode;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.openfeign.EnableFeignClients;

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/ResourceCenterService.java

@@ -6,8 +6,8 @@ import com.yihu.jw.mysql.query.BaseJpaService;
import org.apache.commons.lang.StringUtils;
//import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramInterval;
import org.hibernate.FlushMode;
import org.hibernate.Query;
import org.hibernate.SQLQuery;
import org.hibernate.query.NativeQuery;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.springframework.stereotype.Service;
@@ -194,7 +194,7 @@ public class ResourceCenterService extends BaseJpaService {
                " '0-1','1-10','11-20','21-30','31-40','41-50','51-60','61-70','71-80','81-90','> 90') as age from ( "+
                " SELECT CASE when length(id)=15  then CONCAT('19',substr(id ,7,6)) ELSE substr(id ,7,8) end  id  from demographics t )t1 "+
                " )tt WHERE tt.age is not null  GROUP BY tt.age";
        SQLQuery query = session.createSQLQuery(sql);
        NativeQuery query = session.createSQLQuery(sql);
        query.setFlushMode(FlushMode.COMMIT);
        return query.list();
    }
@@ -206,7 +206,7 @@ public class ResourceCenterService extends BaseJpaService {
                "'0-6','7-17','18-40','41-65','> 65') as age from ( " +
                " SELECT CASE when length(id)=15  then CONCAT('19',substr(id ,7,6)) ELSE substr(id ,7,8) end  id ,gender from demographics t )t1 " +
                " )tt WHERE tt.age is not null AND  gender IN ('1', '2') GROUP BY tt.age, tt.gender";
        SQLQuery query = session.createSQLQuery(sql);
        NativeQuery query = session.createSQLQuery(sql);
        query.setFlushMode(FlushMode.COMMIT);
        return query.list();
    }
@@ -268,7 +268,7 @@ public class ResourceCenterService extends BaseJpaService {
    public List<Object[]> findAppFeatureIdAndNameByAppIdAndCode(String code, String appId) {
        Session session = currentSession();
        String sql = "SELECT id, name FROM apps_feature WHERE code = :code AND app_id = :appId";
        SQLQuery query = session.createSQLQuery(sql);
        NativeQuery query = session.createSQLQuery(sql);
        query.setFlushMode(FlushMode.COMMIT);
        query.setString("code", code);
        query.setString("appId", appId);
@@ -283,7 +283,7 @@ public class ResourceCenterService extends BaseJpaService {
        } else {
            sql = "SELECT COUNT(1) FROM  rs_resource";
        }
        SQLQuery query = session.createSQLQuery(sql);
        NativeQuery query = session.createSQLQuery(sql);
        query.setFlushMode(FlushMode.COMMIT);
        if (dataSource != null) {
            query.setInteger("dataSource", dataSource);
@@ -294,7 +294,7 @@ public class ResourceCenterService extends BaseJpaService {
    public List<Object[]> getResourceCategoryIdAndNameList(){
        Session session = currentSession();
        String sql = "SELECT id, name FROM rs_resource_category";
        SQLQuery query = session.createSQLQuery(sql);
        NativeQuery query = session.createSQLQuery(sql);
        query.setFlushMode(FlushMode.COMMIT);
        return query.list();
    }
@@ -302,7 +302,7 @@ public class ResourceCenterService extends BaseJpaService {
    public BigInteger countResourceByResourceCateIdAndDataSource (String cateId, Integer dataSource) {
        Session session = currentSession();
        String sql = "SELECT COUNT(1) FROM rs_resource WHERE category_id = :cateId AND data_source = :dataSource";
        SQLQuery query = session.createSQLQuery(sql);
        NativeQuery query = session.createSQLQuery(sql);
        query.setFlushMode(FlushMode.COMMIT);
        query.setString("cateId", cateId);
        query.setInteger("dataSource", dataSource);
@@ -313,7 +313,7 @@ public class ResourceCenterService extends BaseJpaService {
        Session session = currentSession();
        String sql;
        sql = "SELECT COUNT(1) FROM rs_report";
        SQLQuery query = session.createSQLQuery(sql);
        NativeQuery query = session.createSQLQuery(sql);
        query.setFlushMode(FlushMode.COMMIT);
        return (BigInteger)query.uniqueResult();
    }
@@ -321,7 +321,7 @@ public class ResourceCenterService extends BaseJpaService {
    public List<Object[]> getReportCategoryIdAndNameList(){
        Session session = currentSession();
        String sql = "SELECT id, name FROM rs_report_category";
        SQLQuery query = session.createSQLQuery(sql);
        NativeQuery query = session.createSQLQuery(sql);
        query.setFlushMode(FlushMode.COMMIT);
        return query.list();
    }
@@ -329,7 +329,7 @@ public class ResourceCenterService extends BaseJpaService {
    public BigInteger countReportByReportCateId (Integer cateId) {
        Session session = currentSession();
        String sql = "SELECT COUNT(1) FROM rs_report WHERE report_category_id = :cateId";
        SQLQuery query = session.createSQLQuery(sql);
        NativeQuery query = session.createSQLQuery(sql);
        query.setFlushMode(FlushMode.COMMIT);
        query.setInteger("cateId", cateId);
        return (BigInteger) query.uniqueResult();
@@ -339,7 +339,7 @@ public class ResourceCenterService extends BaseJpaService {
        Session session = currentSession();
        String sql;
        sql = "SELECT COUNT(1) FROM tj_quota";
        SQLQuery query = session.createSQLQuery(sql);
        NativeQuery query = session.createSQLQuery(sql);
        query.setFlushMode(FlushMode.COMMIT);
        return (BigInteger)query.uniqueResult();
    }
@@ -347,7 +347,7 @@ public class ResourceCenterService extends BaseJpaService {
    public List<Object[]> getQuotaCategoryIdAndNameList(){
        Session session = currentSession();
        String sql = "SELECT id, name FROM tj_quota_category";
        SQLQuery query = session.createSQLQuery(sql);
        NativeQuery query = session.createSQLQuery(sql);
        query.setFlushMode(FlushMode.COMMIT);
        return query.list();
    }
@@ -355,7 +355,7 @@ public class ResourceCenterService extends BaseJpaService {
    public BigInteger countQuotaByQuotaCateId (Integer cateId) {
        Session session = currentSession();
        String sql = "SELECT COUNT(1) FROM tj_quota WHERE quota_type = :cateId";
        SQLQuery query = session.createSQLQuery(sql);
        NativeQuery query = session.createSQLQuery(sql);
        query.setFlushMode(FlushMode.COMMIT);
        query.setInteger("cateId", cateId);
        return (BigInteger) query.uniqueResult();

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsAppResourceMetadataGrantService.java

@@ -3,8 +3,8 @@ package com.yihu.jw.basic.resource.service;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.basic.resource.dao.RsAppResourceMetadataDao;
import com.yihu.jw.entity.ehr.resource.RsAppResourceMetadata;
import org.hibernate.Query;
import org.hibernate.SQLQuery;
import org.hibernate.query.NativeQuery;
import org.hibernate.query.Query;
import org.hibernate.transform.Transformers;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
@@ -131,7 +131,7 @@ public class RsAppResourceMetadataGrantService extends BaseJpaService<RsAppResou
                            " FROM rs_app_resource_metadata b WHERE b.APP_RESOURCE_ID= :appResId" +
                ") p ORDER BY p.resourceMetadataName";
        SQLQuery query = currentSession().createSQLQuery(sql);
        NativeQuery query = currentSession().createSQLQuery(sql);
        query.setParameter("appResId", appResId);
        query.setParameter("appId", appId);
        query.setParameter("resId", resId);
@@ -147,7 +147,7 @@ public class RsAppResourceMetadataGrantService extends BaseJpaService<RsAppResou
                "`rs_app_resource_metadata` meta " +
                "WHERE  " +
                "APP_RESOURCE_ID in(:appResId) GROUP BY APP_ID HAVING count(APP_ID)>0";
        SQLQuery query = currentSession().createSQLQuery(sql);
        NativeQuery query = currentSession().createSQLQuery(sql);
        query.setParameterList("appResId", appResId);
        query.setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP);
        return query.list();

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsDictionaryService.java

@@ -3,9 +3,9 @@ package com.yihu.jw.basic.resource.service;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.basic.resource.dao.RsDictionaryDao;
import com.yihu.jw.entity.ehr.resource.RsDictionary;
import org.hibernate.SQLQuery;
import org.hibernate.Session;
import org.hibernate.Transaction;
import org.hibernate.query.NativeQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.core.PreparedStatementCreator;
@@ -117,7 +117,7 @@ public class RsDictionaryService extends BaseJpaService<RsDictionary, RsDictiona
    public List codeExist(String[] codes)
    {
        String sql = "SELECT DISTINCT code FROM rs_dictionary WHERE code in(:codes)";
        SQLQuery sqlQuery = currentSession().createSQLQuery(sql);
        NativeQuery sqlQuery = currentSession().createSQLQuery(sql);
        sqlQuery.setParameterList("codes", codes);
        return sqlQuery.list();
    }

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsMetadataService.java

@@ -4,7 +4,7 @@ import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.basic.resource.dao.RsResourceMetadataDao;
import com.yihu.jw.basic.resource.dao.RsMetadataDao;
import com.yihu.jw.entity.ehr.resource.RsMetadata;
import org.hibernate.SQLQuery;
import org.hibernate.query.NativeQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
@@ -102,7 +102,7 @@ public class RsMetadataService extends BaseJpaService<RsMetadata, RsResourceMeta
        String header = "INSERT INTO rs_metadata(id, domain, name, std_code, dict_code, column_type, null_able, description, dict_id, valid) VALUES \n";
        StringBuilder sql = new StringBuilder(header) ;
        Map<String, Object> map;
        SQLQuery query;
        NativeQuery query;
        int total = 0;
        for(int i=1; i<=metaLs.size(); i++){
            map = metaLs.get(i-1);
@@ -135,7 +135,7 @@ public class RsMetadataService extends BaseJpaService<RsMetadata, RsResourceMeta
     */
    public List stdCodeExist(String stdCodes) {
        String sql = "SELECT std_code FROM rs_metadata WHERE std_code in(:stdCodes) AND valid<>0";
        SQLQuery sqlQuery = currentSession().createSQLQuery(sql);
        NativeQuery sqlQuery = currentSession().createSQLQuery(sql);
        sqlQuery.setParameterList("stdCodes", stdCodes.split(","));
        return sqlQuery.list();
    }
@@ -145,7 +145,7 @@ public class RsMetadataService extends BaseJpaService<RsMetadata, RsResourceMeta
     */
    public List idExist( String[] ids) {
        String sql = "SELECT id FROM rs_metadata WHERE id in(:ids)";
        SQLQuery sqlQuery = currentSession().createSQLQuery(sql);
        NativeQuery sqlQuery = currentSession().createSQLQuery(sql);
        sqlQuery.setParameterList("ids", ids);
        return sqlQuery.list();
    }
@@ -153,7 +153,7 @@ public class RsMetadataService extends BaseJpaService<RsMetadata, RsResourceMeta
    public int getMaxIdNumber() {
        String sql = "SELECT MAX(CONVERT(case when ID is not null  then substring(ID,5) else '0' end ,SIGNED)) from rs_metadata";
        SQLQuery sqlQuery = currentSession().createSQLQuery(sql);
        NativeQuery sqlQuery = currentSession().createSQLQuery(sql);
        List list = sqlQuery.list();
        if (list != null && list.size() > 0){
            return Integer.valueOf(list.get(0).toString());

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsOrgResourceGrantService.java

@@ -4,7 +4,7 @@ import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.basic.resource.dao.RsOrgResourceDao;
import com.yihu.jw.basic.resource.dao.RsOrgResourceMetadataDao;
import com.yihu.jw.entity.ehr.resource.RsOrgResource;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.domain.Page;
@@ -130,7 +130,7 @@ public class RsOrgResourceGrantService extends BaseJpaService<RsOrgResource, RsO
//        String sql = "SELECT sm.id, m.name FROM rs_resource_metadata sm LEFT JOIN rs_metadata m ON sm.METADATA_ID=m.ID WHERE " +
//                "sm.resources_id=:resourcesId";
//        SQLQuery query = currentSession().createSQLQuery(sql);
//        NativeQuery query = currentSession().createSQLQuery(sql);
//        query.setParameter("resourcesId", resourcesId);
//        List<Object[]> rsResourceMetadatas = query.list();

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsOrgResourceMetadataGrantService.java

@@ -3,8 +3,8 @@ package com.yihu.jw.basic.resource.service;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.basic.resource.dao.RsOrgResourceMetadataDao;
import com.yihu.jw.entity.ehr.resource.RsOrgResourceMetadata;
import org.hibernate.Query;
import org.hibernate.SQLQuery;
import org.hibernate.query.NativeQuery;
import org.hibernate.query.Query;
import org.hibernate.transform.Transformers;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
@@ -131,7 +131,7 @@ public class RsOrgResourceMetadataGrantService extends BaseJpaService<RsOrgResou
                            " FROM rs_organization_resource_metadata b WHERE b.ORGANIZATION_RESOURCE_ID= :organizationResId" +
                ") p ORDER BY p.resourceMetadataName";
        SQLQuery query = currentSession().createSQLQuery(sql);
        NativeQuery query = currentSession().createSQLQuery(sql);
        query.setParameter("organizationResId", organizationResId);
        query.setParameter("organizationId", organizationId);
        query.setParameter("resId", resId);
@@ -147,7 +147,7 @@ public class RsOrgResourceMetadataGrantService extends BaseJpaService<RsOrgResou
                "`rs_organization_resource_metadata` meta " +
                "WHERE  " +
                "ORGANIZATION_RESOURCE_ID in(:organizationResId) GROUP BY ORGANIZATION_ID HAVING count(ORGANIZATION_ID)>0";
        SQLQuery query = currentSession().createSQLQuery(sql);
        NativeQuery query = currentSession().createSQLQuery(sql);
        query.setParameterList("organizationResId", organizationResId);
        query.setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP);
        return query.list();

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsReportCategoryService.java

@@ -4,7 +4,7 @@ import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.basic.resource.dao.RsReportCategoryDao;
import com.yihu.jw.entity.ehr.resource.RsReportCategory;
import org.hibernate.FlushMode;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsResourceCategoryService.java

@@ -5,7 +5,7 @@ import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.basic.resource.dao.RsResourceCategoryDao;
import com.yihu.jw.basic.resource.dao.RsResourceDao;
import com.yihu.jw.entity.ehr.resource.RsResourceCategory;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsResourceGrantService.java

@@ -4,7 +4,7 @@ import com.yihu.jw.entity.ehr.resource.RsAppResource;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.basic.resource.dao.RsAppResourceDao;
import com.yihu.jw.basic.resource.dao.RsAppResourceMetadataDao;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.domain.Page;
@@ -120,7 +120,7 @@ public class RsResourceGrantService extends BaseJpaService<RsAppResource, RsAppR
//        String sql = "SELECT sm.id, m.name FROM rs_resource_metadata sm LEFT JOIN rs_metadata m ON sm.METADATA_ID=m.ID WHERE " +
//                "sm.resources_id=:resourcesId";
//        SQLQuery query = currentSession().createSQLQuery(sql);
//        NativeQuery query = currentSession().createSQLQuery(sql);
//        query.setParameter("resourcesId", resourcesId);
//        List<Object[]> rsResourceMetadatas = query.list();

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsResourceMetadataService.java

@@ -3,7 +3,7 @@ package com.yihu.jw.basic.resource.service;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.basic.resource.dao.RsResourceMetadataDao;
import com.yihu.jw.entity.ehr.resource.RsResourceMetadata;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsResourceQuotaService.java

@@ -5,7 +5,7 @@ import com.yihu.jw.basic.resource.model.ResourceQuotaJson;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.basic.resource.dao.RsResourceQuotaDao;
import com.yihu.jw.entity.ehr.resource.RsResourceQuota;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsResourceService.java

@@ -8,7 +8,7 @@ import com.yihu.jw.entity.ehr.resource.RsResource;
import com.yihu.jw.entity.ehr.resource.RsResourceCategory;
import com.yihu.jw.entity.ehr.resource.RsRolesResource;
import org.hibernate.FlushMode;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsRolesResourceGrantService.java

@@ -4,7 +4,7 @@ import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.basic.resource.dao.RsRolesResourceDao;
import com.yihu.jw.basic.resource.dao.RsRolesResourceMetadataDao;
import com.yihu.jw.entity.ehr.resource.RsRolesResource;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.domain.Page;
@@ -115,7 +115,7 @@ public class RsRolesResourceGrantService extends BaseJpaService<RsRolesResource,
            return rolesRsList;
//        String sql = "SELECT sm.id, m.name FROM rs_resource_metadata sm LEFT JOIN rs_metadata m ON sm.METADATA_ID=m.ID WHERE " +
//                "sm.resources_id=:resourcesId";
//        SQLQuery query = currentSession().createSQLQuery(sql);
//        NativeQuery query = currentSession().createSQLQuery(sql);
//        query.setParameter("resourcesId", resourcesId);
//        List<Object[]> rsResourceMetadatas = query.list();
        rsRolesResourceDao.saveAll(rolesRsList);

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsRolesResourceMetadataGrantService.java

@@ -3,8 +3,8 @@ package com.yihu.jw.basic.resource.service;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.basic.resource.dao.RsRolesResourceMetadataDao;
import com.yihu.jw.entity.ehr.resource.RsRolesResourceMetadata;
import org.hibernate.Query;
import org.hibernate.SQLQuery;
import org.hibernate.query.NativeQuery;
import org.hibernate.query.Query;
import org.hibernate.transform.Transformers;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
@@ -120,7 +120,7 @@ public class RsRolesResourceMetadataGrantService extends BaseJpaService<RsRolesR
                            " FROM rs_roles_resource_metadata b WHERE b.ROLES_RESOURCE_ID= :rolesResId" +
                ") p ORDER BY p.resourceMetadataName";
        SQLQuery query = currentSession().createSQLQuery(sql);
        NativeQuery query = currentSession().createSQLQuery(sql);
        query.setParameter("rolesResId", rolesResId);
        query.setParameter("rolesId", rolesId);
        query.setParameter("resId", resId);
@@ -135,7 +135,7 @@ public class RsRolesResourceMetadataGrantService extends BaseJpaService<RsRolesR
                "`rs_roles_resource_metadata` meta " +
                "WHERE  " +
                "ROLES_RESOURCE_ID in(:rolesResId) GROUP BY ROLES_ID HAVING count(ROLES_ID)>0";
        SQLQuery query = currentSession().createSQLQuery(sql);
        NativeQuery query = currentSession().createSQLQuery(sql);
        query.setParameterList("rolesResId", rolesResId);
        query.setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP);
        return query.list();

svr/svr-basic/src/main/java/com/yihu/jw/basic/security/service/UserTokenService.java

@@ -4,8 +4,8 @@ import com.yihu.jw.basic.security.dao.UserTokenRepository;
import com.yihu.jw.entity.ehr.security.UserToken;
import com.yihu.jw.util.oauth2.TokenUtil;
import org.hibernate.Criteria;
import org.hibernate.Query;
import org.hibernate.SQLQuery;
import org.hibernate.query.NativeQuery;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -73,7 +73,7 @@ public class UserTokenService {
        sb.append("    and app_id  = '" + appId + "'  ");
        String sql = sb.toString();
        SQLQuery sqlQuery = session.createSQLQuery(sql);
        NativeQuery sqlQuery = session.createSQLQuery(sql);
        if (sqlQuery.list().size() == 0) {
            return null;

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

@@ -175,7 +175,7 @@ public class RuleController extends EnvelopRestEndpoint {
    @RequestMapping(value = "bindQcRule", method = RequestMethod.GET)
    public Envelop getBindQcRule(
            @RequestParam(name = "stdVersion") String stdVersion,
            @RequestParam(name = "stdDataSetId") Integer stdDataSetId,
            @RequestParam(name = "stdDataSetId") Long stdDataSetId,
            @RequestParam(name = "dataElement") String dataElement) {
        Envelop envelop = new Envelop();
        try {

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

@@ -43,7 +43,7 @@ public class StandardController extends EnvelopRestEndpoint {
    @ApiOperation(value = "根据标准ID获取集成标准信息",  produces = "application/json", notes = "获取标准")
    public ObjEnvelop getForStandardId(
            @ApiParam(name = "standardId", value = "标准ID")
            @RequestParam(value = "standardId") Integer standardId){
            @RequestParam(value = "standardId") Long standardId){
        return standardService.get(standardId);
    }
@@ -70,7 +70,7 @@ public class StandardController extends EnvelopRestEndpoint {
    @ApiOperation(value = "删除标准",  produces = "application/json", notes = "删除标准")
    public Envelop delete(
            @ApiParam(name = "standardId", value = "标准ID")
            @RequestParam(value = "standardId") Integer standardId) {
            @RequestParam(value = "standardId") Long standardId) {
        return standardService.delete(standardId);
    }

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

@@ -56,7 +56,7 @@ public class StdDatasetController extends EnvelopRestEndpoint {
            @ApiParam(name = "stdVersion", value = "标准版本号")
            @RequestParam(value = "stdVersion") String stdVersion,
            @ApiParam(name = "datasetId", value = "数据集ID")
            @RequestParam(value = "datasetId") Integer datasetId) {
            @RequestParam(value = "datasetId") Long datasetId) {
        return stdDatasetService.get(stdVersion, datasetId);
    }
@@ -66,7 +66,7 @@ public class StdDatasetController extends EnvelopRestEndpoint {
            @ApiParam(name = "stdVersion", value = "标准版本号")
            @RequestParam(value = "stdVersion") String stdVersion,
            @ApiParam(name = "datasetId", value = "数据集ID")
            @RequestParam(value = "datasetId") Integer datasetId) {
            @RequestParam(value = "datasetId") Long datasetId) {
        return stdDatasetService.delete(stdVersion, datasetId);
    }

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

@@ -0,0 +1,117 @@
package com.yihu.jw.basic.standard.controller;
import com.yihu.ehr.constants.ServiceApi;
import com.yihu.jw.basic.standard.model.standard.StdIndex;
import com.yihu.jw.basic.standard.service.bo.StandardVersion;
import com.yihu.jw.basic.standard.service.standard.StdIndexService;
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;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import java.io.IOException;
import java.util.List;
@Api(value = "stdIndex", tags = {"标准索引相关"})
@RestController("StdIndexController")
public class StdIndexController extends EnvelopRestEndpoint {
    @Autowired
    private StdIndexService stdIndexService;
    @ApiOperation("获取列表数据(分页)")
    @RequestMapping(value = ServiceApi.StdIndex.List, method = RequestMethod.GET)
    public Envelop getList(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段", defaultValue = "")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件", defaultValue = "")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档", defaultValue = "")
            @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 = "")
            @RequestParam(value = "version") String version) throws IOException {
        List<StdIndex> responseEntity = stdIndexService.searchPage(StdIndex.class, StandardVersion.StdIndexTable,version, filters, sorts, page, rows,true);
        List<StdIndex> all = stdIndexService.searchPage(StdIndex.class, StandardVersion.StdIndexTable,version, filters, sorts, null, null,true);
        Long count = Long.valueOf(all.size());
        return PageEnvelop.getSuccessListWithPage("查询成功",responseEntity,page,rows,count);
    }
    @ApiOperation("根据id获取索引")
    @RequestMapping(value = ServiceApi.StdIndex.GetById, method = RequestMethod.GET)
    public Envelop getById(@ApiParam(name = "version", value = "版本", defaultValue = "")
                             @RequestParam(value = "version") String version,
                             @ApiParam(name = "id", value = "id", defaultValue = "")
                             @PathVariable(value = "id") int id) throws IOException {
        String filters = "id="+id;
        List<StdIndex> list = stdIndexService.searchPage(StdIndex.class, StandardVersion.StdIndexTable,version, filters, null, null, null,true);
        if(CollectionUtils.isEmpty(list)){
            return success();
        }
        return ObjEnvelop.getSuccess("查询成功",list.get(0));
    }
    @ApiOperation("保存标准索引")
    @RequestMapping(value = ServiceApi.StdIndex.Create, method = RequestMethod.POST)
    public Envelop save(@ApiParam(name = "indexJson", value = "标准索引json字符串")
                          @RequestParam(value = "indexJson") String indexJson){
        try {
            stdIndexService.save(indexJson);
            return success();
        } catch (Exception e) {
            e.printStackTrace();
            return failed("保存失败");
        }
    }
    @ApiOperation("保存标准索引")
    @RequestMapping(value = ServiceApi.StdIndex.Update, method = RequestMethod.POST)
    public Envelop update(@ApiParam(name = "indexJson", value = "标准索引json字符串")
                        @RequestParam(value = "indexJson") String indexJson){
        try {
            stdIndexService.update(indexJson);
            return success();
        } catch (Exception e) {
            e.printStackTrace();
            return failed("保存失败");
        }
    }
    @ApiOperation("根据传过来的条件判断是否是唯一的,唯一返回true")
    @RequestMapping(value = ServiceApi.StdIndex.IsUnique, method = RequestMethod.POST)
    public Envelop isUniqueName(@ApiParam(name = "filters", value = "数据集id")
                                @RequestParam(value = "filters") String filters,
                                @ApiParam(name = "version", value = "版本号")
                                @RequestParam(value = "version") String version) throws IOException {
        return ObjEnvelop.getSuccess("查询成功",stdIndexService.isUnique(filters,version));
    }
    @ApiOperation("删除索引,多个用,隔开")
    @RequestMapping(value = ServiceApi.StdIndex.DeleteById, method = RequestMethod.DELETE)
    public Envelop delete(@ApiParam(name = "ids", value = "ids")
                           @PathVariable(value = "ids") String ids,
                          @ApiParam(name = "version", value = "version")
                           @RequestParam(value = "version") String version) {
        String sql = "delete from std_index_"+version+" where id in ('"+ ids + "')";
        try {
            stdIndexService.execute(sql);
            return success();
        } catch (Exception e){
            e.getMessage();
            return failed("删除失败");
        }
    }
}

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/dao/StdDataSetModelDao.java

@@ -1,11 +1,9 @@
package com.yihu.jw.basic.standard.dao;
import com.yihu.jw.basic.standard.model.standard.StdDataSetModel;
import com.yihu.jw.basic.standard.dao.SQLGeneralDAO;
import com.yihu.jw.util.sql.BeanTransformer;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.springframework.cache.annotation.CacheConfig;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Repository;
/**

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/dao/StdDictionaryEntryModelDao.java

@@ -1,11 +1,9 @@
package com.yihu.jw.basic.standard.dao;
import com.yihu.jw.basic.standard.model.standard.StdDictionaryEntryModel;
import com.yihu.jw.basic.standard.dao.SQLGeneralDAO;
import com.yihu.jw.util.sql.BeanTransformer;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.springframework.cache.annotation.CacheConfig;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Repository;
import java.util.List;

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/dao/StdDictionaryModelDao.java

@@ -1,11 +1,9 @@
package com.yihu.jw.basic.standard.dao;
import com.yihu.jw.basic.standard.model.standard.StdDictionaryModel;
import com.yihu.jw.basic.standard.dao.SQLGeneralDAO;
import com.yihu.jw.util.sql.BeanTransformer;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.springframework.cache.annotation.CacheConfig;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Repository;
/**

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/dao/StdMetaDataModelDao.java

@@ -1,9 +1,8 @@
package com.yihu.jw.basic.standard.dao;
import com.yihu.jw.basic.standard.model.standard.StdMetaDataModel;
import com.yihu.jw.basic.standard.dao.SQLGeneralDAO;
import com.yihu.jw.util.sql.BeanTransformer;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.springframework.stereotype.Repository;
import java.util.List;

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/dao/XSQLGeneralDAO.java

@@ -2,7 +2,7 @@ package com.yihu.jw.basic.standard.dao;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.util.sql.SqlCreator;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import java.io.IOException;

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/model/standard/StandardVersionModel.java

@@ -1,6 +1,7 @@
package com.yihu.jw.basic.standard.model.standard;
import com.yihu.jw.entity.IntegerIdentityEntity;
import com.yihu.jw.entity.LongIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -15,7 +16,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "std_version")
public class StandardVersionModel extends IntegerIdentityEntity implements Serializable {
public class StandardVersionModel extends LongIdentityEntity implements Serializable {
    private String version;

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/model/standard/StdDataSetModel.java

@@ -56,7 +56,7 @@ public class StdDataSetModel implements Serializable {
    private Integer hashCode;
    @Column(name="std_id")
    private Integer standardId;
    private Long standardId;
    @Transient
    private String innerVersionId;
@@ -186,11 +186,11 @@ public class StdDataSetModel implements Serializable {
        this.innerVersionId = innerVersionId;
    }
    public Integer getStandardId() {
    public Long getStandardId() {
        return standardId;
    }
    public void setStandardId(Integer standardId) {
    public void setStandardId(Long standardId) {
        this.standardId = standardId;
    }
}

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/model/standard/StdIndex.java

@@ -8,7 +8,7 @@ public class StdIndex {
    @Id
    @GeneratedValue(strategy = GenerationType.IDENTITY)
    @Column(name = "id")
    private Integer id;//主键id
    private Long id;//主键id
    @Column(name = "std_dataset_id", nullable = false)
    private Long stdDatasetId;//所属的数据集id
    @Column(name = "std_dataset_code", nullable = true, length = 32)
@@ -25,11 +25,11 @@ public class StdIndex {
    private String version;//版本号
    public Integer getId() {
    public Long getId() {
        return id;
    }
    public void setId(Integer id) {
    public void setId(Long id) {
        this.id = id;
    }

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/model/standard/resultModel/MStdIndex.java

@@ -0,0 +1,80 @@
package com.yihu.jw.basic.standard.model.standard.resultModel;
public class MStdIndex {
    private Long id;
    private Long stdDatasetId;
    private String stdDatasetCode;
    private String indexName;
    private String indexField;
    private String indexType;
    private String indexMethod;
    private String version;
    public MStdIndex() {
    }
    public Long getId() {
        return this.id;
    }
    public void setId(Long id) {
        this.id = id;
    }
    public Long getStdDatasetId() {
        return this.stdDatasetId;
    }
    public void setStdDatasetId(Long stdDatasetId) {
        this.stdDatasetId = stdDatasetId;
    }
    public String getStdDatasetCode() {
        return this.stdDatasetCode;
    }
    public void setStdDatasetCode(String stdDatasetCode) {
        this.stdDatasetCode = stdDatasetCode;
    }
    public String getIndexName() {
        return this.indexName;
    }
    public void setIndexName(String indexName) {
        this.indexName = indexName;
    }
    public String getIndexField() {
        return this.indexField;
    }
    public void setIndexField(String indexField) {
        this.indexField = indexField;
    }
    public String getIndexType() {
        return this.indexType;
    }
    public void setIndexType(String indexType) {
        this.indexType = indexType;
    }
    public String getIndexMethod() {
        return this.indexMethod;
    }
    public void setIndexMethod(String indexMethod) {
        this.indexMethod = indexMethod;
    }
    public String getVersion() {
        return this.version;
    }
    public void setVersion(String version) {
        this.version = version;
    }
}

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/service/adapter/AdapterDatasetRelationService.java

@@ -10,7 +10,7 @@ import com.yihu.jw.util.sql.ErrorCode;
import com.yihu.jw.basic.standard.dao.SQLGeneralDAO;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.util.sql.SqlCreator;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.hibernate.query.NativeQuery;
import org.springframework.stereotype.Service;

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/service/adapter/AdapterDictEntryService.java

@@ -21,7 +21,7 @@ import com.yihu.jw.exception.ApiException;
import com.yihu.jw.util.sql.BeanTransformer;
import com.yihu.jw.util.sql.SqlConstants;
import com.yihu.jw.util.sql.SqlCreator;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.stereotype.Service;

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/service/adapter/AdapterMetadataService.java

@@ -25,7 +25,7 @@ import com.yihu.jw.util.sql.SqlConstants;
import com.yihu.jw.util.sql.SqlCreator;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.stereotype.Service;

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/service/adapter/AdapterSchemeService.java

@@ -13,7 +13,7 @@ import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.util.common.StringUtil;
import com.yihu.jw.util.sql.SqlConstants;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/service/adapter/AdapterSchemeVersionService.java

@@ -1,6 +1,5 @@
package com.yihu.jw.basic.standard.service.adapter;
import com.yihu.jw.basic.standard.model.adapter.AdapterMetadataModel;
import com.yihu.jw.basic.standard.model.adapter.AdapterSchemeModel;
import com.yihu.jw.basic.standard.model.adapter.AdapterSchemeVersionModel;
import com.yihu.jw.basic.standard.model.adapter.resultModel.AdapterSchemeVersionResultDetailModel;
@@ -20,7 +19,7 @@ import com.yihu.jw.basic.standard.model.*;
import com.yihu.jw.util.sql.SqlConstants;
import com.yihu.jw.util.sql.SqlCreator;
import org.hibernate.Criteria;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.hibernate.criterion.Restrictions;
import org.springframework.beans.factory.annotation.Autowired;

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/service/document/CDADataSetRelationshipManager.java

@@ -16,11 +16,10 @@ import com.yihu.jw.exception.ApiException;
import com.yihu.jw.restmodel.ehr.standard.MCdaDataSet;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.util.sql.ErrorCode;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.RowMapper;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import org.w3c.dom.Document;
@@ -28,7 +27,6 @@ import org.w3c.dom.Element;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.OutputKeys;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerException;

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/service/document/CDADocumentService.java

@@ -11,7 +11,7 @@ import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.util.sql.SqlCreator;
import com.yihu.jw.util.date.DateUtil;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/service/qc/RuleService.java

@@ -152,7 +152,7 @@ public class RuleService {
    /* ******************************************   反射方式绑定质控规则 *************************************** */
    public List<RuleModel> getBindQcRule(String stdVersion,Integer stdDataSetId,String dataElement) throws IOException {
    public List<RuleModel> getBindQcRule(String stdVersion,Long stdDataSetId,String dataElement) throws IOException {
        StdDataSetModel stdDataSetModel = stdDatasetService.get(new StandardVersion(stdVersion), stdDataSetId);
        if (stdDataSetModel != null) {
            String qcRuleMethod = getQcRule(stdVersion, stdDataSetModel.getCode(), dataElement);
@@ -204,7 +204,7 @@ public class RuleService {
            return;
        }
        StdDataSetModel stdDataSetModel = stdDatasetService.get(new StandardVersion(version), dataSetId.intValue());
        StdDataSetModel stdDataSetModel = stdDatasetService.get(new StandardVersion(version), dataSetId);
        if (stdDataSetModel != null) {
            qcMetaDataKeySchema.setQcMetaDataList(version, stdDataSetModel.getCode(), metadataInnerCode, ruleMethod);
        } else {
@@ -237,7 +237,7 @@ public class RuleService {
        if(CollectionUtils.isNotEmpty(list)){
            for(StdMetaDataModel model:list){
                Long dataSetId = model.getDataSetId();
                StdDataSetModel stdDataSetModel = stdDatasetService.get(new StandardVersion(version), dataSetId.intValue());
                StdDataSetModel stdDataSetModel = stdDatasetService.get(new StandardVersion(version), dataSetId);
                if (stdDataSetModel != null) {
                    qcMetaDataKeySchema.setQcMetaDataList(version, stdDataSetModel.getCode(), metadataInnerCode, ruleMethod);
                } else {
@@ -256,7 +256,7 @@ public class RuleService {
    public void bindQcRuleByDataSet(String stdVersion, Long dataSetId) {
        try {
            Map<String, Serializable> map = null;
            StdDataSetModel stdDataSetModel = stdDatasetService.get(new StandardVersion(stdVersion), dataSetId.intValue());
            StdDataSetModel stdDataSetModel = stdDatasetService.get(new StandardVersion(stdVersion), dataSetId);
            List<StdMetaDataModel> metadataList = stdMetadataService.searchPageData(StdMetaDataModel.class, StandardVersion.MetaDataTable, stdVersion, "dataSetId=" + dataSetId, null, null, null);
            RuleModel ruleModel = null;

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/service/standard/STDVersionService.java

@@ -5,7 +5,7 @@ import com.yihu.jw.basic.standard.dao.SQLGeneralDAO;
import com.yihu.jw.basic.standard.model.standard.STDVersion;
import com.yihu.jw.basic.util.CDAVersionUtil;
import org.hibernate.Criteria;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.hibernate.criterion.Restrictions;
import org.springframework.stereotype.Service;

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/service/standard/StandardService.java

@@ -17,7 +17,7 @@ import com.yihu.jw.basic.standard.model.standard.resultModel.StandardResultDetai
import com.yihu.jw.util.sql.SqlConstants;
import org.apache.commons.lang3.StringUtils;
import org.hibernate.Criteria;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
@@ -93,10 +93,7 @@ public class StandardService extends SQLGeneralDAO {
        query.put("code", code);
        List<StandardModel> list = getList(query, order, 1, 0);
        if (!CollectionUtils.isEmpty(list)) {
            return true;
        }
        return false;
        return !CollectionUtils.isEmpty(list);
    }
    public Boolean standardNameValidate(String name) {
@@ -105,14 +102,11 @@ public class StandardService extends SQLGeneralDAO {
        query.put("name", name);
        List<StandardModel> list = getList(query, order, 1, 0);
        if (!CollectionUtils.isEmpty(list)) {
            return true;
        }
        return false;
        return !CollectionUtils.isEmpty(list);
    }
    @Transactional
    public Envelop delete(Integer standardId) {
    public Envelop delete(Long standardId) {
        Boolean publishedFlg = false;
        Boolean existFlg = false;
        try {
@@ -147,10 +141,7 @@ public class StandardService extends SQLGeneralDAO {
        query.setParameter("standardId", standardId);
        query.setParameter("name", name);
        List<StandardModel> list = query.list();
        if (!CollectionUtils.isEmpty(list)) {
            return true;
        }
        return false;
        return !CollectionUtils.isEmpty(list);
    }
    public Boolean standardCodeValidate(Long standardId, String code) {
@@ -159,10 +150,7 @@ public class StandardService extends SQLGeneralDAO {
        query.setParameter("standardId", standardId);
        query.setParameter("code", code);
        List<StandardModel> list = query.list();
        if (!CollectionUtils.isEmpty(list)) {
            return true;
        }
        return false;
        return !CollectionUtils.isEmpty(list);
    }
    @Transactional
@@ -189,7 +177,7 @@ public class StandardService extends SQLGeneralDAO {
        }
    }
    public ObjEnvelop get(Integer standardId) {
    public ObjEnvelop get(Long standardId) {
        try {
            StandardModel standardModel = getEntity(StandardModel.class, standardId);
            return ObjEnvelop.getSuccess("获取标准成功",standardModel);
@@ -371,7 +359,7 @@ public class StandardService extends SQLGeneralDAO {
    }
    //TODO:TEST
    public StandardModel fork(Integer standardId) {
    public StandardModel fork(Long standardId) {
        try {
            ObjEnvelop objEnvelop = get(standardId);
            StandardModel baseStandard = (StandardModel) objEnvelop.getObj();
@@ -397,10 +385,7 @@ public class StandardService extends SQLGeneralDAO {
        Query query = getCurrentSession().createQuery(hql);
        query.setParameter("standardId", standardId);
        List<StandardVersionModel> standardModelList = query.list();
        if (!CollectionUtils.isEmpty(standardModelList)) {
            return true;
        }
        return false;
        return !CollectionUtils.isEmpty(standardModelList);
    }
    private void update(StandardModel standardModel) throws Exception {

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/service/standard/StandardVersionService.java

@@ -16,7 +16,7 @@ import com.yihu.jw.basic.standard.model.adapter.AdapterSchemeModel;
import com.yihu.jw.basic.standard.service.bo.StandardVersion;
import com.yihu.jw.util.sql.SqlConstants;
import org.hibernate.Criteria;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
@@ -78,7 +78,7 @@ public class StandardVersionService extends SQLGeneralDAO {
    public ListEnvelop getDetailResultModelList(Long standardId, String condition, String order, Integer rows, Integer page) {
        try {
            List<StandardVersionModel> standardVersionModelList = getVersionList(standardId, condition, order, rows, page);
            List<DictItem> detailModelList = new ArrayList<DictItem>();
            List<DictItem> detailModelList = new ArrayList<>();
            DictItem item = new DictItem();
            item.setCode("");
            item.setValue("-无-");
@@ -138,17 +138,14 @@ public class StandardVersionService extends SQLGeneralDAO {
        return !CollectionUtils.isEmpty(list);
    }
    public Boolean versionNameValidate(Long standardId, Integer versionId, String versionName) throws Exception {
    public Boolean versionNameValidate(Long standardId, Long versionId, String versionName) throws Exception {
        String sql = "FROM StandardVersionModel WHERE versionName = :versionName and standardId = :standardId and id != :versionId";
        Query query = getCurrentSession().createQuery(sql);
        query.setParameter("standardId", standardId);
        query.setParameter("versionName", versionName);
        query.setParameter("versionId", versionId);
        List<StandardVersionModel> list = query.list();
        if (!CollectionUtils.isEmpty(list)) {
            return true;
        }
        return false;
        return !CollectionUtils.isEmpty(list);
    }
    @Transactional
@@ -349,8 +346,7 @@ public class StandardVersionService extends SQLGeneralDAO {
                /*version.getCDATableName(),
               /* version.getCDADatasetTableName()*/};
        List<String> deleteSql = new ArrayList<>();
        for (int i = 0; i < tables.length; ++i) {
            String table = tables[i];
        for (String table : tables) {
            deleteSql.add(SqlConstants.DROP_TABLE + table);
        }
        insertBatch(deleteSql);
@@ -411,8 +407,7 @@ public class StandardVersionService extends SQLGeneralDAO {
    @Transactional
    public String saveDatasetExcel(MultipartFile file, String version,Long standardId) throws Exception {
        List<List<String[]>> list = ExcelUtilBigData.readerExcel(file.getInputStream(), 13, 0);//String[] 存放一行,List<String[]> 代表一个excel表格
        for (int i = 0; i < list.size(); i++) {
            List<String[]> l = list.get(i);
        for (List<String[]> l : list) {
            //遍历sheet
            //新增数据集
            StandardVersion standardVersion = new StandardVersion(version);
@@ -422,7 +417,7 @@ public class StandardVersionService extends SQLGeneralDAO {
            stdeDataset.setSummary(getNotNull(l.get(3)[1]));
            stdeDataset.setLanguage(getNotNull(l.get(4)[1]));
            stdeDataset.setClassModel(getNotNull(l.get(5)[1]));
            stdeDataset.setStandardId(standardId.intValue());
            stdeDataset.setStandardId(standardId);
            stdeDataset.setCatalog(0);
//            if(org.apache.commons.lang3.StringUtils.isNotBlank(getNotNull(l.get(2)[1]))){
//                stdeDataset.setCatalog(Integer.valueOf(getNotNull(l.get(2)[1])));
@@ -440,7 +435,7 @@ public class StandardVersionService extends SQLGeneralDAO {
                stdeMetadata.setType(getNotNull(l.get(row)[5]));
                stdeMetadata.setFormat(getNotNull(l.get(row)[6]));
                String dicId = getNotNull(l.get(row)[7]);
                if(org.apache.commons.lang3.StringUtils.isNotBlank(dicId)){
                if (org.apache.commons.lang3.StringUtils.isNotBlank(dicId)) {
                    stdeMetadata.setDictId(Long.valueOf(dicId));
                }
                stdeMetadata.setColumnName(getNotNull(l.get(row)[8]));
@@ -448,19 +443,19 @@ public class StandardVersionService extends SQLGeneralDAO {
                stdeMetadata.setColumnLength(getNotNull(l.get(row)[10]));
                stdeMetadata.setPrimaryKey(false);
                String isPrimaryKey = getNotNull(l.get(row)[11]);
                if(org.apache.commons.lang3.StringUtils.isNotBlank(isPrimaryKey)){
                    if("1".equals(isPrimaryKey)){
                if (org.apache.commons.lang3.StringUtils.isNotBlank(isPrimaryKey)) {
                    if ("1".equals(isPrimaryKey)) {
                        stdeMetadata.setPrimaryKey(true);
                    }
                }
                String isNullable = getNotNull(l.get(row)[12]);
                stdeMetadata.setNullable(false);
                if(org.apache.commons.lang3.StringUtils.isNotBlank(isNullable)){
                    if("1".equals(isNullable)){
                if (org.apache.commons.lang3.StringUtils.isNotBlank(isNullable)) {
                    if ("1".equals(isNullable)) {
                        stdeMetadata.setNullable(true);
                    }
                }
                if(org.apache.commons.lang3.StringUtils.isBlank(stdeMetadata.getCode())){
                if (org.apache.commons.lang3.StringUtils.isBlank(stdeMetadata.getCode())) {
                    continue;
                }
                stdMetadataService.add(standardVersion, stdeMetadata);

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/service/standard/StdCDACatalogService.java

@@ -33,7 +33,7 @@ public class StdCDACatalogService extends SQLGeneralDAO {
    }
    public void finalize() throws Throwable {
    protected void finalize() throws Throwable {
    }

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/service/standard/StdCDADatasetService.java

@@ -10,7 +10,7 @@ import com.yihu.jw.exception.ApiException;
import com.yihu.jw.util.sql.BeanTransformer;
import com.yihu.jw.util.sql.RequestParamTransformer;
import com.yihu.jw.util.sql.SqlCreator;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.stereotype.Service;

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/service/standard/StdCDAService.java

@@ -10,7 +10,7 @@ import com.yihu.jw.exception.ApiException;
import com.yihu.jw.util.sql.BeanTransformer;
import com.yihu.jw.util.sql.RequestParamTransformer;
import com.yihu.jw.util.sql.SqlCreator;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.stereotype.Service;

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/service/standard/StdDatasetCatalogService.java

@@ -7,7 +7,7 @@ import com.yihu.jw.exception.ApiException;
import com.yihu.jw.util.sql.RequestParamTransformer;
import com.yihu.jw.util.sql.SqlCreator;
import com.yihu.jw.basic.standard.model.standard.StdDatasetCatalogModel;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.springframework.dao.DataAccessException;
import org.springframework.jdbc.core.BeanPropertyRowMapper;

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/service/standard/StdDatasetService.java

@@ -15,8 +15,8 @@ import com.yihu.jw.basic.standard.service.bo.StandardVersion;
import jxl.Sheet;
import jxl.Workbook;
import org.hibernate.Criteria;
import org.hibernate.Query;
import org.hibernate.SQLQuery;
import org.hibernate.query.NativeQuery;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.hibernate.criterion.Restrictions;
import org.springframework.beans.factory.annotation.Autowired;
@@ -50,7 +50,7 @@ public class StdDatasetService extends SQLGeneralDAO {
    public StdDatasetService() {
    }
    public void finalize() throws Throwable {
    protected void finalize() throws Throwable {
        super.finalize();
    }
@@ -95,13 +95,10 @@ public class StdDatasetService extends SQLGeneralDAO {
        query.put("code", code);
        List<StdDataSetModel> list = this.getList(standardVersion, query, order, 1, 1);
        if (!CollectionUtils.isEmpty(list)) {
            return true;
        }
        return false;
        return !CollectionUtils.isEmpty(list);
    }
    public Envelop delete(String stdVersion, Integer datasetId) {
    public Envelop delete(String stdVersion, Long datasetId) {
        if (StringUtil.isEmpty(stdVersion)) {
            return Envelop.getError("并无该标准版本");
        }
@@ -123,10 +120,7 @@ public class StdDatasetService extends SQLGeneralDAO {
        sqlCreator.neCondition("id", datasetId);
        String sql = sqlCreator.selectData(standardVersion.getDataSetTableName());
        List<StdDataSetModel> list = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(StdDataSetModel.class));
        if (!CollectionUtils.isEmpty(list)) {
            return true;
        }
        return false;
        return !CollectionUtils.isEmpty(list);
    }
    public ObjEnvelop update(String stdVersion, String dataset) {
@@ -153,7 +147,7 @@ public class StdDatasetService extends SQLGeneralDAO {
    }
    public ObjEnvelop get(String stdVersion, Integer datasetId) {
    public ObjEnvelop get(String stdVersion, Long datasetId) {
        if (StringUtil.isEmpty(stdVersion)) {
            return ObjEnvelop.getError("并无该数据集信息");
        }
@@ -181,7 +175,7 @@ public class StdDatasetService extends SQLGeneralDAO {
//        return (StdDataSetModel) query.uniqueResult();
//    }
    public StdDataSetModel get(StandardVersion standardVersion, Integer datasetId) {
    public StdDataSetModel get(StandardVersion standardVersion, Long datasetId) {
        String dataSetTable = standardVersion.getDataSetTableName();
        SqlCreator sqlCreator = new SqlCreator(StdDataSetModel.class);
        sqlCreator.equalCondition("id", datasetId);
@@ -198,15 +192,15 @@ public class StdDatasetService extends SQLGeneralDAO {
        query.executeUpdate();
    }
    private void delete(StandardVersion standardVersion, Integer datasetId) {
    private void delete(StandardVersion standardVersion, Long datasetId) {
        Session session = getCurrentSession();
        String sql = "delete from " + standardVersion.getDataSetTableName() + " where id = :id";
        Query query = session.createSQLQuery(sql);
        query.setInteger("id", datasetId);
        query.setParameter("id", datasetId);
        query.executeUpdate();
        sql = "delete from " + standardVersion.getMetaDataTableName() + " where dataset_id = :datasetId";
        query = session.createSQLQuery(sql);
        query.setInteger("datasetId", datasetId);
        query.setParameter("datasetId", datasetId);
        query.executeUpdate();
    }
@@ -365,7 +359,7 @@ public class StdDatasetService extends SQLGeneralDAO {
            if (!StringUtil.isEmpty(sql)) {
                sql = sql.substring(0, sql.length() - SqlConstants.UNION.length());
                SQLQuery sqlQuery = getCurrentSession().createSQLQuery(sql);
                NativeQuery sqlQuery = getCurrentSession().createSQLQuery(sql);
                sqlQuery.setResultTransformer(transformer);
                List<StdDataSetModel> modelList = sqlQuery.list();
                List<StdDataSetModel> distinctModelList = new ArrayList<>();
@@ -438,7 +432,7 @@ public class StdDatasetService extends SQLGeneralDAO {
                //插入数据集信息
                stdDataSetModel.setCode(dataSetCode);//code唯一
                stdDataSetModel.setName(dataSetNname);
                stdDataSetModel.setStandardId(2);
                stdDataSetModel.setStandardId(2L);
                //获取数据元信息
                Set<String> set = new HashSet<String>();
@@ -565,7 +559,7 @@ public class StdDatasetService extends SQLGeneralDAO {
            if (!StringUtil.isEmpty(sql)) {
                sql = sql.substring(0, sql.length() - SqlConstants.UNION.length());
                SQLQuery sqlQuery = getCurrentSession().createSQLQuery(sql);
                NativeQuery sqlQuery = getCurrentSession().createSQLQuery(sql);
                sqlQuery.setResultTransformer(transformer);
                List<StdDataSetModel> modelList = sqlQuery.list();
                List<StdDataSetModel> distinctModelList = new ArrayList<>();

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/service/standard/StdDictEntryService.java

@@ -3,7 +3,6 @@ package com.yihu.jw.basic.standard.service.standard;
import com.fasterxml.jackson.databind.JsonNode;
import com.yihu.jw.basic.standard.model.Select2;
import com.yihu.jw.basic.standard.model.standard.StdDictionaryEntryModel;
import com.yihu.jw.basic.standard.model.standard.StdDictionaryModel;
import com.yihu.jw.basic.standard.service.bo.StandardVersion;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
@@ -15,7 +14,7 @@ import com.yihu.jw.exception.ApiException;
import com.yihu.jw.util.sql.RequestParamTransformer;
import com.yihu.jw.util.sql.SqlConstants;
import com.yihu.jw.util.sql.SqlCreator;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.stereotype.Service;

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/service/standard/StdDictService.java

@@ -15,7 +15,7 @@ import com.yihu.jw.util.sql.*;
import com.yihu.jw.basic.standard.dao.SQLGeneralDAO;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.basic.standard.model.DictItem;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
@@ -42,7 +42,7 @@ public class StdDictService extends SQLGeneralDAO {
    public StdDictService() {
    }
    public void finalize() throws Throwable {
    protected void finalize() throws Throwable {
    }
@@ -111,10 +111,7 @@ public class StdDictService extends SQLGeneralDAO {
        query.put("code", code);
        List<StdDictionaryModel> list = this.getList(standardVersion, query, order, 1, 0);
        if (!CollectionUtils.isEmpty(list)) {
            return true;
        }
        return false;
        return !CollectionUtils.isEmpty(list);
    }
    public Envelop delete(String stdVersion, Integer dictId) {
@@ -136,10 +133,7 @@ public class StdDictService extends SQLGeneralDAO {
        sqlCreator.neCondition("id", dictId);
        String sql = sqlCreator.selectData(standardVersion.getDictTableName());
        List<StdDictionaryModel> list = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(StdDictionaryModel.class));
        if (!CollectionUtils.isEmpty(list)) {
            return true;
        }
        return false;
        return !CollectionUtils.isEmpty(list);
    }
    public ObjEnvelop update(String stdVersion, String dict) {
@@ -184,7 +178,7 @@ public class StdDictService extends SQLGeneralDAO {
        String sql = "select id, std_id, code, name, define, description, parent_id from " + dictTableName + " where id = :id";
        Query query = session.createSQLQuery(sql);
        query.setInteger("id", dictId);
        query.setParameter("id", dictId);
        query.setResultTransformer(new BeanTransformer<>(StdDictionaryModel.class));
        return (StdDictionaryModel) query.uniqueResult();
    }
@@ -294,9 +288,9 @@ public class StdDictService extends SQLGeneralDAO {
        if (limit != null) {
            if (offset != null &&offset>0) {
                sql += " limit "+(offset - 1) * limit+","+limit;
                completeSql += " limit "+(offset - 1) * limit+","+limit;
            }else {
                sql += " limit "+limit;
                completeSql += " limit "+limit;
            }
        }

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/service/standard/StdIndexService.java

@@ -0,0 +1,61 @@
package com.yihu.jw.basic.standard.service.standard;
import com.fasterxml.jackson.databind.JsonNode;
import com.yihu.jw.basic.standard.dao.SQLGeneralDAO;
import com.yihu.jw.basic.standard.model.standard.StdDataSetModel;
import com.yihu.jw.basic.standard.model.standard.StdIndex;
import com.yihu.jw.basic.standard.model.standard.resultModel.MStdIndex;
import com.yihu.jw.basic.standard.service.bo.StandardVersion;
import com.yihu.jw.util.sql.SqlCreator;
import org.hibernate.query.NativeQuery;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import java.io.IOException;
import java.util.List;
@Transactional
@Service
public class StdIndexService extends SQLGeneralDAO {
    @Resource
    private StdDatasetService stdDatasetService;
    public void save(String indexJson) throws Exception {
        MStdIndex mStdIndex = objectMapper.readValue(indexJson, MStdIndex.class);
        String version = mStdIndex.getVersion();
        Long stdDatasetId = mStdIndex.getStdDatasetId();
        //通过id查找stdDatasetCode
        StdDataSetModel stdDataSetModel = stdDatasetService.get(new StandardVersion(version), stdDatasetId);
        if(stdDataSetModel!=null){
            mStdIndex.setStdDatasetCode(stdDataSetModel.getCode());
        }else{
            throw new Exception("未找到数据集");
        }
        JsonNode jsonNode = objectMapper.readTree(objectMapper.writeValueAsString(mStdIndex));
        SqlCreator sqlCreator = new SqlCreator(StdIndex.class);
        String sql = sqlCreator.insertData("std_index_"+version, jsonNode);
        NativeQuery query = getExeuteQuery(sqlCreator, sql);
        query.executeUpdate();
    }
    public void update(String indexJson) throws IOException {
        MStdIndex mStdIndex = objectMapper.readValue(indexJson, MStdIndex.class);
        String version = mStdIndex.getVersion();
        JsonNode jsonNode = objectMapper.readTree(indexJson);
        SqlCreator sqlCreator = new SqlCreator(StdIndex.class);
        String sql = sqlCreator.updateDataByTableKey("std_index_"+version, jsonNode);
        NativeQuery query = getExeuteQuery(sqlCreator, sql);
        query.executeUpdate();
    }
    public boolean isUnique(String filters, String version) throws IOException {
        List<StdIndex> list = searchPage(StdIndex.class, StandardVersion.StdIndexTable,version, filters, null, null, null,true);
        return !CollectionUtils.isEmpty(list);
    }
}

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/service/standard/StdMetadataService.java

@@ -2,7 +2,6 @@ package com.yihu.jw.basic.standard.service.standard;
import com.fasterxml.jackson.databind.JsonNode;
import com.yihu.jw.basic.standard.dao.SQLGeneralDAO;
import com.yihu.jw.basic.standard.model.adapter.AdapterMetadataModel;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
@@ -14,8 +13,8 @@ import com.yihu.jw.basic.standard.model.standard.*;
import com.yihu.jw.basic.standard.model.standard.resultModel.StandardParamResultModel;
import com.yihu.jw.basic.standard.service.bo.StandardVersion;
import org.hibernate.Criteria;
import org.hibernate.Query;
import org.hibernate.SQLQuery;
import org.hibernate.query.NativeQuery;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.hibernate.criterion.Restrictions;
import org.springframework.beans.factory.annotation.Autowired;
@@ -79,12 +78,12 @@ public class StdMetadataService extends SQLGeneralDAO {
        if (limit != null) {
            if (offset != null &&offset>0) {
                sql += " limit "+(offset - 1) * limit+","+limit;
                completeSql += " limit "+(offset - 1) * limit+","+limit;
            }else {
                sql += " limit "+limit;
                completeSql += " limit "+limit;
            }
        }
        return jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(StdMetaDataModel.class));
        return jdbcTemplate.query(completeSql,new BeanPropertyRowMapper<>(StdMetaDataModel.class));
    }
    public List<StdMetaDataModel> getList(String stdVersion, Long datasetId, String condition, String order, Integer limit, Integer offset) {
@@ -128,10 +127,7 @@ public class StdMetadataService extends SQLGeneralDAO {
        query.put("code", code);
        List<StdMetaDataModel> list = this.getList(standardVersion, datasetId, query, order, 1, 1);
        if (!CollectionUtils.isEmpty(list)) {
            return true;
        }
        return false;
        return !CollectionUtils.isEmpty(list);
    }
    public Envelop delete(String stdVersion, Long metadataId) {
@@ -154,10 +150,7 @@ public class StdMetadataService extends SQLGeneralDAO {
        sqlCreator.neCondition("id", metadataId);
        String sql = sqlCreator.selectData(standardVersion.getMetaDataTableName());
        List<StdMetaDataModel> list = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(StdMetaDataModel.class));
        if (!CollectionUtils.isEmpty(list)) {
            return true;
        }
        return false;
        return !CollectionUtils.isEmpty(list);
    }
    public ObjEnvelop update(String stdVersion, String metadata) {
@@ -212,7 +205,7 @@ public class StdMetadataService extends SQLGeneralDAO {
        Session session = getCurrentSession();
        String sql = "delete from " + standardVersion.getMetaDataTableName() + " where id = :id";
        Query query = session.createSQLQuery(sql);
        query.setLong("id", metadataId);
        query.setParameter("id", metadataId);
        query.executeUpdate();
    }
@@ -373,7 +366,7 @@ public class StdMetadataService extends SQLGeneralDAO {
                    StandardVersion version = new StandardVersion(versionModel.getVersion());
                    sqlDatasetCreator.equalCondition("code", code);
                    sql = sqlDatasetCreator.selectData(version.getDataSetTableName());
                    SQLQuery sqlQuery = session.createSQLQuery(sql);
                    NativeQuery sqlQuery = session.createNativeQuery(sql);
                    BeanTransformer datasetTransformer = new BeanTransformer(StdDataSetModel.class);
                    sqlQuery.setResultTransformer(datasetTransformer);
                    sqlQuery.setParameter("code", code);
@@ -405,7 +398,7 @@ public class StdMetadataService extends SQLGeneralDAO {
                List<StdMetaDataModel> distinctModelList = new ArrayList<>();
                if (!StringUtil.isEmpty(sql)) {
                    sql = sql.substring(0, sql.length() - SqlConstants.UNION.length());
                    SQLQuery sqlQuery;
                    NativeQuery sqlQuery;
                    sqlQuery = getCurrentSession().createSQLQuery(sql);
                    sqlQuery.setResultTransformer(metadataTransformer);
                    for (int i = 1; i < count; i++) {

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/service/standard/StdPublisherService.java

@@ -11,7 +11,7 @@ import com.yihu.jw.util.sql.RequestParamTransformer;
import com.yihu.jw.basic.standard.model.standard.resultModel.PublisherResultModel;
import com.yihu.jw.util.sql.SqlConstants;
import org.hibernate.Criteria;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/service/standard/StdRelationService.java

@@ -3,7 +3,6 @@ package com.yihu.jw.basic.standard.service.standard;
import com.fasterxml.jackson.databind.JsonNode;
import com.yihu.jw.basic.standard.dao.SQLGeneralDAO;
import com.yihu.jw.basic.standard.model.standard.StdDatasetRelation;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.util.sql.SqlCreator;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

svr/svr-basic/src/main/java/com/yihu/jw/basic/statistics/service/ResourceStatisticService.java

@@ -4,8 +4,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.basic.report.dao.XJsonArchivesRepository;
import com.yihu.jw.entity.ehr.report.JsonArchives;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.hibernate.SQLQuery;
import org.hibernate.Session;
import org.hibernate.query.NativeQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
@@ -24,7 +24,7 @@ public class ResourceStatisticService extends BaseJpaService<JsonArchives, XJson
        Session session = currentSession();
        String sql = "SELECT count(1), date_format(receive_date, '%Y-%m-%d') AS date FROM json_archives " +
                " WHERE DATE_SUB(CURDATE(), INTERVAL 7 DAY) <= date(receive_date) GROUP BY date_format(receive_date, '%Y-%m-%d')";
        SQLQuery query = session.createSQLQuery(sql);
        NativeQuery query = session.createSQLQuery(sql);
        return query.list();
    }
@@ -33,7 +33,7 @@ public class ResourceStatisticService extends BaseJpaService<JsonArchives, XJson
        Session session = currentSession();
        String sql = "SELECT count(1), date_format(receive_date, '%Y-%m-%d') AS date, event_type FROM json_archives " +
                "WHERE DATE_SUB(CURDATE(), INTERVAL 7 DAY) <= date(receive_date) AND  event_type=:eventType  GROUP BY date_format(receive_date, '%Y-%m-%d'), event_type;";
        SQLQuery query = session.createSQLQuery(sql);
        NativeQuery query = session.createSQLQuery(sql);
        query.setParameter("eventType", eventType);
        return query.list();
    }
@@ -44,7 +44,7 @@ public class ResourceStatisticService extends BaseJpaService<JsonArchives, XJson
        Session session = currentSession();
        String sql = "SELECT count(1), event_type FROM json_archives " +
                "WHERE DATE_SUB(CURDATE(), INTERVAL 1 DAY) < date(event_date) GROUP BY event_type";
        SQLQuery query = session.createSQLQuery(sql);
        NativeQuery query = session.createSQLQuery(sql);
        return query.list();
    }
}

svr/svr-basic/src/main/java/com/yihu/jw/basic/system/controller/DictController.java

@@ -1,213 +1,197 @@
//package com.yihu.jw.basic.system.controller;
//
//import com.yihu.hos.system.model.SystemDict;
//import com.yihu.hos.system.model.SystemDictList;
//import com.yihu.hos.system.service.DictManager;
//import com.yihu.hos.web.framework.model.Result;
//import org.apache.commons.beanutils.BeanUtils;
//import org.springframework.stereotype.Controller;
//import org.springframework.util.StringUtils;
//import org.springframework.web.bind.annotation.RequestMapping;
//import org.springframework.web.bind.annotation.ResponseBody;
//
//import javax.annotation.Resource;
//import javax.servlet.http.HttpServletRequest;
//import java.util.HashMap;
//import java.util.Map;
//
///**
// * Created by chenweida on 2016/1/20.
// */
//@RestController
//@RequestMapping("/dict")
//public class DictController {
//    @Resource(name = DictManager.BEAN_ID)
//    private DictManager dictManager;
//
//    @RequestMapping("/initial")
//    public String dictInitial(Model model) {
//        model.addAttribute("contentPage", "system/dict/dict");
//        return "partView";
//    }
//
//    @RequestMapping("/dictDialog")
//    public String resourceRestDialog(EnvelopRestEndpointString id, String mode) {
//        SystemDictList sdl;
//        try {
//            if ("view".equals(mode)) {
//                sdl = dictManager.getSystemDictListById(id);
//            } else if ("modify".equals(mode)) {
//                sdl = dictManager.getSystemDictListById(id);
//            } else {
//                sdl = new SystemDictList();
//            }
//            model.addAttribute("resourceId", id);
//            model.addAttribute("mode", mode);
//            model.addAttribute("model", sdl);
//            model.addAttribute("contentPage", "system/dict/dictDialog");
//        } catch (Exception e) {
//            e.printStackTrace();
//        }
//        return "pageView";
//    }
//
//    @RequestMapping("/dictItemDialog")
//    public String resourceRestDetailDialog(EnvelopRestEndpointString id, String mode, String dictName) {
//        SystemDict sd = null;
//        try {
//            if ("view".equals(mode)) {
//                sd = dictManager.getSystemDictById(id);
//            } else if ("modify".equals(mode)) {
//                sd = dictManager.getSystemDictById(id);
//            } else {
//                sd = new SystemDict();
//                // sd.setInnerCode(chineseName);
//                sd.setDictName(dictName);
//
//            }
//            model.addAttribute("resourceId", id);
//            model.addAttribute("mode", mode);
//            model.addAttribute("model", sd);
//            model.addAttribute("contentPage", "system/dict/dictItemDialog");
//        } catch (Exception e) {
//            e.printStackTrace();
//        }
//        return "pageView";
//    }
//
//    /**
//     * 获取字典列表
//     */
//    @RequestMapping("/getDictList")
//    @ResponseBody
//    public Result getDictList(HttpServletRequest request) {
//        try {
//            Map<String, Object> params = new HashMap<>();
//            String name = request.getParameter("name");
//            params.put("name", name);
//            String page = StringUtils.isEmpty(request.getParameter("page")) ? "1" : request.getParameter("page");
//            String rows = StringUtils.isEmpty(request.getParameter("rows")) ? "10" : request.getParameter("rows");
//
//            params.put("page", page);
//            params.put("rows", rows);
//
//            return dictManager.getDictList(params);
//        } catch (Exception ex) {
//            ex.printStackTrace();
//            return Result.error(ex.getMessage());
//        }
//    }
//
//
//    @RequestMapping("/deleteDict")
//    @ResponseBody
//    public Result deleteDict(HttpServletRequest request) {
//        try {
//            String id = request.getParameter("id");
//            return dictManager.deleteDict(id);
//        } catch (Exception e) {
//            e.printStackTrace();
//            return Result.error("删除失败");
//        }
//
//    }
//
//    @RequestMapping("/addDict")
//    @ResponseBody
//    public Result addDict(HttpServletRequest request) {
//        try {
//            SystemDictList rr = new SystemDictList();
//            BeanUtils.populate(rr, request.getParameterMap());
//            return dictManager.addDict(rr);
//        } catch (Exception e) {
//            e.printStackTrace();
//            return Result.error("新增失败");
//        }
//
//    }
//
//    @RequestMapping("/updateDict")
//    @ResponseBody
//    public Result updateDict(HttpServletRequest request) {
//        try {
//            SystemDictList rr = new SystemDictList();
//            BeanUtils.populate(rr, request.getParameterMap());
//            return dictManager.updateDict(rr);
//        } catch (Exception e) {
//            e.printStackTrace();
//            return Result.error("更新失败");
//        }
//
//    }
//
//
//    //-------------------------字典项----------------------------
//
//    /**
//     * 获取字典列表
//     */
//    @RequestMapping("/getDictItemList")
//    @ResponseBody
//    public Result getDictItemList(HttpServletRequest request) {
//        try {
//            Map<String, Object> params = new HashMap<>();
//            String name = request.getParameter("name");
//            String dictId = request.getParameter("dictId");
//            params.put("name", name);
//            String page = StringUtils.isEmpty(request.getParameter("page")) ? "1" : request.getParameter("page");
//            String rows = StringUtils.isEmpty(request.getParameter("rows")) ? "10" : request.getParameter("rows");
//
//            params.put("dictId", dictId);
//            params.put("page", page);
//            params.put("rows", rows);
//
//            return dictManager.getDictItemList(params);
//        } catch (Exception ex) {
//            ex.printStackTrace();
//            return Result.error(ex.getMessage());
//        }
//    }
//
//
//    @RequestMapping("/deleteDictItem")
//    @ResponseBody
//    public Result deleteDictItem(HttpServletRequest request) {
//        try {
//            String id = request.getParameter("id");
//            return dictManager.deleteDictItem(id);
//        } catch (Exception e) {
//            e.printStackTrace();
//            return Result.error("删除失败");
//        }
//
//    }
//
//    @RequestMapping("/addDictItem")
//    @ResponseBody
//    public Result addDictItem(HttpServletRequest request) {
//        try {
//            SystemDict rr = new SystemDict();
//            BeanUtils.populate(rr, request.getParameterMap());
//            return dictManager.addDictItem(rr);
//        } catch (Exception e) {
//            e.printStackTrace();
//            return Result.error("新增失败");
//        }
//
//    }
//
//    @RequestMapping("/updateDictItem")
//    @ResponseBody
//    public Result updateDictItem(HttpServletRequest request) {
//        try {
//            SystemDict rr = new SystemDict();
//            BeanUtils.populate(rr, request.getParameterMap());
//            return dictManager.updateDictItem(rr);
//        } catch (Exception e) {
//            e.printStackTrace();
//            return Result.error("更新失败");
//        }
//
//    }
//
//}
package com.yihu.jw.basic.system.controller;
import com.yihu.jw.basic.system.model.SystemDict;
import com.yihu.jw.basic.system.model.SystemDictList;
import com.yihu.jw.basic.system.service.DictManager;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import io.swagger.annotations.Api;
import org.apache.commons.beanutils.BeanUtils;
import org.springframework.stereotype.Controller;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.Map;
/**
 * Created by chenweida on 2016/1/20.
 */
@RestController
@RequestMapping("/dict")
@Api(value = "DictController", tags = "esb字典相关")
public class DictController extends EnvelopRestEndpoint {
    @Resource(name = DictManager.BEAN_ID)
    private DictManager dictManager;
    @GetMapping("/dictDialog")
    public Envelop resourceRestDialog(String id, String mode) {
        SystemDictList sdl;
        try {
            if ("view".equals(mode)) {
                sdl = dictManager.getSystemDictListById(id);
            } else if ("modify".equals(mode)) {
                sdl = dictManager.getSystemDictListById(id);
            } else {
                sdl = new SystemDictList();
            }
            return ObjEnvelop.getSuccess("查询成功",sdl);
        } catch (Exception e) {
            e.printStackTrace();
            return failed("查询失败");
        }
    }
    @GetMapping("/dictItemDialog")
    public Envelop resourceRestDetailDialog(String id, String mode, String dictName) {
        SystemDict sd = null;
        try {
            if ("view".equals(mode)) {
                sd = dictManager.getSystemDictById(id);
            } else if ("modify".equals(mode)) {
                sd = dictManager.getSystemDictById(id);
            } else {
                sd = new SystemDict();
                // sd.setInnerCode(chineseName);
                sd.setDictName(dictName);
            }
            return ObjEnvelop.getSuccess("查询成功",sd);
        } catch (Exception e) {
            e.printStackTrace();
            return failed("查询失败");
        }
    }
    /**
     * 获取字典列表
     */
    @GetMapping("/getDictList")
    public Envelop getDictList(HttpServletRequest request) {
        try {
            Map<String, Object> params = new HashMap<>();
            String name = request.getParameter("name");
            params.put("name", name);
            String page = StringUtils.isEmpty(request.getParameter("page")) ? "1" : request.getParameter("page");
            String rows = StringUtils.isEmpty(request.getParameter("rows")) ? "10" : request.getParameter("rows");
            params.put("page", page);
            params.put("rows", rows);
            return dictManager.getDictList(params);
        } catch (Exception ex) {
            ex.printStackTrace();
            return failed("查询失败");
        }
    }
    @PostMapping("/deleteDict")
    public Envelop deleteDict(HttpServletRequest request) {
        try {
            String id = request.getParameter("id");
            return dictManager.deleteDict(id);
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError("删除失败");
        }
    }
    @PostMapping("/addDict")
    public Envelop addDict(HttpServletRequest request) {
        try {
            SystemDictList rr = new SystemDictList();
            BeanUtils.populate(rr, request.getParameterMap());
            return dictManager.addDict(rr);
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError("新增失败");
        }
    }
    @PostMapping("/updateDict")
    public Envelop updateDict(HttpServletRequest request) {
        try {
            SystemDictList rr = new SystemDictList();
            BeanUtils.populate(rr, request.getParameterMap());
            return dictManager.updateDict(rr);
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError("更新失败");
        }
    }
    //-------------------------字典项----------------------------
    /**
     * 获取字典列表
     */
    @GetMapping("/getDictItemList")
    public Envelop getDictItemList(HttpServletRequest request) {
        try {
            Map<String, Object> params = new HashMap<>();
            String name = request.getParameter("name");
            String dictId = request.getParameter("dictId");
            params.put("name", name);
            String page = StringUtils.isEmpty(request.getParameter("page")) ? "1" : request.getParameter("page");
            String rows = StringUtils.isEmpty(request.getParameter("rows")) ? "10" : request.getParameter("rows");
            params.put("dictId", dictId);
            params.put("page", page);
            params.put("rows", rows);
            return dictManager.getDictItemList(params);
        } catch (Exception ex) {
            ex.printStackTrace();
            return Envelop.getError(ex.getMessage());
        }
    }
    @PostMapping("/deleteDictItem")
    public Envelop deleteDictItem(HttpServletRequest request) {
        try {
            String id = request.getParameter("id");
            return dictManager.deleteDictItem(id);
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError("删除失败");
        }
    }
    @PostMapping("/addDictItem")
    public Envelop addDictItem(HttpServletRequest request) {
        try {
            SystemDict rr = new SystemDict();
            BeanUtils.populate(rr, request.getParameterMap());
            return dictManager.addDictItem(rr);
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError("新增失败");
        }
    }
    @PostMapping("/updateDictItem")
    public Envelop updateDictItem(HttpServletRequest request) {
        try {
            SystemDict rr = new SystemDict();
            BeanUtils.populate(rr, request.getParameterMap());
            return dictManager.updateDictItem(rr);
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError("更新失败");
        }
    }
}

svr/svr-basic/src/main/java/com/yihu/jw/basic/system/dao/DatasourceDao.java

@@ -4,7 +4,7 @@ import com.yihu.jw.basic.standard.dao.SQLGeneralDAO;
import com.yihu.jw.basic.system.model.SystemDatasource;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.stereotype.Repository;
import org.springframework.util.StringUtils;
@@ -78,10 +78,6 @@ public class DatasourceDao extends SQLGeneralDAO {
        return getDataGridResult(sb.toString(),page,pageSize);
    }
    public List getData() {
        Query query = getCurrentSession().createQuery("from SystemDatasource t");
        return query.list();
    }
    /**
     * 获取全部数据源列表

svr/svr-basic/src/main/java/com/yihu/jw/basic/system/dao/FlowTempDao.java

@@ -2,7 +2,7 @@
//
//import com.yihu.hos.system.model.SystemServiceFlowTemp;
//import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
//import org.hibernate.Query;
//import org.hibernate.query.Query;
//import org.hibernate.Session;
//import org.springframework.stereotype.Repository;
//

svr/svr-basic/src/main/java/com/yihu/jw/basic/system/dao/SystemParamDao.java

@@ -3,7 +3,7 @@
//import com.yihu.hos.system.model.SystemParam;
//import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
//import com.yihu.hos.web.framework.model.Result;
//import org.hibernate.Query;
//import org.hibernate.query.Query;
//import org.springframework.stereotype.Repository;
//import org.springframework.util.StringUtils;
//

svr/svr-basic/src/main/java/com/yihu/jw/basic/system/service/DictManager.java

@@ -1,154 +1,155 @@
//package com.yihu.jw.basic.system.service;
//
//import com.yihu.hos.system.dao.DictDao;
//import com.yihu.hos.system.dao.DictListDao;
//import com.yihu.hos.system.model.SystemDict;
//import com.yihu.hos.system.model.SystemDictList;
//import com.yihu.hos.web.framework.model.Result;
//import org.springframework.stereotype.Service;
//import org.springframework.transaction.annotation.Transactional;
//
//import javax.annotation.Resource;
//import java.util.List;
//import java.util.Map;
//
///**
// * Created by chenweida on 2016/1/20.
// */
//@Service("dictManager")
//public class DictManager  {
//
//    public static final String BEAN_ID = "dictManager";
//
//    @Resource(name =DictDao.BEAN_ID )
//    private DictDao dictItemDao;//字典项
//    @Resource(name = DictListDao.BEAN_ID)
//    private DictListDao dictDao;//字典
//
//
//    /**
//     * 通过字典名字,
//     * 字典项的code查找字典项值
//     * @param dictName
//     * @param code
//     * @return
//     */
//    public String getDictIetmValue(String dictName,String code){
//        SystemDict  dictItem = dictItemDao.getDictIetmValue(dictName, code);
//        if(dictItem!=null){
//            return dictItem.getValue();
//        }
//        return "";
//    }
//
//    @Transactional
//    public Result getDictList(Map<String, Object> params) throws Exception {
//        return dictDao.getDictList(params);
//    }
//
//    @Transactional
//    public Result getDictItemList(Map<String, Object> params) throws Exception {
//        return dictItemDao.getDictList(params);
//    }
//
//
//    public SystemDict getSystemDictById(String id) throws Exception {
//        return dictItemDao.getEntity(SystemDict.class, id);
//    }
//
//
//    public SystemDictList getSystemDictListById(String id) throws Exception {
//        return dictDao.getEntity(SystemDictList.class, id);
//    }
//
//    @Transactional
//    public Result deleteDict(String id) throws Exception {
//        SystemDictList sd = dictDao.getEntity(SystemDictList.class, id);
//        dictItemDao.delDictItemByDictName(sd.getDictName());
//        dictDao.deleteEntity(sd);
//        return Result.success("删除成功");
//    }
//
//    @Transactional
//    public Result addDict(SystemDictList rr) throws Exception {
//        SystemDictList systemDictListTemp = dictDao.getDitcByName(rr.getDictName());
//        if (systemDictListTemp != null) {
//            return Result.error("字典代码重复");
//        }
//        dictDao.saveEntity(rr);
//        return Result.success("保存成功");
//    }
//
//    @Transactional
//    public Result updateDict(SystemDictList rr) throws Exception {
//        SystemDictList systemDictListTemp = dictDao.getDitcByNameWithOutId(rr.getDictName(), rr.getId());
//        if (systemDictListTemp != null) {
//            return Result.error("字典代码重复");
//        }
//        SystemDictList sd = dictDao.getEntity(SystemDictList.class, rr.getId());
//        sd.setPid(rr.getPid());
//        sd.setChineseName(rr.getChineseName());
//        sd.setDictName(rr.getDictName());
//        sd.setPyCode(rr.getPyCode());
//        sd.setRelationColCode(rr.getRelationColCode());
//        sd.setRelationColValue(rr.getRelationColValue());
//        sd.setRelationTable(rr.getRelationTable());
//        sd.setRemark(rr.getRemark());
//        sd.setRelationColExtend(rr.getRelationColExtend());
//        return Result.success("更新成功");
//    }
//
//    @Transactional
//    public Result deleteDictItem(String id) throws Exception {
//        SystemDict sd = dictItemDao.getEntity(SystemDict.class, id);
//        dictItemDao.deleteEntity(sd);
//        return Result.success("删除成功");
//    }
//
//    @Transactional
//    public Result addDictItem(SystemDict rr) throws Exception {
//       // SystemDict rrTemp = dictItemDao.getDictItemByCode(rr.getInnerCode());
//       // if (rrTemp != null) {
//       //     return Result.error("字典项代码已经存在");
//      //  }
//        dictItemDao.saveEntity(rr);
//
//        return Result.success("保存成功");
//    }
//
//    @Transactional
//    public Result updateDictItem(SystemDict rr) throws Exception {
//      //  SystemDict rrTemp = dictItemDao.getDictItemByCodeWithOutId(rr.getInnerCode(),rr.getId());
//       // if (rrTemp != null) {
//       //    return Result.error("字典项代码已经存在");
//      //  }
//        SystemDict sd = dictItemDao.getEntity(SystemDict.class, rr.getId());
//        sd.setPyCode(rr.getPyCode());
//        sd.setDictName(rr.getDictName());
//        sd.setCode(rr.getCode());
//        sd.setSort(rr.getSort());
//        sd.setValue(rr.getValue());
//        return Result.success("更新成功");
//    }
//
//    /**
//     * 通过字典名字,
//     * 字典项的code查找字典项值
//     * @param dictName
//     * @param code
//     * @return
//     */
//    public SystemDict getDictIetm(String dictName,String code){
//        SystemDict dictItem = dictItemDao.getDictIetmValue(dictName, code);
//        return dictItem;
//    }
//
//    /**
//     * @param dictName
//     * @param codes
//     * @return
//     */
//    public List<SystemDict> getDictEntries(String dictName,String[] codes) {
//       return dictItemDao.getDictEntries(dictName,codes);
//    }
//}
package com.yihu.jw.basic.system.service;
import com.yihu.jw.basic.system.dao.DictDao;
import com.yihu.jw.basic.system.dao.DictListDao;
import com.yihu.jw.basic.system.model.SystemDict;
import com.yihu.jw.basic.system.model.SystemDictList;
import com.yihu.jw.restmodel.web.Envelop;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
/**
 * Created by chenweida on 2016/1/20.
 */
@Service("dictManager")
public class DictManager  {
    public static final String BEAN_ID = "dictManager";
    @Resource(name = DictDao.BEAN_ID )
    private DictDao dictItemDao;//字典项
    @Resource(name = DictListDao.BEAN_ID)
    private DictListDao dictDao;//字典
    /**
     * 通过字典名字,
     * 字典项的code查找字典项值
     * @param dictName
     * @param code
     * @return
     */
    public String getDictIetmValue(String dictName,String code){
        SystemDict dictItem = dictItemDao.getDictIetmValue(dictName, code);
        if(dictItem!=null){
            return dictItem.getValue();
        }
        return "";
    }
    @Transactional
    public Envelop getDictList(Map<String, Object> params) throws Exception {
        return dictDao.getDictList(params);
    }
    @Transactional
    public Envelop getDictItemList(Map<String, Object> params) throws Exception {
        return dictItemDao.getDictList(params);
    }
    public SystemDict getSystemDictById(String id) throws Exception {
        return dictItemDao.getEntity(SystemDict.class, id);
    }
    public SystemDictList getSystemDictListById(String id) throws Exception {
        return dictDao.getEntity(SystemDictList.class, id);
    }
    @Transactional
    public Envelop deleteDict(String id) throws Exception {
        SystemDictList sd = dictDao.getEntity(SystemDictList.class, id);
        dictItemDao.delDictItemByDictName(sd.getDictName());
        dictDao.deleteEntity(sd);
        return Envelop.getSuccess("删除成功");
    }
    @Transactional
    public Envelop addDict(SystemDictList rr) throws Exception {
        SystemDictList systemDictListTemp = dictDao.getDitcByName(rr.getDictName());
        if (systemDictListTemp != null) {
            return Envelop.getError("字典代码重复");
        }
        dictDao.saveEntity(rr);
        return Envelop.getSuccess("保存成功");
    }
    @Transactional
    public Envelop updateDict(SystemDictList rr) throws Exception {
        SystemDictList systemDictListTemp = dictDao.getDitcByNameWithOutId(rr.getDictName(), rr.getId());
        if (systemDictListTemp != null) {
            return Envelop.getError("字典代码重复");
        }
        SystemDictList sd = dictDao.getEntity(SystemDictList.class, rr.getId());
        sd.setPid(rr.getPid());
        sd.setChineseName(rr.getChineseName());
        sd.setDictName(rr.getDictName());
        sd.setPyCode(rr.getPyCode());
        sd.setRelationColCode(rr.getRelationColCode());
        sd.setRelationColValue(rr.getRelationColValue());
        sd.setRelationTable(rr.getRelationTable());
        sd.setRemark(rr.getRemark());
        sd.setRelationColExtend(rr.getRelationColExtend());
        return Envelop.getSuccess("更新成功");
    }
    @Transactional
    public Envelop deleteDictItem(String id) throws Exception {
        SystemDict sd = dictItemDao.getEntity(SystemDict.class, id);
        dictItemDao.deleteEntity(sd);
        return Envelop.getSuccess("删除成功");
    }
    @Transactional
    public Envelop addDictItem(SystemDict rr) throws Exception {
       // SystemDict rrTemp = dictItemDao.getDictItemByCode(rr.getInnerCode());
       // if (rrTemp != null) {
       //     return Envelop.getError("字典项代码已经存在");
      //  }
        dictItemDao.saveEntity(rr);
        return Envelop.getSuccess("保存成功");
    }
    @Transactional
    public Envelop updateDictItem(SystemDict rr) throws Exception {
      //  SystemDict rrTemp = dictItemDao.getDictItemByCodeWithOutId(rr.getInnerCode(),rr.getId());
       // if (rrTemp != null) {
       //    return Envelop.getError("字典项代码已经存在");
      //  }
        SystemDict sd = dictItemDao.getEntity(SystemDict.class, rr.getId());
        sd.setPyCode(rr.getPyCode());
        sd.setDictName(rr.getDictName());
        sd.setCode(rr.getCode());
        sd.setSort(rr.getSort());
        sd.setValue(rr.getValue());
        return Envelop.getSuccess("更新成功");
    }
    /**
     * 通过字典名字,
     * 字典项的code查找字典项值
     * @param dictName
     * @param code
     * @return
     */
    public SystemDict getDictIetm(String dictName,String code){
        SystemDict dictItem = dictItemDao.getDictIetmValue(dictName, code);
        return dictItem;
    }
    /**
     * @param dictName
     * @param codes
     * @return
     */
    public List<SystemDict> getDictEntries(String dictName,String[] codes) {
       return dictItemDao.getDictEntries(dictName,codes);
    }
}

svr/svr-basic/src/main/java/com/yihu/jw/basic/user/service/DoctorService.java

@@ -15,8 +15,8 @@ import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.util.date.DateUtil;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.lang3.StringUtils;
import org.hibernate.Query;
import org.hibernate.SQLQuery;
import org.hibernate.query.NativeQuery;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -150,7 +150,7 @@ public class DoctorService extends BaseJpaService<Doctors, XDoctorRepository> {
    public List idExist(String[] phones)
    {
        String sql = "SELECT phone FROM doctors WHERE phone in(:phones)";
        SQLQuery sqlQuery = currentSession().createSQLQuery(sql);
        NativeQuery sqlQuery = currentSession().createSQLQuery(sql);
        sqlQuery.setParameterList("phones", phones);
        return sqlQuery.list();
    }
@@ -165,7 +165,7 @@ public class DoctorService extends BaseJpaService<Doctors, XDoctorRepository> {
                "BZQK, SFZCQKYX, QDHGZS, XZSQPZGZ, SFCSTJGZ, TJXXHGZ,insert_time,code) VALUES \n";
        StringBuilder sql = new StringBuilder(header) ;
        Map<String, Object> map;
        SQLQuery query;
        NativeQuery query;
        int total = 0;
        DemographicInfo demographicInfo =null;
        for(int i=1; i<=doctorLs.size(); i++){
@@ -259,7 +259,7 @@ public class DoctorService extends BaseJpaService<Doctors, XDoctorRepository> {
    public List getIdByPhone(String[] phones)
    {
        String sql = "SELECT d.* FROM doctors d WHERE phone in(:phones)";
        SQLQuery sqlQuery = currentSession().createSQLQuery(sql);
        NativeQuery sqlQuery = currentSession().createSQLQuery(sql);
        sqlQuery.setParameterList("phones", phones);
        return sqlQuery.list();
    }
@@ -270,7 +270,7 @@ public class DoctorService extends BaseJpaService<Doctors, XDoctorRepository> {
    public List emailsExistence(String[] emails)
    {
        String sql = "SELECT email FROM doctors WHERE email in(:emails)";
        SQLQuery sqlQuery = currentSession().createSQLQuery(sql);
        NativeQuery sqlQuery = currentSession().createSQLQuery(sql);
        sqlQuery.setParameterList("emails", emails);
        return sqlQuery.list();
    }
@@ -288,7 +288,7 @@ public class DoctorService extends BaseJpaService<Doctors, XDoctorRepository> {
    public List idCardNosExist(String[] idCardNos)
    {
        String sql = "SELECT id_card_no FROM doctors WHERE id_card_no in(:idCardNos)";
        SQLQuery sqlQuery = currentSession().createSQLQuery(sql);
        NativeQuery sqlQuery = currentSession().createSQLQuery(sql);
        sqlQuery.setParameterList("idCardNos", idCardNos);
        return sqlQuery.list();
    }
@@ -317,7 +317,7 @@ public class DoctorService extends BaseJpaService<Doctors, XDoctorRepository> {
                        "WHERE d.role_type=:roleType and omr.org_id is not null and omr.org_name is not null " +
                        " GROUP BY omr.org_id,omr.org_name";
        SQLQuery query = currentSession().createSQLQuery(sql);
        NativeQuery query = currentSession().createSQLQuery(sql);
        query.setParameter("roleType", roleType);
        List<Object> list=query.list();
        return list;
@@ -372,7 +372,7 @@ public class DoctorService extends BaseJpaService<Doctors, XDoctorRepository> {
    public List getIdByIdCardNos(String[] idCardNos)
    {
        String sql = "SELECT d.* FROM doctors d WHERE id_card_no in(:idCardNos)";
        SQLQuery sqlQuery = currentSession().createSQLQuery(sql);
        NativeQuery sqlQuery = currentSession().createSQLQuery(sql);
        sqlQuery.setParameterList("idCardNos", idCardNos);
        return sqlQuery.list();
    }