From 8f305f5ddcf4b063064827fa08fba8f49aef32a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=86=99=E6=9C=9D?= <13694051+wangxizhao123@user.noreply.gitee.com> Date: Fri, 28 Jun 2024 16:03:12 +0800 Subject: [PATCH] =?UTF-8?q?fast()=E6=8C=87=E6=A0=87=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=EF=BC=8C=E6=BB=91=E7=AA=97=E8=A7=84=E5=88=99=E8=AE=BE=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/dev/DataSpecificationDev.java | 61 ++++++++ .../domain/event/DataSpecification.java | 45 ++++++ .../common/domain/event/DateType.java | 25 +++ .../business/common/domain/event/Length.java | 1 + .../business/common/domain/event/Radius.java | 1 + .../muyu/goods/controller/CarController.java | 3 +- .../goods/controller/ForewarnController.java | 106 ++++++++++++- .../com/muyu/goods/incident/mq/Producer.java | 4 + .../com/muyu/goods/mapper/ForewarnMapper.java | 22 ++- .../com/muyu/goods/service/ICarService.java | 3 +- .../muyu/goods/service/IForewarnService.java | 63 +++++++- .../goods/service/impl/CarServiceImpl.java | 9 +- .../goods/service/impl/ForewarnService.java | 147 +++++++++++++++++- .../resources/mapper/rule/ForewarnMapper.xml | 84 ++++++++-- 14 files changed, 546 insertions(+), 28 deletions(-) create mode 100644 muyu-modules/muyu-business/muyu-business-common/src/main/java/com/business/common/dev/DataSpecificationDev.java create mode 100644 muyu-modules/muyu-business/muyu-business-common/src/main/java/com/business/common/domain/event/DataSpecification.java create mode 100644 muyu-modules/muyu-business/muyu-business-common/src/main/java/com/business/common/domain/event/DateType.java diff --git a/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/business/common/dev/DataSpecificationDev.java b/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/business/common/dev/DataSpecificationDev.java new file mode 100644 index 0000000..5da1f45 --- /dev/null +++ b/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/business/common/dev/DataSpecificationDev.java @@ -0,0 +1,61 @@ +package com.business.common.dev; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class DataSpecificationDev { + /** + * 主键 + */ + private Long id; + /** + * 车辆标识 + */ + private String vin; + /** + * 编码 + */ + private String dataCode; + /** + * 标签 + */ + private String label; + /** + * 标准数据 + */ + private String standardData; + /** + *编码id + */ + private Long dateTypeId; + /** + * 滑窗范围id + */ + private Long radiusId; + /** + * 滑窗范围 + */ + private String radius; + /** + * 滑窗定义 + */ + private String radiusName; + /** + * 滑动长度id + */ + private Long lengthId; + /** + * 滑动定义 + */ + private String lengthName; + /** + * 滑动长度 + */ + private String length; +} diff --git a/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/business/common/domain/event/DataSpecification.java b/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/business/common/domain/event/DataSpecification.java new file mode 100644 index 0000000..09d9456 --- /dev/null +++ b/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/business/common/domain/event/DataSpecification.java @@ -0,0 +1,45 @@ +package com.business.common.domain.event; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class DataSpecification { + /** + * 主键 + */ + private Long id; + /** + * 车辆标识 + */ + private String vin; + /** + * 编码 + */ + private String dataCode; + /** + * 标签 + */ + private String label; + /** + * 标准数据 + */ + private String standardData; + /** + *编码id + */ + private Long dateTypeId; + /** + * 滑窗范围id + */ + private Long radiusId; + /** + * 滑窗长度id + */ + private Long lengthId; +} diff --git a/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/business/common/domain/event/DateType.java b/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/business/common/domain/event/DateType.java new file mode 100644 index 0000000..5477ce0 --- /dev/null +++ b/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/business/common/domain/event/DateType.java @@ -0,0 +1,25 @@ +package com.business.common.domain.event; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class DateType { + /** + * 主键 + */ + private Long dateTypeId; + /** + * 编码 + */ + private String dataCode; + /** + * 标签 + */ + private String label; +} diff --git a/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/business/common/domain/event/Length.java b/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/business/common/domain/event/Length.java index a8aae1f..d82b410 100644 --- a/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/business/common/domain/event/Length.java +++ b/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/business/common/domain/event/Length.java @@ -11,6 +11,7 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor public class Length { + private Long lengthId; /** * 长度定义 */ diff --git a/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/business/common/domain/event/Radius.java b/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/business/common/domain/event/Radius.java index 4f8c03c..dd969f7 100644 --- a/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/business/common/domain/event/Radius.java +++ b/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/business/common/domain/event/Radius.java @@ -10,6 +10,7 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor public class Radius { + private Long radiusId; /** * 范围定义 */ diff --git a/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/controller/CarController.java b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/controller/CarController.java index 68571c5..c8b666d 100644 --- a/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/controller/CarController.java +++ b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/controller/CarController.java @@ -1,6 +1,7 @@ package com.muyu.goods.controller; import java.util.List; +import java.util.Map; import javax.servlet.http.HttpServletResponse; import com.business.common.dev.LongitudeAndLatitude; @@ -148,7 +149,7 @@ public class CarController extends BaseController * @return */ @PostMapping("read") - public Result read() { + public Result> read() { return success(carService.read()); } diff --git a/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/controller/ForewarnController.java b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/controller/ForewarnController.java index 9ec924e..de59e51 100644 --- a/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/controller/ForewarnController.java +++ b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/controller/ForewarnController.java @@ -1,11 +1,13 @@ package com.muyu.goods.controller; import com.business.common.dev.DataFormatDev; +import com.business.common.dev.DataSpecificationDev; import com.business.common.domain.DataFormat; -import com.business.common.domain.event.Window; +import com.business.common.domain.event.*; import com.dtflys.forest.annotation.Post; import com.muyu.common.core.domain.Result; import com.muyu.common.core.web.controller.BaseController; +import com.muyu.common.log.annotation.Log; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.LoginUser; import com.muyu.goods.Domain.WindowDonain; @@ -24,8 +26,8 @@ public class ForewarnController extends BaseController { @Autowired private IForewarnService forewarnService; - @PostMapping("list") - public Result> list() { + @PostMapping("listDataSpecificationDev") + public Result> list() { return success(forewarnService.list()); } //全部报文 @@ -48,4 +50,102 @@ public class ForewarnController extends BaseController { public Result deleteDataFormatById(@PathVariable String vin) { return success(forewarnService.deleteDataFormatById(vin)); } + + /** + * 导入redis + * @return + */ + @PostMapping("redisDataDormById") + public Result redisDataDormById() { + return success(forewarnService.redisDataDormById()); + } + + /** + * 滑动长度 + * @return + */ + @PostMapping("listLength") + public Result> listLength() { + return success(forewarnService.listLength()); + } + + /** + * 滑动范围 + * @return + */ + @PostMapping("listRadius") + public Result> listRadius() { + return success(forewarnService.listRadius()); + } + + /** + * 查看车辆具体滑窗 + * @param vin + * @return + */ + @PostMapping("selectDataSpecificationDev") + public Result> selectDataSpecificationDev(@RequestParam String vin) { + return success(forewarnService.selectDataSpecificationDev(vin)); + } + + /** + * 添加新滑动 + * @param dataSpecification + * @return + */ + @PostMapping("indexDataSpecification") + public Result indexDataSpecification(@RequestBody DataSpecification dataSpecification,@RequestParam String vin) { + return success(forewarnService.indexDataSpecification(dataSpecification,vin)); + } + + /** + * 查看单个滑窗详情 + * @param id + * @return + */ + @PostMapping("selectDataSpecificationById/{id}") + public Result selectDataSpecificationById(@PathVariable Long id) { + return success(forewarnService.selectDataSpecificationById(id)); + } + + /** + * 修改滑动 + * @param dataSpecification + * @return + */ + @PostMapping("updataDataSpecification") + public Result updataDataSpecification(@RequestBody DataSpecification dataSpecification) { + return success(forewarnService.updataDataSpecification(dataSpecification)); + } + + /** + * 删除滑动 + * @param id + * @return + */ + @PostMapping("deleteDataSpecification") + public Result deleteDataSpecification(@RequestParam Long id){ + return success(forewarnService.deleteDataSpecification(id)); + } + + /** + * 获取相应的编码 + * @param vin + * @return + */ + @PostMapping("listDateType") + public Result> listDateType(@RequestParam String vin) { + return success(forewarnService.listDateType(vin)); + } + + /** + * 获取相应的编码 + * @param + * @return + */ + @PostMapping("selectDateType") + public Result> selectDateType() { + return success(forewarnService.selectDateType()); + } + } diff --git a/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/incident/mq/Producer.java b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/incident/mq/Producer.java index 92dea5c..2030dbd 100644 --- a/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/incident/mq/Producer.java +++ b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/incident/mq/Producer.java @@ -25,4 +25,8 @@ public class Producer { String jsonString = JSONObject.toJSONString(faultInfo); rabbitTemplate.convertAndSend("fault.message","end",jsonString); } + + public void redis_cache(String vin) { + rabbitTemplate.convertAndSend("data_format_renewal",vin); + } } diff --git a/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/mapper/ForewarnMapper.java b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/mapper/ForewarnMapper.java index c5faf14..d5ecd34 100644 --- a/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/mapper/ForewarnMapper.java +++ b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/mapper/ForewarnMapper.java @@ -1,14 +1,15 @@ package com.muyu.goods.mapper; import com.business.common.dev.DataFormatDev; +import com.business.common.dev.DataSpecificationDev; import com.business.common.domain.DataFormat; -import com.business.common.domain.event.Window; +import com.business.common.domain.event.*; import org.apache.ibatis.annotations.Param; import java.util.List; public interface ForewarnMapper { - List list(); + List list(); List listDataFormat(); @@ -17,4 +18,21 @@ public interface ForewarnMapper { Integer deleteDataFormatById(@Param("vin") String vin); List selectDataFormatById(@Param("vin") String vin); + + List listLength(); + + List listRadius(); + + List selectDataSpecificationDev(); + + int indexDataSpecification(DataSpecification dataSpecification); + + int updataDataSpecification(DataSpecification dataSpecification); + + Integer deleteDataSpecification(@Param("id") Long id); + + + List listDateType(); + + DataSpecification selectDataSpecificationById(@Param("id") Long id); } diff --git a/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/service/ICarService.java b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/service/ICarService.java index c86889a..b27d7ff 100644 --- a/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/service/ICarService.java +++ b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/service/ICarService.java @@ -5,6 +5,7 @@ import com.business.common.domain.Car; import com.business.common.domain.VehicleInfo; import java.util.List; +import java.util.Map; /** * 车辆信息Service接口 @@ -69,7 +70,7 @@ public interface ICarService Car query(Long carId); - VehicleInfo read(); + Map read(); void open(); diff --git a/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/service/IForewarnService.java b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/service/IForewarnService.java index 1aa76b7..1d7d7b0 100644 --- a/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/service/IForewarnService.java +++ b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/service/IForewarnService.java @@ -1,13 +1,15 @@ package com.muyu.goods.service; import com.business.common.dev.DataFormatDev; +import com.business.common.dev.DataSpecificationDev; import com.business.common.domain.DataFormat; -import com.business.common.domain.event.Window; +import com.business.common.domain.event.*; +import com.muyu.common.core.domain.Result; import java.util.List; public interface IForewarnService { - List list(); + List list(); /** * 全部报文 @@ -34,4 +36,61 @@ public interface IForewarnService { */ Integer deleteDataFormatById(String vin); + /** + * 导入redis + * @return + */ + String redisDataDormById(); + + /** + * 查看滑动长度 + * @return + */ + List listLength(); + + /** + * 查看滑窗范围 + * @return + */ + List listRadius(); + + /** + * 查看车辆滑窗 + * @param vin + * @return + */ + List selectDataSpecificationDev(String vin); + + /** + * 添加滑窗 + * @param dataSpecification + * @return + */ + Integer indexDataSpecification(DataSpecification dataSpecification,String vin); + + /** + * 修改滑窗 + * @param dataSpecification + * @return + */ + Integer updataDataSpecification(DataSpecification dataSpecification); + + /** + * 删除滑窗 + * @param id + * @return + */ + Integer deleteDataSpecification(Long id); + + /** + * 查看具体编程 + * @param vin + * @return + */ + List listDateType(String vin); + + List selectDateType(); + + DataSpecification selectDataSpecificationById(Long id); + } diff --git a/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/service/impl/CarServiceImpl.java b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/service/impl/CarServiceImpl.java index 0a7c141..67f26ce 100644 --- a/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/service/impl/CarServiceImpl.java +++ b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/service/impl/CarServiceImpl.java @@ -1,6 +1,8 @@ package com.muyu.goods.service.impl; import java.util.List; + +import java.util.Map; import java.util.UUID; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; @@ -21,6 +23,8 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; +import static com.fasterxml.jackson.databind.type.LogicalType.Map; + /** * 车辆信息Service业务层处理 * @@ -157,7 +161,7 @@ public class CarServiceImpl implements ICarService private Timer timer; @Override - public VehicleInfo read() { + public Map read() { String rightPopAndLeftPush = null; try { rightPopAndLeftPush = redisTemplate.opsForList().leftPop("event_handler:realtime_data:JAV0VJUJYOTOK9KSY" @@ -170,8 +174,7 @@ public class CarServiceImpl implements ICarService } if (rightPopAndLeftPush != null){ String parse = JSON.parse(rightPopAndLeftPush).toString(); - VehicleInfo vehicleInfo = JSON.parseObject(parse, VehicleInfo.class); - return vehicleInfo; + return JSON.parseObject(parse, java.util.Map.class); }else{ return null; } diff --git a/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/service/impl/ForewarnService.java b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/service/impl/ForewarnService.java index e8756e7..87fdb55 100644 --- a/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/service/impl/ForewarnService.java +++ b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/service/impl/ForewarnService.java @@ -1,12 +1,16 @@ package com.muyu.goods.service.impl; import com.business.common.dev.DataFormatDev; +import com.business.common.dev.DataSpecificationDev; import com.business.common.domain.DataFormat; -import com.business.common.domain.event.Window; +import com.business.common.domain.event.*; +import com.muyu.common.core.domain.Result; import com.muyu.common.security.utils.SecurityUtils; +import com.muyu.goods.incident.mq.Producer; import com.muyu.goods.mapper.ForewarnMapper; import com.muyu.goods.service.IForewarnService; import org.apache.kafka.common.protocol.types.Field; +import org.apache.xmlbeans.GDateSpecification; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; @@ -24,9 +28,11 @@ public class ForewarnService implements IForewarnService { private ForewarnMapper forewarnMapper; @Autowired private RedisTemplate redisTemplate; + @Autowired + private Producer producer; @Override - public List list() { + public List list() { return forewarnMapper.list(); } @@ -86,8 +92,16 @@ public class ForewarnService implements IForewarnService { list.add(dataFormatDev); } //再添加新报文 - - return forewarnMapper.indexDataFormat(list); + int i = forewarnMapper.indexDataFormat(list); + if (i > 0){ + listDataFormat(); + Boolean b = redisTemplate.opsForHash().hasKey("load_center:go_live", vin); + if (b){ + System.out.println(vin); + producer.redis_cache(vin); + } + } + return i; } /** @@ -99,5 +113,130 @@ public class ForewarnService implements IForewarnService { return forewarnMapper.deleteDataFormatById(vin); } + @Override + public String redisDataDormById() { + List dataSpecificationDevs = selectDataSpecificationDev(null); + //进行分组 + Map map = new HashMap<>(); + Map map2 = new HashMap<>(); + Map> collect = dataSpecificationDevs.stream().collect(Collectors.groupingBy(DataSpecificationDev::getVin)); + // 给每组数据改成字符串格式 + collect.forEach((a,b) -> { + String name = ""; + String code = ""; + //编辑字符串 + for (DataSpecificationDev dataSpecificationDev : b) { + name += dataSpecificationDev.getDataCode() + "-" + dataSpecificationDev.getLabel() + "-" + + dataSpecificationDev.getRadius() + "-" + dataSpecificationDev.getLength() + "-" + dataSpecificationDev.getStandardData() + ","; + code += dataSpecificationDev.getDataCode() + ","; + } + name = name.substring(0,name.length()-1); + code = code.substring(0,code.length()-1); + //存入map中 + map.put(a,name); + map2.put(a,code); + }); + //map数据导入redis + map.forEach((key,val) -> { + redisTemplate.opsForHash().put("event_handler:indicator_warning:execute_info:",key,val); + }); + map2.forEach((key,val) -> { + redisTemplate.opsForHash().put("event_handler:indicator_warning:warning_data:",key,val); + }); + return dataSpecificationDevs.toString(); + } + + /** + * 滑动长度 + * @return + */ + @Override + public List listLength() { + return forewarnMapper.listLength(); + } + + /** + * 滑窗范围 + * @return + */ + @Override + public List listRadius() { + return forewarnMapper.listRadius(); + } + + @Override + public List selectDataSpecificationDev(String vin) { + List list = forewarnMapper.selectDataSpecificationDev(); + if (vin!=null){ + List collect = list.stream().filter(dataSpecificationDev -> dataSpecificationDev.getVin().equals(vin)).collect(Collectors.toList()); + return collect; + } + return list; + } + + /** + * 添加滑窗 + * @param dataSpecification + * @return + */ + @Override + public Integer indexDataSpecification(DataSpecification dataSpecification, String vin) { + DateType dateType1 = selectDateType().stream().filter(dateType -> dataSpecification.getDateTypeId() == dateType.getDateTypeId()).collect(Collectors.toList()).get(0); + dataSpecification.setDataCode(dateType1.getDataCode()); + dataSpecification.setLabel(dateType1.getLabel()); + dataSpecification.setVin(vin); + int i = forewarnMapper.indexDataSpecification(dataSpecification); + return i; + } + + /** + * 修改滑窗 + * @param dataSpecification + * @return + */ + @Override + public Integer updataDataSpecification(DataSpecification dataSpecification) { + int i = forewarnMapper.updataDataSpecification(dataSpecification); + return i; + } + + /** + * 删除滑窗 + * @param id + * @return + */ + @Override + public Integer deleteDataSpecification(Long id) { + return forewarnMapper.deleteDataSpecification(id); + } + + @Override + public List listDateType(String vin) { + List dateTypeList = selectDateType(); + List dataFormats = selectDataFormatById(vin); + //取重复的值 + //创建一个集合类 + List dataCode = dataFormats.stream().map(DataFormat::getDataCode).collect(Collectors.toList()); + //开始区分 + List dateTypes = dateTypeList.stream().filter(dateType -> dataCode.contains(dateType.getDataCode())).collect(Collectors.toList()); + //取没有重复值 + List dataSpecificationDevs = selectDataSpecificationDev(vin); + //拉取集合类 + List collect = dataSpecificationDevs.stream().map(DataSpecificationDev::getDataCode).collect(Collectors.toList()); + //过滤提取没有重复的值 + List typeList = dateTypes.stream().filter(dateType -> !collect.contains(dateType.getDataCode())).collect(Collectors.toList()); + return typeList; + } + + @Override + public List selectDateType() { + return forewarnMapper.listDateType(); + } + + @Override + public DataSpecification selectDataSpecificationById(Long id) { + return forewarnMapper.selectDataSpecificationById(id); + } + } diff --git a/muyu-modules/muyu-business/muyu-business-server/src/main/resources/mapper/rule/ForewarnMapper.xml b/muyu-modules/muyu-business/muyu-business-server/src/main/resources/mapper/rule/ForewarnMapper.xml index 6b43b1f..f89cce8 100644 --- a/muyu-modules/muyu-business/muyu-business-server/src/main/resources/mapper/rule/ForewarnMapper.xml +++ b/muyu-modules/muyu-business/muyu-business-server/src/main/resources/mapper/rule/ForewarnMapper.xml @@ -4,14 +4,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + - - - - - + + + + + + @@ -31,8 +32,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - select id, vin, point, standard, window_start_time, window_end_time, result from window + + select d.id,d.vin,d.data_code,d.label,d.standard_data,d.date_type_id,d.radius_id,d.length_id, + r.radius_name, r.radius, l.length_name, l.length + from data_specification d left join radius r on d.radius_id = r.radius_id + left join length l on l.length_id = d.length_id select data_code, label, start,end from data_format @@ -41,17 +45,52 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into data_format values - (#{list.vin},#{list.dataCode},#{list.label},#{list.start},#{list.end}) + (0,#{list.vin},#{list.dataCode},#{list.label},#{list.start},#{list.end}) + + insert into data_specification + + vin, + data_code, + label, + standard_data, + date_type_id, + radius_id, + length_id, + + + #{vin}, + #{dataCode}, + #{label}, + #{standardData}, + #{dateTypeId}, + #{radiusId}, + #{lengthId}, + + + + update data_specification + + data_code = #{dataCode}, + label = #{label}, + standard_data = #{standardData}, + date_type_id = #{dateTypeId}, + radius_id = #{radiusId}, + length_id = #{lengthId}, + + where id = #{id} + delete from data_format where vin = #{vin}; - + + delete + from data_specification + where id = #{id}; + @@ -59,6 +98,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where vin = #{vin} + + + + + +