Merge remote-tracking branch 'origin/master'

win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/service/codegen/inner/CodegenEngine.java

@@ -75,8 +75,8 @@ public class CodegenEngine {
             .put(javaTemplatePath("dal/mapper"),
                     javaModuleImplMainFilePath("dal/mysql/${table.businessName}/${table.className}Mapper"))
             .put(javaTemplatePath("dal/mapper.xml"), mapperXmlFilePath())
-//            .put(javaTemplatePath("service/serviceImpl"),
+            .put(javaTemplatePath("service/serviceImpl"),
-//                    javaModuleImplMainFilePath("service/${table.businessName}/${table.className}ServiceImpl"))
+                    javaModuleImplMainFilePath("service/${table.businessName}/${table.className}ServiceImpl"))
             .put(javaTemplatePath("service/service"),
                     javaModuleImplMainFilePath("service/${table.businessName}/${table.className}Service"))
             // Java module-biz Test

win-module-infra/win-module-infra-biz/src/main/resources/codegen/java/controller/controller.vm

@@ -113,7 +113,7 @@ public class ${sceneEnum.prefixClass}${table.className}Controller {
     public void importTemplate(HttpServletResponse response) throws IOException {
         List<${table.className}ExcelVO> list = Arrays.asList();
         // 输出
-        ExcelUtils.write(response, "${table.classComment}基本信息导入模板.xls", "${table.classComment}基本信息列表", ${table.className}ExcelVo.class, list);
+        ExcelUtils.write(response, "${table.classComment}基本信息导入模板.xls", "${table.classComment}基本信息列表", ${table.className}ExcelVO.class, list);
     }
 
     @PostMapping("/import")

win-module-infra/win-module-infra-biz/src/main/resources/codegen/java/service/service.vm.bark

@@ -1,99 +0,0 @@
-package ${basePackage}.module.${table.moduleName}.service.${table.businessName};
-
-import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-
-import java.util.*;
-import ${basePackage}.module.${table.moduleName}.controller.${sceneEnum.basePackage}.${table.businessName}.vo.*;
-import ${basePackage}.module.${table.moduleName}.dal.dataobject.${table.businessName}.${table.className}DO;
-import ${PageResultClassName};
-
-import ${basePackage}.module.${table.moduleName}.convert.${table.businessName}.${table.className}Convert;
-import ${basePackage}.module.${table.moduleName}.dal.mysql.${table.businessName}.${table.className}Mapper;
-
-import static ${ServiceExceptionUtilClassName}.exception;
-import static ${basePackage}.module.${table.moduleName}.enums.ErrorCodeConstants.*;
-
-/**
- * ${table.classComment} Service
- *
- * @author ${table.author}
- */
-@Service
-@Validated
-public class ${table.className}Service {
-
-    @Resource
-    private ${table.className}Mapper ${classNameVar}Mapper;
-
-
-    public ${primaryColumn.javaType} create${simpleClassName}(${sceneEnum.prefixClass}${table.className}CreateReqVO createReqVO) {
-        // 插入
-        ${table.className}DO ${classNameVar} = ${table.className}Convert.INSTANCE.convert(createReqVO);
-        ${classNameVar}Mapper.insert(${classNameVar});
-        // 返回
-        return ${classNameVar}.getId();
-    }
-
-    public void update${simpleClassName}(${sceneEnum.prefixClass}${table.className}UpdateReqVO updateReqVO) {
-        // 校验存在
-        validate${simpleClassName}Exists(updateReqVO.getId());
-        // 更新
-        ${table.className}DO updateObj = ${table.className}Convert.INSTANCE.convert(updateReqVO);
-        ${classNameVar}Mapper.updateById(updateObj);
-    }
-
-    public void delete${simpleClassName}(${primaryColumn.javaType} id) {
-        // 校验存在
-        validate${simpleClassName}Exists(id);
-        // 删除
-        ${classNameVar}Mapper.deleteById(id);
-    }
-
-    private void validate${simpleClassName}Exists(${primaryColumn.javaType} id) {
-        if (${classNameVar}Mapper.selectById(id) == null) {
-            throw exception(${simpleClassName_underlineCase.toUpperCase()}_NOT_EXISTS);
-        }
-    }
-
-    public ${table.className}DO get${simpleClassName}(${primaryColumn.javaType} id) {
-        return ${classNameVar}Mapper.selectById(id);
-    }
-
-    public List<${table.className}DO> get${simpleClassName}List(Collection<${primaryColumn.javaType}> ids) {
-        return ${classNameVar}Mapper.selectBatchIds(ids);
-    }
-
-    public PageResult<${table.className}DO> get${simpleClassName}Page(${sceneEnum.prefixClass}${table.className}PageReqVO pageReqVO) {
-        return ${classNameVar}Mapper.selectPage(pageReqVO);
-    }
-
-    public List<${table.className}DO> get${simpleClassName}List(${sceneEnum.prefixClass}${table.className}ExportReqVO exportReqVO) {
-        return ${classNameVar}Mapper.selectList(exportReqVO);
-    }
-
-    public List<${table.className}ExcelVO> import${table.className}List(List<${table.className}ExcelVO> datas, Integer mode, boolean updatePart) {
-        if (CollUtil.isEmpty(datas)) {
-            throw exception(${simpleClassName_underlineCase.toUpperCase()}_IMPORT_LIST_IS_EMPTY);
-        }
-
-        List<${table.className}ExcelVO> errorList = new ArrayList<>();
-        datas.forEach(item -> {
-            if(errorList == null){
-                // 判断如果不存在，在进行插入
-                ${table.className}DO obj = ${classNameVar}Mapper.selectByCode(item.getCode());
-                if (obj == null&& mode != 3) {
-                    ${classNameVar}Mapper.insert(${table.className}Convert.INSTANCE.convert(item));
-                }
-                else if (obj != null && mode != 2) {// 如果存在，判断是否允许更新
-                    ${table.className}DO ${classNameVar}DO = ${table.className}Convert.INSTANCE.convert(item);
-                    ${classNameVar}DO.setId(obj.getId());
-                    ${classNameVar}Mapper.updateById(obj);
-                }
-            }
-        });
-
-        return errorList;
-    }
-}