diff --git a/src/main/java/com/zcloud/controller/eightwork/AppEightWorkController.java b/src/main/java/com/zcloud/controller/eightwork/AppEightWorkController.java index f661060..328d303 100644 --- a/src/main/java/com/zcloud/controller/eightwork/AppEightWorkController.java +++ b/src/main/java/com/zcloud/controller/eightwork/AppEightWorkController.java @@ -2,15 +2,21 @@ package com.zcloud.controller.eightwork; import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; import com.zcloud.entity.PageData; +import com.zcloud.entity.Response; +import com.zcloud.logs.LogAnno; import com.zcloud.service.eightwork.EightWorkService; +import com.zcloud.service.system.DictionariesService; import com.zcloud.util.*; +import org.apache.commons.lang.StringUtils; 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.List; import java.util.Map; @RestController @@ -21,6 +27,63 @@ public class AppEightWorkController extends BaseController { private Smb smb; @Autowired private EightWorkService eightWorkService; + @Autowired + private DictionariesService dictionariesService; + + /**八项作业列表 + * @param page + * @throws Exception + */ + @RequestMapping(value="/list") + @ResponseBody + @LogAnno(menuType= "手机",menuServer= "八项作业",instructionsOperate = "八项作业",instructionsType = "列表") + public Object list(Page page) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 + if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); +// pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + page.setPd(pd); + List varList = eightWorkService.list(page); //列出confinedspace列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + /** + * description: + * accidentType-风险点 + * hiddenLevel-隐患级别 + * + * @return tree or list + * @throws Exception all + */ + @RequestMapping(value = "/getInfo") + @ResponseBody + public Response getInfo() throws Exception { + Response response = Response.getResponse(); + try { + PageData request = this.getPageData(); + if (StringUtils.isBlank(request.getString("vectors"))) throw new RuntimeException("未找到要获取的数据字典类型"); + List vectors = Warden.getList(request.getString("vectors"),String.class); + for (String vector: vectors) { + switch (vector) { + case "accidentType": + //事故类型 + response.put("accidentType", dictionariesService.getTreeById("cee1190ea96a4ca9b7bca81e11f0d0f8")); + continue; + default: + } + } + return response.OK(); + } catch (Exception e) { + e.printStackTrace(); + return response.errorMessage(e.getMessage()); + } + } @RequestMapping("/saveFile") @ResponseBody diff --git a/src/main/java/com/zcloud/mapper/datasource/eightwork/EightWorkMapper.java b/src/main/java/com/zcloud/mapper/datasource/eightwork/EightWorkMapper.java new file mode 100644 index 0000000..77095f3 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/eightwork/EightWorkMapper.java @@ -0,0 +1,25 @@ +package com.zcloud.mapper.datasource.eightwork; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明:有限空间作业 + * 作者:luoxiaobao + * 时间:2021-09-13 + * 官网:www.zcloudchina.com + */ +public interface EightWorkMapper { + + + + /**列表 + * @param page + * @throws Exception + */ + List datalist(Page page); + +} + diff --git a/src/main/java/com/zcloud/service/eightwork/EightWorkService.java b/src/main/java/com/zcloud/service/eightwork/EightWorkService.java index 45cdd08..9f30af1 100644 --- a/src/main/java/com/zcloud/service/eightwork/EightWorkService.java +++ b/src/main/java/com/zcloud/service/eightwork/EightWorkService.java @@ -1,5 +1,6 @@ package com.zcloud.service.eightwork; +import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import java.util.List; @@ -11,4 +12,10 @@ import java.util.List; public interface EightWorkService { public List getTaskSetps(PageData pd); PageData checkWork(PageData pd); + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception; } diff --git a/src/main/java/com/zcloud/service/eightwork/impl/EightWorkServiceImpl.java b/src/main/java/com/zcloud/service/eightwork/impl/EightWorkServiceImpl.java index d7bea18..6a6f0b6 100644 --- a/src/main/java/com/zcloud/service/eightwork/impl/EightWorkServiceImpl.java +++ b/src/main/java/com/zcloud/service/eightwork/impl/EightWorkServiceImpl.java @@ -1,5 +1,6 @@ package com.zcloud.service.eightwork.impl; +import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.mapper.datasource.eightwork.EightWorkFlowLogMapper; import com.zcloud.mapper.datasource.eightwork.EightWorkTaskFlowMapper; @@ -7,6 +8,7 @@ import com.zcloud.service.eightwork.EightWorkService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import com.zcloud.mapper.datasource.eightwork.EightWorkMapper; import java.util.List; @@ -21,6 +23,10 @@ public class EightWorkServiceImpl implements EightWorkService { private EightWorkTaskFlowMapper eightWorkTaskFlowMapper; @Autowired private EightWorkFlowLogMapper eightWorkFlowLogMapper; + @Autowired + private EightWorkMapper eightworkMapper; + + @Override public List getTaskSetps(PageData pd) { return eightWorkTaskFlowMapper.getTaskSetps(pd); @@ -31,4 +37,12 @@ public class EightWorkServiceImpl implements EightWorkService { return null; } + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception{ + return eightworkMapper.datalist(page); + } + } diff --git a/src/main/resources/mybatis/datasource/eightwork/EightWorkMapper.xml b/src/main/resources/mybatis/datasource/eightwork/EightWorkMapper.xml new file mode 100644 index 0000000..fdfc9de --- /dev/null +++ b/src/main/resources/mybatis/datasource/eightwork/EightWorkMapper.xml @@ -0,0 +1,57 @@ + + + + + + + + +