I3_YF_SEAT
/
impp-core
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into test

Browse Source
yun-zuoyi
allen.zhang 6 years ago
parent 234ce910c9 3a083c00c7
commit 2c15ede4f0
29 changed files with 199 additions and 9 deletions
Show Stats Download Patch File Download Diff File

9
modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ITestService.java
Unescape Escape View File

@ -27,6 +27,15 @@ public interface ITestService {
@ApiOperation(value = "in条件封装查询")
List<SysUser> querySysUserByPack(DdlPackBean packBean);
@ApiOperation(value = "添加用户")
void insertSysUser(SysUser sysUser);
@ApiOperation(value = "修改用户")
void updateSysUser(SysUser sysUser);
@ApiOperation(value = "查询用户")
List<SysUser> listSysUser();
@ApiOperation(value = "读写分离测试写")
@Transactional
void write();

18
modules/i3plus-core-apiservice/pom.xml
Unescape Escape View File

@ -77,17 +77,35 @@
<artifactId>mysql-connector-java</artifactId>
</dependency>
<dependency>
<groupId>com.oracle</groupId>
<artifactId>ojdbc6</artifactId>
</dependency>
<!--用于编译jsp-->
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-jasper</artifactId>
</dependency>
<!-- oracle -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<!-- sqlserver -->
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>sqljdbc4</artifactId>
</dependency>
<!-- postgresql -->
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
</dependency>
<!-- shiro -->
<dependency>
<groupId>org.apache.shiro</groupId>

39
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoDdlPackController.java
Unescape Escape View File

@ -15,9 +15,7 @@ import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
@ -101,4 +99,39 @@ public class DemoDdlPackController {
ListPager<SysUser> listPager = testService.querySysUserByPager(user,pager);
return ResultBean.success("操作成功").setListPager(listPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}
/**
* 测试添加长文本数据
* @param sysUser
* @return
*/
@PostMapping(value="/test-insert")
@ApiOperation(value="测试添加长文本数据")
public BaseResultBean testInsertSysUserLob(SysUser sysUser){
testService.insertSysUser(sysUser);
return ResultBean.success("操作成功").setResultObject(sysUser).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}
/**
* 测试添加长文本数据
* @param sysUser
* @return
*/
@PutMapping(value="/test-update")
@ApiOperation(value="测试添加长文本数据")
public BaseResultBean testUpdateSysUserLob(SysUser sysUser){
testService.updateSysUser(sysUser);
return ResultBean.success("操作成功").setResultObject(sysUser).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}
/**
* 测试查询长文本数据
* @return
*/
@PutMapping(value="/test-list")
@ApiOperation(value="测试添加长文本数据")
public BaseResultBean testListSysUserLob(){
List<SysUser> sysUserList = testService.listSysUser();
return ResultBean.success("操作成功").setResultList(sysUserList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}
}

2
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/BaseMessageController.java
Unescape Escape View File

@ -50,6 +50,8 @@ public class BaseMessageController extends CoreBaseController {
*/
public ResultBean basaeInsertSysMessage(SysMessage sysMessage) {
try {
startMultiService();
// 条件校验
ValidatorBean.beginValid(sysMessage)
.notNull("messageTitle", sysMessage.getMessageTitle())

6
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java
Unescape Escape View File

@ -112,6 +112,8 @@ public class WhiteController extends CoreBaseController {
@ApiOperation(value="登陆",notes="登陆")
public ResultBean login(HttpServletRequest request, String loginName, String loginPwd, String languageCode,
@RequestParam(required = false) String ipAddr){
startMultiService();
LOGGER.info("用户登陆 loginName:{} loginPwd:{} languageCode:{}",loginName,loginPwd,languageCode);
ResultBean result = null;
try {
@ -209,6 +211,8 @@ public class WhiteController extends CoreBaseController {
@ApiOperation(value = "根据语言代码查询资源")
public ResultBean findSysLocaleResourceByLanguageCode(String languageCode){
try {
startMultiService();
ValidatorBean.checkNotNull(languageCode,"语言代码不能为空");
if (sysLocaleLanguageService.getSysLocaleLanguageByCode(languageCode) == null) {
throw ImppExceptionBuilder.newInstance()
@ -237,6 +241,8 @@ public class WhiteController extends CoreBaseController {
@ApiOperation(value = "新增文件资源", notes = "新增文件资源")
public ResultBean insertSysFile(@RequestBody SysFile sysFile){
try {
startMultiService();
// 条件验证
ValidatorBean.beginValid(sysFile)
.notNull("dfsFileName", sysFile.getDfsFileName())

16
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java
Unescape Escape View File

@ -64,6 +64,8 @@ public class PersonnelController extends CoreBaseController {
@ApiOperation(value = "添加用户信息", notes = "返回内容添加用户信息")
public ResultBean insertUserDetailModel(UserDetailModel model) {
try {
startMultiService();
SysUser user = model.getSysUser();
SysUserInfo info = model.getSysUserInfo();
@ -143,6 +145,8 @@ public class PersonnelController extends CoreBaseController {
@ApiOperation(value = "修改用户信息", notes = "返回内容添加用户信息")
public ResultBean updateUserDetailModel(UserDetailModel model) {
try {
startMultiService();
SysUser user = model.getSysUser();
SysUserInfo info = model.getSysUserInfo();
@ -228,6 +232,8 @@ public class PersonnelController extends CoreBaseController {
@ApiOperation(value = "修改用户信息", notes = "返回内容添加用户信息")
public ResultBean updateUserModel(UserDetailModel model) {
try {
startMultiService();
checkUserModel(model);
SysUser user = personnelService.getSysUserById(Long.parseLong(model.getUserId()));
initUser(model, user);
@ -334,6 +340,8 @@ public class PersonnelController extends CoreBaseController {
@ApiOperation(value = "删除用户信息", notes = "根据用户信息id删除信息")
public ResultBean deleteSysUserInfo(@PathVariable("id") String id) {
try {
startMultiService();
//条件验证
ValidatorBean.checkNotNull(id, "id为空");
@ -362,6 +370,8 @@ public class PersonnelController extends CoreBaseController {
@ApiOperation(value = "根据id批量删除", notes = "根据id批量删除")
public ResultBean deleteSysUserInfoByIds(String[] ids) {
try {
startMultiService();
ids = ConvertBean.modelSafeArrayNumber(ids, true);
if (ids.length == 0) {
throw ImppExceptionBuilder.newInstance()
@ -405,6 +415,8 @@ public class PersonnelController extends CoreBaseController {
@ApiOperation(value = "删除账号信息", notes = "根据账号信息id删除信息")
public ResultBean deleteSysUser(@PathVariable("id") String id) {
try {
startMultiService();
//条件验证
ValidatorBean.checkNotNull(id, "id为空");
@ -433,6 +445,8 @@ public class PersonnelController extends CoreBaseController {
@ApiOperation(value = "根据id批量删除", notes = "根据id批量删除")
public ResultBean deleteSysUserByIds(String[] ids) {
try {
startMultiService();
ids = ConvertBean.modelSafeArrayNumber(ids, true);
if (ids.length == 0) {
throw ImppExceptionBuilder.newInstance()
@ -631,6 +645,8 @@ public class PersonnelController extends CoreBaseController {
* @param model 用户模型
*/
public void refreshRef(SysUser user, SysUserInfo info, UserDetailModel model) {
startMultiService();
if (user != null) {
// 刷新账号 部门关系
personnelService.refreshRefSysUserDepartment(user.getId(), StringTool.getArrayLong(model.getUserDepartmentIdList()));

2
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysBarcodeRuleController.java
Unescape Escape View File

@ -97,6 +97,8 @@ public class SysBarcodeRuleController extends CoreBaseController {
@ApiOperation(value = "删除条码规则",notes = "删除条码规则")
public ResultBean deleteSysBarcodeRuleById(@PathVariable("id") String idStr) {
try {
startMultiService();
// 条件验证
ValidatorBean.checkNotNull(idStr,"id不能为空");
SysBarcodeRule sysBarcodeRule = sysBarcodeRuleService.getSysBarcodeRuleById(Long.parseLong(idStr));

2
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysConfigController.java
Unescape Escape View File

@ -93,6 +93,8 @@ public class SysConfigController extends CoreBaseController {
@ApiOperation(value = "根据id删除系统参数", notes = "根据id删除系统参数")
public ResultBean deleteSysConfig(@PathVariable("id") String idStr) {
try {
startMultiService();
// 条件验证
ValidatorBean.checkNotNull(idStr,"id不能为空");
if(sysConfigService.getSysConfigById(Long.parseLong(idStr)) == null){

2
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java
Unescape Escape View File

@ -115,6 +115,8 @@ public class SysDictionaryController extends CoreBaseController{
@ApiOperation(value = "根据id删除字典",notes = "根据id删除字典")
public ResultBean updateSysDictionary(@PathVariable("id") String idStr) {
try {
startMultiService();
// 条件验证
ValidatorBean.checkNotNull(idStr,"id不能为空");
SysDictionary sysDictionary = sysDictionaryService.getSysDictionaryById(Long.parseLong(idStr));

10
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysFileController.java
Unescape Escape View File

@ -87,6 +87,8 @@ public class SysFileController extends CoreBaseController{
@ApiOperation(value = "根据id删除文件资源", notes = "根据id删除文件资源")
public ResultBean deleteSysFileById(@PathVariable("id") String idStr){
try {
startMultiService();
ValidatorBean.checkNotNull(idStr, "id不能为空");
SysFile sysFile = sysFileService.getSysFileById(Long.parseLong(idStr));
ValidatorBean.checkNotNull(sysFile, "文件信息不存在");
@ -132,7 +134,7 @@ public class SysFileController extends CoreBaseController{
@ApiOperation(value = "根据id查询文件资源", notes = "根据id查询文件资源")
public ResultBean getSysFileById(@PathVariable("id") String id){
try {
ValidatorBean.checkIsNumber(id, "id必须为数字");
ValidatorBean.checkIsNumber(id, "id必须为数字[" + id + "]");
SysFile sysFile = sysFileService.getSysFileById(Long.parseLong(id));
ValidatorBean.checkNotNull(sysFile, "文件信息不存在");
@ -201,6 +203,8 @@ public class SysFileController extends CoreBaseController{
@ApiOperation(value = "文件上传", notes = "文件上传")
public ResultBean singleFileUpload(@RequestParam("file") MultipartFile file) {
try {
startMultiService();
if(file.isEmpty()){
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
@ -239,6 +243,8 @@ public class SysFileController extends CoreBaseController{
@ApiOperation(value = "文件下载", notes = "文件下载")
public ResultBean singleDownload(@PathVariable("id")String id, HttpServletResponse response) {
try {
startMultiService();
ValidatorBean.checkIsNumber(id, "文件ID不能为空");
SysFile sysFile = sysFileService.getSysFileById(Long.parseLong(id));
@ -306,6 +312,8 @@ public class SysFileController extends CoreBaseController{
@ApiOperation(value = "新增文件资源", notes = "新增文件资源")
public ResultBean insertSysFile(@RequestBody SysFile sysFile){
try {
startMultiService();
// 条件验证
ValidatorBean.beginValid(sysFile)
.notNull("dfsFileName", sysFile.getDfsFileName())

2
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLabelTemplateController.java
Unescape Escape View File

@ -81,6 +81,8 @@ public class SysLabelTemplateController extends CoreBaseController {
@ApiOperation(value = "根据id删除打印模板", notes = "根据id删除打印模板")
public ResultBean deleteSysLabelTemplate(@PathVariable("id") String idStr) {
try {
startMultiService();
// 条件验证
ValidatorBean.checkNotNull(idStr,"id不能为空");
if(sysLabelTemplateService.getSysLabelTemplateById(Long.parseLong(idStr)) == null){

2
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleLanguageController.java
Unescape Escape View File

@ -110,6 +110,8 @@ public class SysLocaleLanguageController extends CoreBaseController {
@ApiOperation(value = "根据id删除系统语言",notes = "根据id删除系统语言")
public ResultBean deleteSysLocaleLanguageById(@PathVariable("id") String idStr){
try {
startMultiService();
//条件验证
ValidatorBean.checkNotNull(idStr,"id不能为空");
SysLocaleLanguage sysLocaleLanguage =sysLocaleLanguageService.getSysLocaleLanguageById(Long.parseLong(idStr));

2
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java
Unescape Escape View File

@ -120,6 +120,8 @@ public class SysLocaleResourceController extends CoreBaseController {
@ApiOperation(value = "根据id删除系统语言资源",notes = "根据id删除系统语言资源")
public ResultBean deleteSysLocaleResourceById(@PathVariable("id") String idStr){
try {
startMultiService();
//条件验证
ValidatorBean.checkNotNull(idStr,"id不能为空");
SysLocaleResource sysLocaleResource =sysLocaleResourceService.getSysLocaleResourceById(Long.parseLong(idStr));

2
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogExceptionController.java
Unescape Escape View File

@ -103,6 +103,8 @@ public class SysLogExceptionController extends CoreBaseController {
@GetMapping(value = "/export")
@ApiOperation(value = "导出系统异常日志")
public ResultBean exportSysLogException(SysLogException sysLogException, String[] colName, int pageSize,boolean isZip) {
startMultiService();
ListPager listPager;
List result = new ArrayList();
File zipFile = null;

2
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java
Unescape Escape View File

@ -190,6 +190,8 @@ public class SysLogOperateController extends CoreBaseController {
File excelDir = null;
File excelFile;
try {
startMultiService();
Pager pager = new Pager();
pager.setCurrentPage(1);
// 判断是否超过excel最大导出数量设定值

2
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogSystemController.java
Unescape Escape View File

@ -178,6 +178,8 @@ public class SysLogSystemController extends CoreBaseController{
File excelDir = null;
File excelFile;
try {
startMultiService();
Pager pager = new Pager();
pager.setCurrentPage(1);
// 判断是否超过excel最大导出数量设定值

2
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrderNoRuleController.java
Unescape Escape View File

@ -311,6 +311,8 @@ public class SysOrderNoRuleController extends CoreBaseController {
@ApiOperation(value = "下载导入模板")
public ResultBean downSysOrderNoRuleTemplate() {
try {
startMultiService();
FastDFSFile fastDFSFile = new FastDFSFile(SysOrderNoRule.class.getSimpleName() + "ImportTemplate.xls",
ExcelUtil.importTemplate(SysOrderNoRule.class), "xls");

8
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java
Unescape Escape View File

@ -52,6 +52,8 @@ public class SysRoleController extends CoreBaseController{
@ApiOperation(value = "新增系统角色", notes = "系统角色")
public ResultBean insertSysRole(SysRole role) {
try {
startMultiService();
//条件验证
ValidatorBean.beginValid(role)
.notNull("name", role.getName());
@ -82,6 +84,8 @@ public class SysRoleController extends CoreBaseController{
@ApiOperation(value = "修改系统角色", notes = "系统角色")
public ResultBean updateSysRole(SysRole role) {
try {
startMultiService();
// 数据校验
ValidatorBean.beginValid(role)
.notNull("id", role.getId())
@ -283,6 +287,8 @@ public class SysRoleController extends CoreBaseController{
@ApiOperation(value = "新增角色权限关系", notes = "新增角色权限关系")
public ResultBean insertRefMenu(String roleId,String[] refIds) {
try {
startMultiService();
// 数据校验
ValidatorBean.checkNotNull(roleId, "角色roleId 不能为空");
@ -308,6 +314,8 @@ public class SysRoleController extends CoreBaseController{
@ApiOperation(value = "批量新增角色权限关系", notes = "批量新增角色权限关系")
public ResultBean insertBatchRefMenu(String[] roleIds,String[] menuIds) {
try {
startMultiService();
roleIds = ConvertBean.modelSafeArrayNumber(roleIds,true);
menuIds = ConvertBean.modelSafeArrayNumber(menuIds,true);

2
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskController.java
Unescape Escape View File

@ -158,6 +158,8 @@ public class SysTaskController extends CoreBaseController {
@ApiOperation(value = "删除任务", notes = "删除任务")
public ResultBean deleteSysTaskById(@PathVariable("id") String idStr) {
try {
startMultiService();
// 数据校验
ValidatorBean.checkNotNull(idStr, "id不能为空");
if (sysTaskService.getSysTaskById(Long.parseLong(idStr)) == null) {

2
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskCycleController.java
Unescape Escape View File

@ -165,6 +165,8 @@ public class SysTaskCycleController extends CoreBaseController {
@ApiOperation(value = "删除任务周期", notes = "删除任务周期")
public ResultBean deleteSysTaskCycle(@PathVariable("id") String idStr) {
try {
startMultiService();
// 数据校验
ValidatorBean.checkNotNull(idStr, "时间表达式id 不能为空");
if (sysTaskCycleService.getSysTaskCycleById(Long.parseLong(idStr)) == null) {

8
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskPlanController.java
Unescape Escape View File

@ -114,6 +114,8 @@ public class SysTaskPlanController extends CoreBaseController {
@ApiOperation(value = "新增任务计划", notes = "任务计划")
public ResultBean insertSysTaskTime(SysTaskPlan sysTaskPlan, Integer isExecute) {
try {
startMultiService();
// 数据校验
ValidatorBean.beginValid(sysTaskPlan)
.notNull("name", sysTaskPlan.getName())
@ -195,6 +197,8 @@ public class SysTaskPlanController extends CoreBaseController {
@ApiOperation(value = "修改任务计划", notes = "任务计划")
public ResultBean updateSysTaskTime(SysTaskPlan sysTaskPlan, Integer isExecute) {
try {
startMultiService();
ResultBean resultBean = ResultBean.success("操作成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultObject(sysTaskPlan);
@ -270,6 +274,8 @@ public class SysTaskPlanController extends CoreBaseController {
@ApiOperation(value = "删除任务计划", notes = "删除任务计划")
public ResultBean deleteSysTaskTime(@PathVariable("id") String id) {
try {
startMultiService();
// 数据校验
ValidatorBean.checkNotNull(id, "任务计划id 不能为空");
SysTaskPlan sysTaskPlan = sysTaskPlanService.getSysTaskPlanById(Long.parseLong(id));
@ -339,6 +345,8 @@ public class SysTaskPlanController extends CoreBaseController {
@ApiOperation(value = "修改任务计划状态", notes = "根据ID修改任务计划状态")
public ResultBean updateQuartzStatus(@PathVariable("id") String idStr, @PathVariable("status") Integer status) {
try {
startMultiService();
// 数据校验
ValidatorBean.checkNotNull(idStr, "id 不能为空");
ValidatorBean.checkNotZero(status, "状态不能为空");

2
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolTypeController.java
Unescape Escape View File

@ -102,6 +102,8 @@ public class SysToolTypeController extends CoreBaseController{
@ApiOperation(value = "根据id删除硬件类型",notes = "根据id删除硬件类型")
public ResultBean deleteSysToolType(@PathVariable("id") String idStr){
try {
startMultiService();
ValidatorBean.checkNotNull(idStr,"id不能为空");
if(toolTypeService.getSysToolTypeById(Long.parseLong(idStr)) == null){
throw ImppExceptionBuilder.newInstance()

10
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java
Unescape Escape View File

@ -72,6 +72,8 @@ public class SysUserController extends CoreBaseController{
@ApiOperation(value = "新增用户", notes = "新增系统用户")
public ResultBean insertSysUser(SysUser sysUser,String[] roleIds) {
try {
startMultiService();
ConvertBean.modelSafeArrayNumber(roleIds,true);
ValidatorBean.beginValid(sysUser)
@ -133,6 +135,8 @@ public class SysUserController extends CoreBaseController{
@ApiOperation(value = "修改用户", notes = "修改用户信息")
public ResultBean updateSysUser(SysUser sysUser,String[] roleIds) {
try {
startMultiService();
ConvertBean.modelSafeArrayNumber(roleIds,true);
ValidatorBean.beginValid(sysUser)
.numberCheck("id",sysUser.getUserInfoId())
@ -248,6 +252,8 @@ public class SysUserController extends CoreBaseController{
@ApiOperation(value = "修改密码", notes = "修改当前登录用户密码")
public ResultBean updateSysUserPassword(String password,String newPwd) {
try {
startMultiService();
SessionUser sessionUser = AuthUtil.getSessionUser();
// 数据校验
ValidatorBean.checkNotNull(password, "旧密码不能为空");
@ -382,6 +388,8 @@ public class SysUserController extends CoreBaseController{
@ApiOperation(value = "密码重置",notes = "根据id重置用户密码")
public ResultBean updateResetPassword(@PathVariable String id){
try {
startMultiService();
SysUser user = sysUserService.getSysUserById(Long.parseLong(id));
if(user != null){
Integer num = personnelService.checkSysUserResetPassword(user);
@ -531,6 +539,8 @@ public class SysUserController extends CoreBaseController{
@ApiOperation(value = "修改用户操作组织id")
public ResultBean updateSysUserOrganize(String idStr, String organizeIdStr){
try{
startMultiService();
ValidatorBean.checkNotNull(idStr, "id不能为空");
SysUser sysUser = sysUserService.getSysUserById(Long.parseLong(idStr));
ValidatorBean.checkNotNull(sysUser, "用户不存在");

4
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java
Unescape Escape View File

@ -71,6 +71,8 @@ public class SysUserInfoController extends CoreBaseController{
@ApiOperation(value="添加用户信息",notes="返回内容添加用户信息")
public ResultBean insertSysUserInfo(SysUserInfo userInfo){
try {
startMultiService();
//登陆用户
SessionUser user = AuthUtil.getSessionUser();
@ -103,6 +105,8 @@ public class SysUserInfoController extends CoreBaseController{
@ApiOperation(value="修改用户信息",notes="根据用户信息id修改信息")
public ResultBean updateSysUserInfoById(SysUserInfo userInfo){
try {
startMultiService();
//登陆用户
SessionUser user = AuthUtil.getSessionUser();

3
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageLetterQueueReceiver.java
Unescape Escape View File

@ -4,6 +4,7 @@ import cn.estsh.i3plus.core.api.iservice.busi.IPersonnelService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysUserService;
import cn.estsh.i3plus.core.apiservice.websocket.MessageWebSocket;
import cn.estsh.i3plus.platform.common.convert.ConvertBean;
import cn.estsh.i3plus.platform.common.tool.JsonUtilTool;
import cn.estsh.i3plus.platform.common.tool.StringTool;
import cn.estsh.i3plus.platform.common.tool.TimeTool;
@ -68,6 +69,7 @@ public class MessageLetterQueueReceiver {
LOGGER.info("【MQ-{}】 数据接收成功：{}", PlatformConstWords.IMPP_MESSAGE_LETTER_QUEUE, data);
SysMessage msg = JsonUtilTool.decode(data, SysMessage.class);
try {
ConvertBean.serviceModelInitialize(msg, "system");
msg = sysMessageService.insertSysMessage(msg);
if (!StringUtils.isBlank(msg.getMessageReceiversId())) {
@ -92,6 +94,7 @@ public class MessageLetterQueueReceiver {
refUserMessage.setMessageStatus(ImppEnumUtil.MESSAGE_STATUS.UNREAD.getValue());
refUserMessage.setReceiverTime(TimeTool.getNowTime(true));
refUserMessage.setIsUrgent(msg.getIsUrgent());
ConvertBean.serviceModelInitialize(refUserMessage, "system");
insertList.add(refUserMessage);
}

4
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/ScheduleQueueReceiver.java
Unescape Escape View File

@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.apiservice.mq;
import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskPlanService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysUserService;
import cn.estsh.i3plus.platform.common.convert.ConvertBean;
import cn.estsh.i3plus.platform.common.tool.JsonUtilTool;
import cn.estsh.i3plus.platform.common.tool.StringTool;
import cn.estsh.i3plus.platform.common.tool.TimeTool;
@ -73,6 +74,7 @@ public class ScheduleQueueReceiver {
logTaskTime.setTaskSoftTypeRdd(taskPlan.getTaskSoftTypeRdd());
logTaskTime.setTaskCycleNameRdd(taskPlan.getTaskCycleNameRdd());
logTaskTime.setTaskCycleExpsRdd(taskPlan.getTaskCycleExpsRdd());
ConvertBean.serviceModelInitialize(logTaskTime, "system");
sysTaskPlanService.logInsertSysLogTaskTime(logTaskTime);
// 定时任务失败通知
@ -91,6 +93,8 @@ public class ScheduleQueueReceiver {
sysMessage.setMessageContentType(ImppEnumUtil.MESSAGE_TYPE_CONTENT.HTML.getValue());
sysMessage.setMessageSendTime(TimeTool.getNowTime(true));
sysMessage.setIsSystem(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
// 初始数据
ConvertBean.serviceModelInitialize(sysMessage, "system");
// 是否内部成员
if (CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() == taskPlan.getIsInternalUser()) {

15
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestService.java
Unescape Escape View File

@ -105,4 +105,19 @@ public class TestService implements ITestService {
u = testTransUserRepository.insert(u);
System.out.println("插入对象：" + u);
}
@Override
public void insertSysUser(SysUser sysUser) {
sysUserRDao.insert(sysUser);
}
@Override
public void updateSysUser(SysUser sysUser) {
sysUserRDao.update(sysUser);
}
@Override
public List<SysUser> listSysUser() {
return sysUserRDao.list();
}
}

8
modules/i3plus-core-apiservice/src/main/resources/application-dev.properties
Unescape Escape View File

@ -58,17 +58,15 @@ spring.datasource.time-between-eviction-runs-millis=18800
##主数据源，读写
#impp.write.datasource.type=com.zaxxer.hikari.HikariDataSource
impp.write.datasource.driver-class-name=com.mysql.jdbc.Driver
impp.write.datasource.jdbc-url=jdbc:mysql://192.168.1.60:3306/impp_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8
#impp.write.datasource.jdbc-url=jdbc:mysql://192.168.1.44:3306/40_impp_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8
impp.write.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3306/impp_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8
impp.write.datasource.username=impp_i3_core_user
impp.write.datasource.password=impp_i3_core_pwd
##辅数据源，只读
#impp.read.datasource.type=com.zaxxer.hikari.HikariDataSource
impp.read.datasource.driver-class-name=com.mysql.jdbc.Driver
impp.read.datasource.jdbc-url=jdbc:mysql://192.168.1.60:3307/impp_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8
#impp.read.datasource.jdbc-url=jdbc:mysql://192.168.1.44:3306/40_impp_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8
impp.read.datasource.username=impp_i3_schedule_user_3307
impp.read.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3306/impp_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8
impp.read.datasource.username=impp_i3_core_user
impp.read.datasource.password=impp_i3_core_pwd
################ 日志数据源 ################

22
pom.xml
Unescape Escape View File

@ -143,6 +143,28 @@
<version>5.1.39</version>
</dependency>
<!-- oracle -->
<dependency>
<groupId>com.oracle</groupId>
<artifactId>ojdbc6</artifactId>
<version>12.1.0.1.0</version>
</dependency>
<!-- sqlserver -->
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>sqljdbc4</artifactId>
<version>4.0</version>
</dependency>
<!-- postgresql -->
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.2.5</version>
</dependency>
<!-- 常用string方法 -->
<dependency>
<groupId>org.apache.commons</groupId>

Write Preview
Loading…
Cancel
Save