| @@ -92,6 +92,10 @@ public class WxDevice implements Serializable { | |||||
| @io.swagger.annotations.ApiModelProperty(value="最后一次在线时间",name="hbCmd") | @io.swagger.annotations.ApiModelProperty(value="最后一次在线时间",name="hbCmd") | ||||
| private Integer hbCmd; | private Integer hbCmd; | ||||
| /**设备名**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="设备配置",name="config") | |||||
| private String config; | |||||
| public String getTenantId() { | public String getTenantId() { | ||||
| return tenantId; | return tenantId; | ||||
| } | } | ||||
| @@ -195,6 +199,14 @@ public class WxDevice implements Serializable { | |||||
| this.hbCmd = hbCmd; | this.hbCmd = hbCmd; | ||||
| } | } | ||||
| public String getConfig() { | |||||
| return config; | |||||
| } | |||||
| public void setConfig(String config) { | |||||
| this.config = config; | |||||
| } | |||||
| public static enum Field | public static enum Field | ||||
| { | { | ||||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | ||||
| @@ -1640,9 +1640,9 @@ public class WxChartServiceImpl implements WxChartDataService { | |||||
| if (StringUtils.isEmpty(paramsMap.get("enddate"))) { | if (StringUtils.isEmpty(paramsMap.get("enddate"))) { | ||||
| params.put("enddate", endTime); | params.put("enddate", endTime); | ||||
| } else { | } else { | ||||
| endTime = DateUtils.stringToDate(paramsMap.get("enddate") + " 23:59:59", "yyyy-MM-dd HH:mm:ss"); | |||||
| params.put("enddate", paramsMap.get("enddate") + " 23:59:59"); | params.put("enddate", paramsMap.get("enddate") + " 23:59:59"); | ||||
| } | } | ||||
| List<Map<String, Object>> successlist = wxOrderGroupMapper.queryOrderGroupSuccessCountAndTime(params); | List<Map<String, Object>> successlist = wxOrderGroupMapper.queryOrderGroupSuccessCountAndTime(params); | ||||
| List<Map<String, Object>> verifyList = wxOrderGroupMapper.queryOrderGroupVerifyCountAndTime(params); | List<Map<String, Object>> verifyList = wxOrderGroupMapper.queryOrderGroupVerifyCountAndTime(params); | ||||
| @@ -16,10 +16,11 @@ | |||||
| <result column="first_hb_time" jdbcType="TIMESTAMP" property="firstHbTime"/> | <result column="first_hb_time" jdbcType="TIMESTAMP" property="firstHbTime"/> | ||||
| <result column="last_hb_time" jdbcType="TIMESTAMP" property="lastHbTime"/> | <result column="last_hb_time" jdbcType="TIMESTAMP" property="lastHbTime"/> | ||||
| <result column="hb_cmd" jdbcType="INTEGER" property="hbCmd"/> | <result column="hb_cmd" jdbcType="INTEGER" property="hbCmd"/> | ||||
| <result column="config" jdbcType="VARCHAR" property="config"/> | |||||
| </resultMap> | </resultMap> | ||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| `id`, `tenant_id`, `device_id`, `type`, `status`, `location`, `name`, `version`, `create_date`, `update_date`, `online_status`, `first_hb_time`, `last_hb_time`, `hb_cmd` | |||||
| `id`, `tenant_id`, `device_id`, `type`, `status`, `location`, `name`, `version`, `create_date`, `update_date`, `online_status`, `first_hb_time`, `last_hb_time`, `hb_cmd`, `config` | |||||
| </sql> | </sql> | ||||
| <sql id="dynamicWhereConditions"> | <sql id="dynamicWhereConditions"> | ||||
| @@ -82,6 +83,10 @@ | |||||
| and `hb_cmd` = #{hbCmd} | and `hb_cmd` = #{hbCmd} | ||||
| </if> | </if> | ||||
| <if test=" null != config "> | |||||
| and `config` = #{config} | |||||
| </if> | |||||
| <if test=" null != ids "> | <if test=" null != ids "> | ||||
| and id in | and id in | ||||