From fbbac3c79d750c6688fd95c8ca75afcac4ac2d7f Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 21 Mar 2019 12:54:09 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[=E6=8B=BC=E5=9B=A2][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E7=8A=B6=E6=80=81]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkService/src/main/resources/mapper/WxOrderMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index 1f591b917..fc7b13b72 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -700,7 +700,7 @@ - update wx_order set order_status=#{orderStatus} where tenant_id=#{tenantId} and order_group_id=#{orderGroupId} + update wx_order set order_status=#{orderStatus} where tenant_id=#{tenantId} and order_group_id=#{orderGroupId} and order_status=10 From 6d033aa549fa78364377c9ff14390314199c7ec3 Mon Sep 17 00:00:00 2001 From: hupeng Date: Thu, 21 Mar 2019 13:15:04 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[=E5=A4=A7=E5=B1=8F][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=AF=E9=85=8D=E7=BD=AE=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxDeviceController.java | 13 ++--- .../WxDeviceScreenAdController.java | 2 +- .../com/iformall/service/WxDeviceService.java | 3 +- .../service/impl/WxDeviceServiceImpl.java | 54 ++++++++++++++++++- 4 files changed, 63 insertions(+), 9 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxDeviceController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxDeviceController.java index bdd04a1ad..718d34061 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxDeviceController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxDeviceController.java @@ -53,8 +53,8 @@ public class WxDeviceController extends BaseController { wxDevice.setStatus(EnumDeviceStatus.VALID.getCode()); wxDevice.setOnlineStatus(EnumDeviceOnlineStatus.OFFLINE.getCode()); wxDevice.setTenantId(getTenantId()); - wxDeviceService.saveOrUpdate(wxDevice); - return new ResultData(); + + return wxDeviceService.saveOrUpdate(wxDevice); } @ApiOperation("更新设备") @@ -65,8 +65,8 @@ public class WxDeviceController extends BaseController { if (wxDevice.getId() == null) return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); wxDevice.setTenantId(getTenantId()); - wxDeviceService.saveOrUpdate(wxDevice); - return new ResultData(); + + return wxDeviceService.saveOrUpdate(wxDevice); } @ApiOperation("设备详情") @@ -90,8 +90,9 @@ public class WxDeviceController extends BaseController { wxDevice.setId(id); wxDevice.setTenantId(getTenantId()); wxDevice.setStatus(EnumDeviceStatus.INVALID.getCode()); - wxDeviceService.saveOrUpdate(wxDevice); - return new ResultData(); + + return wxDeviceService.saveOrUpdate(wxDevice); + } } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxDeviceScreenAdController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxDeviceScreenAdController.java index afc554af7..a8bdb8e52 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxDeviceScreenAdController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxDeviceScreenAdController.java @@ -95,7 +95,7 @@ public class WxDeviceScreenAdController extends BaseController { wxDevice.setLastHbTime(new Date()); wxDevice.setVersion(paramMap.get("version")); wxDeviceService.saveOrUpdate(wxDevice); - return new ResultData(wxDevice); + return new ResultData(wxDevice.getConfig()); } @ApiOperation("基础信息") diff --git a/mallinkService/src/main/java/com/iformall/service/WxDeviceService.java b/mallinkService/src/main/java/com/iformall/service/WxDeviceService.java index 4b0dec811..b8a71c7b1 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxDeviceService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxDeviceService.java @@ -2,6 +2,7 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; +import com.iformall.common.ResultData; import com.iformall.domain.po.WxDevice; import java.util.List; @@ -34,7 +35,7 @@ public interface WxDeviceService { * * @param record */ - void saveOrUpdate(WxDevice record); + ResultData saveOrUpdate(WxDevice record); /** diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxDeviceServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxDeviceServiceImpl.java index 49a721965..4a2794b97 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxDeviceServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxDeviceServiceImpl.java @@ -1,11 +1,15 @@ package com.iformall.service.impl; +import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.iformall.common.ErrorCode; import com.iformall.common.IdWorker; +import com.iformall.common.ResultData; import com.iformall.domain.po.WxDevice; import com.iformall.enums.EnumDeviceStatus; +import com.iformall.enums.EnumDeviceType; import com.iformall.mapper.WxDeviceMapper; import com.iformall.service.WxDeviceService; import org.slf4j.Logger; @@ -24,6 +28,14 @@ public class WxDeviceServiceImpl implements WxDeviceService { @Autowired WxDeviceMapper wxDeviceMapper; + final String DEVICE_DEFAULT_CONFIG_SCREEN_AD = "{" + + "\"heartBeatIntervel\":300000," + //5MIN + "\"dataRefreshIntervel\":3600000," + //1HOUR + "\"pageChangeInterval\":10000," + //10SEC + "\"animationTheme\":0" + + "}"; + + @Override public PageInfo listAsPage(WxDevice record, Integer pageIndex, Integer pageSize) { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxDeviceMapper.findList(record)); @@ -34,20 +46,60 @@ public class WxDeviceServiceImpl implements WxDeviceService { return wxDeviceMapper.selectByPrimaryKey(id); } + + private String getDefaultConfig(int type) { + + if (type == EnumDeviceType.SCREEN.getCode()) { + return DEVICE_DEFAULT_CONFIG_SCREEN_AD; + } + return null; + } + + private boolean checkConfig(int type, String config) { + JSONObject jConfig; + try { + jConfig = JSONObject.parseObject(config); + } catch (Exception e) { + return false; + } + + if (type == EnumDeviceType.SCREEN.getCode()) { + Integer heartBeatIntervel = jConfig.getInteger("heartBeatIntervel"); + Integer dataRefreshIntervel = jConfig.getInteger("dataRefreshIntervel"); + Integer pageChangeInterval = jConfig.getInteger("pageChangeInterval"); + Integer animationTheme = jConfig.getInteger("animationTheme"); + if (heartBeatIntervel == null || + dataRefreshIntervel == null || + pageChangeInterval == null || + animationTheme == null) { + return false; + } + } + return true; + } + @Override - public void saveOrUpdate(WxDevice record) { + public ResultData saveOrUpdate(WxDevice record) { if (record.getId() == null) { final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); record.setCreateDate(new Date()); record.setUpdateDate(new Date()); + record.setConfig(getDefaultConfig(record.getType())); wxDeviceMapper.insertSelective(record); } else { record.setUpdateDate(new Date()); + if (record.getConfig() != null) { + if (!checkConfig(record.getType(),record.getConfig())) { + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); + } + } wxDeviceMapper.updateByPrimaryKeySelective(record); } + return new ResultData(); } + @Override public void deleteById(Long id) { wxDeviceMapper.deleteByPrimaryKey(id); From ccb678ce114796c3cb949fb734c0e3b3af304ad5 Mon Sep 17 00:00:00 2001 From: hupeng Date: Thu, 21 Mar 2019 13:51:47 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[=E5=A4=A7=E5=B1=8F][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E5=BF=83=E8=B7=B3=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E5=80=BC?= =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/WxDeviceScreenAdController.java | 8 +++++++- .../com/iformall/service/impl/WxDeviceServiceImpl.java | 8 ++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxDeviceScreenAdController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxDeviceScreenAdController.java index a8bdb8e52..9421bc17a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxDeviceScreenAdController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxDeviceScreenAdController.java @@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -95,7 +96,12 @@ public class WxDeviceScreenAdController extends BaseController { wxDevice.setLastHbTime(new Date()); wxDevice.setVersion(paramMap.get("version")); wxDeviceService.saveOrUpdate(wxDevice); - return new ResultData(wxDevice.getConfig()); + + Map result = new HashMap<>(); + result.put("config",wxDevice.getConfig()); + result.put("name", wxDevice.getName()); + result.put("location", wxDevice.getLocation()); + return new ResultData(result); } @ApiOperation("基础信息") diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxDeviceServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxDeviceServiceImpl.java index 4a2794b97..efca8b262 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxDeviceServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxDeviceServiceImpl.java @@ -29,8 +29,8 @@ public class WxDeviceServiceImpl implements WxDeviceService { WxDeviceMapper wxDeviceMapper; final String DEVICE_DEFAULT_CONFIG_SCREEN_AD = "{" + - "\"heartBeatIntervel\":300000," + //5MIN - "\"dataRefreshIntervel\":3600000," + //1HOUR + "\"heartbeatInterval\":300000," + //5MIN + "\"dataRefreshInterval\":3600000," + //1HOUR "\"pageChangeInterval\":10000," + //10SEC "\"animationTheme\":0" + "}"; @@ -64,8 +64,8 @@ public class WxDeviceServiceImpl implements WxDeviceService { } if (type == EnumDeviceType.SCREEN.getCode()) { - Integer heartBeatIntervel = jConfig.getInteger("heartBeatIntervel"); - Integer dataRefreshIntervel = jConfig.getInteger("dataRefreshIntervel"); + Integer heartBeatIntervel = jConfig.getInteger("heartbeatInterval"); + Integer dataRefreshIntervel = jConfig.getInteger("dataRefreshInterval"); Integer pageChangeInterval = jConfig.getInteger("pageChangeInterval"); Integer animationTheme = jConfig.getInteger("animationTheme"); if (heartBeatIntervel == null ||