Jenkins自动合并

yun-zuoyi
jenkins 5 years ago
commit b07d0b0d7b

@ -29,4 +29,13 @@ public interface IReportService {
*/
@ApiOperation(value = "HQL 执行",notes = "执行 HQL")
List selectTemplateModel(TemplateModel model) throws Exception;
/**
* HQL
* @param model HQL Model
* @return
* @throws Exception
*/
@ApiOperation(value = "HQL 执行",notes = "执行 HQL")
Long countTemplateModel(TemplateModel model) throws Exception;
}

@ -28,7 +28,7 @@ import java.util.Enumeration;
* @Modify:
**/
@RestController
@Api(description = "登陆授权demo")
@Api(tags = "登陆授权demo")
@RequestMapping(PlatformConstWords.BASE_URL + "/demo")
public class DemoAuthController extends CoreBaseController {
public static final Logger LOGGER = LoggerFactory.getLogger(DemoAuthController.class);

@ -22,7 +22,7 @@
//
//@RestController
//@RequestMapping("/impp-ddl")
//@Api(description="hql封装demo")
//@Api(tags="hql封装demo")
//public class DemoDdlPackController {
//
// private static final Logger LOGGER = LoggerFactory.getLogger(DemoDdlPackController.class);

@ -34,7 +34,7 @@ import java.util.Map;
**/
@RestController
@RequestMapping("/impp/form")
@Api(description="动态报表设置")
@Api(tags="动态报表设置")
public class DemoDynamicFormController {
private static final Logger LOGGER = LoggerFactory.getLogger(DemoDynamicFormController.class);

@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.RestController;
* @Modify:
**/
@RestController
@Api(description="微服功能demo")
@Api(tags="微服功能demo")
@RequestMapping("/demo-eureka-service")
@ConditionalOnExpression("'${eureka.client.enabled}' == 'true'")
public class DemoEurekaController {

@ -25,7 +25,7 @@ import java.sql.SQLException;
@RestController
@RequestMapping("/impp")
@Api(description="异常服务测试")
@Api(tags="异常服务测试")
public class DemoExceptionController {
private static final Logger LOGGER = LoggerFactory.getLogger(DemoExceptionController.class);

@ -27,7 +27,7 @@ import java.util.List;
* @Modify:
**/
@RestController
@Api(description = "系统服务demo")
@Api(tags = "系统服务demo")
@RequestMapping(PlatformConstWords.BASE_URL + "/demo-mongo-service")
public class DemoMongoController extends CoreBaseController {
private static final Logger LOGGER = LoggerFactory.getLogger(DemoMongoController.class);

@ -40,7 +40,7 @@ import java.util.Locale;
* @Modify:
**/
@RestController
@Api(description="系统服务demo")
@Api(tags="系统服务demo")
@RequestMapping(PlatformConstWords.BASE_URL + "/demo-system-service")
public class DemoResourceController extends CoreBaseController {
private static final Logger LOGGER = LoggerFactory.getLogger(DemoResourceController.class);

@ -27,7 +27,7 @@ import java.util.List;
* @Modify:
**/
@RestController
@Api(description = "定时任务demo")
@Api(tags = "定时任务demo")
@RequestMapping(PlatformConstWords.BASE_URL + "/schedule")
public class DemoScheduleController extends CoreBaseController {
private static final Logger LOGGER = LoggerFactory.getLogger(DemoScheduleController.class);

@ -69,7 +69,7 @@
// * @Modify:
// **/
//@RestController
//@Api(description = "IMPP性能测试")
//@Api(tags = "IMPP性能测试")
//@RequestMapping("/impp/white/sys-test")
//public class DemoTestingController {
// public static final Logger LOGGER = LoggerFactory.getLogger(DemoTestingController.class);

@ -25,7 +25,7 @@
// * @Modify:
// **/
//@RestController
//@Api(description = "对事务以及entityManager的操作演示")
//@Api(tags = "对事务以及entityManager的操作演示")
//@RequestMapping("/demo-trans")
//public class DemoTransactionController extends CoreBaseController {
// private static final Logger LOGGER = LoggerFactory.getLogger(DemoTransactionController.class);

@ -32,7 +32,7 @@ import java.net.URLConnection;
* @Modify:
**/
@RestController
@Api(description="树和异常demo")
@Api(tags="树和异常demo")
@RequestMapping(PlatformConstWords.BASE_URL + "/demo")
public class DemoTreeAndExceptionController extends CoreBaseController{
private static final Logger LOGGER = LoggerFactory.getLogger(DemoTreeAndExceptionController.class);

@ -25,7 +25,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
* @Modify:
**/
@RestController
@Api(description="复杂对象服务demo")
@Api(tags="复杂对象服务demo")
@RequestMapping(PlatformConstWords.BASE_URL + "/demo-upload")
public class DemoUploadController extends CoreBaseController{
private static final Logger LOGGER = LoggerFactory.getLogger(DemoUploadController.class);

@ -36,7 +36,7 @@ import java.util.List;
* @Modify :
**/
@RestController
@Api(description = "用户所有权限操作服务")
@Api(tags = "用户所有权限操作服务")
@RequestMapping(PlatformConstWords.BASE_URL + "/auth")
public class AuthController extends CoreBaseController {

@ -1,11 +1,20 @@
package cn.estsh.i3plus.core.apiservice.controller.base;
import cn.estsh.i3plus.core.api.iservice.base.ISystemInitService;
import cn.estsh.i3plus.core.api.iservice.busi.ICoreMemTreeService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysMenuService;
import cn.estsh.i3plus.platform.common.tool.SerializeTool;
import cn.estsh.i3plus.platform.common.util.CommonConstWords;
import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.SysMenu;
import cn.estsh.impp.framework.base.controller.CoreBaseController;
import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.util.ImppRedis;
import cn.estsh.impp.framework.boot.util.ResultBean;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
@ -15,6 +24,9 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;
/**
* @Description :
* @Reference :
@ -23,7 +35,7 @@ import org.springframework.web.bind.annotation.RestController;
* @Modify:
**/
@RestController
@Api(description = "后台运维服务")
@Api(tags = "后台运维服务")
@RequestMapping("/impp/white/backstage")
public class BackstageController extends CoreBaseController {
@ -32,6 +44,15 @@ public class BackstageController extends CoreBaseController {
@Autowired
private ISystemInitService systemInitService;
@Autowired
private ISysMenuService menuService;
@Autowired
private ICoreMemTreeService memTreeService;
@Resource(name= CommonConstWords.IMPP_REDIS_CORE)
private ImppRedis redisRes;
@GetMapping(value = "/redis-put-all")
@ApiOperation(value = "重新加载所有缓存数据",notes = "重新加载所有缓存数据")
public ResultBean redisPutAll(){

@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
* @Modify:
**/
@RestController
@Api(description = "通用功能服务")
@Api(tags = "通用功能服务")
@RequestMapping(PlatformConstWords.BASE_URL +"/common")
public class CoreCommonController extends BaseCommonController {
}

@ -38,7 +38,7 @@ import java.util.*;
* @Modify:
**/
@RestController
@Api(description = "系统服务")
@Api(tags = "系统服务")
@RequestMapping(PlatformConstWords.BASE_URL + "/system")
public class SystemController {

@ -44,7 +44,7 @@ import java.util.*;
* @Modify:
**/
@RestController
@Api(description = "非权限服务")
@Api(tags = "非权限服务")
@RequestMapping("/impp/white")
public class WhiteController extends CoreBaseController {

@ -21,7 +21,7 @@
// * @Modify:
// **/
//@RestController
//@Api(description="复杂对象服务demo")
//@Api(tags="复杂对象服务demo")
//@RequestMapping(PlatformConstWords.BASE_URL +"/factory-store")
//public class FactoryStoreController extends CoreBaseController {
// private Logger LOGGER = LoggerFactory.getLogger(this.getClass());

@ -43,7 +43,7 @@ import java.util.Map;
* @Modify:
**/
@RestController
@Api(description = "系统用户管理服务")
@Api(tags = "系统用户管理服务")
@RequestMapping(PlatformConstWords.BASE_URL + "/personnel")
public class PersonnelController extends CoreBaseController {

@ -31,7 +31,7 @@ import java.util.Map;
* @Modify:
**/
@RestController
@Api(description = "条码规则管理服务")
@Api(tags = "条码规则管理服务")
@RequestMapping(PlatformConstWords.BASE_URL +"/sys-barcode-rule")
public class SysBarcodeRuleController extends CoreBaseController {

@ -43,7 +43,7 @@ import java.util.List;
* @Modify :
**/
@RestController
@Api(description = "系统参数管理服务")
@Api(tags = "系统参数管理服务")
@RequestMapping(PlatformConstWords.BASE_URL +"/sys-config")
public class SysConfigController extends CoreBaseController {
public static final Logger LOGGER = LoggerFactory.getLogger(SysConfigController.class);

@ -35,7 +35,7 @@ import java.util.Map;
* @Modify:
**/
@RestController
@Api(description = "Dashboard服务")
@Api(tags = "Dashboard服务")
@RequestMapping(PlatformConstWords.BASE_URL + "/dashboard")
public class SysDashboardController extends CoreBaseController {
private static final Logger LOGGER = LoggerFactory.getLogger(SysDashboardController.class);

@ -36,7 +36,7 @@ import java.util.List;
* @Modify :
**/
@RestController
@Api(description = "部门管理服务")
@Api(tags = "部门管理服务")
@RequestMapping(PlatformConstWords.BASE_URL +"/department")
public class SysDepartmentController extends CoreBaseController {
public static final Logger LOGGER = LoggerFactory.getLogger(SysDepartmentController.class);

@ -40,7 +40,7 @@ import java.util.stream.Collectors;
* @Modify :
**/
@RestController
@Api(description = "字典管理服务")
@Api(tags = "字典管理服务")
@RequestMapping(PlatformConstWords.BASE_URL +"/sys-dictionary")
public class SysDictionaryController extends CoreBaseController{
public static final Logger LOGGER = LoggerFactory.getLogger(SysConfigController.class);

@ -24,7 +24,7 @@ import java.util.List;
* @Modify :
**/
@RestController
@Api(description = "系统枚举服务")
@Api(tags = "系统枚举服务")
@RequestMapping(PlatformConstWords.BASE_URL + "/sys-enum")
public class SysEnumController extends CoreBaseController {

@ -52,7 +52,7 @@ import java.util.List;
* @Modify :
**/
@RestController
@Api(description = "文件资源服务")
@Api(tags = "文件资源服务")
@RequestMapping(PlatformConstWords.BASE_URL + "/sys-file")
public class SysFileController extends CoreBaseController {
public static final Logger LOGGER = LoggerFactory.getLogger(SysFileController.class);

@ -35,7 +35,7 @@ import java.util.List;
* @Modify :
**/
@RestController
@Api(description = "打印模板管理服务")
@Api(tags = "打印模板管理服务")
@RequestMapping(PlatformConstWords.BASE_URL +"/sys-label-template")
public class SysLabelTemplateController extends CoreBaseController {
public static final Logger LOGGER = LoggerFactory.getLogger(SysLabelTemplateController.class);

@ -34,7 +34,7 @@ import java.util.List;
* @Modify:
**/
@RestController
@Api(description = "系统语言服务")
@Api(tags = "系统语言服务")
@RequestMapping(PlatformConstWords.BASE_URL + "/sys-locale-language")
public class SysLocaleLanguageController extends CoreBaseController {
public static final Logger LOGGER = LoggerFactory.getLogger(SysFileController.class);

@ -43,7 +43,7 @@ import java.util.*;
* @Modify:
**/
@RestController
@Api(description = "系统语言资源服务")
@Api(tags = "系统语言资源服务")
@RequestMapping(PlatformConstWords.BASE_URL + "/sys-locale-resource")
public class SysLocaleResourceController extends CoreBaseController {
public static final Logger LOGGER = LoggerFactory.getLogger(SysLocaleResourceController.class);

@ -43,7 +43,7 @@ import java.util.List;
* @Modify:
**/
@RestController
@Api(description = "系统异常日志服务")
@Api(tags = "系统异常日志服务")
@RequestMapping(PlatformConstWords.BASE_URL + "/sys-log-exception")
public class SysLogExceptionController extends CoreBaseController {
public static final Logger LOGGER = LoggerFactory.getLogger(SysLogExceptionController.class);

@ -39,7 +39,7 @@ import java.util.List;
* @Modify :
**/
@RestController
@Api(description = "操作日志")
@Api(tags = "操作日志")
@RequestMapping(PlatformConstWords.BASE_URL + "/sys-log-operate")
public class SysLogOperateController extends CoreBaseController {
public static final Logger LOGGER = LoggerFactory.getLogger(SysLogOperateController.class);

@ -42,7 +42,7 @@ import java.util.List;
* @Modify :
**/
@RestController
@Api(description = "系统日志服务")
@Api(tags = "系统日志服务")
@RequestMapping(PlatformConstWords.BASE_URL +"/sys-log-system")
public class SysLogSystemController extends CoreBaseController{
public static final Logger LOGGER = LoggerFactory.getLogger(SysLogSystemController.class);

@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.*;
* @Modify :
**/
@RestController
@Api(description = "定时任务日志服务")
@Api(tags = "定时任务日志服务")
@RequestMapping(PlatformConstWords.BASE_URL +"/sys-log-task-time")
public class SysLogTaskTimeController extends CoreBaseController{
public static final Logger LOGGER = LoggerFactory.getLogger(SysLogTaskTimeController.class);

@ -31,7 +31,7 @@ import java.util.List;
* @Modify:
**/
@RestController
@Api(description = "内存树服务")
@Api(tags = "内存树服务")
@RequestMapping(PlatformConstWords.BASE_URL + "/mem-tree")
public class SysMemTreeController extends CoreBaseController {

@ -1,5 +1,6 @@
package cn.estsh.i3plus.core.apiservice.controller.busi;
import cn.estsh.i3plus.core.api.iservice.busi.ICoreMemTreeService;
import cn.estsh.i3plus.core.api.iservice.busi.IPersonnelService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysMenuService;
import cn.estsh.i3plus.platform.common.convert.ConvertBean;
@ -7,6 +8,7 @@ import cn.estsh.i3plus.platform.common.exception.BaseImppException;
import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
import cn.estsh.i3plus.platform.common.tool.ExcelTool;
import cn.estsh.i3plus.platform.common.tool.StringTool;
import cn.estsh.i3plus.platform.common.util.CommonConstWords;
import cn.estsh.i3plus.platform.common.util.FileContentTypeTool;
import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
@ -47,7 +49,7 @@ import java.util.Map;
* @Modify :
**/
@RestController
@Api(description = "系统功能服务")
@Api(tags = "系统功能服务")
@RequestMapping(PlatformConstWords.BASE_URL + "/sys-menu")
public class SysMenuController extends CoreBaseController {
@ -59,10 +61,13 @@ public class SysMenuController extends CoreBaseController {
@Autowired
private EntityManager entityManager;
@Resource(name="redisRes")
@Resource(name= CommonConstWords.IMPP_REDIS_RES)
private ImppRedis redisRes;
@Autowired
private ICoreMemTreeService memTreeService;
@Autowired
private IPersonnelService personnelService;
/**
@ -117,12 +122,22 @@ public class SysMenuController extends CoreBaseController {
.notNull("menuCode", menu.getMenuCode())
.notNull("name", menu.getName());
SysMenu sysMenu = sysMenuService.getSysMenuById(menu.getId());
ValidatorBean.checkNotNull(sysMenu,"不存在的功能权限信息");
ConvertBean.modelUpdate(menu, getSessionUser());
// 用户自定义输入,方便快速记忆
// menu.setNameZhShortening(StringTool.getAllFirstLetter(menu.getName()));
if (menu.getParentId() == null || menu.getParentId().intValue() == 0) {
menu.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue());
} else {
List<SysMenu> menuList = sysMenuService.findSysMenuAll();
sysMenu = memTreeService.packTreeSysMenuById(menuList,sysMenu.getId());
List<Long> idList = memTreeService.findChildSysMenu(sysMenu);
if(idList.contains(menu.getParentId())){
return ResultBean.fail("父节点不能使用当前的子节点").build();
}
}
if (menu.getMenuSort() == null) {
menu.setMenuSort(0);
}
@ -313,6 +328,7 @@ public class SysMenuController extends CoreBaseController {
* @param multipart
* @return
*/
@Deprecated
@PostMapping("/upload")
@ApiOperation(value = "文件上传", notes = "文件上传")
public ResultBean singleFileUpload(@RequestParam("file") MultipartFile multipart) {

@ -38,7 +38,7 @@ import java.util.List;
**/
@RestController
@RequestMapping("/impp")
@Api(description = "消息管理服务")
@Api(tags = "消息管理服务")
public class SysMessageController extends CoreBaseController {
public static final Logger LOGGER = LoggerFactory.getLogger(SysMessageController.class);

@ -46,7 +46,7 @@ import java.util.List;
* @Modify:
**/
@RestController
@Api(description = "系统单号规则管理服务")
@Api(tags = "系统单号规则管理服务")
@RequestMapping(PlatformConstWords.BASE_URL + "/sys-order-no-rule")
public class SysOrderNoRuleController extends CoreBaseController {

@ -43,7 +43,7 @@ import java.util.List;
* @Modify :
**/
@RestController
@Api(description = "组织")
@Api(tags = "组织")
@RequestMapping(PlatformConstWords.BASE_URL +"/organize")
public class SysOrganizeController extends CoreBaseController{

@ -38,7 +38,7 @@ import java.util.List;
* @Modify :
**/
@RestController
@Api(description = "岗位管理服务")
@Api(tags = "岗位管理服务")
@RequestMapping(PlatformConstWords.BASE_URL + "/position")
public class SysPositionController extends CoreBaseController {
public static final Logger LOGGER = LoggerFactory.getLogger(SysPositionController.class);

@ -37,7 +37,7 @@ import java.util.List;
* @Modify :
**/
@RestController
@Api(description = "系统角色服务")
@Api(tags = "系统角色服务")
@RequestMapping(PlatformConstWords.BASE_URL + "/sys-role")
public class SysRoleController extends CoreBaseController{

@ -45,7 +45,7 @@ import java.util.List;
* @Modify:
**/
@RestController
@Api(description = "任务管理服务")
@Api(tags = "任务管理服务")
@RequestMapping(PlatformConstWords.BASE_URL + "/task")
public class SysTaskController extends CoreBaseController {

@ -46,7 +46,7 @@ import java.util.List;
* @Modify :
**/
@RestController
@Api(description = "任务周期")
@Api(tags = "任务周期")
@RequestMapping(PlatformConstWords.BASE_URL + "/task-cycle")
public class SysTaskCycleController extends CoreBaseController {

@ -43,7 +43,7 @@ import java.util.List;
* @Modify :
**/
@RestController
@Api(description = "任务计划管理服务")
@Api(tags = "任务计划管理服务")
@RequestMapping(PlatformConstWords.BASE_URL + "/task-plan")
public class SysTaskPlanController extends CoreBaseController {

@ -41,7 +41,7 @@ import java.util.List;
* @Modify :
**/
@RestController
@Api(description = "硬件服务")
@Api(tags = "硬件服务")
@RequestMapping(PlatformConstWords.BASE_URL +"/tool")
public class SysToolController extends CoreBaseController{
public static final Logger LOGGER = LoggerFactory.getLogger(SysToolController.class);

@ -34,7 +34,7 @@ import java.util.List;
* @Modify :
**/
@RestController
@Api(description = "硬件类型服务")
@Api(tags = "硬件类型服务")
@RequestMapping(PlatformConstWords.BASE_URL +"/tool-type")
public class SysToolTypeController extends CoreBaseController{
public static final Logger LOGGER = LoggerFactory.getLogger(SysToolTypeController.class);

@ -34,7 +34,7 @@ import java.util.List;
* @Modify :
**/
@RestController
@Api(description = "树服务")
@Api(tags = "树服务")
@RequestMapping(PlatformConstWords.BASE_URL + "/sys-tree")
public class SysTreeController extends CoreBaseController {

@ -39,7 +39,7 @@ import java.util.List;
* @Modify :
**/
@RestController
@Api(description = "系统用户服务")
@Api(tags = "系统用户服务")
@RequestMapping(PlatformConstWords.BASE_URL + "/sys-user")
public class SysUserController extends CoreBaseController{

@ -44,7 +44,7 @@ import java.util.List;
* @Modify :
**/
@RestController
@Api(description = "系统用户服务")
@Api(tags = "系统用户服务")
@RequestMapping(PlatformConstWords.BASE_URL + "/sys-user-info")
public class SysUserInfoController extends CoreBaseController{

@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.*;
**/
@RestController
@RequestMapping(PlatformConstWords.BASE_URL +"/sweb")
@Api(description = "消息管理服务")
@Api(tags = "消息管理服务")
public class SwebMessageController extends CoreBaseController {
@Autowired

@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.*;
**/
@RestController
@RequestMapping(PlatformConstWords.BASE_URL +"/wms")
@Api(description = "消息管理服务")
@Api(tags = "消息管理服务")
public class WMSMessageController extends CoreBaseController {
@Autowired

@ -6,7 +6,6 @@ import cn.estsh.i3plus.platform.common.tool.ClassTool;
import cn.estsh.i3plus.platform.common.tool.StringTool;
import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
import cn.estsh.i3plus.pojo.base.bean.BaseResultBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.model.common.ClassFieldModel;
import cn.estsh.i3plus.pojo.model.common.ClassModel;
@ -17,18 +16,14 @@ import cn.estsh.impp.framework.base.controller.CoreBaseController;
import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.util.ResultBean;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import javax.persistence.Transient;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.List;
@ -37,7 +32,7 @@ import java.util.List;
*/
@RestController
@RequestMapping(PlatformConstWords.BASE_URL + "/cloud/report")
@Api(description = "报表服务")
@Api(tags = "报表服务")
public class CoreReportController extends CoreBaseController {
private static final Logger LOGGER = LoggerFactory.getLogger(CoreReportController.class);
@ -140,14 +135,7 @@ public class CoreReportController extends CoreBaseController {
LOGGER.info("【类信息:{}】", clzNameList);
List<ClassModel> clzList = new ArrayList<>(clzNameList.size());
for (String clzName : clzNameList) {
ClassModel model = getClassModel(clzName);
if (model != null) {
if (StringUtils.isNotBlank(model.getClzFullName())) {
List<ClassFieldModel> list = getClassFieldModel(model.getClzFullName());
model.setFieldList(list);
}
clzList.add(model);
}
ClassModel model = ClassTool.getClassModel(clzName);
}
return ResultBean.success("获取类:" + clzList.size()).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(clzList);
}
@ -161,13 +149,7 @@ public class CoreReportController extends CoreBaseController {
@ApiOperation(value = "查询管理后台所有类", notes = "根据核心包路径列出所有类")
public BaseResultBean<ClassModel> getClzModel(@PathVariable("classPath") String classPath) {
LOGGER.info("【类路径:{}】", pojoPackagePath);
ClassModel model = getClassModel(classPath);
if (model != null) {
if (StringUtils.isNotBlank(model.getClzFullName())) {
List<ClassFieldModel> list = getClassFieldModel(model.getClzFullName());
model.setFieldList(list);
}
}
ClassModel model = ClassTool.getClassModel(classPath);
return ResultBean.success("获取类:" + model.getClzDesc()).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(model);
}
@ -182,7 +164,7 @@ public class CoreReportController extends CoreBaseController {
List<String> clzNameList = ClassTool.getClassName(pojoPackagePath, true);
List<ClassModel> clzList = new ArrayList<>(clzNameList.size());
for (String clzName : clzNameList) {
clzList.add(getClassModel(clzName));
clzList.add(ClassTool.getClassModel(clzName));
}
return ResultBean.success("获取类:" + clzList.size())
@ -199,78 +181,12 @@ public class CoreReportController extends CoreBaseController {
@ApiOperation(value = "查询类所有属性")
public ResultBean<ClassFieldModel> testWms(@RequestParam("clzFullName") String clzFullName) {
LOGGER.info("【查询类属性:{}】", clzFullName);
List<ClassFieldModel> fieldModelList = getClassFieldModel(clzFullName);
List<ClassFieldModel> fieldModelList = ClassTool.getClassFieldModel(clzFullName);
return ResultBean.success("获取属性:" + fieldModelList.size())
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultList(fieldModelList);
}
/**
*
* @param clzName
* @return
*/
private ClassModel getClassModel(String clzName) {
try {
LOGGER.info("【获取类信息:{}】", clzName);
//注册类
Class tmpClz = Class.forName(clzName);
ClassModel classModel = new ClassModel();
classModel.setServerId(CommonEnumUtil.SOFT_TYPE.CORE.getValue());
classModel.setServerName(CommonEnumUtil.SOFT_TYPE.CORE.getCode());
classModel.setPackageName(pojoPackagePath);
classModel.setClzFullName(clzName);
classModel.setClzSimpleName(tmpClz.getSimpleName());
Api api = ( Api ) tmpClz.getAnnotation(Api.class);
if (api != null) {
classModel.setClzDesc(api.value());
return classModel;
} else {
LOGGER.warn("不添加类:{},因为没有添加api描述", tmpClz);
}
} catch (ClassNotFoundException e) {
LOGGER.error("【类:{}注册出错】", clzName, clzName, e);
}
return null;
}
/**
*
* @param clzFullName
* @return
*/
private List<ClassFieldModel> getClassFieldModel(String clzFullName) {
List<ClassFieldModel> fieldModelList = new ArrayList<>();
try {
Class tmpClz = Class.forName(clzFullName);
List<Field> fields = ClassTool.getAllFieldsList(tmpClz);
ClassFieldModel fieldModel = null;
ApiParam apiParam;
Transient tran;
for (Field f : fields) {
tran = f.getAnnotation(Transient.class);
if (tran == null && !"serialVersionUID".equals(f.getName())) {
// 临时对象不需要处理
fieldModel = new ClassFieldModel();
fieldModel.setPackageName(pojoPackagePath);
fieldModel.setClzFullName(clzFullName);
fieldModel.setClzSimpleName(tmpClz.getSimpleName());
fieldModel.setFieldName(f.getName());
apiParam = f.getAnnotation(ApiParam.class);
if (apiParam != null) {
fieldModel.setFieldDesc(apiParam.value());
}
fieldModelList.add(fieldModel);
} else {
LOGGER.info("【临时属性:{}】", f.getName());
}
}
} catch (ClassNotFoundException e) {
LOGGER.error("【类:{}实例化出错】", clzFullName, e);
}
return fieldModelList;
}
}

@ -0,0 +1,111 @@
package cn.estsh.i3plus.core.apiservice.controller.report;
import cn.estsh.i3plus.core.api.iservice.base.IReportService;
import cn.estsh.i3plus.icloud.core.sdk.ICoreReportPojoCloud;
import cn.estsh.i3plus.platform.common.tool.ClassTool;
import cn.estsh.i3plus.platform.common.util.CommonConstWords;
import cn.estsh.i3plus.pojo.base.bean.BaseResultBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.model.common.ClassModel;
import cn.estsh.i3plus.pojo.model.report.BrDataSourceModel;
import cn.estsh.i3plus.pojo.model.report.TemplateModel;
import cn.estsh.impp.framework.boot.util.ResultBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @CreateDate : 19-12-5 5:25
* @Modify:
**/
@RestController
@Api(tags = "Cloud 报表服务")
@RequestMapping(CommonConstWords.BASE_URL_CORE + "/cloud/report-pojo")
public class ReportPojoCloudController {
private static final Logger LOGGER = LoggerFactory.getLogger(ReportPojoCloudController.class);
@Value("${impp.app.pojo-packages}.bean")
private String pojoPackagePath;
@Autowired
private IReportService reportService;
@PostMapping(value = "/find-data-source")
@ApiOperation(value = "数据源列表", notes = "获取服务的数据源列表")
public BaseResultBean<BrDataSourceModel> findDataSource() {
return ResultBean.success("操作成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultList(Arrays.asList(BrDataSourceModel.DEFAULT_DATA_SOURCE));
}
@PostMapping(value = "/find-pojo-detail")
@ApiOperation(value = "获取对象列表", notes = "获取对象列表包含对象属性信息")
public BaseResultBean<ClassModel> findCloudPojoDetail(@RequestBody BrDataSourceModel model) {
LOGGER.info("【类路径:{}】", pojoPackagePath);
List<String> clzNameList = ClassTool.getClassName(pojoPackagePath, true);
LOGGER.info("【类信息:{}】", clzNameList);
List<ClassModel> clzList = new ArrayList<>(clzNameList.size());
for (String clzName : clzNameList) {
ClassModel classModel = ClassTool.getClassModel(clzName, CommonEnumUtil.SOFT_TYPE.REPORT);
if (classModel != null) {
clzList.add(classModel);
}
}
return ResultBean.success("获取类:" + clzList.size()).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(clzList);
}
/**
*
*
* @param model
* @return
*/
@PostMapping(value = "/hql/run")
@ApiOperation(value = "查询管理后台所有类", notes = "根据核心包路径列出所有类")
public BaseResultBean runHql(@RequestBody TemplateModel model) {
LOGGER.info("【执行 HQL】TemplateModel{}", model);
try {
List result = reportService.selectTemplateModel(model);
return ResultBean.success("操作成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultList(result);
} catch (Exception e) {
return ResultBean.fail("操作失败").setMsg(e.getMessage()).setErrorMsg(e.getLocalizedMessage());
}
}
/**
*
*
* @param model
* @return
*/
@PostMapping(value = "/hql/run-count")
@ApiOperation(value = "查询管理后台所有类", notes = "根据核心包路径列出所有类")
public BaseResultBean runHqlCount(@RequestBody TemplateModel model) {
LOGGER.info("【执行 HQL】TemplateModel{}", model);
try {
Long count = reportService.countTemplateModel(model);
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(count);
} catch (Exception e) {
return ResultBean.fail("操作失败").setMsg(e.getMessage()).setErrorMsg(e.getLocalizedMessage());
}
}
}

@ -1,6 +1,7 @@
package cn.estsh.i3plus.core.apiservice.dao;
import java.util.List;
import java.util.Map;
/**
* @Description :
@ -14,11 +15,11 @@ public interface IReportDao {
/**
*
* @param hql hql
* @param paramName
* @param paramValue
* @return
* @throws Exception
*/
List<Object[]> findByHqlObjects(String hql, String[] paramName, Object[] paramValue) throws Exception;
List<Object[]> findByHqlObjects(String hql, Map<String,Object> findParam) throws Exception;
Long findByHqlCount(String hql, Map<String,Object> findParam) throws Exception;
}

@ -5,10 +5,12 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import javax.persistence.EntityManager;
import javax.persistence.Query;
import java.util.List;
import java.util.Map;
/**
* @Description :
@ -26,17 +28,28 @@ public class ReportDaoImpl implements IReportDao {
private EntityManager entityManager;
@Override
public List<Object[]> findByHqlObjects(String hql, String[] paramName, Object[] paramValue) throws Exception {
LOGGER.info(" find HQL:{} paramName:{} paramValue:{}", hql, paramName, paramValue);
public List<Object[]> findByHqlObjects(String hql, Map<String,Object> findParam) throws Exception {
LOGGER.info(" find HQL:{} \n find params :{}", hql, findParam);
Query queryObject = entityManager.createQuery(hql);
if(paramName != null && paramValue != null){
for (int i = 0; i < paramName.length; i++) {
if (paramValue[i] != null) {
queryObject.setParameter(paramName[i], paramValue[i].toString());
}
}
if(CollectionUtils.isEmpty(findParam)){
findParam.forEach((K, V) -> queryObject.setParameter(K, V));
}
entityManager.clear();
return queryObject.getResultList();
}
@Override
public Long findByHqlCount(String hql, Map<String, Object> findParam) throws Exception {
LOGGER.info(" find HQL:{} \n find params :{}", hql, findParam);
Query queryObject = entityManager.createQuery(hql);
if(CollectionUtils.isEmpty(findParam)){
findParam.forEach((K, V) -> queryObject.setParameter(K, V));
}
entityManager.clear();
return (Long)queryObject.getSingleResult();
}
}

@ -4,7 +4,6 @@ import cn.estsh.i3plus.core.api.iservice.base.IReportService;
import cn.estsh.i3plus.core.apiservice.dao.IReportDao;
import cn.estsh.i3plus.pojo.base.tool.HqlPack;
import cn.estsh.i3plus.pojo.model.report.TemplateModel;
import org.hibernate.QueryException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@ -36,8 +35,14 @@ public class ReportService implements IReportService {
}
@Override
public Long countTemplateModel(TemplateModel model) throws Exception {
LOGGER.info("报表执行 model :{}",model);
return reportDao.findByHqlCount(model.getCountHql(), model.getFindParam());
}
@Override
public List selectTemplateModel(TemplateModel model) throws Exception{
LOGGER.info("报表执行 model :{}",model);
return reportDao.findByHqlObjects(model.getHql(), model.getParamName(), model.getParamValue());
return reportDao.findByHqlObjects(model.getSelectHql(), model.getFindParam());
}
}

@ -165,7 +165,8 @@ public class SystemInitService implements ISystemInitService {
lanMap.put(res.getLanguageCode(), res.getResourceValue());
// web 资源
if(res.getResourceType() == CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.WEB.getValue()) {
if(res.getResourceType() == CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.WEB.getValue()
||res.getResourceType() == CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.MENU.getValue()) {
// web 资源
if (!webLangMap.containsKey(res.getLanguageCode())) {
webLangMap.put(res.getLanguageCode(), new HashMap<>());

@ -190,7 +190,7 @@ public class SysMenuService implements ISysMenuService {
public List<SysMenu> refreshSysMenu(List<SysMenu> list) {
LOGGER.info("系统功能 SYS_MENU list :{}", list);
sysMenuRDao.deleteAll();
// sysMenuRDao.deleteAll();
return sysMenuRDao.saveAll(list);
}

Loading…
Cancel
Save