wangming 1 рік тому
батько
коміт
1623d25de5

+ 15 - 0
business-common/src/main/java/com/rongwei/bscommon/sys/service/CommonInterfaceService.java

@@ -3,6 +3,7 @@ package com.rongwei.bscommon.sys.service;
 import cn.hutool.json.JSONObject;
 import com.rongwei.bsentity.dto.CommonInterfaceRequest;
 import com.rongwei.rwcommon.vo.ColumnQueryType;
+import com.rongwei.rwcommon.vo.generalsql.MasterSlaveUpdateVo;
 
 import java.util.List;
 import java.util.Map;
@@ -23,4 +24,18 @@ public interface CommonInterfaceService {
      * @param json
      */
     void commonBaseWrite(CommonInterfaceRequest<List<JSONObject>> json);
+
+    /**
+     * 保存通用接口
+     *
+     * @param saveData
+     */
+    void insertSave(String saveData);
+
+    /**
+     * 更新通用接口
+     *
+     * @param saveData
+     */
+    void updateSave(String saveData);
 }

+ 62 - 0
business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/CommonInterfaceServiceImpl.java

@@ -3,6 +3,7 @@ package com.rongwei.bscommon.sys.service.impl;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.crypto.SecureUtil;
 import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.rongwei.bscommon.sys.service.CommonInterfaceService;
@@ -16,12 +17,15 @@ import com.rongwei.bsentity.dto.InterfaceCommonSqlPropertyDto;
 import com.rongwei.bsentity.dto.InterfaceWriteParamDto;
 import com.rongwei.commonservice.service.dao.CommonSqlDao;
 import com.rongwei.rwadmincommon.system.dao.SysGeneralCRUDDao;
+import com.rongwei.rwadmincommon.system.service.SysGeneralCRUDService;
 import com.rongwei.rwadmincommon.system.vo.SysUserVo;
 import com.rongwei.rwcommon.base.exception.CustomException;
 import com.rongwei.rwcommon.utils.SecurityUtil;
 import com.rongwei.rwcommon.utils.StringUtils;
 import com.rongwei.rwcommon.vo.ColumnQueryType;
 import com.rongwei.rwcommon.vo.CriteriaBuilder;
+import com.rongwei.rwcommon.vo.generalsql.MasterSlaveInsertVo;
+import com.rongwei.rwcommon.vo.generalsql.MasterSlaveUpdateVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -30,6 +34,8 @@ import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.support.DefaultTransactionDefinition;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
 import java.util.*;
 
 @Service
@@ -48,6 +54,8 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService {
     private CommonSqlDao commonSqlDao;
     @Autowired
     private ZhcxCommon zhcxCommon;
+    @Autowired
+    private SysGeneralCRUDService generalCRUDService;
 
     /**
      * 基础查询
@@ -78,6 +86,60 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService {
         executeBaseWrite(json, interfaceInfo);
     }
 
+    /**
+     * 保存通用接口
+     *
+     * @param saveData
+     */
+    @Override
+    public void insertSave(String saveData) {
+        //解码
+        String decodeStr = decoderByBase64(saveData);
+        MasterSlaveInsertVo insertVo = JSONUtil.toBean(decodeStr, MasterSlaveInsertVo.class);
+        try {
+            generalCRUDService.generalMsInsert(insertVo);
+        } catch (Exception e) {
+            log.error("保存失败, {}", e);
+            throw new CustomException("保存失败");
+        }
+    }
+
+    /**
+     * 更新通用接口
+     *
+     * @param saveData
+     */
+    @Override
+    public void updateSave(String saveData) {
+        //解码
+        String decodeStr = decoderByBase64(saveData);
+        MasterSlaveUpdateVo updateVo = JSONUtil.toBean(decodeStr, MasterSlaveUpdateVo.class);
+        try {
+            generalCRUDService.generalMsUpdate(updateVo);
+        } catch (Exception e) {
+            log.error("保存失败, {}", e);
+            throw new CustomException("保存失败");
+        }
+    }
+
+    /**
+     * base64解码
+     *
+     * @param encoderData
+     * @return
+     */
+    private String decoderByBase64(String encoderData) {
+        Base64.Decoder decoder = Base64.getDecoder();
+        try {
+            String decode = new String(decoder.decode(encoderData), "UTF-8");
+            return URLDecoder.decode(decode, "utf-8");
+        } catch (UnsupportedEncodingException e) {
+            log.error("解析失败, {}", e);
+            throw new CustomException("解析失败");
+        }
+
+    }
+
     /**
      * 验签
      *

+ 3 - 3
business-common/src/main/java/com/rongwei/bscommon/sys/utils/CodeGeneration.java

@@ -30,7 +30,7 @@ public class CodeGeneration {
         //全局配置
         GlobalConfig gc = new GlobalConfig();
         //生成文件输出根目录
-        gc.setOutputDir("E:\\temp");
+        gc.setOutputDir("D:\\temp");
         //生成完成后不弹出文件框
         gc.setOpen(false);
         gc.setFileOverride(true);  //文件覆盖
@@ -38,7 +38,7 @@ public class CodeGeneration {
         gc.setEnableCache(false);// XML 二级缓存
         gc.setBaseResultMap(true);// XML ResultMap
         gc.setBaseColumnList(false);// XML columList
-        gc.setAuthor("fpy");// 作者
+        gc.setAuthor("wm");// 作者
         gc.setDateType(DateType.ONLY_DATE);
 
         // 自定义文件命名,注意 %s 会自动填充表实体属性!
@@ -85,7 +85,7 @@ public class CodeGeneration {
         strategy.setSuperEntityClass(BaseDo.class);
         strategy.setRestControllerStyle(true);
         // 设置要映射的表名(重要,需要修改的地方)
-        strategy.setInclude("ZHCX_SUPERVISION_CUSTOM_USER_MANAGE");
+        strategy.setInclude("ZHCX_INTERFACE_INFORMATION_GET_PARAM");
         strategy.setNaming(NamingStrategy.underline_to_camel); // 自动转换表名的驼峰命名法
         strategy.setColumnNaming(NamingStrategy.no_change); // 自动转换列名的驼峰命名法
         strategy.setEntityLombokModel(true); // 是否使用lombox

+ 24 - 0
business-server/src/main/java/com/rongwei/bsserver/controller/CommonInterfaceController.java

@@ -47,4 +47,28 @@ public class CommonInterfaceController {
         commonInterfaceService.commonBaseWrite(json);
         return R.ok();
     }
+
+    /**
+     * 保存
+     *
+     * @param data
+     * @return
+     */
+    @RequestMapping("insert")
+    public R commonInsert(@RequestBody Map<String, String> data) {
+        commonInterfaceService.insertSave(data.get("data"));
+        return R.ok();
+    }
+
+    /**
+     * 更新
+     *
+     * @param data
+     * @return
+     */
+    @RequestMapping("update")
+    public R commonUpdate(@RequestBody Map<String, String> data) {
+        commonInterfaceService.updateSave(data.get("data"));
+        return R.ok();
+    }
 }