From d509e25f601c110427306543a0d17cd97cc6b194 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期六, 22 六月 2024 17:45:12 +0800
Subject: [PATCH] 生成模板优化
---
project-generator/src/main/resources/vm/java/service.java.vm | 8 +-
project-generator/src/main/resources/vm/java/serviceImpl.java.vm | 27 ++++++++-
project-system/src/main/java/com/project/system/sms/YPSmsApi.java | 8 +-
project-generator/src/main/resources/vm/java/controller.java.vm | 12 ++--
project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java | 64 +++++++++++++++++++--
project-framework/src/main/java/com/project/framework/web/service/SysLoginService.java | 18 +++++
project-admin/src/main/java/com/project/admin/controller/enforce/EnforceEvaluateController.java | 4
7 files changed, 113 insertions(+), 28 deletions(-)
diff --git a/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceEvaluateController.java b/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceEvaluateController.java
index 0aa0b27..dcff819 100644
--- a/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceEvaluateController.java
+++ b/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceEvaluateController.java
@@ -49,9 +49,9 @@
}
- @ApiOperation("淇濆瓨鎵ф硶璇勪环閰嶇疆")
+ @ApiOperation("淇濆瓨鎵ф硶鍗曡瘎浠�")
//@PreAuthorize("@ss.hasPermi('enforce:log:add')")
- @Log(title = "鎵ф硶璇勪环璁剧疆", businessType = BusinessType.INSERT)
+ @Log(title = "鎵ф硶鍗曡瘎浠�", businessType = BusinessType.INSERT)
@PostMapping("/saveOrder")
@RepeatSubmit
public AjaxResult saveOrder(@RequestBody EnforceEvaluateBo bo)
diff --git a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java
index adf2027..f6e32bf 100644
--- a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java
+++ b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java
@@ -54,7 +54,12 @@
private final IEnforceEvaluateLogService evaluateLogService;
private final YPSmsService smsService;
- @Override//閫氱敤鍒楄〃
+ /**
+ * 閫氱敤鍒楄〃-鏃犳潈闄�
+ * @param bo 鍙傛暟
+ * @return 鍒楄〃
+ */
+ @Override
public List<EnforceOrderVo> queryCommonList(EnforceOrderQueryBo bo)
{
QueryWrapper<EnforceOrder> qw = getQw(bo);
@@ -62,7 +67,12 @@
return Convert.toList(EnforceOrderVo.class , list);
}
- @Override//浼佷笟鍒楄〃
+ /**
+ * 浼佷笟鎵ф硶鍗曞垪琛�
+ * @param bo 鍙傛暟
+ * @return 鍒楄〃
+ */
+ @Override
public List<EnforceOrderVo> queryCompanyList(EnforceOrderQueryBo bo)
{
QueryWrapper<EnforceOrder> qw = getQw(bo);
@@ -71,7 +81,12 @@
return Convert.toList(EnforceOrderVo.class , list);
}
- @Override//鍒楄〃鏌ヨ
+ /**
+ * 鎵ф硶鐢宠鍗曞垪琛�
+ * @param bo 鍙傛暟
+ * @return 鍒楄〃
+ */
+ @Override
@DataScope(deptAlias = "apply_dept_id", userAlias = "apply_id")
public List<EnforceOrderVo> queryList(EnforceOrderQueryBo bo)
{
@@ -81,7 +96,12 @@
return Convert.toList(EnforceOrderVo.class , list);
}
- @Override//鎵ф硶涓婃姤鍒楄〃
+ /**
+ * 鎵ф硶鎵ц鍗曞垪琛�
+ * @param bo 鍙傛暟
+ * @return 鍒楄〃
+ */
+ @Override
@DataScope(deptAlias = "execute_dept_id", userAlias = "execute_id")
public List<EnforceOrderVo> getExecuteList(EnforceOrderQueryBo bo) {
QueryWrapper<EnforceOrder> qw = getQw(bo);
@@ -90,7 +110,12 @@
return Convert.toList(EnforceOrderVo.class , list);
}
- @Override//寰呭鏍稿垪琛�
+ /**
+ * 寰呭鏍稿垪琛�
+ * @param bo 鍙傛暟
+ * @return 鍒楄〃
+ */
+ @Override
public List<EnforceOrderVo> queryCheckList(EnforceOrderQueryBo bo)
{
SysUser loginUser = SecurityUtils.getLoginUser().getUser();
@@ -104,6 +129,11 @@
return this.baseMapper.selectCheckList(bo);
}
+ /**
+ * 瀹℃壒璁板綍鍒楄〃
+ * @param bo 鍙傛暟
+ * @return 鍒楄〃
+ */
@Override
public List<EnforceOrderVo> queryCheckedList(OrderCheckedQueryBo bo)
{
@@ -111,7 +141,12 @@
return this.baseMapper.selectCheckedList(bo);
}
- @Override//淇℃伅鍏紡鍒楄〃
+
+ /**
+ * 淇℃伅鍏紡鍒楄〃
+ * @return 鍒楄〃
+ */
+ @Override
public List<EnforceOrderVo> showList()
{
List<EnforceOrder> list = this.list(lq()
@@ -121,7 +156,10 @@
return Convert.toList(EnforceOrderVo.class, list);
}
- @Override//id鏌ヨ
+ /**
+ * id鏌ヨ
+ */
+ @Override
public EnforceOrderVo queryById(Long orderId)
{
EnforceOrder db = this.baseMapper.selectById(orderId);
@@ -146,6 +184,9 @@
}
+ /**
+ * 鏂板
+ */
@Override//娣诲姞
@Transactional
public Boolean insertByBo(EnforceOrderBo bo)
@@ -180,6 +221,9 @@
return savePeers;
}
+ /**
+ * 淇敼
+ */
@Override//淇敼
@Transactional
public Boolean updateByBo(EnforceOrderBo bo)
@@ -189,6 +233,9 @@
return this.updateById(update);
}
+ /**
+ * 鍒犻櫎
+ */
@Override//鍒犻櫎
@Transactional
public Boolean deleteByIds(Collection<Long> ids)
@@ -199,6 +246,9 @@
return this.removeByIds(ids);
}
+ /**
+ * 鑾峰彇涓嬩竴绾у鎵逛汉鐢佃瘽
+ */
@Override
public List<String> getCheckPhones(Integer checkLevel, Long applyDeptId)
{
diff --git a/project-framework/src/main/java/com/project/framework/web/service/SysLoginService.java b/project-framework/src/main/java/com/project/framework/web/service/SysLoginService.java
index 35217de..ffee8d1 100644
--- a/project-framework/src/main/java/com/project/framework/web/service/SysLoginService.java
+++ b/project-framework/src/main/java/com/project/framework/web/service/SysLoginService.java
@@ -150,7 +150,14 @@
return getVerifyCodeNew(phone);
}
- private boolean sendYp(String phone, String code){
+ /**
+ * 浜戠墖楠岃瘉鐮�
+ * @param phone 鎵嬫満
+ * @param code 楠岃瘉鐮�
+ * @return 缁撴灉
+ */
+ private boolean sendYp(String phone, String code)
+ {
String result = smsApi.sendSms(phone, StringUtils.format(YPSmsApi.CODE_TMP, code, Constants.PHONE_EXPIRATION));
if (result.contains("\"code\":0,\"msg\":\"OK\"")){
log.info("鍙戦�佹垚鍔� ->楠岃瘉鐮侊細"+code);
@@ -159,7 +166,14 @@
return false;
}
- private boolean sendAl(String phone, String code ){
+ /**
+ * 闃块噷楠岃瘉鐮�
+ * @param phone 鎵嬫満
+ * @param code 楠岃瘉鐮�
+ * @return 缁撴灉
+ */
+ private boolean sendAl(String phone, String code )
+ {
DefaultProfile profile = DefaultProfile.getProfile("cn-beijing", AliyunSmsConstants.SMS_APPID, AliyunSmsConstants.SMS_SECRET);
IAcsClient client = new DefaultAcsClient(profile);
CommonRequest request = new CommonRequest();
diff --git a/project-generator/src/main/resources/vm/java/controller.java.vm b/project-generator/src/main/resources/vm/java/controller.java.vm
index 2b0a8fc..6f73d4e 100644
--- a/project-generator/src/main/resources/vm/java/controller.java.vm
+++ b/project-generator/src/main/resources/vm/java/controller.java.vm
@@ -43,7 +43,7 @@
private final I${ClassName}Service i${ClassName}Service;
- @ApiOperation("鏌ヨ${functionName}鍒楄〃")
+ @ApiOperation("鍒楄〃鈥斺��${functionName}")
@GetMapping("/list")
#if($table.crud || $table.sub)
public TableDataInfo list(${ClassName}QueryBo bo)
@@ -62,7 +62,7 @@
- @ApiOperation("瀵煎嚭${functionName}鍒楄〃")
+ @ApiOperation("瀵煎嚭鈥斺��${functionName}")
//@PreAuthorize("@ss.hasPermi('${permissionPrefix}:export')")
@Log(title = "${functionName}", businessType = BusinessType.EXPORT)
@GetMapping("/export")
@@ -75,7 +75,7 @@
}
- @ApiOperation("鑾峰彇${functionName}璇︾粏淇℃伅")
+ @ApiOperation("璇︽儏鈥斺��${functionName}")
@GetMapping("/{${pkColumn.javaField}}")
public AjaxResult getInfo(@PathVariable("${pkColumn.javaField}" ) ${pkColumn.javaType} ${pkColumn.javaField})
{
@@ -83,7 +83,7 @@
}
- @ApiOperation("鏂板${functionName}")
+ @ApiOperation("鏂板鈥斺��${functionName}")
//@PreAuthorize("@ss.hasPermi('${permissionPrefix}:add')")
@Log(title = "${functionName}", businessType = BusinessType.INSERT)
@PostMapping("/add")
@@ -94,7 +94,7 @@
}
- @ApiOperation("淇敼${functionName}")
+ @ApiOperation("淇敼鈥斺��${functionName}")
//@PreAuthorize("@ss.hasPermi('${permissionPrefix}:edit')")
@Log(title = "${functionName}", businessType = BusinessType.UPDATE)
@PostMapping("/upd")
@@ -105,7 +105,7 @@
}
- @ApiOperation("鍒犻櫎${functionName}")
+ @ApiOperation("鍒犻櫎鈥斺��${functionName}")
//@PreAuthorize("@ss.hasPermi('${permissionPrefix}:remove')")
@Log(title = "${functionName}" , businessType = BusinessType.DELETE)
@DeleteMapping("/{${pkColumn.javaField}s}")
diff --git a/project-generator/src/main/resources/vm/java/service.java.vm b/project-generator/src/main/resources/vm/java/service.java.vm
index 5b3d2e5..8562672 100644
--- a/project-generator/src/main/resources/vm/java/service.java.vm
+++ b/project-generator/src/main/resources/vm/java/service.java.vm
@@ -24,28 +24,28 @@
List<${ClassName}Vo> queryList(${ClassName}QueryBo bo);
/**
- * 鏌ヨ鍗曚釜
+ * id 鏌ヨ
* @return ${ClassName}Vo
*/
${ClassName}Vo queryById(${pkColumn.javaType} ${pkColumn.javaField});
/**
- * 鏍规嵁鏂板涓氬姟瀵硅薄鎻掑叆${functionName}
+ * 鏂板 ${functionName}
* @param bo ${functionName}鏂板涓氬姟瀵硅薄
* @return true鎴愬姛 false澶辫触
*/
Boolean insertByBo(${ClassName}Bo bo);
/**
- * 鏍规嵁缂栬緫涓氬姟瀵硅薄淇敼${functionName}
+ * 淇敼 ${functionName}
* @param bo ${functionName}缂栬緫涓氬姟瀵硅薄
* @return true鎴愬姛 false澶辫触
*/
Boolean updateByBo(${ClassName}Bo bo);
/**
- * 鏍￠獙骞跺垹闄ゆ暟鎹�
+ * 鍒犻櫎
* @param ids 涓婚敭闆嗗悎
* @return true鎴愬姛 false澶辫触
*/
diff --git a/project-generator/src/main/resources/vm/java/serviceImpl.java.vm b/project-generator/src/main/resources/vm/java/serviceImpl.java.vm
index 66c3f89..812d57d 100644
--- a/project-generator/src/main/resources/vm/java/serviceImpl.java.vm
+++ b/project-generator/src/main/resources/vm/java/serviceImpl.java.vm
@@ -30,7 +30,9 @@
public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${ClassName}> implements I${ClassName}Service {
-
+ /**
+ * 鏌ヨ鍒楄〃
+ */
@Override//鍒楄〃鏌ヨ
public List<${ClassName}Vo> queryList(${ClassName}QueryBo bo)
{
@@ -39,6 +41,10 @@
return Convert.toList(${ClassName}Vo.class , list);
}
+ /**
+ * 鏌ヨ鍗曚釜
+ * @return ${ClassName}Vo
+ */
@Override//id鏌ヨ
public ${ClassName}Vo queryById(${pkColumn.javaType} ${pkColumn.javaField})
{
@@ -47,6 +53,11 @@
}
+ /**
+ * 鏂板 ${functionName}
+ * @param bo ${functionName}鏂板涓氬姟瀵硅薄
+ * @return true鎴愬姛 false澶辫触
+ */
@Override//娣诲姞
@Transactional
public Boolean insertByBo(${ClassName}Bo bo)
@@ -56,7 +67,12 @@
return this.save(add);
}
- @Override//淇敼
+ /**
+ * 淇敼 ${functionName}
+ * @param bo ${functionName}缂栬緫涓氬姟瀵硅薄
+ * @return true鎴愬姛 false澶辫触
+ */
+ @Override
@Transactional
public Boolean updateByBo(${ClassName}Bo bo)
{
@@ -65,7 +81,12 @@
return this.updateById(update);
}
- @Override//鍒犻櫎
+ /**
+ * 鍒犻櫎
+ * @param ids 涓婚敭闆嗗悎
+ * @return true鎴愬姛 false澶辫触
+ */
+ @Override
@Transactional
public Boolean deleteByIds(Collection<Long> ids)
{
diff --git a/project-system/src/main/java/com/project/system/sms/YPSmsApi.java b/project-system/src/main/java/com/project/system/sms/YPSmsApi.java
index 5d39f36..90b3a01 100644
--- a/project-system/src/main/java/com/project/system/sms/YPSmsApi.java
+++ b/project-system/src/main/java/com/project/system/sms/YPSmsApi.java
@@ -58,22 +58,22 @@
/**
* 鎵ф硶鍗曠敵璇锋ā鏉�
*/
- public static final String APPLY_TMP = "{} 鎻愪氦浜嗘柊鐨勭敵璇峰崟锛岃鎮ㄥ強鏃跺鎵癸紒";
+ public static final String APPLY_TMP = SIGN + "{} 鎻愪氦浜嗘柊鐨勭敵璇峰崟锛岃鎮ㄥ強鏃跺鎵癸紒";
/**
* 鎵ф硶鍗曞鏍稿悗妯℃澘
*/
- public static final String CHECK_TMP = "鎮ㄦ彁浜ょ殑鐢宠鍗曞凡琚鎵逛汉 {}, 璇锋偍鍙婃椂鏌ョ湅锛�";
+ public static final String CHECK_TMP = SIGN + "鎮ㄦ彁浜ょ殑鐢宠鍗曞凡琚鎵逛汉 {}, 璇锋偍鍙婃椂鏌ョ湅锛�";
/**
* 浼佷笟閫氱煡妯℃澘
*/
- public static final String COMPANY_TMP = "{} 鍗曚綅棰勮灏嗕簬 {} 鍒拌吹鍗曚綅杩涜妫�鏌ワ紝璇锋彁鍓嶇煡鏅擄紒";
+ public static final String COMPANY_TMP = SIGN + "{} 鍗曚綅棰勮灏嗕簬 {} 鍒拌吹鍗曚綅杩涜妫�鏌ワ紝璇锋彁鍓嶇煡鏅擄紒";
/**
* 楠岃瘉鐮佹ā鏉�
*/
- public static final String CODE_TMP = "鎮ㄧ殑楠岃瘉鐮佹槸{}";
+ public static final String CODE_TMP = SIGN + "鎮ㄧ殑楠岃瘉鐮佹槸{}";
--
Gitblit v1.9.1