修改发布控制器的接口

13693261870

2023-09-02 edcf06f395234fb1b2f34e4da3cf3539572c20d7

修改发布控制器的接口

 src/main/java/com/moon/server/controller/data/PublishController.java

@@ -8,7 +8,6 @@
import com.moon.server.entity.data.PublishEntity;
import com.moon.server.entity.sys.UserEntity;
import com.moon.server.helper.StringHelper;
import com.moon.server.helper.WebHelper;
import com.moon.server.service.all.PermsService;
import com.moon.server.service.data.PublishService;
import com.moon.server.service.data.ShuJianService;
@@ -22,7 +21,6 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.List;

/**
@@ -172,104 +170,90 @@
            @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", example = "10"),
            @ApiImplicitParam(name = "pageIndex", value = "分页数（从1开始）", dataType = "int", paramType = "query", example = "1")
    })
    @GetMapping(value = "/selectColorTables")
    public void selectColorTables(int pageSize, int pageIndex, HttpServletRequest req, HttpServletResponse res) {
    @GetMapping(value = "/selectSjColorTables")
    public void selectSjColorTables(int pageSize, int pageIndex, HttpServletRequest req, HttpServletResponse res) {
        pageIndex = Math.max(pageIndex, 1);
        pageSize = Math.max(pageSize, 5);

        shuJianService.selectColorTables(pageSize, pageIndex, req, res);
        shuJianService.selectSjColorTables(pageSize, pageIndex, req, res);
    }

    @SysLog()
    @ApiOperation(value = "插入发布数据")
    @ApiOperation(value = "插入数简服务")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "entity", value = "实体类", dataType = "PubEntity", paramType = "body")
    })
    @PostMapping(value = "/insertForPub", produces = "application/json; charset=UTF-8")
    public ResponseMsg<Object> insertForPub(@RequestBody PubEntity entity, HttpServletRequest req) {
    @ResponseBody
    @PostMapping(value = "/insertSjService", produces = "application/json; charset=UTF-8")
    public ResponseMsg<Object> insertSjService(@RequestBody PubEntity entity, HttpServletRequest req, HttpServletResponse res) {
        try {
            if (null == entity || null == entity.getIds() || entity.getIds().isEmpty()) {
                return fail("实体类为空或找不到元数据ID", 0);
            }
            if (StringHelper.isEmpty(entity.getType())) {
                return fail("数据类别为空", null);
                return fail("发布类别为空", null);
            }

            UserEntity ue = tokenService.getCurrentUser(req);
            if (ue != null) {
            if (null != ue) {
                entity.setUserId(ue.getId());
                entity.setDepcode(ue.getDepcode());
            }

            permsService.clearPermsCache();
            // String method = getConvertMethod(entity.getType())
            long count = publishService.postForPub(entity, "", req);
            Integer rows = shuJianService.insertSjService(entity, req, res);

            return success(count);
            return success(rows);
        } catch (Exception ex) {
            return fail(ex.getMessage(), -1);
        }
    }

    @SysLog()
    @ApiOperation(value = "发布数简服务")
    @ApiOperation(value = "更新数简服务")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "entity", value = "实体类", dataType = "PubEntity", paramType = "body")
    })
    public ResponseMsg<Object> insertShuJianService(@RequestBody PubEntity entity, HttpServletRequest req) {
    @ResponseBody
    @PostMapping(value = "/updateSjService", produces = "application/json; charset=UTF-8")
    public ResponseMsg<Object> updateSjService(@RequestBody PubEntity entity, HttpServletRequest req, HttpServletResponse res) {
        try {
            if (null == entity || null == entity.getIds() || entity.getIds().isEmpty()) {
                return fail("实体类为空或找不到元数据ID", 0);
            if (null == entity || null == entity.getPubid()) {
                return fail("实体类为空或发布ID为空", 0);
            }
            if (StringHelper.isEmpty(entity.getType())) {
                return fail("发布类别为空", null);
            }

            return success(null);
            UserEntity ue = tokenService.getCurrentUser(req);
            if (null != ue) {
                entity.setUserId(ue.getId());
                entity.setDepcode(ue.getDepcode());
            }

            permsService.clearPermsCache();
            Integer rows = shuJianService.updateSjService(entity, req, res);

            return success(rows);
        } catch (Exception ex) {
            return fail(ex.getMessage(), -1);
        }
    }

    @SysLog()
    @ApiOperation(value = "删除多条")
    @ApiOperation(value = "删除数简服务")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "ids", value = "ID数组", dataType = "Integer", paramType = "query", allowMultiple = true, example = "1")
    })
    @GetMapping(value = "/deletes")
    public ResponseMsg<Integer> deletes(@RequestParam List<Integer> ids, HttpServletRequest req) {
    public ResponseMsg<Integer> deletesSjServices(@RequestParam List<Integer> ids) {
        try {
            if (ids == null || ids.isEmpty()) {
            if (null == ids || ids.isEmpty()) {
                return fail("id数组不能为空", -1);
            }

            String strs = StringHelper.join(ids, ",");
            List<PublishEntity> list = publishService.selectByIds(strs);
            if (null == list || list.isEmpty()) {
                return fail("没有找到要删除的数据", -1);
            }

            permsService.clearPermsCache();
            int count = publishService.deletes(ids, req);

            return success(count);
        } catch (Exception ex) {
            return fail(ex.getMessage(), -1);
        }
    }

    @SysLog()
    @ApiOperation(value = "更新一条")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "entity", value = "实体类", dataType = "PublishEntity", paramType = "body")
    })
    @ResponseBody
    @PostMapping(value = "/update", produces = "application/json; charset=UTF-8")
    public ResponseMsg<Integer> update(@RequestBody PublishEntity entity, HttpServletRequest req) {
        try {
            UserEntity ue = tokenService.getCurrentUser(req);
            if (ue != null) {
                entity.setUpdateUser(ue.getId());
            }

            permsService.clearPermsCache();
            int count = publishService.update(entity);
            int count = shuJianService.deletesSjServices(ids);

            return success(count);
        } catch (Exception ex) {

 src/main/java/com/moon/server/service/data/PublishService.java

@@ -33,9 +33,6 @@
    @Resource
    PublishMapper publishMapper;

    @Resource
    ShuJianService shuJianService;

    private final static Log log = LogFactory.getLog(PublishService.class);

    @Override
@@ -169,40 +166,6 @@
        }

        return map;
    }

    /**
     * 获取服务类型
     */
    private String getServerType(PublishEntity entity) {
        switch (entity.getType()) {
            case "DOM":
                return "TMS服务";
            case "DEM":
                return "三维地形服务";
            case "mpt":
                return "三维场景服务";
            case "las":
            case "laz":
            case "cpt":
                return "三维点云服务";
            default:
                return "三维模型服务";
        }
    }

    /**
     * 删除多条
     */
    public Integer deletes(List<Integer> idList, HttpServletRequest req) {
        String ids = StringHelper.join(idList, ",");

        List<PublishEntity> list = selectByIds(ids);
        for (PublishEntity entity : list) {
            shuJianService.deleteServe(entity);
        }

        return deletes(ids);
    }

    /**

 src/main/java/com/moon/server/service/data/ShuJianService.java

@@ -1,6 +1,7 @@
package com.moon.server.service.data;

import com.moon.server.entity.all.StaticData;
import com.moon.server.entity.ctrl.PubEntity;
import com.moon.server.entity.data.PublishEntity;
import com.moon.server.entity.shujian.CreateLayerEntity;
import com.moon.server.entity.shujian.CreateServiceEntity;
@@ -12,6 +13,7 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
@@ -30,10 +32,13 @@
    @Value("${shujian.url}")
    private String sjUrl;

    @Resource
    PublishService publishService;

    /**
     * 分页查询数简的颜色表
     */
    public void selectColorTables(Integer pageSize, Integer pageIndex, HttpServletRequest req, HttpServletResponse res) {
    public void selectSjColorTables(Integer pageSize, Integer pageIndex, HttpServletRequest req, HttpServletResponse res) {
        try {
            String url = String.format("%s/sj_raster/v6/api/color_table?%s&page_count=%d&page_num=%d&key=", sjUrl, ak, pageSize, pageIndex);

@@ -42,6 +47,24 @@
        } catch (Exception ex) {
            log.error(ex.getMessage(), ex);
        }
    }

    /**
     * 插入数简服务
     */
    public Integer insertSjService(PubEntity entity, HttpServletRequest req, HttpServletResponse res) {
        //

        return 1;
    }

    /**
     * 插入数简服务
     */
    public Integer updateSjService(PubEntity entity, HttpServletRequest req, HttpServletResponse res) {
        //

        return 1;
    }

    /**
@@ -95,17 +118,29 @@
    /**
     * 删除数简服务
     */
    public void deleteServe(PublishEntity entity) {
        if (null != entity.getLayerid()) {
            deleteLayer(entity.getLayerid());
    public Integer deletesSjServices(List<Integer> ids) {
        String strs = StringHelper.join(ids, ",");

        List<PublishEntity> list = publishService.selectByIds(strs);
        if (null == list || list.isEmpty()) {
            return 0;
        }
        if (null != entity.getServiceid()) {
            deleteService(entity.getServiceid());

        for (PublishEntity entity : list) {
            if (null != entity.getLayerid()) {
                deleteLayer(entity.getLayerid());
            }

            if (null != entity.getServiceid()) {
                deleteService(entity.getServiceid());
            }
        }

        return publishService.deletes(strs);
    }

    /**
     * 删除数简图层
     * 删除图层
     */
    public void deleteLayer(Integer id) {
        try {
@@ -119,7 +154,7 @@
    }

    /**
     * 删除数简图层
     * 删除服务
     */
    public void deleteService(Integer id) {
        try {