修改代码

ace-common/src/main/java/com/github/wxiaoqi/security/common/biz/BaseBiz.java

@@ -131,7 +131,6 @@ public abstract class BaseBiz<M extends Mapper<T>, T> {
         return mapper.select(entity);
     }
 
-
     public List<T> selectListAll() {
         return mapper.selectAll();
     }

rs-datacenter/rs-datacenter-api/src/main/java/com/upyuns/platform/rs/datacenter/entity/RscpStorageJson.java

+package com.upyuns.platform.rs.datacenter.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import tk.mybatis.mapper.annotation.KeySql;
+
+import javax.persistence.Column;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Data
+@Table(name = "rscp_storage_json")
+@ApiModel(description = "")
+public class RscpStorageJson implements java.io.Serializable {
+    /** 版本号 */
+    private static final long serialVersionUID = -6625661497803837040L;
+
+    public static final int STATU_DEFAULT = 1;
+
+    /* This code was generated by TableGo tools, mark 1 begin. */
+
+    /** id */
+    @Id
+    @KeySql(useGeneratedKeys = true)
+    @Column(name = "id",insertable = false)
+    @ApiModelProperty(value = "")
+    private Long id;
+
+    /** 创建时间 */
+    @ApiModelProperty(value = "创建时间")
+    private Long crtTime;
+
+    /** 更新时间 */
+    @ApiModelProperty(value = "更新时间")
+    private Long updTime;
+
+    /** 状态 */
+    @ApiModelProperty(value = "状态")
+    private Integer status;
+
+    /** json文本 */
+    @ApiModelProperty(value = "json文本")
+    private String contextJson;
+
+    /** json文本 */
+    @ApiModelProperty(value = "用户Id")
+    private String userId;
+
+
+    @ApiModelProperty(value = "逻辑删除")
+    private Integer isDel;
+
+    /* This code was generated by TableGo tools, mark 1 end. */
+
+    /* This code was generated by TableGo tools, mark 2 begin. */
+}
\ No newline at end of file

rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/biz/RscpImageDataTotalBiz.java

