Skip to content

A
amos-boot-biz
Commit 78243f43 authored by Tkunkun's avatar Tkunkun
Browse files
Options

修改装备异常显示

parent a7cd10d4
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 52 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentDetailController.java
View file @ 78243f43
......@@ -35,6 +35,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.*;
......@@ -197,9 +198,9 @@ public class EquipmentDetailController extends AbstractBaseController {
if(!equipmentParams.isEmpty()){
EquipmentParams equipmentParam = equipmentParams.get(0);
equipmentDetail.setStatus(equipmentParam.getStatus());
}else{
equipmentDetail.setStatus("正常");
}
equipmentDetail.setStatus("正常");
StockDetail stockDetail = null;
if(stockDetailId != null){
//解决灭火药剂，有多个货位状态问题
......@@ -607,18 +608,20 @@ public class EquipmentDetailController extends AbstractBaseController {
*/
@ApiOperation(value = "导出装备清单", notes = "导出装备清单")
@PostMapping(value = "/export")
@PostMapping(value = "/export",produces = "application/json;charset=UTF-8")
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
public void exportDangerList(@RequestBody List<DetailssAmountVO> detailssAmountVO,@RequestParam Integer prop, HttpServletResponse response) {
String fileName = "装备清单" + new Date().getTime();
String fileName =new Date().toString();
SimpleDateFormat formatter= new SimpleDateFormat("yyyyMMdd");
String format = formatter.format(new Date());
if(prop==1){//全部导出
List<DetailssAmountVO> getall = iEquipmentDetailService.getall();
List<DetailssAmountVO> detailssAmountVOS = this.selectReasonMeasure(getall);
FileHelper.exportExcel(detailssAmountVOS, "装备清单", "装备清单", DetailssAmountVO.class, fileName + ".xls", response);
FileHelper.exportExcel(detailssAmountVOS, "装备清单", "装备清单", DetailssAmountVO.class, format + ".xls", response);
}
else {//仅仅导出筛选结果的数据
List<DetailssAmountVO> detailssAmountVOS = this.selectReasonMeasure(detailssAmountVO);
FileHelper.exportExcel(detailssAmountVOS, "装备清单", "装备清单", DetailssAmountVO.class, fileName + ".xls", response);
FileHelper.exportExcel(detailssAmountVOS, "装备清单", "装备清单", DetailssAmountVO.class, format + ".xls", response);
}
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/TopographyController.java
View file @ 78243f43
......@@ -48,9 +48,9 @@ import java.util.concurrent.ConcurrentHashMap;
* @since 2021-10-14
*/
@RestController
@Api(tags = "网络拓扑Api")
@RequestMapping(value = "/topography")
//@RestController
//@Api(tags = "网络拓扑Api")
//@RequestMapping(value = "/topography")
public class TopographyController extends AbstractBaseController {
private final Logger logger = LogManager.getLogger(TopographyController.class);
......@@ -97,7 +97,7 @@ public class TopographyController extends AbstractBaseController {
// * 拓扑图-树
// *
// * @param type 节点类型
// * @return
// * @return
// */
// @TycloudOperation(ApiLevel = UserType.AGENCY)
// @ApiOperation(value = "拓扑图-树", notes = "拓扑图-树")
......@@ -108,20 +108,20 @@ public class TopographyController extends AbstractBaseController {
// List<TopographyTreeDTO> list = topographyService.getTree(reginParams.getCompany().getOrgCode(),TopoNodeTypeEnum.PAMS.getType());
// return ResponseHelper.buildResponse(list);
// }
//
//
//
//
// /**
// * 拓扑图
// *
// * @param type 节点类型
// * @return
// * @return
// */
// @GetMapping(value = "/nodes/{treeid}", produces = "application/json;charset=UTF-8")
// @TycloudOperation(ApiLevel = UserType.AGENCY)
// @ApiOperation(value = "拓扑图", notes = "拓扑图")
// public ResponseModel<Map<String,Object>> getNodesByTreeid(@ApiParam(value = "树id", required = false) @PathVariable String treeid) {
// //获取当前登录人的公司code
// ReginParams reginParams =getSelectedOrgInfo();
// ReginParams reginParams =getSelectedOrgInfo();
// List<TopographyNodeDTO> nodes = topographyService.getNodes(reginParams.getCompany().getOrgCode(),treeid,TopoNodeTypeEnum.PAMS.getType());
// List<TopographyLineDTO> links = topographyService.getLinks(reginParams.getCompany().getOrgCode(),treeid,TopoNodeTypeEnum.PAMS.getType());
// Map<String,Object> results = new HashMap<>();
......@@ -129,12 +129,12 @@ public class TopographyController extends AbstractBaseController {
// results.put("linkData", links);
// return ResponseHelper.buildResponse(results);
// }
//
//
// /**
// * 自建系统树
// *
// * @param type 节点类型
// * @return
// * @return
// */
// @GetMapping(value = "/selftree", produces = "application/json;charset=UTF-8")
// @TycloudOperation(ApiLevel = UserType.AGENCY)
......@@ -145,19 +145,19 @@ public class TopographyController extends AbstractBaseController {
// List<TopographyTreeDTO> list = topographyService.getTree(reginParams.getCompany().getOrgCode(),TopoNodeTypeEnum.自建系统.getType());
// return ResponseHelper.buildResponse(list);
// }
//
//
// /**
// * 自建系统拓扑图
// *
// * @param type 节点类型
// * @return
// * @return
// */
// @GetMapping(value = "/selfnodes/{treeid}", produces = "application/json;charset=UTF-8")
// @TycloudOperation(ApiLevel = UserType.AGENCY)
// @ApiOperation(value = "拓扑图", notes = "拓扑图")
// public CommonResponse getSelfNodesByTreeid(@ApiParam(value = "树id", required = false) @PathVariable String treeid) {
// //获取当前登录人的公司code
// ReginParams reginParams =getSelectedOrgInfo();
// ReginParams reginParams =getSelectedOrgInfo();
// List<TopographyNodeDTO> nodes = topographyService.getNodes("%#"+reginParams.getCompany().getOrgCode(),treeid,TopoNodeTypeEnum.自建系统.getType());
// List<TopographyLineDTO> links = topographyService.getLinks(reginParams.getCompany().getOrgCode(),treeid,TopoNodeTypeEnum.自建系统.getType());
// Map<String,Object> results = new HashMap<>();
......@@ -165,13 +165,13 @@ public class TopographyController extends AbstractBaseController {
// results.put("linkData", links);
// return ResponseHelper.buildResponse(results);
// }
//
//
//
//
// /**
// * 保存自建系统
// *
// * @param type 节点类型
// * @return
// * @return
// */
// @PostMapping(value = "/selfnodes", produces = "application/json;charset=UTF-8")
// @TycloudOperation(ApiLevel = UserType.AGENCY)
......@@ -179,25 +179,25 @@ public class TopographyController extends AbstractBaseController {
// public CommonResponse saveselfnodes(@ApiParam(value = "", required = false) @RequestBody JSONObject topography) {
// JSONArray nodes = topography.getJSONArray("nodeData");
// List<TopographyNodeDTO> nodeData = JSON.parseArray(JSON.toJSONString(nodes), TopographyNodeDTO.class);
//
//
// //获取当前登录人的公司code
// ReginParams reginParams =getSelectedOrgInfo();
// if(reginParams.getDepartment()!=null){
// topographyService.saveNodes(topographyService.getSelfOrgCode(),nodeData);
// }else{
// topographyService.saveNodes(topographyService.getSelfOrgCode(),nodeData);
//
//
// }
//
//
// return ResponseHelper.buildResponse();
// }
//
//
//
//
// /**
// * 保存拓扑图
// *
// * @param type 节点类型
// * @return
// * @return
// */
// @PostMapping(value = "/nodes", produces = "application/json;charset=UTF-8")
// @TycloudOperation(ApiLevel = UserType.AGENCY)
......@@ -211,16 +211,16 @@ public class TopographyController extends AbstractBaseController {
// topographyService.saveNodes(reginParams.getDepartment().getOrgCode(),nodeData);
// }else{
// topographyService.saveNodes(reginParams.getCompany().getOrgCode(),nodeData);
//
// }
//
// }
// return ResponseHelper.buildResponse();
// }
//
//
// /**
// * 异常
// *
// * @return
// * @throws Exception
// * @return
// * @throws Exception
// */
// @PostMapping(value = "/testAbnormal", produces = "application/json;charset=UTF-8")
// @TycloudOperation(ApiLevel = UserType.AGENCY)
......@@ -274,7 +274,7 @@ public class TopographyController extends AbstractBaseController {
// ReginParams reginParams =getSelectedOrgInfo();
// return ResponseHelper.buildResponse(topographyService.getTree(reginParams.getCompany().getOrgCode(),TopoNodeTypeEnum.网络拓扑图.getType()));
// }
//
//
// @PostMapping("/addWebTree")
// @TycloudOperation(ApiLevel = UserType.AGENCY)
// @ApiOperation(value = "添加树数据", notes = "添加树数据")
......@@ -286,9 +286,9 @@ public class TopographyController extends AbstractBaseController {
// }else{
// tree.setOrgCode(reginParams.getCompany().getOrgCode());
// }
//
//
// topographyService.addWebTree(tree);
//
//
// return ResponseHelper.buildResponse(topographyService.getTree(reginParams.getCompany().getOrgCode(),TopoNodeTypeEnum.网络拓扑图.getType()));
// }
......@@ -327,7 +327,7 @@ public class TopographyController extends AbstractBaseController {
// * 动环拓扑图-树
// *
// * @param type 节点类型
// * @return
// * @return
// */
// @GetMapping(value = "/donghuanTree", produces = "application/json;charset=UTF-8")
// @TycloudOperation(ApiLevel = UserType.AGENCY)
......@@ -338,12 +338,12 @@ public class TopographyController extends AbstractBaseController {
// List<TopographyTreeDTO> list = topographyService.getTree("%#"+reginParams.getCompany().getOrgCode(),TopoNodeTypeEnum.动环监控.getType());
// return ResponseHelper.buildResponse(list);
// }
//
//
// /**
// * 动环拓扑图
// *
// * @param type 节点类型
// * @return
// * @return
// */
// @GetMapping(value = "/donghuanNodes/{treeid}", produces = "application/json;charset=UTF-8")
// @TycloudOperation(ApiLevel = UserType.AGENCY)
......@@ -358,12 +358,12 @@ public class TopographyController extends AbstractBaseController {
// results.put("linkData", links);
// return ResponseHelper.buildResponse(results);
// }
//
//
// /**
// * 保存动环拓扑图
// *
// * @param type 节点类型
// * @return
// * @return
// */
// @PostMapping(value = "/donghuanNodes", produces = "application/json;charset=UTF-8")
// @TycloudOperation(ApiLevel = UserType.AGENCY)
......@@ -371,24 +371,24 @@ public class TopographyController extends AbstractBaseController {
// public CommonResponse savedonghuanNodes(@ApiParam(value = "", required = false) @RequestBody JSONObject topography) {
// JSONArray nodes = topography.getJSONArray("nodeData");
// List<TopographyNodeDTO> nodeData = JSON.parseArray(JSON.toJSONString(nodes), TopographyNodeDTO.class);
//
//
// //获取当前登录人的公司code
// ReginParams reginParams =getSelectedOrgInfo();
// if(reginParams.getDepartment()!=null){
// topographyService.saveNodes(topographyService.getSelfOrgCode(),nodeData);
// }else{
// topographyService.saveNodes(topographyService.getSelfOrgCode(),nodeData);
//
//
// }
//
//
// return ResponseHelper.buildResponse();
// }
//
//
// /**
// * 获取设备监控拓扑图
// *
// * @param type 节点类型
// * @return
// * @return
// */
// @GetMapping(value = "/deviceNodes", produces = "application/json;charset=UTF-8")
// @TycloudOperation(ApiLevel = UserType.AGENCY)
......@@ -396,19 +396,19 @@ public class TopographyController extends AbstractBaseController {
// public CommonResponse deviceNodes() {
// //获取当前登录人的公司code
// ReginParams reginParams =getSelectedOrgInfo();
// List<Map> nodes = topographyService.getDeviceNodes(reginParams.getCompany().getOrgCode());
// List<Map> nodes = topographyService.getDeviceNodes(reginParams.getCompany().getOrgCode());
// List<TopographyLineDTO> links = topographyService.getDeviceLinks(reginParams.getCompany().getOrgCode());
// Map<String,Object> results = new HashMap<>();
// results.put("nodeData", nodes);
// results.put("linkData", links);
// return ResponseHelper.buildResponse(results);
// }
//
//
// /**
// * 保存设备监控拓扑图
// *
// * @param type 节点类型
// * @return
// * @return
// */
// @PostMapping(value = "/deviceNodes", produces = "application/json;charset=UTF-8")
// @TycloudOperation(ApiLevel = UserType.AGENCY)
......@@ -416,15 +416,15 @@ public class TopographyController extends AbstractBaseController {
// public CommonResponse saveDeviceNodes(@ApiParam(value = "", required = false) @RequestBody JSONObject topography) {
// JSONArray nodes = topography.getJSONArray("nodeData");
// List<TopographyNodeDTO> nodeData = JSON.parseArray(JSON.toJSONString(nodes), TopographyNodeDTO.class);
//
//
//
//
// //获取当前登录人的公司code
// ReginParams reginParams =getSelectedOrgInfo();
// if(reginParams.getDepartment()!=null){
// topographyService.saveNodes(topographyService.getSelfOrgCode(),nodeData);
// }else{
// topographyService.saveNodes(topographyService.getSelfOrgCode(),nodeData);
//
//
// }
// return ResponseHelper.buildResponse();
// }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment