Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
T
tcm-system
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
TCM
tcm-system
Commits
25695e14
Commit
25695e14
authored
Dec 22, 2020
by
tangf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改消息发送
parent
103bc1e6
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
4 deletions
+5
-4
DevideController.java
...m/pangding/web/authority/controller/DevideController.java
+2
-1
CompanyDaoImpl.java
...a/com/pangding/web/authority/dao/impl/CompanyDaoImpl.java
+1
-1
DeviceDaoImpl.java
...va/com/pangding/web/authority/dao/impl/DeviceDaoImpl.java
+2
-2
No files found.
src/main/java/com/pangding/web/authority/controller/DevideController.java
View file @
25695e14
...
@@ -3,6 +3,7 @@ package com.pangding.web.authority.controller;
...
@@ -3,6 +3,7 @@ package com.pangding.web.authority.controller;
import
com.pangding.web.authority.service.DeviceService
;
import
com.pangding.web.authority.service.DeviceService
;
import
com.pangding.web.vo.system.req.DeviceReqVo
;
import
com.pangding.web.vo.system.req.DeviceReqVo
;
import
com.pangding.web.vo.system.res.DeviceResVo
;
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.PageSizeData
;
import
com.yanzuoguang.util.vo.ResponseResult
;
import
com.yanzuoguang.util.vo.ResponseResult
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.Api
;
...
@@ -44,7 +45,7 @@ public class DevideController {
...
@@ -44,7 +45,7 @@ public class DevideController {
@RequestMapping
(
value
=
"/findDeviceInfoByCode"
,
method
=
RequestMethod
.
POST
,
produces
=
MediaType
.
APPLICATION_JSON_UTF8_VALUE
)
@RequestMapping
(
value
=
"/findDeviceInfoByCode"
,
method
=
RequestMethod
.
POST
,
produces
=
MediaType
.
APPLICATION_JSON_UTF8_VALUE
)
@ApiOperation
(
value
=
"根据设备编号获取设备信息"
,
notes
=
"返回设备信息"
)
@ApiOperation
(
value
=
"根据设备编号获取设备信息"
,
notes
=
"返回设备信息"
)
public
ResponseResult
<
DeviceResVo
>
findDeviceInfoByCode
(
@RequestBody
DeviceReqVo
req
){
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
);
return
deviceService
.
findDeviceInfoByCode
(
req
);
}
}
...
...
src/main/java/com/pangding/web/authority/dao/impl/CompanyDaoImpl.java
View file @
25695e14
...
@@ -23,7 +23,7 @@ public class CompanyDaoImpl extends BaseDaoImpl implements CompanyDao {
...
@@ -23,7 +23,7 @@ public class CompanyDaoImpl extends BaseDaoImpl implements CompanyDao {
register
(
CompanyVo
.
class
);
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"
)
"where 1=1 {WHERE} order by create_time desc"
)
.
add
(
"companyName"
,
"and company_name = ? "
)
.
add
(
"companyName"
,
"and company_name = ? "
)
.
add
(
"companyType"
,
"and company_type = ? "
)
.
add
(
"companyType"
,
"and company_type = ? "
)
...
...
src/main/java/com/pangding/web/authority/dao/impl/DeviceDaoImpl.java
View file @
25695e14
...
@@ -34,8 +34,8 @@ public class DeviceDaoImpl extends BaseDaoImpl implements DeviceDao {
...
@@ -34,8 +34,8 @@ public class DeviceDaoImpl extends BaseDaoImpl implements DeviceDao {
.
add
(
"deviceStatus"
,
" AND device_status = ? "
);
.
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"
)
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
(
"deviceId"
,
"
AND device_id = ? "
)
.
add
(
"deviceCode"
,
"AND device_code = ? "
)
.
add
(
"deviceCode"
,
"
AND device_code = ? "
)
.
add
(
"deviceName"
,
" AND device_name = ? "
)
.
add
(
"deviceName"
,
" AND device_name = ? "
)
.
add
(
"deviceType"
,
" AND device_type = ? "
)
.
add
(
"deviceType"
,
" AND device_type = ? "
)
.
add
(
"companyId"
,
" AND company_id = ? "
)
.
add
(
"companyId"
,
" AND company_id = ? "
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment