diff --git a/docs/jsh_erp.sql b/docs/jsh_erp.sql index b56bdc92..672a44c2 100644 --- a/docs/jsh_erp.sql +++ b/docs/jsh_erp.sql @@ -189,44 +189,6 @@ INSERT INTO `jsh_accountitem` VALUES ('95', '94', '13', null, '-66.000000', '', INSERT INTO `jsh_accountitem` VALUES ('96', '95', '13', null, '6.000000', '', '1', '0'); INSERT INTO `jsh_accountitem` VALUES ('97', '96', null, '14', '22.000000', '', null, '0'); --- ---------------------------- --- Table structure for jsh_app --- ---------------------------- -DROP TABLE IF EXISTS `jsh_app`; -CREATE TABLE `jsh_app` ( - `Id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键', - `Number` varchar(50) DEFAULT NULL COMMENT '编号', - `Name` varchar(50) DEFAULT NULL COMMENT '名称', - `Type` varchar(50) DEFAULT NULL COMMENT '类型', - `Icon` varchar(50) DEFAULT NULL COMMENT '图标', - `URL` varchar(50) DEFAULT NULL COMMENT '编号', - `Width` varchar(50) DEFAULT NULL COMMENT '宽度', - `Height` varchar(50) DEFAULT NULL COMMENT '高度', - `ReSize` bit(1) DEFAULT NULL COMMENT '是否可改变大小', - `OpenMax` bit(1) DEFAULT NULL COMMENT '最大化', - `Flash` bit(1) DEFAULT NULL COMMENT '是否切换', - `ZL` varchar(50) DEFAULT NULL COMMENT '类型', - `Sort` varchar(50) DEFAULT NULL COMMENT '排序', - `Remark` varchar(200) DEFAULT NULL COMMENT '备注', - `Enabled` bit(1) DEFAULT NULL COMMENT '是否启用', - `delete_Flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除', - PRIMARY KEY (`Id`) -) ENGINE=InnoDB AUTO_INCREMENT=29 DEFAULT CHARSET=utf8 COMMENT='应用表'; - --- ---------------------------- --- Records of jsh_app --- ---------------------------- -INSERT INTO `jsh_app` VALUES ('3', '00', '系统管理', 'app', '0000000004.png', '', '1350', '630', '', '\0', '\0', 'desk', '198', '', '', '0'); -INSERT INTO `jsh_app` VALUES ('6', '02', '个人信息', 'app', '0000000005.png', '../user/password.html', '600', '400', '\0', '\0', '\0', 'dock', '200', '', '', '0'); -INSERT INTO `jsh_app` VALUES ('7', '01', '基础数据', 'app', '0000000006.png', '', '1350', '630', '', '\0', '\0', 'desk', '120', '', '', '0'); -INSERT INTO `jsh_app` VALUES ('22', '03', '报表查询', 'app', '0000000022.png', '', '1350', '630', '', '\0', '\0', 'desk', '115', '', '', '0'); -INSERT INTO `jsh_app` VALUES ('23', '04', '零售管理', 'app', 'resizeApi.png', '', '1350', '630', '', '\0', '', 'desk', '025', '', '', '0'); -INSERT INTO `jsh_app` VALUES ('24', '05', '采购管理', 'app', 'buy.png', '', '1350', '630', '', '\0', '', 'desk', '027', '', '', '0'); -INSERT INTO `jsh_app` VALUES ('25', '06', '销售管理', 'app', 'sale.png', '', '1350', '630', '', '\0', '', 'desk', '028', '', '', '0'); -INSERT INTO `jsh_app` VALUES ('26', '07', '财务管理', 'app', 'money.png', '', '1350', '630', '', '\0', '\0', 'desk', '035', '', '', '0'); -INSERT INTO `jsh_app` VALUES ('27', '08', '仓库管理', 'app', 'depot.png', '', '1350', '630', '', '\0', '', 'desk', '029', '', '', '0'); -INSERT INTO `jsh_app` VALUES ('28', '09', '新手引导', 'app', 'userHelp.png', '../user/userHelp.html', '1000', '500', '\0', '\0', '\0', 'dock', '210', '', '', '0'); - -- ---------------------------- -- Table structure for jsh_depot -- ---------------------------- @@ -677,7 +639,6 @@ CREATE TABLE `jsh_functions` ( -- Records of jsh_functions -- ---------------------------- INSERT INTO `jsh_functions` VALUES ('1', '0001', '系统管理', '0', '', '', '0910', '', '电脑版', '', 'icon-settings', '0'); -INSERT INTO `jsh_functions` VALUES ('12', '000101', '应用管理', '0001', '/pages/manage/app.html', '\0', '0132', '', '电脑版', '', 'icon-notebook', '0'); INSERT INTO `jsh_functions` VALUES ('13', '000102', '角色管理', '0001', '/pages/manage/role.html', '\0', '0130', '', '电脑版', '', 'icon-notebook', '0'); INSERT INTO `jsh_functions` VALUES ('14', '000103', '用户管理', '0001', '/pages/manage/user.html', '\0', '0140', '', '电脑版', null, 'icon-notebook', '0'); INSERT INTO `jsh_functions` VALUES ('15', '000104', '日志管理', '0001', '/pages/manage/log.html', '\0', '0160', '', '电脑版', null, 'icon-notebook', '0'); @@ -1797,14 +1758,9 @@ CREATE TABLE `jsh_userbusiness` ( -- ---------------------------- -- Records of jsh_userbusiness -- ---------------------------- -INSERT INTO `jsh_userbusiness` VALUES ('1', 'RoleAPP', '4', '[3][6][7][22][23][24][25][26][27][28]', null, '0'); -INSERT INTO `jsh_userbusiness` VALUES ('2', 'RoleAPP', '5', '[8][7][6]', null, '0'); -INSERT INTO `jsh_userbusiness` VALUES ('3', 'RoleAPP', '6', '[23][24][25][27][26][22][7][3][6]', null, '0'); -INSERT INTO `jsh_userbusiness` VALUES ('4', 'RoleAPP', '7', '[21][1][8][11]', null, '0'); INSERT INTO `jsh_userbusiness` VALUES ('5', 'RoleFunctions', '4', '[245][13][12][16][243][14][15][234][236][22][23][220][240][25][217][218][26][194][195][31][59][207][208][209][226][227][228][229][235][237][244][210][211][241][33][199][242][41][200][201][202][40][232][233][197][203][204][205][206][212][246]', '[{\"funId\":\"25\",\"btnStr\":\"1\"},{\"funId\":\"217\",\"btnStr\":\"1\"},{\"funId\":\"218\",\"btnStr\":\"1\"},{\"funId\":\"241\",\"btnStr\":\"3\"},{\"funId\":\"242\",\"btnStr\":\"3\"}]', '0'); INSERT INTO `jsh_userbusiness` VALUES ('6', 'RoleFunctions', '5', '[22][23][25][26][194][195][31][33][200][201][41][199][202]', null, '0'); INSERT INTO `jsh_userbusiness` VALUES ('7', 'RoleFunctions', '6', '[22][23][220][240][25][217][218][26][194][195][31][59][207][208][209][226][227][228][229][235][237][210][211][241][33][199][242][41][200][201][202][40][232][233][197][203][204][205][206][212]', '[{\"funId\":\"33\",\"btnStr\":\"4\"}]', '0'); -INSERT INTO `jsh_userbusiness` VALUES ('8', 'RoleAPP', '8', '[21][1][8][11][10]', null, '0'); INSERT INTO `jsh_userbusiness` VALUES ('9', 'RoleFunctions', '7', '[168][13][12][16][14][15][189][18][19][132]', null, '0'); INSERT INTO `jsh_userbusiness` VALUES ('10', 'RoleFunctions', '8', '[168][13][12][16][14][15][189][18][19][132][22][23][25][26][27][157][158][155][156][125][31][127][126][128][33][34][35][36][37][39][40][41][42][43][46][47][48][49][50][51][52][53][54][55][56][57][192][59][60][61][62][63][65][66][68][69][70][71][73][74][76][77][79][191][81][82][83][85][89][161][86][176][165][160][28][134][91][92][29][94][95][97][104][99][100][101][102][105][107][108][110][111][113][114][116][117][118][120][121][131][135][123][122][20][130][146][147][138][148][149][153][140][145][184][152][143][170][171][169][166][167][163][164][172][173][179][178][181][182][183][186][187]', null, '0'); INSERT INTO `jsh_userbusiness` VALUES ('11', 'RoleFunctions', '9', '[168][13][12][16][14][15][189][18][19][132][22][23][25][26][27][157][158][155][156][125][31][127][126][128][33][34][35][36][37][39][40][41][42][43][46][47][48][49][50][51][52][53][54][55][56][57][192][59][60][61][62][63][65][66][68][69][70][71][73][74][76][77][79][191][81][82][83][85][89][161][86][176][165][160][28][134][91][92][29][94][95][97][104][99][100][101][102][105][107][108][110][111][113][114][116][117][118][120][121][131][135][123][122][20][130][146][147][138][148][149][153][140][145][184][152][143][170][171][169][166][167][163][164][172][173][179][178][181][182][183][186][187][188]', null, '0'); @@ -1826,7 +1782,6 @@ INSERT INTO `jsh_userbusiness` VALUES ('27', 'UserCustomer', '63', '[58]', null, INSERT INTO `jsh_userbusiness` VALUES ('28', 'UserDepot', '96', '[7]', null, '0'); INSERT INTO `jsh_userbusiness` VALUES ('29', 'UserRole', '96', '[6]', null, '0'); INSERT INTO `jsh_userbusiness` VALUES ('30', 'UserRole', '113', '[10]', null, '0'); -INSERT INTO `jsh_userbusiness` VALUES ('31', 'RoleAPP', '10', '[3][6][7][22][23][24][25][26][27][28]', null, '0'); INSERT INTO `jsh_userbusiness` VALUES ('32', 'RoleFunctions', '10', '[245][13][243][14][15][234][22][23][220][240][25][217][218][26][194][195][31][59][207][208][209][226][227][228][229][235][237][244][210][211][241][33][199][242][41][200][201][202][40][232][233][197][203][204][205][206][212][246]', '[{\"funId\":\"25\",\"btnStr\":\"1\"},{\"funId\":\"217\",\"btnStr\":\"1\"},{\"funId\":\"218\",\"btnStr\":\"1\"},{\"funId\":\"241\",\"btnStr\":\"3\"},{\"funId\":\"242\",\"btnStr\":\"3\"}]', '0'); INSERT INTO `jsh_userbusiness` VALUES ('34', 'UserRole', '115', '[10]', null, '0'); INSERT INTO `jsh_userbusiness` VALUES ('35', 'UserRole', '117', '[10]', null, '0'); @@ -1837,13 +1792,9 @@ INSERT INTO `jsh_userbusiness` VALUES ('39', 'UserDepot', '120', '[7][8][9][10][ INSERT INTO `jsh_userbusiness` VALUES ('40', 'UserCustomer', '120', '[52][48][6][5][2]', null, '0'); INSERT INTO `jsh_userbusiness` VALUES ('41', 'RoleFunctions', '12', '', null, '0'); INSERT INTO `jsh_userbusiness` VALUES ('48', 'RoleFunctions', '13', '[59][207][208][209][226][227][228][229][235][237][210][211][241][33][199][242][41][200]', null, '0'); -INSERT INTO `jsh_userbusiness` VALUES ('49', 'RoleAPP', '13', '[22][23][24][25]', null, '0'); -INSERT INTO `jsh_userbusiness` VALUES ('50', 'RoleAPP', '64', '[3]', null, '0'); INSERT INTO `jsh_userbusiness` VALUES ('51', 'UserRole', '74', '[10]', null, '0'); INSERT INTO `jsh_userbusiness` VALUES ('52', 'UserDepot', '121', '[13]', null, '0'); -INSERT INTO `jsh_userbusiness` VALUES ('53', 'RoleAPP', '121', '[3]', null, '0'); INSERT INTO `jsh_userbusiness` VALUES ('54', 'UserDepot', '115', '[13]', null, '0'); -INSERT INTO `jsh_userbusiness` VALUES ('55', 'RoleAPP', '115', '[3]', null, '0'); INSERT INTO `jsh_userbusiness` VALUES ('56', 'UserCustomer', '115', '[56]', null, '0'); INSERT INTO `jsh_userbusiness` VALUES ('57', 'UserCustomer', '121', '[56]', null, '0'); INSERT INTO `jsh_userbusiness` VALUES ('58', 'UserRole', '121', '[15]', null, '0'); diff --git a/docs/华夏ERP数据库设计汇总.xlsx b/docs/华夏ERP数据库设计汇总.xlsx index fa716f7d..2c7686ac 100644 Binary files a/docs/华夏ERP数据库设计汇总.xlsx and b/docs/华夏ERP数据库设计汇总.xlsx differ diff --git a/docs/数据库更新记录-方便升级.txt b/docs/数据库更新记录-方便升级.txt index ddeb1b5a..5dc2b0e9 100644 --- a/docs/数据库更新记录-方便升级.txt +++ b/docs/数据库更新记录-方便升级.txt @@ -662,3 +662,11 @@ COMMENT='消息表' AUTO_INCREMENT=2 ROW_FORMAT=COMPACT ; + +-- ---------------------------- +-- 时间：2019年9月13日 +-- 删除表 jsh_app databasechangelog databasechangeloglock +-- ---------------------------- +drop table databasechangelog; +drop table databasechangeloglock; +drop table jsh_app; \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/controller/AppController.java b/src/main/java/com/jsh/erp/controller/AppController.java deleted file mode 100644 index 2c114110..00000000 --- a/src/main/java/com/jsh/erp/controller/AppController.java +++ /dev/null @@ -1,273 +0,0 @@ -package com.jsh.erp.controller; - -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import com.jsh.erp.constants.ExceptionConstants; -import com.jsh.erp.datasource.entities.App; -import com.jsh.erp.datasource.entities.User; -import com.jsh.erp.datasource.entities.UserBusiness; -import com.jsh.erp.exception.BusinessRunTimeException; -import com.jsh.erp.service.app.AppService; -import com.jsh.erp.service.userBusiness.UserBusinessService; -import com.jsh.erp.utils.BaseResponseInfo; -import com.jsh.erp.utils.FileUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import java.io.*; -import java.util.ArrayList; -import java.util.List; -import java.util.Properties; - -/** - * @author ji_sheng_hua 752*718*920 - */ -@RestController -@RequestMapping(value = "/app") -public class AppController { - private Logger logger = LoggerFactory.getLogger(AppController.class); - - @Resource - private AppService appService; - - @Resource - private UserBusinessService userBusinessService; - - /** - * 根据用户查询有权限的app - * @param userId - * @param request - * @return - */ - @GetMapping(value = "/findAppByUserId") - public JSONObject findAppByUserId(@RequestParam("userId") String userId, HttpServletRequest request)throws Exception { - List roleList = userBusinessService.findRoleByUserId(userId); - String roles = null; - if(roleList!=null && roleList.size()>0 && roleList.get(0)!=null){ - roles = roleList.get(0).getValue(); - } - if(roles!=null) { - roles = roles.replaceAll("\\]\\[",",").replaceAll("\\]","").replaceAll("\\[",""); //转为逗号隔开的 - } - List appList = userBusinessService.findAppByRoles(roles); - String apps = null; - if(appList!=null && appList.size()>0 && appList.get(0)!=null){ - apps = appList.get(0).getValue(); - } - if(apps!=null) { - apps = apps.replaceAll("\\]\\[",",").replaceAll("\\]","").replaceAll("\\[",""); //转为逗号隔开的 - } - JSONObject obj = new JSONObject(); - List dockList = appService.findAppInIds(apps,"dock"); - JSONArray dockArray = new JSONArray(); - if (null != dockList) { - for (App app : dockList) { - JSONObject item = new JSONObject(); - item.put("id", app.getId()); - item.put("title", app.getName()); - item.put("type", app.getType()); - item.put("icon", "../../upload/images/deskIcon/" + app.getIcon()); - item.put("url", app.getUrl()); - item.put("width", app.getWidth()); - item.put("height", app.getHeight()); - item.put("isresize", app.getResize()); - item.put("isopenmax", app.getOpenmax()); - item.put("isflash", app.getFlash()); - dockArray.add(item); - } - } - obj.put("dock",dockArray); - - List deskList = appService.findAppInIds(apps,"desk"); - JSONArray deskArray = new JSONArray(); - if (null != deskList) { - for (App app : deskList) { - JSONObject item = new JSONObject(); - item.put("id", app.getId()); - item.put("title", app.getName()); - item.put("type", app.getType()); - item.put("icon", "../../upload/images/deskIcon/" + app.getIcon()); - item.put("url", "../../pages/common/menu.html?appID=" + app.getNumber() + "&id=" + app.getId()); - item.put("width", app.getWidth()); - item.put("height", app.getHeight()); - item.put("isresize", app.getResize()); - item.put("isopenmax", app.getOpenmax()); - item.put("isflash", app.getFlash()); - deskArray.add(item); - } - } - obj.put("desk",deskArray); - return obj; - } - - @GetMapping(value = "/findDesk") - public JSONObject findDesk(HttpServletRequest request)throws Exception { - JSONObject obj = new JSONObject(); - List dockList = appService.findDock(); - JSONArray dockArray = new JSONArray(); - if (null != dockList) { - for (App app : dockList) { - JSONObject item = new JSONObject(); - item.put("id", app.getId()); - item.put("title", app.getName()); - item.put("type", app.getType()); - item.put("icon", "../../upload/images/deskIcon/" + app.getIcon()); - item.put("url", app.getUrl()); - item.put("width", app.getWidth()); - item.put("height", app.getHeight()); - item.put("isresize", app.getResize()); - item.put("isopenmax", app.getOpenmax()); - item.put("isflash", app.getFlash()); - dockArray.add(item); - } - } - obj.put("dock",dockArray); - - List deskList = appService.findDesk(); - JSONArray deskArray = new JSONArray(); - if (null != deskList) { - for (App app : deskList) { - JSONObject item = new JSONObject(); - item.put("id", app.getId()); - item.put("title", app.getName()); - item.put("type", app.getType()); - item.put("icon", "../../upload/images/deskIcon/" + app.getIcon()); - item.put("url", "../../pages/common/menu.html?appID=" + app.getNumber() + "&id=" + app.getId()); - item.put("width", app.getWidth()); - item.put("height", app.getHeight()); - item.put("isresize", app.getResize()); - item.put("isopenmax", app.getOpenmax()); - item.put("isflash", app.getFlash()); - deskArray.add(item); - } - } - obj.put("desk",deskArray); - return obj; - } - - /** - * 角色对应应用显示 - * @param request - * @return - */ - @PostMapping(value = "/findRoleAPP") - public JSONArray findRoleAPP(@RequestParam("UBType") String type, @RequestParam("UBKeyId") String keyId, - HttpServletRequest request)throws Exception { - JSONArray arr = new JSONArray(); - try { - List dataListApp = appService.findRoleAPP(); - //开始拼接json数据 - JSONObject outer = new JSONObject(); - outer.put("id", 1); - outer.put("text", "应用列表"); - outer.put("state", "open"); - //存放数据json数组 - JSONArray dataArray = new JSONArray(); - if (null != dataListApp) { - //根据条件从列表里面移除"系统管理" - List dataList = new ArrayList(); - for (App appOne : dataListApp) { - //从session中获取租户id - String loginName = null; - Object userInfo = request.getSession().getAttribute("user"); - if(userInfo != null) { - User user = (User) userInfo; - loginName = user.getLoginame(); - } - if(("admin").equals(loginName)) { - dataList.add(appOne); - } else { - if(!("系统管理").equals(appOne.getName())) { - dataList.add(appOne); - } - } - } - - //筛选应用列表 - for (App app : dataList) { - JSONObject item = new JSONObject(); - item.put("id", app.getId()); - item.put("text", app.getName()); - //勾选判断1 - Boolean flag = false; - try { - flag = userBusinessService.checkIsUserBusinessExist(type, keyId, "[" + app.getId().toString() + "]"); - } catch (Exception e) { - logger.error(">>>>>>>>>>>>>>>>>设置角色对应的应用：类型" + type + " KeyId为： " + keyId + " 存在异常！"); - } - if (flag == true) { - item.put("checked", true); - } - //结束 - dataArray.add(item); - } - } - outer.put("children", dataArray); - arr.add(outer); - } catch (Exception e) { - e.printStackTrace(); - } - return arr; - } - - /** - * 上传图片 - * @param fileInfo - * @param request - */ - @PostMapping(value = "/uploadImg") - public BaseResponseInfo uploadImg(MultipartFile fileInfo, @RequestParam("fileInfoName") String fileName, - HttpServletRequest request)throws Exception { - BaseResponseInfo res = new BaseResponseInfo(); - try { - if (fileInfo != null) { - String basePath = request.getSession().getServletContext().getRealPath("/"); //默认windows文件路径，linux环境下生成的目录与项目同级，而不是下级 - String path = basePath + "upload/images/deskIcon/"; //windows环境下的路径 - Properties pro = System.getProperties(); - String osName = pro.getProperty("os.name");//获得当前操作系统的名称 - if("Linux".equals(osName) || "linux".equals(osName) || "LINUX".equals(osName)){ - path = basePath + "/upload/images/deskIcon/"; //linux环境下的路径 - } - FileUtils.SaveFileFromInputStream(fileInfo.getInputStream(), path, fileName); - res.code = 200; - res.data = "上传图片成功"; - } - } catch (FileNotFoundException e) { - e.printStackTrace(); - res.code = 500; - res.data = "获取图片失败"; - } catch (IOException e) { - e.printStackTrace(); - res.code = 500; - res.data = "上传图片失败"; - } - return res; - } - /** - * create by: qiankunpingtai - * website：https://qiankunpingtai.cn - * description: - * 批量删除应用信息 - * create time: 2019/3/29 11:15 - * @Param: ids - * @return java.lang.Object - */ - @RequestMapping(value = "/batchDeleteAppByIds") - public Object batchDeleteAppByIds(@RequestParam("ids") String ids) throws Exception { - - JSONObject result = ExceptionConstants.standardSuccess(); - int i= appService.batchDeleteAppByIds(ids); - if(i<1){ - logger.error("异常码[{}],异常提示[{}],参数,ids[{}]", - ExceptionConstants.APP_DELETE_FAILED_CODE,ExceptionConstants.APP_DELETE_FAILED_MSG,ids); - throw new BusinessRunTimeException(ExceptionConstants.APP_DELETE_FAILED_CODE, - ExceptionConstants.APP_DELETE_FAILED_MSG); - } - return result; - } -} diff --git a/src/main/java/com/jsh/erp/datasource/entities/App.java b/src/main/java/com/jsh/erp/datasource/entities/App.java deleted file mode 100644 index c5d30bf6..00000000 --- a/src/main/java/com/jsh/erp/datasource/entities/App.java +++ /dev/null @@ -1,515 +0,0 @@ -package com.jsh.erp.datasource.entities; - -public class App { - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_app.Id - * - * @mbggenerated - */ - private Long id; - - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_app.Number - * - * @mbggenerated - */ - private String number; - - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_app.Name - * - * @mbggenerated - */ - private String name; - - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_app.Type - * - * @mbggenerated - */ - private String type; - - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_app.Icon - * - * @mbggenerated - */ - private String icon; - - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_app.URL - * - * @mbggenerated - */ - private String url; - - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_app.Width - * - * @mbggenerated - */ - private String width; - - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_app.Height - * - * @mbggenerated - */ - private String height; - - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_app.ReSize - * - * @mbggenerated - */ - private Boolean resize; - - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_app.OpenMax - * - * @mbggenerated - */ - private Boolean openmax; - - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_app.Flash - * - * @mbggenerated - */ - private Boolean flash; - - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_app.ZL - * - * @mbggenerated - */ - private String zl; - - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_app.Sort - * - * @mbggenerated - */ - private String sort; - - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_app.Remark - * - * @mbggenerated - */ - private String remark; - - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_app.Enabled - * - * @mbggenerated - */ - private Boolean enabled; - - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_app.delete_Flag - * - * @mbggenerated - */ - private String deleteFlag; - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_app.Id - * - * @return the value of jsh_app.Id - * - * @mbggenerated - */ - public Long getId() { - return id; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_app.Id - * - * @param id the value for jsh_app.Id - * - * @mbggenerated - */ - public void setId(Long id) { - this.id = id; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_app.Number - * - * @return the value of jsh_app.Number - * - * @mbggenerated - */ - public String getNumber() { - return number; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_app.Number - * - * @param number the value for jsh_app.Number - * - * @mbggenerated - */ - public void setNumber(String number) { - this.number = number == null ? null : number.trim(); - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_app.Name - * - * @return the value of jsh_app.Name - * - * @mbggenerated - */ - public String getName() { - return name; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_app.Name - * - * @param name the value for jsh_app.Name - * - * @mbggenerated - */ - public void setName(String name) { - this.name = name == null ? null : name.trim(); - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_app.Type - * - * @return the value of jsh_app.Type - * - * @mbggenerated - */ - public String getType() { - return type; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_app.Type - * - * @param type the value for jsh_app.Type - * - * @mbggenerated - */ - public void setType(String type) { - this.type = type == null ? null : type.trim(); - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_app.Icon - * - * @return the value of jsh_app.Icon - * - * @mbggenerated - */ - public String getIcon() { - return icon; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_app.Icon - * - * @param icon the value for jsh_app.Icon - * - * @mbggenerated - */ - public void setIcon(String icon) { - this.icon = icon == null ? null : icon.trim(); - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_app.URL - * - * @return the value of jsh_app.URL - * - * @mbggenerated - */ - public String getUrl() { - return url; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_app.URL - * - * @param url the value for jsh_app.URL - * - * @mbggenerated - */ - public void setUrl(String url) { - this.url = url == null ? null : url.trim(); - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_app.Width - * - * @return the value of jsh_app.Width - * - * @mbggenerated - */ - public String getWidth() { - return width; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_app.Width - * - * @param width the value for jsh_app.Width - * - * @mbggenerated - */ - public void setWidth(String width) { - this.width = width == null ? null : width.trim(); - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_app.Height - * - * @return the value of jsh_app.Height - * - * @mbggenerated - */ - public String getHeight() { - return height; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_app.Height - * - * @param height the value for jsh_app.Height - * - * @mbggenerated - */ - public void setHeight(String height) { - this.height = height == null ? null : height.trim(); - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_app.ReSize - * - * @return the value of jsh_app.ReSize - * - * @mbggenerated - */ - public Boolean getResize() { - return resize; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_app.ReSize - * - * @param resize the value for jsh_app.ReSize - * - * @mbggenerated - */ - public void setResize(Boolean resize) { - this.resize = resize; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_app.OpenMax - * - * @return the value of jsh_app.OpenMax - * - * @mbggenerated - */ - public Boolean getOpenmax() { - return openmax; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_app.OpenMax - * - * @param openmax the value for jsh_app.OpenMax - * - * @mbggenerated - */ - public void setOpenmax(Boolean openmax) { - this.openmax = openmax; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_app.Flash - * - * @return the value of jsh_app.Flash - * - * @mbggenerated - */ - public Boolean getFlash() { - return flash; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_app.Flash - * - * @param flash the value for jsh_app.Flash - * - * @mbggenerated - */ - public void setFlash(Boolean flash) { - this.flash = flash; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_app.ZL - * - * @return the value of jsh_app.ZL - * - * @mbggenerated - */ - public String getZl() { - return zl; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_app.ZL - * - * @param zl the value for jsh_app.ZL - * - * @mbggenerated - */ - public void setZl(String zl) { - this.zl = zl == null ? null : zl.trim(); - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_app.Sort - * - * @return the value of jsh_app.Sort - * - * @mbggenerated - */ - public String getSort() { - return sort; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_app.Sort - * - * @param sort the value for jsh_app.Sort - * - * @mbggenerated - */ - public void setSort(String sort) { - this.sort = sort == null ? null : sort.trim(); - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_app.Remark - * - * @return the value of jsh_app.Remark - * - * @mbggenerated - */ - public String getRemark() { - return remark; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_app.Remark - * - * @param remark the value for jsh_app.Remark - * - * @mbggenerated - */ - public void setRemark(String remark) { - this.remark = remark == null ? null : remark.trim(); - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_app.Enabled - * - * @return the value of jsh_app.Enabled - * - * @mbggenerated - */ - public Boolean getEnabled() { - return enabled; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_app.Enabled - * - * @param enabled the value for jsh_app.Enabled - * - * @mbggenerated - */ - public void setEnabled(Boolean enabled) { - this.enabled = enabled; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_app.delete_Flag - * - * @return the value of jsh_app.delete_Flag - * - * @mbggenerated - */ - public String getDeleteFlag() { - return deleteFlag; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_app.delete_Flag - * - * @param deleteFlag the value for jsh_app.delete_Flag - * - * @mbggenerated - */ - public void setDeleteFlag(String deleteFlag) { - this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim(); - } -} \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/entities/AppExample.java b/src/main/java/com/jsh/erp/datasource/entities/AppExample.java deleted file mode 100644 index ed21763a..00000000 --- a/src/main/java/com/jsh/erp/datasource/entities/AppExample.java +++ /dev/null @@ -1,1372 +0,0 @@ -package com.jsh.erp.datasource.entities; - -import java.util.ArrayList; -import java.util.List; - -public class AppExample { - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table jsh_app - * - * @mbggenerated - */ - protected String orderByClause; - - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table jsh_app - * - * @mbggenerated - */ - protected boolean distinct; - - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table jsh_app - * - * @mbggenerated - */ - protected List oredCriteria; - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_app - * - * @mbggenerated - */ - public AppExample() { - oredCriteria = new ArrayList(); - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_app - * - * @mbggenerated - */ - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_app - * - * @mbggenerated - */ - public String getOrderByClause() { - return orderByClause; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_app - * - * @mbggenerated - */ - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_app - * - * @mbggenerated - */ - public boolean isDistinct() { - return distinct; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_app - * - * @mbggenerated - */ - public List getOredCriteria() { - return oredCriteria; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_app - * - * @mbggenerated - */ - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_app - * - * @mbggenerated - */ - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_app - * - * @mbggenerated - */ - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_app - * - * @mbggenerated - */ - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_app - * - * @mbggenerated - */ - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - /** - * This class was generated by MyBatis Generator. - * This class corresponds to the database table jsh_app - * - * @mbggenerated - */ - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("Id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("Id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(Long value) { - addCriterion("Id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(Long value) { - addCriterion("Id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(Long value) { - addCriterion("Id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(Long value) { - addCriterion("Id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(Long value) { - addCriterion("Id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(Long value) { - addCriterion("Id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("Id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("Id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(Long value1, Long value2) { - addCriterion("Id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(Long value1, Long value2) { - addCriterion("Id not between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andNumberIsNull() { - addCriterion("Number is null"); - return (Criteria) this; - } - - public Criteria andNumberIsNotNull() { - addCriterion("Number is not null"); - return (Criteria) this; - } - - public Criteria andNumberEqualTo(String value) { - addCriterion("Number =", value, "number"); - return (Criteria) this; - } - - public Criteria andNumberNotEqualTo(String value) { - addCriterion("Number <>", value, "number"); - return (Criteria) this; - } - - public Criteria andNumberGreaterThan(String value) { - addCriterion("Number >", value, "number"); - return (Criteria) this; - } - - public Criteria andNumberGreaterThanOrEqualTo(String value) { - addCriterion("Number >=", value, "number"); - return (Criteria) this; - } - - public Criteria andNumberLessThan(String value) { - addCriterion("Number <", value, "number"); - return (Criteria) this; - } - - public Criteria andNumberLessThanOrEqualTo(String value) { - addCriterion("Number <=", value, "number"); - return (Criteria) this; - } - - public Criteria andNumberLike(String value) { - addCriterion("Number like", value, "number"); - return (Criteria) this; - } - - public Criteria andNumberNotLike(String value) { - addCriterion("Number not like", value, "number"); - return (Criteria) this; - } - - public Criteria andNumberIn(List values) { - addCriterion("Number in", values, "number"); - return (Criteria) this; - } - - public Criteria andNumberNotIn(List values) { - addCriterion("Number not in", values, "number"); - return (Criteria) this; - } - - public Criteria andNumberBetween(String value1, String value2) { - addCriterion("Number between", value1, value2, "number"); - return (Criteria) this; - } - - public Criteria andNumberNotBetween(String value1, String value2) { - addCriterion("Number not between", value1, value2, "number"); - return (Criteria) this; - } - - public Criteria andNameIsNull() { - addCriterion("Name is null"); - return (Criteria) this; - } - - public Criteria andNameIsNotNull() { - addCriterion("Name is not null"); - return (Criteria) this; - } - - public Criteria andNameEqualTo(String value) { - addCriterion("Name =", value, "name"); - return (Criteria) this; - } - - public Criteria andNameNotEqualTo(String value) { - addCriterion("Name <>", value, "name"); - return (Criteria) this; - } - - public Criteria andNameGreaterThan(String value) { - addCriterion("Name >", value, "name"); - return (Criteria) this; - } - - public Criteria andNameGreaterThanOrEqualTo(String value) { - addCriterion("Name >=", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLessThan(String value) { - addCriterion("Name <", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLessThanOrEqualTo(String value) { - addCriterion("Name <=", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLike(String value) { - addCriterion("Name like", value, "name"); - return (Criteria) this; - } - - public Criteria andNameNotLike(String value) { - addCriterion("Name not like", value, "name"); - return (Criteria) this; - } - - public Criteria andNameIn(List values) { - addCriterion("Name in", values, "name"); - return (Criteria) this; - } - - public Criteria andNameNotIn(List values) { - addCriterion("Name not in", values, "name"); - return (Criteria) this; - } - - public Criteria andNameBetween(String value1, String value2) { - addCriterion("Name between", value1, value2, "name"); - return (Criteria) this; - } - - public Criteria andNameNotBetween(String value1, String value2) { - addCriterion("Name not between", value1, value2, "name"); - return (Criteria) this; - } - - public Criteria andTypeIsNull() { - addCriterion("Type is null"); - return (Criteria) this; - } - - public Criteria andTypeIsNotNull() { - addCriterion("Type is not null"); - return (Criteria) this; - } - - public Criteria andTypeEqualTo(String value) { - addCriterion("Type =", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotEqualTo(String value) { - addCriterion("Type <>", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeGreaterThan(String value) { - addCriterion("Type >", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeGreaterThanOrEqualTo(String value) { - addCriterion("Type >=", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeLessThan(String value) { - addCriterion("Type <", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeLessThanOrEqualTo(String value) { - addCriterion("Type <=", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeLike(String value) { - addCriterion("Type like", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotLike(String value) { - addCriterion("Type not like", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeIn(List values) { - addCriterion("Type in", values, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotIn(List values) { - addCriterion("Type not in", values, "type"); - return (Criteria) this; - } - - public Criteria andTypeBetween(String value1, String value2) { - addCriterion("Type between", value1, value2, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotBetween(String value1, String value2) { - addCriterion("Type not between", value1, value2, "type"); - return (Criteria) this; - } - - public Criteria andIconIsNull() { - addCriterion("Icon is null"); - return (Criteria) this; - } - - public Criteria andIconIsNotNull() { - addCriterion("Icon is not null"); - return (Criteria) this; - } - - public Criteria andIconEqualTo(String value) { - addCriterion("Icon =", value, "icon"); - return (Criteria) this; - } - - public Criteria andIconNotEqualTo(String value) { - addCriterion("Icon <>", value, "icon"); - return (Criteria) this; - } - - public Criteria andIconGreaterThan(String value) { - addCriterion("Icon >", value, "icon"); - return (Criteria) this; - } - - public Criteria andIconGreaterThanOrEqualTo(String value) { - addCriterion("Icon >=", value, "icon"); - return (Criteria) this; - } - - public Criteria andIconLessThan(String value) { - addCriterion("Icon <", value, "icon"); - return (Criteria) this; - } - - public Criteria andIconLessThanOrEqualTo(String value) { - addCriterion("Icon <=", value, "icon"); - return (Criteria) this; - } - - public Criteria andIconLike(String value) { - addCriterion("Icon like", value, "icon"); - return (Criteria) this; - } - - public Criteria andIconNotLike(String value) { - addCriterion("Icon not like", value, "icon"); - return (Criteria) this; - } - - public Criteria andIconIn(List values) { - addCriterion("Icon in", values, "icon"); - return (Criteria) this; - } - - public Criteria andIconNotIn(List values) { - addCriterion("Icon not in", values, "icon"); - return (Criteria) this; - } - - public Criteria andIconBetween(String value1, String value2) { - addCriterion("Icon between", value1, value2, "icon"); - return (Criteria) this; - } - - public Criteria andIconNotBetween(String value1, String value2) { - addCriterion("Icon not between", value1, value2, "icon"); - return (Criteria) this; - } - - public Criteria andUrlIsNull() { - addCriterion("URL is null"); - return (Criteria) this; - } - - public Criteria andUrlIsNotNull() { - addCriterion("URL is not null"); - return (Criteria) this; - } - - public Criteria andUrlEqualTo(String value) { - addCriterion("URL =", value, "url"); - return (Criteria) this; - } - - public Criteria andUrlNotEqualTo(String value) { - addCriterion("URL <>", value, "url"); - return (Criteria) this; - } - - public Criteria andUrlGreaterThan(String value) { - addCriterion("URL >", value, "url"); - return (Criteria) this; - } - - public Criteria andUrlGreaterThanOrEqualTo(String value) { - addCriterion("URL >=", value, "url"); - return (Criteria) this; - } - - public Criteria andUrlLessThan(String value) { - addCriterion("URL <", value, "url"); - return (Criteria) this; - } - - public Criteria andUrlLessThanOrEqualTo(String value) { - addCriterion("URL <=", value, "url"); - return (Criteria) this; - } - - public Criteria andUrlLike(String value) { - addCriterion("URL like", value, "url"); - return (Criteria) this; - } - - public Criteria andUrlNotLike(String value) { - addCriterion("URL not like", value, "url"); - return (Criteria) this; - } - - public Criteria andUrlIn(List values) { - addCriterion("URL in", values, "url"); - return (Criteria) this; - } - - public Criteria andUrlNotIn(List values) { - addCriterion("URL not in", values, "url"); - return (Criteria) this; - } - - public Criteria andUrlBetween(String value1, String value2) { - addCriterion("URL between", value1, value2, "url"); - return (Criteria) this; - } - - public Criteria andUrlNotBetween(String value1, String value2) { - addCriterion("URL not between", value1, value2, "url"); - return (Criteria) this; - } - - public Criteria andWidthIsNull() { - addCriterion("Width is null"); - return (Criteria) this; - } - - public Criteria andWidthIsNotNull() { - addCriterion("Width is not null"); - return (Criteria) this; - } - - public Criteria andWidthEqualTo(String value) { - addCriterion("Width =", value, "width"); - return (Criteria) this; - } - - public Criteria andWidthNotEqualTo(String value) { - addCriterion("Width <>", value, "width"); - return (Criteria) this; - } - - public Criteria andWidthGreaterThan(String value) { - addCriterion("Width >", value, "width"); - return (Criteria) this; - } - - public Criteria andWidthGreaterThanOrEqualTo(String value) { - addCriterion("Width >=", value, "width"); - return (Criteria) this; - } - - public Criteria andWidthLessThan(String value) { - addCriterion("Width <", value, "width"); - return (Criteria) this; - } - - public Criteria andWidthLessThanOrEqualTo(String value) { - addCriterion("Width <=", value, "width"); - return (Criteria) this; - } - - public Criteria andWidthLike(String value) { - addCriterion("Width like", value, "width"); - return (Criteria) this; - } - - public Criteria andWidthNotLike(String value) { - addCriterion("Width not like", value, "width"); - return (Criteria) this; - } - - public Criteria andWidthIn(List values) { - addCriterion("Width in", values, "width"); - return (Criteria) this; - } - - public Criteria andWidthNotIn(List values) { - addCriterion("Width not in", values, "width"); - return (Criteria) this; - } - - public Criteria andWidthBetween(String value1, String value2) { - addCriterion("Width between", value1, value2, "width"); - return (Criteria) this; - } - - public Criteria andWidthNotBetween(String value1, String value2) { - addCriterion("Width not between", value1, value2, "width"); - return (Criteria) this; - } - - public Criteria andHeightIsNull() { - addCriterion("Height is null"); - return (Criteria) this; - } - - public Criteria andHeightIsNotNull() { - addCriterion("Height is not null"); - return (Criteria) this; - } - - public Criteria andHeightEqualTo(String value) { - addCriterion("Height =", value, "height"); - return (Criteria) this; - } - - public Criteria andHeightNotEqualTo(String value) { - addCriterion("Height <>", value, "height"); - return (Criteria) this; - } - - public Criteria andHeightGreaterThan(String value) { - addCriterion("Height >", value, "height"); - return (Criteria) this; - } - - public Criteria andHeightGreaterThanOrEqualTo(String value) { - addCriterion("Height >=", value, "height"); - return (Criteria) this; - } - - public Criteria andHeightLessThan(String value) { - addCriterion("Height <", value, "height"); - return (Criteria) this; - } - - public Criteria andHeightLessThanOrEqualTo(String value) { - addCriterion("Height <=", value, "height"); - return (Criteria) this; - } - - public Criteria andHeightLike(String value) { - addCriterion("Height like", value, "height"); - return (Criteria) this; - } - - public Criteria andHeightNotLike(String value) { - addCriterion("Height not like", value, "height"); - return (Criteria) this; - } - - public Criteria andHeightIn(List values) { - addCriterion("Height in", values, "height"); - return (Criteria) this; - } - - public Criteria andHeightNotIn(List values) { - addCriterion("Height not in", values, "height"); - return (Criteria) this; - } - - public Criteria andHeightBetween(String value1, String value2) { - addCriterion("Height between", value1, value2, "height"); - return (Criteria) this; - } - - public Criteria andHeightNotBetween(String value1, String value2) { - addCriterion("Height not between", value1, value2, "height"); - return (Criteria) this; - } - - public Criteria andResizeIsNull() { - addCriterion("ReSize is null"); - return (Criteria) this; - } - - public Criteria andResizeIsNotNull() { - addCriterion("ReSize is not null"); - return (Criteria) this; - } - - public Criteria andResizeEqualTo(Boolean value) { - addCriterion("ReSize =", value, "resize"); - return (Criteria) this; - } - - public Criteria andResizeNotEqualTo(Boolean value) { - addCriterion("ReSize <>", value, "resize"); - return (Criteria) this; - } - - public Criteria andResizeGreaterThan(Boolean value) { - addCriterion("ReSize >", value, "resize"); - return (Criteria) this; - } - - public Criteria andResizeGreaterThanOrEqualTo(Boolean value) { - addCriterion("ReSize >=", value, "resize"); - return (Criteria) this; - } - - public Criteria andResizeLessThan(Boolean value) { - addCriterion("ReSize <", value, "resize"); - return (Criteria) this; - } - - public Criteria andResizeLessThanOrEqualTo(Boolean value) { - addCriterion("ReSize <=", value, "resize"); - return (Criteria) this; - } - - public Criteria andResizeIn(List values) { - addCriterion("ReSize in", values, "resize"); - return (Criteria) this; - } - - public Criteria andResizeNotIn(List values) { - addCriterion("ReSize not in", values, "resize"); - return (Criteria) this; - } - - public Criteria andResizeBetween(Boolean value1, Boolean value2) { - addCriterion("ReSize between", value1, value2, "resize"); - return (Criteria) this; - } - - public Criteria andResizeNotBetween(Boolean value1, Boolean value2) { - addCriterion("ReSize not between", value1, value2, "resize"); - return (Criteria) this; - } - - public Criteria andOpenmaxIsNull() { - addCriterion("OpenMax is null"); - return (Criteria) this; - } - - public Criteria andOpenmaxIsNotNull() { - addCriterion("OpenMax is not null"); - return (Criteria) this; - } - - public Criteria andOpenmaxEqualTo(Boolean value) { - addCriterion("OpenMax =", value, "openmax"); - return (Criteria) this; - } - - public Criteria andOpenmaxNotEqualTo(Boolean value) { - addCriterion("OpenMax <>", value, "openmax"); - return (Criteria) this; - } - - public Criteria andOpenmaxGreaterThan(Boolean value) { - addCriterion("OpenMax >", value, "openmax"); - return (Criteria) this; - } - - public Criteria andOpenmaxGreaterThanOrEqualTo(Boolean value) { - addCriterion("OpenMax >=", value, "openmax"); - return (Criteria) this; - } - - public Criteria andOpenmaxLessThan(Boolean value) { - addCriterion("OpenMax <", value, "openmax"); - return (Criteria) this; - } - - public Criteria andOpenmaxLessThanOrEqualTo(Boolean value) { - addCriterion("OpenMax <=", value, "openmax"); - return (Criteria) this; - } - - public Criteria andOpenmaxIn(List values) { - addCriterion("OpenMax in", values, "openmax"); - return (Criteria) this; - } - - public Criteria andOpenmaxNotIn(List values) { - addCriterion("OpenMax not in", values, "openmax"); - return (Criteria) this; - } - - public Criteria andOpenmaxBetween(Boolean value1, Boolean value2) { - addCriterion("OpenMax between", value1, value2, "openmax"); - return (Criteria) this; - } - - public Criteria andOpenmaxNotBetween(Boolean value1, Boolean value2) { - addCriterion("OpenMax not between", value1, value2, "openmax"); - return (Criteria) this; - } - - public Criteria andFlashIsNull() { - addCriterion("Flash is null"); - return (Criteria) this; - } - - public Criteria andFlashIsNotNull() { - addCriterion("Flash is not null"); - return (Criteria) this; - } - - public Criteria andFlashEqualTo(Boolean value) { - addCriterion("Flash =", value, "flash"); - return (Criteria) this; - } - - public Criteria andFlashNotEqualTo(Boolean value) { - addCriterion("Flash <>", value, "flash"); - return (Criteria) this; - } - - public Criteria andFlashGreaterThan(Boolean value) { - addCriterion("Flash >", value, "flash"); - return (Criteria) this; - } - - public Criteria andFlashGreaterThanOrEqualTo(Boolean value) { - addCriterion("Flash >=", value, "flash"); - return (Criteria) this; - } - - public Criteria andFlashLessThan(Boolean value) { - addCriterion("Flash <", value, "flash"); - return (Criteria) this; - } - - public Criteria andFlashLessThanOrEqualTo(Boolean value) { - addCriterion("Flash <=", value, "flash"); - return (Criteria) this; - } - - public Criteria andFlashIn(List values) { - addCriterion("Flash in", values, "flash"); - return (Criteria) this; - } - - public Criteria andFlashNotIn(List values) { - addCriterion("Flash not in", values, "flash"); - return (Criteria) this; - } - - public Criteria andFlashBetween(Boolean value1, Boolean value2) { - addCriterion("Flash between", value1, value2, "flash"); - return (Criteria) this; - } - - public Criteria andFlashNotBetween(Boolean value1, Boolean value2) { - addCriterion("Flash not between", value1, value2, "flash"); - return (Criteria) this; - } - - public Criteria andZlIsNull() { - addCriterion("ZL is null"); - return (Criteria) this; - } - - public Criteria andZlIsNotNull() { - addCriterion("ZL is not null"); - return (Criteria) this; - } - - public Criteria andZlEqualTo(String value) { - addCriterion("ZL =", value, "zl"); - return (Criteria) this; - } - - public Criteria andZlNotEqualTo(String value) { - addCriterion("ZL <>", value, "zl"); - return (Criteria) this; - } - - public Criteria andZlGreaterThan(String value) { - addCriterion("ZL >", value, "zl"); - return (Criteria) this; - } - - public Criteria andZlGreaterThanOrEqualTo(String value) { - addCriterion("ZL >=", value, "zl"); - return (Criteria) this; - } - - public Criteria andZlLessThan(String value) { - addCriterion("ZL <", value, "zl"); - return (Criteria) this; - } - - public Criteria andZlLessThanOrEqualTo(String value) { - addCriterion("ZL <=", value, "zl"); - return (Criteria) this; - } - - public Criteria andZlLike(String value) { - addCriterion("ZL like", value, "zl"); - return (Criteria) this; - } - - public Criteria andZlNotLike(String value) { - addCriterion("ZL not like", value, "zl"); - return (Criteria) this; - } - - public Criteria andZlIn(List values) { - addCriterion("ZL in", values, "zl"); - return (Criteria) this; - } - - public Criteria andZlNotIn(List values) { - addCriterion("ZL not in", values, "zl"); - return (Criteria) this; - } - - public Criteria andZlBetween(String value1, String value2) { - addCriterion("ZL between", value1, value2, "zl"); - return (Criteria) this; - } - - public Criteria andZlNotBetween(String value1, String value2) { - addCriterion("ZL not between", value1, value2, "zl"); - return (Criteria) this; - } - - public Criteria andSortIsNull() { - addCriterion("Sort is null"); - return (Criteria) this; - } - - public Criteria andSortIsNotNull() { - addCriterion("Sort is not null"); - return (Criteria) this; - } - - public Criteria andSortEqualTo(String value) { - addCriterion("Sort =", value, "sort"); - return (Criteria) this; - } - - public Criteria andSortNotEqualTo(String value) { - addCriterion("Sort <>", value, "sort"); - return (Criteria) this; - } - - public Criteria andSortGreaterThan(String value) { - addCriterion("Sort >", value, "sort"); - return (Criteria) this; - } - - public Criteria andSortGreaterThanOrEqualTo(String value) { - addCriterion("Sort >=", value, "sort"); - return (Criteria) this; - } - - public Criteria andSortLessThan(String value) { - addCriterion("Sort <", value, "sort"); - return (Criteria) this; - } - - public Criteria andSortLessThanOrEqualTo(String value) { - addCriterion("Sort <=", value, "sort"); - return (Criteria) this; - } - - public Criteria andSortLike(String value) { - addCriterion("Sort like", value, "sort"); - return (Criteria) this; - } - - public Criteria andSortNotLike(String value) { - addCriterion("Sort not like", value, "sort"); - return (Criteria) this; - } - - public Criteria andSortIn(List values) { - addCriterion("Sort in", values, "sort"); - return (Criteria) this; - } - - public Criteria andSortNotIn(List values) { - addCriterion("Sort not in", values, "sort"); - return (Criteria) this; - } - - public Criteria andSortBetween(String value1, String value2) { - addCriterion("Sort between", value1, value2, "sort"); - return (Criteria) this; - } - - public Criteria andSortNotBetween(String value1, String value2) { - addCriterion("Sort not between", value1, value2, "sort"); - return (Criteria) this; - } - - public Criteria andRemarkIsNull() { - addCriterion("Remark is null"); - return (Criteria) this; - } - - public Criteria andRemarkIsNotNull() { - addCriterion("Remark is not null"); - return (Criteria) this; - } - - public Criteria andRemarkEqualTo(String value) { - addCriterion("Remark =", value, "remark"); - return (Criteria) this; - } - - public Criteria andRemarkNotEqualTo(String value) { - addCriterion("Remark <>", value, "remark"); - return (Criteria) this; - } - - public Criteria andRemarkGreaterThan(String value) { - addCriterion("Remark >", value, "remark"); - return (Criteria) this; - } - - public Criteria andRemarkGreaterThanOrEqualTo(String value) { - addCriterion("Remark >=", value, "remark"); - return (Criteria) this; - } - - public Criteria andRemarkLessThan(String value) { - addCriterion("Remark <", value, "remark"); - return (Criteria) this; - } - - public Criteria andRemarkLessThanOrEqualTo(String value) { - addCriterion("Remark <=", value, "remark"); - return (Criteria) this; - } - - public Criteria andRemarkLike(String value) { - addCriterion("Remark like", value, "remark"); - return (Criteria) this; - } - - public Criteria andRemarkNotLike(String value) { - addCriterion("Remark not like", value, "remark"); - return (Criteria) this; - } - - public Criteria andRemarkIn(List values) { - addCriterion("Remark in", values, "remark"); - return (Criteria) this; - } - - public Criteria andRemarkNotIn(List values) { - addCriterion("Remark not in", values, "remark"); - return (Criteria) this; - } - - public Criteria andRemarkBetween(String value1, String value2) { - addCriterion("Remark between", value1, value2, "remark"); - return (Criteria) this; - } - - public Criteria andRemarkNotBetween(String value1, String value2) { - addCriterion("Remark not between", value1, value2, "remark"); - return (Criteria) this; - } - - public Criteria andEnabledIsNull() { - addCriterion("Enabled is null"); - return (Criteria) this; - } - - public Criteria andEnabledIsNotNull() { - addCriterion("Enabled is not null"); - return (Criteria) this; - } - - public Criteria andEnabledEqualTo(Boolean value) { - addCriterion("Enabled =", value, "enabled"); - return (Criteria) this; - } - - public Criteria andEnabledNotEqualTo(Boolean value) { - addCriterion("Enabled <>", value, "enabled"); - return (Criteria) this; - } - - public Criteria andEnabledGreaterThan(Boolean value) { - addCriterion("Enabled >", value, "enabled"); - return (Criteria) this; - } - - public Criteria andEnabledGreaterThanOrEqualTo(Boolean value) { - addCriterion("Enabled >=", value, "enabled"); - return (Criteria) this; - } - - public Criteria andEnabledLessThan(Boolean value) { - addCriterion("Enabled <", value, "enabled"); - return (Criteria) this; - } - - public Criteria andEnabledLessThanOrEqualTo(Boolean value) { - addCriterion("Enabled <=", value, "enabled"); - return (Criteria) this; - } - - public Criteria andEnabledIn(List values) { - addCriterion("Enabled in", values, "enabled"); - return (Criteria) this; - } - - public Criteria andEnabledNotIn(List values) { - addCriterion("Enabled not in", values, "enabled"); - return (Criteria) this; - } - - public Criteria andEnabledBetween(Boolean value1, Boolean value2) { - addCriterion("Enabled between", value1, value2, "enabled"); - return (Criteria) this; - } - - public Criteria andEnabledNotBetween(Boolean value1, Boolean value2) { - addCriterion("Enabled not between", value1, value2, "enabled"); - return (Criteria) this; - } - - public Criteria andDeleteFlagIsNull() { - addCriterion("delete_Flag is null"); - return (Criteria) this; - } - - public Criteria andDeleteFlagIsNotNull() { - addCriterion("delete_Flag is not null"); - return (Criteria) this; - } - - public Criteria andDeleteFlagEqualTo(String value) { - addCriterion("delete_Flag =", value, "deleteFlag"); - return (Criteria) this; - } - - public Criteria andDeleteFlagNotEqualTo(String value) { - addCriterion("delete_Flag <>", value, "deleteFlag"); - return (Criteria) this; - } - - public Criteria andDeleteFlagGreaterThan(String value) { - addCriterion("delete_Flag >", value, "deleteFlag"); - return (Criteria) this; - } - - public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) { - addCriterion("delete_Flag >=", value, "deleteFlag"); - return (Criteria) this; - } - - public Criteria andDeleteFlagLessThan(String value) { - addCriterion("delete_Flag <", value, "deleteFlag"); - return (Criteria) this; - } - - public Criteria andDeleteFlagLessThanOrEqualTo(String value) { - addCriterion("delete_Flag <=", value, "deleteFlag"); - return (Criteria) this; - } - - public Criteria andDeleteFlagLike(String value) { - addCriterion("delete_Flag like", value, "deleteFlag"); - return (Criteria) this; - } - - public Criteria andDeleteFlagNotLike(String value) { - addCriterion("delete_Flag not like", value, "deleteFlag"); - return (Criteria) this; - } - - public Criteria andDeleteFlagIn(List values) { - addCriterion("delete_Flag in", values, "deleteFlag"); - return (Criteria) this; - } - - public Criteria andDeleteFlagNotIn(List values) { - addCriterion("delete_Flag not in", values, "deleteFlag"); - return (Criteria) this; - } - - public Criteria andDeleteFlagBetween(String value1, String value2) { - addCriterion("delete_Flag between", value1, value2, "deleteFlag"); - return (Criteria) this; - } - - public Criteria andDeleteFlagNotBetween(String value1, String value2) { - addCriterion("delete_Flag not between", value1, value2, "deleteFlag"); - return (Criteria) this; - } - } - - /** - * This class was generated by MyBatis Generator. - * This class corresponds to the database table jsh_app - * - * @mbggenerated do_not_delete_during_merge - */ - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - /** - * This class was generated by MyBatis Generator. - * This class corresponds to the database table jsh_app - * - * @mbggenerated - */ - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/mappers/AppMapper.java b/src/main/java/com/jsh/erp/datasource/mappers/AppMapper.java deleted file mode 100644 index a5f4e98f..00000000 --- a/src/main/java/com/jsh/erp/datasource/mappers/AppMapper.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.jsh.erp.datasource.mappers; - -import com.jsh.erp.datasource.entities.App; -import com.jsh.erp.datasource.entities.AppExample; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -public interface AppMapper { - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_app - * - * @mbggenerated - */ - int countByExample(AppExample example); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_app - * - * @mbggenerated - */ - int deleteByExample(AppExample example); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_app - * - * @mbggenerated - */ - int deleteByPrimaryKey(Long id); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_app - * - * @mbggenerated - */ - int insert(App record); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_app - * - * @mbggenerated - */ - int insertSelective(App record); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_app - * - * @mbggenerated - */ - List selectByExample(AppExample example); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_app - * - * @mbggenerated - */ - App selectByPrimaryKey(Long id); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_app - * - * @mbggenerated - */ - int updateByExampleSelective(@Param("record") App record, @Param("example") AppExample example); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_app - * - * @mbggenerated - */ - int updateByExample(@Param("record") App record, @Param("example") AppExample example); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_app - * - * @mbggenerated - */ - int updateByPrimaryKeySelective(App record); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_app - * - * @mbggenerated - */ - int updateByPrimaryKey(App record); -} \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/mappers/AppMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/AppMapperEx.java deleted file mode 100644 index 5b5700a7..00000000 --- a/src/main/java/com/jsh/erp/datasource/mappers/AppMapperEx.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.jsh.erp.datasource.mappers; - -import com.jsh.erp.datasource.entities.App; -import com.jsh.erp.datasource.entities.AppExample; -import org.apache.ibatis.annotations.Param; - -import java.util.Date; -import java.util.List; - -public interface AppMapperEx { - - List selectByConditionApp( - @Param("name") String name, - @Param("type") String type, - @Param("offset") Integer offset, - @Param("rows") Integer rows); - - Long countsByApp( - @Param("name") String name, - @Param("type") String type); - - int batchDeleteAppByIds(@Param("updateTime") Date updateTime, @Param("updater") Long updater, @Param("ids") String ids[]); -} \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/service/ResourceInfo.java b/src/main/java/com/jsh/erp/service/ResourceInfo.java index 3c585b03..352d7bea 100644 --- a/src/main/java/com/jsh/erp/service/ResourceInfo.java +++ b/src/main/java/com/jsh/erp/service/ResourceInfo.java @@ -6,7 +6,6 @@ import java.lang.annotation.*; * @author jishenghua 2018-10-7 15:25:39 * user-5 * role-10 - * app-15 * depot-20 * log-25 * functions-30 diff --git a/src/main/java/com/jsh/erp/service/app/AppComponent.java b/src/main/java/com/jsh/erp/service/app/AppComponent.java deleted file mode 100644 index 9afec67f..00000000 --- a/src/main/java/com/jsh/erp/service/app/AppComponent.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.jsh.erp.service.app; - -import com.jsh.erp.service.ICommonQuery; -import com.jsh.erp.utils.Constants; -import com.jsh.erp.utils.QueryUtils; -import com.jsh.erp.utils.StringUtil; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import java.util.List; -import java.util.Map; - -@Service(value = "app_component") -@AppResource -public class AppComponent implements ICommonQuery { - - @Resource - private AppService appService; - - @Override - public Object selectOne(Long id) throws Exception { - return appService.getApp(id); - } - - @Override - public List select(Map map)throws Exception { - return getAppList(map); - } - - private List getAppList(Map map)throws Exception { - String search = map.get(Constants.SEARCH); - String name = StringUtil.getInfo(search, "name"); - String type = StringUtil.getInfo(search, "type"); - String order = QueryUtils.order(map); - return appService.select(name, type, QueryUtils.offset(map), QueryUtils.rows(map)); - } - - @Override - public Long counts(Map map)throws Exception { - String search = map.get(Constants.SEARCH); - String name = StringUtil.getInfo(search, "name"); - String type = StringUtil.getInfo(search, "type"); - return appService.countApp(name, type); - } - - @Override - public int insert(String beanJson, HttpServletRequest request)throws Exception { - return appService.insertApp(beanJson, request); - } - - @Override - public int update(String beanJson, Long id)throws Exception { - return appService.updateApp(beanJson, id); - } - - @Override - public int delete(Long id)throws Exception { - return appService.deleteApp(id); - } - - @Override - public int batchDelete(String ids)throws Exception { - return appService.batchDeleteApp(ids); - } - - @Override - public int checkIsNameExist(Long id, String name)throws Exception { - return 0; - } - -} diff --git a/src/main/java/com/jsh/erp/service/app/AppResource.java b/src/main/java/com/jsh/erp/service/app/AppResource.java deleted file mode 100644 index c5d3d56b..00000000 --- a/src/main/java/com/jsh/erp/service/app/AppResource.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.jsh.erp.service.app; - -import com.jsh.erp.service.ResourceInfo; - -import java.lang.annotation.*; - -/** - * @author jishenghua qq752718920 2018-10-7 15:26:27 - */ -@ResourceInfo(value = "app", type = 15) -@Inherited -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.RUNTIME) -public @interface AppResource { -} diff --git a/src/main/java/com/jsh/erp/service/app/AppService.java b/src/main/java/com/jsh/erp/service/app/AppService.java deleted file mode 100644 index 86683dd8..00000000 --- a/src/main/java/com/jsh/erp/service/app/AppService.java +++ /dev/null @@ -1,254 +0,0 @@ -package com.jsh.erp.service.app; - -import com.alibaba.fastjson.JSONObject; -import com.jsh.erp.constants.BusinessConstants; -import com.jsh.erp.constants.ExceptionConstants; -import com.jsh.erp.datasource.entities.App; -import com.jsh.erp.datasource.entities.AppExample; -import com.jsh.erp.datasource.entities.User; -import com.jsh.erp.datasource.entities.UserBusiness; -import com.jsh.erp.datasource.mappers.AppMapper; -import com.jsh.erp.datasource.mappers.AppMapperEx; -import com.jsh.erp.exception.BusinessRunTimeException; -import com.jsh.erp.exception.JshException; -import com.jsh.erp.service.log.LogService; -import com.jsh.erp.service.user.UserService; -import com.jsh.erp.service.userBusiness.UserBusinessService; -import com.jsh.erp.utils.StringUtil; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import java.util.Date; -import java.util.List; - -@Service -public class AppService { - private Logger logger = LoggerFactory.getLogger(AppService.class); - - @Resource - private AppMapper appMapper; - @Resource - private AppMapperEx appMapperEx; - @Resource - private UserService userService; - @Resource - private LogService logService; - - @Resource - private UserBusinessService userBusinessService; - - public List findDock()throws Exception{ - AppExample example = new AppExample(); - example.createCriteria().andZlEqualTo("dock").andEnabledEqualTo(true).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); - example.setOrderByClause("Sort"); - List list=null; - try{ - list=appMapper.selectByExample(example); - }catch(Exception e){ - JshException.readFail(logger, e); - } - return list; - } - /** - * create by: cjl - * description: - * 桌面功能菜单初始化列表 - * create time: 2019/1/11 16:59 - * @Param: null - * @return - */ - public List findDesk()throws Exception{ - AppExample example = new AppExample(); - example.createCriteria().andZlEqualTo("desk").andEnabledEqualTo(true).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); - example.setOrderByClause("Sort"); - List list=null; - try{ - list=appMapper.selectByExample(example); - }catch(Exception e){ - JshException.readFail(logger, e); - } - return list; - } - - public App getApp(long id)throws Exception { - App result=null; - try{ - result=appMapper.selectByPrimaryKey(id); - }catch(Exception e){ - JshException.readFail(logger, e); - } - return result; - } - - public List getApp()throws Exception { - AppExample example = new AppExample(); - example.createCriteria().andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); - List list=null; - try{ - list=appMapper.selectByExample(example); - }catch(Exception e){ - JshException.readFail(logger, e); - } - return list; - } - - public List select(String name, String type, int offset, int rows)throws Exception { - List list=null; - try{ - list=appMapperEx.selectByConditionApp(name, type, offset, rows); - }catch(Exception e){ - JshException.readFail(logger, e); - } - return list; - } - - public Long countApp(String name, String type)throws Exception { - Long result=null; - try{ - result=appMapperEx.countsByApp(name, type); - }catch(Exception e){ - JshException.readFail(logger, e); - } - return result; - } - - @Transactional(value = "transactionManager", rollbackFor = Exception.class) - public int insertApp(String beanJson, HttpServletRequest request)throws Exception { - App app = JSONObject.parseObject(beanJson, App.class); - int result=0; - try{ - result=appMapper.insertSelective(app); - }catch(Exception e){ - JshException.writeFail(logger, e); - } - return result; - } - - @Transactional(value = "transactionManager", rollbackFor = Exception.class) - public int updateApp(String beanJson, Long id) throws Exception{ - App app = JSONObject.parseObject(beanJson, App.class); - app.setId(id); - int result=0; - try{ - result=appMapper.updateByPrimaryKeySelective(app); - }catch(Exception e){ - JshException.writeFail(logger, e); - } - return result; - } - - @Transactional(value = "transactionManager", rollbackFor = Exception.class) - public int deleteApp(Long id)throws Exception { - int result=0; - try{ - result=appMapper.deleteByPrimaryKey(id); - }catch(Exception e){ - JshException.writeFail(logger, e); - } - return result; - } - - @Transactional(value = "transactionManager", rollbackFor = Exception.class) - public int batchDeleteApp(String ids)throws Exception { - List idList = StringUtil.strToLongList(ids); - AppExample example = new AppExample(); - example.createCriteria().andIdIn(idList); - int result=0; - try{ - result=appMapper.deleteByExample(example); - }catch(Exception e){ - JshException.writeFail(logger, e); - } - return result; - } - - public List findRoleAPP()throws Exception{ - AppExample example = new AppExample(); - example.createCriteria().andEnabledEqualTo(true).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); - example.setOrderByClause("Sort"); - List list=null; - try{ - list=appMapper.selectByExample(example); - }catch(Exception e){ - JshException.readFail(logger, e); - } - return list; - } - - public List findAppInIds(String ids, String type)throws Exception{ - List idList = StringUtil.strToLongList(ids); - AppExample example = new AppExample(); - example.createCriteria().andZlEqualTo(type).andEnabledEqualTo(true).andIdIn(idList) - .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); - example.setOrderByClause("Sort"); - List list=null; - try{ - list=appMapper.selectByExample(example); - }catch(Exception e){ - JshException.readFail(logger, e); - } - return list; - } - @Transactional(value = "transactionManager", rollbackFor = Exception.class) - public int batchDeleteAppByIds(String ids) throws Exception{ - logService.insertLog(BusinessConstants.LOG_INTERFACE_NAME_APP, - new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_DELETE).append(ids).toString(), - ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest()); - User userInfo=userService.getCurrentUser(); - String [] idArray=ids.split(","); - int result=0; - try{ - result=appMapperEx.batchDeleteAppByIds(new Date(),userInfo==null?null:userInfo.getId(),idArray); - }catch(Exception e){ - JshException.writeFail(logger, e); - } - return result; - } - - public List findAppByUserId(String userId)throws Exception { - List roleList = userBusinessService.findRoleByUserId(userId); - String roles = null; - if(roleList!=null && roleList.size()>0 && roleList.get(0)!=null){ - roles = roleList.get(0).getValue(); - } - if(roles!=null) { - roles = roles.replaceAll("\\]\\[",",").replaceAll("\\]","").replaceAll("\\[",""); //转为逗号隔开的 - } - List appList = userBusinessService.findAppByRoles(roles); - String apps = null; - if(appList!=null && appList.size()>0 && appList.get(0)!=null){ - apps = appList.get(0).getValue(); - } - if(apps!=null) { - apps = apps.replaceAll("\\]\\[",",").replaceAll("\\]","").replaceAll("\\[",""); //转为逗号隔开的 - } - - List deskList = findAppInIds(apps,"desk"); - - return deskList; - } - - /** - * 通过number列表查询app list - * @param numberList - * @return - */ - public List findAppByNumber(List numberList) throws Exception{ - - AppExample example = new AppExample(); - example.createCriteria().andEnabledEqualTo(true).andNumberIn(numberList); - List list=null; - try{ - list=appMapper.selectByExample(example); - }catch(Exception e){ - JshException.readFail(logger, e); - } - return list; - } -} diff --git a/src/main/java/com/jsh/erp/service/depot/DepotComponent.java b/src/main/java/com/jsh/erp/service/depot/DepotComponent.java index aa78ad79..0e5de244 100644 --- a/src/main/java/com/jsh/erp/service/depot/DepotComponent.java +++ b/src/main/java/com/jsh/erp/service/depot/DepotComponent.java @@ -1,7 +1,6 @@ package com.jsh.erp.service.depot; import com.jsh.erp.service.ICommonQuery; -import com.jsh.erp.service.app.AppResource; import com.jsh.erp.utils.Constants; import com.jsh.erp.utils.QueryUtils; import com.jsh.erp.utils.StringUtil; diff --git a/src/main/java/com/jsh/erp/service/functions/FunctionsComponent.java b/src/main/java/com/jsh/erp/service/functions/FunctionsComponent.java index ebb0c67a..fb695d0e 100644 --- a/src/main/java/com/jsh/erp/service/functions/FunctionsComponent.java +++ b/src/main/java/com/jsh/erp/service/functions/FunctionsComponent.java @@ -1,7 +1,6 @@ package com.jsh.erp.service.functions; import com.jsh.erp.service.ICommonQuery; -import com.jsh.erp.service.app.AppResource; import com.jsh.erp.service.functions.FunctionsService; import com.jsh.erp.utils.Constants; import com.jsh.erp.utils.QueryUtils; diff --git a/src/main/java/com/jsh/erp/service/unit/UnitComponent.java b/src/main/java/com/jsh/erp/service/unit/UnitComponent.java index cc17fb54..5c62cdcd 100644 --- a/src/main/java/com/jsh/erp/service/unit/UnitComponent.java +++ b/src/main/java/com/jsh/erp/service/unit/UnitComponent.java @@ -1,7 +1,6 @@ package com.jsh.erp.service.unit; import com.jsh.erp.service.ICommonQuery; -import com.jsh.erp.service.app.AppResource; import com.jsh.erp.utils.Constants; import com.jsh.erp.utils.QueryUtils; import com.jsh.erp.utils.StringUtil; diff --git a/src/main/java/com/jsh/erp/service/userBusiness/UserBusinessService.java b/src/main/java/com/jsh/erp/service/userBusiness/UserBusinessService.java index ed40fb8e..f5baa394 100644 --- a/src/main/java/com/jsh/erp/service/userBusiness/UserBusinessService.java +++ b/src/main/java/com/jsh/erp/service/userBusiness/UserBusinessService.java @@ -9,7 +9,6 @@ import com.jsh.erp.datasource.mappers.UserBusinessMapperEx; import com.jsh.erp.exception.BusinessRunTimeException; import com.jsh.erp.exception.JshException; import com.jsh.erp.service.CommonQueryManager; -import com.jsh.erp.service.app.AppService; import com.jsh.erp.service.functions.FunctionsService; import com.jsh.erp.service.log.LogService; import com.jsh.erp.service.user.UserService; @@ -42,9 +41,6 @@ public class UserBusinessService { @Resource private FunctionsService functionsService; - @Resource - private AppService appService; - @Resource private CommonQueryManager configResourceManager; @@ -79,10 +75,6 @@ public class UserBusinessService { }catch(Exception e){ JshException.writeFail(logger, e); } - // 更新应用权限 - if (BusinessConstants.TYPE_NAME_ROLE_FUNCTIONS.equals(userBusiness.getType()) && result > 0) { - result = insertOrUpdateAppValue(BusinessConstants.TYPE_NAME_ROLE_APP, userBusiness.getKeyid(), userBusiness.getValue()); - } return result; } @@ -96,10 +88,6 @@ public class UserBusinessService { }catch(Exception e){ JshException.writeFail(logger, e); } - // 更新应用权限 - if (BusinessConstants.TYPE_NAME_ROLE_FUNCTIONS.equals(userBusiness.getType()) && result > 0) { - result = insertOrUpdateAppValue(BusinessConstants.TYPE_NAME_ROLE_APP, userBusiness.getKeyid(), userBusiness.getValue()); - } return result; } @@ -245,51 +233,4 @@ public class UserBusinessService { } return result; } - - /** - * 通过功能（RoleFunctions）权限更新应用（RoleApp）权限 - * @param type - * @param keyId - * @param functionIds - * @return - */ - public int insertOrUpdateAppValue(String type, String keyId, String functionIds) throws Exception{ - int result=0; - functionIds = functionIds.replaceAll("\\]\\[", ","). - replaceAll("\\[","").replaceAll("\\]",""); - List functionsList = functionsService.findByIds(functionIds); - if (!CollectionUtils.isEmpty(functionsList)) { - Set appNumbers = new HashSet<>(); - String appNumber; - for (Functions functions : functionsList) { - appNumber = functions.getNumber().substring(0, 2); - appNumbers.add(appNumber); - } - List appNumberList = new ArrayList<>(appNumbers); - List appList = appService.findAppByNumber(appNumberList); - StringBuilder appIdSb = new StringBuilder(); - if (!CollectionUtils.isEmpty(appList)) { - for (App app : appList) { - appIdSb.append("[" + app.getId() + "]"); - } - List userBusinessList = getBasicData(keyId, type); - try{ - if(userBusinessList.size() > 0) { - UserBusiness userBusiness = userBusinessList.get(0); - userBusiness.setValue(appIdSb.toString()); - result = userBusinessMapper.updateByPrimaryKeySelective(userBusiness); - } else { - UserBusiness userBusiness = new UserBusiness(); - userBusiness.setType(type); - userBusiness.setKeyid(keyId); - userBusiness.setValue(appIdSb.toString()); - result = userBusinessMapper.insertSelective(userBusiness); - } - }catch(Exception e){ - JshException.writeFail(logger, e); - } - } - } - return result; - } } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 5a968586..18861b6f 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -2,7 +2,7 @@ server.port=8080 #server.port=443 #server.ssl.key-store=classpath:jishenghua.jks #server.ssl.key-alias=alias -#server.ssl.key-store-password=password +#server.ssl.key-store-password=M9z21aFp #server.ssl.key-store-type=JKS #ssl的开关 server.ssl.enable=false diff --git a/src/main/resources/mapper_xml/AppMapper.xml b/src/main/resources/mapper_xml/AppMapper.xml deleted file mode 100644 index f1e7bc67..00000000 --- a/src/main/resources/mapper_xml/AppMapper.xml +++ /dev/null @@ -1,443 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - Id, Number, Name, Type, Icon, URL, Width, Height, ReSize, OpenMax, Flash, ZL, Sort, - Remark, Enabled, delete_Flag - - - - - - delete from jsh_app - where Id = #{id,jdbcType=BIGINT} - - - - delete from jsh_app - - - - - - - insert into jsh_app (Id, Number, Name, - Type, Icon, URL, Width, - Height, ReSize, OpenMax, Flash, - ZL, Sort, Remark, Enabled, - delete_Flag) - values (#{id,jdbcType=BIGINT}, #{number,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, - #{type,jdbcType=VARCHAR}, #{icon,jdbcType=VARCHAR}, #{url,jdbcType=VARCHAR}, #{width,jdbcType=VARCHAR}, - #{height,jdbcType=VARCHAR}, #{resize,jdbcType=BIT}, #{openmax,jdbcType=BIT}, #{flash,jdbcType=BIT}, - #{zl,jdbcType=VARCHAR}, #{sort,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{enabled,jdbcType=BIT}, - #{deleteFlag,jdbcType=VARCHAR}) - - - - insert into jsh_app - - - Id, - - - Number, - - - Name, - - - Type, - - - Icon, - - - URL, - - - Width, - - - Height, - - - ReSize, - - - OpenMax, - - - Flash, - - - ZL, - - - Sort, - - - Remark, - - - Enabled, - - - delete_Flag, - - - - - #{id,jdbcType=BIGINT}, - - - #{number,jdbcType=VARCHAR}, - - - #{name,jdbcType=VARCHAR}, - - - #{type,jdbcType=VARCHAR}, - - - #{icon,jdbcType=VARCHAR}, - - - #{url,jdbcType=VARCHAR}, - - - #{width,jdbcType=VARCHAR}, - - - #{height,jdbcType=VARCHAR}, - - - #{resize,jdbcType=BIT}, - - - #{openmax,jdbcType=BIT}, - - - #{flash,jdbcType=BIT}, - - - #{zl,jdbcType=VARCHAR}, - - - #{sort,jdbcType=VARCHAR}, - - - #{remark,jdbcType=VARCHAR}, - - - #{enabled,jdbcType=BIT}, - - - #{deleteFlag,jdbcType=VARCHAR}, - - - - - - - update jsh_app - - - Id = #{record.id,jdbcType=BIGINT}, - - - Number = #{record.number,jdbcType=VARCHAR}, - - - Name = #{record.name,jdbcType=VARCHAR}, - - - Type = #{record.type,jdbcType=VARCHAR}, - - - Icon = #{record.icon,jdbcType=VARCHAR}, - - - URL = #{record.url,jdbcType=VARCHAR}, - - - Width = #{record.width,jdbcType=VARCHAR}, - - - Height = #{record.height,jdbcType=VARCHAR}, - - - ReSize = #{record.resize,jdbcType=BIT}, - - - OpenMax = #{record.openmax,jdbcType=BIT}, - - - Flash = #{record.flash,jdbcType=BIT}, - - - ZL = #{record.zl,jdbcType=VARCHAR}, - - - Sort = #{record.sort,jdbcType=VARCHAR}, - - - Remark = #{record.remark,jdbcType=VARCHAR}, - - - Enabled = #{record.enabled,jdbcType=BIT}, - - - delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR}, - - - - - - - - - update jsh_app - set Id = #{record.id,jdbcType=BIGINT}, - Number = #{record.number,jdbcType=VARCHAR}, - Name = #{record.name,jdbcType=VARCHAR}, - Type = #{record.type,jdbcType=VARCHAR}, - Icon = #{record.icon,jdbcType=VARCHAR}, - URL = #{record.url,jdbcType=VARCHAR}, - Width = #{record.width,jdbcType=VARCHAR}, - Height = #{record.height,jdbcType=VARCHAR}, - ReSize = #{record.resize,jdbcType=BIT}, - OpenMax = #{record.openmax,jdbcType=BIT}, - Flash = #{record.flash,jdbcType=BIT}, - ZL = #{record.zl,jdbcType=VARCHAR}, - Sort = #{record.sort,jdbcType=VARCHAR}, - Remark = #{record.remark,jdbcType=VARCHAR}, - Enabled = #{record.enabled,jdbcType=BIT}, - delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR} - - - - - - - update jsh_app - - - Number = #{number,jdbcType=VARCHAR}, - - - Name = #{name,jdbcType=VARCHAR}, - - - Type = #{type,jdbcType=VARCHAR}, - - - Icon = #{icon,jdbcType=VARCHAR}, - - - URL = #{url,jdbcType=VARCHAR}, - - - Width = #{width,jdbcType=VARCHAR}, - - - Height = #{height,jdbcType=VARCHAR}, - - - ReSize = #{resize,jdbcType=BIT}, - - - OpenMax = #{openmax,jdbcType=BIT}, - - - Flash = #{flash,jdbcType=BIT}, - - - ZL = #{zl,jdbcType=VARCHAR}, - - - Sort = #{sort,jdbcType=VARCHAR}, - - - Remark = #{remark,jdbcType=VARCHAR}, - - - Enabled = #{enabled,jdbcType=BIT}, - - - delete_Flag = #{deleteFlag,jdbcType=VARCHAR}, - - - where Id = #{id,jdbcType=BIGINT} - - - - update jsh_app - set Number = #{number,jdbcType=VARCHAR}, - Name = #{name,jdbcType=VARCHAR}, - Type = #{type,jdbcType=VARCHAR}, - Icon = #{icon,jdbcType=VARCHAR}, - URL = #{url,jdbcType=VARCHAR}, - Width = #{width,jdbcType=VARCHAR}, - Height = #{height,jdbcType=VARCHAR}, - ReSize = #{resize,jdbcType=BIT}, - OpenMax = #{openmax,jdbcType=BIT}, - Flash = #{flash,jdbcType=BIT}, - ZL = #{zl,jdbcType=VARCHAR}, - Sort = #{sort,jdbcType=VARCHAR}, - Remark = #{remark,jdbcType=VARCHAR}, - Enabled = #{enabled,jdbcType=BIT}, - delete_Flag = #{deleteFlag,jdbcType=VARCHAR} - where Id = #{id,jdbcType=BIGINT} - - \ No newline at end of file diff --git a/src/main/resources/mapper_xml/AppMapperEx.xml b/src/main/resources/mapper_xml/AppMapperEx.xml deleted file mode 100644 index 8422d73c..00000000 --- a/src/main/resources/mapper_xml/AppMapperEx.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - update jsh_app - set delete_Flag='1' - where 1=1 - and id in ( - - #{id} - - ) - - \ No newline at end of file diff --git a/src/test/resources/generatorConfig.xml b/src/test/resources/generatorConfig.xml index 37247683..cc8718a2 100644 --- a/src/test/resources/generatorConfig.xml +++ b/src/test/resources/generatorConfig.xml @@ -44,7 +44,6 @@