修改模板代码

tnc-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai

@@ -3,7 +3,6 @@ package ${bussiPackage}.${entityPackage}.controller;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
@@ -43,15 +42,15 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 </#list>
 
  /**
- * @Description: ${tableVo.ftlDescription}
- * @Author: jeecg-boot
- * @Date:   ${.now?string["yyyy-MM-dd"]}
- * @Version: V1.0
+ * @description ${tableVo.ftlDescription}
+ * @author jeecg-boot
+ * @date ${.now?string["yyyy-MM-dd"]}
+ * @version V1.0
  */
+@Slf4j
 @Api(tags="${tableVo.ftlDescription}")
 @RestController
 @RequestMapping("/${entityPackage}/${entityName?uncap_first}")
-@Slf4j
 public class ${entityName}Controller extends JeecgController<${entityName}, I${entityName}Service> {
 	@Autowired
 	private I${entityName}Service ${entityName?uncap_first}Service;
@@ -79,7 +78,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e
 	}
 	
 	/**
-	 *   添加
+	 * 添加
 	 *
 	 * @param ${entityName?uncap_first}
 	 * @return
@@ -96,7 +95,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e
 	}
 	
 	/**
-	 *  编辑
+	 * 编辑
 	 *
 	 * @param ${entityName?uncap_first}
 	 * @return
@@ -110,7 +109,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e
 	}
 	
 	/**
-	 *   通过id删除
+	 * 通过id删除
 	 *
 	 * @param id
 	 * @return
@@ -155,23 +154,23 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e
 	}
 
     /**
-    * 导出excel
-    *
-    * @param request
-    * @param ${entityName?uncap_first}
-    */
+     * 导出excel
+     *
+     * @param request
+     * @param ${entityName?uncap_first}
+     */
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, ${entityName} ${entityName?uncap_first}) {
         return super.exportXls(request, ${entityName?uncap_first}, ${entityName}.class, "${tableVo.ftlDescription}");
     }
 
     /**
-      * 通过excel导入数据
-    *
-    * @param request
-    * @param response
-    * @return
-    */
+     * 通过excel导入数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, ${entityName}.class);

tnc-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai

@@ -18,10 +18,10 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
- * @Description: ${tableVo.ftlDescription}
- * @Author: jeecg-boot
- * @Date:   ${.now?string["yyyy-MM-dd"]}
- * @Version: V1.0
+ * @description ${tableVo.ftlDescription}
+ * @author jeecg-boot
+ * @date ${.now?string["yyyy-MM-dd"]}
+ * @version: V1.0
  */
 @Data
 @TableName("${tableName}")

tnc-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai

