Skip to content

T
traffic-signal-platform
Commit 2c8f6023 authored by 董国亮's avatar 董国亮
Browse files
Options

youhuajiekou

parent f145ee10
Hide whitespace changes
Inline Side-by-side
Showing with 163 additions and 152 deletions
signal-optimize-service/src/main/java/net/wanji/opt/controller/induce/GreenwaveInducesController.java
View file @ 2c8f6023
...@@ -121,9 +121,11 @@ public class GreenwaveInducesController { ...@@ -121,9 +121,11 @@ public class GreenwaveInducesController {
try { try {
String startTime = DateUtil.format(DateUtil.parse(m.getControlOptTimes().split("\\|")[0], Constants.DATE_FORMAT.E_DATE_FORMAT_SECOND), Constants.DATE_FORMAT.E_DATE_FORMAT_TIME); String startTime = DateUtil.format(DateUtil.parse(m.getControlOptTimes().split("\\|")[0], Constants.DATE_FORMAT.E_DATE_FORMAT_SECOND), Constants.DATE_FORMAT.E_DATE_FORMAT_TIME);
String endTime = DateUtil.format(DateUtil.parse(m.getControlOptTimes().split("\\|")[1], Constants.DATE_FORMAT.E_DATE_FORMAT_SECOND), Constants.DATE_FORMAT.E_DATE_FORMAT_TIME); String endTime = DateUtil.format(DateUtil.parse(m.getControlOptTimes().split("\\|")[1], Constants.DATE_FORMAT.E_DATE_FORMAT_SECOND), Constants.DATE_FORMAT.E_DATE_FORMAT_TIME);
greenwaveDTO.setControlOptTimes(startTime.substring(0,startTime.lastIndexOf(":00"))+"-"+endTime.substring(0,endTime.lastIndexOf(":00"))); greenwaveDTO.setControlOptTimes(startTime.substring(0,startTime.lastIndexOf(":"))+"-"+endTime.substring(0,endTime.lastIndexOf(":")));
}catch (ParseException ex){ex.printStackTrace(); }catch (ParseException ex){ex.printStackTrace();
greenwaveDTO.setControlOptTimes(m.getControlOptTimes()); greenwaveDTO.setControlOptTimes(m.getControlOptTimes());
}catch (StringIndexOutOfBoundsException ex){ex.printStackTrace();
greenwaveDTO.setControlOptTimes(m.getControlOptTimes());
} }
}else { }else {
greenwaveDTO.setControlOptTimes(m.getControlOptTimes()); greenwaveDTO.setControlOptTimes(m.getControlOptTimes());
...@@ -146,19 +148,19 @@ public class GreenwaveInducesController { ...@@ -146,19 +148,19 @@ public class GreenwaveInducesController {
/** /**
* 根据条件查询记录 * 根据条件查询记录
* *
* @param GreenwaveInduces 查询条件 * @param greenwaveInduces 查询条件
* @return JsonViewObject * @return JsonViewObject
*/ */
@ApiOperation(value = "根据条件查询记录", notes = "根据条件查询记录", response = JsonViewObject.class, consumes = MediaType.APPLICATION_JSON) @ApiOperation(value = "根据条件查询记录", notes = "根据条件查询记录", response = JsonViewObject.class, consumes = MediaType.APPLICATION_JSON)
@PostMapping(value = "/byCondition", produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON) @PostMapping(value = "/byCondition", produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
JsonViewObject getByWhere(@ApiParam(value = "查询条件", required = true) @RequestBody @Validated({ValidationGroups.Query.class}) GreenwaveInduces GreenwaveInduces){ JsonViewObject getByWhere(@ApiParam(value = "查询条件", required = true) @RequestBody @Validated({ValidationGroups.Query.class}) GreenwaveInduces greenwaveInduces){
JsonViewObject jsonView = JsonViewObject.newInstance(); JsonViewObject jsonView = JsonViewObject.newInstance();
long start=System.currentTimeMillis(); long start=System.currentTimeMillis();
String jsonStr = JSON.toJSONString(GreenwaveInduces); String jsonStr = JSON.toJSONString(greenwaveInduces);
try { try {
//参数校验过程中修改，兼容实现，restful入参不用map，便于进行参数逐个校验 //参数校验过程中修改，兼容实现，restful入参不用map，便于进行参数逐个校验
Map params = JSONObject.parseObject(JSONObject.toJSONString(GreenwaveInduces), Map.class); Map params = JSONObject.parseObject(JSONObject.toJSONString(greenwaveInduces), Map.class);
// Map<String, Object> params = new HashMap<>(); // Map<String, Object> params = new HashMap<>();
// JSONObject.parseObject(JSONObject.toJSONString(GreenwaveInduces), Map.class).forEach((k,v) -> params.put(StringUtils.camelToCapital(k.toString()).toLowerCase(), v)); // JSONObject.parseObject(JSONObject.toJSONString(GreenwaveInduces), Map.class).forEach((k,v) -> params.put(StringUtils.camelToCapital(k.toString()).toLowerCase(), v));
List<GreenwaveInduces> greenwaveInducesList = this.greenwaveInducesMapper.findByMap(params); List<GreenwaveInduces> greenwaveInducesList = this.greenwaveInducesMapper.findByMap(params);
...@@ -200,9 +202,11 @@ public class GreenwaveInducesController { ...@@ -200,9 +202,11 @@ public class GreenwaveInducesController {
try { try {
String startTime = DateUtil.format(DateUtil.parse(m.getControlOptTimes().split("\\|")[0], Constants.DATE_FORMAT.E_DATE_FORMAT_SECOND), Constants.DATE_FORMAT.E_DATE_FORMAT_TIME); String startTime = DateUtil.format(DateUtil.parse(m.getControlOptTimes().split("\\|")[0], Constants.DATE_FORMAT.E_DATE_FORMAT_SECOND), Constants.DATE_FORMAT.E_DATE_FORMAT_TIME);
String endTime = DateUtil.format(DateUtil.parse(m.getControlOptTimes().split("\\|")[1], Constants.DATE_FORMAT.E_DATE_FORMAT_SECOND), Constants.DATE_FORMAT.E_DATE_FORMAT_TIME); String endTime = DateUtil.format(DateUtil.parse(m.getControlOptTimes().split("\\|")[1], Constants.DATE_FORMAT.E_DATE_FORMAT_SECOND), Constants.DATE_FORMAT.E_DATE_FORMAT_TIME);
greenwaveDTO.setControlOptTimes(startTime.substring(0,startTime.lastIndexOf(":00"))+"-"+endTime.substring(0,endTime.lastIndexOf(":00"))); greenwaveDTO.setControlOptTimes(startTime.substring(0,startTime.lastIndexOf(":"))+"-"+endTime.substring(0,endTime.lastIndexOf(":")));
}catch (ParseException ex){ex.printStackTrace(); }catch (ParseException ex){ex.printStackTrace();
greenwaveDTO.setControlOptTimes(m.getControlOptTimes()); greenwaveDTO.setControlOptTimes(m.getControlOptTimes());
}catch (StringIndexOutOfBoundsException ex){ex.printStackTrace();
greenwaveDTO.setControlOptTimes(m.getControlOptTimes());
} }
}else { }else {
greenwaveDTO.setControlOptTimes(m.getControlOptTimes()); greenwaveDTO.setControlOptTimes(m.getControlOptTimes());
...@@ -219,7 +223,6 @@ public class GreenwaveInducesController { ...@@ -219,7 +223,6 @@ public class GreenwaveInducesController {
} catch (Exception e) { } catch (Exception e) {
jsonView.fail(I18nResourceBundle.getConstants("GET_FAILED_MSG")); jsonView.fail(I18nResourceBundle.getConstants("GET_FAILED_MSG"));
log.error("{} getByWhere error，jsonStr:{}", this.getClass().getSimpleName(), jsonStr, e); log.error("{} getByWhere error，jsonStr:{}", this.getClass().getSimpleName(), jsonStr, e);
} }
return jsonView; return jsonView;
} }
...@@ -235,7 +238,6 @@ public class GreenwaveInducesController { ...@@ -235,7 +238,6 @@ public class GreenwaveInducesController {
JsonViewObject getById(@ApiParam(value = "记录的id", required = true, example = "1") @PathVariable("id") @NotBlank(message = "查询id不能为空") String id){ JsonViewObject getById(@ApiParam(value = "记录的id", required = true, example = "1") @PathVariable("id") @NotBlank(message = "查询id不能为空") String id){
JsonViewObject jsonView = JsonViewObject.newInstance(); JsonViewObject jsonView = JsonViewObject.newInstance();
long start=System.currentTimeMillis(); long start=System.currentTimeMillis();
try { try {
GreenwaveInduces GreenwaveInduces = this.greenwaveInducesService.getById(id); GreenwaveInduces GreenwaveInduces = this.greenwaveInducesService.getById(id);
jsonView.success(GreenwaveInduces); jsonView.success(GreenwaveInduces);
...@@ -278,22 +280,22 @@ public class GreenwaveInducesController { ...@@ -278,22 +280,22 @@ public class GreenwaveInducesController {
/** /**
* 新建记录 * 新建记录
* *
* @param GreenwaveInduces * @param greenwaveInduces
* @return JsonViewObject * @return JsonViewObject
*/ */
@ApiOperation(value = "新建记录", notes = "新建记录", response = JsonViewObject.class, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON) @ApiOperation(value = "新建记录", notes = "新建记录", response = JsonViewObject.class, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
@PostMapping(value = "/creating", produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON) @PostMapping(value = "/creating", produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
JsonViewObject save(@ApiParam(value = "记录的JSON格式字符串", required = true) @RequestBody @Validated({ValidationGroups.Create.class}) GreenwaveInduces GreenwaveInduces){ JsonViewObject save(@ApiParam(value = "记录的JSON格式字符串", required = true) @RequestBody @Validated({ValidationGroups.Create.class}) GreenwaveInduces greenwaveInduces){
JsonViewObject jsonView = JsonViewObject.newInstance(); JsonViewObject jsonView = JsonViewObject.newInstance();
long start=System.currentTimeMillis(); long start=System.currentTimeMillis();
try { try {
if (GreenwaveInduces != null) { if (greenwaveInduces != null) {
jsonView = this.greenwaveInducesService.saveOrUpdate(GreenwaveInduces)?jsonView.success():jsonView.fail(); jsonView = this.greenwaveInducesService.saveOrUpdate(greenwaveInduces)?jsonView.success():jsonView.fail();
} }
} catch (Exception e) { } catch (Exception e) {
jsonView.fail(I18nResourceBundle.getConstants("SAVE_FAILED_MSG")); jsonView.fail(I18nResourceBundle.getConstants("SAVE_FAILED_MSG"));
log.error("AbstractRestServerImpl save error, jsonStr:{}", JSON.toJSONString(GreenwaveInduces), e); log.error("AbstractRestServerImpl save error, jsonStr:{}", JSON.toJSONString(greenwaveInduces), e);
} }
return jsonView; return jsonView;
} }
...@@ -301,21 +303,21 @@ public class GreenwaveInducesController { ...@@ -301,21 +303,21 @@ public class GreenwaveInducesController {
/** /**
* 修改记录 * 修改记录
* *
* @param GreenwaveInduces * @param greenwaveInduces
* @return * @return
*/ */
@ApiOperation(value = "修改记录", notes = "修改记录", response = JsonViewObject.class, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON) @ApiOperation(value = "修改记录", notes = "修改记录", response = JsonViewObject.class, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
@PostMapping(value = "/updating", produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON) @PostMapping(value = "/updating", produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
JsonViewObject update(@ApiParam(value = "记录的JSON格式字符串", required = true) @RequestBody @Validated({ValidationGroups.Update.class}) GreenwaveInduces GreenwaveInduces){ JsonViewObject update(@ApiParam(value = "记录的JSON格式字符串", required = true) @RequestBody @Validated({ValidationGroups.Update.class}) GreenwaveInduces greenwaveInduces){
JsonViewObject jsonView = JsonViewObject.newInstance(); JsonViewObject jsonView = JsonViewObject.newInstance();
long start=System.currentTimeMillis(); long start=System.currentTimeMillis();
try { try {
if (GreenwaveInduces != null) { if (greenwaveInduces != null) {
jsonView = this.greenwaveInducesService.saveOrUpdate(GreenwaveInduces)?jsonView.success():jsonView.fail(); jsonView = this.greenwaveInducesService.saveOrUpdate(greenwaveInduces)?jsonView.success():jsonView.fail();
} }
} catch (Exception e) { } catch (Exception e) {
jsonView.fail(I18nResourceBundle.getConstants("UPDATE_FAILED_MSG")); jsonView.fail(I18nResourceBundle.getConstants("UPDATE_FAILED_MSG"));
log.error("AbstractRestServerImpl update error, jsonStr:{}", JSON.toJSONString(GreenwaveInduces), e); log.error("AbstractRestServerImpl update error, jsonStr:{}", JSON.toJSONString(greenwaveInduces), e);
} }
return jsonView; return jsonView;
} }
......
signal-optimize-service/src/main/java/net/wanji/opt/controller/induce/GreenwaveInducesHistController.java
View file @ 2c8f6023
...@@ -3,6 +3,7 @@ package net.wanji.opt.controller.induce; ...@@ -3,6 +3,7 @@ package net.wanji.opt.controller.induce;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import io.swagger.annotations.*; import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import net.wanji.common.framework.Constants; import net.wanji.common.framework.Constants;
...@@ -12,6 +13,7 @@ import net.wanji.common.framework.rest.ValidationGroups; ...@@ -12,6 +13,7 @@ import net.wanji.common.framework.rest.ValidationGroups;
import net.wanji.common.utils.tool.DateUtil; import net.wanji.common.utils.tool.DateUtil;
import net.wanji.databus.dao.entity.GreenwaveInfoPO; import net.wanji.databus.dao.entity.GreenwaveInfoPO;
import net.wanji.databus.dao.mapper.GreenwaveInfoMapper; import net.wanji.databus.dao.mapper.GreenwaveInfoMapper;
import net.wanji.databus.po.CrossDataHistPO;
import net.wanji.opt.dao.mapper.induce.GreenwaveInducesHistMapper; import net.wanji.opt.dao.mapper.induce.GreenwaveInducesHistMapper;
import net.wanji.opt.dto.induce.GreenwaveDirDTO; import net.wanji.opt.dto.induce.GreenwaveDirDTO;
import net.wanji.opt.dto.induce.GreenwaveInducesDTO; import net.wanji.opt.dto.induce.GreenwaveInducesDTO;
...@@ -53,18 +55,12 @@ public class GreenwaveInducesHistController { ...@@ -53,18 +55,12 @@ public class GreenwaveInducesHistController {
@Resource @Resource
private GreenwaveInducesHistService greenwaveInducesHistService; private GreenwaveInducesHistService greenwaveInducesHistService;
@Resource
private GreenwaveInducesHistMapper greenwaveInducesHistMapper;
@Resource @Resource
private GreenwaveInducesService greenwaveInducesService; private GreenwaveInducesService greenwaveInducesService;
@Resource @Resource
private GreenwaveInfoMapper greenwaveInfoMapper; private GreenwaveInfoMapper greenwaveInfoMapper;
// @Resource
// private InduceTemplateService induceTemplateService;
@Resource @Resource
private DeviceInducesService deviceInducesService; private DeviceInducesService deviceInducesService;
...@@ -92,53 +88,58 @@ public class GreenwaveInducesHistController { ...@@ -92,53 +88,58 @@ public class GreenwaveInducesHistController {
greenwaveInducesDTO.setDesignSpeed(x.getDesignSpeed()); greenwaveInducesDTO.setDesignSpeed(x.getDesignSpeed());
greenwaveInducesDTO.setStatus(x.getStatus()); greenwaveInducesDTO.setStatus(x.getStatus());
greenwaveInducesDTO.setWkt(x.getWkt()); greenwaveInducesDTO.setWkt(x.getWkt());
AtomicReference<Integer> equipCount = new AtomicReference<>(0);
AtomicReference<Integer> equipCount= new AtomicReference<>(0);
List<GreenwaveDirDTO> dirList = new ArrayList<>(); List<GreenwaveDirDTO> dirList = new ArrayList<>();
this.greenwaveInducesHistService.list().stream().filter(o->Objects.isNull(o.getGreenId()) || o.getGreenId().equals(x.getId())).forEach(o -> { LambdaQueryWrapper<GreenwaveInducesHist> queryWrapper = new LambdaQueryWrapper<>();
GreenwaveDirDTO greenwaveDirDTO=new GreenwaveDirDTO(); queryWrapper.eq(GreenwaveInducesHist::getGreenId, x.getId());
greenwaveDirDTO.setDir(o.getDir()); List<GreenwaveInducesHist> newGreenwaveInducesHistList= greenwaveInducesHistService.list(queryWrapper);
greenwaveDirDTO.setStrategyId(o.getStrategyId()); newGreenwaveInducesHistList.stream().forEach(o -> {
greenwaveDirDTO.setStrategyName(o.getStrategyName()); GreenwaveDirDTO greenwaveDirDTO = new GreenwaveDirDTO();
greenwaveDirDTO.setDir(o.getDir());
greenwaveDirDTO.setMinSpeed(o.getMinSpeed()); greenwaveDirDTO.setStrategyId(o.getStrategyId());
greenwaveDirDTO.setMaxSpeed(o.getMaxSpeed()); greenwaveDirDTO.setStrategyName(o.getStrategyName());
if (Objects.nonNull(o.getControlOptTimes()) && o.getControlOptTimes().split("\\|").length > 0) { greenwaveDirDTO.setMinSpeed(o.getMinSpeed());
try { greenwaveDirDTO.setMaxSpeed(o.getMaxSpeed());
String startTime = DateUtil.format(DateUtil.parse(o.getControlOptTimes().split("\\|")[0], Constants.DATE_FORMAT.E_DATE_FORMAT_SECOND), Constants.DATE_FORMAT.E_DATE_FORMAT_TIME); if (Objects.nonNull(o.getControlOptTimes()) && o.getControlOptTimes().split("\\|").length > 0) {
String endTime = DateUtil.format(DateUtil.parse(o.getControlOptTimes().split("\\|")[1], Constants.DATE_FORMAT.E_DATE_FORMAT_SECOND), Constants.DATE_FORMAT.E_DATE_FORMAT_TIME); try {
greenwaveDirDTO.setControlOptTimes(startTime.substring(0, startTime.lastIndexOf(":00")) + "-" + endTime.substring(0, endTime.lastIndexOf(":00"))); String startTime = DateUtil.format(DateUtil.parse(o.getControlOptTimes().split("\\|")[0], Constants.DATE_FORMAT.E_DATE_FORMAT_SECOND), Constants.DATE_FORMAT.E_DATE_FORMAT_TIME);
} catch (ParseException ex) { String endTime = DateUtil.format(DateUtil.parse(o.getControlOptTimes().split("\\|")[1], Constants.DATE_FORMAT.E_DATE_FORMAT_SECOND), Constants.DATE_FORMAT.E_DATE_FORMAT_TIME);
ex.printStackTrace(); greenwaveDirDTO.setControlOptTimes(startTime.substring(0, startTime.lastIndexOf(":")) + "-" + endTime.substring(0, endTime.lastIndexOf(":")));
} catch (ParseException ex) {
ex.printStackTrace();
greenwaveDirDTO.setControlOptTimes(o.getControlOptTimes());
} catch (StringIndexOutOfBoundsException ex) {
ex.printStackTrace();
greenwaveDirDTO.setControlOptTimes(o.getControlOptTimes());
}
} else {
greenwaveDirDTO.setControlOptTimes(o.getControlOptTimes()); greenwaveDirDTO.setControlOptTimes(o.getControlOptTimes());
} }
} else { //获取诱导屏列表
greenwaveDirDTO.setControlOptTimes(o.getControlOptTimes()); List<InduceDTO> induceDTOList = new ArrayList<>();
} greenwaveInducesList.stream().filter(l -> Objects.nonNull(l.getGreenId()) && l.getGreenId().equals(o.getGreenId()) && Objects.nonNull(l.getDir()) && l.getDir().equals(o.getDir())).forEach(n -> {
//获取诱导屏列表 InduceDTO induceDTO = new InduceDTO();
List<InduceDTO> induceDTOList = new ArrayList<>(); induceDTO.setId(n.getId());
greenwaveInducesList.stream().filter(l -> Objects.nonNull(l.getGreenId()) && l.getGreenId().equals(o.getGreenId()) && Objects.nonNull(l.getDir()) && l.getDir().equals(o.getDir())).forEach(n -> { induceDTO.setEquipCode(n.getEquipCode());
InduceDTO induceDTO = new InduceDTO(); induceDTO.setStatus(o.getStatus());
induceDTO.setId(n.getId()); //获取屏幕的设备信息
induceDTO.setEquipCode(n.getEquipCode()); List<DeviceInduces> deviceInduces = deviceInducesList.stream().filter(m -> Objects.nonNull(m.getEquipCode()) && m.getEquipCode().equals(n.getEquipCode())).collect(Collectors.toList());// 过滤条件// 收集结果
induceDTO.setStatus(o.getStatus()); if (Objects.nonNull(deviceInduces) && deviceInduces.size() > 0) {
//获取屏幕的设备信息 induceDTO.setEquipName(deviceInduces.get(0).getEquipName());
List<DeviceInduces> deviceInduces = deviceInducesList.stream().filter(m -> Objects.nonNull(m.getEquipCode()) && m.getEquipCode().equals(n.getEquipCode()) ).collect(Collectors.toList());// 过滤条件// 收集结果 induceDTO.setRidDir(n.getDir());//
if (Objects.nonNull(deviceInduces) && deviceInduces.size() > 0) { induceDTO.setResolutionWidth(deviceInduces.get(0).getResolutionWidth());//
induceDTO.setEquipName(deviceInduces.get(0).getEquipName()); induceDTO.setResolutionHeight(deviceInduces.get(0).getResolutionHeight());//
induceDTO.setRidDir(n.getDir());// induceDTO.setWkt(deviceInduces.get(0).getWkt());
induceDTO.setResolutionWidth(deviceInduces.get(0).getResolutionWidth());// }
induceDTO.setResolutionHeight(deviceInduces.get(0).getResolutionHeight());// //关联模板信息
induceDTO.setWkt(deviceInduces.get(0).getWkt()); //induceDTO.setInduceTemplateList(induceTemplateList.stream().filter(x->Objects.isNull(x.getEquipCode()) || x.getEquipCode().equals(n.getEquipCode())).collect(Collectors.toList()));
} induceDTOList.add(induceDTO);
//关联模板信息 });
//induceDTO.setInduceTemplateList(induceTemplateList.stream().filter(x->Objects.isNull(x.getEquipCode()) || x.getEquipCode().equals(n.getEquipCode())).collect(Collectors.toList())); greenwaveDirDTO.setInduceList(induceDTOList);
induceDTOList.add(induceDTO); equipCount.updateAndGet(v -> v + induceDTOList.size());
dirList.add(greenwaveDirDTO);
}); });
greenwaveDirDTO.setInduceList(induceDTOList); // });
equipCount.updateAndGet(v -> v + induceDTOList.size());
dirList.add(greenwaveDirDTO);
});
greenwaveInducesDTO.setGreenwaveDirList(dirList); greenwaveInducesDTO.setGreenwaveDirList(dirList);
greenwaveInducesDTO.setEquipCount(equipCount.get()); greenwaveInducesDTO.setEquipCount(equipCount.get());
greenwaveInfoList.add(greenwaveInducesDTO); greenwaveInfoList.add(greenwaveInducesDTO);
...@@ -155,19 +156,19 @@ public class GreenwaveInducesHistController { ...@@ -155,19 +156,19 @@ public class GreenwaveInducesHistController {
/** /**
* 根据条件查询记录 * 根据条件查询记录
* *
* @param GreenwaveInducesHist 查询条件 * @param greenwaveInducesHist 查询条件
* @return JsonViewObject * @return JsonViewObject
*/ */
@ApiOperation(value = "根据条件查询记录", notes = "根据条件查询记录", response = JsonViewObject.class, consumes = MediaType.APPLICATION_JSON) @ApiOperation(value = "根据条件查询记录", notes = "根据条件查询记录", response = JsonViewObject.class, consumes = MediaType.APPLICATION_JSON)
@PostMapping(value = "/byCondition", produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON) @PostMapping(value = "/byCondition", produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
JsonViewObject getByWhere(@ApiParam(value = "查询条件", required = true) @RequestBody @Validated({ValidationGroups.Query.class}) GreenwaveInducesHist GreenwaveInducesHist) { JsonViewObject getByWhere(@ApiParam(value = "查询条件", required = true) @RequestBody @Validated({ValidationGroups.Query.class}) GreenwaveInducesHist greenwaveInducesHist) {
JsonViewObject jsonView = JsonViewObject.newInstance(); JsonViewObject jsonView = JsonViewObject.newInstance();
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
String jsonStr = JSON.toJSONString(GreenwaveInducesHist); String jsonStr = JSON.toJSONString(greenwaveInducesHist);
try { try {
//参数校验过程中修改，兼容实现，restful入参不用map，便于进行参数逐个校验 //参数校验过程中修改，兼容实现，restful入参不用map，便于进行参数逐个校验
Map params = JSONObject.parseObject(JSONObject.toJSONString(GreenwaveInducesHist), Map.class); Map params = JSONObject.parseObject(JSONObject.toJSONString(greenwaveInducesHist), Map.class);
// Map<String, Object> params = new HashMap<>(); // Map<String, Object> params = new HashMap<>();
// JSONObject.parseObject(JSONObject.toJSONString(GreenwaveInducesHist), Map.class).forEach((k,v) -> params.put(StringUtils.camelToCapital(k.toString()).toLowerCase(), v)); // JSONObject.parseObject(JSONObject.toJSONString(GreenwaveInducesHist), Map.class).forEach((k,v) -> params.put(StringUtils.camelToCapital(k.toString()).toLowerCase(), v));
List<GreenwaveInducesHist> greenwaveInducesHistList = this.greenwaveInducesHistService.list(); List<GreenwaveInducesHist> greenwaveInducesHistList = this.greenwaveInducesHistService.list();
...@@ -185,53 +186,62 @@ public class GreenwaveInducesHistController { ...@@ -185,53 +186,62 @@ public class GreenwaveInducesHistController {
greenwaveInducesDTO.setStatus(x.getStatus()); greenwaveInducesDTO.setStatus(x.getStatus());
AtomicReference<Integer> equipCount = new AtomicReference<>(0); AtomicReference<Integer> equipCount = new AtomicReference<>(0);
List<GreenwaveDirDTO> dirList = new ArrayList<>(); List<GreenwaveDirDTO> dirList = new ArrayList<>();
// greenwaveInducesList.stream().collect(Collectors.toMap(p -> p.getGreenId() + "_" + p.getDir(), p -> p)).values().stream().distinct().collect(Collectors.toList()).stream().forEach(p->{ && o.getDir().equals(p.getDir()) greenwaveInducesHistList.stream().filter(t->Objects.nonNull(t.getGreenId())&& t.getGreenId().equals(x.getId())).collect(Collectors.groupingBy(GreenwaveInducesHist::getDir)).entrySet().forEach(k->{
greenwaveInducesHistList.stream().filter(o -> Objects.isNull(o.getGreenId()) && o.getGreenId().equals(x.getId())).forEach(o -> { // greenwaveInducesList.stream().collect(Collectors.toMap(p -> p.getGreenId() + "_" + p.getDir(), p -> p, (existing, replacement) -> (existing.getGreenId() + "_" + existing.getDir()).equals(replacement.getGreenId() + "_" + replacement.getDir()) ? existing : replacement)).values().stream().distinct().collect(Collectors.toList()).stream().forEach(p -> {
GreenwaveDirDTO greenwaveDirDTO = new GreenwaveDirDTO(); LambdaQueryWrapper<GreenwaveInducesHist> queryWrapper = new LambdaQueryWrapper<>();
//这里从绿波表里获取基本信息 queryWrapper.eq(GreenwaveInducesHist::getGreenId, x.getId());
queryWrapper.eq(GreenwaveInducesHist::getDir,k.getKey());
List<GreenwaveInducesHist> newGreenwaveInducesHistList= greenwaveInducesHistService.list(queryWrapper);
newGreenwaveInducesHistList.stream().forEach(o -> {
// greenwaveInducesHistList.stream().filter(o -> Objects.isNull(o.getGreenId()) && Objects.equals(o.getGreenId(),x.getId())).forEach(o -> {
GreenwaveDirDTO greenwaveDirDTO = new GreenwaveDirDTO();
//这里从绿波表里获取基本信息
// List<GreenwaveInfoPO> greenwaveInfoByGreenId = greenwaveInfoPOList.stream().filter(n -> n.getId().equals(o.getGreenId())).collect(Collectors.toList());// 过滤条件// 收集结果 // List<GreenwaveInfoPO> greenwaveInfoByGreenId = greenwaveInfoPOList.stream().filter(n -> n.getId().equals(o.getGreenId())).collect(Collectors.toList());// 过滤条件// 收集结果
greenwaveDirDTO.setDir(o.getDir()); greenwaveDirDTO.setDir(o.getDir());
greenwaveDirDTO.setStrategyId(o.getStrategyId()); greenwaveDirDTO.setStrategyId(o.getStrategyId());
greenwaveDirDTO.setStrategyName(o.getStrategyName()); greenwaveDirDTO.setStrategyName(o.getStrategyName());
greenwaveDirDTO.setMinSpeed(o.getMinSpeed()); greenwaveDirDTO.setMinSpeed(o.getMinSpeed());
greenwaveDirDTO.setMaxSpeed(o.getMaxSpeed()); greenwaveDirDTO.setMaxSpeed(o.getMaxSpeed());
if (Objects.nonNull(o.getControlOptTimes()) && o.getControlOptTimes().split("\\|").length > 0) { if (Objects.nonNull(o.getControlOptTimes()) && o.getControlOptTimes().split("\\|").length > 0) {
try { try {
String startTime = DateUtil.format(DateUtil.parse(o.getControlOptTimes().split("\\|")[0], Constants.DATE_FORMAT.E_DATE_FORMAT_SECOND), Constants.DATE_FORMAT.E_DATE_FORMAT_TIME); String startTime = DateUtil.format(DateUtil.parse(o.getControlOptTimes().split("\\|")[0], Constants.DATE_FORMAT.E_DATE_FORMAT_SECOND), Constants.DATE_FORMAT.E_DATE_FORMAT_TIME);
String endTime = DateUtil.format(DateUtil.parse(o.getControlOptTimes().split("\\|")[1], Constants.DATE_FORMAT.E_DATE_FORMAT_SECOND), Constants.DATE_FORMAT.E_DATE_FORMAT_TIME); String endTime = DateUtil.format(DateUtil.parse(o.getControlOptTimes().split("\\|")[1], Constants.DATE_FORMAT.E_DATE_FORMAT_SECOND), Constants.DATE_FORMAT.E_DATE_FORMAT_TIME);
greenwaveDirDTO.setControlOptTimes(startTime.substring(0, startTime.lastIndexOf(":00")) + "-" + endTime.substring(0, endTime.lastIndexOf(":00"))); greenwaveDirDTO.setControlOptTimes(startTime.substring(0, startTime.lastIndexOf(":")) + "-" + endTime.substring(0, endTime.lastIndexOf(":")));
} catch (ParseException ex) { } catch (ParseException ex) {
ex.printStackTrace(); ex.printStackTrace();
greenwaveDirDTO.setControlOptTimes(o.getControlOptTimes());
} catch (StringIndexOutOfBoundsException ex) {
ex.printStackTrace();
greenwaveDirDTO.setControlOptTimes(o.getControlOptTimes());
}
} else {
greenwaveDirDTO.setControlOptTimes(o.getControlOptTimes()); greenwaveDirDTO.setControlOptTimes(o.getControlOptTimes());
} }
} else { //获取诱导屏列表
greenwaveDirDTO.setControlOptTimes(o.getControlOptTimes()); List<InduceDTO> induceDTOList = new ArrayList<>();
} greenwaveInducesList.stream().filter(l -> Objects.nonNull(l.getGreenId()) && l.getGreenId().equals(o.getGreenId()) && Objects.nonNull(l.getDir()) && l.getDir().equals(o.getDir())).forEach(n -> {
//获取诱导屏列表 InduceDTO induceDTO = new InduceDTO();
List<InduceDTO> induceDTOList = new ArrayList<>(); induceDTO.setId(n.getId());
greenwaveInducesList.stream().filter(l -> Objects.nonNull(l.getGreenId()) && l.getGreenId().equals(o.getGreenId()) && Objects.nonNull(l.getDir()) && l.getDir().equals(o.getDir())).forEach(n -> { induceDTO.setEquipCode(n.getEquipCode());
InduceDTO induceDTO = new InduceDTO(); induceDTO.setStatus(o.getStatus());
induceDTO.setId(n.getId()); //获取屏幕的设备信息
induceDTO.setEquipCode(n.getEquipCode()); List<DeviceInduces> deviceInduces = deviceInducesList.stream().filter(m -> Objects.nonNull(m.getEquipCode()) && m.getEquipCode().equals(n.getEquipCode())).collect(Collectors.toList());// 过滤条件// 收集结果
induceDTO.setStatus(o.getStatus()); if (Objects.nonNull(deviceInduces) && deviceInduces.size() > 0) {
//获取屏幕的设备信息 induceDTO.setEquipName(deviceInduces.get(0).getEquipName());
List<DeviceInduces> deviceInduces = deviceInducesList.stream().filter(m -> Objects.nonNull(m.getEquipCode()) && m.getEquipCode().equals(n.getEquipCode())).collect(Collectors.toList());// 过滤条件// 收集结果 induceDTO.setRidDir(n.getDir());//
if (Objects.nonNull(deviceInduces) && deviceInduces.size() > 0) { induceDTO.setResolutionWidth(deviceInduces.get(0).getResolutionWidth());//
induceDTO.setEquipName(deviceInduces.get(0).getEquipName()); induceDTO.setResolutionHeight(deviceInduces.get(0).getResolutionHeight());//
induceDTO.setRidDir(n.getDir());// induceDTO.setWkt(deviceInduces.get(0).getWkt());
induceDTO.setResolutionWidth(deviceInduces.get(0).getResolutionWidth());// }
induceDTO.setResolutionHeight(deviceInduces.get(0).getResolutionHeight());// //关联模板信息
induceDTO.setWkt(deviceInduces.get(0).getWkt()); //induceDTO.setInduceTemplateList(induceTemplateList.stream().filter(x -> Objects.isNull(x.getEquipCode()) || x.getEquipCode().equals(n.getEquipCode())).collect(Collectors.toList()));
} induceDTOList.add(induceDTO);
//关联模板信息 });
//induceDTO.setInduceTemplateList(induceTemplateList.stream().filter(x -> Objects.isNull(x.getEquipCode()) || x.getEquipCode().equals(n.getEquipCode())).collect(Collectors.toList())); greenwaveDirDTO.setInduceList(induceDTOList);
induceDTOList.add(induceDTO); equipCount.updateAndGet(v -> v + induceDTOList.size());
dirList.add(greenwaveDirDTO);
}); });
greenwaveDirDTO.setInduceList(induceDTOList);
equipCount.updateAndGet(v -> v + induceDTOList.size());
dirList.add(greenwaveDirDTO);
}); });
// });
greenwaveInducesDTO.setGreenwaveDirList(dirList); greenwaveInducesDTO.setGreenwaveDirList(dirList);
greenwaveInducesDTO.setEquipCount(equipCount.get()); greenwaveInducesDTO.setEquipCount(equipCount.get());
greenwaveInfoList.add(greenwaveInducesDTO); greenwaveInfoList.add(greenwaveInducesDTO);
...@@ -297,22 +307,22 @@ public class GreenwaveInducesHistController { ...@@ -297,22 +307,22 @@ public class GreenwaveInducesHistController {
/** /**
* 新建记录 * 新建记录
* *
* @param GreenwaveInducesHist * @param greenwaveInducesHist
* @return JsonViewObject * @return JsonViewObject
*/ */
@ApiOperation(value = "新建记录", notes = "新建记录", response = JsonViewObject.class, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON) @ApiOperation(value = "新建记录", notes = "新建记录", response = JsonViewObject.class, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
@PostMapping(value = "/creating", produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON) @PostMapping(value = "/creating", produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
JsonViewObject save(@ApiParam(value = "记录的JSON格式字符串", required = true) @RequestBody @Validated({ValidationGroups.Create.class}) GreenwaveInducesHist GreenwaveInducesHist){ JsonViewObject save(@ApiParam(value = "记录的JSON格式字符串", required = true) @RequestBody @Validated({ValidationGroups.Create.class}) GreenwaveInducesHist greenwaveInducesHist){
JsonViewObject jsonView = JsonViewObject.newInstance(); JsonViewObject jsonView = JsonViewObject.newInstance();
long start=System.currentTimeMillis(); long start=System.currentTimeMillis();
try { try {
if (GreenwaveInducesHist != null) { if (greenwaveInducesHist != null) {
jsonView = this.greenwaveInducesHistService.saveOrUpdate(GreenwaveInducesHist)?jsonView.success():jsonView.fail(); jsonView = this.greenwaveInducesHistService.saveOrUpdate(greenwaveInducesHist)?jsonView.success():jsonView.fail();
} }
} catch (Exception e) { } catch (Exception e) {
jsonView.fail(I18nResourceBundle.getConstants("SAVE_FAILED_MSG")); jsonView.fail(I18nResourceBundle.getConstants("SAVE_FAILED_MSG"));
log.error("AbstractRestServerImpl save error, jsonStr:{}", JSON.toJSONString(GreenwaveInducesHist), e); log.error("AbstractRestServerImpl save error, jsonStr:{}", JSON.toJSONString(greenwaveInducesHist), e);
} }
return jsonView; return jsonView;
} }
...@@ -320,21 +330,21 @@ public class GreenwaveInducesHistController { ...@@ -320,21 +330,21 @@ public class GreenwaveInducesHistController {
/** /**
* 修改记录 * 修改记录
* *
* @param GreenwaveInducesHist * @param greenwaveInducesHist
* @return * @return
*/ */
@ApiOperation(value = "修改记录", notes = "修改记录", response = JsonViewObject.class, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON) @ApiOperation(value = "修改记录", notes = "修改记录", response = JsonViewObject.class, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
@PostMapping(value = "/updating", produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON) @PostMapping(value = "/updating", produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
JsonViewObject update(@ApiParam(value = "记录的JSON格式字符串", required = true) @RequestBody @Validated({ValidationGroups.Update.class}) GreenwaveInducesHist GreenwaveInducesHist){ JsonViewObject update(@ApiParam(value = "记录的JSON格式字符串", required = true) @RequestBody @Validated({ValidationGroups.Update.class}) GreenwaveInducesHist greenwaveInducesHist){
JsonViewObject jsonView = JsonViewObject.newInstance(); JsonViewObject jsonView = JsonViewObject.newInstance();
long start=System.currentTimeMillis(); long start=System.currentTimeMillis();
try { try {
if (GreenwaveInducesHist != null) { if (greenwaveInducesHist != null) {
jsonView = this.greenwaveInducesHistService.saveOrUpdate(GreenwaveInducesHist)?jsonView.success():jsonView.fail(); jsonView = this.greenwaveInducesHistService.saveOrUpdate(greenwaveInducesHist)?jsonView.success():jsonView.fail();
} }
} catch (Exception e) { } catch (Exception e) {
jsonView.fail(I18nResourceBundle.getConstants("UPDATE_FAILED_MSG")); jsonView.fail(I18nResourceBundle.getConstants("UPDATE_FAILED_MSG"));
log.error("AbstractRestServerImpl update error, jsonStr:{}", JSON.toJSONString(GreenwaveInducesHist), e); log.error("AbstractRestServerImpl update error, jsonStr:{}", JSON.toJSONString(greenwaveInducesHist), e);
} }
return jsonView; return jsonView;
} }
......
signal-optimize-service/src/main/java/net/wanji/opt/controller/induce/InduceHistController.java
View file @ 2c8f6023
...@@ -64,22 +64,21 @@ public class InduceHistController { ...@@ -64,22 +64,21 @@ public class InduceHistController {
/** /**
* 根据条件查询记录 * 根据条件查询记录
* *
* @param InduceHist 查询条件 * @param induceHist 查询条件
* @return JsonViewObject * @return JsonViewObject
*/ */
@ApiOperation(value = "根据条件查询记录", notes = "根据条件查询记录", response = JsonViewObject.class, consumes = MediaType.APPLICATION_JSON) @ApiOperation(value = "根据条件查询记录", notes = "根据条件查询记录", response = JsonViewObject.class, consumes = MediaType.APPLICATION_JSON)
@PostMapping(value = "/byCondition", produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON) @PostMapping(value = "/byCondition", produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
JsonViewObject getByWhere(@ApiParam(value = "查询条件", required = true) @RequestBody @Validated({ValidationGroups.Query.class}) InduceHist InduceHist){ JsonViewObject getByWhere(@ApiParam(value = "查询条件", required = true) @RequestBody @Validated({ValidationGroups.Query.class}) InduceHist induceHist){
JsonViewObject jsonView = JsonViewObject.newInstance(); JsonViewObject jsonView = JsonViewObject.newInstance();
long start=System.currentTimeMillis(); long start=System.currentTimeMillis();
String jsonStr = JSON.toJSONString(InduceHist); String jsonStr = JSON.toJSONString(induceHist);
try { try {
//参数校验过程中修改，兼容实现，restful入参不用map，便于进行参数逐个校验 //参数校验过程中修改，兼容实现，restful入参不用map，便于进行参数逐个校验
// Map params = JSONObject.parseObject(JSONObject.toJSONString(InduceHist), Map.class); // Map params = JSONObject.parseObject(JSONObject.toJSONString(InduceHist), Map.class);
Map<String, Object> params = new HashMap<>(); Map<String, Object> params = new HashMap<>();
JSONObject.parseObject(JSONObject.toJSONString(InduceHist), Map.class).forEach((k,v) -> params.put(StringUtils.camelToCapital(k.toString()).toLowerCase(), v)); JSONObject.parseObject(JSONObject.toJSONString(induceHist), Map.class).forEach((k,v) -> params.put(StringUtils.camelToCapital(k.toString()).toLowerCase(), v));
List list = this.induceHistService.listByMap(params); List list = this.induceHistService.listByMap(params);
jsonView.success(list); jsonView.success(list);
} catch (Exception e) { } catch (Exception e) {
...@@ -144,22 +143,22 @@ public class InduceHistController { ...@@ -144,22 +143,22 @@ public class InduceHistController {
/** /**
* 新建记录 * 新建记录
* *
* @param InduceHist * @param induceHist
* @return JsonViewObject * @return JsonViewObject
*/ */
@ApiOperation(value = "新建记录", notes = "新建记录", response = JsonViewObject.class, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON) @ApiOperation(value = "新建记录", notes = "新建记录", response = JsonViewObject.class, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
@PostMapping(value = "/creating", produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON) @PostMapping(value = "/creating", produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
JsonViewObject save(@ApiParam(value = "记录的JSON格式字符串", required = true) @RequestBody @Validated({ValidationGroups.Create.class}) InduceHist InduceHist){ JsonViewObject save(@ApiParam(value = "记录的JSON格式字符串", required = true) @RequestBody @Validated({ValidationGroups.Create.class}) InduceHist induceHist){
JsonViewObject jsonView = JsonViewObject.newInstance(); JsonViewObject jsonView = JsonViewObject.newInstance();
long start=System.currentTimeMillis(); long start=System.currentTimeMillis();
try { try {
if (InduceHist != null) { if (induceHist != null) {
jsonView = this.induceHistService.saveOrUpdate(InduceHist)?jsonView.success():jsonView.fail(); jsonView = this.induceHistService.saveOrUpdate(induceHist)?jsonView.success():jsonView.fail();
} }
} catch (Exception e) { } catch (Exception e) {
jsonView.fail(I18nResourceBundle.getConstants("SAVE_FAILED_MSG")); jsonView.fail(I18nResourceBundle.getConstants("SAVE_FAILED_MSG"));
log.error("AbstractRestServerImpl save error, jsonStr:{}", JSON.toJSONString(InduceHist), e); log.error("AbstractRestServerImpl save error, jsonStr:{}", JSON.toJSONString(induceHist), e);
} }
return jsonView; return jsonView;
} }
...@@ -167,21 +166,21 @@ public class InduceHistController { ...@@ -167,21 +166,21 @@ public class InduceHistController {
/** /**
* 修改记录 * 修改记录
* *
* @param InduceHist * @param induceHist
* @return * @return
*/ */
@ApiOperation(value = "修改记录", notes = "修改记录", response = JsonViewObject.class, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON) @ApiOperation(value = "修改记录", notes = "修改记录", response = JsonViewObject.class, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
@PostMapping(value = "/updating", produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON) @PostMapping(value = "/updating", produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
JsonViewObject update(@ApiParam(value = "记录的JSON格式字符串", required = true) @RequestBody @Validated({ValidationGroups.Update.class}) InduceHist InduceHist){ JsonViewObject update(@ApiParam(value = "记录的JSON格式字符串", required = true) @RequestBody @Validated({ValidationGroups.Update.class}) InduceHist induceHist){
JsonViewObject jsonView = JsonViewObject.newInstance(); JsonViewObject jsonView = JsonViewObject.newInstance();
long start=System.currentTimeMillis(); long start=System.currentTimeMillis();
try { try {
if (InduceHist != null) { if (induceHist != null) {
jsonView = this.induceHistService.saveOrUpdate(InduceHist)?jsonView.success():jsonView.fail(); jsonView = this.induceHistService.saveOrUpdate(induceHist)?jsonView.success():jsonView.fail();
} }
} catch (Exception e) { } catch (Exception e) {
jsonView.fail(I18nResourceBundle.getConstants("UPDATE_FAILED_MSG")); jsonView.fail(I18nResourceBundle.getConstants("UPDATE_FAILED_MSG"));
log.error("AbstractRestServerImpl update error, jsonStr:{}", JSON.toJSONString(InduceHist), e); log.error("AbstractRestServerImpl update error, jsonStr:{}", JSON.toJSONString(induceHist), e);
} }
return jsonView; return jsonView;
} }
......
signal-optimize-service/src/main/java/net/wanji/opt/controller/induce/InduceTemplateController.java
View file @ 2c8f6023
...@@ -67,21 +67,21 @@ public class InduceTemplateController { ...@@ -67,21 +67,21 @@ public class InduceTemplateController {
/** /**
* 根据条件查询记录 * 根据条件查询记录
* *
* @param InduceTemplate 查询条件 * @param induceTemplate 查询条件
* @return JsonViewObject * @return JsonViewObject
*/ */
@ApiOperation(value = "根据条件查询记录", notes = "根据条件查询记录", response = JsonViewObject.class, consumes = MediaType.APPLICATION_JSON) @ApiOperation(value = "根据条件查询记录", notes = "根据条件查询记录", response = JsonViewObject.class, consumes = MediaType.APPLICATION_JSON)
@PostMapping(value = "/byCondition", produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON) @PostMapping(value = "/byCondition", produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
JsonViewObject getByWhere(@ApiParam(value = "查询条件", required = true) @RequestBody @Validated({ValidationGroups.Query.class}) InduceTemplate InduceTemplate){ JsonViewObject getByWhere(@ApiParam(value = "查询条件", required = true) @RequestBody @Validated({ValidationGroups.Query.class}) InduceTemplate induceTemplate){
JsonViewObject jsonView = JsonViewObject.newInstance(); JsonViewObject jsonView = JsonViewObject.newInstance();
long start=System.currentTimeMillis(); long start=System.currentTimeMillis();
String jsonStr = JSON.toJSONString(InduceTemplate); String jsonStr = JSON.toJSONString(induceTemplate);
try { try {
//参数校验过程中修改，兼容实现，restful入参不用map，便于进行参数逐个校验 //参数校验过程中修改，兼容实现，restful入参不用map，便于进行参数逐个校验
// Map params = JSONObject.parseObject(JSONObject.toJSONString(InduceTemplate), Map.class); // Map params = JSONObject.parseObject(JSONObject.toJSONString(InduceTemplate), Map.class);
Map<String, Object> params = new HashMap<>(); Map<String, Object> params = new HashMap<>();
JSONObject.parseObject(JSONObject.toJSONString(InduceTemplate), Map.class).forEach((k,v) -> params.put(StringUtils.camelToCapital(k.toString()).toLowerCase(), v)); JSONObject.parseObject(JSONObject.toJSONString(induceTemplate), Map.class).forEach((k,v) -> params.put(StringUtils.camelToCapital(k.toString()).toLowerCase(), v));
List list = this.induceTemplateService.listByMap(params); List list = this.induceTemplateService.listByMap(params);
jsonView.success(list); jsonView.success(list);
...@@ -147,22 +147,22 @@ public class InduceTemplateController { ...@@ -147,22 +147,22 @@ public class InduceTemplateController {
/** /**
* 新建记录 * 新建记录
* *
* @param InduceTemplate * @param induceTemplate
* @return JsonViewObject * @return JsonViewObject
*/ */
@ApiOperation(value = "新建记录", notes = "新建记录", response = JsonViewObject.class, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON) @ApiOperation(value = "新建记录", notes = "新建记录", response = JsonViewObject.class, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
@PostMapping(value = "/creating", produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON) @PostMapping(value = "/creating", produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
JsonViewObject save(@ApiParam(value = "记录的JSON格式字符串", required = true) @RequestBody @Validated({ValidationGroups.Create.class}) InduceTemplate InduceTemplate){ JsonViewObject save(@ApiParam(value = "记录的JSON格式字符串", required = true) @RequestBody @Validated({ValidationGroups.Create.class}) InduceTemplate induceTemplate){
JsonViewObject jsonView = JsonViewObject.newInstance(); JsonViewObject jsonView = JsonViewObject.newInstance();
long start=System.currentTimeMillis(); long start=System.currentTimeMillis();
try { try {
if (InduceTemplate != null) { if (induceTemplate != null) {
jsonView = this.induceTemplateService.saveOrUpdate(InduceTemplate)?jsonView.success():jsonView.fail(); jsonView = this.induceTemplateService.saveOrUpdate(induceTemplate)?jsonView.success():jsonView.fail();
} }
} catch (Exception e) { } catch (Exception e) {
jsonView.fail(I18nResourceBundle.getConstants("SAVE_FAILED_MSG")); jsonView.fail(I18nResourceBundle.getConstants("SAVE_FAILED_MSG"));
log.error("AbstractRestServerImpl save error, jsonStr:{}", JSON.toJSONString(InduceTemplate), e); log.error("AbstractRestServerImpl save error, jsonStr:{}", JSON.toJSONString(induceTemplate), e);
} }
return jsonView; return jsonView;
} }
...@@ -170,21 +170,21 @@ public class InduceTemplateController { ...@@ -170,21 +170,21 @@ public class InduceTemplateController {
/** /**
* 修改记录 * 修改记录
* *
* @param InduceTemplate * @param induceTemplate
* @return * @return
*/ */
@ApiOperation(value = "修改记录", notes = "修改记录", response = JsonViewObject.class, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON) @ApiOperation(value = "修改记录", notes = "修改记录", response = JsonViewObject.class, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
@PostMapping(value = "/updating", produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON) @PostMapping(value = "/updating", produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
JsonViewObject update(@ApiParam(value = "记录的JSON格式字符串", required = true) @RequestBody @Validated({ValidationGroups.Update.class}) InduceTemplate InduceTemplate){ JsonViewObject update(@ApiParam(value = "记录的JSON格式字符串", required = true) @RequestBody @Validated({ValidationGroups.Update.class}) InduceTemplate induceTemplate){
JsonViewObject jsonView = JsonViewObject.newInstance(); JsonViewObject jsonView = JsonViewObject.newInstance();
long start=System.currentTimeMillis(); long start=System.currentTimeMillis();
try { try {
if (InduceTemplate != null) { if (induceTemplate != null) {
jsonView = this.induceTemplateService.saveOrUpdate(InduceTemplate)?jsonView.success():jsonView.fail(); jsonView = this.induceTemplateService.saveOrUpdate(induceTemplate)?jsonView.success():jsonView.fail();
} }
} catch (Exception e) { } catch (Exception e) {
jsonView.fail(I18nResourceBundle.getConstants("UPDATE_FAILED_MSG")); jsonView.fail(I18nResourceBundle.getConstants("UPDATE_FAILED_MSG"));
log.error("AbstractRestServerImpl update error, jsonStr:{}", JSON.toJSONString(InduceTemplate), e); log.error("AbstractRestServerImpl update error, jsonStr:{}", JSON.toJSONString(induceTemplate), e);
} }
return jsonView; return jsonView;
} }
......
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