Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
education
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
李丛阳
education
Commits
c53295b7
Commit
c53295b7
authored
Apr 23, 2018
by
李博今
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加教室管理功能
修改FileController 添加b_rooms sql文件
parent
83a849f2
Changes
18
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
978 additions
and
4 deletions
+978
-4
pom.xml
pom.xml
+7
-0
b_rooms.sql
sql/new_table/2.0.3/b_rooms.sql
+46
-0
BArrangeController.java
...soft/business/barrange/controller/BArrangeController.java
+60
-0
BArrangeRepository.java
...org/rcisoft/business/barrange/dao/BArrangeRepository.java
+43
-0
BArrange.java
...n/java/org/rcisoft/business/barrange/entity/BArrange.java
+39
-0
BArrangeService.java
...rg/rcisoft/business/barrange/service/BArrangeService.java
+32
-0
BArrangeServiceImpl.java
...t/business/barrange/service/impl/BArrangeServiceImpl.java
+61
-0
BRoomsController.java
.../rcisoft/business/brooms/controller/BRoomsController.java
+114
-0
BRoomsRepository.java
...ava/org/rcisoft/business/brooms/dao/BRoomsRepository.java
+34
-0
BRooms.java
src/main/java/org/rcisoft/business/brooms/entity/BRooms.java
+134
-0
BRoomsService.java
...va/org/rcisoft/business/brooms/service/BRoomsService.java
+54
-0
BRoomsServiceImpl.java
...isoft/business/brooms/service/impl/BRoomsServiceImpl.java
+109
-0
Upload2DataBase.java
...va/org/rcisoft/business/brooms/utils/Upload2DataBase.java
+115
-0
multipartToFile.java
...va/org/rcisoft/business/brooms/utils/multipartToFile.java
+17
-0
FileController.java
...in/java/org/rcisoft/common/controller/FileController.java
+23
-3
logback-spring.xml
src/main/resources/logback-spring.xml
+1
-1
BArrangeMapper.xml
...ources/mapper/business/barrange/mapper/BArrangeMapper.xml
+51
-0
BRoomsMapper.xml
.../resources/mapper/business/brooms/mapper/BRoomsMapper.xml
+38
-0
No files found.
pom.xml
View file @
c53295b7
...
...
@@ -319,6 +319,11 @@
<artifactId>
poi
</artifactId>
<version>
3.15
</version>
</dependency>
<dependency>
<groupId>
org.apache.poi
</groupId>
<artifactId>
poi-ooxml
</artifactId>
<version>
3.10-FINAL
</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.ant/ant -->
<dependency>
...
...
@@ -396,6 +401,8 @@
<version>
5.1.44
</version>
</dependency>
</dependencies>
...
...
sql/new_table/2.0.3/b_rooms.sql
0 → 100644
View file @
c53295b7
/*
Navicat MySQL Data Transfer
Source Server : 127.0.0.1_3306
Source Server Version : 50717
Source Host : localhost:3306
Source Database : edu_db
Target Server Type : MYSQL
Target Server Version : 50717
File Encoding : 65001
Date: 2018-04-23 14:55:26
*/
SET
FOREIGN_KEY_CHECKS
=
0
;
-- ----------------------------
-- Table structure for b_rooms
-- ----------------------------
DROP
TABLE
IF
EXISTS
`b_rooms`
;
CREATE
TABLE
`b_rooms`
(
`business_id`
varchar
(
64
)
NOT
NULL
DEFAULT
''
,
`campus`
varchar
(
200
)
DEFAULT
NULL
,
`building`
varchar
(
5
)
DEFAULT
NULL
,
`classroom_no`
varchar
(
5
)
DEFAULT
NULL
,
`classroom_name`
varchar
(
100
)
DEFAULT
NULL
,
`category`
varchar
(
100
)
DEFAULT
NULL
COMMENT
'0:普通教室 1:多媒体教室 2:阶梯教室 3:操场'
,
`class_seat`
int
(
5
)
DEFAULT
NULL
,
`exam_seat`
int
(
5
)
DEFAULT
NULL
,
`plan`
varchar
(
50
)
DEFAULT
NULL
,
`flag`
char
(
1
)
DEFAULT
NULL
,
`del_flag`
char
(
1
)
DEFAULT
NULL
,
`update_by`
varchar
(
64
)
DEFAULT
NULL
,
`create_by`
varchar
(
64
)
DEFAULT
NULL
,
`create_date`
datetime
DEFAULT
NULL
,
`update_date`
datetime
DEFAULT
NULL
,
`code`
varchar
(
64
)
DEFAULT
NULL
,
PRIMARY
KEY
(
`business_id`
)
)
ENGINE
=
InnoDB
DEFAULT
CHARSET
=
utf8
;
-- ----------------------------
-- Records of b_rooms
-- ----------------------------
INSERT
INTO
`b_rooms`
VALUES
(
'349a3c2352554d95b726566c1470280f'
,
'0'
,
'A区'
,
'504'
,
'本校A区504'
,
'3'
,
'50'
,
null
,
null
,
'1'
,
'0'
,
'333e421d32d9425ea99afce95b603902'
,
'333e421d32d9425ea99afce95b603902'
,
'2018-04-23 14:54:39'
,
'2018-04-23 14:54:39'
,
'AD001'
);
INSERT
INTO
`b_rooms`
VALUES
(
'f46302680784402dbfafbab5bec071e2'
,
'0'
,
'B区'
,
'505'
,
'本校B区505'
,
'4'
,
'51'
,
null
,
null
,
'1'
,
'0'
,
'333e421d32d9425ea99afce95b603902'
,
'333e421d32d9425ea99afce95b603902'
,
'2018-04-23 14:54:39'
,
'2018-04-23 14:54:39'
,
'AD002'
);
src/main/java/org/rcisoft/business/barrange/controller/BArrangeController.java
0 → 100644
View file @
c53295b7
package
org
.
rcisoft
.
business
.
barrange
.
controller
;
/*固定导入*/
import
io.swagger.annotations.ApiImplicitParam
;
import
io.swagger.annotations.ApiImplicitParams
;
import
io.swagger.annotations.ApiOperation
;
import
org.springframework.validation.BindingResult
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.*
;
import
org.rcisoft.core.result.Result
;
import
org.rcisoft.core.result.ResultServiceEnums
;
import
org.rcisoft.core.model.PersistModel
;
import
org.rcisoft.core.constant.MessageConstant
;
import
org.rcisoft.common.controller.PaginationController
;
import
org.rcisoft.core.util.UserUtil
;
import
org.rcisoft.common.model.GridModel
;
import
org.rcisoft.core.exception.ServiceException
;
import
javax.validation.Valid
;
import
org.rcisoft.business.barrange.entity.BArrange
;
import
org.rcisoft.business.barrange.service.BArrangeService
;
import
java.util.List
;
/**
* Created by on 2018-4-19 10:28:59.
*/
@RestController
@RequestMapping
(
"/barrange"
)
public
class
BArrangeController
extends
PaginationController
<
BArrange
>
{
@Autowired
private
BArrangeService
bArrangeServiceImpl
;
@ApiOperation
(
value
=
"添加"
,
notes
=
"添加"
)
//@ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = false, dataType = "varchar")})
@PostMapping
(
value
=
"/add"
)
public
Result
add
(
@Valid
BArrange
bArrange
,
BindingResult
bindingResult
)
{
bArrange
.
setToken
(
getToken
());
PersistModel
data
=
bArrangeServiceImpl
.
save
(
bArrange
);
return
Result
.
builder
(
data
,
MessageConstant
.
MESSAGE_ALERT_SUCCESS
,
MessageConstant
.
MESSAGE_ALERT_ERROR
,
bArrange
);
}
@ApiOperation
(
value
=
"查看 集合"
,
notes
=
"查看单 集合"
)
@GetMapping
(
value
=
"/findAll"
)
public
Result
findAllByTermCode
(
BArrange
bArrange
)
{
bArrange
.
setCreateBy
(
UserUtil
.
getUserInfoProp
(
getToken
(),
UserUtil
.
USER_ID
));
return
Result
.
builder
(
new
PersistModel
(
1
),
MessageConstant
.
MESSAGE_ALERT_SUCCESS
,
MessageConstant
.
MESSAGE_ALERT_ERROR
,
bArrangeServiceImpl
.
findAll
());
}
}
src/main/java/org/rcisoft/business/barrange/dao/BArrangeRepository.java
0 → 100644
View file @
c53295b7
package
org
.
rcisoft
.
business
.
barrange
.
dao
;
import
org.rcisoft.core.base.BaseMapper
;
import
org.rcisoft.business.barrange.entity.BArrange
;
import
org.apache.ibatis.annotations.ResultMap
;
import
org.apache.ibatis.annotations.Select
;
import
org.springframework.stereotype.Repository
;
import
java.util.List
;
/**
* Created with on 2018-4-19 10:28:59.
*/
@Repository
public
interface
BArrangeRepository
extends
BaseMapper
<
BArrange
>
{
@Select
(
"<script>select term_code from b_arrange where 1=1 "
+
"and del_flag = 0 "
+
"and flag = 1 "
+
"GROUP BY term_code"
+
"</script>"
)
@ResultMap
(
value
=
"BaseResultMap2"
)
List
<
BArrange
>
queryBArranges0
();
@Select
(
"<script>select grade_code from b_arrange where 1=1 and term_code = #{termCode} "
+
"and del_flag = 0 "
+
"and flag = 1 "
+
"GROUP BY grade_code"
+
"</script>"
)
@ResultMap
(
value
=
"BaseResultMap3"
)
List
<
BArrange
>
queryBArranges1
(
String
termCode
);
@Select
(
"<script>select * from b_arrange where 1=1 and grade_code = #{gradeCode} "
+
"and del_flag = 0 "
+
"and flag = 1 "
+
"GROUP BY agency_code"
+
"</script>"
)
@ResultMap
(
value
=
"BaseResultMap4"
)
List
<
BArrange
>
queryBArranges2
(
String
gradeCode
);
}
src/main/java/org/rcisoft/business/barrange/entity/BArrange.java
0 → 100644
View file @
c53295b7
package
org
.
rcisoft
.
business
.
barrange
.
entity
;
import
lombok.*
;
import
org.rcisoft.core.entity.IdEntity
;
import
javax.persistence.*
;
import
java.math.BigDecimal
;
import
java.math.BigInteger
;
import
java.io.Serializable
;
import
java.util.Date
;
import
java.util.List
;
/**
* Created with on 2018-4-19 10:28:59.
*/
@Entity
@Data
@NoArgsConstructor
@AllArgsConstructor
@Table
(
name
=
"b_arrange"
)
public
class
BArrange
extends
IdEntity
<
BArrange
>
{
private
String
termCode
;
private
String
desc
;
private
String
gradeCode
;
private
String
agencyCode
;
private
String
status
;
@Transient
private
List
<
BArrange
>
childList
;
}
src/main/java/org/rcisoft/business/barrange/service/BArrangeService.java
0 → 100644
View file @
c53295b7
package
org
.
rcisoft
.
business
.
barrange
.
service
;
import
org.rcisoft.business.barrange.entity.BArrange
;
import
org.rcisoft.core.model.PersistModel
;
import
org.rcisoft.core.aop.PageUtil
;
import
java.util.List
;
/**
* Created by on 2018-4-19 10:28:59.
*/
public
interface
BArrangeService
{
/**
* 保存
* @param bArrange
* @return
*/
PersistModel
save
(
BArrange
bArrange
);
/**
* 分页查询
* @return
*/
List
<
BArrange
>
findAll
();
}
src/main/java/org/rcisoft/business/barrange/service/impl/BArrangeServiceImpl.java
0 → 100644
View file @
c53295b7
package
org
.
rcisoft
.
business
.
barrange
.
service
.
impl
;
import
org.rcisoft.core.util.UserUtil
;
import
org.rcisoft.core.aop.PageUtil
;
import
org.rcisoft.core.model.PersistModel
;
import
org.rcisoft.business.barrange.dao.BArrangeRepository
;
import
org.rcisoft.business.barrange.entity.BArrange
;
import
org.rcisoft.business.barrange.service.BArrangeService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Isolation
;
import
org.springframework.transaction.annotation.Propagation
;
import
org.springframework.transaction.annotation.Transactional
;
import
java.util.List
;
import
lombok.extern.slf4j.Slf4j
;
/**
* Created by on 2018-4-19 10:28:59.
*/
@Service
@Transactional
(
readOnly
=
true
,
propagation
=
Propagation
.
NOT_SUPPORTED
)
@Slf4j
public
class
BArrangeServiceImpl
implements
BArrangeService
{
@Autowired
private
BArrangeRepository
bArrangeRepository
;
/**
* 保存 bArrange
* @param bArrange
* @return
*/
@Transactional
(
propagation
=
Propagation
.
REQUIRED
,
isolation
=
Isolation
.
DEFAULT
)
@Override
public
PersistModel
save
(
BArrange
bArrange
){
bArrange
.
setCommonBusinessId
();
//增加操作
UserUtil
.
setCurrentPersistOperation
(
bArrange
);
int
line
=
bArrangeRepository
.
insertSelective
(
bArrange
);
log
.
info
(
UserUtil
.
getUserInfoProp
(
bArrange
.
getToken
(),
UserUtil
.
USER_USERNAME
)+
"新增了ID为"
+
bArrange
.
getBusinessId
()+
"的信息"
);
return
new
PersistModel
(
line
);
}
/**
* 分页查询 bArrange
* @return
*/
public
List
<
BArrange
>
findAll
(){
List
<
BArrange
>
list
=
bArrangeRepository
.
queryBArranges0
();
return
list
;
}
}
src/main/java/org/rcisoft/business/brooms/controller/BRoomsController.java
0 → 100644
View file @
c53295b7
package
org
.
rcisoft
.
business
.
brooms
.
controller
;
/*固定导入*/
import
io.swagger.annotations.ApiImplicitParam
;
import
io.swagger.annotations.ApiImplicitParams
;
import
io.swagger.annotations.ApiOperation
;
import
org.apache.commons.fileupload.disk.DiskFileItem
;
import
org.rcisoft.business.brooms.utils.Upload2DataBase
;
import
org.rcisoft.common.component.Global
;
import
org.rcisoft.common.controller.FileController
;
import
org.springframework.validation.BindingResult
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.*
;
import
org.rcisoft.core.result.Result
;
import
org.rcisoft.core.result.ResultServiceEnums
;
import
org.rcisoft.core.model.PersistModel
;
import
org.rcisoft.core.constant.MessageConstant
;
import
org.rcisoft.common.controller.PaginationController
;
import
org.rcisoft.core.util.UserUtil
;
import
org.rcisoft.common.model.GridModel
;
import
org.rcisoft.core.exception.ServiceException
;
import
javax.validation.Valid
;
import
org.rcisoft.business.brooms.entity.BRooms
;
import
org.rcisoft.business.brooms.service.BRoomsService
;
import
org.springframework.web.multipart.MultipartFile
;
import
org.springframework.web.multipart.commons.CommonsMultipartFile
;
import
java.io.File
;
import
java.util.List
;
/**
* Created by on 2018-4-23 9:26:21.
*/
@RestController
@RequestMapping
(
"brooms"
)
public
class
BRoomsController
extends
FileController
<
BRooms
>
{
@Autowired
private
BRoomsService
bRoomsServiceImpl
;
@Autowired
private
Global
global
;
@ApiOperation
(
value
=
"添加"
,
notes
=
"添加"
)
//@ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = false, dataType = "varchar")})
@PostMapping
(
value
=
"/add"
)
public
Result
add
(
@Valid
BRooms
bRooms
,
BindingResult
bindingResult
)
{
bRooms
.
setToken
(
getToken
());
PersistModel
data
=
bRoomsServiceImpl
.
save
(
bRooms
);
return
Result
.
builder
(
data
,
MessageConstant
.
MESSAGE_ALERT_SUCCESS
,
MessageConstant
.
MESSAGE_ALERT_ERROR
,
bRooms
);
}
@ApiOperation
(
value
=
"逻辑删除"
,
notes
=
"逻辑删除"
)
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"id"
,
value
=
"id"
,
required
=
false
,
dataType
=
"varchar"
)})
@DeleteMapping
(
"/delete/{id:\\w+}"
)
public
Result
delete
(
@PathVariable
String
id
)
{
BRooms
bRooms
=
new
BRooms
();
bRooms
.
setBusinessId
(
id
);
bRooms
.
setToken
(
getToken
());
PersistModel
data
=
bRoomsServiceImpl
.
remove
(
bRooms
);
return
Result
.
builder
(
data
,
MessageConstant
.
MESSAGE_ALERT_SUCCESS
,
MessageConstant
.
MESSAGE_ALERT_ERROR
,
id
);
}
@ApiOperation
(
value
=
"修改"
,
notes
=
"修改"
)
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"businessId"
,
value
=
"businessId"
,
required
=
false
,
dataType
=
"varchar"
)})
@PutMapping
(
"/update/{id:\\w+}"
)
public
Result
update
(
@Valid
BRooms
bRooms
,
BindingResult
bindingResult
)
{
bRooms
.
setToken
(
getToken
());
PersistModel
data
=
bRoomsServiceImpl
.
merge
(
bRooms
);
return
Result
.
builder
(
data
,
MessageConstant
.
MESSAGE_ALERT_SUCCESS
,
MessageConstant
.
MESSAGE_ALERT_ERROR
,
bRooms
);
}
@ApiOperation
(
value
=
"查看单 "
,
notes
=
"查看单 "
)
@GetMapping
(
"/detail/{id:\\w+}"
)
public
Result
detail
(
@PathVariable
String
id
)
{
return
Result
.
builder
(
new
PersistModel
(
1
),
MessageConstant
.
MESSAGE_ALERT_SUCCESS
,
MessageConstant
.
MESSAGE_ALERT_ERROR
,
bRoomsServiceImpl
.
findById
(
id
));
}
@ApiOperation
(
value
=
"查看 集合"
,
notes
=
"查看单 集合"
)
@GetMapping
(
value
=
"/queryBRoomsByPagination"
)
public
GridModel
listByPagination
(
BRooms
bRooms
)
{
bRooms
.
setCreateBy
(
UserUtil
.
getUserInfoProp
(
getToken
(),
UserUtil
.
USER_ID
));
List
<
BRooms
>
list
=
bRoomsServiceImpl
.
findAllByPagination
(
getPaginationUtility
(),
bRooms
);
return
getGridModelResponse
();
}
@ApiOperation
(
value
=
"Excel上传"
,
notes
=
"Excel上传"
)
@PostMapping
(
value
=
"/uploadExcel"
)
public
Result
uploadExcel
(
@RequestParam
(
value
=
"uploadFile"
,
required
=
true
)
MultipartFile
uploadFile
){
String
path
=
super
.
globalCommonFileUpload
(
uploadFile
,
"UUID"
,
"G:/testplace"
+
File
.
separator
+
"/xmlAndHtml"
);
List
<
BRooms
>
All
=
Upload2DataBase
.
DoIt
(
path
);
return
Result
.
builder
(
new
PersistModel
(
1
),
MessageConstant
.
MESSAGE_ALERT_SUCCESS
,
MessageConstant
.
MESSAGE_ALERT_ERROR
,
bRoomsServiceImpl
.
uploadExcel
(
All
));
}
}
src/main/java/org/rcisoft/business/brooms/dao/BRoomsRepository.java
0 → 100644
View file @
c53295b7
package
org
.
rcisoft
.
business
.
brooms
.
dao
;
import
org.rcisoft.core.base.BaseMapper
;
import
org.rcisoft.business.brooms.entity.BRooms
;
import
org.apache.ibatis.annotations.ResultMap
;
import
org.apache.ibatis.annotations.Select
;
import
org.springframework.stereotype.Repository
;
import
java.util.List
;
/**
* Created with on 2018-4-23 9:26:21.
*/
@Repository
public
interface
BRoomsRepository
extends
BaseMapper
<
BRooms
>
{
/**
* 分页查询 bRooms
*
*/
@Select
(
"<script>select * from b_rooms where 1=1 "
+
"<if test=\"delFlag !=null and delFlag != '' \">and del_flag = #{delFlag} </if> "
+
"<if test=\"classroomName !=null and classroomName != '' \">and classroom_name like concat(concat(\"%\",#{classroomName}),\"%\") </if> "
+
"<if test=\"code !=null and code != '' \">and code like concat(concat(\"%\",#{code}),\"%\") </if> "
+
"<if test=\"category !=null and category != '' \">and category = #{category} </if> "
+
"<if test=\"flag !=null and flag != '' \">and flag = #{flag} </if> "
+
"</script>"
)
@ResultMap
(
value
=
"BaseResultMap"
)
List
<
BRooms
>
queryBRoomss
(
BRooms
bRooms
);
int
addExcel
(
List
<
BRooms
>
list
);
}
src/main/java/org/rcisoft/business/brooms/entity/BRooms.java
0 → 100644
View file @
c53295b7
package
org
.
rcisoft
.
business
.
brooms
.
entity
;
import
lombok.*
;
import
org.rcisoft.core.entity.IdEntity
;
import
javax.persistence.*
;
import
java.math.BigDecimal
;
import
java.math.BigInteger
;
import
java.io.Serializable
;
import
java.util.Date
;
import
java.util.List
;
/**
* Created with on 2018-4-23 9:26:21.
*/
@Entity
@Data
@NoArgsConstructor
@AllArgsConstructor
@Table
(
name
=
"b_rooms"
)
public
class
BRooms
extends
IdEntity
<
BRooms
>
{
private
String
category
;
private
String
campus
;
private
String
building
;
private
String
classroomNo
;
private
String
classroomName
;
private
Integer
classSeat
;
private
Integer
examSeat
;
private
String
plan
;
private
String
code
;
@Transient
private
String
transitCampus
;
@Transient
private
String
transitCategory
;
public
String
getTransitCampus
(){
if
(
this
.
transitCampus
!=
null
&&
!
this
.
transitCampus
.
equals
(
""
)){
switch
(
this
.
transitCampus
)
{
case
"0"
:
this
.
transitCampus
=
"校本部"
;
break
;
case
"1"
:
this
.
transitCampus
=
"新校区"
;
break
;
}
}
return
this
.
transitCampus
;
}
public
String
getTransitCategory
(){
if
(
this
.
transitCategory
!=
null
&&
!
this
.
transitCategory
.
equals
(
""
)){
switch
(
this
.
transitCategory
)
{
case
"0"
:
this
.
transitCategory
=
"普通教室"
;
break
;
case
"1"
:
this
.
transitCategory
=
"听力教室"
;
break
;
case
"2"
:
this
.
transitCategory
=
"多媒体教室"
;
break
;
case
"3"
:
this
.
transitCategory
=
"实训机房"
;
break
;
case
"4"
:
this
.
transitCategory
=
"报告厅"
;
break
;
case
"5"
:
this
.
transitCategory
=
"多功能报告厅"
;
break
;
case
"6"
:
this
.
transitCategory
=
"阶梯教室"
;
break
;
}
}
return
this
.
transitCategory
;
}
// public String getCampus(){
// if(this.campus != null && !this.campus.equals("")){
// switch (this.campus) {
// case "0":
// this.transitCampus = "校本部";
// break;
// case "1":
// this.transitCampus = "新校区";
// break;
// }
// }
// return this.campus;
// }
//
// public String getCategroy(){
// if(this.category != null && !this.category.equals("")){
// switch (this.category) {
// case "0":
// this.transitCategory = "普通教室";
// break;
// case "1":
// this.transitCategory = "听力教室";
// break;
// case "2":
// this.transitCategory = "多媒体教室";
// break;
// case "3":
// this.transitCategory = "实训机房";
// break;
// case "4":
// this.transitCategory = "报告厅";
// break;
// case "5":
// this.transitCategory = "多功能报告厅";
// break;
// case "6":
// this.transitCategory = "阶梯教室";
// break;
// }
// }
// return this.category;
// }
}
src/main/java/org/rcisoft/business/brooms/service/BRoomsService.java
0 → 100644
View file @
c53295b7
package
org
.
rcisoft
.
business
.
brooms
.
service
;
import
org.rcisoft.business.brooms.entity.BRooms
;
import
org.rcisoft.core.model.PersistModel
;
import
org.rcisoft.core.aop.PageUtil
;
import
org.rcisoft.core.result.Result
;
import
java.util.List
;
/**
* Created by on 2018-4-23 9:26:21.
*/
public
interface
BRoomsService
{
/**
* 保存
* @param bRooms
* @return
*/
PersistModel
save
(
BRooms
bRooms
);
/**
* 逻辑删除
* @param bRooms
* @return
*/
PersistModel
remove
(
BRooms
bRooms
);
/**
* 修改
* @param bRooms
* @return
*/
PersistModel
merge
(
BRooms
bRooms
);
/**
* 根据id查询
* @param id
* @return
*/
BRooms
findById
(
String
id
);
/**
* 分页查询
* @param bRooms
* @return
*/
List
<
BRooms
>
findAllByPagination
(
PageUtil
<
BRooms
>
paginationUtility
,
BRooms
bRooms
);
PersistModel
uploadExcel
(
List
<
BRooms
>
list
);
}
src/main/java/org/rcisoft/business/brooms/service/impl/BRoomsServiceImpl.java
0 → 100644
View file @
c53295b7
package
org
.
rcisoft
.
business
.
brooms
.
service
.
impl
;
import
org.rcisoft.core.result.Result
;
import
org.rcisoft.core.util.UserUtil
;
import
org.rcisoft.core.aop.PageUtil
;
import
org.rcisoft.core.model.PersistModel
;
import
org.rcisoft.business.brooms.dao.BRoomsRepository
;
import
org.rcisoft.business.brooms.entity.BRooms
;
import
org.rcisoft.business.brooms.service.BRoomsService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Isolation
;
import
org.springframework.transaction.annotation.Propagation
;
import
org.springframework.transaction.annotation.Transactional
;
import
java.util.List
;
import
lombok.extern.slf4j.Slf4j
;
/**
* Created by on 2018-4-23 9:26:21.
*/
@Service
@Transactional
(
readOnly
=
true
,
propagation
=
Propagation
.
NOT_SUPPORTED
)
@Slf4j
public
class
BRoomsServiceImpl
implements
BRoomsService
{
@Autowired
private
BRoomsRepository
bRoomsRepository
;
/**
* 保存 bRooms
* @param bRooms
* @return
*/
@Transactional
(
propagation
=
Propagation
.
REQUIRED
,
isolation
=
Isolation
.
DEFAULT
)
@Override
public
PersistModel
save
(
BRooms
bRooms
){
bRooms
.
setCommonBusinessId
();
//增加操作
UserUtil
.
setCurrentPersistOperation
(
bRooms
);
int
line
=
bRoomsRepository
.
insertSelective
(
bRooms
);
log
.
info
(
UserUtil
.
getUserInfoProp
(
bRooms
.
getToken
(),
UserUtil
.
USER_USERNAME
)+
"新增了ID为"
+
bRooms
.
getBusinessId
()+
"的信息"
);
return
new
PersistModel
(
line
);
}
/**
* 逻辑删除
* @param bRooms
* @return
*/
@Transactional
(
propagation
=
Propagation
.
REQUIRED
,
isolation
=
Isolation
.
DEFAULT
)
@Override
public
PersistModel
remove
(
BRooms
bRooms
){
UserUtil
.
setCurrentMergeOperation
(
bRooms
);
bRooms
.
setDeleted
();
int
line
=
bRoomsRepository
.
logicalDelete
(
bRooms
);
log
.
info
(
UserUtil
.
getUserInfoProp
(
bRooms
.
getToken
(),
UserUtil
.
USER_USERNAME
)+
"逻辑删除了ID为"
+
bRooms
.
getBusinessId
()+
"的信息"
);
return
new
PersistModel
(
line
);
}
/**
* 修改 bRooms
* @param bRooms
* @return
*/
@Transactional
(
propagation
=
Propagation
.
REQUIRED
,
isolation
=
Isolation
.
DEFAULT
)
@Override
public
PersistModel
merge
(
BRooms
bRooms
){
UserUtil
.
setCurrentMergeOperation
(
bRooms
);
int
line
=
bRoomsRepository
.
updateByPrimaryKeySelective
(
bRooms
);
log
.
info
(
UserUtil
.
getUserInfoProp
(
bRooms
.
getToken
(),
UserUtil
.
USER_USERNAME
)+
"修改了ID为"
+
bRooms
.
getBusinessId
()+
"的信息"
);
return
new
PersistModel
(
line
);
}
/**
* 根据id查询 bRooms
* @param id
* @return
*/
public
BRooms
findById
(
String
id
){
return
bRoomsRepository
.
selectByPrimaryKey
(
id
);
}
/**
* 分页查询 bRooms
* @param bRooms
* @return
*/
public
List
<
BRooms
>
findAllByPagination
(
PageUtil
<
BRooms
>
paginationUtility
,
BRooms
bRooms
){
bRooms
.
setStart
();
bRooms
.
setNotDeleted
();
return
bRoomsRepository
.
queryBRoomss
(
bRooms
);
}
@Override
public
PersistModel
uploadExcel
(
List
<
BRooms
>
list
)
{
int
num
=
bRoomsRepository
.
addExcel
(
list
);
return
new
PersistModel
(
num
);
}
}
src/main/java/org/rcisoft/business/brooms/utils/Upload2DataBase.java
0 → 100644
View file @
c53295b7
package
org
.
rcisoft
.
business
.
brooms
.
utils
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.poi.hssf.usermodel.HSSFWorkbook
;
import
org.apache.poi.ss.usermodel.*
;
import
org.apache.poi.xssf.usermodel.XSSFWorkbook
;
import
org.rcisoft.business.brooms.entity.BRooms
;
import
org.rcisoft.core.util.UserUtil
;
import
java.io.File
;
import
java.io.FileInputStream
;
import
java.io.IOException
;
import
java.util.ArrayList
;
import
java.util.Iterator
;
import
java.util.List
;
@Slf4j
public
class
Upload2DataBase
{
public
static
List
<
BRooms
>
DoIt
(
String
path
){
List
<
BRooms
>
list
=
new
ArrayList
<>();
File
file
=
new
File
(
path
);
try
{
FileInputStream
fis
=
new
FileInputStream
(
file
);
Workbook
workbook
=
null
;
if
(
file
.
getName
().
toLowerCase
().
endsWith
(
"xlsx"
)){
workbook
=
new
XSSFWorkbook
(
fis
);
}
else
if
(
file
.
getName
().
toLowerCase
().
endsWith
(
"xls"
)){
workbook
=
new
HSSFWorkbook
(
fis
);
}
int
numberOfSheets
=
workbook
.
getNumberOfSheets
();
//遍历所有Excel表
for
(
int
i
=
0
;
i
<
numberOfSheets
;
i
++){
Sheet
sheet
=
workbook
.
getSheetAt
(
i
);
Iterator
<
Row
>
rowIterator
=
sheet
.
iterator
();
rowIterator
.
next
();
rowIterator
.
next
();
//遍历此表
while
(
rowIterator
.
hasNext
())
{
Row
row
=
rowIterator
.
next
();
int
j
=
0
;
BRooms
bRooms
=
new
BRooms
();
String
classroomName
=
""
;
Iterator
<
Cell
>
cellIterator
=
row
.
cellIterator
();
//将每格的值赋给上面的变量
while
(
cellIterator
.
hasNext
())
{
Cell
cell
=
cellIterator
.
next
();
//如果某个值为空,则赋值给它
if
(
bRooms
.
getCampus
()
==
null
){
if
(
cell
.
getStringCellValue
().
trim
().
equals
(
"校本部"
)){
bRooms
.
setCampus
(
"0"
);
classroomName
=
"本校"
;
}
else
{
bRooms
.
setCampus
(
"1"
);
classroomName
=
"新校"
;
}
}
else
if
(
bRooms
.
getCode
()
==
null
){
bRooms
.
setCode
(
cell
.
getStringCellValue
().
trim
());
}
else
if
(
bRooms
.
getBuilding
()
==
null
){
bRooms
.
setBuilding
(
cell
.
getStringCellValue
().
trim
());
classroomName
+=
bRooms
.
getBuilding
();
}
else
if
(
bRooms
.
getClassroomNo
()
==
null
){
cell
.
setCellType
(
CellType
.
STRING
);
bRooms
.
setClassroomNo
(
cell
.
getStringCellValue
());
classroomName
+=
bRooms
.
getClassroomNo
();
}
else
if
(
bRooms
.
getCategory
()
==
null
){
String
result
=
""
;
switch
(
cell
.
getStringCellValue
().
trim
())
{
case
"普通教室"
:
result
=
"0"
;
break
;
case
"听力教室"
:
result
=
"1"
;
break
;
case
"多媒体教室"
:
result
=
"2"
;
break
;
case
"实训机房"
:
result
=
"3"
;
break
;
case
"报告厅"
:
result
=
"4"
;
break
;
case
"多功能报告厅"
:
result
=
"5"
;
break
;
case
"阶梯教室"
:
result
=
"6"
;
break
;
}
bRooms
.
setCategory
(
result
);
}
else
if
(
bRooms
.
getClassSeat
()
==
null
){
bRooms
.
setClassSeat
((
int
)
cell
.
getNumericCellValue
());
}
}
UserUtil
.
setCurrentPersistOperation
(
bRooms
);
bRooms
.
setClassroomName
(
classroomName
);
list
.
add
(
bRooms
);
}
//end of rows iterator
}
//end of sheets for loop
//close file input stream
fis
.
close
();
}
catch
(
IOException
e
)
{
e
.
printStackTrace
();
}
return
list
;
}
}
src/main/java/org/rcisoft/business/brooms/utils/multipartToFile.java
0 → 100644
View file @
c53295b7
package
org
.
rcisoft
.
business
.
brooms
.
utils
;
import
org.apache.commons.fileupload.disk.DiskFileItem
;
import
org.springframework.web.multipart.MultipartFile
;
import
org.springframework.web.multipart.commons.CommonsMultipartFile
;
import
java.io.File
;
import
java.io.IOException
;
public
class
multipartToFile
{
private
static
File
multipartToFileMethod
(
MultipartFile
multfile
)
throws
IOException
{
CommonsMultipartFile
cf
=
(
CommonsMultipartFile
)
multfile
;
DiskFileItem
fi
=
(
DiskFileItem
)
cf
.
getFileItem
();
return
fi
.
getStoreLocation
();
}
}
\ No newline at end of file
src/main/java/org/rcisoft/common/controller/FileController.java
View file @
c53295b7
...
...
@@ -55,12 +55,31 @@ public class FileController<T> extends PaginationController<T> {
finalSavingPath
=
savingAbsolutePath
+
SEPARATOR
+
savingPatternOrFullName
;
}
// File file = new File(finalSavingPath);
// if(!file.mkdirs()) {
// file.mkdirs();
// }
//
// try {
// multipartFile.transferTo(file);
// } catch (IllegalStateException var10) {
// var10.printStackTrace();
// } catch (IOException var11) {
// var11.printStackTrace();
// }
//
// return returnFinalFileName;
//以下代码修改过
File
file
=
new
File
(
finalSavingPath
);
if
(!
file
.
mkdirs
())
{
file
.
mkdirs
();
File
fileDir
=
new
File
(
savingAbsolutePath
);
if
(!
fileDir
.
exists
())
{
fileDir
.
mkdirs
();
}
try
{
file
.
deleteOnExit
();
file
.
createNewFile
();
multipartFile
.
transferTo
(
file
);
}
catch
(
IllegalStateException
var10
)
{
var10
.
printStackTrace
();
...
...
@@ -68,7 +87,8 @@ public class FileController<T> extends PaginationController<T> {
var11
.
printStackTrace
();
}
return
returnFinalFileName
;
//修改过
return
finalSavingPath
;
}
...
...
src/main/resources/logback-spring.xml
View file @
c53295b7
...
...
@@ -59,7 +59,7 @@
<logger
name=
"org.springframework.aop.aspectj"
level=
"ERROR"
/>
<springProfile
name=
"dev"
>
<root
level=
"
info
"
>
<root
level=
"
debug
"
>
<appender-ref
ref=
"consoleLog"
/>
<appender-ref
ref=
"fileInfoLog"
/>
<appender-ref
ref=
"fileErrorLog"
/>
...
...
src/main/resources/mapper/business/barrange/mapper/BArrangeMapper.xml
0 → 100644
View file @
c53295b7
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"org.rcisoft.business.barrange.dao.BArrangeRepository"
>
<resultMap
id=
"BaseResultMap"
type=
"org.rcisoft.business.barrange.entity.BArrange"
>
<id
column=
"business_id"
jdbcType=
"VARCHAR"
property=
"businessId"
/>
<result
column=
"create_by"
jdbcType=
"VARCHAR"
property=
"createBy"
/>
<result
column=
"update_by"
jdbcType=
"VARCHAR"
property=
"updateBy"
/>
<result
column=
"create_date"
jdbcType=
"TIMESTAMP"
property=
"createDate"
/>
<result
column=
"update_date"
jdbcType=
"TIMESTAMP"
property=
"updateDate"
/>
<result
column=
"remarks"
jdbcType=
"VARCHAR"
property=
"remarks"
/>
<result
column=
"del_flag"
jdbcType=
"VARCHAR"
property=
"delFlag"
/>
<result
column=
"flag"
jdbcType=
"VARCHAR"
property=
"flag"
/>
<result
column=
"term_code"
jdbcType=
"VARCHAR"
property=
"termCode"
/>
<result
column=
"desc"
jdbcType=
"VARCHAR"
property=
"desc"
/>
<result
column=
"grade_code"
jdbcType=
"VARCHAR"
property=
"gradeCode"
/>
<result
column=
"agency_code"
jdbcType=
"VARCHAR"
property=
"agencyCode"
/>
<result
column=
"status"
jdbcType=
"VARCHAR"
property=
"status"
/>
</resultMap>
<resultMap
id=
"BaseResultMap2"
type=
"org.rcisoft.business.barrange.entity.BArrange"
>
<id
column=
"business_id"
jdbcType=
"VARCHAR"
property=
"businessId"
/>
<result
column=
"term_code"
jdbcType=
"VARCHAR"
property=
"termCode"
/>
<collection
property=
"childList"
javaType=
"ArrayList"
column=
"term_code"
ofType=
"org.rcisoft.business.barrange.entity.BArrange"
select=
"org.rcisoft.business.barrange.dao.BArrangeRepository.queryBArranges1"
/>
</resultMap>
<resultMap
id=
"BaseResultMap3"
type=
"org.rcisoft.business.barrange.entity.BArrange"
>
<id
column=
"business_id"
jdbcType=
"VARCHAR"
property=
"businessId"
/>
<result
column=
"grade_code"
jdbcType=
"VARCHAR"
property=
"gradeCode"
/>
<collection
property=
"childList"
javaType=
"ArrayList"
column=
"grade_code"
ofType=
"org.rcisoft.business.barrange.entity.BArrange"
select=
"org.rcisoft.business.barrange.dao.BArrangeRepository.queryBArranges2"
/>
</resultMap>
<resultMap
id=
"BaseResultMap4"
type=
"org.rcisoft.business.barrange.entity.BArrange"
>
<id
column=
"business_id"
jdbcType=
"VARCHAR"
property=
"businessId"
/>
<result
column=
"create_by"
jdbcType=
"VARCHAR"
property=
"createBy"
/>
<result
column=
"update_by"
jdbcType=
"VARCHAR"
property=
"updateBy"
/>
<result
column=
"create_date"
jdbcType=
"TIMESTAMP"
property=
"createDate"
/>
<result
column=
"update_date"
jdbcType=
"TIMESTAMP"
property=
"updateDate"
/>
<result
column=
"remarks"
jdbcType=
"VARCHAR"
property=
"remarks"
/>
<result
column=
"del_flag"
jdbcType=
"VARCHAR"
property=
"delFlag"
/>
<result
column=
"flag"
jdbcType=
"VARCHAR"
property=
"flag"
/>
<result
column=
"term_code"
jdbcType=
"VARCHAR"
property=
"termCode"
/>
<result
column=
"desc"
jdbcType=
"VARCHAR"
property=
"desc"
/>
<result
column=
"grade_code"
jdbcType=
"VARCHAR"
property=
"gradeCode"
/>
<result
column=
"agency_code"
jdbcType=
"VARCHAR"
property=
"agencyCode"
/>
<result
column=
"status"
jdbcType=
"VARCHAR"
property=
"status"
/>
</resultMap>
<!--<cache type="${corePackag!}.util.RedisCache"/>-->
</mapper>
\ No newline at end of file
src/main/resources/mapper/business/brooms/mapper/BRoomsMapper.xml
0 → 100644
View file @
c53295b7
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"org.rcisoft.business.brooms.dao.BRoomsRepository"
>
<resultMap
id=
"BaseResultMap"
type=
"org.rcisoft.business.brooms.entity.BRooms"
>
<id
column=
"business_id"
jdbcType=
"VARCHAR"
property=
"businessId"
/>
<result
column=
"campus"
jdbcType=
"VARCHAR"
property=
"campus"
/>
<result
column=
"campus"
jdbcType=
"VARCHAR"
property=
"transitCampus"
/>
<result
column=
"building"
jdbcType=
"VARCHAR"
property=
"building"
/>
<result
column=
"classroom_no"
jdbcType=
"VARCHAR"
property=
"classroomNo"
/>
<result
column=
"classroom_name"
jdbcType=
"VARCHAR"
property=
"classroomName"
/>
<result
column=
"category"
jdbcType=
"VARCHAR"
property=
"category"
/>
<result
column=
"category"
jdbcType=
"VARCHAR"
property=
"transitCategory"
/>
<result
column=
"class_seat"
jdbcType=
"INTEGER"
property=
"classSeat"
/>
<result
column=
"exam_seat"
jdbcType=
"INTEGER"
property=
"examSeat"
/>
<result
column=
"code"
jdbcType=
"VARCHAR"
property=
"code"
/>
<result
column=
"plan"
jdbcType=
"VARCHAR"
property=
"plan"
/>
<result
column=
"flag"
jdbcType=
"CHAR"
property=
"flag"
/>
<result
column=
"del_flag"
jdbcType=
"CHAR"
property=
"delFlag"
/>
<result
column=
"update_by"
jdbcType=
"VARCHAR"
property=
"updateBy"
/>
<result
column=
"create_by"
jdbcType=
"VARCHAR"
property=
"createBy"
/>
<result
column=
"create_date"
jdbcType=
"TIMESTAMP"
property=
"createDate"
/>
<result
column=
"update_date"
jdbcType=
"TIMESTAMP"
property=
"updateDate"
/>
</resultMap>
<insert
id=
"addExcel"
>
insert into b_rooms(business_id,campus,building,classroom_no,classroom_name,category,class_seat,exam_seat,
plan,flag,del_flag,update_by,create_by,create_date,update_date,code)
values
<foreach
collection=
"list"
item=
"item"
separator=
","
>
(#{item.businessId},#{item.campus},#{item.building},
#{item.classroomNo},#{item.classroomName},#{item.category},#{item.classSeat},#{item.examSeat}
,#{item.plan},#{item.flag},#{item.delFlag},#{item.updateBy},#{item.createBy}
,#{item.createDate},#{item.updateDate},#{item.code})
</foreach>
</insert>
<!--<cache type="${corePackag!}.util.RedisCache"/>-->
</mapper>
\ No newline at end of file
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