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

合并代码

Browse Source
yun-zuoyi
Silliter 6 years ago
parent d63d31eb11 4d96152b3e
commit 89b7bf03df
9 changed files with 184 additions and 63 deletions
Show Stats Download Patch File Download Diff File

1
modules/i3plus-core-api/i3plus-core-api.iml
Unescape Escape View File

@ -79,6 +79,7 @@
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.6" level="project" />
<orderEntry type="module" module-name="i3plus-pojo-report" />
<orderEntry type="module" module-name="i3plus-pojo-form" />
<orderEntry type="module" module-name="i3plus-pojo-wms" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.4.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.4.0" level="project" />

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

@ -74,4 +74,12 @@ public interface ISysFileService {
*/
@ApiOperation(value = "上传文件资源",notes = "上传文件资源")
SysFile uploadFile(Object file) throws Exception;
/**
* 根据文件代码获取文件信息
* @param fileCode
* @return
*/
@ApiOperation(value = "根据文件代码获取文件信息")
SysFile getSysFileByFileCode(String fileCode);
}

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

@ -1,5 +1,6 @@
package cn.estsh.i3plus.core.api.iservice.busi;
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.platform.bean.SysUser;
@ -21,4 +22,7 @@ public interface ITestService {
@ApiOperation(value = "条件查询")
public ListPager<SysUser> querySysUserByPager(SysUser user, Pager pager);
@ApiOperation(value = "in条件封装查询")
List<SysUser> querySysUserByPack(DdlPackBean packBean);
}

3
modules/i3plus-core-apiservice/i3plus-core-apiservice.iml
Unescape Escape View File

@ -110,10 +110,11 @@
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.6" level="project" />
<orderEntry type="module" module-name="i3plus-pojo-report" />
<orderEntry type="module" module-name="i3plus-pojo-form" />
<orderEntry type="module" module-name="i3plus-pojo-wms" />
<orderEntry type="module" module-name="i3plus-pojo-base" />
<orderEntry type="module" module-name="i3plus-core-api" />
<orderEntry type="module" module-name="impp-framework-boot" />
<orderEntry type="library" name="Maven: impp.framework:impp-framework-boot:1.0-TEST-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.0.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.0.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.6" level="project" />

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

@ -2,10 +2,13 @@ package cn.estsh.i3plus.core.apiservice.controller;
import cn.estsh.i3plus.core.api.iservice.busi.ISysUserService;
import cn.estsh.i3plus.core.api.iservice.busi.ITestService;
import cn.estsh.i3plus.pojo.base.bean.BaseResultBean;
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.base.tool.HqlPack;
import cn.estsh.i3plus.pojo.platform.bean.SysUser;
import cn.estsh.impp.framework.boot.exception.ImppBusiException;
@ -22,6 +25,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
@RestController
@RequestMapping("/impp-ddl")
@ -44,4 +49,37 @@ public class DemoDdlPackController {
return ResultBean.fail(busExcep);
}
}
@GetMapping(value="/testpackin")
@ApiOperation(value="ddl封装in")
public BaseResultBean testDdlPackIn(int testType){
String[] strArr = {"1","2"};
Integer[] intArr = {1,2};
List strList = new ArrayList();
strList.add("1");
strList.add("2");
List intList = new ArrayList();
intList.add(1);
intList.add(2);
DdlPackBean packBean = new DdlPackBean(true);
if(testType == 1) {
DdlPreparedPack.getInPack("aaa", "userName", packBean);
}else if(testType == 2) {
DdlPreparedPack.getInPackArray(strArr, "userName", packBean);
}else if(testType == 3) {
DdlPreparedPack.getInPackArray(intArr, "userStatus", packBean);
}else if(testType == 4) {
DdlPreparedPack.getInPackList(strList, "userName", packBean);
}else if(testType == 5) {
DdlPreparedPack.getInPackList(intList, "userStatus", packBean);
}
List<SysUser> list = testService.querySysUserByPack(packBean);
return ResultBean.success("用户数量：" + list.size())
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultList(list);
}
}

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

