物联网 BUG修复

svr/svr-iot/src/main/java/com/yihu/iot/controller/product/IotProductController.java

@@ -135,8 +135,8 @@ public class IotProductController extends EnvelopRestEndpoint {
                                            @RequestParam(value = "jsonData", required = false)String jsonData) {
        try {
            IotProductVO iotProductVO = toEntity(jsonData, IotProductVO.class);
            iotProductBaseInfoService.addProduct(iotProductVO);
            return MixEnvelop.getSuccess(IotRequestMapping.Common.message_success_create);
           return iotProductBaseInfoService.addProduct(iotProductVO);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
@@ -194,8 +194,7 @@ public class IotProductController extends EnvelopRestEndpoint {
                                            @RequestParam(value = "jsonData", required = false)String jsonData) {
        try {
            IotProductVO iotProductVO = toEntity(jsonData, IotProductVO.class);
            iotProductBaseInfoService.updProduct(iotProductVO);
            return MixEnvelop.getSuccess(IotRequestMapping.Common.message_success_update);
            return iotProductBaseInfoService.updProduct(iotProductVO);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());

svr/svr-iot/src/main/java/com/yihu/iot/dao/product/IotProductBaseInfoDao.java

@@ -19,4 +19,7 @@ public interface IotProductBaseInfoDao extends PagingAndSortingRepository<IotPro
    @Query("from IotProductBaseInfoDO w where w.del = 1")
    List<IotProductBaseInfoDO> findAllByDel();
    @Query("from IotProductBaseInfoDO w where w.name =?1 and w.del = 1")
    IotProductBaseInfoDO findByName(String name);
}

svr/svr-iot/src/main/java/com/yihu/iot/service/product/IotProductBaseInfoService.java

@@ -130,7 +130,7 @@ public class IotProductBaseInfoService extends BaseJpaService<IotProductBaseInfo
     * 修改产品
     * @param iotProductVO
     */
    public void updProduct(IotProductVO iotProductVO){
    public MixEnvelop<IotProductVO, IotProductVO> updProduct(IotProductVO iotProductVO){
        IotProductBaseInfoVO baseInfoVO = iotProductVO.getIotProductBaseInfo();
        IotProductExtendInfoVO extendInfoVO = iotProductVO.getIotProductExtendInfo();
        List<IotProductAttachmentVO> attachmentVOList = extendInfoVO.getAttachmentVOList();
@@ -139,6 +139,12 @@ public class IotProductBaseInfoService extends BaseJpaService<IotProductBaseInfo
        //数据转换
        IotProductBaseInfoDO baseInfoDO = convertToModel(baseInfoVO,IotProductBaseInfoDO.class);
        IotProductBaseInfoDO productBaseInfoDO = iotProductBaseInfoDao.findByName(baseInfoDO.getName());
        if (productBaseInfoDO!=null&&(baseInfoDO.getId().equalsIgnoreCase(productBaseInfoDO.getId())==false)){
            return MixEnvelop.getError("产品已存在");
        }
        //日期单独处理
        baseInfoDO.setStartTime(DateUtil.strToDate(baseInfoVO.getStartTime()));
        baseInfoDO.setEndTime(DateUtil.strToDate(baseInfoVO.getEndTime()));
@@ -228,14 +234,20 @@ public class IotProductBaseInfoService extends BaseJpaService<IotProductBaseInfo
            one.setProductId(productId);
        });
        iotProductDataTransmissionDao.save(dataTransmissionDOList);
        return MixEnvelop.getSuccess(IotRequestMapping.Common.message_success_update);
    }
    /**
     * 新增产品
     * @param iotProductVO
     */
    public void addProduct(IotProductVO iotProductVO){
    public MixEnvelop<IotProductVO, IotProductVO> addProduct(IotProductVO iotProductVO){
        IotProductBaseInfoVO baseInfoVO = iotProductVO.getIotProductBaseInfo();
        IotProductBaseInfoDO productBaseInfoDO = iotProductBaseInfoDao.findByName(baseInfoVO.getName());
        if (productBaseInfoDO!=null){
            return MixEnvelop.getError("产品已存在");
        }
        IotProductExtendInfoVO extendInfoVO = iotProductVO.getIotProductExtendInfo();
        List<IotProductAttachmentVO> attachmentVOList = extendInfoVO.getAttachmentVOList();
        List<IotProductMeasuredDataVO> measuredDataVOList = iotProductVO.getMeasuredDataVOList();
@@ -282,6 +294,8 @@ public class IotProductBaseInfoService extends BaseJpaService<IotProductBaseInfo
            one.setProductId(productId);
        });
        iotProductDataTransmissionDao.save(dataTransmissionDOList);
        return MixEnvelop.getSuccess(IotRequestMapping.Common.message_success_create);
    }
    /**