|
@@ -4,6 +4,7 @@
|
|
package com.jeeplus.modules.sg.managementcenter.moduleacquisition.web;
|
|
package com.jeeplus.modules.sg.managementcenter.moduleacquisition.web;
|
|
|
|
|
|
|
|
|
|
|
|
+import com.jeeplus.common.config.Global;
|
|
import com.jeeplus.common.json.AjaxJson;
|
|
import com.jeeplus.common.json.AjaxJson;
|
|
import com.jeeplus.common.utils.StringUtils;
|
|
import com.jeeplus.common.utils.StringUtils;
|
|
import com.jeeplus.common.utils.excel.ImportExcel;
|
|
import com.jeeplus.common.utils.excel.ImportExcel;
|
|
@@ -73,6 +74,13 @@ public class ModuleBlockWeb extends BaseController {
|
|
@RequestMapping(value = "data")
|
|
@RequestMapping(value = "data")
|
|
public Map<String, Object> data(ModuleBlock moduleBlock, HttpServletRequest request, HttpServletResponse response, Model model) {
|
|
public Map<String, Object> data(ModuleBlock moduleBlock, HttpServletRequest request, HttpServletResponse response, Model model) {
|
|
Page<ModuleBlock> page = moduleBlockService.findPage(new Page<ModuleBlock>(request, response), moduleBlock);
|
|
Page<ModuleBlock> page = moduleBlockService.findPage(new Page<ModuleBlock>(request, response), moduleBlock);
|
|
|
|
+ //当判定系统为linux的时候
|
|
|
|
+ if (Global.SYS_TYPE.equals("2")) {
|
|
|
|
+ List<ModuleBlock> list = page.getList();
|
|
|
|
+ for (ModuleBlock moduleBlock1: list) {
|
|
|
|
+ moduleBlock1.setMdImg("http://" + request.getServerName() +moduleBlock1.getMdImg());
|
|
|
|
+ }
|
|
|
|
+ }
|
|
return getBootstrapData(page);
|
|
return getBootstrapData(page);
|
|
}
|
|
}
|
|
/**
|
|
/**
|
|
@@ -86,6 +94,13 @@ public class ModuleBlockWeb extends BaseController {
|
|
Integer version = new Integer(md_version) + 1;
|
|
Integer version = new Integer(md_version) + 1;
|
|
moduleBlock.setMdVersion(String.valueOf(version));
|
|
moduleBlock.setMdVersion(String.valueOf(version));
|
|
Page<ModuleBlock> page = moduleBlockService.findPage(new Page<ModuleBlock>(request, response), moduleBlock);
|
|
Page<ModuleBlock> page = moduleBlockService.findPage(new Page<ModuleBlock>(request, response), moduleBlock);
|
|
|
|
+ //当判定系统为linux的时候
|
|
|
|
+ if (Global.SYS_TYPE.equals("2")) {
|
|
|
|
+ List<ModuleBlock> list = page.getList();
|
|
|
|
+ for (ModuleBlock moduleBlock1: list) {
|
|
|
|
+ moduleBlock1.setMdImg("http://" + request.getServerName() +moduleBlock1.getMdImg());
|
|
|
|
+ }
|
|
|
|
+ }
|
|
return getBootstrapData(page);
|
|
return getBootstrapData(page);
|
|
}
|
|
}
|
|
|
|
|