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

common/common-entity/src/main/java/com/yihu/jw/entity/ehr/quota/TjDimensionSlave.java

@@ -31,6 +31,7 @@ public class TjDimensionSlave implements Serializable{
    private Date updateTime;//修改时间
    private String updateUser;//修改人
    private String updateUserName;//修改人名
    private Boolean checked;
    @Id
    @GeneratedValue(strategy = GenerationType.AUTO)
@@ -139,4 +140,13 @@ public class TjDimensionSlave implements Serializable{
    public void setUpdateUserName(String updateUserName) {
        this.updateUserName = updateUserName;
    }
    @Transient
    public Boolean getChecked() {
        return checked;
    }
    public void setChecked(Boolean checked) {
        this.checked = checked;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/ehr/quota/TjQuota.java

@@ -36,6 +36,9 @@ public class TjQuota implements Serializable {
    //周期指标执行状态：0未开启，1执行中
    private String jobStatus;
    private TjQuotaDataSource tjQuotaDataSource;
    private TjQuotaDataSave tjQuotaDataSave;
    private List<TjQuota> children;
    @Id
@@ -239,4 +242,22 @@ public class TjQuota implements Serializable {
    public void setJobStatus(String jobStatus) {
        this.jobStatus = jobStatus;
    }
    @Transient
    public TjQuotaDataSource getTjQuotaDataSource() {
        return tjQuotaDataSource;
    }
    public void setTjQuotaDataSource(TjQuotaDataSource tjQuotaDataSource) {
        this.tjQuotaDataSource = tjQuotaDataSource;
    }
    @Transient
    public TjQuotaDataSave getTjQuotaDataSave() {
        return tjQuotaDataSave;
    }
    public void setTjQuotaDataSave(TjQuotaDataSave tjQuotaDataSave) {
        this.tjQuotaDataSave = tjQuotaDataSave;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/ehr/quota/TjQuotaDataSave.java

@@ -15,6 +15,7 @@ public class TjQuotaDataSave implements Serializable{
    private String configJson;
    private String type;
    private String name;
    @Id
    @GeneratedValue(strategy = GenerationType.AUTO)
@@ -62,4 +63,13 @@ public class TjQuotaDataSave implements Serializable{
    public void setType(String type) {
        this.type = type;
    }
    @Transient
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/ehr/quota/TjQuotaDataSource.java

@@ -13,6 +13,7 @@ public class TjQuotaDataSource implements Serializable{
    private String quotaCode;
    private String sourceCode;
    private String configJson;
    private String name;
    @Id
    @GeneratedValue(strategy = GenerationType.AUTO)
@@ -51,4 +52,13 @@ public class TjQuotaDataSource implements Serializable{
    public void setConfigJson(String configJson) {
        this.configJson = configJson;
    }
    @Transient
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/ehr/quota/TjQuotaDimensionSlave.java

@@ -24,6 +24,8 @@ public class TjQuotaDimensionSlave implements Serializable{
    private Integer sort;//纬度顺序
    private String converClass;//转换类
    private String name;
    @Id
    @GeneratedValue(strategy = GenerationType.AUTO)
    @Column(name = "id", unique = true, nullable = false)
@@ -87,4 +89,13 @@ public class TjQuotaDimensionSlave implements Serializable{
    public void setConverClass(String converClass) {
        this.converClass = converClass;
    }
    @Transient
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/web/MixEnvelop.java

@@ -192,4 +192,17 @@ public class MixEnvelop<T, J> extends Envelop {
        envelop.setStatus(200);
        return envelop;
    }
    public static MixEnvelop getSuccess(String message,Object obj, List detailModelList, int page, int size, Long count) {
        MixEnvelop envelop = new MixEnvelop();
        envelop.setMessage(message);
        envelop.setPageSize(size);
        envelop.setObj(obj);
        envelop.setDetailModelList(detailModelList);
        envelop.setCurrPage(page);
        envelop.setStatus(200);
        envelop.setTotalCount(count.intValue());
        return envelop;
    }
}

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

@@ -10,6 +10,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.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
@@ -24,6 +25,7 @@ import java.util.Map;
 */
@RestController
@RequestMapping("/quota")
@Api( tags = {"网关-统计查询"})
public class QuotaCategoryController extends EnvelopRestEndpoint {
    @Autowired

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

@@ -8,6 +8,7 @@ import com.yihu.jw.restmodel.web.ObjEnvelop;
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.ui.Model;
import org.springframework.util.LinkedMultiValueMap;
@@ -28,6 +29,7 @@ import java.util.Map;
 */
@RestController
@RequestMapping("/tjDataSave")
@Api( tags = {"网关-统计数据存储"})
public class TjDataSaveController extends EnvelopRestEndpoint {
    @Autowired
@@ -168,7 +170,7 @@ public class TjDataSaveController extends EnvelopRestEndpoint {
        } catch (Exception e) {
            e.getMessage();
        }
        return  failed("查询失败");
        return failed("查询失败");
    }
    /**

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

@@ -1,226 +1,186 @@
//package com.yihu.jw.basic.agadmin.controller.quota;
//
//import com.fasterxml.jackson.databind.ObjectMapper;
//import com.yihu.ehr.constants.SessionAttributeKeys;
//import com.yihu.jw.restmodel.web.Envelop;
//import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
//import com.yihu.jw.util.http.HttpClientUtil;
//import org.springframework.beans.factory.annotation.Value;
//import org.springframework.stereotype.Controller;
//import org.springframework.ui.Model;
//import org.springframework.util.LinkedMultiValueMap;
//import org.springframework.util.MultiValueMap;
//import org.springframework.util.StringUtils;
//import org.springframework.web.bind.annotation.RequestMapping;
//import org.springframework.web.bind.annotation.ResponseBody;
//import org.springframework.web.bind.annotation.RestController;
//import org.springframework.web.bind.annotation.SessionAttributes;
//
//import javax.servlet.http.HttpServletRequest;
//import java.io.IOException;
//import java.net.URLDecoder;
//import java.util.HashMap;
//import java.util.Map;
//
///**
// * Created by llh on 2017/5/9.
// */
//@RestController
//@RequestMapping("/tjDataSource")
//public class TjDataSourceController extends EnvelopRestEndpoint {
//
//
//    //查询
//    @RequestMapping("/getTjDataSource")
//    @ResponseBody
//    public Object searchTjDataSource(String name,String searchParm, int page, int rows){
//        String url = "/tj/getTjDataSourceList";
//        String resultStr = "";
//        Envelop envelop = new Envelop();
//        Map<String, Object> params = new HashMap<>();
//        StringBuffer stringBuffer = new StringBuffer();
//        if (!StringUtils.isEmpty(name)) {
//            stringBuffer.append("name?" + name );
//        }
//        if (!StringUtils.isEmpty(searchParm)) {
//            stringBuffer.append("name?" + searchParm );
//        }
//        String filters = stringBuffer.toString();
//        if (!StringUtils.isEmpty(filters)) {
//            params.put("filters", filters);
//        }
//        params.put("page", page);
//        params.put("size", rows);
//        try {
//            resultStr = HttpClientUtil.doGet(comUrl + url, params, username, password);
//            return resultStr;
//        } catch (Exception ex) {
//            ex.printStackTrace();
//            return failed(ERR_SYSTEM_DES);
//        }
//    }
//
//
//
//    /**
//     * 新增修改
//     * @param tjDataSourceModelJsonData
//     * @param request
//     * @return
//     * @throws IOException
//     */
//    @RequestMapping(value = "updateTjDataSource", produces = "text/html;charset=UTF-8")
//    @ResponseBody
//    public Object updateTjDataSource(String tjDataSourceModelJsonData, HttpServletRequest request) throws IOException {
//
//        String url = "/tj/addTjDataSource";
//        String resultStr = "";
//        System.out.println();
//        Envelop result = new Envelop();
//        UsersModel userDetailModel = getCurrentUserRedis(request);
//        MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
//        String[] strings = URLDecoder.decode(tjDataSourceModelJsonData, "UTF-8").split(";");
//        TjDataSourceModel detailModel = toModel(strings[0], TjDataSourceModel.class);
//        RestTemplates templates = new RestTemplates();
//
//        try {
//            if (!StringUtils.isEmpty(detailModel.getId())) {
//                Long tjDataSourceId = detailModel.getId();
//                resultStr = templates.doGet(comUrl + "/tj/getTjDataSourceById/" + tjDataSourceId);
//                Envelop envelop = getEnvelop(resultStr);
//                if (envelop.isSuccessFlg()) {
//                    TjDataSourceModel updateTjDataSource = getEnvelopModel(envelop.getObj(), TjDataSourceModel.class);
//
//                    updateTjDataSource.setCode(detailModel.getCode());
//                    updateTjDataSource.setName(detailModel.getName());
//                    updateTjDataSource.setType(detailModel.getType());
//                    updateTjDataSource.setStatus(detailModel.getStatus());
//                    updateTjDataSource.setRemark(detailModel.getRemark());
//                    updateTjDataSource.setUpdateUser(userDetailModel.getId());
//                    updateTjDataSource.setUpdateUserName(userDetailModel.getRealName());
//                    params.add("model", toJson(updateTjDataSource));
//
//                    resultStr = templates.doPost(comUrl + url, params);
//                } else {
//                    result.setSuccessFlg(false);
//                    result.setErrorMsg(envelop.getErrorMsg());
//                    return result;
//                }
//            } else {
//                detailModel.setCreateUser(userDetailModel.getId());
//                detailModel.setCreateUserName(userDetailModel.getRealName());
//                params.add("model", toJson(detailModel));
//                resultStr = templates.doPost(comUrl + url, params);
//            }
//        } catch (Exception e) {
//            e.printStackTrace();
//            return failed(ERR_SYSTEM_DES);
//        }
//        return resultStr;
//    }
//
//    /**
//     * 删除消息
//     * @param tjDataSourceId
//     * @return
//     */
//    @RequestMapping("deleteTjDataSource")
//    @ResponseBody
//    public Object deleteTjDataSource(Long tjDataSourceId) {
//        String url = "/tj/deletetTjDataSource" ;
//        String resultStr = "";
//        Envelop result = new Envelop();
//        Map<String, Object> params = new HashMap<>();
//        ObjectMapper mapper = new ObjectMapper();
//        params.put("id", tjDataSourceId);
//        try {
//            resultStr = HttpClientUtil.doDelete(comUrl + url, params, username, password);
//            result = mapper.readValue(resultStr, Envelop.class);
//            if (result.isSuccessFlg()) {
//                result.setSuccessFlg(true);
//            } else {
//                result.setSuccessFlg(false);
//                result.setErrorMsg("删除失败");
//            }
//            return result;
//        } catch (Exception e) {
//            e.printStackTrace();
//            return failed(ERR_SYSTEM_DES);
//        }
//    }
//
//    /**
//     * 根据id获取消息
//     * @param model
//     * @param id
//     * @return
//     */
//    @RequestMapping("getTjDataSourceById")
//    @ResponseBody
//    public TjDataSourceModel getTjQuotaById(Model model, Long id ) {
//        String url ="/tj/getTjDataSourceById/" +id;
//        String resultStr = "";
//        Envelop envelop = new Envelop();
//        Map<String, Object> params = new HashMap<>();
//        params.put("id", id);
//        TjDataSourceModel detailModel = null;
//        try {
//            resultStr = HttpClientUtil.doGet(comUrl + url, params, username, password);
//            Envelop ep = getEnvelop(resultStr);
//            detailModel = toModel(toJson(ep.getObj()),TjDataSourceModel.class);
//        } catch (Exception e) {
//            e.printStackTrace();
//        }
//        return detailModel;
//    }
//
//    /**
//     * 校验name是否唯一,true已存在
//     * @param name
//     * @return
//     */
//    @RequestMapping("hasExistsName")
//    @ResponseBody
//    public boolean hasExistsName(String name) {
//        String url = "/tj/tjDataSourceExistsName/" + name ;
//        String resultStr = "";
//        Envelop result = new Envelop();
//        Map<String, Object> params = new HashMap<>();
//        ObjectMapper mapper = new ObjectMapper();
//        params.put("name", name);
//        try {
//            resultStr = HttpClientUtil.doGet(comUrl + url, params, username, password);
//            if (resultStr.equals("true")) {
//                return  true;
//            }
//        } catch (Exception e) {
//            e.getMessage();
//        }
//        return  false;
//    }
//
//    /**
//     * 校验code是否唯一
//     * @param code
//     * @return
//     */
//    @RequestMapping("hasExistsCode")
//    @ResponseBody
//    public boolean hasExistsCode(String code) {
//        String url = "/tj/tjDataSourceExistsCode/" + code ;
//        String resultStr = "";
//        Envelop result = new Envelop();
//        Map<String, Object> params = new HashMap<>();
//        ObjectMapper mapper = new ObjectMapper();
//        params.put("code", code);
//        try {
//            resultStr = HttpClientUtil.doGet(comUrl + url, params, username, password);
//            if (resultStr.equals("true")) {
//                return  true;
//            }
//        } catch (Exception e) {
//            e.getMessage();
//        }
//        return  false;
//    }
//}
package com.yihu.jw.basic.agadmin.controller.quota;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.basic.quota.service.TjDataSourceService;
import com.yihu.jw.entity.ehr.quota.TjDataSource;
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 com.yihu.jw.util.http.HttpClientUtil;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.ui.Model;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
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.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.net.URLDecoder;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
 * Created by llh on 2017/5/9.
 */
@RestController
@RequestMapping("/tjDataSource")
@Api( tags = {"网关-统计数据源"})
public class TjDataSourceController extends EnvelopRestEndpoint {
    @Autowired
    TjDataSourceService tjDataSourceService;
    //查询
    @GetMapping("/getTjDataSource")
    public Envelop searchTjDataSource(String name,String searchParm, int page, int rows){
        String url = "/tj/getTjDataSourceList";
        StringBuffer stringBuffer = new StringBuffer();
        if (!StringUtils.isEmpty(name)) {
            stringBuffer.append("name?" + name );
        }
        if (!StringUtils.isEmpty(searchParm)) {
            stringBuffer.append("name?" + searchParm );
        }
        String filters = stringBuffer.toString();
        try {
            PageEnvelop PageEnvelop = new PageEnvelop();
            List<TjDataSource> tjDataSourceList = tjDataSourceService.search(null, filters, null, page, rows);
            if(tjDataSourceList != null){
                PageEnvelop.setDetailModelList(tjDataSourceList);
                PageEnvelop.setTotalCount((int)tjDataSourceService.getCount(filters));
                PageEnvelop.setStatus(200);
                PageEnvelop.setCurrPage(page);
                PageEnvelop.setPageSize(rows);
            }else{
                PageEnvelop.setStatus(200);
                PageEnvelop.setMessage("查询无数据");
                PageEnvelop.setTotalCount(0);
            }
            return PageEnvelop;
        } catch (Exception ex) {
            ex.printStackTrace();
            return failed(ERR_SYSTEM_DES);
        }
    }
    /**
     * 新增修改
     * @param tjDataSourceModelJsonData
     * @param request
     * @return
     * @throws IOException
     */
    @PostMapping(value = "updateTjDataSource", produces = "text/html;charset=UTF-8")
    public Envelop updateTjDataSource(String tjDataSourceModelJsonData, HttpServletRequest request) throws IOException {
        String url = "/tj/addTjDataSource";
        String[] strings = URLDecoder.decode(tjDataSourceModelJsonData, "UTF-8").split(";");
        TjDataSource detailModel = objectMapper.readValue(strings[0],TjDataSource.class);
        try {
            if (!StringUtils.isEmpty(detailModel.getId())) {
                Long tjDataSourceId = detailModel.getId();
                TjDataSource updateTjDataSource = tjDataSourceService.getById(tjDataSourceId);
                if (updateTjDataSource!=null) {
                    updateTjDataSource.setCode(detailModel.getCode());
                    updateTjDataSource.setName(detailModel.getName());
                    updateTjDataSource.setType(detailModel.getType());
                    updateTjDataSource.setStatus(detailModel.getStatus());
                    updateTjDataSource.setRemark(detailModel.getRemark());
                    updateTjDataSource.setUpdateTime(new Date());
                    tjDataSourceService.save(updateTjDataSource);
                    return ObjEnvelop.getSuccess("操作成功",updateTjDataSource);
                } else {
                    return failed("参数错误");
                }
            } else {
                detailModel.setCreateTime(new Date());
                tjDataSourceService.save(detailModel);
                return ObjEnvelop.getSuccess("操作成功",detailModel);
            }
        } catch (Exception e) {
            e.printStackTrace();
            return failed(ERR_SYSTEM_DES);
        }
    }
    /**
     * 删除消息
     * @param tjDataSourceId
     * @return
     */
    @PostMapping("deleteTjDataSource")
    public Envelop deleteTjDataSource(Long tjDataSourceId) {
        String url = "/tj/deletetTjDataSource" ;
        try {
            TjDataSource tjDataSource = tjDataSourceService.getById(tjDataSourceId);
            tjDataSource.setStatus(-1);
            tjDataSourceService.save(tjDataSource);
            return success("删除成功");
        } catch (Exception e) {
            e.printStackTrace();
            return failed(ERR_SYSTEM_DES);
        }
    }
    /**
     * 根据id获取消息
     * @param id
     * @return
     */
    @GetMapping("getTjDataSourceById")
    public Envelop getTjQuotaById(Long id ) {
        String url ="/tj/getTjDataSourceById/" +id;
        try {
            TjDataSource updateTjDataSource = tjDataSourceService.getById(id);
            return ObjEnvelop.getSuccess("获取成功",updateTjDataSource);
        } catch (Exception e) {
            e.printStackTrace();
        }
        return failed("查询失败");
    }
    /**
     * 校验name是否唯一,true已存在
     * @param name
     * @return
     */
    @GetMapping("hasExistsName")
    public Envelop hasExistsName(String name) {
        String url = "/tj/tjDataSourceExistsName/" + name ;
        try {
            String filter = "name=" + name;
            List<TjDataSource> list = tjDataSourceService.search(filter);
            return ObjEnvelop.getSuccess("查询成功",list.size() > 0);
        } catch (Exception e) {
            e.getMessage();
        }
        return  failed("查询失败");
    }
    /**
     * 校验code是否唯一
     * @param code
     * @return
     */
    @GetMapping("hasExistsCode")
    public Envelop hasExistsCode(String code) {
        String url = "/tj/tjDataSourceExistsCode/" + code ;
        try {
            String filter = "code=" + code;
            List<TjDataSource> list = tjDataSourceService.search(filter);
            return ObjEnvelop.getSuccess("查询成功",list.size() > 0);
        } catch (Exception e) {
            e.getMessage();
        }
        return  failed("查询失败");
    }
}

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

@@ -1,6 +1,5 @@
package com.yihu.jw.basic.agadmin.controller.quota;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.basic.quota.service.TjDimensionMainService;
import com.yihu.jw.entity.ehr.quota.TjDimensionMain;
@@ -8,18 +7,13 @@ 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 com.yihu.jw.util.http.HttpClientUtil;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
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.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.SessionAttributes;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
@@ -31,13 +25,14 @@ import java.util.*;
 */
@RestController
@RequestMapping("/tjDimensionMain")
@Api( tags = {"网关-统计维度"})
public class TjDimensionMainController extends EnvelopRestEndpoint {
    @Autowired
    TjDimensionMainService tjDimensionMainService;
    //查询统计主维度
    @RequestMapping("/getTjDimensionMain")
    @GetMapping("/getTjDimensionMain")
    public Object searchTjDimensionMain(String name, int page, int rows){
        String url = "/tj/getTjDimensionMainList";
        String resultStr = "";
@@ -48,11 +43,6 @@ public class TjDimensionMainController extends EnvelopRestEndpoint {
            stringBuffer.append("name?" + name );
        }
        String filters = stringBuffer.toString();
        if (!StringUtils.isEmpty(filters)) {
            params.put("filters", filters);
        }
        params.put("page", page);
        params.put("size", rows);
        try {
            PageEnvelop PageEnvelop = new PageEnvelop();
            List<TjDimensionMain> qtjDimensionMainList = tjDimensionMainService.search(null, filters, null, page, rows);
@@ -83,7 +73,7 @@ public class TjDimensionMainController extends EnvelopRestEndpoint {
     * @return
     * @throws IOException
     */
    @RequestMapping(value = "updateTjDimensionMain", produces = "text/html;charset=UTF-8")
    @PostMapping(value = "updateTjDimensionMain", produces = "text/html;charset=UTF-8")
    public Object updateTjDimensionMain(String tjDimensionMainModelJsonData, HttpServletRequest request) throws IOException {
        String url = "/tj/tjDimensionMain";
@@ -123,7 +113,7 @@ public class TjDimensionMainController extends EnvelopRestEndpoint {
     * @param tjDimensionMainId
     * @return
     */
    @RequestMapping("deleteTjDimensionMain")
    @PostMapping("deleteTjDimensionMain")
    public Object deleteTjDimensionMain(Long tjDimensionMainId) {
        String url = "/tj/tjDimensionMain";
@@ -144,7 +134,7 @@ public class TjDimensionMainController extends EnvelopRestEndpoint {
     * @param id
     * @return
     */
    @RequestMapping("getTjDimensionMainByID")
    @GetMapping("getTjDimensionMainByID")
    public Envelop getTjDimensionMainByID(Long id ) {
        String url ="/tj/tjDimensionMainId/" +id;
        try {
@@ -163,7 +153,7 @@ public class TjDimensionMainController extends EnvelopRestEndpoint {
     * @param name
     * @return
     */
    @RequestMapping("isNameExists")
    @GetMapping("isNameExists")
    public Envelop isNameExists(String name) {
        String url = "/tj/tjDimensionMainName" ;
        try {
@@ -181,7 +171,7 @@ public class TjDimensionMainController extends EnvelopRestEndpoint {
     * @param code
     * @return
     */
    @RequestMapping("isCodeExists")
    @GetMapping("isCodeExists")
    public Envelop isCodeExists(String code) {
        String url = "/tj/tjDimensionMainCode" ;
        try {
@@ -194,7 +184,7 @@ public class TjDimensionMainController extends EnvelopRestEndpoint {
        return  failed("查询失败");
    }
//    @RequestMapping("/getTjDimensionMainInfo")
//    @GetMapping("/getTjDimensionMainInfo")
//    public Envelop getTjDimensionMainInfo(String quotaCode, String name, int page, int rows){
//        String url = "/tj/getTjDimensionMainInfoList";
//        String resultStr = "";

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

@@ -1,258 +1,243 @@
//package com.yihu.jw.basic.agadmin.controller.quota;
//
//import com.fasterxml.jackson.databind.ObjectMapper;
//import com.yihu.ehr.constants.SessionAttributeKeys;
//import com.yihu.jw.restmodel.web.Envelop;
//import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
//import com.yihu.jw.util.http.HttpClientUtil;
//import org.springframework.beans.factory.annotation.Value;
//import org.springframework.stereotype.Controller;
//import org.springframework.ui.Model;
//import org.springframework.util.LinkedMultiValueMap;
//import org.springframework.util.MultiValueMap;
//import org.springframework.util.StringUtils;
//import org.springframework.web.bind.annotation.RequestMapping;
//import org.springframework.web.bind.annotation.ResponseBody;
//import org.springframework.web.bind.annotation.RestController;
//import org.springframework.web.bind.annotation.SessionAttributes;
//
//import javax.servlet.http.HttpServletRequest;
//import java.io.IOException;
//import java.net.URLDecoder;
//import java.util.HashMap;
//import java.util.Map;
//
///**
// * Created by llh on 2017/5/9.
// */
//@RestController
//@RequestMapping("/tjDimensionSlave")
//public class TjDimensionSlaveController extends EnvelopRestEndpoint {
//
//
//
//    //查询
//    @RequestMapping("/getTjDimensionSlave")
//    @ResponseBody
//    public Object searchTjDimensionSlave(String name, int page, int rows){
//        String url = "/tj/getTjDimensionSlaveList";
//        String resultStr = "";
//        Envelop envelop = new Envelop();
//        Map<String, Object> params = new HashMap<>();
//        StringBuffer stringBuffer = new StringBuffer();
//        if (!StringUtils.isEmpty(name)) {
//            stringBuffer.append("name?" + name );
//        }
//        String filters = stringBuffer.toString();
//        if (!StringUtils.isEmpty(filters)) {
//            params.put("filters", filters);
//        }
//        params.put("page", page);
//        params.put("size", rows);
//        try {
//            resultStr = HttpClientUtil.doGet(comUrl + url, params, username, password);
//            return resultStr;
//        } catch (Exception ex) {
//            ex.printStackTrace();
//            return failed(ERR_SYSTEM_DES);
//        }
//    }
//
//
//
//    /**
//     * 新增修改
//     * @param tjDimensionSlaveModelJsonData
//     * @param request
//     * @return
//     * @throws IOException
//     */
//    @RequestMapping(value = "updateTjDimensionSlave", produces = "text/html;charset=UTF-8")
//    @ResponseBody
//    public Object updateTjDimensionSlave(String tjDimensionSlaveModelJsonData, HttpServletRequest request) throws IOException {
//
//        String url = "/tj/tjDimensionSlave";
//        String resultStr = "";
//        System.out.println();
//        Envelop result = new Envelop();
//        UsersModel userDetailModel = getCurrentUserRedis(request);
//        MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
//        String[] strings = URLDecoder.decode(tjDimensionSlaveModelJsonData, "UTF-8").split(";");
//        TjDimensionSlaveModel detailModel = toModel(strings[0], TjDimensionSlaveModel.class);
//        RestTemplates templates = new RestTemplates();
//
//        try {
//            if (!StringUtils.isEmpty(detailModel.getId())) {
//                Long id = detailModel.getId();
//                resultStr = templates.doGet(comUrl + "/tj/tjDimensionSlaveId/" + id);
//                Envelop envelop = getEnvelop(resultStr);
//                if (envelop.isSuccessFlg()) {
//                    TjDimensionSlaveModel updateTjDimensionSlave = getEnvelopModel(envelop.getObj(), TjDimensionSlaveModel.class);
//
//                    updateTjDimensionSlave.setCode(detailModel.getCode());
//                    updateTjDimensionSlave.setName(detailModel.getName());
//                    updateTjDimensionSlave.setType(detailModel.getType());
//                    updateTjDimensionSlave.setStatus(detailModel.getStatus());
//                    updateTjDimensionSlave.setRemark(detailModel.getRemark());
//                    updateTjDimensionSlave.setUpdateUser(userDetailModel.getId());
//                    updateTjDimensionSlave.setUpdateUserName(userDetailModel.getRealName());
//                    params.add("model", toJson(updateTjDimensionSlave));
//
//                    resultStr = templates.doPost(comUrl + url, params);
//                } else {
//                    result.setSuccessFlg(false);
//                    result.setErrorMsg(envelop.getErrorMsg());
//                    return result;
//                }
//            } else {
//                detailModel.setCreateUser(userDetailModel.getId());
//                detailModel.setCreateUserName(userDetailModel.getRealName());
//                params.add("model", toJson(detailModel));
//                resultStr = templates.doPost(comUrl + url, params);
//            }
//        } catch (Exception e) {
//            e.printStackTrace();
//            return failed(ERR_SYSTEM_DES);
//        }
//        return resultStr;
//    }
//
//    /**
//     * 删除消息
//     * @param tjDimensionSlaveId
//     * @return
//     */
//    @RequestMapping("deleteTjDimensionSlave")
//    @ResponseBody
//    public Object deleteTjDimensionSlave(Long tjDimensionSlaveId) {
//        String url = "/tj/tjDimensionSlave";
//        String resultStr = "";
//        Envelop result = new Envelop();
//        Map<String, Object> params = new HashMap<>();
//        ObjectMapper mapper = new ObjectMapper();
//
//        params.put("id", tjDimensionSlaveId);
//        try {
//            resultStr = HttpClientUtil.doDelete(comUrl + url, params, username, password);
//            result = mapper.readValue(resultStr, Envelop.class);
//            if (result.isSuccessFlg()) {
//                result.setSuccessFlg(true);
//            } else {
//                result.setSuccessFlg(false);
//                result.setErrorMsg("删除失败");
//            }
//            return result;
//        } catch (Exception e) {
//            e.printStackTrace();
//            return failed(ERR_SYSTEM_DES);
//        }
//    }
//
//
//    /**
//     * 根据id获取消息
//     * @param model
//     * @param id
//     * @return
//     */
//    @RequestMapping("getTjDimensionSlaveById")
//    @ResponseBody
//    public TjDimensionSlaveModel getTjDimensionSlaveById(Model model, Long id ) {
//        String url ="/tj/tjDimensionSlaveId/" +id;
//        String resultStr = "";
//        Envelop envelop = new Envelop();
//        Map<String, Object> params = new HashMap<>();
//        params.put("id", id);
//        try {
//            resultStr = HttpClientUtil.doGet(comUrl + url, params, username, password);
//            Envelop ep = getEnvelop(resultStr);
//            TjDimensionSlaveModel detailModel = toModel(toJson(ep.getObj()),TjDimensionSlaveModel.class);
//            return detailModel;
//        } catch (Exception e) {
//            return null;
//        }
//    }
//
//    /**
//     * 校验名称是否唯一
//     * @param name
//     * @return
//     */
//    @RequestMapping("isNameExists")
//    @ResponseBody
//    public boolean isNameExists(String name) {
//        String url = "/tj/tjDimensionSlaveName" ;
//        String resultStr = "";
//        Envelop result = new Envelop();
//        Map<String, Object> params = new HashMap<>();
//        ObjectMapper mapper = new ObjectMapper();
//        params.put("name", name);
//        try {
//            resultStr = HttpClientUtil.doGet(comUrl + url, params, username, password);
//            if (resultStr.equals("true")) {
//                return  true;
//            } else {
//
//            }
//        } catch (Exception e) {
//            e.getMessage();
//        }
//        return  false;
//    }
//
//    /**
//     * 校验code是否唯一
//     * @param code
//     * @return
//     */
//    @RequestMapping("isCodeExists")
//    @ResponseBody
//    public boolean isCodeExists(String code) {
//        String url = "/tj/tjDimensionSlaveCode" ;
//        String resultStr = "";
//        Envelop result = new Envelop();
//        Map<String, Object> params = new HashMap<>();
//        ObjectMapper mapper = new ObjectMapper();
//        params.put("code", code);
//        try {
//            resultStr = HttpClientUtil.doGet(comUrl + url, params, username, password);
//            if (resultStr.equals("true")) {
//                return  true;
//            } else {
//
//            }
//        } catch (Exception e) {
//            e.getMessage();
//        }
//        return  false;
//    }
//
//    @RequestMapping("/getTjDimensionSlaveInfo")
//    @ResponseBody
//    public Object getTjDimensionSlaveInfo(String quotaCode, String name, int page, int rows){
//        String url = "/tj/getTjDimensionSlaveInfoList";
//        String resultStr = "";
//        Envelop envelop = new Envelop();
//        Map<String, Object> params = new HashMap<>();
//        StringBuffer slaveFilter = new StringBuffer("status=1");
//        if (!StringUtils.isEmpty(quotaCode)) {
//            params.put("filter", "quotaCode=" + quotaCode);
//        }
//        if (!StringUtils.isEmpty(name)) {
//            slaveFilter.append("name?" + name + " g1;code?" + name + " g1;");
//        }
//        String filters = slaveFilter.toString();
//        if (!StringUtils.isEmpty(filters)) {
//            params.put("filters", filters);
//        }
//        params.put("page", page);
//        params.put("size", rows);
//        try {
//            resultStr = HttpClientUtil.doGet(comUrl + url, params, username, password);
//            return resultStr;
//        } catch (Exception ex) {
//            ex.printStackTrace();
//            return failed(ERR_SYSTEM_DES);
//        }
//    }
//}
package com.yihu.jw.basic.agadmin.controller.quota;
import com.yihu.jw.basic.quota.service.TjDimensionSlaveService;
import com.yihu.jw.basic.quota.service.TjQuotaDimensionSlaveService;
import com.yihu.jw.entity.ehr.quota.TjDimensionSlave;
import com.yihu.jw.entity.ehr.quota.TjQuotaDimensionSlave;
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 org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.net.URLDecoder;
import java.util.*;
/**
 * Created by llh on 2017/5/9.
 */
@RestController
@RequestMapping("/tjDimensionSlave")
public class TjDimensionSlaveController extends EnvelopRestEndpoint {
    @Autowired
    TjDimensionSlaveService tjDimensionSlaveService;
    @Autowired
    TjQuotaDimensionSlaveService tjQuotaDimensionSlaveService;
    //查询
    @RequestMapping("/getTjDimensionSlave")
    public Envelop searchTjDimensionSlave(String name, int page, int rows){
        String url = "/tj/getTjDimensionSlaveList";
        String resultStr = "";
        Envelop envelop = new Envelop();
        Map<String, Object> params = new HashMap<>();
        StringBuffer stringBuffer = new StringBuffer();
        if (!StringUtils.isEmpty(name)) {
            stringBuffer.append("name?" + name );
        }
        String filters = stringBuffer.toString();
        try {
            PageEnvelop PageEnvelop = new PageEnvelop();
            List<TjDimensionSlave> qtjDimensionSlaveList = tjDimensionSlaveService.search(null, filters, null, page, rows);
            if(qtjDimensionSlaveList != null){
                PageEnvelop.setDetailModelList(qtjDimensionSlaveList);
                PageEnvelop.setTotalCount((int)tjDimensionSlaveService.getCount(filters));
                PageEnvelop.setStatus(200);
                PageEnvelop.setCurrPage(page);
                PageEnvelop.setPageSize(rows);
            }else{
                PageEnvelop.setStatus(200);
                PageEnvelop.setMessage("查询无数据");
                PageEnvelop.setTotalCount(0);
            }
            return PageEnvelop;
        } catch (Exception ex) {
            ex.printStackTrace();
            return failed(ERR_SYSTEM_DES);
        }
    }
    /**
     * 新增修改
     * @param tjDimensionSlaveModelJsonData
     * @param request
     * @return
     * @throws IOException
     */
    @RequestMapping(value = "updateTjDimensionSlave", produces = "text/html;charset=UTF-8")
    public Envelop updateTjDimensionSlave(String tjDimensionSlaveModelJsonData, HttpServletRequest request) throws IOException {
        String url = "/tj/tjDimensionSlave";
        String[] strings = URLDecoder.decode(tjDimensionSlaveModelJsonData, "UTF-8").split(";");
        TjDimensionSlave detailModel = objectMapper.readValue(strings[0], TjDimensionSlave.class);
        try {
            if (!StringUtils.isEmpty(detailModel.getId())) {
                Long id = detailModel.getId();
                TjDimensionSlave updateTjDimensionSlave =  tjDimensionSlaveService.getTjDimensionSlave(id);
                if (updateTjDimensionSlave!=null) {
                    updateTjDimensionSlave.setCode(detailModel.getCode());
                    updateTjDimensionSlave.setName(detailModel.getName());
                    updateTjDimensionSlave.setType(detailModel.getType());
                    updateTjDimensionSlave.setStatus(detailModel.getStatus());
                    updateTjDimensionSlave.setRemark(detailModel.getRemark());
                    updateTjDimensionSlave.setUpdateTime(new Date());
                    tjDimensionSlaveService.save(updateTjDimensionSlave);
                    return ObjEnvelop.getSuccess("操作成功",updateTjDimensionSlave);
                } else {
                    return failed("参数错误");
                }
            } else {
                detailModel.setCreateTime(new Date());
                tjDimensionSlaveService.save(detailModel);
                return ObjEnvelop.getSuccess("操作成功",detailModel);
            }
        } catch (Exception e) {
            e.printStackTrace();
            return failed(ERR_SYSTEM_DES);
        }
    }
    /**
     * 删除消息
     * @param tjDimensionSlaveId
     * @return
     */
    @RequestMapping("deleteTjDimensionSlave")
    public Envelop deleteTjDimensionSlave(Long tjDimensionSlaveId) {
        String url = "/tj/tjDimensionSlave";
        try {
            TjDimensionSlave tjDimensionSlave = tjDimensionSlaveService.getTjDimensionSlave(tjDimensionSlaveId);
            tjDimensionSlave.setStatus(-1);
            tjDimensionSlaveService.save(tjDimensionSlave);
            return ObjEnvelop.getSuccess("从维度删除成功！");
        } catch (Exception e) {
            e.printStackTrace();
            return failed(ERR_SYSTEM_DES);
        }
    }
    /**
     * 根据id获取消息
     * @param id
     * @return
     */
    @RequestMapping("getTjDimensionSlaveById")
    public Envelop getTjDimensionSlaveById( Long id ) {
        String url ="/tj/tjDimensionSlaveId/" +id;
        try {
            TjDimensionSlave updateTjDimensionSlave =  tjDimensionSlaveService.getTjDimensionSlave(id);
            return ObjEnvelop.getSuccess("获取成功",updateTjDimensionSlave);
        } catch (Exception e) {
            e.printStackTrace();
            return failed("查询失败");
        }
    }
    /**
     * 校验名称是否唯一
     * @param name
     * @return
     */
    @RequestMapping("isNameExists")
    public Envelop isNameExists(String name) {
        String url = "/tj/tjDimensionSlaveName" ;
        try {
            String filter = "name=" + name;
            List<TjDimensionSlave> list = tjDimensionSlaveService.search(filter);
            return ObjEnvelop.getSuccess("查询成功",list.size() > 0);
        } catch (Exception e) {
            e.getMessage();
        }
        return failed("查询失败");
    }
    /**
     * 校验code是否唯一
     * @param code
     * @return
     */
    @RequestMapping("isCodeExists")
    public Envelop isCodeExists(String code) {
        String url = "/tj/tjDimensionSlaveCode" ;
        try {
            String filter = "code=" + code;
            List<TjDimensionSlave> list = tjDimensionSlaveService.search(filter);
            return ObjEnvelop.getSuccess("查询成功",list.size() > 0);
        } catch (Exception e) {
            e.getMessage();
        }
        return failed("查询失败");
    }
    @RequestMapping("/getTjDimensionSlaveInfo")
    public Envelop getTjDimensionSlaveInfo(String quotaCode, String name, int page, int rows){
        String url = "/tj/getTjDimensionSlaveInfoList";
        StringBuffer slaveFilter = new StringBuffer("status=1");
        String filter = null;
        if (!StringUtils.isEmpty(quotaCode)) {
            filter = "quotaCode=" + quotaCode;
        }
        if (!StringUtils.isEmpty(name)) {
            slaveFilter.append("name?" + name + " g1;code?" + name + " g1;");
        }
        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<TjQuotaDimensionSlave> qtjQuotaDimensionSlaveList = tjQuotaDimensionSlaveService.search(null, filter, null, page, rows);
                List<TjQuotaDimensionSlave> tjQuotaDimensionSlaveModelList = new ArrayList<>();
                if (qtjQuotaDimensionSlaveList.size()>0) {
                    for (TjQuotaDimensionSlave tjQuotaQuotaDimensionSlaveModel : tjQuotaDimensionSlaveModelList) {
                        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);
                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("",tjQuotaDimensionSlaveModelList,mainModelList,page,rows,(long) qtjDimensionSlaveList.size());
            } else {
                return success();
            }
        } catch (Exception ex) {
            ex.printStackTrace();
            return failed(ERR_SYSTEM_DES);
        }
    }
    public List<String> getTjQuotaDimensionMainOfSlaveCode(String filters, String sorts) throws Exception {
        List<String> list = new ArrayList<>();
        List<TjQuotaDimensionSlave> qtjQuotaDimensionSlaveList = tjQuotaDimensionSlaveService.search(filters, sorts);
        List<TjQuotaDimensionSlave>  tjQuotaDimensionSlaveModelList = new ArrayList<>();
        if (qtjQuotaDimensionSlaveList.size()>0) {
            for (TjQuotaDimensionSlave tjQuotaQuotaDimensionSlaveModel : qtjQuotaDimensionSlaveList) {
                tjQuotaDimensionSlaveModelList.add(tjQuotaQuotaDimensionSlaveModel);
            }
            for (int i=0; i<tjQuotaDimensionSlaveModelList.size(); i++) {
                list.add(tjQuotaDimensionSlaveModelList.get(i).getSlaveCode());
            }
        }
        return list;
    }
}

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

@@ -3,12 +3,21 @@
//import com.fasterxml.jackson.core.type.TypeReference;
//import com.fasterxml.jackson.databind.ObjectMapper;
//
//import com.yihu.jw.basic.quota.service.*;
//import com.yihu.jw.basic.resource.service.RsResourceQuotaService;
//import com.yihu.jw.entity.ehr.quota.*;
//import com.yihu.jw.entity.ehr.resource.RsResourceQuota;
//import com.yihu.jw.restmodel.ehr.tj.MTjQuotaDataSaveModel;
//import com.yihu.jw.restmodel.ehr.tj.MTjQuotaDataSourceModel;
//import com.yihu.jw.restmodel.ehr.tj.MTjQuotaModel;
//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 com.yihu.jw.util.date.DateUtil;
//import com.yihu.jw.util.http.HttpClientUtil;
//import io.swagger.annotations.Api;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.beans.factory.annotation.Value;
//import org.springframework.stereotype.Controller;
//import org.springframework.ui.Model;
//import org.springframework.util.LinkedMultiValueMap;
//import org.springframework.util.MultiValueMap;
@@ -16,7 +25,6 @@
//import org.springframework.web.bind.annotation.RequestMapping;
//import org.springframework.web.bind.annotation.ResponseBody;
//import org.springframework.web.bind.annotation.RestController;
//import org.springframework.web.bind.annotation.SessionAttributes;
//import org.springframework.web.client.RestClientException;
//import org.springframework.web.multipart.MultipartFile;
//
@@ -31,17 +39,25 @@
// */
//@RestController
//@RequestMapping("/tjQuota")
//@Api( tags = {"网关-统计"})
//public class TjQuotaController extends EnvelopRestEndpoint {
//
//    @Autowired
//    TjQuotaService tjQuotaService;
//    @Autowired
//    private RsResourceQuotaService resourceQuotaService;
//    @Autowired
//    TjQuotaDataSaveService tjQuotaDataSaveService;
//    @Autowired
//    TjQuotaDataSourceService tjQuotaDataSourceService;
//    @Autowired
//    TjDataSaveService tjDataSaveService;
//    @Autowired
//    TjDataSourceService tjDataSourceService;
//
//    @RequestMapping("/getTjQuota")
//    @ResponseBody
//    public Object searchTjQuota(String name, Integer quotaType, int page, int rows) {
//        String url = "/tj/getTjQuotaList";
//        String resultStr = "";
//        Envelop envelop = new Envelop();
//        Map<String, Object> params = new HashMap<>();
//        params.put("filters", "");
//        StringBuffer stringBuffer = new StringBuffer();
//        stringBuffer.append("status=1;");
//        if (!StringUtils.isEmpty(name)) {
@@ -53,14 +69,22 @@
//            stringBuffer.append("quotaType=-1");
//        }*/
//        String filters = stringBuffer.toString();
//        if (!StringUtils.isEmpty(filters)) {
//            params.put("filters", filters);
//        }
//        params.put("page", page);
//        params.put("size", rows);
//
//        try {
//            resultStr = HttpClientUtil.doGet(comUrl + url, params, username, password);
//            return resultStr;
//            PageEnvelop PageEnvelop = new PageEnvelop();
//            List<TjQuota> tjQuota = tjQuotaService.search(null, filters, null, page, rows);
//            if(tjQuota != null){
//                PageEnvelop.setDetailModelList(tjQuota);
//                PageEnvelop.setTotalCount((int)tjQuotaService.getCount(filters));
//                PageEnvelop.setStatus(200);
//                PageEnvelop.setCurrPage(page);
//                PageEnvelop.setPageSize(rows);
//            }else{
//                PageEnvelop.setStatus(200);
//                PageEnvelop.setMessage("查询无数据");
//                PageEnvelop.setTotalCount(0);
//            }
//            return PageEnvelop;
//        } catch (Exception ex) {
//            ex.printStackTrace();
//            return failed(ERR_SYSTEM_DES);
@@ -76,26 +100,17 @@
//     * @throws IOException
//     */
//    @RequestMapping(value = "updateTjDataSource", produces = "text/html;charset=UTF-8")
//    @ResponseBody
//    public Object updateTjQuota(String tjQuotaModelJsonData, HttpServletRequest request) throws IOException {
//
//    public Envelop updateTjQuota(String tjQuotaModelJsonData, HttpServletRequest request) throws IOException {
//        String url = "/tj/addTjQuota/";
//        String resultStr = "";
//        Envelop result = new Envelop();
//        UsersModel userDetailModel = getCurrentUserRedis(request);
//        MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
//        String[] strings = URLDecoder.decode(tjQuotaModelJsonData, "UTF-8").split(";");
//        TjQuotaModel detailModel = toModel(strings[0], TjQuotaModel.class);
//        RestTemplates templates = new RestTemplates();
//
//        TjQuota detailModel = objectMapper.readValue(strings[0], TjQuota.class);
//        try {
//            if (!StringUtils.isEmpty(detailModel.getId())) {
//                Long tjQuotaId = detailModel.getId();
//                resultStr = templates.doGet(comUrl + "/tj/getTjQuotaById/" + tjQuotaId);
//                Envelop envelop = getEnvelop(resultStr);
//                if (envelop.isSuccessFlg()) {
//                    TjQuotaModel updateTjQuota = getEnvelopModel(envelop.getObj(), TjQuotaModel.class);
//
//                TjQuota updateTjQuota = tjQuotaService.getById(tjQuotaId);
//                if (updateTjQuota!=null) {
//                    updateTjQuota.setResultGetType(detailModel.getResultGetType());
//                    updateTjQuota.setCode(detailModel.getCode());
//                    updateTjQuota.setName(detailModel.getName());
@@ -107,30 +122,46 @@
//                    updateTjQuota.setQuotaType(detailModel.getQuotaType());
//                    updateTjQuota.setDataLevel(detailModel.getDataLevel());
//                    updateTjQuota.setRemark(detailModel.getRemark());
//                    updateTjQuota.setUpdateUser(userDetailModel.getId());
//                    updateTjQuota.setUpdateUserName(userDetailModel.getRealName());
//                    updateTjQuota.setTjQuotaDataSaveModel(detailModel.getTjQuotaDataSaveModel());
//                    updateTjQuota.setTjQuotaDataSourceModel(detailModel.getTjQuotaDataSourceModel());
//                    updateTjQuota.setTjQuotaChartModel(detailModel.getTjQuotaChartModel());
//                    params.add("model", toJson(updateTjQuota));
//
//                    resultStr = templates.doPost(comUrl + url, params);
//                    TjQuotaDataSource tjquotaDataSource = null;
//                    TjQuotaDataSave tjQuotaDataSave = null;
//                    if(detailModel.getTjQuotaDataSource() != null){
//                        tjquotaDataSource = detailModel.getTjQuotaDataSource();
//                        tjquotaDataSource.setQuotaCode(detailModel.getCode());
//                    }
//                    if(detailModel.getTjQuotaDataSave() != null
//                            && org.apache.commons.lang3.StringUtils.isNotEmpty(detailModel.getTjQuotaDataSave().getSaveCode())){
//                        tjQuotaDataSave = detailModel.getTjQuotaDataSave();
//                        tjQuotaDataSave.setQuotaCode(detailModel.getCode());
//                    }
//                    detailModel.setUpdateTime(new Date());
//                    tjQuotaService.saves(detailModel, tjquotaDataSource, tjQuotaDataSave);
//                    return ObjEnvelop.getSuccess("统计表更新成功！", detailModel);
//                } else {
//                    result.setSuccessFlg(false);
//                    result.setErrorMsg(envelop.getErrorMsg());
//                    return result;
//                    return failed("参数错误");
//                }
//            } else {
//                detailModel.setCreateUser(userDetailModel.getId());
//                detailModel.setCreateUserName(userDetailModel.getRealName());
//                params.add("model", toJson(detailModel));
//                resultStr = templates.doPost(comUrl + url, params);
//                TjQuotaDataSource tjquotaDataSource = null;
//                TjQuotaDataSave tjQuotaDataSave = null;
//                if(detailModel.getTjQuotaDataSource() != null){
//                    tjquotaDataSource = detailModel.getTjQuotaDataSource();
//                    tjquotaDataSource.setQuotaCode(detailModel.getCode());
//                }
//                if(detailModel.getTjQuotaDataSave() != null
//                        && org.apache.commons.lang3.StringUtils.isNotEmpty(detailModel.getTjQuotaDataSave().getSaveCode())){
//                    tjQuotaDataSave = detailModel.getTjQuotaDataSave();
//                    tjQuotaDataSave.setQuotaCode(detailModel.getCode());
//                }
//                detailModel.setIsInitExec("0");
//                detailModel.setStatus(1);
//                detailModel.setCreateTime(new Date());
//                detailModel.setUpdateTime(new Date());
//                tjQuotaService.saves(detailModel, tjquotaDataSource, tjQuotaDataSave);
//                return ObjEnvelop.getSuccess("统计表更新成功！", detailModel);
//            }
//        } catch (Exception e) {
//            e.printStackTrace();
//            return failed(ERR_SYSTEM_DES);
//        }
//        return resultStr;
//    }
//
//    /**
@@ -140,38 +171,19 @@
//     * @return
//     */
//    @RequestMapping("deleteTjDataSave")
//    @ResponseBody
//    public Object deleteTjQuota(Long tjQuotaId) {
//    public Envelop deleteTjQuota(Long tjQuotaId) {
//        String url = "/tj/deleteTjQuota";
//        String resultStr = "";
//        Envelop result = new Envelop();
//        Map<String, Object> params = new HashMap<>();
//        ObjectMapper mapper = new ObjectMapper();
//
//        //判断资源视图中有没有用到此视图，有用到 不允许删除
//        String resQuotaUrl = "/resourceQuota/searchByQuotaId";
//
//        try {
//            params.put("quotaId", tjQuotaId);
//            resultStr = HttpClientUtil.doGet(comUrl + resQuotaUrl, params, username, password);
//            result = mapper.readValue(resultStr, Envelop.class);
//            if (result.getObj() != null) {
//                result.setSuccessFlg(false);
//                result.setErrorMsg("指标在视图中被使用暂时不能删除，若要删除先解除资源视图中指标关系");
//                return result;
//            }
//
//            params.clear();
//            params.put("id", tjQuotaId);
//            resultStr = HttpClientUtil.doDelete(comUrl + url, params, username, password);
//            result = mapper.readValue(resultStr, Envelop.class);
//            if (result.isSuccessFlg()) {
//                result.setSuccessFlg(true);
//            } else {
//                result.setSuccessFlg(false);
//                result.setErrorMsg("删除失败");
//            }
//            return result;
//            List<RsResourceQuota> list = resourceQuotaService.search("quotaId=" + tjQuotaId);
//            if (list.size()>0) {
//                return failed("指标在视图中被使用暂时不能删除，若要删除先解除资源视图中指标关系");
//            }
//            TjQuota tjQuota = tjQuotaService.getById(tjQuotaId);
//            tjQuota.setStatus(-1);
//            tjQuotaService.save(tjQuota);
//            return ObjEnvelop.getSuccess("统计指标表删除成功！");
//        } catch (Exception e) {
//            e.printStackTrace();
//            return failed(ERR_SYSTEM_DES);
@@ -186,22 +198,33 @@
//     * @return
//     */
//    @RequestMapping("getTjQuotaById")
//    @ResponseBody
//    public Object getTjQuotaById(Model model, Long id) {
//    public Envelop getTjQuotaById(Model model, Long id) {
//        String url = "/tj/getTjQuotaById/" + id;
//        String resultStr = "";
//        Envelop envelop = new Envelop();
//        Map<String, Object> params = new HashMap<>();
//        params.put("id", id);
//        TjQuotaModel detailModel = null;
//        try {
//            resultStr = HttpClientUtil.doGet(comUrl + url, params, username, password);
//            Envelop ep = getEnvelop(resultStr);
//            detailModel = toModel(toJson(ep.getObj()), TjQuotaModel.class);
//            TjQuota tjQuota = tjQuotaService.getById(id);
//            if (null != tjQuota) {
//                TjQuotaDataSave tjQuotaDataSave = tjQuotaDataSaveService.getByQuotaCode(tjQuota.getCode());
//                TjQuotaDataSource tjQuotaDataSource = tjQuotaDataSourceService.getByQuotaCode(tjQuota.getCode());
//                if (tjQuotaDataSave != null) {
//                    TjDataSave tjDataSave = tjDataSaveService.getByCode(tjQuotaDataSave.getSaveCode());
//                    tjQuotaDataSave.setName(tjDataSave.getName());
//                }
//                if (tjQuotaDataSource != null) {
//                    TjDataSource tjDataSource = tjDataSourceService.getByCode(tjQuotaDataSource.getSourceCode());
//                    tjQuotaDataSource.setName(tjDataSource.getName());
//                }
//                tjQuota.setTjQuotaDataSave(tjQuotaDataSave);
//                tjQuota.setTjQuotaDataSource(tjQuotaDataSource);
//            }
//            return ObjEnvelop.getSuccess("统计指标表删除成功！",tjQuota);
//        } catch (Exception e) {
//            e.printStackTrace();
//        }
//        return detailModel;
//        return failed("查询失败");
//    }
//
//    /**
@@ -211,8 +234,7 @@
//     * @return
//     */
//    @RequestMapping("hasExistsName")
//    @ResponseBody
//    public boolean hasExistsName(String name) {
//    public Envelop hasExistsName(String name) {
//        String url = "/tj/tjQuotaExistsName/" + name;
//        String resultStr = "";
//        Envelop result = new Envelop();
@@ -220,14 +242,13 @@
//        ObjectMapper mapper = new ObjectMapper();
//        params.put("name", name);
//        try {
//            resultStr = HttpClientUtil.doGet(comUrl + url, params, username, password);
//            if (resultStr.equals("true")) {
//                return true;
//            }
//            String filter = "name=" + name;
//            List<TjQuota> list = tjQuotaService.search(filter);
//            return ObjEnvelop.getSuccess("查询成功",list.size() >0);
//        } catch (Exception e) {
//            e.getMessage();
//        }
//        return false;
//        return  failed("查询失败");
//    }
//
//    /**
@@ -237,8 +258,7 @@
//     * @return
//     */
//    @RequestMapping("hasExistsCode")
//    @ResponseBody
//    public boolean hasExistsCode(String code) {
//    public Envelop hasExistsCode(String code) {
//        String url = "/tj/tjQuotaExistsCode/" + code;
//        String resultStr = "";
//        Envelop result = new Envelop();
@@ -246,21 +266,19 @@
//        ObjectMapper mapper = new ObjectMapper();
//        params.put("code", code);
//        try {
//            resultStr = HttpClientUtil.doGet(comUrl + url, params, username, password);
//            if (resultStr.equals("true")) {
//                return true;
//            }
//            String filter = "code=" + code;
//            List<TjQuota> list = tjQuotaService.search(filter);
//            return ObjEnvelop.getSuccess("查询成功",list.size() >0);
//        } catch (Exception e) {
//            e.getMessage();
//        }
//        return false;
//        return  failed("查询失败");
//    }
//
//    /**
//     * 初始执行(全量统计)
//     */
//    @RequestMapping("firstExecuteQuota")
//    @ResponseBody
//    public Object firstExecuteQuota(Long tjQuotaId) {
//        Envelop envelop = new Envelop();
//        Map<String, Object> params = new HashMap<>();
@@ -280,7 +298,6 @@
//     * 执行指标
//     */
//    @RequestMapping("execuQuota")
//    @ResponseBody
//    public Object execuQuota(Long tjQuotaId, String startDate, String endDate) {
//        Envelop envelop = new Envelop();
//        Map<String, Object> params = new HashMap<>();
@@ -354,7 +371,6 @@
//     * @return
//     */
//    @RequestMapping("selectQuotaResult")
//    @ResponseBody
//    public Object selectQuotaResult(Long tjQuotaId, int page, int rows,
//                                    String startTime, String endTime, String orgName,
//                                    String province, String city, String district,String res, HttpServletRequest request) {
@@ -388,20 +404,6 @@
//        }
//    }
//
//    /**
//     * 指标日志查询
//     *
//     * @param model
//     * @return
//     */
//    @RequestMapping("initialQuotaLog")
//    public String initialQuotaLog(Model model, String quotaCode, String quotaType, String name) {
//        model.addAttribute("contentPage", "/report/zhibiao/zhiBiaoLogIndex");
//        model.addAttribute("quotaCode", quotaCode);
//        model.addAttribute("quotaType", quotaType);
//        model.addAttribute("name", name);
//        return "emptyView";
//    }
//
//    /**
//     * 获取指标日志信息
@@ -410,7 +412,6 @@
//     * @return
//     */
//    @RequestMapping("queryQuotaLog")
//    @ResponseBody
//    public Object queryQuotaLog(String quotaCode, String startTime, String endTime, int page, int rows) throws Exception {
//        String url = "/tj/getTjQuotaLogList";
//        String resultStr = "";
@@ -440,7 +441,6 @@
//     * @return
//     */
//    @RequestMapping("hasConfigDimension")
//    @ResponseBody
//    public boolean hasConfigDimension(String quotaCode) throws Exception {
//        String url = "/tj/hasConfigDimension";
//        String resultStr = "";
@@ -461,7 +461,6 @@
//
//    //带检索分页的查找指标方法,用于下拉框
//    @RequestMapping("/rsQuota")
//    @ResponseBody
//    public Object searchRsQuota(String searchParm, int page, int rows) {
//        String url = "/tj/getTjQuotaList";
//        Envelop envelop = new Envelop();
@@ -502,7 +501,6 @@
//
//
//    @RequestMapping("/getTjQuotaChartList")
//    @ResponseBody
//    public Object getQuotaChartList(String quotaCode, String name, int dictId, int page, int rows) {
//        String url = "/tj/getTjQuotaChartList";
//        String resultStr = "";
@@ -545,7 +543,6 @@
//     * @throws IOException
//     */
//    @RequestMapping(value = "addTjQuotaChart", produces = "text/html;charset=UTF-8")
//    @ResponseBody
//    public Object addTjQuotaChart(String quotaCode, String jsonModel, HttpServletRequest request) throws IOException {
//        String url = "/tj/batchTjQuotaChart";
//        String resultStr = "";
@@ -924,7 +921,6 @@
//     * 停止执行指标
//     */
//    @RequestMapping("removeQuota")
//    @ResponseBody
//    public Object removeQuota(Long tjQuotaId) {
//        Envelop envelop = new Envelop();
//        Map<String, Object> params = new HashMap<>();

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

@@ -1,67 +1,56 @@
//package com.yihu.jw.basic.agadmin.controller.quota;
//
//import com.yihu.ehr.constants.SessionAttributeKeys;
//
//import com.yihu.jw.restmodel.web.Envelop;
//import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
//import com.yihu.jw.util.http.HttpClientUtil;
//import org.apache.commons.lang.StringUtils;
//import org.springframework.beans.factory.annotation.Value;
//import org.springframework.util.LinkedMultiValueMap;
//import org.springframework.util.MultiValueMap;
//import org.springframework.web.bind.annotation.RequestMapping;
//import org.springframework.web.bind.annotation.ResponseBody;
//import org.springframework.web.bind.annotation.RestController;
//import org.springframework.web.bind.annotation.SessionAttributes;
//import org.springframework.web.client.RestClientException;
//
//import javax.servlet.http.HttpServletRequest;
//import java.io.IOException;
//import java.util.HashMap;
//import java.util.Map;
//
///**
// * Created by Administrator on 2017/6/15.
// */
//@RestController
//@RequestMapping("/tjQuotaDimensionMain")
//public class TjQuotaDimensionMainController extends EnvelopRestEndpoint {
//
//
//    /**
//     * 添加主维度子表
//     * @param jsonModel 维度子表信息的json串
//     * @param request
//     * @return
//     * @throws IOException
//     */
//    @RequestMapping(value = "addTjQuotaDimensionMain", produces = "text/html;charset=UTF-8")
//    @ResponseBody
//    public Object addTjQuotaDimensionMain(String quotaCode, String jsonModel, HttpServletRequest request) throws IOException {
//        String url = "/tj/addTjQuotaDimensionMain";
//        String resultStr = "";
//        Envelop result = new Envelop();
//        if (!StringUtils.isBlank(quotaCode)) {
//            url = "/tj/deleteMainByQuotaCode";
//            Map<String, Object> params = new HashMap<>();
//            params.put("quotaCode", quotaCode);
//            try {
//                resultStr = HttpClientUtil.doDelete(comUrl + url, params, username, password);
//            } catch (Exception e) {
//                e.printStackTrace();
//                return failed(ERR_SYSTEM_DES);
//            }
//            return resultStr;
//        }
//        MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
//        params.add("model", jsonModel);
//        RestTemplates templates = new RestTemplates();
//        try {
//            resultStr = templates.doPost(comUrl + url, params);
//        } catch (RestClientException e) {
//            e.printStackTrace();
//            return failed(ERR_SYSTEM_DES);
//        }
//        return resultStr;
//    }
//}
package com.yihu.jw.basic.agadmin.controller.quota;
import com.fasterxml.jackson.core.type.TypeReference;
import com.yihu.jw.basic.quota.service.TjQuotaDimensionMainService;
import com.yihu.jw.entity.ehr.quota.TjQuotaDimensionMain;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.util.List;
import java.util.Map;
/**
 * Created by Administrator on 2017/6/15.
 */
@RestController
@RequestMapping("/tjQuotaDimensionMain")
public class TjQuotaDimensionMainController extends EnvelopRestEndpoint {
    @Autowired
    TjQuotaDimensionMainService tjQuotaDimensionMainService;
    /**
     * 添加主维度子表
     * @param jsonModel 维度子表信息的json串
     * @param request
     * @return
     * @throws IOException
     */
    @RequestMapping(value = "addTjQuotaDimensionMain", produces = "text/html;charset=UTF-8")
    public Object addTjQuotaDimensionMain(String quotaCode, String jsonModel, HttpServletRequest request) throws IOException {
        String url = "/tj/addTjQuotaDimensionMain";
        String resultStr = "";
        Envelop result = new Envelop();
        if (!StringUtils.isBlank(quotaCode)) {
            url = "/tj/deleteMainByQuotaCode";
            tjQuotaDimensionMainService.deleteByQuotaCode(quotaCode);
            return success("删除成功");
        }
        List<TjQuotaDimensionMain> list = objectMapper.readValue(jsonModel, new TypeReference<List<TjQuotaDimensionMain>>(){});
        if (list != null && list.size() > 0) {
            tjQuotaDimensionMainService.deleteByQuotaCode(list.get(0).getQuotaCode());
        }
        for (int i=0; i<list.size(); i++) {
            tjQuotaDimensionMainService.save(list.get(i));
        }
        return ObjEnvelop.getSuccess("统计指标主维度关联信息更新成功！", list);
    }
}

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

@@ -1,67 +1,60 @@
//package com.yihu.jw.basic.agadmin.controller.quota;
//
//import com.yihu.ehr.constants.SessionAttributeKeys;
//import com.yihu.jw.restmodel.web.Envelop;
//import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
//import com.yihu.jw.util.http.HttpClientUtil;
//import org.apache.commons.lang.StringUtils;
//import org.springframework.beans.factory.annotation.Value;
//import org.springframework.stereotype.Controller;
//import org.springframework.util.LinkedMultiValueMap;
//import org.springframework.util.MultiValueMap;
//import org.springframework.web.bind.annotation.RequestMapping;
//import org.springframework.web.bind.annotation.ResponseBody;
//import org.springframework.web.bind.annotation.RestController;
//import org.springframework.web.bind.annotation.SessionAttributes;
//import org.springframework.web.client.RestClientException;
//
//import javax.servlet.http.HttpServletRequest;
//import java.io.IOException;
//import java.util.HashMap;
//import java.util.Map;
//
///**
// * Created by Administrator on 2017/6/15.
// */
//@RestController
//@RequestMapping("/tjQuotaDimensionMain")
//public class TjQuotaDimensionSlaveController extends EnvelopRestEndpoint {
//
//
//    /**
//     * 添加主维度子表
//     * @param jsonModel 维度子表信息的json串
//     * @param request
//     * @return
//     * @throws IOException
//     */
//    @RequestMapping(value = "addTjQuotaDimensionSlave", produces = "text/html;charset=UTF-8")
//    @ResponseBody
//    public Object addTjQuotaDimensionSlave(String quotaCode, String jsonModel, HttpServletRequest request) throws IOException {
//        String url = "/tj/addTjQuotaDimensionSlave";
//        String resultStr = "";
//        Envelop result = new Envelop();
//        if (!StringUtils.isBlank(quotaCode)) {
//            url = "/tj/deleteSlaveByQuotaCode";
//            Map<String, Object> params = new HashMap<>();
//            params.put("quotaCode", quotaCode);
//            try {
//                resultStr = HttpClientUtil.doDelete(comUrl + url, params, username, password);
//            } catch (Exception e) {
//                e.printStackTrace();
//                return failed(ERR_SYSTEM_DES);
//            }
//            return resultStr;
//        }
//        MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
//        params.add("model", jsonModel);
//        RestTemplates templates = new RestTemplates();
//        try {
//            resultStr = templates.doPost(comUrl + url, params);
//        } catch (RestClientException e) {
//            e.printStackTrace();
//            return failed(ERR_SYSTEM_DES);
//        }
//        return resultStr;
//    }
//}
package com.yihu.jw.basic.agadmin.controller.quota;
import com.fasterxml.jackson.core.type.TypeReference;
import com.yihu.jw.basic.quota.service.TjQuotaDimensionSlaveService;
import com.yihu.jw.entity.ehr.quota.TjQuotaDimensionSlave;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
 * Created by Administrator on 2017/6/15.
 */
@RestController
@RequestMapping("/tjQuotaDimensionMain")
public class TjQuotaDimensionSlaveController extends EnvelopRestEndpoint {
    @Autowired
    TjQuotaDimensionSlaveService tjQuotaDimensionSlaveService;
    /**
     * 添加主维度子表
     * @param jsonModel 维度子表信息的json串
     * @param request
     * @return
     * @throws IOException
     */
    @RequestMapping(value = "addTjQuotaDimensionSlave", produces = "text/html;charset=UTF-8")
    public Object addTjQuotaDimensionSlave(String quotaCode, String jsonModel, HttpServletRequest request) throws IOException {
        String url = "/tj/addTjQuotaDimensionSlave";
        String resultStr = "";
        Envelop result = new Envelop();
        if (!StringUtils.isBlank(quotaCode)) {
            url = "/tj/deleteSlaveByQuotaCode";
            tjQuotaDimensionSlaveService.deleteByQuotaCode(quotaCode);
            return success("删除成功");
        }
        List<TjQuotaDimensionSlave> list = objectMapper.readValue(jsonModel, new TypeReference<List<TjQuotaDimensionSlave>>(){});
        if (list != null && list.size() > 0) {
            tjQuotaDimensionSlaveService.deleteByQuotaCode(list.get(0).getQuotaCode());
        }
        for (int i=0; i<list.size(); i++) {
            TjQuotaDimensionSlave item = list.get(i);
            // 年龄段转换类
            if ("age".equals(item.getSlaveCode()) && "patient_age".equals(item.getKeyVal())) {
                item.setConverClass("com.yihu.quota.etl.conver.AgeConvert");
            }
            tjQuotaDimensionSlaveService.save(item);
        }
        return ObjEnvelop.getSuccess("统计指标从维度关联信息更新成功！", list);
    }
}

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

@@ -3,6 +3,7 @@ package com.yihu.jw.basic.agadmin.controller.resource;
import com.yihu.ehr.constants.ServiceApi;
import com.yihu.jw.basic.apps.service.AppService;
import com.yihu.jw.basic.resource.dao.RsReportCategoryDao;
import com.yihu.jw.basic.resource.service.RsReportCategoryAppService;
import com.yihu.jw.basic.resource.service.RsReportCategoryService;
import com.yihu.jw.entity.ehr.apps.App;
@@ -46,6 +47,8 @@ public class ReportCategoryController extends EnvelopRestEndpoint {
    @Autowired
    private RsReportCategoryService rsReportCategoryService;
    @Autowired
    private RsReportCategoryDao rsReportCategoryDao;
    @Autowired
    private AppService appService;
    @RequestMapping("/configDialog")
@@ -221,9 +224,9 @@ public class ReportCategoryController extends EnvelopRestEndpoint {
     * 删除
     */
    @RequestMapping("/delete")
    public Envelop delete(String id) {
    public Envelop delete(Integer id) {
        try {
            rsReportCategoryService.delete(id);
            rsReportCategoryDao.deleteById(id);
            return success("删除成功");
        } catch (Exception e) {
            e.printStackTrace();

svr/svr-basic/src/main/java/com/yihu/jw/basic/apps/controller/AppApiEndPoint.java

@@ -1,5 +1,6 @@
package com.yihu.jw.basic.apps.controller;
import com.yihu.jw.basic.apps.dao.AppApiDao;
import com.yihu.jw.entity.ehr.apps.AppApi;
import com.yihu.jw.entity.ehr.apps.AppApiParameter;
import com.yihu.jw.entity.ehr.apps.AppApiResponse;
@@ -49,6 +50,8 @@ public class AppApiEndPoint extends EnvelopRestEndpoint {
    @Autowired
    private AppApiService appApiService;
    @Autowired
    private AppApiDao appApiRepository;
    @Autowired
    private AppApiParameterService appApiParameterService;
    @Autowired
    private AppApiResponseService appApiResponseService;
@@ -114,7 +117,7 @@ public class AppApiEndPoint extends EnvelopRestEndpoint {
    public boolean deleteAppApi(
            @ApiParam(name = "id", value = "id")
            @PathVariable(value = "id") int id) throws Exception {
        appApiService.delete(id);
        appApiRepository.deleteById(id);
        return true;
    }

svr/svr-basic/src/main/java/com/yihu/jw/basic/apps/controller/AppApiParameterEndPoint.java

@@ -1,5 +1,6 @@
package com.yihu.jw.basic.apps.controller;
import com.yihu.jw.basic.apps.dao.AppApiParameterDao;
import com.yihu.jw.entity.ehr.apps.AppApiParameter;
import com.yihu.jw.basic.apps.service.AppApiParameterService;
import com.yihu.ehr.constants.ApiVersion;
@@ -32,6 +33,8 @@ import java.util.List;
public class AppApiParameterEndPoint extends EnvelopRestEndpoint {
    @Autowired
    private AppApiParameterService appApiParameterService;
    @Autowired
    private AppApiParameterDao appApiParameterRepository;
    @RequestMapping(value = ServiceApi.AppApiParameter.AppApiParameters, method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "创建AppApiParameter")
@@ -92,7 +95,7 @@ public class AppApiParameterEndPoint extends EnvelopRestEndpoint {
    public boolean deleteAppApiParameter(
            @ApiParam(name = "id", value = "id")
            @PathVariable(value = "id") int id) throws Exception {
        appApiParameterService.delete(id);
        appApiParameterRepository.deleteById(id);
        return true;
    }
}

svr/svr-basic/src/main/java/com/yihu/jw/basic/apps/controller/AppApiResponseEndPoint.java

@@ -1,5 +1,6 @@
package com.yihu.jw.basic.apps.controller;
import com.yihu.jw.basic.apps.dao.AppApiResponseDao;
import com.yihu.jw.basic.apps.service.AppApiResponseService;
import com.yihu.jw.entity.ehr.apps.AppApiResponse;
import com.yihu.ehr.constants.ApiVersion;
@@ -32,6 +33,8 @@ import java.util.List;
public class AppApiResponseEndPoint extends EnvelopRestEndpoint {
    @Autowired
    private AppApiResponseService appApiResponseService;
    @Autowired
    private AppApiResponseDao xAppApiResponseRepository;
    @RequestMapping(value = ServiceApi.AppApiResponse.AppApiResponses, method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "创建AppApiResponse")
@@ -93,7 +96,7 @@ public class AppApiResponseEndPoint extends EnvelopRestEndpoint {
    public boolean deleteAppApiResponse(
            @ApiParam(name = "id", value = "id")
            @PathVariable(value = "id") int id) throws Exception {
        appApiResponseService.delete(id);
        xAppApiResponseRepository.deleteById(id);
        return true;
    }
}

svr/svr-basic/src/main/java/com/yihu/jw/basic/apps/controller/AppFeatureEndPoint.java

@@ -1,5 +1,6 @@
package com.yihu.jw.basic.apps.controller;
import com.yihu.jw.basic.apps.dao.AppFeatureDao;
import com.yihu.jw.entity.ehr.apps.AppFeature;
import com.yihu.jw.basic.apps.service.AppFeatureService;
import com.yihu.ehr.constants.ApiVersion;
@@ -33,6 +34,8 @@ import java.util.Map;
public class AppFeatureEndPoint extends EnvelopRestEndpoint {
    @Autowired
    private AppFeatureService appFeatureService;
    @Autowired
    private AppFeatureDao xAppFeatureRepository;
    @RequestMapping(value = ServiceApi.AppFeature.AppFeature, method = RequestMethod.GET)
    @ApiOperation(value = "获取AppFeature")
@@ -105,8 +108,8 @@ public class AppFeatureEndPoint extends EnvelopRestEndpoint {
    @ApiOperation(value = "删除AppFeature")
    public boolean deleteAppFeature(
            @ApiParam(name = "id", value = "id")
            @PathVariable(value = "id") int id) throws Exception {
        appFeatureService.delete(id);
            @PathVariable(value = "id") String id) throws Exception {
        xAppFeatureRepository.deleteById(id);
        return true;
    }

svr/svr-basic/src/main/java/com/yihu/jw/basic/org/controller/OrgHealthCategoryEndPoint.java

@@ -1,5 +1,6 @@
package com.yihu.jw.basic.org.controller;
import com.yihu.jw.basic.org.dao.OrgHealthCategoryDao;
import com.yihu.jw.entity.ehr.org.OrgHealthCategory;
import com.yihu.jw.basic.org.service.OrgHealthCategoryService;
import com.yihu.ehr.constants.ApiVersion;
@@ -32,6 +33,8 @@ public class OrgHealthCategoryEndPoint extends EnvelopRestEndpoint {
    @Autowired
    private OrgHealthCategoryService orgHealthCategoryService;
    @Autowired
    OrgHealthCategoryDao orgHealthCategoryDao;
    @ApiOperation("根据ID获取卫生机构类别")
    @RequestMapping(value = ServiceApi.Org.HealthCategory.GetById, method = RequestMethod.GET)
@@ -170,11 +173,11 @@ public class OrgHealthCategoryEndPoint extends EnvelopRestEndpoint {
    @RequestMapping(value = ServiceApi.Org.HealthCategory.Delete, method = RequestMethod.DELETE)
    public Envelop delete(
            @ApiParam(name = "id", value = "卫生机构类别ID", required = true)
            @RequestParam(value = "id") Integer id) {
            @RequestParam(value = "id") Long id) {
        Envelop envelop = new Envelop();
        envelop.setStatus(-1);
        try {
            orgHealthCategoryService.delete(id);
            orgHealthCategoryDao.deleteById(id);
            envelop.setStatus(200);
            envelop.setMessage("成功删除卫生机构类别。");

svr/svr-basic/src/main/java/com/yihu/jw/basic/patient/controller/AuthenticationEndPoint.java

@@ -1,5 +1,6 @@
package com.yihu.jw.basic.patient.controller;
import com.yihu.jw.basic.patient.dao.XAuthenticationRepository;
import com.yihu.jw.entity.ehr.patient.Authentication;
import com.yihu.jw.basic.patient.service.AuthenticationService;
import com.yihu.ehr.constants.ApiVersion;
@@ -31,6 +32,8 @@ import java.util.List;
public class AuthenticationEndPoint extends EnvelopRestEndpoint {
    @Autowired
    AuthenticationService authenticationService;
    @Autowired
    private XAuthenticationRepository authenticationRepository;
    @RequestMapping(value = ServiceApi.Patients.Authentications, method = RequestMethod.GET)
    @ApiOperation(value = "人口身份认证申请列表")
@@ -81,7 +84,7 @@ public class AuthenticationEndPoint extends EnvelopRestEndpoint {
            @ApiParam(name = "id", value = "编号", defaultValue = "")
            @PathVariable(value = "id") int id) throws Exception{
        authenticationService.delete(id);
        authenticationRepository.deleteById(id);
        return true;
    }

svr/svr-basic/src/main/java/com/yihu/jw/basic/patient/controller/FamiliesEndPoint.java

@@ -1,5 +1,6 @@
package com.yihu.jw.basic.patient.controller;
import com.yihu.jw.basic.patient.dao.XFamiliesRepository;
import com.yihu.jw.entity.ehr.patient.Families;
import com.yihu.jw.basic.patient.service.FamiliesService;
import com.yihu.ehr.constants.ApiVersion;
@@ -32,6 +33,8 @@ public class FamiliesEndPoint extends EnvelopRestEndpoint {
    @Autowired
    private FamiliesService familiesService;
    @Autowired
    private XFamiliesRepository familiesRep;
    @RequestMapping(value = ServiceApi.Families.Families, method = RequestMethod.GET)
    @ApiOperation(value = "获取家庭关系列表")
@@ -103,7 +106,7 @@ public class FamiliesEndPoint extends EnvelopRestEndpoint {
            @ApiParam(name = "id", value = "用户编号", defaultValue = "")
            @PathVariable(value = "id") String id) throws Exception {
        familiesService.delete(id);
        familiesRep.deleteById(id);
        return true;
    }

svr/svr-basic/src/main/java/com/yihu/jw/basic/patient/controller/PatientCardsEndPoint.java

@@ -2,6 +2,8 @@ package com.yihu.jw.basic.patient.controller;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.basic.patient.dao.XArchiveRelationDao;
import com.yihu.jw.basic.patient.dao.XMedicalCardsDao;
import com.yihu.jw.basic.patient.service.ArchiveRelationService;
import com.yihu.jw.basic.patient.service.MedicalCardsService;
import com.yihu.jw.basic.patient.service.UserCardsService;
@@ -39,13 +41,15 @@ public class PatientCardsEndPoint extends EnvelopRestEndpoint {
    UserCardsService userCardsService;
    @Autowired
    ObjectMapper objectMapper;
    private XMedicalCardsDao medicalCardsDao;
    @Autowired
    MedicalCardsService medicalCardsService;
    @Autowired
    ArchiveRelationService archiveRelationService;
    @Autowired
    private XArchiveRelationDao archiveRelationDao;
    // ----------------------- 就诊卡基本信息管理 ------------------------------
    @RequestMapping(value = ServiceApi.Patients.GetUserCards, method = RequestMethod.GET)
@@ -243,7 +247,7 @@ public class PatientCardsEndPoint extends EnvelopRestEndpoint {
    public Envelop mCardDelete(
            @ApiParam(name = "id", value = "id", defaultValue = "")
            @RequestParam(value = "id",required = false) Long id) throws Exception{
        medicalCardsService.delete(id);
        medicalCardsDao.deleteById(id);
        return success("就诊卡删除成功！");
    }
@@ -332,7 +336,7 @@ public class PatientCardsEndPoint extends EnvelopRestEndpoint {
    Envelop delArchiveRelation(
            @ApiParam(name = "id", value = "id", defaultValue = "")
            @RequestParam(value = "id",required = false) Long id) throws Exception{
        archiveRelationService.delete(id);
        archiveRelationDao.deleteById(id);
        return success("档案关联删除成功！");
    }

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

@@ -3,6 +3,7 @@ package com.yihu.jw.basic.patient.service;
import com.yihu.jw.basic.patient.dao.XAuthenticationRepository;
import com.yihu.jw.entity.ehr.patient.Authentication;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -15,5 +16,7 @@ import org.springframework.transaction.annotation.Transactional;
@Transactional
public class AuthenticationService extends BaseJpaService<Authentication, XAuthenticationRepository> {
    @Autowired
    private XAuthenticationRepository authenticationRepository;
}

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

@@ -84,7 +84,6 @@ public class TjDataSaveEndPoint extends EnvelopRestEndpoint {
    public Envelop delete(
            @ApiParam(name = "id", value = "编号", defaultValue = "")
            @RequestParam(value = "id") Long id) throws Exception{
//        tjDataSaveService.delete(id);
        TjDataSave tjDataSave = tjDataSaveService.getById(id);
        tjDataSave.setStatus(-1);
        tjDataSaveService.save(tjDataSave);

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

@@ -28,8 +28,7 @@ import java.util.List;
@RequestMapping(ApiVersion.Version1_0)
@Api(value = "TjDataSource", description = "数据源", tags = {"统计指标管理-数据源"})
public class TjDataSourceEndPoint extends EnvelopRestEndpoint {
    @Autowired
    ObjectMapper objectMapper;
    @Autowired
    TjDataSourceService tjDataSourceService;
@@ -86,7 +85,6 @@ public class TjDataSourceEndPoint extends EnvelopRestEndpoint {
    public Envelop delete(
            @ApiParam(name = "id", value = "编号", defaultValue = "")
            @RequestParam(value = "id") Long id) throws Exception{
//        tjDataSourceService.delete(id);
        TjDataSource tjDataSource = tjDataSourceService.getById(id);
        tjDataSource.setStatus(-1);
        tjDataSourceService.save(tjDataSource);

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

@@ -28,9 +28,6 @@ import java.util.List;
@RequestMapping(ApiVersion.Version1_0)
@Api(value = "TjDimensionSlave", description = "从维度", tags = {"从维度"})
public class TjDimensionSlaveEndPoint extends EnvelopRestEndpoint {
    @Autowired
    ObjectMapper objectMapper;
    
    @Autowired
    TjDimensionSlaveService tjDimensionSlaveService;
@@ -88,7 +85,7 @@ public class TjDimensionSlaveEndPoint extends EnvelopRestEndpoint {
    public Envelop delete(
            @ApiParam(name = "id", value = "编号", defaultValue = "")
            @RequestParam(value = "id") Long id) throws Exception{
        TjDimensionSlave tjDimensionSlave = tjDimensionSlaveService.getTjDimensionSlave(Integer.valueOf(id.toString()));
        TjDimensionSlave tjDimensionSlave = tjDimensionSlaveService.getTjDimensionSlave(id);
        tjDimensionSlave.setStatus(-1);
        tjDimensionSlaveService.save(tjDimensionSlave);
        return ObjEnvelop.getSuccess("从维度删除成功！");
@@ -96,7 +93,7 @@ public class TjDimensionSlaveEndPoint extends EnvelopRestEndpoint {
    @RequestMapping(value = ServiceApi.TJ.TjDimensionSlaveId, method = RequestMethod.GET)
    @ApiOperation(value = "获取从维度信息", notes = "获取从维度信息")
    TjDimensionSlave getTjDimensionSlave(@PathVariable(value = "id") Integer id){
    TjDimensionSlave getTjDimensionSlave(@PathVariable(value = "id") Long id){
        return tjDimensionSlaveService.getTjDimensionSlave(id);
    };

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

@@ -2,6 +2,7 @@ package com.yihu.jw.basic.quota.controller;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.basic.quota.dao.XTjQuotaChartRepository;
import com.yihu.jw.basic.quota.service.TjQuotaChartService;
import com.yihu.jw.entity.ehr.quota.TjQuotaChart;
import com.yihu.jw.restmodel.web.Envelop;
@@ -30,8 +31,7 @@ import java.util.List;
public class TjQuotaChartEndPoint extends EnvelopRestEndpoint {
    @Autowired
    ObjectMapper objectMapper;
    
    public XTjQuotaChartRepository xTjQuotaChartRepository;
    @Autowired
    TjQuotaChartService tjQuotaChartService;
@@ -97,8 +97,8 @@ public class TjQuotaChartEndPoint extends EnvelopRestEndpoint {
    @ApiOperation(value = "删除指标图表")
    public Envelop delete(
            @ApiParam(name = "id", value = "编号", defaultValue = "")
            @RequestParam(value = "id") String id) throws Exception{
        tjQuotaChartService.delete(id);
            @RequestParam(value = "id") Integer id) throws Exception{
        xTjQuotaChartRepository.deleteById(id);
        return ObjEnvelop.getSuccess("统计指标删除成功！");
    }

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

@@ -1,6 +1,7 @@
package com.yihu.jw.basic.quota.controller;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.basic.quota.dao.XTjQuotaDataSaveRepository;
import com.yihu.jw.basic.quota.service.TjQuotaDataSaveService;
import com.yihu.jw.entity.ehr.quota.TjQuotaDataSave;
import com.yihu.jw.restmodel.web.Envelop;
@@ -27,10 +28,10 @@ import java.util.List;
@RequestMapping(ApiVersion.Version1_0)
@Api(value = "TjQuotaDataSave", description = "统计数据存储", tags = {"统计指标管理-统计数据存储"})
public class TjQuotaDataSaveEndPoint extends EnvelopRestEndpoint {
    @Autowired
    ObjectMapper objectMapper;
    @Autowired
    TjQuotaDataSaveService tjQuotaDataSaveService;
    @Autowired
    XTjQuotaDataSaveRepository tjQuotaDataSaveRepository;
    @RequestMapping(value = ServiceApi.TJ.GetTjQuotaDataSaveList, method = RequestMethod.GET)
    @ApiOperation(value = "根据查询条件查询统计数据存储")
@@ -80,7 +81,7 @@ public class TjQuotaDataSaveEndPoint extends EnvelopRestEndpoint {
    public Envelop delete(
            @ApiParam(name = "id", value = "编号", defaultValue = "")
            @RequestParam(value = "id") Long id) throws Exception{
        tjQuotaDataSaveService.delete(id);
        tjQuotaDataSaveRepository.deleteById(id);
        return ObjEnvelop.getSuccess("统计数据存储删除成功！");
    }
}

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

@@ -1,6 +1,7 @@
package com.yihu.jw.basic.quota.controller;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.basic.quota.dao.XTjQuotaDataSourceRepository;
import com.yihu.jw.basic.quota.service.TjQuotaDataSourceService;
import com.yihu.jw.entity.ehr.quota.TjQuotaDataSource;
import com.yihu.jw.restmodel.web.Envelop;
@@ -31,6 +32,8 @@ public class TjQuotaDataSourceEndPoint extends EnvelopRestEndpoint {
    ObjectMapper objectMapper;
    @Autowired
    TjQuotaDataSourceService tjQuotaDataSourceService;
    @Autowired
    XTjQuotaDataSourceRepository tjQuotaDataSourceRepository;
    @RequestMapping(value = ServiceApi.TJ.GetTjQuotaDataSourceList, method = RequestMethod.GET)
    @ApiOperation(value = "根据查询条件查询统计数据源")
@@ -80,7 +83,7 @@ public class TjQuotaDataSourceEndPoint extends EnvelopRestEndpoint {
    public Envelop delete(
            @ApiParam(name = "id", value = "编号", defaultValue = "")
            @RequestParam(value = "id") Long id) throws Exception{
        tjQuotaDataSourceService.delete(id);
        tjQuotaDataSourceRepository.deleteById(id);
        return ObjEnvelop.getSuccess("统计数据源删除成功！");
    }
}

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

@@ -2,6 +2,7 @@ package com.yihu.jw.basic.quota.controller;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.basic.quota.dao.XTjQuotaDimensionMainRepository;
import com.yihu.jw.basic.quota.service.TjQuotaDimensionMainService;
import com.yihu.jw.entity.ehr.quota.TjQuotaDimensionMain;
import com.yihu.jw.restmodel.web.Envelop;
@@ -29,11 +30,10 @@ import java.util.List;
@Api(value = "TjQuotaDimensionMain", description = "统计指标主维度关联信息", tags = {"统计指标主维度关联信息"})
public class TjQuotaDimensionMainEndPoint extends EnvelopRestEndpoint {
    @Autowired
    ObjectMapper objectMapper;
    
    @Autowired
    TjQuotaDimensionMainService tjQuotaDimensionMainService;
    @Autowired
    XTjQuotaDimensionMainRepository tjQuotaDimensionMainRepository;
    @RequestMapping(value = ServiceApi.TJ.GetTjQuotaDimensionMainList, method = RequestMethod.GET)
    @ApiOperation(value = "根据查询条件查询统计指标主维度关联信息")
@@ -120,8 +120,8 @@ public class TjQuotaDimensionMainEndPoint extends EnvelopRestEndpoint {
    @ApiOperation(value = "删除统计指标主维度关联信息")
    public Envelop delete(
            @ApiParam(name = "id", value = "编号", defaultValue = "")
            @RequestParam(value = "id") String id) throws Exception{
        tjQuotaDimensionMainService.delete(id);
            @RequestParam(value = "id") Long id) throws Exception{
        tjQuotaDimensionMainRepository.deleteById(id);
        return ObjEnvelop.getSuccess("统计指标主维度关联信息删除成功！");
    }

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

@@ -2,6 +2,7 @@ package com.yihu.jw.basic.quota.controller;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.basic.quota.dao.XTjQuotaDimensionSlaveRepository;
import com.yihu.jw.basic.quota.service.TjQuotaDimensionSlaveService;
import com.yihu.jw.entity.ehr.quota.TjQuotaDimensionSlave;
import com.yihu.jw.restmodel.web.Envelop;
@@ -29,11 +30,10 @@ import java.util.List;
@Api(value = "TjQuotaDimensionSlave", description = "统计指标从维度关联信息", tags = {"从统计指标从维度关联信息"})
public class TjQuotaDimensionSlaveEndPoint extends EnvelopRestEndpoint {
    @Autowired
    ObjectMapper objectMapper;
    
    @Autowired
    TjQuotaDimensionSlaveService tjQuotaDimensionSlaveService;
    @Autowired
    XTjQuotaDimensionSlaveRepository tjQuotaDimensionSlaveRepository;
    @RequestMapping(value = ServiceApi.TJ.GetTjQuotaDimensionSlaveList, method = RequestMethod.GET)
    @ApiOperation(value = "根据查询条件查询统计指标从维度关联信息")
@@ -121,8 +121,8 @@ public class TjQuotaDimensionSlaveEndPoint extends EnvelopRestEndpoint {
    @ApiOperation(value = "删除统计指标从维度关联信息")
    public Envelop delete(
            @ApiParam(name = "id", value = "编号", defaultValue = "")
            @RequestParam(value = "id") String id) throws Exception{
        tjQuotaDimensionSlaveService.delete(id);
            @RequestParam(value = "id") Long id) throws Exception{
        tjQuotaDimensionSlaveRepository.deleteById(id);
        return ObjEnvelop.getSuccess("统计指标从维度关联信息删除成功！");
    }

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

@@ -40,8 +40,7 @@ import java.util.Map;
@RequestMapping(ApiVersion.Version1_0)
@Api(value = "TjQuota", description = "统计表", tags = {"统计指标管理-统计表"})
public class TjQuotaEndPoint extends EnvelopRestEndpoint {
    @Autowired
    ObjectMapper objectMapper;
    @Autowired
    TjQuotaService tjQuotaService;
    @Autowired

svr/svr-basic/src/main/java/com/yihu/jw/basic/quota/dao/XTjQuotaDimensionMainRepository.java

@@ -14,7 +14,7 @@ import java.util.List;
 * @version 1.0
 * @created 2017/5/08
 */
public interface XTjQuotaDimensionMainRepository extends JpaRepository<TjQuotaDimensionMain, Integer> {
public interface XTjQuotaDimensionMainRepository extends JpaRepository<TjQuotaDimensionMain, Long> {
    @Modifying
    @Query("delete from TjQuotaDimensionMain DimensionMain where DimensionMain.quotaCode = :quotaCode")

svr/svr-basic/src/main/java/com/yihu/jw/basic/quota/dao/XTjQuotaDimensionSlaveRepository.java

@@ -14,7 +14,7 @@ import java.util.List;
 * @version 1.0
 * @created 2017/5/08
 */
public interface XTjQuotaDimensionSlaveRepository extends JpaRepository<TjQuotaDimensionSlave, Integer> {
public interface XTjQuotaDimensionSlaveRepository extends JpaRepository<TjQuotaDimensionSlave, Long> {
    @Modifying
    @Query("delete from TjQuotaDimensionSlave DimensionSlave where DimensionSlave.quotaCode = :quotaCode")
    int deleteByQuotaCode(@Param("quotaCode") String quotaCode);

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

@@ -29,8 +29,8 @@ public class TjDimensionSlaveService extends BaseJpaService<TjDimensionSlave, XT
     * 根据ID获取.
     * @param
     */
    public TjDimensionSlave getTjDimensionSlave(Integer id) {
        TjDimensionSlave tjDimensionSlave = tjDimensionSlaveRepository.getOne(Long.valueOf(id));
    public TjDimensionSlave getTjDimensionSlave(Long id) {
        TjDimensionSlave tjDimensionSlave = tjDimensionSlaveRepository.getOne(id);
        return tjDimensionSlave;
    }

svr/svr-basic/src/main/java/com/yihu/jw/basic/redis/controler/RedisMqChannelEndPoint.java

@@ -2,6 +2,7 @@ package com.yihu.jw.basic.redis.controler;
import com.yihu.ehr.constants.ApiVersion;
import com.yihu.ehr.constants.ServiceApi;
import com.yihu.jw.basic.redis.dao.RedisMqChannelDao;
import com.yihu.jw.basic.redis.pubsub.CustomMessageListenerAdapter;
import com.yihu.jw.basic.redis.pubsub.MessageCommonBiz;
import com.yihu.jw.basic.redis.service.RedisMqChannelService;
@@ -45,6 +46,8 @@ public class RedisMqChannelEndPoint extends EnvelopRestEndpoint {
    @Autowired
    private RedisMqChannelService redisMqChannelService;
    @Autowired
    RedisMqChannelDao redisMqChannelDao;
    @Autowired
    private RedisMqMessageLogService redisMqMessageLogService;
    @Autowired
    private RedisMqSubscriberService redisMqSubscriberService;
@@ -157,7 +160,7 @@ public class RedisMqChannelEndPoint extends EnvelopRestEndpoint {
            return failed("该消息队列存在发布者，不能删除。");
        }
        redisMqChannelService.delete(id);
        redisMqChannelDao.deleteById(id);
        // 删除该消息队列的消息监听
        CustomMessageListenerAdapter messageListener = MessageCommonBiz.newCustomMessageListenerAdapter(channel);

svr/svr-basic/src/main/java/com/yihu/jw/basic/redis/controler/RedisMqPublisherEndPoint.java

@@ -2,6 +2,7 @@ package com.yihu.jw.basic.redis.controler;
import com.yihu.ehr.constants.ApiVersion;
import com.yihu.ehr.constants.ServiceApi;
import com.yihu.jw.basic.redis.dao.RedisMqPublisherDao;
import com.yihu.jw.basic.redis.service.RedisMqChannelService;
import com.yihu.jw.basic.redis.service.RedisMqPublisherService;
import com.yihu.jw.entity.ehr.redis.RedisMqChannel;
@@ -34,6 +35,8 @@ public class RedisMqPublisherEndPoint extends EnvelopRestEndpoint {
    @Autowired
    private RedisMqPublisherService redisMqPublisherService;
    @Autowired
    RedisMqPublisherDao redisMqPublisherDao;
    @Autowired
    private RedisMqChannelService redisMqChannelService;
    @ApiOperation("根据ID获取消息发布者")
@@ -120,7 +123,7 @@ public class RedisMqPublisherEndPoint extends EnvelopRestEndpoint {
            @RequestParam(value = "id") Integer id) {
        try {
            RedisMqPublisher publisher = redisMqPublisherService.getById(id);
            redisMqPublisherService.delete(id);
            redisMqPublisherDao.deleteById(id);
            // 扣减发布者数
            RedisMqChannel channel = redisMqChannelService.findByChannel(publisher.getChannel());

svr/svr-basic/src/main/java/com/yihu/jw/basic/redis/controler/RedisMqSubscriberEndPoint.java

@@ -2,6 +2,7 @@ package com.yihu.jw.basic.redis.controler;
import com.yihu.ehr.constants.ApiVersion;
import com.yihu.ehr.constants.ServiceApi;
import com.yihu.jw.basic.redis.dao.RedisMqSubscriberDao;
import com.yihu.jw.basic.redis.service.RedisMqChannelService;
import com.yihu.jw.basic.redis.service.RedisMqSubscriberService;
import com.yihu.jw.entity.ehr.redis.RedisMqChannel;
@@ -37,6 +38,8 @@ public class RedisMqSubscriberEndPoint extends EnvelopRestEndpoint {
    @Autowired
    private RedisMqSubscriberService redisMqSubscriberService;
    @Autowired
    RedisMqSubscriberDao redisMqSubscriberDao;
    @Autowired
    private RedisMqChannelService redisMqChannelService;
    @Autowired
    private RedisMessageListenerContainer redisMessageListenerContainer;
@@ -135,7 +138,7 @@ public class RedisMqSubscriberEndPoint extends EnvelopRestEndpoint {
            @RequestParam(value = "id") Integer id) {
        try {
            RedisMqSubscriber subscriber = redisMqSubscriberService.getById(id);
            redisMqSubscriberService.delete(id);
            redisMqSubscriberDao.deleteById(id);
            // 扣减订阅者数
            RedisMqChannel channel = redisMqChannelService.findByChannel(subscriber.getChannel());

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

@@ -2,6 +2,7 @@ package com.yihu.jw.basic.report.controller;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.basic.report.dao.XQcDailyReportDatasetRepository;
import com.yihu.jw.basic.report.service.QcDailyReportDatasetService;
import com.yihu.ehr.constants.ApiVersion;
import com.yihu.ehr.constants.ServiceApi;
@@ -30,7 +31,7 @@ import java.util.*;
public class QcDailyReportDatasetEndPoint extends EnvelopRestEndpoint {
    @Autowired
    ObjectMapper objectMapper;
    private XQcDailyReportDatasetRepository qcDailyReportDatasetRepository;
    @Autowired
    QcDailyReportDatasetService qcDailyReportDatasetService;
@@ -89,7 +90,7 @@ public class QcDailyReportDatasetEndPoint extends EnvelopRestEndpoint {
    public boolean delete(
            @ApiParam(name = "id", value = "编号", defaultValue = "")
            @RequestParam(value = "id") String id) throws Exception{
        qcDailyReportDatasetService.delete(id);
        qcDailyReportDatasetRepository.deleteById(id);
        return true;
    }

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

@@ -1,6 +1,7 @@
package com.yihu.jw.basic.report.controller;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.basic.report.dao.XQcDailyReportDatasetsRepository;
import com.yihu.jw.basic.report.service.QcDailyReportDatasetsService;
import com.yihu.ehr.constants.ApiVersion;
import com.yihu.ehr.constants.ServiceApi;
@@ -29,8 +30,7 @@ import java.util.List;
public class QcDailyReportDatasetsEndPoint extends EnvelopRestEndpoint {
    @Autowired
    ObjectMapper objectMapper;
    
    private XQcDailyReportDatasetsRepository qcDailyReportDatasetsRepository;
    @Autowired
    QcDailyReportDatasetsService qcDailyReportDatasetsService;
@@ -90,7 +90,7 @@ public class QcDailyReportDatasetsEndPoint extends EnvelopRestEndpoint {
    public boolean delete(
            @ApiParam(name = "id", value = "编号", defaultValue = "")
            @RequestParam(value = "id") String id) throws Exception{
        qcDailyReportDatasetsService.delete(id);
        qcDailyReportDatasetsRepository.deleteById(id);
        return true;
    }

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

@@ -2,6 +2,7 @@ package com.yihu.jw.basic.report.controller;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.basic.report.dao.XQcDailyReportRepository;
import com.yihu.jw.basic.report.service.QcDailyReportDetailService;
import com.yihu.jw.basic.report.service.QcDailyReportService;
import com.yihu.ehr.constants.ApiVersion;
@@ -37,7 +38,7 @@ import java.util.Map;
public class QcDailyReportEndPoint extends EnvelopRestEndpoint {
    @Autowired
    ObjectMapper objectMapper;
    XQcDailyReportRepository xQcDailyReportRepository;
    @Autowired
    QcDailyReportService qcDailyReportService;
    @Autowired
@@ -96,7 +97,7 @@ public class QcDailyReportEndPoint extends EnvelopRestEndpoint {
    public boolean delete(
            @ApiParam(name = "id", value = "编号", defaultValue = "")
            @RequestParam(value = "id") String id) throws Exception {
        qcDailyReportService.delete(id);
        xQcDailyReportRepository.deleteById(id);
        return true;
    }

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

@@ -2,6 +2,7 @@ package com.yihu.jw.basic.report.controller;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.basic.report.dao.XQcDailyReportMetaDataRepository;
import com.yihu.jw.basic.report.service.QcDailyReportMetadataService;
import com.yihu.ehr.constants.ApiVersion;
import com.yihu.ehr.constants.ServiceApi;
@@ -34,7 +35,7 @@ import java.util.Map;
public class QcDailyReportMetadataEndPoint extends EnvelopRestEndpoint {
    @Autowired
    ObjectMapper objectMapper;
    private XQcDailyReportMetaDataRepository qcDailyReportMetaDataRepository;
    @Autowired
    QcDailyReportMetadataService qcDailyReportMetaDataService;
@@ -91,7 +92,7 @@ public class QcDailyReportMetadataEndPoint extends EnvelopRestEndpoint {
    public boolean delete(
            @ApiParam(name = "id", value = "编号", defaultValue = "")
            @RequestParam(value = "id") String id) throws Exception{
        qcDailyReportMetaDataService.delete(id);
        qcDailyReportMetaDataRepository.deleteById(id);
        return true;
    }

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

@@ -1,6 +1,7 @@
package com.yihu.jw.basic.report.controller;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.basic.report.dao.XQcQuotaDictRepository;
import com.yihu.jw.basic.report.service.QcQuotaDictService;
import com.yihu.ehr.constants.ApiVersion;
import com.yihu.ehr.constants.ServiceApi;
@@ -26,11 +27,10 @@ import java.util.List;
@Api(value = "QcQuotaDict", description = "数据统计指标", tags = {"数据统计指标"})
public class QcQuotaDictEndPoint extends EnvelopRestEndpoint {
    @Autowired
    ObjectMapper objectMapper;
    
    @Autowired
    QcQuotaDictService qcQuotaDictService;
    @Autowired
    private XQcQuotaDictRepository qcQuotaDictRepository;
    @RequestMapping(value = ServiceApi.Report.GetQcQuotaDictList, method = RequestMethod.GET)
    @ApiOperation(value = "根据查询条件查询数据统计指标")
@@ -79,8 +79,8 @@ public class QcQuotaDictEndPoint extends EnvelopRestEndpoint {
    @ApiOperation(value = "删除数据统计指标")
    public Envelop delete(
            @ApiParam(name = "id", value = "编号", defaultValue = "")
            @RequestParam(value = "id") String id) throws Exception{
        qcQuotaDictService.delete(id);
            @RequestParam(value = "id") Long id) throws Exception{
        qcQuotaDictRepository.deleteById(id);
        return success("统计指标删除成功！");
    }
}

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

@@ -1,6 +1,7 @@
package com.yihu.jw.basic.report.controller;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.basic.report.dao.XQcQuotaResultRepository;
import com.yihu.jw.basic.report.service.QcQuotaResultService;
import com.yihu.ehr.constants.ApiVersion;
import com.yihu.ehr.constants.ServiceApi;
@@ -37,6 +38,8 @@ public class QcQuotaResultEndPoint extends EnvelopRestEndpoint {
    @Autowired
    QcQuotaResultService qcQuotaResultService;
    @Autowired
    XQcQuotaResultRepository qcQuotaResultRepository;
    CalculatePointUtil calculatePointUtil=new CalculatePointUtil();
    @RequestMapping(value = ServiceApi.Report.GetQcQuotaResultList, method = RequestMethod.GET)
@@ -87,7 +90,7 @@ public class QcQuotaResultEndPoint extends EnvelopRestEndpoint {
    public Envelop delete(
            @ApiParam(name = "id", value = "编号", defaultValue = "")
            @RequestParam(value = "id") String id) throws Exception{
        qcQuotaResultService.delete(id);
        qcQuotaResultRepository.deleteById(id);
        return success("统计指标删除成功！");
    }

svr/svr-basic/src/main/java/com/yihu/jw/basic/report/dao/XQcQuotaDictRepository.java

@@ -8,6 +8,6 @@ import org.springframework.data.jpa.repository.JpaRepository;
 * @version 1.0
 * @created 2017/5/08
 */
public interface XQcQuotaDictRepository extends JpaRepository<QcQuotaDict, Integer> {
public interface XQcQuotaDictRepository extends JpaRepository<QcQuotaDict, Long> {
}

svr/svr-basic/src/main/java/com/yihu/jw/basic/report/dao/XQcQuotaResultRepository.java

@@ -13,7 +13,7 @@ import java.util.List;
 * @version 1.0
 * @created 2017/5/08
 */
public interface XQcQuotaResultRepository extends JpaRepository<QcQuotaResult, Integer> {
public interface XQcQuotaResultRepository extends JpaRepository<QcQuotaResult, String> {
    //按机构查询统计结果集
    @Query("select qc.orgCode,qc.orgName,qc.quotaId,qc.quotaName,sum(qc.totalNum),sum(qc.realNum),sum(qc.errorNum),sum(qc.timelyNum) from QcQuotaResult qc where qc.orgCode = :orgCode and qc.eventTime >= :startTime and qc.eventTime< :endTime group by qc.orgCode,qc.orgName,qc.quotaId,qc.quotaName ")

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

@@ -5,6 +5,7 @@ import com.yihu.jw.entity.ehr.report.QcDailyReportDataset;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.hibernate.Query;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -19,6 +20,9 @@ import java.util.List;
@Transactional
public class QcDailyReportDatasetService extends BaseJpaService<QcDailyReportDataset, XQcDailyReportDatasetRepository> {
    @Autowired
    private XQcDailyReportDatasetRepository qcDailyReportDatasetRepository;
    public int getListCount(String reportId) {
        Session session = currentSession();
        String hql = "select qcd from QcDailyReportDataset qcd where qcd.reportId =:reportId ";

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

@@ -23,6 +23,8 @@ import java.util.List;
public class QcDailyReportDatasetsService extends BaseJpaService<QcDailyReportDatasets, XQcDailyReportDatasetsRepository> {
    @Autowired
    private QcDailyReportDatasetService qcDailyReportDatasetService;
    @Autowired
    private XQcDailyReportDatasetsRepository qcDailyReportDatasetsRepository;
    public List<Object> getOrgDatasetsData(String orgCode, Date quotaDate) {
        Session session = currentSession();

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

@@ -5,6 +5,7 @@ import com.yihu.jw.entity.ehr.report.QcDailyReportMetadata;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.hibernate.Query;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -20,6 +21,9 @@ import java.util.List;
@Transactional
public class QcDailyReportMetadataService extends BaseJpaService<QcDailyReportMetadata, XQcDailyReportMetaDataRepository> {
    @Autowired
    private XQcDailyReportMetaDataRepository qcDailyReportMetaDataRepository;
    public List<Object> getOrgMeataData(String orgCode, Date quotaDate) {
        Session session = currentSession();
        String hql = "select qc.totalQty,qc.errorQty,qc.errCode " +

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

@@ -3,6 +3,7 @@ package com.yihu.jw.basic.report.service;
import com.yihu.jw.basic.report.dao.XQcQuotaDictRepository;
import com.yihu.jw.entity.ehr.report.QcQuotaDict;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -16,4 +17,6 @@ import org.springframework.transaction.annotation.Transactional;
public class QcQuotaDictService extends BaseJpaService<QcQuotaDict, XQcQuotaDictRepository> {
    @Autowired
    private XQcQuotaDictRepository qcQuotaDictRepository;
}

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

@@ -2,6 +2,7 @@ package com.yihu.jw.basic.resource.controller;
import com.yihu.ehr.constants.ServiceApi;
import com.yihu.ehr.constants.ApiVersion;
import com.yihu.jw.basic.resource.dao.RsAdapterDictionaryDao;
import com.yihu.jw.entity.ehr.resource.RsAdapterDictionary;
import com.yihu.jw.basic.resource.service.RsAdapterDictionaryService;
import com.yihu.jw.restmodel.ehr.resource.MRsAdapterDictionary;
@@ -33,6 +34,8 @@ public class RsAdapterDictionaryEndPoint extends EnvelopRestEndpoint {
    @Autowired
    private RsAdapterDictionaryService adapterDictionaryService;
    @Autowired
    private RsAdapterDictionaryDao adapterDictionaryDao;
    @RequestMapping(value = ServiceApi.Resources.AdapterDicts, method = RequestMethod.GET)
    @ApiOperation(value = "根据查询条件获取适配字典列表")
@@ -139,7 +142,7 @@ public class RsAdapterDictionaryEndPoint extends EnvelopRestEndpoint {
    public Envelop deleteRsAdapterDictionary(
            @ApiParam(name = "id", value = "id", defaultValue = "")
            @PathVariable(value = "id") String id) throws Exception {
        adapterDictionaryService.delete(id);
        adapterDictionaryDao.deleteById(id);
        return success("删除成功");
    }
@@ -151,7 +154,7 @@ public class RsAdapterDictionaryEndPoint extends EnvelopRestEndpoint {
    public Envelop deleteDictionary(
            @ApiParam(name = "id", value = "适配字典ID", defaultValue = "")
            @PathVariable(value = "id") String id) throws Exception {
        adapterDictionaryService.delete(id);
        adapterDictionaryDao.deleteById(id);
        return success("删除成功");
    }

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

@@ -3,6 +3,7 @@ package com.yihu.jw.basic.resource.controller;
import com.fasterxml.jackson.core.type.TypeReference;
import com.yihu.ehr.constants.ApiVersion;
import com.yihu.ehr.constants.ServiceApi;
import com.yihu.jw.basic.resource.dao.RsDictionaryDao;
import com.yihu.jw.restmodel.ehr.resource.MRsAdapterMetadata;
import com.yihu.jw.restmodel.ehr.resource.MRsDictionary;
import com.yihu.jw.restmodel.web.Envelop;
@@ -37,7 +38,8 @@ public class RsDictionaryEndPoint extends EnvelopRestEndpoint {
    @Autowired
    private RsDictionaryService dictionaryService;
    @Autowired
    private RsDictionaryDao dictionaryDao;
    @Autowired
    private RsDictionaryEntryService dictionaryEntryService;
@@ -102,7 +104,7 @@ public class RsDictionaryEndPoint extends EnvelopRestEndpoint {
            if (count != 0) {
                envelop.setMessage("该字典存在字典项，不可删除。");
            } else {
                dictionaryService.delete(id);
                dictionaryDao.deleteById(id);
                envelop.setStatus(200);
                envelop.setMessage("删除成功。");
            }

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

@@ -2,6 +2,7 @@ package com.yihu.jw.basic.resource.controller;
import com.yihu.ehr.constants.ServiceApi;
import com.yihu.ehr.constants.ApiVersion;
import com.yihu.jw.basic.resource.dao.RsDictionaryEntryDao;
import com.yihu.jw.restmodel.ehr.resource.MRsDictionaryEntry;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.entity.ehr.resource.RsDictionaryEntry;
@@ -28,6 +29,8 @@ import java.util.List;
public class RsDictionaryEntryEndPoint extends EnvelopRestEndpoint {
    @Autowired
    private RsDictionaryEntryService rsDictionaryEntryService;
    @Autowired
    private RsDictionaryEntryDao dictionaryEntryDao;
    @RequestMapping(value = ServiceApi.Resources.DictEntries, method = RequestMethod.GET)
    @ApiOperation(value = "根据查询条件获取标准字典项列表", notes = "根据查询条件获取标准字典项列表")
@@ -90,7 +93,7 @@ public class RsDictionaryEntryEndPoint extends EnvelopRestEndpoint {
    public boolean deleteRsDictionaryEntry(
            @ApiParam(name = "id", value = "id", defaultValue = "")
            @PathVariable(value = "id") int id) throws Exception {
        rsDictionaryEntryService.delete(id);
        dictionaryEntryDao.deleteById(id);
        return true;
    }

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

@@ -2,6 +2,7 @@ package com.yihu.jw.basic.resource.controller;
import com.yihu.ehr.constants.ServiceApi;
import com.yihu.ehr.constants.ApiVersion;
import com.yihu.jw.basic.resource.dao.RsInterfaceDao;
import com.yihu.jw.entity.ehr.resource.RsInterface;
import com.yihu.jw.basic.resource.service.RsInterfaceService;
import com.yihu.jw.restmodel.ehr.resource.MRsInterface;
@@ -30,6 +31,8 @@ public class RsInterfaceEndPoint extends EnvelopRestEndpoint {
    @Autowired
    private RsInterfaceService interfaceService;
    @Autowired
    private RsInterfaceDao rsInterfaceDao;
    @RequestMapping(value = ServiceApi.Resources.Interfaces, method = RequestMethod.GET)
    @ApiOperation(value = "根据查询条件获取资源列表", notes = "根据查询条件获取资源列表")
@@ -106,7 +109,7 @@ public class RsInterfaceEndPoint extends EnvelopRestEndpoint {
    public boolean deleteRsInterface(
            @ApiParam(name = "id", value = "id", defaultValue = "")
            @PathVariable(value = "id") String id) throws Exception {
        interfaceService.delete(id);
        rsInterfaceDao.deleteById(id);
        return true;
    }
}

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

@@ -2,6 +2,7 @@ package com.yihu.jw.basic.resource.controller;
import com.yihu.ehr.constants.ApiVersion;
import com.yihu.ehr.constants.ServiceApi;
import com.yihu.jw.basic.resource.dao.RsReportCategoryDao;
import com.yihu.jw.basic.resource.model.RsCategoryTypeTreeModel;
import com.yihu.jw.basic.resource.service.RsResourceCategoryService;
import com.yihu.jw.entity.ehr.resource.RsResourceCategory;
@@ -38,6 +39,8 @@ public class RsReportCategoryEndPoint extends EnvelopRestEndpoint {
    @Autowired
    private RsReportCategoryService rsReportCategoryService;
    @Autowired
    private RsReportCategoryDao rsReportCategoryDao;
    @Autowired
    private RsResourceCategoryService rsCategoryService;
    @ApiOperation("根据ID获取资源报表分类")
@@ -156,7 +159,7 @@ public class RsReportCategoryEndPoint extends EnvelopRestEndpoint {
    public void delete(
            @ApiParam(name = "id", value = "资源报表分类ID", required = true)
            @RequestParam(value = "id") Integer id) throws Exception {
        rsReportCategoryService.delete(id);
        rsReportCategoryDao.deleteById(id);
    }
    @ApiOperation("验证资源报表分类编码是否唯一")

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

@@ -4,6 +4,7 @@ import com.yihu.ehr.constants.ApiVersion;
import com.yihu.ehr.constants.ErrorCode;
import com.yihu.ehr.constants.ServiceApi;
import com.yihu.fastdfs.FastDFSUtil;
import com.yihu.jw.basic.resource.dao.RsReportDao;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.restmodel.ehr.resource.MRsReport;
import com.yihu.jw.restmodel.web.Envelop;
@@ -41,6 +42,8 @@ public class RsReportEndPoint extends EnvelopRestEndpoint {
    @Autowired
    private RsReportService rsReportService;
    @Autowired
    private RsReportDao rsReportDao;
    @Autowired
    private FastDFSUtil fastDFSUtil;
    @Autowired
    private RsReportCategoryService rsReportCategoryService;
@@ -106,7 +109,7 @@ public class RsReportEndPoint extends EnvelopRestEndpoint {
    public void delete(
            @ApiParam(name = "id", value = "资源报表ID", required = true)
            @RequestParam(value = "id") Integer id) throws Exception {
        rsReportService.delete(id);
        rsReportDao.deleteById(id);
    }
    @ApiOperation("验证资源报表编码是否唯一")

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

@@ -2,6 +2,7 @@ package com.yihu.jw.basic.resource.controller;
import com.yihu.ehr.constants.ServiceApi;
import com.yihu.ehr.constants.ApiVersion;
import com.yihu.jw.basic.resource.dao.RsResourceDefaultParamDao;
import com.yihu.jw.restmodel.ehr.resource.MResourceDefaultParam;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.entity.ehr.resource.RsResourceDefaultParam;
@@ -31,6 +32,8 @@ public class RsResourceDefaultParamsEndPoint extends EnvelopRestEndpoint {
    @Autowired
    private RsResourceDefaultParamService resourceDefaultParamService;
    @Autowired
    private RsResourceDefaultParamDao resourceDefaultParamDao;
    @RequestMapping(value = ServiceApi.Resources.ParamById,method = RequestMethod.GET)
    @ApiOperation("根据id获取参数信息")
@@ -69,7 +72,7 @@ public class RsResourceDefaultParamsEndPoint extends EnvelopRestEndpoint {
    public boolean deleteResourceDefaultParams(
            @ApiParam(name="id",value="资源默认参数id")
            @PathVariable(value="id") String id){
        resourceDefaultParamService.delete(id);
        resourceDefaultParamDao.deleteById(id);
        return true;
    }

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

@@ -2,6 +2,7 @@ package com.yihu.jw.basic.resource.controller;
import com.yihu.ehr.constants.ApiVersion;
import com.yihu.ehr.constants.ServiceApi;
import com.yihu.jw.basic.resource.dao.RsReportMonitorTypeDao;
import com.yihu.jw.restmodel.ehr.resource.MRsReportMonitorType;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
@@ -31,6 +32,8 @@ public class RsResourceMonitorTypeEndPoint extends EnvelopRestEndpoint {
    @Autowired
    private RsReportMonitorTypeService rsReportMonitorTypeService;
    @Autowired
    private RsReportMonitorTypeDao rsReportMonitorTypeDao;
    @ApiOperation("根据ID获取资源报表监测分类")
    @RequestMapping(value = ServiceApi.Resources.RsReportMonitorType, method = RequestMethod.GET)
@@ -65,7 +68,7 @@ public class RsResourceMonitorTypeEndPoint extends EnvelopRestEndpoint {
    public void delete(
            @ApiParam(name = "id", value = "资源报表监测分类ID", required = true)
            @RequestParam(value = "id") Integer id) throws Exception {
        rsReportMonitorTypeService.delete(id);
        rsReportMonitorTypeDao.deleteById(id);
    }
    @ApiOperation("验证资源报表监测分类名称是否唯一")

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

@@ -2,6 +2,7 @@ package com.yihu.jw.basic.resource.controller;
import com.yihu.ehr.constants.ServiceApi;
import com.yihu.ehr.constants.ApiVersion;
import com.yihu.jw.basic.resource.dao.RsSystemDictionaryDao;
import com.yihu.jw.entity.ehr.resource.RsSystemDictionary;
import com.yihu.jw.entity.ehr.resource.RsSystemDictionaryEntry;
import com.yihu.jw.basic.resource.service.RsSystemDictionaryEntryService;
@@ -32,6 +33,8 @@ public class RsSystemDictionaryEndPoint extends EnvelopRestEndpoint {
    @Autowired
    private RsSystemDictionaryService rsSystemDictionaryService;
    @Autowired
    private RsSystemDictionaryDao systemDictionaryDao;
    @Autowired
    private RsSystemDictionaryEntryService rsSystemDictionaryEntryService;
@@ -101,7 +104,7 @@ public class RsSystemDictionaryEndPoint extends EnvelopRestEndpoint {
        if(systemDictionaryEntries!=null && systemDictionaryEntries.size()!=0){
            throw new Exception("该字典包含字典项，不可删除");
        }
        rsSystemDictionaryService.delete(id);
        systemDictionaryDao.deleteById(id);
        return true;
    }

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

@@ -2,6 +2,7 @@ package com.yihu.jw.basic.resource.controller;
import com.yihu.ehr.constants.ServiceApi;
import com.yihu.ehr.constants.ApiVersion;
import com.yihu.jw.basic.resource.dao.RsSystemDictionaryEntryDao;
import com.yihu.jw.entity.ehr.resource.RsSystemDictionaryEntry;
import com.yihu.jw.basic.resource.service.RsSystemDictionaryEntryService;
import com.yihu.jw.restmodel.ehr.resource.MRsSystemDictionaryEntry;
@@ -29,6 +30,8 @@ import java.util.List;
public class RsSystemDictionaryEntryEndPoint extends EnvelopRestEndpoint {
    @Autowired
    private RsSystemDictionaryEntryService systemDictionaryEntryService;
    @Autowired
    private RsSystemDictionaryEntryDao systemDictionaryEntryDao;
    @RequestMapping(value = ServiceApi.Resources.SystemDictEntries, method = RequestMethod.GET)
    @ApiOperation(value = "根据查询条件获取系统字典项列表", notes = "根据查询条件获取系统字典项列表")
@@ -90,7 +93,7 @@ public class RsSystemDictionaryEntryEndPoint extends EnvelopRestEndpoint {
    public boolean deleteRsSystemDictionaryEntry(
            @ApiParam(name = "id", value = "id", defaultValue = "")
            @PathVariable(value = "id") String id) throws Exception {
        systemDictionaryEntryService.delete(id);
        systemDictionaryEntryDao.deleteById(id);
        return true;
    }

svr/svr-basic/src/main/java/com/yihu/jw/basic/user/controller/RolesEndPoint.java

@@ -1,5 +1,6 @@
package com.yihu.jw.basic.user.controller;
import com.yihu.jw.basic.user.dao.RolesDao;
import com.yihu.jw.entity.ehr.user.Roles;
import com.yihu.ehr.constants.ErrorCode;
import com.yihu.ehr.constants.ServiceApi;
@@ -39,6 +40,8 @@ public class RolesEndPoint extends EnvelopRestEndpoint {
    @Autowired
    private RolesService rolesService;
    @Autowired
    private RolesDao rolesRepository;
    @RequestMapping(value = ServiceApi.Roles.RoleBatchAdd, method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "批量新增角色组")
@@ -106,7 +109,7 @@ public class RolesEndPoint extends EnvelopRestEndpoint {
    public boolean deleteRoles(
            @ApiParam(name = "id", value = "角色组id")
            @PathVariable(value = "id") long id) {
        rolesService.delete(id);
        rolesRepository.deleteById(id);
        return true;
    }