Skip to content

A
amos-boot-biz
Commit d126b575 authored by tangwei's avatar tangwei
Browse files
Options

解决冲突

parents ba43ec64 69b4d198
Hide whitespace changes
Inline Side-by-side
Showing with 335 additions and 331 deletions
amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/IdxBizFanWarningRecordController.java
View file @ d126b575
...@@ -20,6 +20,7 @@ import com.yeejoin.amos.boot.module.jxiop.biz.tdengine.FanWarningRecord; ...@@ -20,6 +20,7 @@ import com.yeejoin.amos.boot.module.jxiop.biz.tdengine.FanWarningRecord;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.apache.commons.beanutils.BeanMap; import org.apache.commons.beanutils.BeanMap;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
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.*;
...@@ -33,8 +34,6 @@ import java.util.*; ...@@ -33,8 +34,6 @@ import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
*
*
* @author system_generator * @author system_generator
* @date 2023-08-15 * @date 2023-08-15
*/ */
...@@ -47,17 +46,17 @@ public class IdxBizFanWarningRecordController extends BaseController { ...@@ -47,17 +46,17 @@ public class IdxBizFanWarningRecordController extends BaseController {
IdxBizFanWarningRecordServiceImpl idxBizFanWarningRecordServiceImpl; IdxBizFanWarningRecordServiceImpl idxBizFanWarningRecordServiceImpl;
@Autowired @Autowired
IdxBizFanWarningRuleSetServiceImpl idxBizFanWarningRuleSetService; IdxBizFanWarningRuleSetServiceImpl idxBizFanWarningRuleSetService;
@Autowired @Autowired
IdxBizPvWarningRuleSetServiceImpl idxBizPvWarningRuleSetService; IdxBizPvWarningRuleSetServiceImpl idxBizPvWarningRuleSetService;
@Autowired @Autowired
FanWaringRecordMapper fanWaringRecordMapper; FanWaringRecordMapper fanWaringRecordMapper;
@Autowired @Autowired
IdxBizFanPointProcessVariableClassificationMapper idxBizFanPointProcessVariableClassificationMapper; IdxBizFanPointProcessVariableClassificationMapper idxBizFanPointProcessVariableClassificationMapper;
/** /**
* 新增 * 新增
...@@ -65,28 +64,28 @@ public class IdxBizFanWarningRecordController extends BaseController { ...@@ -65,28 +64,28 @@ public class IdxBizFanWarningRecordController extends BaseController {
* @return * @return
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/save") @PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增") @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
public ResponseModel<IdxBizFanWarningRecordDto> save(@RequestBody IdxBizFanWarningRecordDto model) { public ResponseModel<IdxBizFanWarningRecordDto> save(@RequestBody IdxBizFanWarningRecordDto model) {
model = idxBizFanWarningRecordServiceImpl.createWithModel(model); model = idxBizFanWarningRecordServiceImpl.createWithModel(model);
return ResponseHelper.buildResponse(model); return ResponseHelper.buildResponse(model);
} }
/** /**
* 根据sequenceNbr更新 * 根据sequenceNbr更新
* *
* @param sequenceNbr 主键 * @param sequenceNbr 主键
* @return * @return
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/{sequenceNbr}") @PutMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新") @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
public ResponseModel<IdxBizFanWarningRecordDto> updateBySequenceNbrIdxBizFanWarningRecord(@RequestBody IdxBizFanWarningRecordDto model,@PathVariable(value = "sequenceNbr") String sequenceNbr) { public ResponseModel<IdxBizFanWarningRecordDto> updateBySequenceNbrIdxBizFanWarningRecord(@RequestBody IdxBizFanWarningRecordDto model, @PathVariable(value = "sequenceNbr") String sequenceNbr) {
model.setSequenceNbr(sequenceNbr); model.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(idxBizFanWarningRecordServiceImpl.updateWithModel(model)); return ResponseHelper.buildResponse(idxBizFanWarningRecordServiceImpl.updateWithModel(model));
} }
/** /**
* 根据sequenceNbr删除 * 根据sequenceNbr删除
* *
* @param sequenceNbr 主键 * @param sequenceNbr 主键
...@@ -95,327 +94,332 @@ public class IdxBizFanWarningRecordController extends BaseController { ...@@ -95,327 +94,332 @@ public class IdxBizFanWarningRecordController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping(value = "/{sequenceNbr}") @DeleteMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除") @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){ public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
return ResponseHelper.buildResponse(idxBizFanWarningRecordServiceImpl.removeById(sequenceNbr)); return ResponseHelper.buildResponse(idxBizFanWarningRecordServiceImpl.removeById(sequenceNbr));
} }
/** /**
* 根据sequenceNbr查询 * 根据sequenceNbr查询
* *
* @param sequenceNbr 主键 * @param sequenceNbr 主键
* @return * @return
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{sequenceNbr}") @GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个") @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个")
public ResponseModel<IdxBizFanWarningRecordDto> selectOne(@PathVariable Long sequenceNbr) { public ResponseModel<IdxBizFanWarningRecordDto> selectOne(@PathVariable Long sequenceNbr) {
return ResponseHelper.buildResponse(idxBizFanWarningRecordServiceImpl.queryBySeq(sequenceNbr)); return ResponseHelper.buildResponse(idxBizFanWarningRecordServiceImpl.queryBySeq(sequenceNbr));
} }
/** /**
* 列表分页查询 * 列表分页查询
* *
* @param current 当前页 * @param current 当前页
* @param current 每页大小 * @param current 每页大小
* @return * @return
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page") @GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET",value = "分页查询", notes = "分页查询") @ApiOperation(httpMethod = "GET", value = "分页查询", notes = "分页查询")
public ResponseModel<Page<IdxBizFanWarningRecordDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam public ResponseModel<Page<IdxBizFanWarningRecordDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
(value = "size") int size) { (value = "size") int size) {
Page<IdxBizFanWarningRecordDto> page = new Page<IdxBizFanWarningRecordDto>(); Page<IdxBizFanWarningRecordDto> page = new Page<IdxBizFanWarningRecordDto>();
page.setCurrent(current); page.setCurrent(current);
page.setSize(size); page.setSize(size);
return ResponseHelper.buildResponse(idxBizFanWarningRecordServiceImpl.queryForIdxBizFanWarningRecordPage(page)); return ResponseHelper.buildResponse(idxBizFanWarningRecordServiceImpl.queryForIdxBizFanWarningRecordPage(page));
} }
/** /**
* 列表全部数据查询 * 列表全部数据查询
* *
* @return * @return
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "列表全部数据查询", notes = "列表全部数据查询") @ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
@GetMapping(value = "/list") @GetMapping(value = "/list")
public ResponseModel<List<IdxBizFanWarningRecordDto>> selectForList() { public ResponseModel<List<IdxBizFanWarningRecordDto>> selectForList() {
return ResponseHelper.buildResponse(idxBizFanWarningRecordServiceImpl.queryForIdxBizFanWarningRecordList()); return ResponseHelper.buildResponse(idxBizFanWarningRecordServiceImpl.queryForIdxBizFanWarningRecordList());
} }
/** /**
* 根据sequenceNbr查询 * 根据sequenceNbr查询
* *
* @param ANALYSISPOINTID 主键 * @param ANALYSISPOINTID 主键
* @return * @return
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/getInfoByPointId") @GetMapping(value = "/getInfoByPointId")
@ApiOperation(httpMethod = "GET",value = "根据ANALYSIS_POINT_ID查询单个", notes = "根据ANALYSIS_POINT_ID查询单个") @ApiOperation(httpMethod = "GET", value = "根据ANALYSIS_POINT_ID查询单个", notes = "根据ANALYSIS_POINT_ID查询单个")
public ResponseModel<Map<String, Object>> getInfoByPointId(@RequestParam String ANALYSISPOINTID) { public ResponseModel<Map<String, Object>> getInfoByPointId(@RequestParam String ANALYSISPOINTID) {
LambdaQueryWrapper<IdxBizFanWarningRuleSet> query =new LambdaQueryWrapper<>(); LambdaQueryWrapper<IdxBizFanWarningRuleSet> query = new LambdaQueryWrapper<>();
query.eq(IdxBizFanWarningRuleSet::getAnalysisPointId,ANALYSISPOINTID); query.eq(IdxBizFanWarningRuleSet::getAnalysisPointId, ANALYSISPOINTID);
List<IdxBizFanWarningRuleSet> idxBizFanWarningRecordList = idxBizFanWarningRuleSetService.getBaseMapper().selectList(query); List<IdxBizFanWarningRuleSet> idxBizFanWarningRecordList = idxBizFanWarningRuleSetService.getBaseMapper().selectList(query);
Map<String,Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
for (int i = 0; i < idxBizFanWarningRecordList.size(); i++) { for (int i = 0; i < idxBizFanWarningRecordList.size(); i++) {
IdxBizFanWarningRuleSet idxBizFanWarningRecord = idxBizFanWarningRecordList.get(i); IdxBizFanWarningRuleSet idxBizFanWarningRecord = idxBizFanWarningRecordList.get(i);
if (idxBizFanWarningRecord.getWarningName().equals("注意")){ if (idxBizFanWarningRecord.getWarningName().equals("注意")) {
map.putAll(BeanUtil.beanToMap(idxBizFanWarningRecord)); map.putAll(BeanUtil.beanToMap(idxBizFanWarningRecord));
}else if (idxBizFanWarningRecord.getWarningName().equals("警告")){ } else if (idxBizFanWarningRecord.getWarningName().equals("警告")) {
//警告周期 //警告周期
map.put("jgWarningCycle",idxBizFanWarningRecord.getWarningCycle()); map.put("jgWarningCycle", idxBizFanWarningRecord.getWarningCycle());
map.put("jgWarningIf",idxBizFanWarningRecord.getWarningIf()); map.put("jgWarningIf", idxBizFanWarningRecord.getWarningIf());
}else if (idxBizFanWarningRecord.getWarningName().equals("危险")){ } else if (idxBizFanWarningRecord.getWarningName().equals("危险")) {
//警告周期 //警告周期
map.put("wxWarningCycle",idxBizFanWarningRecord.getWarningCycle()); map.put("wxWarningCycle", idxBizFanWarningRecord.getWarningCycle());
map.put("wxWarningIf",idxBizFanWarningRecord.getWarningIf()); map.put("wxWarningIf", idxBizFanWarningRecord.getWarningIf());
} }
} }
return ResponseHelper.buildResponse(map); return ResponseHelper.buildResponse(map);
} }
/**
/** * 根据pointId修改信息
* 根据pointId修改信息 *
* * @param analysisInfo 主键
* @param analysisInfo 主键 * @return
* @return */
*/ @TycloudOperation(ApiLevel = UserType.AGENCY)
@TycloudOperation(ApiLevel = UserType.AGENCY) @PostMapping(value = "/updateByPointInfo")
@PostMapping(value = "/updateByPointInfo") @ApiOperation(httpMethod = "POST", value = "根据pointId修改信息", notes = "根据pointId修改信息")
@ApiOperation(httpMethod = "POST", value = "根据pointId修改信息", notes = "根据pointId修改信息") public ResponseModel<Boolean> updateByPointInfo(@RequestBody JSONObject analysisInfo) {
public ResponseModel<Boolean> updateByPointInfo(@RequestBody JSONObject analysisInfo) { LambdaQueryWrapper<IdxBizFanWarningRuleSet> query = new LambdaQueryWrapper<>();
LambdaQueryWrapper<IdxBizFanWarningRuleSet> query = new LambdaQueryWrapper<>(); query.eq(IdxBizFanWarningRuleSet::getAnalysisPointId, analysisInfo.get("analysisPointId"));
query.eq(IdxBizFanWarningRuleSet::getAnalysisPointId, analysisInfo.get("analysisPointId")); List<IdxBizFanWarningRuleSet> idxBizFanWarningRecordList = idxBizFanWarningRuleSetService.getBaseMapper().selectList(query);
List<IdxBizFanWarningRuleSet> idxBizFanWarningRecordList = idxBizFanWarningRuleSetService.getBaseMapper().selectList(query); for (IdxBizFanWarningRuleSet idxBizFanWarningRuleSet : idxBizFanWarningRecordList) {
for (IdxBizFanWarningRuleSet idxBizFanWarningRuleSet : idxBizFanWarningRecordList) { BeanUtil.copyProperties(analysisInfo, idxBizFanWarningRuleSet, "sequenceNbr", "warningName");
BeanUtil.copyProperties(analysisInfo, idxBizFanWarningRuleSet, "sequenceNbr", "warningName"); if (idxBizFanWarningRuleSet.getWarningName().equals("警告")) {
if (idxBizFanWarningRuleSet.getWarningName().equals("警告")) { //警告周期
//警告周期 idxBizFanWarningRuleSet.setWarningIf(analysisInfo.get("jgWarningIf").toString());
idxBizFanWarningRuleSet.setWarningIf(analysisInfo.get("jgWarningIf").toString()); idxBizFanWarningRuleSet.setWarningCycle(analysisInfo.get("jgWarningCycle").toString());
idxBizFanWarningRuleSet.setWarningCycle(analysisInfo.get("jgWarningCycle").toString()); } else if (idxBizFanWarningRuleSet.getWarningName().equals("危险")) {
} else if (idxBizFanWarningRuleSet.getWarningName().equals("危险")) { //警告周期
//警告周期 idxBizFanWarningRuleSet.setWarningIf(analysisInfo.get("wxWarningIf").toString());
idxBizFanWarningRuleSet.setWarningIf(analysisInfo.get("wxWarningIf").toString()); idxBizFanWarningRuleSet.setWarningCycle(analysisInfo.get("wxWarningCycle").toString());
idxBizFanWarningRuleSet.setWarningCycle(analysisInfo.get("wxWarningCycle").toString()); }
} }
} boolean b = idxBizFanWarningRuleSetService.updateBatchById(idxBizFanWarningRecordList);
boolean b = idxBizFanWarningRuleSetService.updateBatchById(idxBizFanWarningRecordList); return ResponseHelper.buildResponse(b);
return ResponseHelper.buildResponse(b); }
}
/**
/** * 根据sequenceNbr查询
* 根据sequenceNbr查询 *
* * @param ANALYSISPOINTID 主键
* @param ANALYSISPOINTID 主键 * @return
* @return */
*/ @TycloudOperation(ApiLevel = UserType.AGENCY)
@TycloudOperation(ApiLevel = UserType.AGENCY) @GetMapping(value = "/getInfoByPointIdPv")
@GetMapping(value = "/getInfoByPointIdPv") @ApiOperation(httpMethod = "GET", value = "根据ANALYSIS_POINT_ID查询单个", notes = "根据ANALYSIS_POINT_ID查询单个")
@ApiOperation(httpMethod = "GET",value = "根据ANALYSIS_POINT_ID查询单个", notes = "根据ANALYSIS_POINT_ID查询单个") public ResponseModel<Map<String, Object>> getInfoByPointIdPv(@RequestParam String ANALYSISPOINTID) {
public ResponseModel<Map<String, Object>> getInfoByPointIdPv(@RequestParam String ANALYSISPOINTID) {
LambdaQueryWrapper<IdxBizPvWarningRuleSet> query = new LambdaQueryWrapper<>();
LambdaQueryWrapper<IdxBizPvWarningRuleSet> query =new LambdaQueryWrapper<>(); query.eq(IdxBizPvWarningRuleSet::getAnalysisPointId, ANALYSISPOINTID);
query.eq(IdxBizPvWarningRuleSet::getAnalysisPointId,ANALYSISPOINTID); List<IdxBizPvWarningRuleSet> idxBizPvWarningRecordList = idxBizPvWarningRuleSetService.getBaseMapper().selectList(query);
List<IdxBizPvWarningRuleSet> idxBizPvWarningRecordList = idxBizPvWarningRuleSetService.getBaseMapper().selectList(query); Map<String, Object> map = new HashMap<>();
Map<String,Object> map = new HashMap<>(); for (int i = 0; i < idxBizPvWarningRecordList.size(); i++) {
for (int i = 0; i < idxBizPvWarningRecordList.size(); i++) { IdxBizPvWarningRuleSet idxBizPvWarningRecord = idxBizPvWarningRecordList.get(i);
IdxBizPvWarningRuleSet idxBizPvWarningRecord = idxBizPvWarningRecordList.get(i); if (idxBizPvWarningRecord.getWarningName().equals("注意")) {
if (idxBizPvWarningRecord.getWarningName().equals("注意")){ map.putAll(BeanUtil.beanToMap(idxBizPvWarningRecord));
map.putAll(BeanUtil.beanToMap(idxBizPvWarningRecord)); } else if (idxBizPvWarningRecord.getWarningName().equals("警告")) {
}else if (idxBizPvWarningRecord.getWarningName().equals("警告")){ //警告周期
//警告周期 map.put("jgWarningCycle", idxBizPvWarningRecord.getWarningCycle());
map.put("jgWarningCycle",idxBizPvWarningRecord.getWarningCycle()); map.put("jgWarningIf", idxBizPvWarningRecord.getWarningIf());
map.put("jgWarningIf",idxBizPvWarningRecord.getWarningIf()); } else if (idxBizPvWarningRecord.getWarningName().equals("危险")) {
}else if (idxBizPvWarningRecord.getWarningName().equals("危险")){ //警告周期
//警告周期 map.put("wxWarningCycle", idxBizPvWarningRecord.getWarningCycle());
map.put("wxWarningCycle",idxBizPvWarningRecord.getWarningCycle()); map.put("wxWarningIf", idxBizPvWarningRecord.getWarningIf());
map.put("wxWarningIf",idxBizPvWarningRecord.getWarningIf()); }
} }
} return ResponseHelper.buildResponse(map);
return ResponseHelper.buildResponse(map); }
}
/**
* 根据pointId修改信息
/** *
* 根据pointId修改信息 * @param analysisInfo 主键
* * @return
* @param analysisInfo 主键 */
* @return @TycloudOperation(ApiLevel = UserType.AGENCY)
*/ @PostMapping(value = "/updateByPointInfoPv")
@TycloudOperation(ApiLevel = UserType.AGENCY) @ApiOperation(httpMethod = "POST", value = "根据pointId修改信息", notes = "根据pointId修改信息")
@PostMapping(value = "/updateByPointInfoPv") public ResponseModel<Boolean> updateByPointInfoPv(@RequestBody JSONObject analysisInfo) {
@ApiOperation(httpMethod = "POST", value = "根据pointId修改信息", notes = "根据pointId修改信息") LambdaQueryWrapper<IdxBizPvWarningRuleSet> query = new LambdaQueryWrapper<>();
public ResponseModel<Boolean> updateByPointInfoPv(@RequestBody JSONObject analysisInfo) { query.eq(IdxBizPvWarningRuleSet::getAnalysisPointId, analysisInfo.get("analysisPointId"));
LambdaQueryWrapper<IdxBizPvWarningRuleSet> query = new LambdaQueryWrapper<>(); List<IdxBizPvWarningRuleSet> idxBizFanWarningRecordList = idxBizPvWarningRuleSetService.getBaseMapper().selectList(query);
query.eq(IdxBizPvWarningRuleSet::getAnalysisPointId, analysisInfo.get("analysisPointId")); for (IdxBizPvWarningRuleSet idxBizPvWarningRuleSet : idxBizFanWarningRecordList) {
List<IdxBizPvWarningRuleSet> idxBizFanWarningRecordList = idxBizPvWarningRuleSetService.getBaseMapper().selectList(query); BeanUtil.copyProperties(analysisInfo, idxBizPvWarningRuleSet, "sequenceNbr", "warningName");
for (IdxBizPvWarningRuleSet idxBizPvWarningRuleSet : idxBizFanWarningRecordList) { if (idxBizPvWarningRuleSet.getWarningName().equals("警告")) {
BeanUtil.copyProperties(analysisInfo, idxBizPvWarningRuleSet, "sequenceNbr", "warningName"); //警告周期
if (idxBizPvWarningRuleSet.getWarningName().equals("警告")) { idxBizPvWarningRuleSet.setWarningIf(analysisInfo.get("jgWarningIf").toString());
//警告周期 idxBizPvWarningRuleSet.setWarningCycle(analysisInfo.get("jgWarningCycle").toString());
idxBizPvWarningRuleSet.setWarningIf(analysisInfo.get("jgWarningIf").toString()); } else if (idxBizPvWarningRuleSet.getWarningName().equals("危险")) {
idxBizPvWarningRuleSet.setWarningCycle(analysisInfo.get("jgWarningCycle").toString()); //警告周期
} else if (idxBizPvWarningRuleSet.getWarningName().equals("危险")) { idxBizPvWarningRuleSet.setWarningIf(analysisInfo.get("wxWarningIf").toString());
//警告周期 idxBizPvWarningRuleSet.setWarningCycle(analysisInfo.get("wxWarningCycle").toString());
idxBizPvWarningRuleSet.setWarningIf(analysisInfo.get("wxWarningIf").toString()); }
idxBizPvWarningRuleSet.setWarningCycle(analysisInfo.get("wxWarningCycle").toString()); }
} boolean b = idxBizPvWarningRuleSetService.updateBatchById(idxBizFanWarningRecordList);
} return ResponseHelper.buildResponse(b);
boolean b = idxBizPvWarningRuleSetService.updateBatchById(idxBizFanWarningRecordList); }
return ResponseHelper.buildResponse(b);
}
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@GetMapping(value = "/stringToMap")
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false) @ApiOperation(httpMethod = "get", value = "字符串转为对象格式", notes = "字符串转为对象格式")
@GetMapping(value = "/stringToMap") public ResponseModel<Map<String, Object>> list(@RequestParam("analysisPointIds") String ids) {
@ApiOperation(httpMethod = "get", value = "字符串转为对象格式", notes = "字符串转为对象格式") Map<String, Object> data = new HashMap<>();
public ResponseModel<Map<String, Object>> list(@RequestParam("analysisPointIds") String ids) { data.put("analysisPointIds", ids);
Map<String, Object> data = new HashMap<>(); return ResponseHelper.buildResponse(data);
data.put("analysisPointIds", ids); }
return ResponseHelper.buildResponse(data);
} /**
* 根据pointId修改信息
/** *
* 根据pointId修改信息 * @param analysisInfo 主键
* * @return
* @param analysisInfo 主键 */
* @return @TycloudOperation(ApiLevel = UserType.AGENCY)
*/ @PostMapping(value = "/updateByPointInfoBatchPv")
@TycloudOperation(ApiLevel = UserType.AGENCY) @ApiOperation(httpMethod = "POST", value = "根据pointId修改信息", notes = "根据pointId修改信息")
@PostMapping(value = "/updateByPointInfoBatchPv") public ResponseModel<Boolean> updateByPointInfoBatchPv(@RequestBody JSONObject analysisInfo) {
@ApiOperation(httpMethod = "POST", value = "根据pointId修改信息", notes = "根据pointId修改信息") LambdaQueryWrapper<IdxBizPvWarningRuleSet> query = new LambdaQueryWrapper<>();
public ResponseModel<Boolean> updateByPointInfoBatchPv(@RequestBody JSONObject analysisInfo) { List<String> analysisPointIds = Arrays.asList(analysisInfo.get("analysisPointIds").toString().split(","));
LambdaQueryWrapper<IdxBizPvWarningRuleSet> query = new LambdaQueryWrapper<>(); query.in(IdxBizPvWarningRuleSet::getAnalysisPointId, analysisPointIds);
List<String> analysisPointIds = Arrays.asList(analysisInfo.get("analysisPointIds").toString().split(",")); List<IdxBizPvWarningRuleSet> idxBizFanWarningRecordList = idxBizPvWarningRuleSetService.getBaseMapper().selectList(query);
query.in(IdxBizPvWarningRuleSet::getAnalysisPointId, analysisPointIds); for (IdxBizPvWarningRuleSet idxBizPvWarningRuleSet : idxBizFanWarningRecordList) {
List<IdxBizPvWarningRuleSet> idxBizFanWarningRecordList = idxBizPvWarningRuleSetService.getBaseMapper().selectList(query); BeanUtil.copyProperties(analysisInfo, idxBizPvWarningRuleSet, "analysisPointIds");
for (IdxBizPvWarningRuleSet idxBizPvWarningRuleSet : idxBizFanWarningRecordList) { if (idxBizPvWarningRuleSet.getWarningName().equals("警告")) {
BeanUtil.copyProperties(analysisInfo, idxBizPvWarningRuleSet, "analysisPointIds"); //警告周期
if (idxBizPvWarningRuleSet.getWarningName().equals("警告")) { if (StringUtils.isNotBlank(analysisInfo.getString("jgWarningCycle"))) {
//警告周期 idxBizPvWarningRuleSet.setWarningCycle(analysisInfo.get("jgWarningCycle").toString());
idxBizPvWarningRuleSet.setWarningCycle(analysisInfo.get("jgWarningCycle").toString()); }
} else if (idxBizPvWarningRuleSet.getWarningName().equals("危险")) { } else if (idxBizPvWarningRuleSet.getWarningName().equals("危险")) {
//警告周期 //警告周期
idxBizPvWarningRuleSet.setWarningCycle(analysisInfo.get("wxWarningCycle").toString()); if (StringUtils.isNotBlank(analysisInfo.getString("wxWarningCycle"))) {
} idxBizPvWarningRuleSet.setWarningCycle(analysisInfo.get("wxWarningCycle").toString());
} }
boolean b = idxBizPvWarningRuleSetService.updateBatchById(idxBizFanWarningRecordList); }
return ResponseHelper.buildResponse(b); }
} boolean b = idxBizPvWarningRuleSetService.updateBatchById(idxBizFanWarningRecordList);
return ResponseHelper.buildResponse(b);
}
/**
* 根据pointId修改信息
* /**
* @param analysisInfo 主键 * 根据pointId修改信息
* @return *
*/ * @param analysisInfo 主键
@TycloudOperation(ApiLevel = UserType.AGENCY) * @return
@PostMapping(value = "/updateByPointInfoBatchFan") */
@ApiOperation(httpMethod = "POST", value = "根据pointId修改信息", notes = "根据pointId修改信息") @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
public ResponseModel<Boolean> updateByPointInfoBatchFan(@RequestBody JSONObject analysisInfo) { @PostMapping(value = "/updateByPointInfoBatchFan")
LambdaQueryWrapper<IdxBizFanWarningRuleSet> query = new LambdaQueryWrapper<>(); @ApiOperation(httpMethod = "POST", value = "根据pointId修改信息", notes = "根据pointId修改信息")
List<String> analysisPointIds = Arrays.asList(analysisInfo.get("analysisPointIds").toString().split(",")); public ResponseModel<Boolean> updateByPointInfoBatchFan(@RequestBody JSONObject analysisInfo) {
query.in(IdxBizFanWarningRuleSet::getAnalysisPointId, analysisPointIds); LambdaQueryWrapper<IdxBizFanWarningRuleSet> query = new LambdaQueryWrapper<>();
List<IdxBizFanWarningRuleSet> idxBizFanWarningRecordList = idxBizFanWarningRuleSetService.getBaseMapper().selectList(query); List<String> analysisPointIds = Arrays.asList(analysisInfo.get("analysisPointIds").toString().split(","));
for (IdxBizFanWarningRuleSet idxBizFanWarningRuleSet : idxBizFanWarningRecordList) { query.in(IdxBizFanWarningRuleSet::getAnalysisPointId, analysisPointIds);
BeanUtil.copyProperties(analysisInfo, idxBizFanWarningRuleSet, "analysisPointIds"); List<IdxBizFanWarningRuleSet> idxBizFanWarningRecordList = idxBizFanWarningRuleSetService.getBaseMapper().selectList(query);
if (idxBizFanWarningRuleSet.getWarningName().equals("警告")) { for (IdxBizFanWarningRuleSet idxBizFanWarningRuleSet : idxBizFanWarningRecordList) {
//警告周期 BeanUtil.copyProperties(analysisInfo, idxBizFanWarningRuleSet, "analysisPointIds");
idxBizFanWarningRuleSet.setWarningCycle(analysisInfo.get("jgWarningCycle").toString()); if (idxBizFanWarningRuleSet.getWarningName().equals("警告")) {
} else if (idxBizFanWarningRuleSet.getWarningName().equals("危险")) { //警告周期
//警告周期 if (StringUtils.isNotBlank(analysisInfo.getString("jgWarningCycle"))) {
idxBizFanWarningRuleSet.setWarningCycle(analysisInfo.get("wxWarningCycle").toString()); idxBizFanWarningRuleSet.setWarningCycle(analysisInfo.get("jgWarningCycle").toString());
} }
} } else if (idxBizFanWarningRuleSet.getWarningName().equals("危险")) {
boolean b = idxBizFanWarningRuleSetService.updateBatchById(idxBizFanWarningRecordList); //警告周期
return ResponseHelper.buildResponse(b); if (StringUtils.isNotBlank(analysisInfo.getString("wxWarningCycle"))) {
} idxBizFanWarningRuleSet.setWarningCycle(analysisInfo.get("wxWarningCycle").toString());
}
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false) }
@GetMapping(value = "/selectFanWarningNum") }
@ApiOperation(httpMethod = "GET", value = "查询各风机预警状况", notes = "查询各风机预警状况") boolean b = idxBizFanWarningRuleSetService.updateBatchById(idxBizFanWarningRecordList);
public ResponseModel<Map<String,Object>> selectFanWarningNum(@RequestParam String station) { return ResponseHelper.buildResponse(b);
}
LambdaQueryWrapper<IdxBizFanPointProcessVariableClassification> wrapper = new LambdaQueryWrapper<>(); @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
wrapper.select(IdxBizFanPointProcessVariableClassification::getEquipmentName); @GetMapping(value = "/selectFanWarningNum")
wrapper.eq(IdxBizFanPointProcessVariableClassification::getStation, station); @ApiOperation(httpMethod = "GET", value = "查询各风机预警状况", notes = "查询各风机预警状况")
wrapper.groupBy(IdxBizFanPointProcessVariableClassification::getEquipmentName); public ResponseModel<Map<String, Object>> selectFanWarningNum(@RequestParam String station) {
wrapper.last(" ORDER BY RIGHT(EQUIPMENT_NAME,6) desc");
List<IdxBizFanPointProcessVariableClassification> variableClassificationList = idxBizFanPointProcessVariableClassificationMapper.selectList(wrapper);
LambdaQueryWrapper<IdxBizFanPointProcessVariableClassification> wrapper = new LambdaQueryWrapper<>();
wrapper.select(IdxBizFanPointProcessVariableClassification::getEquipmentName);
Map<String, Object> resultMap = new HashMap<>(); wrapper.eq(IdxBizFanPointProcessVariableClassification::getStation, station);
List<Map<String, Object>> maps = fanWaringRecordMapper.selectFanWarningNum(station); wrapper.groupBy(IdxBizFanPointProcessVariableClassification::getEquipmentName);
Map<String, Map<String, Object>> equipmentNameInfoMap = maps.stream().collect(Collectors.toMap(t -> t.get("EQUIPMENT_NAME").toString(), t -> t)); wrapper.last(" ORDER BY RIGHT(EQUIPMENT_NAME,6) desc");
List<IdxBizFanPointProcessVariableClassification> variableClassificationList = idxBizFanPointProcessVariableClassificationMapper.selectList(wrapper);
List<Integer> wxList = new ArrayList<>();
List<Integer> zyList = new ArrayList<>();
List<Integer> jgList = new ArrayList<>(); Map<String, Object> resultMap = new HashMap<>();
List<String> list =new ArrayList<>(); List<Map<String, Object>> maps = fanWaringRecordMapper.selectFanWarningNum(station);
for (Map<String, Object> map : maps) { Map<String, Map<String, Object>> equipmentNameInfoMap = maps.stream().collect(Collectors.toMap(t -> t.get("EQUIPMENT_NAME").toString(), t -> t));
wxList.add(Integer.valueOf(map.get("危险").toString()));
zyList.add(Integer.valueOf(map.get("注意").toString())); List<Integer> wxList = new ArrayList<>();
jgList.add(Integer.valueOf(map.get("警告").toString())); List<Integer> zyList = new ArrayList<>();
list.add(map.get("EQUIPMENT_NAME").toString()); List<Integer> jgList = new ArrayList<>();
List<String> list = new ArrayList<>();
} for (Map<String, Object> map : maps) {
variableClassificationList.forEach(item -> { wxList.add(Integer.valueOf(map.get("危险").toString()));
if (!equipmentNameInfoMap.containsKey(item.getEquipmentName())) { zyList.add(Integer.valueOf(map.get("注意").toString()));
wxList.add(0); jgList.add(Integer.valueOf(map.get("警告").toString()));
zyList.add(0); list.add(map.get("EQUIPMENT_NAME").toString());
jgList.add(0);
list.add(item.getEquipmentName()); }
} variableClassificationList.forEach(item -> {
}); if (!equipmentNameInfoMap.containsKey(item.getEquipmentName())) {
wxList.add(0);
zyList.add(0);
jgList.add(0);
HashMap<String, Object> wxMapResult = new HashMap<>(); list.add(item.getEquipmentName());
wxMapResult.put("data", wxList); }
wxMapResult.put("name", "危险"); });
HashMap<String, Object> zyMapResult = new HashMap<>();
zyMapResult.put("data", zyList);
zyMapResult.put("name", "注意"); HashMap<String, Object> wxMapResult = new HashMap<>();
HashMap<String, Object> jgMapResult = new HashMap<>(); wxMapResult.put("data", wxList);
jgMapResult.put("data", jgList); wxMapResult.put("name", "危险");
jgMapResult.put("name", "警告"); HashMap<String, Object> zyMapResult = new HashMap<>();
zyMapResult.put("data", zyList);
List<Map<String, Object>> hashMaps = Arrays.asList(wxMapResult, zyMapResult, jgMapResult); zyMapResult.put("name", "注意");
resultMap.put("axisData", list); HashMap<String, Object> jgMapResult = new HashMap<>();
resultMap.put("seriesData", hashMaps); jgMapResult.put("data", jgList);
return ResponseHelper.buildResponse(resultMap); jgMapResult.put("name", "警告");
} List<Map<String, Object>> hashMaps = Arrays.asList(wxMapResult, zyMapResult, jgMapResult);
resultMap.put("axisData", list);
resultMap.put("seriesData", hashMaps);
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false) return ResponseHelper.buildResponse(resultMap);
@GetMapping(value = "/selectEquipWarningTotal")
@ApiOperation(httpMethod = "GET", value = "预警信息统计富文本", notes = "预警信息统计富文本") }
public ResponseModel<Map<String,Object>> selectEquipWarningTotal(@RequestParam String STATION,@RequestParam String EQUIPMENTNAME) {
Map<String, Object> maps = fanWaringRecordMapper.selectEquipWarningTotal(STATION,EQUIPMENTNAME);
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
return ResponseHelper.buildResponse(maps); @GetMapping(value = "/selectEquipWarningTotal")
} @ApiOperation(httpMethod = "GET", value = "预警信息统计富文本", notes = "预警信息统计富文本")
public ResponseModel<Map<String, Object>> selectEquipWarningTotal(@RequestParam String STATION, @RequestParam String EQUIPMENTNAME) {
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false) Map<String, Object> maps = fanWaringRecordMapper.selectEquipWarningTotal(STATION, EQUIPMENTNAME);
@GetMapping(value = "/selectWarningPoint")
@ApiOperation(httpMethod = "GET", value = "预警监测设备右侧预警重复列表", notes = "预警监测设备右侧预警重复列表") return ResponseHelper.buildResponse(maps);
public ResponseModel<Page<FanWarningRecord>> selectFanWarningNum(@RequestParam String STATION,@RequestParam String EQUIPMENTNAME,@RequestParam Integer current,@RequestParam Integer size) { }
Page<FanWarningRecord> page = new Page<>();
page.setCurrent(current); @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
page.setSize(size); @GetMapping(value = "/selectWarningPoint")
List<FanWarningRecord> maps = fanWaringRecordMapper.selectWarningPoint(STATION,EQUIPMENTNAME,(current-1)*size,size); @ApiOperation(httpMethod = "GET", value = "预警监测设备右侧预警重复列表", notes = "预警监测设备右侧预警重复列表")
page.setRecords(maps); public ResponseModel<Page<FanWarningRecord>> selectFanWarningNum(@RequestParam String STATION, @RequestParam String EQUIPMENTNAME, @RequestParam Integer current, @RequestParam Integer size) {
int total = fanWaringRecordMapper.selectWarningPointTotal(STATION, EQUIPMENTNAME); Page<FanWarningRecord> page = new Page<>();
page.setTotal(total); page.setCurrent(current);
return ResponseHelper.buildResponse(page); page.setSize(size);
} List<FanWarningRecord> maps = fanWaringRecordMapper.selectWarningPoint(STATION, EQUIPMENTNAME, (current - 1) * size, size);
page.setRecords(maps);
int total = fanWaringRecordMapper.selectWarningPointTotal(STATION, EQUIPMENTNAME);
page.setTotal(total);
return ResponseHelper.buildResponse(page);
}
} }
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