跟新相关bug

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/a4endpoint/MedicineDeviceEndpoint.java

@@ -788,6 +788,26 @@ public class MedicineDeviceEndpoint extends EnvelopRestEndpoint {
        return success(jsonObject.getString("response"));
    }
    /**
     * 设备端系统更新
     * @param equNum
     * @param type
     * @param mess
     * @return
     * @throws Exception
     */
    @PostMapping(value = BaseRequestMapping.BaseDevice.SYSTEMUPDATE)
    @ApiOperation(value = "设备端系统更新")
    public Envelop systemUpdate(
            @ApiParam(name = "equNum", value = "设备编码", required = false)
            @RequestParam(value = "equNum", required = false) String equNum,
            @ApiParam(name = "type", value = "事件类型", required = true)
            @RequestParam(value = "type", required = true) String type,
            @ApiParam(name = "mess", value = "事件说明", required = true)
            @RequestParam(value = "mess", required = true) String mess) throws Exception {
        return success(medicineServive.systemUpdate(equNum,type,mess));
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicineWarrayService.java

@@ -331,7 +331,7 @@ public class MedicineWarrayService extends BaseJpaService<Mediicinewarray, Medii
            conditionSql += " and t.network_status = '" + netStatus + "'";
        }
        if (!StringUtils.isEmpty(content)){
            conditionSql += " and CONCAT(IFNULL(t.`equ_name`,''), IFNULL(t.`equ_num`,'')) like '%" + content + "%'";
            conditionSql += " and CONCAT(IFNULL(t.equ_name,''), IFNULL(t.equ_num,'')) like '%" + content + "%'";
        }
        if (org.apache.commons.lang.StringUtils.isNotBlank(startTime)&& org.apache.commons.lang.StringUtils.isNotBlank(endTime)){
            conditionSql += "  AND  t.log_time >= '" + startTime +"'" +