|
@@ -21,6 +21,7 @@ import com.github.pagehelper.PageInfo;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
|
+
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import java.io.File;
|
|
import java.io.File;
|
|
@@ -48,6 +49,7 @@ public class SceneGeneralTemplateController {
|
|
LogService logService;
|
|
LogService logService;
|
|
@Autowired
|
|
@Autowired
|
|
DictService dictService;
|
|
DictService dictService;
|
|
|
|
+
|
|
//查询列表
|
|
//查询列表
|
|
@PostMapping("/querySceneGeneralTemplateList")
|
|
@PostMapping("/querySceneGeneralTemplateList")
|
|
@ResponseBody
|
|
@ResponseBody
|
|
@@ -72,7 +74,7 @@ public class SceneGeneralTemplateController {
|
|
//新增泛化模板 带任务的
|
|
//新增泛化模板 带任务的
|
|
@PostMapping("/saveSceneGeneralTemplateNew")
|
|
@PostMapping("/saveSceneGeneralTemplateNew")
|
|
@ResponseBody
|
|
@ResponseBody
|
|
- public ResponseBodyVO<String> saveSceneGeneralTemplateNew(@RequestParam("file") MultipartFile multipartFile,@RequestBody SceneImportPO sceneImportPO) {
|
|
|
|
|
|
+ public ResponseBodyVO<String> saveSceneGeneralTemplateNew(@RequestParam("file") MultipartFile multipartFile, @RequestBody SceneImportPO sceneImportPO) {
|
|
File file = null;
|
|
File file = null;
|
|
String originalFilename = multipartFile.getOriginalFilename();
|
|
String originalFilename = multipartFile.getOriginalFilename();
|
|
if (originalFilename.indexOf(".xls") == -1 && originalFilename.indexOf(".xlsx") == -1) {
|
|
if (originalFilename.indexOf(".xls") == -1 && originalFilename.indexOf(".xlsx") == -1) {
|
|
@@ -81,10 +83,10 @@ public class SceneGeneralTemplateController {
|
|
}
|
|
}
|
|
//版本号
|
|
//版本号
|
|
String version = TimeUtil.getToStringDate(new Date(), 5);
|
|
String version = TimeUtil.getToStringDate(new Date(), 5);
|
|
- SceneImportPO sceneImportPO1=sceneImportService.saveTask(sceneImportPO);
|
|
|
|
|
|
+ SceneImportPO sceneImportPO1 = sceneImportService.saveTask(sceneImportPO);
|
|
try {
|
|
try {
|
|
ResponseBodyVO<String> respon;
|
|
ResponseBodyVO<String> respon;
|
|
- // Integer nowTime = TimeUtil.getRq(new Date(), 0);
|
|
|
|
|
|
+ // Integer nowTime = TimeUtil.getRq(new Date(), 0);
|
|
String fileName = "泛化场景/" + version + "/" + originalFilename;
|
|
String fileName = "泛化场景/" + version + "/" + originalFilename;
|
|
respon = fileDownService.upload(multipartFile, fileName);
|
|
respon = fileDownService.upload(multipartFile, fileName);
|
|
|
|
|
|
@@ -99,7 +101,7 @@ public class SceneGeneralTemplateController {
|
|
}
|
|
}
|
|
sceneImportPO1.setStatus(DictConstants.SCENE_IMPORT_STATUS_2);
|
|
sceneImportPO1.setStatus(DictConstants.SCENE_IMPORT_STATUS_2);
|
|
sceneImportService.updateStatus(sceneImportPO1);
|
|
sceneImportService.updateStatus(sceneImportPO1);
|
|
- sceneImportPO =sceneGeneralTemplateService.saveSceneGeneralTemplateNew(file, version,sceneImportPO);
|
|
|
|
|
|
+ sceneImportPO = sceneGeneralTemplateService.saveSceneGeneralTemplateNew(file, version, sceneImportPO);
|
|
sceneImportService.updateStatus(sceneImportPO);
|
|
sceneImportService.updateStatus(sceneImportPO);
|
|
return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
|
|
return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
|
|
|
|
|
|
@@ -144,17 +146,18 @@ public class SceneGeneralTemplateController {
|
|
@PostMapping("/deleteSceneGeneralTemplateById")
|
|
@PostMapping("/deleteSceneGeneralTemplateById")
|
|
@ResponseBody
|
|
@ResponseBody
|
|
public ResponseBodyVO<String> deleteSceneGeneralTemplateById(@RequestBody SceneGeneralTemplatePO po) {
|
|
public ResponseBodyVO<String> deleteSceneGeneralTemplateById(@RequestBody SceneGeneralTemplatePO po) {
|
|
- sceneGeneralTemplateService.deleteSceneGeneralTemplateById(po);
|
|
|
|
|
|
+ sceneGeneralTemplateService.deleteSceneGeneralTemplateById(po);
|
|
return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
|
|
return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
|
|
|
|
|
|
}
|
|
}
|
|
|
|
+
|
|
//批量删除泛化模板
|
|
//批量删除泛化模板
|
|
@PostMapping("/deleteSceneGeneralTemplateByIds")
|
|
@PostMapping("/deleteSceneGeneralTemplateByIds")
|
|
@ResponseBody
|
|
@ResponseBody
|
|
public ResponseBodyVO<String> deleteSceneGeneralTemplateByIds(@RequestBody SceneGeneralTemplateParam params) {
|
|
public ResponseBodyVO<String> deleteSceneGeneralTemplateByIds(@RequestBody SceneGeneralTemplateParam params) {
|
|
- List<String> fhNameList=params.getFhNameList();
|
|
|
|
- SceneGeneralTemplatePO po=new SceneGeneralTemplatePO();
|
|
|
|
- for (String fhName: fhNameList) {
|
|
|
|
|
|
+ List<String> fhNameList = params.getFhNameList();
|
|
|
|
+ SceneGeneralTemplatePO po = new SceneGeneralTemplatePO();
|
|
|
|
+ for (String fhName : fhNameList) {
|
|
po.setSceneId(fhName);
|
|
po.setSceneId(fhName);
|
|
sceneGeneralTemplateService.deleteSceneGeneralTemplateById(po);
|
|
sceneGeneralTemplateService.deleteSceneGeneralTemplateById(po);
|
|
}
|
|
}
|
|
@@ -213,6 +216,7 @@ public class SceneGeneralTemplateController {
|
|
return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE, "参数不能为空,请检查");
|
|
return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE, "参数不能为空,请检查");
|
|
}
|
|
}
|
|
*/
|
|
*/
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 对象转Map
|
|
* 对象转Map
|
|
*
|
|
*
|
|
@@ -236,17 +240,17 @@ public class SceneGeneralTemplateController {
|
|
@ResponseBody
|
|
@ResponseBody
|
|
public ResponseBodyVO<String> saveSceneGeneralTemplateAll(@RequestParam("file") MultipartFile multipartFile, HttpServletRequest request) {
|
|
public ResponseBodyVO<String> saveSceneGeneralTemplateAll(@RequestParam("file") MultipartFile multipartFile, HttpServletRequest request) {
|
|
|
|
|
|
- SceneImportPO sceneImportPO=new SceneImportPO();
|
|
|
|
|
|
+ SceneImportPO sceneImportPO = new SceneImportPO();
|
|
//获取文件类型
|
|
//获取文件类型
|
|
String taskName = request.getParameter("taskName");
|
|
String taskName = request.getParameter("taskName");
|
|
sceneImportPO.setName(taskName);
|
|
sceneImportPO.setName(taskName);
|
|
sceneImportPO.setSceneType("4");
|
|
sceneImportPO.setSceneType("4");
|
|
- sceneImportPO=sceneImportService.saveTask(sceneImportPO);
|
|
|
|
- //记录日志
|
|
|
|
- Map<String,String> mapType= dictService.getDictMapByType(DictConstants.SCENE_TYPE);
|
|
|
|
- String type= mapType.get(DictConstants.SCENE_GENERAL);
|
|
|
|
- String content="创建"+type+"上传任务:"+sceneImportPO.getName()+"(ID:"+sceneImportPO.getId()+")";
|
|
|
|
- logService.logSceneUpload(LogConstants.SYS_LOG_SCENE_TASK_INSERT,content);
|
|
|
|
|
|
+ sceneImportPO = sceneImportService.saveTask(sceneImportPO);
|
|
|
|
+ //记录日志
|
|
|
|
+ Map<String, String> mapType = dictService.getDictMapByType(DictConstants.SCENE_TYPE);
|
|
|
|
+ String type = mapType.get(DictConstants.SCENE_GENERAL);
|
|
|
|
+ String content = "创建" + type + "上传任务:" + sceneImportPO.getName() + "(ID:" + sceneImportPO.getId() + ")";
|
|
|
|
+ logService.logSceneUpload(LogConstants.SYS_LOG_SCENE_TASK_INSERT, content);
|
|
|
|
|
|
|
|
|
|
sceneImportPO.setStatus(DictConstants.SCENE_IMPORT_STATUS_2);
|
|
sceneImportPO.setStatus(DictConstants.SCENE_IMPORT_STATUS_2);
|
|
@@ -277,8 +281,8 @@ public class SceneGeneralTemplateController {
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
- sceneImportPO= sceneGeneralTemplateService.saveSceneGeneralTemplateNew(file, version,sceneImportPO);
|
|
|
|
- sceneImportService.updateInfo(sceneImportPO);
|
|
|
|
|
|
+ sceneImportPO = sceneGeneralTemplateService.saveSceneGeneralTemplateNew(file, version, sceneImportPO);
|
|
|
|
+ sceneImportService.updateInfo(sceneImportPO);
|
|
return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
|
|
return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
|
|
|
|
|
|
}
|
|
}
|