From 4d74bebe76748d8ba6fe90b76db35ca13ba9333c Mon Sep 17 00:00:00 2001
From: lius <Lius2225@163.com>
Date: 星期一, 17 七月 2023 10:52:52 +0800
Subject: [PATCH] 类型添加数据字典
---
/dev/null | 74 -------------------------------------
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcPlanClose.java | 2 +
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcNoplanCloseVo.java | 2 +
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcNoplanClose.java | 2 +
4 files changed, 6 insertions(+), 74 deletions(-)
diff --git a/lxzn-module-demo/src/main/java/org/jeecg/modules/demo/cloud/controller/JcloudDemoFeignController.java b/lxzn-module-demo/src/main/java/org/jeecg/modules/demo/cloud/controller/JcloudDemoFeignController.java
deleted file mode 100644
index 76a8266..0000000
--- a/lxzn-module-demo/src/main/java/org/jeecg/modules/demo/cloud/controller/JcloudDemoFeignController.java
+++ /dev/null
@@ -1,68 +0,0 @@
-//package org.jeecg.modules.demo.cloud.controller;
-//
-//import com.alibaba.csp.sentinel.annotation.SentinelResource;
-//import io.swagger.annotations.Api;
-//import io.swagger.annotations.ApiOperation;
-//import lombok.extern.slf4j.Slf4j;
-//import org.jeecg.common.api.vo.Result;
-//import org.jeecg.common.system.api.ISysBaseAPI;
-//import org.jeecg.common.system.vo.DictModel;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.web.bind.annotation.GetMapping;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.RestController;
-//import javax.annotation.Resource;
-//import java.util.List;
-//
-///**
-// *
-// */
-//@Slf4j
-//@Api(tags = "銆愬井鏈嶅姟銆戝崟鍏冩祴璇�")
-//@RestController
-//@RequestMapping("/test")
-//public class JcloudDemoFeignController {
-// @Resource
-// private ISysBaseAPI sysBaseApi;
-//// @Autowired
-//// private ErpHelloApi erpHelloApi;
-//
-// /**
-// * 娴嬭瘯
-// *
-// * @return
-// */
-// @GetMapping("/callSystem")
-// //@SentinelResource(value = "remoteDict",fallback = "getDefaultHandler")
-// @ApiOperation(value = "閫氳繃feign璋冪敤system鏈嶅姟", notes = "娴嬭瘯jeecg-demo鏈嶅姟锛屾槸鍚﹂�氳繃fegin璋冪敤system鏈嶅姟鎺ュ彛")
-// public Result getRemoteDict() {
-// List<DictModel> list = sysBaseApi.queryAllDict();
-// return Result.OK(list);
-// }
-//
-//
-//// /**
-//// * 娴嬭瘯璋冪敤 erp 寰湇鍔℃帴鍙�
-//// * 銆愬浣曟祴璇曪細閫氳繃archetype鐢熸垚寰湇鍔℃ā鍧楋紝蹇�熼泦鎴愭祴璇曘��
-//// * http://doc.jeecg.com/2194069
-//// * @return
-//// */
-//// @GetMapping("/callErp")
-//// @ApiOperation(value = "娴嬭瘯feign erp", notes = "娴嬭瘯feign erp")
-//// public Result callErp() {
-//// log.info("call erp 鏈嶅姟");
-//// String res = erpHelloApi.callHello();
-//// return Result.OK(res);
-//// }
-//
-// /**
-// * 鐔旀柇锛岄粯璁ゅ洖璋冨嚱鏁�
-// *
-// * @return
-// */
-// public Result<Object> getDefaultHandler() {
-// log.info("娴嬭瘯JcloudDemoController-remoteDict 鐔旀柇闄嶇骇");
-// return Result.error("娴嬭瘯JcloudDemoController-remoteDict 鐔旀柇闄嶇骇");
-// }
-//
-//}
diff --git a/lxzn-module-demo/src/main/java/org/jeecg/modules/demo/cloud/xxljob/TestJobHandler.java b/lxzn-module-demo/src/main/java/org/jeecg/modules/demo/cloud/xxljob/TestJobHandler.java
deleted file mode 100644
index a3bd805..0000000
--- a/lxzn-module-demo/src/main/java/org/jeecg/modules/demo/cloud/xxljob/TestJobHandler.java
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-//package org.jeecg.modules.demo.cloud.xxljob;
-//
-//import com.xxl.job.core.biz.model.ReturnT;
-//import com.xxl.job.core.handler.annotation.XxlJob;
-//import lombok.extern.slf4j.Slf4j;
-//import org.jeecg.common.config.mqtoken.UserTokenContext;
-//import org.jeecg.common.constant.CommonConstant;
-//import org.jeecg.common.system.api.ISysBaseAPI;
-//import org.jeecg.common.system.util.JwtUtil;
-//import org.jeecg.common.util.RedisUtil;
-//import org.jeecg.common.util.SpringContextUtils;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.stereotype.Component;
-//
-//
-///**
-// * xxl-job瀹氭椂浠诲姟娴嬭瘯
-// */
-//@Slf4j
-//@Component
-//public class TestJobHandler {
-// @Autowired
-// ISysBaseAPI sysBaseApi;
-//
-// /**
-// * 绠�鍗曚换鍔�
-// *
-// * 娴嬭瘯锛氭棤token璋冪敤feign鎺ュ彛
-// *
-// * @param params
-// * @return
-// */
-//
-// @XxlJob(value = "testJob")
-// public ReturnT<String> demoJobHandler(String params) {
-// //1.鐢熸垚涓存椂浠ょ墝Token鍒扮嚎绋嬩腑
-// UserTokenContext.setToken(getTemporaryToken());
-//
-// log.info("鎴戞槸 jeecg-demo 鏈嶅姟閲岀殑瀹氭椂浠诲姟 testJob , 鎴戞墽琛屼簡...............................");
-// log.info("鎴戣皟鐢� jeecg-system 鏈嶅姟鐨勫瓧鍏告帴鍙ｏ細{}",sysBaseApi.queryAllDict());
-// //銆傘�傘�傛澶勫彲浠ュ啓澶氫釜feign鎺ュ彛璋冪敤
-//
-// //2.浣跨敤瀹岋紝鍒犻櫎涓存椂浠ょ墝Token
-// UserTokenContext.remove();
-// return ReturnT.SUCCESS;
-// }
-//
-// public void init() {
-// log.info("init");
-// }
-//
-// public void destroy() {
-// log.info("destory");
-// }
-//
-// /**
-// * 鑾峰彇涓存椂浠ょ墝
-// *
-// * 妯℃嫙鐧婚檰鎺ュ彛锛岃幏鍙栨ā鎷� Token
-// * @return
-// */
-// public static String getTemporaryToken() {
-// RedisUtil redisUtil = SpringContextUtils.getBean(RedisUtil.class);
-// // 妯℃嫙鐧诲綍鐢熸垚Token
-// String token = JwtUtil.sign("??", "??");
-// // 璁剧疆Token缂撳瓨鏈夋晥鏃堕棿涓� 5 鍒嗛挓
-// redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token);
-// redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, 5 * 60 * 1000);
-// return token;
-// }
-//
-//}
-//
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcNoplanClose.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcNoplanClose.java
index 45772bc..ed7cf1d 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcNoplanClose.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcNoplanClose.java
@@ -14,6 +14,7 @@
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.common.aspect.annotation.Dict;
import org.jeecg.common.system.base.entity.JeecgEntity;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
@@ -50,6 +51,7 @@
*/
@Excel(name = "闈炶鍒掑仠鏈虹被鍨�", width = 15)
@ApiModelProperty(value = "闈炶鍒掑仠鏈虹被鍨�")
+ @Dict(dicCode = "mdc_noplan_type")
private String noplanType;
/**
* 闈炶鍒掑仠鏈哄紑濮嬫椂闂�
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcPlanClose.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcPlanClose.java
index 4f9ce7f..4b20648 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcPlanClose.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcPlanClose.java
@@ -7,6 +7,7 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
import org.jeecg.common.system.base.entity.JeecgEntity;
import org.jeecgframework.poi.excel.annotation.Excel;
@@ -37,6 +38,7 @@
*/
@Excel(name = "璁″垝鍋滄満鏃堕棿绫诲瀷", width = 15)
@ApiModelProperty(value = "璁″垝鍋滄満鏃堕棿绫诲瀷")
+ @Dict(dicCode = "mdc_plan_type")
private String planCloseTimeType;
/**
* 鏃堕暱锛堝垎閽燂級
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcNoplanCloseVo.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcNoplanCloseVo.java
index 5cf71b4..b9b3693 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcNoplanCloseVo.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcNoplanCloseVo.java
@@ -4,6 +4,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
@@ -29,6 +30,7 @@
/**
* 闈炶鍒掑仠鏈虹被鍨�
*/
+ @Dict(dicCode = "mdc_noplan_type")
private String noplanType;
/**
* 闈炶鍒掑仠鏈哄紑濮嬫椂闂�
--
Gitblit v1.9.3