@@ -323,8 +323,7 @@ public class RscpImageDataTotalBiz extends BaseBiz<RscpImageDataTotalMapper, Rsc
             String targetFile = targetPath + rscpImageDataTotal.getName()+".tar.gz";
             Map<String, Object> copyMap = gtDataRestClient.copy(sourceFile, targetFile);
             if (200 != (Integer) copyMap.get("HttpStatusCode") && 2002 != (Integer) ((Map<String, Object>) copy0Map.get("GTDataException")).get("errorCode")) {
-                log.warn(MessageFormat
-                        .format("Copy data file({0}) to {1}... Fail!Code: {2} Message: {3}",
+                log.warn(MessageFormat.format("Copy data file({0}) to {1}... Fail!Code: {2} Message: {3}",
                                 sourcePath,
                                 targetPath,
                                 copyMap.get("result"),

rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/biz/RscpStorageJsonBiz.java

+package com.upyuns.platform.rs.datacenter.biz;
+
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.upyuns.platform.rs.datacenter.entity.RscpImageInputLog;
+import com.upyuns.platform.rs.datacenter.entity.RscpStorageJson;
+import com.upyuns.platform.rs.datacenter.mapper.RscpImageInputLogMapper;
+import com.upyuns.platform.rs.datacenter.mapper.RscpStorageJsonMapper;
+import org.springframework.stereotype.Service;
+
+@Service
+public class RscpStorageJsonBiz extends BaseBiz<RscpStorageJsonMapper, RscpStorageJson> {
+
+}

rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/mapper/RscpStorageJsonMapper.java

+package com.upyuns.platform.rs.datacenter.mapper;
+
+import com.upyuns.platform.rs.datacenter.entity.RscpStorageJson;
+import tk.mybatis.mapper.common.Mapper;
+
+public interface RscpStorageJsonMapper extends Mapper<RscpStorageJson> {
+
+}
\ No newline at end of file

rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/rest/RscpImageDataTotalController.java

@@ -107,6 +107,19 @@ public class RscpImageDataTotalController extends BaseController<RscpImageDataTo
         return ObjectRestResponse.succ();
     }
 
+//    @RequestMapping(value = "/storageJson", method = RequestMethod.POST)
+//    public ObjectRestResponse storageJson(@RequestBody StorageJsonDTO storageJsonDTO) {
+//
+//        vo.clearBracket();
+//        baseBiz.inStorage(vo);
+//        return ObjectRestResponse.succ();
+//    }
+//
+//    @Data
+//    public class StorageJsonDTO {
+//        String json;
+//    }
+
 //   resolution
 //	     分辨率
 //	 spectrum

rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/rest/RscpStorageJsonController.java

+package com.upyuns.platform.rs.datacenter.rest;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.github.wxiaoqi.security.common.util.AssertUtils;
+import com.github.wxiaoqi.security.common.util.Query;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.github.wxiaoqi.security.common.vo.PageParam;
+import com.upyuns.platform.rs.datacenter.biz.*;
+import com.upyuns.platform.rs.datacenter.entity.RscpImageDataTotal;
+import com.upyuns.platform.rs.datacenter.entity.RscpImageInputLog;
+import com.upyuns.platform.rs.datacenter.entity.RscpImagePrice;
+import com.upyuns.platform.rs.datacenter.entity.RscpStorageJson;
+import com.upyuns.platform.rs.datacenter.fegin.RscloudboxClientRest;
+import com.upyuns.platform.rs.datacenter.pojo.ImageDataVO;
+import com.upyuns.platform.rs.datacenter.pojo.ImagePageFeginDTO;
+import com.upyuns.platform.rs.datacenter.pojo.imagedata.QueryDTO;
+import com.upyuns.platform.rs.datacenter.vo.ImageInputVO;
+import com.upyuns.platform.rs.gtdata.GtDataRestClient;
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE;
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
+
+@RestController
+@RequestMapping("/web/rscpStorageJson")
+public class RscpStorageJsonController extends BaseController<RscpStorageJsonBiz, RscpStorageJson> {
+
+    @RequestMapping(value = "/save", method = RequestMethod.POST)
+    public ObjectRestResponse save(@RequestBody RscpStorageJson rscpStorageJson) {
+
+        AssertUtils.isBlank(rscpStorageJson);
+        AssertUtils.isBlank(rscpStorageJson.getContextJson());
+
+        rscpStorageJson.setUserId(getCurrentUserId());
+        //判断会否存在
+        List<RscpStorageJson> dbList = baseBiz.selectList(new RscpStorageJson(){{
+            setUserId(getCurrentUserId());
+            setIsDel(SYS_FALSE);
+        }});
+
+        if(CollUtil.isNotEmpty(dbList)) {
+            rscpStorageJson.setId(dbList.get(0).getId());
+            baseBiz.updateSelectiveById(rscpStorageJson);
+        }else {
+            baseBiz.insertSelective(rscpStorageJson);
+        }
+        return ObjectRestResponse.succ();
+    }
+
+    @RequestMapping(value = "/detail", method = RequestMethod.GET)
+    public ObjectRestResponse detail(RscpStorageJson rscpStorageJson) {
+
+        AssertUtils.isBlank(rscpStorageJson);
+        AssertUtils.isBlank(rscpStorageJson.getId());
+
+        //判断会否存在
+        List<RscpStorageJson> dbList = baseBiz.selectList(new RscpStorageJson(){{
+            setUserId(getCurrentUserId());
+            setId(rscpStorageJson.getId());
+            setIsDel(SYS_FALSE);
+        }});
+
+        if(CollUtil.isNotEmpty(dbList)) {
+            return ObjectRestResponse.succ(dbList.get(0));
+        }else {
+            return ObjectRestResponse.succ();
+        }
+    }
+
+}
\ No newline at end of file

rs-datacenter/rs-datacenter-server/src/main/resources/mapper/RscpStorageJsonMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<!-- rscp_image_input_log -->
+<mapper namespace="com.upyuns.platform.rs.datacenter.mapper.RscpStorageJsonMapper">
+    <!-- This code was generated by TableGo tools, mark 1 begin. -->
+    <!-- 字段映射 -->
+    <resultMap id="rscpImageInputLogMap" type="com.upyuns.platform.rs.datacenter.entity.RscpStorageJson">
+        <id column="id" property="id" jdbcType="INTEGER" />
+        <result column="crt_time" property="crtTime" jdbcType="INTEGER" />
+        <result column="upd_time" property="updTime" jdbcType="INTEGER" />
+        <result column="status" property="status" jdbcType="INTEGER" />
+        <result column="context_json" property="contextJson" jdbcType="VARCHAR" />
+        <result column="user_id" property="userId" jdbcType="INTEGER" />
+    </resultMap>
+    <!-- This code was generated by TableGo tools, mark 1 end. -->
+    
+    <!-- This code was generated by TableGo tools, mark 2 begin. -->
+    <!-- 表查询字段 -->
+    <sql id="allColumns">
+        riil.id, riil.crt_time, riil.upd_time, riil.status, riil.context_json
+    </sql>
+    <!-- This code was generated by TableGo tools, mark 2 end. -->
+    
+</mapper>
\ No newline at end of file