Explorar el Código

修改建表语句及接口加上过期标记

lijie hace 3 años
padre
commit
34acc21ded

+ 5 - 0
dmp-business/dmp-dic/src/main/java/com/persagy/dmp/dic/controller/DictDataController.java

@@ -31,6 +31,7 @@ public class DictDataController {
     @Autowired
     private DictDataService service;
 
+    @Deprecated
     @PostMapping("/query")
     public CommonResult<List<DictData>> query(@RequestBody QueryCriteria criteria) {
         if(criteria == null) {
@@ -43,24 +44,28 @@ public class DictDataController {
         return ResultHelper.multi(page.getRecords(), page.getTotal());
     }
 
+    @Deprecated
     @PostMapping("/create")
     public CommonResult<DictData> create(@RequestBody DictData vo){
         vo = service.insert(vo);
         return ResultHelper.single(vo);
     }
 
+    @Deprecated
     @PostMapping("/update")
     public CommonResult<DictData> update(@RequestBody DictData vo){
         vo = service.update(vo);
         return ResultHelper.single(vo);
     }
 
+    @Deprecated
     @PostMapping("/delete")
     public CommonResult<DictData> delete(@RequestBody DictData vo){
         service.delete(vo);
         return ResultHelper.success();
     }
 
+    @Deprecated
     @PostMapping("/result")
     public CommonResult<List<DictData>> query(@RequestBody DictType dictType) {
         if(dictType == null) {

+ 4 - 0
dmp-business/dmp-dic/src/main/java/com/persagy/dmp/dic/controller/DictDataMapController.java

@@ -30,6 +30,7 @@ public class DictDataMapController {
     @Autowired
     private DictDataMapService service;
 
+    @Deprecated
     @PostMapping("/query")
     public CommonResult<List<DictDataMap>> query(@RequestBody QueryCriteria criteria) {
         if(criteria == null) {
@@ -42,18 +43,21 @@ public class DictDataMapController {
         return ResultHelper.multi(page.getRecords(), page.getTotal());
     }
 
+    @Deprecated
     @PostMapping("/create")
     public CommonResult<DictDataMap> create(@RequestBody DictDataMap vo){
         vo = service.insert(vo);
         return ResultHelper.single(vo);
     }
 
+    @Deprecated
     @PostMapping("/update")
     public CommonResult<DictDataMap> update(@RequestBody DictDataMap vo){
         vo = service.update(vo);
         return ResultHelper.single(vo);
     }
 
+    @Deprecated
     @PostMapping("/delete")
     public CommonResult<DictDataMap> delete(@RequestBody DictDataMap vo){
         service.delete(vo);

+ 4 - 0
dmp-business/dmp-dic/src/main/java/com/persagy/dmp/dic/controller/DictTypeController.java

@@ -30,6 +30,7 @@ public class DictTypeController {
     @Autowired
     private DictTypeService service;
 
+    @Deprecated
     @PostMapping("/query")
     public CommonResult<List<DictType>> query(@RequestBody QueryCriteria criteria) {
         if(criteria == null) {
@@ -42,18 +43,21 @@ public class DictTypeController {
         return ResultHelper.multi(page.getRecords(), page.getTotal());
     }
 
+    @Deprecated
     @PostMapping("/create")
     public CommonResult<DictType> create(@RequestBody DictType vo){
         vo = service.insert(vo);
         return ResultHelper.single(vo);
     }
 
+    @Deprecated
     @PostMapping("/update")
     public CommonResult<DictType> update(@RequestBody DictType vo){
         vo = service.update(vo);
         return ResultHelper.single(vo);
     }
 
+    @Deprecated
     @PostMapping("/delete")
     public CommonResult<DictType> delete(@RequestBody DictType vo){
         service.delete(vo);

+ 9 - 7
dmp-business/dmp-dic/src/main/resources/db.init/schema.sql

@@ -4,8 +4,7 @@ SET FOREIGN_KEY_CHECKS = 0;
 -- ----------------------------
 --  Table structure for `dic_dt_type`
 -- ----------------------------
-DROP TABLE IF EXISTS `dic_dt_type`;
-CREATE TABLE `dic_dt_type` (
+CREATE TABLE IF NOT EXISTS `dic_dt_type` (
 `id` varchar(40) NOT NULL,
 `group_code` varchar(40) DEFAULT NULL COMMENT '集团编码',
 `type` varchar(40) NOT NULL COMMENT '字典类型',
@@ -26,8 +25,7 @@ KEY `index1` (`type`,`name`,`group_code`,`valid`) USING BTREE
 -- ----------------------------
 --  Table structure for `dic_dt_data`
 -- ----------------------------
-DROP TABLE IF EXISTS `dic_dt_data`;
-CREATE TABLE `dic_dt_data` (
+CREATE TABLE IF NOT EXISTS `dic_dt_data` (
 `id` varchar(80) NOT NULL,
 `dict_type_id` varchar(80) NOT NULL COMMENT '字典类型ID',
 `parent_id` varchar(80) DEFAULT NULL COMMENT '父节点',
@@ -49,8 +47,7 @@ PRIMARY KEY (`id`)
 -- ----------------------------
 --  Table structure for `dic_dt_data_map`
 -- ----------------------------
-DROP TABLE IF EXISTS `dic_dt_data_map`;
-CREATE TABLE `dic_dt_data_map` (
+CREATE TABLE IF NOT EXISTS `dic_dt_data_map` (
 `id` varchar(80) NOT NULL,
 `dict_data_id` varchar(80) NOT NULL COMMENT '字典数据ID',
 `type` varchar(40) NOT NULL COMMENT '字典类型',
@@ -69,7 +66,9 @@ CREATE TABLE `dic_dt_data_map` (
 PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='字典数据映射表';
 
-
+-- ----------------------------
+--  Table structure for `dt_code_type`
+-- ----------------------------
 CREATE TABLE IF NOT EXISTS `dt_code_type` (
   `id` varchar(40) NOT NULL,
   `group_code` varchar(40) DEFAULT NULL,
@@ -89,6 +88,9 @@ CREATE TABLE IF NOT EXISTS `dt_code_type` (
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='码表类型';
 
+-- ----------------------------
+--  Table structure for `dt_code_data`
+-- ----------------------------
 CREATE TABLE IF NOT EXISTS `dt_code_data` (
   `id` varchar(40) NOT NULL,
   `group_code` varchar(40) DEFAULT NULL,

+ 8 - 8
dmp-common/src/main/java/com/persagy/dmp/common/utils/ResultHelper.java

@@ -23,7 +23,7 @@ public class ResultHelper {
      * 成功消息
      * @return
      */
-    public static CommonResult success(){
+    public static <T> CommonResult<T> success(){
 //        return new CommonResult(ResponseCode.A00000.getCode(), ResponseCode.A00000.getDesc());
         return success(null);
     }
@@ -32,9 +32,9 @@ public class ResultHelper {
      * 成功消息
      * @return
      */
-    public static CommonResult success(String respMsg){
+    public static <T> CommonResult<T> success(String respMsg){
 //        return new CommonResult(ResponseCode.A00000.getCode(), respMsg);
-        return new CommonResult(SUCCESS, respMsg);
+        return new CommonResult<>(SUCCESS, respMsg);
     }
 
     /**
@@ -42,7 +42,7 @@ public class ResultHelper {
      * @param respMsg
      * @return
      */
-    public static CommonResult failure(String respMsg) {
+    public static CommonResult<Void> failure(String respMsg) {
         return failure(FAIL, respMsg);
     }
 
@@ -52,8 +52,8 @@ public class ResultHelper {
      * @param respMsg
      * @return
      */
-    public static CommonResult failure(String respCode, String respMsg) {
-        return new CommonResult(respCode, respMsg);
+    public static CommonResult<Void> failure(String respCode, String respMsg) {
+        return new CommonResult<>(respCode, respMsg);
     }
 
     /**
@@ -74,7 +74,7 @@ public class ResultHelper {
      */
     public static <T> CommonResult<T> single(T content, String desc) {
 //        return new CommonResult(ResponseCode.A00000.getCode(), desc, content);
-        return new CommonResult(SUCCESS, desc, content);
+        return new CommonResult<>(SUCCESS, desc, content);
     }
 
     /**
@@ -112,7 +112,7 @@ public class ResultHelper {
         if(total < CollUtil.size(records)) {
             total = size;
         }
-        CommonResult result = success();
+        CommonResult<List<T>> result = success();
         result.setData(records);
         result.setCount(total);
         return result;