Skip to content

Y
YeeAmosFireAutoSysRoot
Commit f6357920 authored by KeYong's avatar KeYong
Browse files
Options

Merge remote-tracking branch 'origin/dev_upgrade_huaian' into dev_upgrade_huaian

parents ad0df265 62c66b9d
Hide whitespace changes
Inline Side-by-side
Showing with 81 additions and 24 deletions
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/EquipmentController.java
View file @ f6357920
package com.yeejoin.amos.fas.business.controller;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.*;
import com.alibaba.fastjson.JSONObject;
import com.yeejoin.amos.component.robot.BadRequest;
import com.yeejoin.amos.fas.business.util.ExcelUtils;
import com.yeejoin.amos.fas.core.util.*;
......@@ -48,7 +47,7 @@ public class EquipmentController extends BaseController {
@RequestMapping(value = "", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
public CommonResponse create(@RequestBody Equipment equipment) throws Exception {
ReginParams reginParams =getSelectedOrgInfo();
String compCode=getOrgCode(reginParams);
equipment.setCreateBy(getUserId());
......@@ -78,7 +77,7 @@ public class EquipmentController extends BaseController {
@RequestMapping(value = "/{ids}", produces = "application/json;charset=UTF-8", method = RequestMethod.DELETE)
public CommonResponse delete(@PathVariable String ids) throws Exception {
String[] idArray = ids.split(",");
if(iEquipService.countFemaRelation(idArray) > 0) {
return CommonResponseUtil.failure("该重点设备已被FMEA绑定，请先删除绑定关系");
}
......@@ -139,6 +138,21 @@ public class EquipmentController extends BaseController {
return CommonResponseUtil.success(list);
}
/**
* 保护对象查询查询，不分页
* @return
*/
@Permission
@ApiOperation(httpMethod = "GET", value = "保护对象查询不分页", notes = "保护对象查询不分页")
@RequestMapping(value = "/all-list-for-studio", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public ResponseModel queryImpEquipNoPageForStudio() {
List<Equipment> list = iEquipService.queryEquipNoPage();
List<Equipment> result = Objects.isNull(list) ? Collections.emptyList() : list;
return CommonResponseUtil2.success(result);
}
/**
* 绑定消防设备
......@@ -302,14 +316,14 @@ public class EquipmentController extends BaseController {
return CommonResponseUtil.success(iEquipService.findAll());
}
//
//
// @ApiOperation(httpMethod = "POST",value = "添加重点设备", notes = "添加重点设备")
// @RequestMapping(value = "/point", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
// public CommonResponse point(@RequestBody List<EquipmentPlanPoint> point) throws Exception{
// iEquipService.savePlanPoint(point);
// return CommonResponseUtil.success();
// }
//
//
// @ApiOperation(httpMethod = "DELETE",value = "删除重点设备", notes = "查询单个重点设备")
// @RequestMapping(value = "/point/{ids}", produces = "application/json;charset=UTF-8", method = RequestMethod.DELETE)
// public CommonResponse deletePoint(@PathVariable Long[] ids) throws Exception {
......
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/FireSourceController.java
View file @ f6357920
package com.yeejoin.amos.fas.business.controller;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yeejoin.amos.fas.business.param.CommonPageInfoParam;
import com.yeejoin.amos.fas.business.service.intfc.IEquipmentService;
import com.yeejoin.amos.fas.business.service.intfc.IFireCarService;
......@@ -12,6 +14,8 @@ import com.yeejoin.amos.fas.core.common.request.CommonRequest;
import com.yeejoin.amos.fas.core.util.CommonResponse;
import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
import com.yeejoin.amos.fas.core.util.CommonResponseUtil2;
import com.yeejoin.amos.fas.core.util.ResponseModel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
......@@ -23,8 +27,10 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.web.bind.annotation.*;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@RestController
@RequestMapping(value = "/api/fireSource")
......@@ -44,7 +50,7 @@ public class FireSourceController extends BaseController {
// @ApiOperation(httpMethod = "POST", value = "添加消防装备", notes = "添加消防装备")
// @RequestMapping(value = "", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
// public CommonResponse create(@RequestBody FireEquipment fireEquipment) throws Exception {
//
//
// if(fireEquipment.getId() == 0l) {//新增
// Boolean existByCode = iFireEquipService.isExistByCode(fireEquipment.getCode());
// if(existByCode){
......@@ -56,11 +62,11 @@ public class FireSourceController extends BaseController {
// fireEquipment.setCreateBy(getUserId());
// fireEquipment.setCreateDate(new Date());
// fireEquipment.setOrgCode(compCode);
//
//
// //设备状态默认为正常
// fireEquipment.setEquipStatus(0);
//
//
//
//
// return CommonResponseUtil.success(iFireEquipService.save(fireEquipment));
// }
......@@ -189,6 +195,37 @@ public class FireSourceController extends BaseController {
}
@Permission
@ApiOperation(httpMethod = "GET", value = "查询消防设备历史数据", notes = "查询消防设备历史数据")
@RequestMapping(value = "/data/history-for-studio", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public ResponseModel queryForFireEquipmentHistoryForStudio(
@ApiParam(value = "设备名称", required = false) @RequestParam(required = false) String fireEquipmentName,
@ApiParam(value = "按保护对象名称", required = false) @RequestParam(required = false) String equipmentName,
@ApiParam(value = "开始日期", required = false) @RequestParam(required = false) String startTime,
@ApiParam(value = "结束日期", required = false) @RequestParam(required = false) String endTime,
@ApiParam(value = "当前页码", required = false) @RequestParam(required = true) int pageNumber,
@ApiParam(value = "每页大小", required = false) @RequestParam(required = true) int pageSize) {
if (pageNumber >= 1) {
--pageNumber;
}
Page page;
try {
CommonPageable commonPageable = new CommonPageable(pageNumber, pageSize);
page = iFireEquipService.queryForFireEquipmentHistory(
StringUtils.trimToNull(fireEquipmentName), StringUtils.trimToNull(equipmentName),
StringUtils.trimToNull(startTime), StringUtils.trimToNull(endTime), commonPageable);
} catch (Exception e) {
return CommonResponseUtil2.failure(e.getMessage());
}
com.baomidou.mybatisplus.extension.plugins.pagination.Page<Object> objectPage = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>();
objectPage.setCurrent(page.getNumber());
objectPage.setRecords(page.getContent());
objectPage.setTotal(page.getTotalElements());
objectPage.setPages(page.getTotalPages());
return CommonResponseUtil2.success(objectPage);
}
@Permission
@ApiOperation(httpMethod = "GET", value = "查询消防设备列表", notes = "查询消防设备列表")
@RequestMapping(value = "/info/page", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse queryForEquipmentList(
......@@ -215,6 +252,6 @@ public class FireSourceController extends BaseController {
log.error(e.getMessage(),e);
return CommonResponseUtil.failure("消防装备明细查询失败" + e.getMessage());
}
}
}
YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_fire_equip.xml
View file @ f6357920
......@@ -144,9 +144,12 @@
<if test="equipmentName!=null">
AND d.equipmentName LIKE '%${equipmentName}%'
</if>
<if test="startTime!=null">
AND d.update_date BETWEEN '${startTime}' AND '${endTime}'
</if>
<if test="startTime != null and startTime != ''">
AND d.update_date &gt;= #{startTime}
</if>
<if test="endTime != null and endTime != ''">
AND d.update_date &lt;= #{endTime}
</if>
</where>
</select>
......@@ -196,9 +199,12 @@
<if test="equipmentName!=null">
AND d.equipmentName LIKE '%${equipmentName}%'
</if>
<if test="startTime!=null">
AND d.create_date BETWEEN '${startTime}' AND '${endTime}'
</if>
<if test="startTime != null and startTime != ''">
AND d.create_date &gt;= #{startTime}
</if>
<if test="endTime != null and endTime != ''">
AND d.create_date &lt;= #{endTime}
</if>
</where>
ORDER BY d.create_date desc
LIMIT ${start},${length}
......@@ -289,8 +295,8 @@
<!-- AND se.fire_equipment_id = fe.id-->
<!-- )-->
<!-- </select>-->
<!-- <select id="findEquipDetailsById" resultType="com.yeejoin.amos.fas.core.common.response.EquipDetailsResponse">-->
<!-- SELECT-->
......@@ -306,7 +312,7 @@
<!-- <if test="id!=null">AND eq.id = #{id}</if>-->
<!-- </where>-->
<!-- </select>-->
<select id="queryStorageEquips" resultType="map">
SELECT
wed.id,
......@@ -554,7 +560,7 @@
detail.creator_id AS create_by,
spec.create_date AS create_date,
(
CASE
CASE
WHEN (
SELECT
count(1)
......@@ -632,9 +638,9 @@
video.id = #{id}
</if>
</where>
</select>
<!-- <select id="findFireStationById" resultType="com.yeejoin.amos.fas.dao.entity.FireStation">-->
<!-- SELECT-->
<!-- *-->
......
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