@ -3,7 +3,6 @@ package cn.estsh.i3plus.core.apiservice.controller.busi;
import cn.estsh.i3plus.core.api.iservice.busi.ISysDictionaryService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysFileService;
import cn.estsh.i3plus.platform.common.tool.StringTool;
import cn.estsh.i3plus.platform.common.util.CommonConstWords;
import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
import cn.estsh.i3plus.pojo.base.bean.BaseConstWords;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
@ -26,7 +25,6 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.io.BufferedInputStream;
import java.io.IOException;
@ -63,6 +61,7 @@ public class SysFileController extends CoreBaseController{
// 条件验证
ValidatorBean.beginValid(sysFile)
.notNull("id", sysFile.getId())
.notNull("fileSoftType", sysFile.getFileSoftType())
.notNull("name", sysFile.getName());
sysFileService.updateSysFile(sysFile);
@ -76,9 +75,17 @@ public class SysFileController extends CoreBaseController{
@DeleteMapping(value = "/delete/{id}")
@ApiOperation(value = "根据id删除文件资源", notes = "根据id删除文件资源")
public ResultBean deleteSysFileById(@PathVariable("id") String id){
public ResultBean deleteSysFileById(@PathVariable("id") String idStr){
try {
sysFileService.deleteSysFileById(Long.parseLong(id));
ValidatorBean.checkNotNull(idStr, "id不能为空");
SysFile sysFile = sysFileService.getSysFileById(Long.parseLong(idStr));
ValidatorBean.checkNotNull(sysFile, "文件信息不存在");
LOGGER.info("FastDFS删除文件 == groupName: {}，name：{}", sysFile.getDfsGroupName(), sysFile.getDfsFileName());
dfsClient.deleteFile(sysFile.getDfsGroupName(), sysFile.getDfsFileName());
sysFileService.deleteSysFileById(Long.parseLong(idStr));
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
return ResultBean.fail(busExcep);
@ -109,6 +116,8 @@ public class SysFileController extends CoreBaseController{
ValidatorBean.checkIsNumber(id, "id必须为数字");
SysFile sysFile = sysFileService.getSysFileById(Long.parseLong(id));
ValidatorBean.checkNotNull(sysFile, "文件信息不存在");
return ResultBean.success("操作成功")
.setResultObject(sysFile)
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
@ -255,6 +264,7 @@ public class SysFileController extends CoreBaseController{
ValidatorBean.beginValid(sysFile)
.notNull("dfsFileName", sysFile.getDfsFileName())
.notNull("dfsGroupName", sysFile.getDfsGroupName())
.notNull("fileSoftType", sysFile.getFileSoftType())
.notNull("fileOriginalName", sysFile.getFileOriginalName());
// 文件类型验证
@ -282,4 +292,25 @@ public class SysFileController extends CoreBaseController{
}
}
/**
* 根据文件代码查询文件信息
* @param fileCode 文件代码
* @return 处理结果
*/
@GetMapping("/get-file-code/{code}")
@ApiOperation(value = "根据文件代码查询文件信息")
public ResultBean getSysFileByFileCode(@PathVariable("code") String fileCode) {
try {
// 条件验证
ValidatorBean.checkNotNull(fileCode, "文件代码不能为空");
SysFile sysFile = sysFileService.getSysFileByFileCode(fileCode);
ValidatorBean.checkNotNull(sysFile, "文件信息不存在");
return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(sysFile);
}catch(ImppBusiException busExcep){
return ResultBean.fail(busExcep);
}catch(Exception e){
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
}

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

@ -314,6 +314,7 @@ public class SysOrderNoRuleController extends CoreBaseController {
SysFile sysFile = new SysFile();
sysFile.setDfsGroupName(fileAbsolutePath[0]);
sysFile.setDfsFileName(fileAbsolutePath[1]);
sysFile.setFileSoftType(CommonEnumUtil.SOFT_TYPE.CORE.getValue());
sysFile.setFileSize(fastDFSFile.getContent().length);
sysFile.setFilePath(filePath);
sysFile.setFileOriginalName(fastDFSFile.getName());

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

@ -8,11 +8,14 @@ import cn.estsh.i3plus.pojo.base.bean.BaseConstWords;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.common.PagerHelper;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.SysDictionary;
import cn.estsh.i3plus.pojo.platform.bean.SysFile;
import cn.estsh.i3plus.pojo.platform.repository.SysDictionaryRepository;
import cn.estsh.i3plus.pojo.platform.repository.SysFileRepository;
import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
import cn.estsh.impp.framework.boot.fastdfs.FastDFSClient;
import cn.estsh.impp.framework.boot.fastdfs.FastDFSFile;
import io.swagger.annotations.ApiOperation;
@ -21,7 +24,6 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import java.io.File;
import java.util.List;
@ -49,6 +51,18 @@ public class SysFileServiceImpl implements ISysFileService {
@ApiOperation(value = "新增资源信息")
public SysFile insertSysFile(SysFile sysFile) {
LOGGER.info("文件资源 SYS_FILE :{}", sysFile);
if (sysFile.getFileCode() != null) {
SysFile fileCode = sysFileRDao.getByProperty("fileCode", sysFile.getFileCode());
if (fileCode != null) {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("文件代码已存在。")
.setErrorSolution("请更换文件代码")
.build();
}
}
return sysFileRDao.insert(sysFile);
}
@ -56,6 +70,18 @@ public class SysFileServiceImpl implements ISysFileService {
@ApiOperation(value = "更新资源信息")
public void updateSysFile(SysFile sysFile) {
LOGGER.info("文件资源 SYS_FILE :{}", sysFile);
if (sysFile.getFileCode() != null) {
List list = sysFileRDao.findByHqlWhere(CoreHqlPack.packHqlSysFileCode(sysFile));
if (list != null && list.size() > 0) {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("文件代码已存在。")
.setErrorSolution("请更换文件代码")
.build();
}
}
sysFileRDao.update(sysFile);
}
@ -128,6 +154,7 @@ public class SysFileServiceImpl implements ISysFileService {
SysFile sysFile = new SysFile();
sysFile.setDfsGroupName(fileAbsolutePath[0]);
sysFile.setDfsFileName(fileAbsolutePath[1]);
sysFile.setFileSoftType(CommonEnumUtil.SOFT_TYPE.CORE.getValue());
sysFile.setFileSize(fastDFSFile.getContent().length);
sysFile.setFilePath(filePath);
sysFile.setFileOriginalName(fastDFSFile.getName());
@ -138,4 +165,9 @@ public class SysFileServiceImpl implements ISysFileService {
return insertSysFile(sysFile);
}
@Override
public SysFile getSysFileByFileCode(String fileCode) {
return sysFileRDao.getByProperty("fileCode", fileCode);
}
}

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

@ -75,4 +75,9 @@ public class TestService implements ITestService {
return list;
}
@Override
public List<SysUser> querySysUserByPack(DdlPackBean packBean) {
return sysUserRDao.findByHqlWhere(packBean);
}
}

Write Preview
Loading…
Cancel
Save