@@ -7,10 +7,10 @@ import ${bussiPackage}.${entityPackage}.entity.${entityName};
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
- * @Description: ${tableVo.ftlDescription}
- * @Author: jeecg-boot
- * @Date:   ${.now?string["yyyy-MM-dd"]}
- * @Version: V1.0
+ * @description ${tableVo.ftlDescription}
+ * @author jeecg-boot
+ * @date ${.now?string["yyyy-MM-dd"]}
+ * @version V1.0
  */
 public interface ${entityName}Mapper extends BaseMapper<${entityName}> {
 

tnc-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai

@@ -4,10 +4,10 @@ import ${bussiPackage}.${entityPackage}.entity.${entityName};
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
- * @Description: ${tableVo.ftlDescription}
- * @Author: jeecg-boot
- * @Date:   ${.now?string["yyyy-MM-dd"]}
- * @Version: V1.0
+ * @description ${tableVo.ftlDescription}
+ * @author jeecg-boot
+ * @date ${.now?string["yyyy-MM-dd"]}
+ * @version V1.0
  */
 public interface I${entityName}Service extends IService<${entityName}> {
 

tnc-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai

@@ -8,10 +8,10 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 /**
- * @Description: ${tableVo.ftlDescription}
- * @Author: jeecg-boot
- * @Date:   ${.now?string["yyyy-MM-dd"]}
- * @Version: V1.0
+ * @description ${tableVo.ftlDescription}
+ * @author jeecg-boot
+ * @date ${.now?string["yyyy-MM-dd"]}
+ * @version V1.0
  */
 @Service
 public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, ${entityName}> implements I${entityName}Service {

tnc-system/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai

@@ -14,7 +14,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.util.oConvertUtils;
 import ${bussiPackage}.${entityPackage}.entity.${entityName};
 import ${bussiPackage}.${entityPackage}.service.I${entityName}Service;
-import java.util.Date;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -58,10 +58,10 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e
 	  * @param request 请求
 	  * @return 结果
 	  */
-	@AutoLog(value = "${tableVo.ftlDescription}-分页列表查询")
+	//@AutoLog(value = "${tableVo.ftlDescription}-分页列表查询")
 	@ApiOperation(value="${tableVo.ftlDescription}-分页列表查询", notes="${tableVo.ftlDescription}-分页列表查询")
 	@GetMapping(value = "/list")
-	public Result<?> queryPageList(${entityName} ${entityName?uncap_first},
+	public Result<IPage<${entityName}>> queryPageList(${entityName} ${entityName?uncap_first},
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest request) {
@@ -124,7 +124,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids") String ids) {
 		this.${entityName?uncap_first}Service.removeByIds(Arrays.asList(ids.split(",")));
-		return Result.OK("批量删除成功！");
+		return Result.OK("批量删除成功!");
 	}
 	
 	/**
@@ -133,10 +133,10 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e
 	 * @param id 主键
 	 * @return 数据
 	 */
-	@AutoLog(value = "${tableVo.ftlDescription}-通过id查询")
+	//@AutoLog(value = "${tableVo.ftlDescription}-通过id查询")
 	@ApiOperation(value="${tableVo.ftlDescription}-通过id查询", notes="${tableVo.ftlDescription}-通过id查询")
 	@GetMapping(value = "/queryById")
-	public Result<?> queryById(@RequestParam(name="id") String id) {
+	public Result<${entityName}> queryById(@RequestParam(name="id") String id) {
 		${entityName} ${entityName?uncap_first} = ${entityName?uncap_first}Service.getById(id);
 		if(${entityName?uncap_first}==null) {
 			return Result.error("未找到对应数据");
@@ -147,8 +147,9 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e
   /**
    * 导出excel
    *
-   * @param request
-   * @param ${entityName?uncap_first}
+   * @param request 请求
+   * @param ${entityName?uncap_first} 对象
+   * @return excel文件
    */
   @RequestMapping(value = "/exportXls")
   public ModelAndView exportXls(HttpServletRequest request, ${entityName} ${entityName?uncap_first}) {

tnc-system/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai

@@ -16,10 +16,10 @@ import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
 /**
- * @description: ${tableVo.ftlDescription}
- * @author: jeecg-boot
- * @date:   ${.now?string["yyyy-MM-dd"]}
- * @version: V1.0
+ * @description ${tableVo.ftlDescription}
+ * @author jeecg-boot
+ * @date ${.now?string["yyyy-MM-dd"]}
+ * @version V1.0
  */
 @Data
 @TableName("${tableName}")

tnc-system/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai

@@ -7,10 +7,10 @@ import ${bussiPackage}.${entityPackage}.entity.${entityName};
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
- * @description: ${tableVo.ftlDescription}
- * @author: jeecg-boot
- * @date:   ${.now?string["yyyy-MM-dd"]}
- * @version: V1.0
+ * @description ${tableVo.ftlDescription}
+ * @author jeecg-boot
+ * @date ${.now?string["yyyy-MM-dd"]}
+ * @version V1.0
  */
 public interface ${entityName}Mapper extends BaseMapper<${entityName}> {
 

tnc-system/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai

@@ -4,10 +4,10 @@ import ${bussiPackage}.${entityPackage}.entity.${entityName};
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
- * @description: ${tableVo.ftlDescription}
- * @author: jeecg-boot
- * @date:   ${.now?string["yyyy-MM-dd"]}
- * @version: V1.0
+ * @description ${tableVo.ftlDescription}
+ * @author jeecg-boot
+ * @date ${.now?string["yyyy-MM-dd"]}
+ * @version V1.0
  */
 public interface I${entityName}Service extends IService<${entityName}> {
 

tnc-system/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai

@@ -8,10 +8,10 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 /**
- * @description: ${tableVo.ftlDescription}
- * @author: jeecg-boot
- * @date:   ${.now?string["yyyy-MM-dd"]}
- * @version: V1.0
+ * @description ${tableVo.ftlDescription}
+ * @author jeecg-boot
+ * @date ${.now?string["yyyy-MM-dd"]}
+ * @version V1.0
  */
 @Service
 public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, ${entityName}> implements I${entityName}Service {