1

sws

2023-01-14 5573ab68a6bf98014e6948d0c5ab538a90ce0ada

 src/main/java/com/lf/server/controller/show/MarkController.java

@@ -12,8 +12,8 @@
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.StringHelper;
import com.lf.server.helper.WebHelper;
import com.lf.server.service.all.BaseUploadService;
import com.lf.server.service.data.DownloadService;
import com.lf.server.service.data.UploaderService;
import com.lf.server.service.show.MarkService;
import com.lf.server.service.sys.DownlogService;
import com.lf.server.service.sys.TokenService;
@@ -43,7 +43,7 @@
    TokenService tokenService;

    @Autowired
    UploaderService uploaderService;
    BaseUploadService baseUploadService;

    @Autowired
    DownlogService downlogService;
@@ -227,14 +227,14 @@
    @ApiOperation(value = "上传ShapeFile文件")
    @ResponseBody
    @PostMapping(value = "/uploadShp", produces = "application/json; charset=UTF-8")
    public ResponseMsg<List<MarkJsonEntity>> uploadShp(HttpServletRequest req, HttpServletResponse res) {
    public ResponseMsg<Object> uploadShp(HttpServletRequest req, HttpServletResponse res) {
        try {
            UserEntity ue = tokenService.getCurrentUser(req);
            if (ue == null) {
                return fail("用户未登录", null);
            }

            List<MetaFileEntity> meList = uploaderService.uploadData(null, null, req, res);
            List<MetaFileEntity> meList = baseUploadService.uploadData(null, null, req, res);
            if (meList == null || meList.size() < StaticData.FOUR) {
                return fail("没有找到已上传的数据或不完整", null);
            }