fixed 代码生成规范

fuint-application/src/main/java/com/fuint/common/util/VelocityUtils.java

@@ -17,16 +17,16 @@ import org.apache.velocity.VelocityContext;
 public class VelocityUtils {
 
     /** 数据库项目路径 */
-    private static final String REPOSITORY_PATH = "/fuint-repository/src";
+    private static final String REPOSITORY_PATH = "/fuint-repository/src/main";
 
     /** mapper路径 */
-    private static final String MAPPER_PATH = "/mapper";
+    private static final String MAPPER_PATH = "/java/com/fuint/repository/mapper";
 
     /** model路径 */
-    private static final String MODEL_PATH = "/model";
+    private static final String MODEL_PATH = "/java/com/fuint/repository/model";
 
     /** mybatis xml路径 */
-    private static final String MAPPER_XML_PATH = "/main/resources/mapper";
+    private static final String MAPPER_XML_PATH = "/resources/mapper";
 
     /** 接口服务路径 */
     private static final String SERVICE_PATH = "/fuint-application/src/main/java/com/fuint/common/service";

fuint-application/src/main/resources/vm/java/BackendController.java.vm

@@ -1,5 +1,6 @@
 package com.fuint.module.backendApi.controller;
 
+import com.fuint.common.dto.AccountInfo;
 import com.fuint.common.util.TokenUtil;
 import com.fuint.framework.web.BaseController;
 import com.fuint.framework.web.ResponseObject;
@@ -18,7 +19,6 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -85,7 +85,7 @@ public class Backend${tableClass}Controller extends BaseController {
             params.put("storeId", storeId);
         }
         paginationRequest.setSearchParams(params);
-        PaginationResponse<${className}> paginationResponse = ${tableName}Service.query${tableName}ListByPagination(paginationRequest);
+        PaginationResponse<${className}> paginationResponse = ${tableName}Service.query${tableClass}ListByPagination(paginationRequest);
 
         Map<String, Object> paramsStore = new HashMap<>();
         paramsStore.put("status", StatusEnum.ENABLED.getKey());
@@ -121,13 +121,14 @@ public class Backend${tableClass}Controller extends BaseController {
             return getFailureResult(1001, "请先登录");
         }
 
-        ${className} ${tablePrefix}${tableClass} = ${tableName}Service.query${tableClass}ById(id)};
+        ${className} ${tablePrefix}${tableClass} = ${tableName}Service.query${tableClass}ById(id);
         if (${tablePrefix}${tableClass} == null) {
             return getFailureResult(201);
         }
 
         String operator = accountInfo.getAccountName();
         ${tablePrefix}${tableClass}.setOperator(operator);
+        ${tablePrefix}${tableClass}.setStatus(status);
         ${tableName}Service.update${tableClass}(${tablePrefix}${tableClass});
 
         return getSuccessResult(true);
@@ -163,9 +164,9 @@ public class Backend${tableClass}Controller extends BaseController {
         info.setMerchantId(accountInfo.getMerchantId());
         if (StringUtil.isNotEmpty(id)) {
             info.setId(Integer.parseInt(id));
-            ${tableName}Service.update${className}(info);
+            ${tableName}Service.update${tableClass}(info);
         } else {
-            ${tableName}Service.add${className}(info);
+            ${tableName}Service.add${tableClass}(info);
         }
 
         return getSuccessResult(true);

fuint-application/src/main/resources/vm/java/serviceImpl.java.vm

@@ -110,7 +110,7 @@ public class ${tableClass}ServiceImpl extends ServiceImpl<${className}Mapper, ${
         }
         ${tablePrefix}${tableClass}.setStatus(StatusEnum.DISABLE.getKey());
         ${tablePrefix}${tableClass}.setUpdateTime(new Date());
-        ${tablePrefix}${tableClass}Mapper..updateById(${tablePrefix}${tableClass});
+        ${tablePrefix}${tableClass}Mapper.updateById(${tablePrefix}${tableClass});
     }
 
     /**