Commit 25695e14 authored by tangf's avatar tangf

修改消息发送

parent 103bc1e6
......@@ -3,6 +3,7 @@ package com.pangding.web.authority.controller;
import com.pangding.web.authority.service.DeviceService;
import com.pangding.web.vo.system.req.DeviceReqVo;
import com.pangding.web.vo.system.res.DeviceResVo;
import com.yanzuoguang.util.helper.CheckerHelper;
import com.yanzuoguang.util.vo.PageSizeData;
import com.yanzuoguang.util.vo.ResponseResult;
import io.swagger.annotations.Api;
......@@ -44,7 +45,7 @@ public class DevideController {
@RequestMapping(value = "/findDeviceInfoByCode", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@ApiOperation(value = "根据设备编号获取设备信息", notes = "返回设备信息")
public ResponseResult<DeviceResVo> findDeviceInfoByCode(@RequestBody DeviceReqVo req){
// CheckerHelper.newInstance().notBlankCheck("id",req.getId()).checkException();
CheckerHelper.newInstance().notBlankCheck("deviceCode",req.getDeviceCode()).checkException();
return deviceService.findDeviceInfoByCode(req);
}
......
......@@ -23,7 +23,7 @@ public class CompanyDaoImpl extends BaseDaoImpl implements CompanyDao {
register(CompanyVo.class);
table.add(SELECT,"select a.*,b.invitation_code,b.withdraw_money from pd_company a inner join pd_company_extend b on a.id = b.id " +
table.add(SELECT,"select a.*,b.invitation_code,b.withdraw_total_cash from pd_company a inner join pd_company_extend b on a.id = b.id " +
"where 1=1 {WHERE} order by create_time desc")
.add("companyName","and company_name = ? ")
.add("companyType","and company_type = ? ")
......
......@@ -34,8 +34,8 @@ public class DeviceDaoImpl extends BaseDaoImpl implements DeviceDao {
.add("deviceStatus", " AND device_status = ? ");
table.add(QUERY_INFO, "SELECT a.*,b.company_name FROM pd_device a LEFT JOIN pd_company b ON a.company_id = b.id WHERE 1=1 {WHERE")
.add("deviceId", "AND device_id = ? ")
.add("deviceCode", "AND device_code = ? ")
.add("deviceId", " AND device_id = ? ")
.add("deviceCode", " AND device_code = ? ")
.add("deviceName", " AND device_name = ? ")
.add("deviceType", " AND device_type = ? ")
.add("companyId", " AND company_id = ? ")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment