Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
8
8timerapiv200
Overview
Overview
Details
Activity
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
8timerv2
8timerapiv200
Commits
ac383e23
Commit
ac383e23
authored
Apr 22, 2020
by
东州 翁
Committed by
chenzg
Jul 05, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
小范围修改
parent
d04954f7
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
49 additions
and
23 deletions
+49
-23
src/main/java/cn/timer/api/bean/qyzx/QyzxFeebackAccessory.java
+9
-3
src/main/java/cn/timer/api/bean/qyzx/QyzxSuggestionFeeback.java
+7
-2
src/main/java/cn/timer/api/config/enums/Regular.java
+3
-1
src/main/java/cn/timer/api/controller/LoginController.java
+1
-0
src/main/java/cn/timer/api/controller/dzht/DzhtController.java
+1
-0
src/main/java/cn/timer/api/controller/qyzx/QyzxController.java
+19
-15
src/main/java/cn/timer/api/dao/qyzx/QyzxEntInfoMMapper.java
+3
-0
src/main/java/cn/timer/api/dao/qyzx/QyzxFeebackAccessoryMapper.java
+3
-1
src/main/java/cn/timer/api/dao/qyzx/QyzxSuggestionFeebackMapper.java
+3
-1
No files found.
src/main/java/cn/timer/api/bean/qyzx/QyzxFeebackAccessory.java
View file @
ac383e23
package
cn
.
timer
.
api
.
bean
.
qyzx
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.List
;
import
com.baomidou.mybatisplus.annotation.FieldFill
;
import
javax.persistence.Entity
;
import
javax.persistence.Table
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.extension.activerecord.Model
;
import
cn.timer.api.bean.qyzx.QyzxEmpLogin.QyzxEmpLoginBuilder
;
import
cn.timer.api.dto.login.QysDto
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
...
...
@@ -21,10 +25,12 @@ import lombok.NoArgsConstructor;
/**
* @author Tang 2019-11-11
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
(
toBuilder
=
true
)
@Table
(
name
=
"qyzx_feeback_accessory"
)
@ApiModel
(
"反馈附件表"
)
public
class
QyzxFeebackAccessory
extends
Model
<
QyzxFeebackAccessory
>
{
...
...
src/main/java/cn/timer/api/bean/qyzx/QyzxSuggestionFeeback.java
View file @
ac383e23
package
cn
.
timer
.
api
.
bean
.
qyzx
;
import
java.util.Date
;
import
javax.persistence.Entity
;
import
javax.persistence.Table
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.extension.activerecord.Model
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.AllArgsConstructor
;
...
...
@@ -16,10 +19,12 @@ import lombok.NoArgsConstructor;
/**
* @author Tang 2019-11-11
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
(
toBuilder
=
true
)
@Table
(
name
=
"qyzx_suggestion_feeback"
)
@ApiModel
(
"意见反馈表"
)
public
class
QyzxSuggestionFeeback
extends
Model
<
QyzxSuggestionFeeback
>
{
...
...
src/main/java/cn/timer/api/config/enums/Regular.java
View file @
ac383e23
...
...
@@ -40,7 +40,9 @@ public enum Regular {
* 强密码
*/
SHPW
(
"SHPW"
,
"^(?=.*\\d)(?=.*[a-z])(?=.*[A-Z])[a-zA-Z0-9]{8,10}$"
),
//纯汉字输入
/**
* 纯汉字输入
*/
CHINESE
(
"CHINESE"
,
"[\\u4E00-\\u9FA5]*"
),
/**
* 邮箱
...
...
src/main/java/cn/timer/api/controller/LoginController.java
View file @
ac383e23
...
...
@@ -28,6 +28,7 @@ import cn.hutool.core.util.StrUtil;
import
cn.timer.api.bean.qyzx.QyzxEmpEntAsso
;
import
cn.timer.api.bean.qyzx.QyzxEmpLogin
;
import
cn.timer.api.bean.qyzx.QyzxEntInfoM
;
import
cn.timer.api.bean.yggl.YgglMainEmp
;
import
cn.timer.api.bean.zzgl.ZzglAuth
;
import
cn.timer.api.bean.zzgl.ZzglBmgwM
;
...
...
src/main/java/cn/timer/api/controller/dzht/DzhtController.java
View file @
ac383e23
...
...
@@ -36,6 +36,7 @@ import cn.timer.api.bean.dzht.DzhtAssoHtwj;
import
cn.timer.api.bean.dzht.DzhtAssoQyrz
;
import
cn.timer.api.bean.qyzx.QyzxEmpEntAsso
;
import
cn.timer.api.bean.qyzx.QyzxEntInfoM
;
import
cn.timer.api.bean.yggl.YgglMainEmp
;
import
cn.timer.api.config.annotation.CurrentUser
;
import
cn.timer.api.config.annotation.UserBean
;
...
...
src/main/java/cn/timer/api/controller/qyzx/QyzxController.java
View file @
ac383e23
...
...
@@ -447,21 +447,25 @@ public class QyzxController {
* 意见反馈
*/
@PostMapping
(
value
=
"/feedback"
)
@ApiOperation
(
value
=
"意见反馈)"
,
httpMethod
=
"POST"
,
notes
=
"接口发布说明"
)
public
Result
<
QyzxLogBuy
>
feedback
(
@CurrentUser
UserBean
userBean
,
@RequestParam
(
required
=
false
)
String
moudle
,
@RequestParam
(
required
=
false
)
String
opinionText
,
@Param
(
"files"
)
List
<
MultipartFile
>
files
)
{
@ApiOperation
(
value
=
"意见反馈"
,
httpMethod
=
"POST"
,
notes
=
"接口发布说明"
)
public
Result
<
QyzxSuggestionFeeback
>
feedback
(
@CurrentUser
UserBean
userBean
,
@RequestParam
(
required
=
false
)
String
opinionText
,
@RequestParam
(
required
=
false
)
String
moudle
,
@Param
(
"files"
)
List
<
MultipartFile
>
files
)
{
String
url
=
null
;
List
<
String
>
list
=
new
ArrayList
<
String
>();
for
(
MultipartFile
file
:
files
)
{
String
path
=
"8timer2.0/"
+
userBean
.
getOrgCode
()
+
"/"
+
moudle
+
"/"
+
file
.
getOriginalFilename
();
if
(
file
==
null
||
file
.
getSize
()
<=
0
)
{
return
ResultUtil
.
error
(
"上传的文件为空,请重新选择!"
);
}
else
{
try
{
url
=
OSSUtil
.
uploadFile
(
path
,
file
.
getInputStream
());
list
.
add
(
url
);
}
catch
(
IOException
e
)
{
e
.
printStackTrace
();
if
(
files
!=
null
)
{
for
(
MultipartFile
file
:
files
)
{
String
path
=
"8timer2.0/"
+
userBean
.
getOrgCode
()
+
"/"
+
moudle
+
"/"
+
file
.
getOriginalFilename
();
if
(
file
==
null
||
file
.
getSize
()
<=
0
)
{
return
ResultUtil
.
error
(
"上传的文件为空,请重新选择!"
);
}
else
{
try
{
url
=
OSSUtil
.
uploadFile
(
path
,
file
.
getInputStream
());
list
.
add
(
url
);
}
catch
(
IOException
e
)
{
e
.
printStackTrace
();
}
}
}
}
...
...
@@ -589,13 +593,13 @@ public class QyzxController {
}
/**
* 添加/修改企业
* 添加/修改企业
信息
*
* @param
* @return
*/
@PostMapping
(
value
=
"/ent"
)
@ApiOperation
(
value
=
"添加/修改企业"
,
httpMethod
=
"POST"
,
notes
=
"接口发布说明"
)
@ApiOperation
(
value
=
"添加/修改企业
信息
"
,
httpMethod
=
"POST"
,
notes
=
"接口发布说明"
)
public
Result
<
QyzxEntInfoM
>
addent
(
@CurrentUser
UserBean
userBean
,
@RequestBody
QyzxEntInfoM
qyzxEntInfoM
)
{
qyzxEntInfoM
.
insertOrUpdate
();
Integer
count
=
qyzxEmpEntAssoMapper
.
selectCount
(
new
QueryWrapper
<
QyzxEmpEntAsso
>()
...
...
src/main/java/cn/timer/api/dao/qyzx/QyzxEntInfoMMapper.java
View file @
ac383e23
...
...
@@ -5,6 +5,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import
cn.timer.api.bean.qyzx.QyzxEntInfoM
;
/**
* 企业信息
* @author Tang 2019-11-11
...
...
src/main/java/cn/timer/api/dao/qyzx/QyzxFeebackAccessoryMapper.java
View file @
ac383e23
...
...
@@ -5,12 +5,14 @@ import org.springframework.stereotype.Repository;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
cn.timer.api.bean.qyzx.QyzxFeebackAccessory
;
/**
* 员工企业关联表
* @author Tang 2019-11-11
*/
@Repository
public
interface
QyzxFeebackAccessoryMapper
extends
BaseMapper
<
QyzxFeebackAccessory
Mapper
>
{
public
interface
QyzxFeebackAccessoryMapper
extends
BaseMapper
<
QyzxFeebackAccessory
>
{
}
src/main/java/cn/timer/api/dao/qyzx/QyzxSuggestionFeebackMapper.java
View file @
ac383e23
...
...
@@ -5,12 +5,14 @@ import org.springframework.stereotype.Repository;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
cn.timer.api.bean.qyzx.QyzxSuggestionFeeback
;
/**
* 员工企业关联表
* @author Tang 2019-11-11
*/
@Repository
public
interface
QyzxSuggestionFeebackMapper
extends
BaseMapper
<
QyzxSuggestionFeeback
Mapper
>
{
public
interface
QyzxSuggestionFeebackMapper
extends
BaseMapper
<
QyzxSuggestionFeeback
>
{
}
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