diff --git a/src/main/java/com/zcloud/controller/accident/AccidentController.java b/src/main/java/com/zcloud/controller/accident/AccidentController.java index ff217f8..132eda2 100644 --- a/src/main/java/com/zcloud/controller/accident/AccidentController.java +++ b/src/main/java/com/zcloud/controller/accident/AccidentController.java @@ -14,6 +14,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.context.request.RequestAttributes; +import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.servlet.ModelAndView; import java.util.*; diff --git a/src/main/java/com/zcloud/controller/eightwork/AppEightWorkController.java b/src/main/java/com/zcloud/controller/eightwork/AppEightWorkController.java new file mode 100644 index 0000000..506e14a --- /dev/null +++ b/src/main/java/com/zcloud/controller/eightwork/AppEightWorkController.java @@ -0,0 +1,52 @@ +package com.zcloud.controller.eightwork; + + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.PageData; +import com.zcloud.util.*; +import org.apache.fop.util.DataURLUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.util.HashMap; +import java.util.Map; + +@RestController +@RequestMapping("/app/eightwork") +public class AppEightWorkController extends BaseController { + + + @Autowired + private Smb smb; + + @RequestMapping("/saveFile") + @ResponseBody + public Object saveFile(@RequestParam(value="file",required=false) MultipartFile file) throws Exception{ + Map map = new HashMap<>(); + String errorInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + if (null != file && !file.isEmpty()) { + String ffile = DateUtil.getDays(); + String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + pd.put("FILE_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); + } + map.put("result",errorInfo); + map.put("pd",pd); + return map; + } + + @RequestMapping("/deleteFile") + @ResponseBody + public Object deleteFile() throws Exception{ + Map map = new HashMap<>(); + String errorInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + smb.deleteFile(pd.getString("CORPINFO_ID")); + map.put("result",errorInfo); + return map; + } +} diff --git a/src/main/java/com/zcloud/controller/eightwork/AppHotworkController.java b/src/main/java/com/zcloud/controller/eightwork/AppHotworkController.java index 32425b6..65f0eef 100644 --- a/src/main/java/com/zcloud/controller/eightwork/AppHotworkController.java +++ b/src/main/java/com/zcloud/controller/eightwork/AppHotworkController.java @@ -90,4 +90,18 @@ public class AppHotworkController extends BaseController { map.put("result", errInfo); return map; } + + @RequestMapping("/findById") + @ResponseBody + public Object findById() throws Exception { + Map map = new HashMap<>(); + String errorInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = hotworkService.findById(pd); + map.put("result",errorInfo); + map.put("page",pd); + return map; + } + } diff --git a/src/main/java/com/zcloud/mapper/datasource/eightwork/HotworkMapper.java b/src/main/java/com/zcloud/mapper/datasource/eightwork/HotworkMapper.java index e4b1455..223f7b3 100644 --- a/src/main/java/com/zcloud/mapper/datasource/eightwork/HotworkMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/eightwork/HotworkMapper.java @@ -11,6 +11,7 @@ import java.util.List; */ public interface HotworkMapper { PageData getCode(PageData pd); + PageData findById(PageData pd); void save(PageData pd); void delete(PageData pd); void edit(PageData pd); diff --git a/src/main/java/com/zcloud/service/eightwork/HotworkService.java b/src/main/java/com/zcloud/service/eightwork/HotworkService.java index f5267ae..af5781e 100644 --- a/src/main/java/com/zcloud/service/eightwork/HotworkService.java +++ b/src/main/java/com/zcloud/service/eightwork/HotworkService.java @@ -5,6 +5,7 @@ import com.zcloud.entity.PageData; import org.springframework.web.multipart.MultipartFile; import java.util.List; +import net.sf.ehcache.constructs.nonstop.store.ExceptionOnTimeoutStore; /** * @author fangjiakai @@ -21,4 +22,6 @@ public interface HotworkService { void accept(PageData pd)throws Exception; void cancel(PageData pd)throws Exception; + + PageData findById(PageData pd) throws Exception; } diff --git a/src/main/java/com/zcloud/service/eightwork/impl/HotworkServiceImpl.java b/src/main/java/com/zcloud/service/eightwork/impl/HotworkServiceImpl.java index 09168a0..8b94514 100644 --- a/src/main/java/com/zcloud/service/eightwork/impl/HotworkServiceImpl.java +++ b/src/main/java/com/zcloud/service/eightwork/impl/HotworkServiceImpl.java @@ -194,6 +194,12 @@ public class HotworkServiceImpl implements HotworkService { saveLog(pd,pd.getString(flow.get("ACTOR_FIELD")),"-1"); } + @Override + public PageData findById(PageData pd) throws Exception { + PageData pageData = hotworkMapper.findById(pd); + return pageData; + } + private PageData getStep(Object TASK_ID, Object STEP_ID) throws Exception { PageData flow = new PageData(); flow.put("TASK_ID", TASK_ID); diff --git a/src/main/java/com/zcloud/service/system/DepartmentService.java b/src/main/java/com/zcloud/service/system/DepartmentService.java index 66f1935..1e5e939 100644 --- a/src/main/java/com/zcloud/service/system/DepartmentService.java +++ b/src/main/java/com/zcloud/service/system/DepartmentService.java @@ -141,5 +141,6 @@ public interface DepartmentService{ * @return */ public int getWorkedDepCount(PageData pd)throws Exception; + } diff --git a/src/main/resources/mybatis/datasource/eightwork/HighWorkMapper.xml b/src/main/resources/mybatis/datasource/eightwork/HighWorkMapper.xml index d59bb55..d438b90 100644 --- a/src/main/resources/mybatis/datasource/eightwork/HighWorkMapper.xml +++ b/src/main/resources/mybatis/datasource/eightwork/HighWorkMapper.xml @@ -221,6 +221,87 @@ HIGHWORK_ID = #{HIGHWORK_ID} + + update