代码修改

svr/svr-basic/src/main/java/com/yihu/jw/basic/agadmin/controller/app/AppController.java

@@ -85,7 +85,7 @@ public class AppController extends EnvelopRestEndpoint {
        String url = "/apps";
        String resultStr = "";
        try {
            List<App> appList = appService.search(null, filters.toString(), "createTime", page, rows);
            List<App> appList = appService.search(null, filters.toString(), "-createTime", page, rows);
            return PageEnvelop.getSuccessListWithPage("查询成功",appList,page,rows,appService.getCount(filters.toString()));
        } catch (Exception e) {
            e.printStackTrace();

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

@@ -113,9 +113,6 @@ public class TjQuotaController extends EnvelopRestEndpoint {
    /**
     * 新增修改
     * @param tjQuotaModelJsonData
     * @return
     * @throws IOException
     */
    @PostMapping(value = "updateTjDataSource")
    public ObjEnvelop updateTjQuota(String tjQuotaModelJsonData) {
@@ -182,9 +179,6 @@ public class TjQuotaController extends EnvelopRestEndpoint {
    /**
     * 删除
     *
     * @param tjQuotaId
     * @return
     */
    @PostMapping("deleteTjDataSave")
    public Envelop deleteTjQuota(Long tjQuotaId) {
@@ -208,8 +202,6 @@ public class TjQuotaController extends EnvelopRestEndpoint {
    /**
     * 根据id获取消息
     * @param id
     * @return
     */
    @GetMapping("getTjQuotaById")
    public Envelop getTjQuotaById(Long id) {
@@ -239,9 +231,6 @@ public class TjQuotaController extends EnvelopRestEndpoint {
    /**
     * 校验name是否唯一,true已存在
     *
     * @param name
     * @return
     */
    @GetMapping("hasExistsName")
    public Envelop hasExistsName(String name) {
@@ -251,16 +240,13 @@ public class TjQuotaController extends EnvelopRestEndpoint {
            List<TjQuota> list = tjQuotaService.search(filter);
            return ObjEnvelop.getSuccess("查询成功",list.size() >0);
        } catch (Exception e) {
            e.getMessage();
            e.printStackTrace();
        }
        return  failed("查询失败");
        return failed("查询失败");
    }
    /**
     * 校验code是否唯一
     *
     * @param code
     * @return
     */
    @GetMapping("hasExistsCode")
    public Envelop hasExistsCode(String code) {
@@ -316,9 +302,6 @@ public class TjQuotaController extends EnvelopRestEndpoint {
    /**
     * 指标结果页
     *
     * @param model
     * @return
     */
    @GetMapping("initialResult")
    public Envelop initialResult(Model model, long tjQuotaId, String quotaCode, String quotaType, String name) throws Exception {
@@ -345,9 +328,6 @@ public class TjQuotaController extends EnvelopRestEndpoint {
    /**
     * 指标执行结果
     *
     * @param tjQuotaId
     * @return
     */
    @GetMapping("selectQuotaResult")
    public Envelop selectQuotaResult(Long tjQuotaId, int page, int rows,
@@ -404,9 +384,6 @@ public class TjQuotaController extends EnvelopRestEndpoint {
    /**
     * 获取指标日志信息
     *
     * @param
     * @return
     */
    @GetMapping("queryQuotaLog")
    public Envelop queryQuotaLog(String quotaCode, String startTime, String endTime, int page, int rows) throws Exception {
@@ -459,9 +436,6 @@ public class TjQuotaController extends EnvelopRestEndpoint {
    /**
     * 获取quotaCode查询是否配置维度
     *
     * @param
     * @return
     */
    @GetMapping("hasConfigDimension")
    public Envelop hasConfigDimension(String quotaCode) throws Exception {
@@ -580,11 +554,6 @@ public class TjQuotaController extends EnvelopRestEndpoint {
    /**
     * 添加主维度子表
     *
     * @param jsonModel 维度子表信息的json串
     * @param request
     * @return
     * @throws IOException
     */
    @PostMapping(value = "addTjQuotaChart")
    public Envelop addTjQuotaChart(String quotaCode, String jsonModel, HttpServletRequest request) throws IOException {
@@ -606,12 +575,6 @@ public class TjQuotaController extends EnvelopRestEndpoint {
    /**
     * 指标文件导入
     *
     * @param file
     * @param request
     * @param response
     * @return
     * @throws IOException
     */
    private static final String parentFile = "tjQuotaDataSet";
@@ -868,9 +831,6 @@ public class TjQuotaController extends EnvelopRestEndpoint {
    /**
     * 根据指标分类的名称获取指标id和name
     *
     * @param names 指标分类名称
     * @return
     * @throws Exception
     */
    private Map<String, String> findExistQuotaType(Set<String> names) throws Exception {
        Map<String, String> map = new HashMap<>();

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

@@ -1,5 +1,6 @@
package com.yihu.jw.basic.agadmin.controller.resource;
import com.yihu.jw.basic.resource.dao.RsResourceMetadataDao;
import com.yihu.jw.basic.resource.service.RsMetadataService;
import com.yihu.jw.basic.resource.service.RsResourceMetadataService;
import com.yihu.jw.entity.ehr.id.BizObject;
@@ -33,6 +34,8 @@ public class ResourceConfigurationController extends EnvelopRestEndpoint {
    @Autowired
    private RsResourceMetadataService rsMetadataService;
    @Autowired
    private RsResourceMetadataDao rsMetadataDao;
    @Autowired
    private RsMetadataService metadataService;
    @RequestMapping("searchResourceConfiguration")
@@ -116,7 +119,7 @@ public class ResourceConfigurationController extends EnvelopRestEndpoint {
    }
    @RequestMapping("/saveResourcConfiguration")
    @RequestMapping("/saveResourceConfiguration")
    public Envelop saveResourceConfiguration(String addRowDatas, String delRowDatas) {
        Map<String, Object> params = new HashMap<>();
        String resultStr = "";
@@ -124,7 +127,7 @@ public class ResourceConfigurationController extends EnvelopRestEndpoint {
        try {
            if (!StringUtils.isEmpty(delRowDatas)) {
                //执行删除操作
                rsMetadataService.delete(delRowDatas);
                rsMetadataDao.deleteById(delRowDatas);
                return success("删除成功");
            }
            if (!StringUtils.isEmpty(addRowDatas)) {