|
|
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import com.ruoyi.common.annotation.Anonymous;
|
|
|
import com.ruoyi.common.core.domain.AjaxResult;
|
|
|
import com.ruoyi.common.core.domain.model.LoginUser;
|
|
|
+import com.ruoyi.common.utils.StringUtils;
|
|
|
import com.ruoyi.iot.domain.TDevicePlan;
|
|
|
import com.ruoyi.iot.domain.WeitiandiDeviceInfo;
|
|
|
import com.ruoyi.iot.entity.param.DeviceParam;
|
|
|
@@ -22,6 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
import org.springframework.web.servlet.view.RedirectView;
|
|
|
|
|
|
+import javax.servlet.http.HttpServletRequest;
|
|
|
import java.text.SimpleDateFormat;
|
|
|
import java.util.Date;
|
|
|
import java.util.List;
|
|
|
@@ -60,8 +62,12 @@ public class DeviceController {
|
|
|
}
|
|
|
@PostMapping("/checkVersion")
|
|
|
@ApiOperation("检测版本")
|
|
|
- public AjaxResult checkVersion(@RequestParam("versionCode")Integer appVersionCode){
|
|
|
- Map<String, Object> deviceData = tDeviceRecordMapper.getDeviceData("select * from cz_app_version order by create_time desc limit 1");
|
|
|
+ public AjaxResult checkVersion(@RequestParam("versionCode")Integer appVersionCode, HttpServletRequest request){
|
|
|
+ String appfrom = request.getParameter("appfrom");
|
|
|
+ if(StringUtils.isEmpty(appfrom)){
|
|
|
+ appfrom = "normal";
|
|
|
+ }
|
|
|
+ Map<String, Object> deviceData = tDeviceRecordMapper.getDeviceData("select * from cz_app_version where from = '"+appfrom+"' order by create_time desc limit 1");
|
|
|
return AjaxResult.success(deviceData);
|
|
|
}
|
|
|
|