clay
/
hcybasenew
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

11

This commit is contained in:
20932067@zju.edu.cn 2021-01-28 17:42:21 +08:00
parent e8fe91ed6e
commit 17358bf2cd
3 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hchyun/hchyun-generator/src/main/java/com/hchyun/generator/controller/InterTableController.java
View File

@ -98,14 +98,12 @@ public class InterTableController extends HcyBaseController {
@GetMapping("/modulepreview/{id}") @GetMapping("/modulepreview/{id}")
public AjaxResult modulePreview(@PathVariable("id") Long id){ public AjaxResult modulePreview(@PathVariable("id") Long id){
try { try {
Map<String,String> dataMap = new HashMap<>();
dataMap.put("Test00.java","Test00.java");
dataMap.put("Test01.java","Test01.java");
dataMap.put("Test02.java","Test02.java");
dataMap.put("Test03.java","Test03.java");
dataMap.put("Test04.java","Test04.java");
ServerResult<Map<String,Object>> serverResult = interTableService.previewCodeMoudle(id); ServerResult<Map<String,Object>> serverResult = interTableService.previewCodeMoudle(id);
return AjaxResult.success(dataMap); if (serverResult.isStart()){
return AjaxResult.success(serverResult.getData());
}else {
return AjaxResult.error(serverResult.getMsg());
}
}catch (RuntimeException e){ }catch (RuntimeException e){
logger.error(e.getMessage()); logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR); return AjaxResult.error(ReturnConstants.SYS_ERROR);

5
hchyun/hchyun-generator/src/main/java/com/hchyun/generator/service/impl/InterTableServiceImpl.java
View File

@ -219,14 +219,13 @@ public class InterTableServiceImpl implements InterTableService {
List<InterTable> interTableList = interTableDao.selectInterTableModule(mid); List<InterTable> interTableList = interTableDao.selectInterTableModule(mid);
VelocityInitializer.initVelocity(); VelocityInitializer.initVelocity();
List<VelocityContext> contextList = InterTableUtils.prepareMoudleContext(interTableList); List<VelocityContext> contextList = InterTableUtils.prepareMoudleContext(interTableList);
String templates = InterTableUtils.getTemplateList(1); String templates = InterTableUtils.getTemplateList(2);
for (VelocityContext context : contextList){ for (VelocityContext context : contextList){
StringWriter sw = new StringWriter(); StringWriter sw = new StringWriter();
Template template = Velocity.getTemplate(templates, Constants.UTF8); Template template = Velocity.getTemplate(templates, Constants.UTF8);
template.merge(context,sw); template.merge(context,sw);
dataMap.put(getJavaClassName(context.get("ClassName")),sw.toString()); dataMap.put(getJavaClassName((String) context.get("ClassName")),sw.toString());
} }
dataMap.put("data",contextList);
return new ServerResult<Map<String,Object>>(true,dataMap); return new ServerResult<Map<String,Object>>(true,dataMap);
}catch (RuntimeException e){ }catch (RuntimeException e){
logger.error(e.getMessage()); logger.error(e.getMessage());

12
hchyun/hchyun-generator/src/main/resources/vm/java/class.java.vm
View File

@ -1,4 +1,4 @@
package ${packageName}controller; package ${packageName}.controller;
/** /**
* ${ClassName} ${functionName} * ${ClassName} ${functionName}
@ -7,9 +7,13 @@ package ${packageName}controller;
* @Email ${emali} * @Email ${emali}
* @Date ${time} * @Date ${time}
*/ */
import com.hchyun.common.annotation.Log;
import com.hchyun.common.constant.ReturnConstants; import com.hchyun.common.constant.ReturnConstants;
import com.hchyun.common.core.controller.BaseController; import com.hchyun.common.core.controller.BaseController;
import com.hchyun.common.core.entity.AjaxResult; import com.hchyun.common.core.entity.AjaxResult;
import com.hchyun.common.enums.BusinessType;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
@ -23,7 +27,7 @@ import org.springframework.web.bind.annotation.RestController;
import java.util.Map; import java.util.Map;
#if($Permission) #if($Permission)
@Api("${functionName}") @Api(value = "${functionName}",tags = "${functionName}")
#end #end
@RestController @RestController
@RequestMapping("${reqMapping}") @RequestMapping("${reqMapping}")
@ -42,7 +46,11 @@ public class ${ClassName}Controller extends BaseController{
@Log(title = "${column.itDescribe}", businessType = BusinessType.INSERT) @Log(title = "${column.itDescribe}", businessType = BusinessType.INSERT)
#end #end
@${column.method}Mapping("/${column.requrl}") @${column.method}Mapping("/${column.requrl}")
#if($column.method.equals("Get"))
public AjaxResult ${InterName} ( Map<String,String> parms){
#else
public AjaxResult ${InterName} (@RequestBody Map<String,String> parms){ public AjaxResult ${InterName} (@RequestBody Map<String,String> parms){
#end
try { try {
return AjaxResult.success("${column.itDescribe}测试!"); return AjaxResult.success("${column.itDescribe}测试!");
}catch (RuntimeException e){ }catch (RuntimeException e){