Merge branch 'master' of http://git.zthymaoyi.com/zyw/tourism

unimall-core/src/main/resources/vm/java/domain.java.vm

@@ -1,4 +1,4 @@
-package ${packageName}.data.domain.${moduleName};
+package ${packageName}.data.domain;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -23,7 +23,7 @@ import ${import};
 #set($Entity="BaseEntity")
 @Data
 @TableName("${tableName}")
-public class ${ClassName} extends BaseDO{
+public class ${ClassName} extends SuperDO{
     private static final long serialVersionUID = 1L;
 
 #foreach ($column in $columns)

unimall-core/src/main/resources/vm/java/mapper.java.vm

@@ -1,6 +1,6 @@
-package ${packageName}.data.mapper.${moduleName};
+package ${packageName}.data.mapper;
 
-import ${packageName}.data.domain.${moduleName}.${ClassName};
+import ${packageName}.data.domain.${ClassName};
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 /**
  * ${functionName}Mapper接口

unimall-core/src/main/resources/vm/java/service.java.vm

@@ -19,11 +19,10 @@ import java.util.Date;
  */
 @HttpOpenApi(group = "admin.${moduleName}.${className}", description = "${functionName}")
 public interface I${ClassName}Service{
-	@HttpMethod(description = "新增", permission = "admin:${moduleName}:${className}:add", permissionParentName = "宠物管理", permissionName = "${functionName}管理")
-	public Boolean add(@NotNull @HttpParam(name = "${className}", type = HttpParamType.COMMON, description = "${functionName}") ${ClassName} ${className},
-						   @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+	@HttpMethod(description = "新增",   permissionName = "${functionName}管理")
+	public Boolean add(@NotNull @HttpParam(name = "${className}", type = HttpParamType.COMMON, description = "${functionName}") ${ClassName} ${className})throws ServiceException;
 
-	@HttpMethod(description = "列表", permission = "admin:${moduleName}:${className}:list",permissionParentName = "宠物管理", permissionName = "${functionName}管理")
+	@HttpMethod(description = "列表", permissionName = "${functionName}管理")
 	public Page<${ClassName}> list(
 	#foreach ($column in $columns)
 		#if($column.isQuery==1)
@@ -34,17 +33,16 @@ public interface I${ClassName}Service{
 		@HttpParam(name = "limit", type = HttpParamType.COMMON, description = "页码长度", valueDef = "20") Integer limit)
 		throws ServiceException;
 
-	@HttpMethod(description = "删除", permission = "admin:${moduleName}:${className}:delete",permissionParentName = "宠物管理", permissionName = "${functionName}管理")
+	@HttpMethod(description = "删除",permissionName = "${functionName}管理")
 	public Boolean delete(@NotNull @HttpParam(name = "${pkColumn.javaField}", type = HttpParamType.COMMON, description = "${pkColumn.columnComment}")String ${pkColumn.javaField})throws ServiceException;
 
-	@HttpMethod(description = "修改", permission = "admin:${moduleName}:${className}:update",permissionParentName = "宠物管理", permissionName = "${functionName}管理")
-	public Boolean update(@NotNull @HttpParam(name = "${className}", type = HttpParamType.COMMON, description = "${functionName}") ${ClassName} ${className},
-						  @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+	@HttpMethod(description = "修改",  permissionName = "${functionName}管理")
+	public Boolean update(@NotNull @HttpParam(name = "${className}", type = HttpParamType.COMMON, description = "${functionName}") ${ClassName} ${className})throws ServiceException;
 
-	@HttpMethod(description = "查询", permission = "admin:${moduleName}:${className}:get",permissionParentName = "宠物管理", permissionName = "${functionName}管理")
+	@HttpMethod(description = "查询", permissionName = "${functionName}管理")
 	public ${ClassName} get(@NotNull @HttpParam(name = "${pkColumn.javaField}", type = HttpParamType.COMMON, description = "${pkColumn.columnComment}")${pkColumn.javaType} ${pkColumn.javaField})throws ServiceException;
 	
-	@HttpMethod(description = "导出excl表", permission = "admin:${moduleName}:${className}:export",permissionParentName = "宠物管理", permissionName = "${functionName}管理")
+	@HttpMethod(description = "导出excl表",  permissionName = "${functionName}管理")
 	public String export(
 	#foreach ($column in $columns)
 		#if($column.isQuery==1)

unimall-core/src/main/resources/vm/java/serviceImpl.java.vm

@@ -1,4 +1,4 @@
-package ${packageName}.admin.api.${moduleName};
+package ${packageName}.admin.api.${moduleName}.impl;
 
 import java.util.List;
 
@@ -11,8 +11,8 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.iotechn.unimall.core.exception.ServiceException;
 import com.iotechn.unimall.data.util.ExcelUtil;
-import ${packageName}.data.mapper.${moduleName}.${ClassName}Mapper;
-import ${packageName}.data.domain.${moduleName}.${ClassName};
+import ${packageName}.data.mapper.${ClassName}Mapper;
+import ${packageName}.data.domain.${ClassName};
 import ${packageName}.admin.api.${moduleName}.I${ClassName}Service;
 import com.iotechn.unimall.data.model.Page;
 import java.util.Date;
@@ -30,11 +30,10 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service{
 	private ${ClassName}Mapper ${className}Mapper;
 	
 	@Override
-	public Boolean add(${ClassName} ${className},Long adminId) throws ServiceException {
+	public Boolean add(${ClassName} ${className}) throws ServiceException {
 		Date now = new Date();
 		${className}.setGmtCreate(now);
 		${className}.setGmtUpdate(now);
-		${className}.setAdminId(adminId);
 		return ${className}Mapper.insert(${className})>0;
 	}
 
@@ -61,7 +60,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service{
 		for (String tt:ids) {
 			${ClassName} tmp =  ${className}Mapper.selectById(Long.parseLong(tt));
 			if(tmp != null){
-				tmp.setDeleteFlag(1);
+				tmp.setDeleteFlag(1l);
 				${className}Mapper.updateById(tmp);
 			}
 		}
@@ -69,10 +68,9 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service{
 	}
 
 	@Override
-	public Boolean update(${ClassName} ${className},Long adminId) throws ServiceException {
+	public Boolean update(${ClassName} ${className}) throws ServiceException {
 		Date now = new Date();
 		${className}.setGmtUpdate(now);
-		${className}.setAdminId(adminId);
 		return ${className}Mapper.updateById(${className})>0;
 	}
 

unimall-core/src/main/resources/vm/xml/mapper.xml.vm

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="${packageName}.data.mapper.${moduleName}.${ClassName}Mapper">
+<mapper namespace="${packageName}.data.mapper.${ClassName}Mapper">
     
 ##    <resultMap type="${ClassName}" id="${ClassName}Result">
 ###foreach ($column in $columns)