代码修改

svr/svr-basic/src/main/java/com/yihu/jw/basic/agadmin/controller/quota/TjDimensionMainController.java

@@ -2,19 +2,22 @@ package com.yihu.jw.basic.agadmin.controller.quota;
import com.yihu.jw.basic.quota.service.TjDimensionMainService;
import com.yihu.jw.basic.quota.service.TjQuotaDimensionMainService;
import com.yihu.jw.entity.ehr.quota.TjDimensionMain;
import com.yihu.jw.entity.ehr.quota.TjQuotaDimensionMain;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.MixEnvelop;
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.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;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.net.URLDecoder;
@@ -28,16 +31,16 @@ import java.util.*;
@Api( tags = {"网关-统计主维度"})
public class TjDimensionMainController extends EnvelopRestEndpoint {
    @Autowired
    @Resource
    TjDimensionMainService tjDimensionMainService;
    @Resource
    TjQuotaDimensionMainService tjQuotaDimensionMainService;
    //查询统计主维度
    @GetMapping("/getTjDimensionMain")
    public Object searchTjDimensionMain(String name, int page, int rows){
        String url = "/tj/getTjDimensionMainList";
        String resultStr = "";
        Envelop envelop = new Envelop();
        Map<String, Object> params = new HashMap<>();
        StringBuffer stringBuffer = new StringBuffer();
        if (!StringUtils.isEmpty(name)) {
            stringBuffer.append("name?" + name );
@@ -184,66 +187,55 @@ public class TjDimensionMainController extends EnvelopRestEndpoint {
        return  failed("查询失败");
    }
//    @GetMapping("/getTjDimensionMainInfo")
//    public Envelop getTjDimensionMainInfo(String quotaCode, String name, int page, int rows){
//        String url = "/tj/getTjDimensionMainInfoList";
//        String resultStr = "";
//        Envelop envelop = new Envelop();
//        Map<String, Object> params = new HashMap<>();
//        StringBuffer mainFilter = new StringBuffer("status=1");
//        if (!StringUtils.isEmpty(quotaCode)) {
//            params.put("filter", "quotaCode=" + quotaCode);
//        }
//        if (!StringUtils.isEmpty(name)) {
//            mainFilter.append("name?" + name + " g1;code?" + name + " g1;");
//        }
//        String filters = mainFilter.toString();
//        if (!StringUtils.isEmpty(filters)) {
//            params.put("filters", filters);
//        }
//        params.put("page", page);
//        params.put("size", rows);
//        try {
//            ListResult listResult = tjDimensionMainClient.search(fields, filters, sorts, size, page);
//
//            List<TjDimensionMainModel> mainModelList  = new ArrayList<>();
//            if(listResult.getTotalCount() != 0){
//                List<Map<String,Object>> modelList = listResult.getDetailModelList();
//                for(Map<String,Object> map : modelList){
//                    TjDimensionMainModel tjDimensionMainModel = objectMapper.convertValue(map,TjDimensionMainModel.class);
//                    mainModelList.add(tjDimensionMainModel);
//                }
//                ListResult listResult2 = tjQuotaDimensionMainClient.search(fields, filter, sorts, size, page);
//                List<TjQuotaDimensionMainModel> mainModelList2  = new ArrayList<>();
//                if(listResult2.getTotalCount() != 0) {
//                    List<Map<String, Object>> modelList2 = listResult2.getDetailModelList();
//                    for (Map<String, Object> map : modelList2) {
//                        TjQuotaDimensionMainModel tjQuotaDimensionMainModel = objectMapper.convertValue(map, TjQuotaDimensionMainModel.class);
//                        TjDimensionMain tjDimensionMain = tjDimensionMainClient.getTjDimensionMain(tjQuotaDimensionMainModel.getMainCode());
//                        if (tjDimensionMain != null) {
//                            tjQuotaDimensionMainModel.setName(tjDimensionMain.getName());
//                        }
//                        mainModelList2.add(tjQuotaDimensionMainModel);
//                    }
//                }
//                List<String> list = getTjQuotaDimensionMainOfMainCode(filter, sorts);
//                for (int i=0; i<mainModelList.size(); i++) {
//                    if (list.contains(mainModelList.get(i).getCode())) {
//                        mainModelList.get(i).setChecked(true);
//                    } else {
//                        mainModelList.get(i).setChecked(false);
//                    }
//                }
//                Envelop result = getResult(mainModelList, listResult.getTotalCount(), listResult.getCurrPage(), listResult.getPageSize());
//                result.setObj(mainModelList2);
//                return result;
//            }else{
//                Envelop envelop = new Envelop();
//                return envelop;
//            }
//        } catch (Exception ex) {
//            ex.printStackTrace();
//            return failed(ERR_SYSTEM_DES);
//        }
//    }
    @GetMapping("/getTjDimensionMainInfo")
    public Envelop getTjDimensionMainInfo(String quotaCode, String name, int page, int rows){
        String url = "/tj/getTjDimensionMainInfoList";
        String resultStr = "";
        StringBuffer mainFilter = new StringBuffer("status=1");
        if (!StringUtils.isEmpty(name)) {
            mainFilter.append("name?" + name + " g1;code?" + name + " g1;");
        }
        String filters = mainFilter.toString();
        String filter = "quotaCode=" + quotaCode;
        try {
            List<TjDimensionMain> mainModelList = tjDimensionMainService.search(null, filters, null, page, rows);
            if(mainModelList.size()>0){
                List<TjQuotaDimensionMain> mainModelList2 = tjQuotaDimensionMainService.search(null, filter, null, page, rows);
                if(mainModelList2.size() > 0) {
                    for (TjQuotaDimensionMain tjQuotaDimensionMainModel : mainModelList2) {
                        List<TjDimensionMain> tjDimensionMains = tjDimensionMainService.search("code=" + tjQuotaDimensionMainModel.getMainCode());
                        if (tjDimensionMains.size()>0) {
                            tjQuotaDimensionMainModel.setName(tjDimensionMains.get(0).getName());
                        }
                        mainModelList2.add(tjQuotaDimensionMainModel);
                    }
                }
                List<String> list = getTjQuotaDimensionMainOfMainCode(filter, null);
                for (int i=0; i<mainModelList.size(); i++) {
                    if (list.contains(mainModelList.get(i).getCode())) {
                        mainModelList.get(i).setChecked(true);
                    } else {
                        mainModelList.get(i).setChecked(false);
                    }
                }
                return MixEnvelop.getSuccess("查询成功",mainModelList2,mainModelList,page,rows,tjDimensionMainService.getCount(filters));
            }else{
                return success();
            }
        } catch (Exception ex) {
            ex.printStackTrace();
            return failed(ERR_SYSTEM_DES);
        }
    }
    public List<String> getTjQuotaDimensionMainOfMainCode(String filters, String sorts) throws Exception{
        List<TjQuotaDimensionMain> mainModelList = tjQuotaDimensionMainService.search(filters, sorts);
        List<String> list = new ArrayList<>();
        if(mainModelList.size() > 0){
            for (int i=0; i<mainModelList.size(); i++) {
                list.add(mainModelList.get(i).getMainCode());
            }
        }
        return list;
    }
}

svr/svr-basic/src/main/java/com/yihu/jw/basic/agadmin/controller/quota/TjDimensionSlaveController.java

@@ -196,20 +196,15 @@ public class TjDimensionSlaveController extends EnvelopRestEndpoint {
        }
        String filters = slaveFilter.toString();
        try {
            List<TjDimensionSlave> qtjDimensionSlaveList = tjDimensionSlaveService.search(null, filters, null, page, rows);
            List<TjDimensionSlave> mainModelList = new ArrayList<>();
            if (qtjDimensionSlaveList.size()>0) {
                mainModelList.addAll(qtjDimensionSlaveList);
            List<TjDimensionSlave> mainModelList = tjDimensionSlaveService.search(null, filters, null, page, rows);
            if (mainModelList.size()>0) {
                List<TjQuotaDimensionSlave> qtjQuotaDimensionSlaveList = tjQuotaDimensionSlaveService.search(null, filter, null, page, rows);
                List<TjQuotaDimensionSlave> tjQuotaDimensionSlaveModelList = new ArrayList<>();
                if (qtjQuotaDimensionSlaveList.size()>0) {
                    for (TjQuotaDimensionSlave tjQuotaQuotaDimensionSlaveModel : tjQuotaDimensionSlaveModelList) {
                    for (TjQuotaDimensionSlave tjQuotaQuotaDimensionSlaveModel : qtjQuotaDimensionSlaveList) {
                        List<TjDimensionSlave> tjDimensionSlaves = tjDimensionSlaveService.search("code=" + tjQuotaQuotaDimensionSlaveModel.getSlaveCode());
                        if (tjDimensionSlaves.size()>0) {
                            tjQuotaQuotaDimensionSlaveModel.setName(tjDimensionSlaves.get(0).getName());
                        }
                        tjQuotaDimensionSlaveModelList.add(tjQuotaQuotaDimensionSlaveModel);
                    }
                }
                List<String> list = getTjQuotaDimensionMainOfSlaveCode(filter, null);
@@ -220,7 +215,7 @@ public class TjDimensionSlaveController extends EnvelopRestEndpoint {
                        mainModelList.get(i).setChecked(false);
                    }
                }
                return MixEnvelop.getSuccess("",tjQuotaDimensionSlaveModelList,mainModelList,page,rows,(long) qtjDimensionSlaveList.size());
                return MixEnvelop.getSuccess("",qtjQuotaDimensionSlaveList,mainModelList,page,rows,tjDimensionSlaveService.getCount(filters));
            } else {
                return success();
            }

svr/svr-basic/src/main/java/com/yihu/jw/basic/agadmin/controller/quota/TjQuotaController.java

@@ -9,6 +9,7 @@ import com.yihu.jw.basic.quota.service.*;
import com.yihu.jw.basic.quota.util.QuartzHelper;
import com.yihu.jw.basic.resource.service.RsResourceQuotaService;
import com.yihu.jw.basic.util.TemPath;
import com.yihu.jw.entity.ehr.dict.SystemDictEntry;
import com.yihu.jw.entity.ehr.quota.*;
import com.yihu.jw.entity.ehr.resource.RsResourceQuota;
import com.yihu.jw.restmodel.ehr.dict.MConventionalDict;
@@ -34,6 +35,7 @@ import javax.servlet.http.HttpServletResponse;
import java.io.*;
import java.net.URLDecoder;
import java.util.*;
import java.util.stream.Collectors;
/**
 * Created by Administrator on 2017/6/13.
@@ -150,9 +152,9 @@ public class TjQuotaController extends EnvelopRestEndpoint {
                        tjQuotaDataSave = detailModel.getTjQuotaDataSaveModel();
                        tjQuotaDataSave.setQuotaCode(detailModel.getCode());
                    }
                    detailModel.setUpdateTime(new Date());
                    tjQuotaService.saves(detailModel, tjquotaDataSource, tjQuotaDataSave);
                    return ObjEnvelop.getSuccess("统计表更新成功！", detailModel);
                    updateTjQuota.setUpdateTime(new Date());
                    tjQuotaService.saves(updateTjQuota, tjquotaDataSource, tjQuotaDataSave);
                    return ObjEnvelop.getSuccess("统计表更新成功！", updateTjQuota);
                } else {
                    return ObjEnvelop.getError("参数错误");
                }
@@ -213,20 +215,18 @@ public class TjQuotaController extends EnvelopRestEndpoint {
     * @return
     */
    @GetMapping("getTjQuotaById")
    public Envelop getTjQuotaById( Long id) {
    public Envelop getTjQuotaById(Long id) {
        String url = "/tj/getTjQuotaById/" + id;
        Map<String, Object> params = new HashMap<>();
        params.put("id", id);
        try {
            TjQuota tjQuota = tjQuotaService.getById(id);
            if (null != tjQuota) {
                TjQuotaDataSave tjQuotaDataSave = tjQuotaDataSaveService.getByQuotaCode(tjQuota.getCode());
                TjQuotaDataSource tjQuotaDataSource = tjQuotaDataSourceService.getByQuotaCode(tjQuota.getCode());
                if (tjQuotaDataSave != null) {
                if (tjQuotaDataSave != null && tjQuotaDataSave.getSaveCode() != null) {
                    TjDataSave tjDataSave = tjDataSaveService.getByCode(tjQuotaDataSave.getSaveCode());
                    tjQuotaDataSave.setName(tjDataSave.getName());
                }
                if (tjQuotaDataSource != null) {
                if (tjQuotaDataSource != null && tjQuotaDataSource.getSourceCode() != null) {
                    TjDataSource tjDataSource = tjDataSourceService.getByCode(tjQuotaDataSource.getSourceCode());
                    tjQuotaDataSource.setName(tjDataSource.getName());
                }
@@ -428,8 +428,17 @@ public class TjQuotaController extends EnvelopRestEndpoint {
            conditionMap.put("startDate", startDate);
            conditionMap.put("endDate", endDate);
            List<TjQuotaLog> tjQuotaLogs = tjQuotaLogService.searchQuotaLogByParams(conditionMap);
            Long totalCount =Long.parseLong(tjQuotaLogService.searchQuotaLogByParamsTotalCount(conditionMap).toString());
            if(tjQuotaLogs.size()>0){
                List<SystemDictEntry> dictEntries = dictEntryService.getDictEntries(82,null);
                Map<String, String> distMap = dictEntries.stream()
                        .collect(Collectors.toMap(SystemDictEntry::getCode, SystemDictEntry::getValue));
                for (TjQuotaLog log:tjQuotaLogs){
                    //获取类别字典
                    log.setStatusName(distMap.get(String.valueOf(log.getStatus())));
                }
            }
            Long totalCount =Long.parseLong(tjQuotaLogService.searchQuotaLogByParamsTotalCount(conditionMap).toString());
            return PageEnvelop.getSuccessListWithPage("",tjQuotaLogs,page,rows,totalCount);
        } catch (Exception ex) {
            ex.printStackTrace();
@@ -512,19 +521,20 @@ public class TjQuotaController extends EnvelopRestEndpoint {
        params.put("page", page);
        params.put("size", rows);
        try {
            List<MConventionalDict> conventionalDictList = dictEntryService.search(null, filter, null, page, rows);
            List<MConventionalDict> mainModelList = new ArrayList<>();
            List<SystemDictEntry> conventionalDictList = dictEntryService.search(null, filter, null, page, rows);
            List<SystemDictEntry> mainModelList = new ArrayList<>();
            if (conventionalDictList.size() > 0) {
                mainModelList.addAll(conventionalDictList);
                Map<String,String> dictMap = new HashMap<>();
                for(MConventionalDict dict:mainModelList){
                for(SystemDictEntry dict:mainModelList){
                    dictMap.put(dict.getCode(),dict.getValue());
                }
                List<TjQuotaChart> tjQuotaChartList = tjQuotaChartService.search(null, filters, null, page, rows);
                List<MConventionalDict> checkedConventionalDicts = new ArrayList<>();
                List<SystemDictEntry> checkedConventionalDicts = new ArrayList<>();
                if (tjQuotaChartList.size() > 0) {
                    for (TjQuotaChart tjQuotaChartModel : tjQuotaChartList) {
                        MConventionalDict mConventionalDict = new MConventionalDict();
                        SystemDictEntry mConventionalDict = new SystemDictEntry();
                        String key = tjQuotaChartModel.getChartId()+"";
                        if(dictMap.containsKey(key)){
                            mConventionalDict.setCode(key);

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

@@ -246,7 +246,7 @@ public class ReportController extends EnvelopRestEndpoint {
                updateModel.setRemark(newRsReport.getRemark());
                updateModel.setTemplatePath(newRsReport.getTemplatePath());
                updateModel.setShowType(newRsReport.getShowType());
                rsReportService.save(updateModel);
                return ObjEnvelop.getSuccess("保存成功",updateModel);
            }
        } catch (Exception e) {

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

@@ -42,7 +42,7 @@ public class TjQuotaService extends BaseJpaService<TjQuota, XTjQuotaRepository>
            tjQuotaDataSaveService.save(dataSave);
        }
        quota.setName(quota.getName().trim());
        quota.setStatus(Integer.parseInt(quota.getCode()));
        quota.setCode(quota.getCode().trim());
        quota = save(quota);
        return quota;
    }