diff --git a/src/main/java/com/zzjee/wm/controller/WmToMoveGoodsController.java b/src/main/java/com/zzjee/wm/controller/WmToMoveGoodsController.java index eaf3b17e..88a70483 100644 --- a/src/main/java/com/zzjee/wm/controller/WmToMoveGoodsController.java +++ b/src/main/java/com/zzjee/wm/controller/WmToMoveGoodsController.java @@ -161,12 +161,12 @@ public class WmToMoveGoodsController extends BaseController { ); message = "批量保存成功"; String movesta = "已完成"; - try { - movesta = ResourceUtil.getConfigByName("wm.movesta"); - - } catch (Exception e) { - - } +// try { +// movesta = ResourceUtil.getConfigByName("wm.movesta"); +// +// } catch (Exception e) { +// +// } wmToMoveGoods.setMoveSta(movesta); wmToMoveGoodsService.updateEntitie(wmToMoveGoods); @@ -299,12 +299,12 @@ public class WmToMoveGoodsController extends BaseController { } else { message = "批量保存成功"; String movesta = "已完成"; - try { - movesta = ResourceUtil.getConfigByName("wm.movesta"); - - } catch (Exception e) { - - } +// try { +// movesta = ResourceUtil.getConfigByName("wm.movesta"); +// +// } catch (Exception e) { +// +// } t.setMoveSta(movesta); MyBeanUtils.copyBeanNotNull2Bean(jeecgDemo, t); systemService.saveOrUpdate(t); @@ -548,12 +548,12 @@ public class WmToMoveGoodsController extends BaseController { // }else{ String movesta = "已完成"; - try { - movesta = ResourceUtil.getConfigByName("wm.movesta"); - - } catch (Exception e) { - - } +// try { +// movesta = ResourceUtil.getConfigByName("wm.movesta"); +// +// } catch (Exception e) { +// +// } t.setMoveSta(movesta); wmToMoveGoodsService.saveOrUpdate(t); D0.setOK(true); diff --git a/src/main/java/org/jeecgframework/web/system/service/impl/SystemServiceImpl.java b/src/main/java/org/jeecgframework/web/system/service/impl/SystemServiceImpl.java index 799f4ce1..f50147e1 100644 --- a/src/main/java/org/jeecgframework/web/system/service/impl/SystemServiceImpl.java +++ b/src/main/java/org/jeecgframework/web/system/service/impl/SystemServiceImpl.java @@ -40,250 +40,257 @@ import org.springframework.util.StringUtils; @Service("systemService") @Transactional public class SystemServiceImpl extends CommonServiceImpl implements SystemService { - @Autowired - private JeecgDictDao jeecgDictDao; - - @Override - public TSUser checkUserExits(TSUser user) throws Exception { - return this.commonDao.getUserByUserIdAndUserNameExits(user); - } - - @Override - public List queryDict(String dicTable, String dicCode, String dicText){ - List dictList = null; - //step.1 如果没有字典表则使用系统字典表 - if(StringUtil.isEmpty(dicTable)){ - dictList = jeecgDictDao.querySystemDict(dicCode); - for(DictEntity t:dictList){ - t.setTypename(MutiLangUtil.getMutiLangInstance().getLang(t.getTypename())); - } - }else { - dicText = StringUtil.isEmpty(dicText, dicCode); - dictList = jeecgDictDao.queryCustomDict(dicTable, dicCode, dicText); - } - return dictList; - } - - /** - * 添加日志 - */ - @Override - public void addLog(String logcontent, Short loglevel, Short operatetype) { - HttpServletRequest request = ContextHolderUtils.getRequest(); - String broswer = BrowserUtils.checkBrowse(request); - TSLog log = new TSLog(); - log.setLogcontent(logcontent); - log.setLoglevel(loglevel); - log.setOperatetype(operatetype); - log.setNote(oConvertUtils.getIp()); - log.setBroswer(broswer); - /*start dangzhenghui 201703016TASK #1784 【online bug】Online 表单保存的时候，报错*/ - log.setOperatetime(new Date()); - /* end dangzhenghui 201703016TASK #1784 【online bug】Online 表单保存的时候，报错*/ - log.setTSUser(ResourceUtil.getSessionUserName()); - commonDao.save(log); - } - - /** - * 根据类型编码和类型名称获取Type,如果为空则创建一个 - * - * @param typecode - * @param typename - * @return - */ - @Override - public TSType getType(String typecode, String typename, TSTypegroup tsTypegroup) { - //TSType actType = commonDao.findUniqueByProperty(TSType.class, "typecode", typecode,tsTypegroup.getId()); - List ls = commonDao.findHql("from TSType where typecode = ? and typegroupid = ?",typecode,tsTypegroup.getId()); - TSType actType = null; - if (ls == null || ls.size()==0) { - actType = new TSType(); - actType.setTypecode(typecode); - actType.setTypename(typename); - actType.setTSTypegroup(tsTypegroup); - commonDao.save(actType); - }else{ - actType = ls.get(0); - } - return actType; - - } - - /** - * 根据类型分组编码和名称获取TypeGroup,如果为空则创建一个 - * - * @param typegroupcode - * @param typgroupename - * @return - */ - @Override - public TSTypegroup getTypeGroup(String typegroupcode, String typgroupename) { - TSTypegroup tsTypegroup = commonDao.findUniqueByProperty(TSTypegroup.class, "typegroupcode", typegroupcode); - if (tsTypegroup == null) { - tsTypegroup = new TSTypegroup(); - tsTypegroup.setTypegroupcode(typegroupcode); - tsTypegroup.setTypegroupname(typgroupename); - commonDao.save(tsTypegroup); - } - return tsTypegroup; - } - - - @Override - public TSTypegroup getTypeGroupByCode(String typegroupCode) { - TSTypegroup tsTypegroup = commonDao.findUniqueByProperty(TSTypegroup.class, "typegroupcode", typegroupCode); - return tsTypegroup; - } - - - @Override - public void initAllTypeGroups() { - List typeGroups = this.commonDao.loadAll(TSTypegroup.class); - for (TSTypegroup tsTypegroup : typeGroups) { - ResourceUtil.allTypeGroups.put(tsTypegroup.getTypegroupcode().toLowerCase(), tsTypegroup); - List types = this.commonDao.findByProperty(TSType.class, "TSTypegroup.id", tsTypegroup.getId()); - ResourceUtil.allTypes.put(tsTypegroup.getTypegroupcode().toLowerCase(), types); - } - } - - - @Override - public void refleshTypesCach(TSType type) { - TSTypegroup tsTypegroup = type.getTSTypegroup(); - TSTypegroup typeGroupEntity = this.commonDao.get(TSTypegroup.class, tsTypegroup.getId()); - List types = this.commonDao.findByProperty(TSType.class, "TSTypegroup.id", tsTypegroup.getId()); - ResourceUtil.allTypes.put(typeGroupEntity.getTypegroupcode().toLowerCase(), types); - } - - - @Override - public void refleshTypeGroupCach() { - ResourceUtil.allTypeGroups.clear(); - List typeGroups = this.commonDao.loadAll(TSTypegroup.class); - for (TSTypegroup tsTypegroup : typeGroups) { - ResourceUtil.allTypeGroups.put(tsTypegroup.getTypegroupcode().toLowerCase(), tsTypegroup); - } - } - - - /** - * 根据角色ID 和 菜单Id 获取 具有操作权限的按钮Codes - * @param roleId - * @param functionId - * @return - */ - @Override - public Set getOperationCodesByRoleIdAndFunctionId(String roleId, String functionId) { - Set operationCodes = new HashSet(); - TSRole role = commonDao.get(TSRole.class, roleId); - CriteriaQuery cq1 = new CriteriaQuery(TSRoleFunction.class); - cq1.eq("TSRole.id", role.getId()); - cq1.eq("TSFunction.id", functionId); - cq1.add(); - List rFunctions = getListByCriteriaQuery(cq1, false); - if (null != rFunctions && rFunctions.size() > 0) { - TSRoleFunction tsRoleFunction = rFunctions.get(0); - if (null != tsRoleFunction.getOperation()) { - String[] operationArry = tsRoleFunction.getOperation().split(","); - for (int i = 0; i < operationArry.length; i++) { - operationCodes.add(operationArry[i]); - } - } - } - return operationCodes; - } - - /** - * 根据用户ID 和 菜单Id 获取 具有操作权限的按钮Codes - * @param userId - * @param functionId - * @return - */ - @Override - public Set getOperationCodesByUserIdAndFunctionId(String userId, String functionId) { - Set operationCodes = new HashSet(); - List rUsers = findByProperty(TSRoleUser.class, "TSUser.id", userId); - for (TSRoleUser ru : rUsers) { - TSRole role = ru.getTSRole(); - CriteriaQuery cq1 = new CriteriaQuery(TSRoleFunction.class); - cq1.eq("TSRole.id", role.getId()); - cq1.eq("TSFunction.id", functionId); - cq1.add(); - List rFunctions = getListByCriteriaQuery(cq1, false); - if (null != rFunctions && rFunctions.size() > 0) { - TSRoleFunction tsRoleFunction = rFunctions.get(0); - if (null != tsRoleFunction.getOperation()) { - String[] operationArry = tsRoleFunction.getOperation().split(","); - for (int i = 0; i < operationArry.length; i++) { - operationCodes.add(operationArry[i]); - } - } - } - } - return operationCodes; - } - /** - * 获取页面控件权限控制的 - * JS片段 - */ - @Override - public String getAuthFilterJS() { - StringBuilder out = new StringBuilder(); - out.append(""); - return out.toString(); - } - - @Override - public void flushRoleFunciton(String id, TSFunction newFunction) { - TSFunction functionEntity = this.getEntity(TSFunction.class, id); - if (functionEntity.getTSIcon() == null || !StringUtil.isNotEmpty(functionEntity.getTSIcon().getId())) { - return; - } - TSIcon oldIcon = this.getEntity(TSIcon.class, functionEntity.getTSIcon().getId()); - if (!oldIcon.getIconClas().equals(newFunction.getTSIcon().getIconClas())) { - // 刷新缓存 - HttpSession session = ContextHolderUtils.getSession(); - TSUser user = ResourceUtil.getSessionUserName(); - List rUsers = this.findByProperty(TSRoleUser.class, "TSUser.id", user.getId()); - for (TSRoleUser ru : rUsers) { - TSRole role = ru.getTSRole(); - session.removeAttribute(role.getId()); - } - } - } + @Autowired + private JeecgDictDao jeecgDictDao; @Override - public String generateOrgCode(String id, String pid) { + public TSUser checkUserExits(TSUser user) throws Exception { + return this.commonDao.getUserByUserIdAndUserNameExits(user); + } + + @Override + public List queryDict(String dicTable, String dicCode, String dicText) { + List dictList = null; + //step.1 如果没有字典表则使用系统字典表 + if (StringUtil.isEmpty(dicTable)) { + dictList = jeecgDictDao.querySystemDict(dicCode); + for (DictEntity t : dictList) { + t.setTypename(MutiLangUtil.getMutiLangInstance().getLang(t.getTypename())); + } + } else { + dicText = StringUtil.isEmpty(dicText, dicCode); + dictList = jeecgDictDao.queryCustomDict(dicTable, dicCode, dicText); + } + return dictList; + } + + /** + * 添加日志 + */ + @Override + public void addLog(String logcontent, Short loglevel, Short operatetype) { + HttpServletRequest request = ContextHolderUtils.getRequest(); + String broswer = BrowserUtils.checkBrowse(request); + TSLog log = new TSLog(); + log.setLogcontent(logcontent); + log.setLoglevel(loglevel); + log.setOperatetype(operatetype); + log.setNote(oConvertUtils.getIp()); + log.setBroswer(broswer); + /*start dangzhenghui 201703016TASK #1784 【online bug】Online 表单保存的时候，报错*/ + log.setOperatetime(new Date()); + /* end dangzhenghui 201703016TASK #1784 【online bug】Online 表单保存的时候，报错*/ + try { + log.setTSUser(ResourceUtil.getSessionUser()); + } catch (Exception e) { + e.printStackTrace(); + } + commonDao.save(log); + } + + /** + * 根据类型编码和类型名称获取Type,如果为空则创建一个 + * + * @param typecode + * @param typename + * @return + */ + @Override + public TSType getType(String typecode, String typename, TSTypegroup tsTypegroup) { + //TSType actType = commonDao.findUniqueByProperty(TSType.class, "typecode", typecode,tsTypegroup.getId()); + List ls = commonDao.findHql("from TSType where typecode = ? and typegroupid = ?", typecode, tsTypegroup.getId()); + TSType actType = null; + if (ls == null || ls.size() == 0) { + actType = new TSType(); + actType.setTypecode(typecode); + actType.setTypename(typename); + actType.setTSTypegroup(tsTypegroup); + commonDao.save(actType); + } else { + actType = ls.get(0); + } + return actType; + + } + + /** + * 根据类型分组编码和名称获取TypeGroup,如果为空则创建一个 + * + * @param typegroupcode + * @param typgroupename + * @return + */ + @Override + public TSTypegroup getTypeGroup(String typegroupcode, String typgroupename) { + TSTypegroup tsTypegroup = commonDao.findUniqueByProperty(TSTypegroup.class, "typegroupcode", typegroupcode); + if (tsTypegroup == null) { + tsTypegroup = new TSTypegroup(); + tsTypegroup.setTypegroupcode(typegroupcode); + tsTypegroup.setTypegroupname(typgroupename); + commonDao.save(tsTypegroup); + } + return tsTypegroup; + } + + + @Override + public TSTypegroup getTypeGroupByCode(String typegroupCode) { + TSTypegroup tsTypegroup = commonDao.findUniqueByProperty(TSTypegroup.class, "typegroupcode", typegroupCode); + return tsTypegroup; + } + + + @Override + public void initAllTypeGroups() { + List typeGroups = this.commonDao.loadAll(TSTypegroup.class); + for (TSTypegroup tsTypegroup : typeGroups) { + ResourceUtil.allTypeGroups.put(tsTypegroup.getTypegroupcode().toLowerCase(), tsTypegroup); + List types = this.commonDao.findByProperty(TSType.class, "TSTypegroup.id", tsTypegroup.getId()); + ResourceUtil.allTypes.put(tsTypegroup.getTypegroupcode().toLowerCase(), types); + } + } + + + @Override + public void refleshTypesCach(TSType type) { + TSTypegroup tsTypegroup = type.getTSTypegroup(); + TSTypegroup typeGroupEntity = this.commonDao.get(TSTypegroup.class, tsTypegroup.getId()); + List types = this.commonDao.findByProperty(TSType.class, "TSTypegroup.id", tsTypegroup.getId()); + ResourceUtil.allTypes.put(typeGroupEntity.getTypegroupcode().toLowerCase(), types); + } + + + @Override + public void refleshTypeGroupCach() { + ResourceUtil.allTypeGroups.clear(); + List typeGroups = this.commonDao.loadAll(TSTypegroup.class); + for (TSTypegroup tsTypegroup : typeGroups) { + ResourceUtil.allTypeGroups.put(tsTypegroup.getTypegroupcode().toLowerCase(), tsTypegroup); + } + } + + + /** + * 根据角色ID 和 菜单Id 获取 具有操作权限的按钮Codes + * + * @param roleId + * @param functionId + * @return + */ + @Override + public Set getOperationCodesByRoleIdAndFunctionId(String roleId, String functionId) { + Set operationCodes = new HashSet(); + TSRole role = commonDao.get(TSRole.class, roleId); + CriteriaQuery cq1 = new CriteriaQuery(TSRoleFunction.class); + cq1.eq("TSRole.id", role.getId()); + cq1.eq("TSFunction.id", functionId); + cq1.add(); + List rFunctions = getListByCriteriaQuery(cq1, false); + if (null != rFunctions && rFunctions.size() > 0) { + TSRoleFunction tsRoleFunction = rFunctions.get(0); + if (null != tsRoleFunction.getOperation()) { + String[] operationArry = tsRoleFunction.getOperation().split(","); + for (int i = 0; i < operationArry.length; i++) { + operationCodes.add(operationArry[i]); + } + } + } + return operationCodes; + } + + /** + * 根据用户ID 和 菜单Id 获取 具有操作权限的按钮Codes + * + * @param userId + * @param functionId + * @return + */ + @Override + public Set getOperationCodesByUserIdAndFunctionId(String userId, String functionId) { + Set operationCodes = new HashSet(); + List rUsers = findByProperty(TSRoleUser.class, "TSUser.id", userId); + for (TSRoleUser ru : rUsers) { + TSRole role = ru.getTSRole(); + CriteriaQuery cq1 = new CriteriaQuery(TSRoleFunction.class); + cq1.eq("TSRole.id", role.getId()); + cq1.eq("TSFunction.id", functionId); + cq1.add(); + List rFunctions = getListByCriteriaQuery(cq1, false); + if (null != rFunctions && rFunctions.size() > 0) { + TSRoleFunction tsRoleFunction = rFunctions.get(0); + if (null != tsRoleFunction.getOperation()) { + String[] operationArry = tsRoleFunction.getOperation().split(","); + for (int i = 0; i < operationArry.length; i++) { + operationCodes.add(operationArry[i]); + } + } + } + } + return operationCodes; + } + + /** + * 获取页面控件权限控制的 + * JS片段 + */ + @Override + public String getAuthFilterJS() { + StringBuilder out = new StringBuilder(); + out.append(""); + return out.toString(); + } + + @Override + public void flushRoleFunciton(String id, TSFunction newFunction) { + TSFunction functionEntity = this.getEntity(TSFunction.class, id); + if (functionEntity.getTSIcon() == null || !StringUtil.isNotEmpty(functionEntity.getTSIcon().getId())) { + return; + } + TSIcon oldIcon = this.getEntity(TSIcon.class, functionEntity.getTSIcon().getId()); + if (!oldIcon.getIconClas().equals(newFunction.getTSIcon().getIconClas())) { + // 刷新缓存 + HttpSession session = ContextHolderUtils.getSession(); + TSUser user = ResourceUtil.getSessionUserName(); + List rUsers = this.findByProperty(TSRoleUser.class, "TSUser.id", user.getId()); + for (TSRoleUser ru : rUsers) { + TSRole role = ru.getTSRole(); + session.removeAttribute(role.getId()); + } + } + } + + @Override + public String generateOrgCode(String id, String pid) { int orgCodeLength = 2; // 默认编码长度 if ("3".equals(ResourceUtil.getOrgCodeLengthType())) { // 类型2-编码长度为3，如001 @@ -291,11 +298,11 @@ public class SystemServiceImpl extends CommonServiceImpl implements SystemServic } - String newOrgCode = ""; - if(!StringUtils.hasText(pid)) { // 第一级编码 + String newOrgCode = ""; + if (!StringUtils.hasText(pid)) { // 第一级编码 String sql = "select max(t.org_code) orgCode from t_s_depart t where t.parentdepartid is null"; Map pOrgCodeMap = commonDao.findOneForJdbc(sql); - if(pOrgCodeMap.get("orgCode") != null) { + if (pOrgCodeMap.get("orgCode") != null) { String curOrgCode = pOrgCodeMap.get("orgCode").toString(); newOrgCode = String.format("%0" + orgCodeLength + "d", Integer.valueOf(curOrgCode) + 1); } else { @@ -304,7 +311,7 @@ public class SystemServiceImpl extends CommonServiceImpl implements SystemServic } else { // 下级编码 String sql = "select max(t.org_code) orgCode from t_s_depart t where t.parentdepartid = ?"; Map orgCodeMap = commonDao.findOneForJdbc(sql, pid); - if(orgCodeMap.get("orgCode") != null) { // 当前基本有编码时 + if (orgCodeMap.get("orgCode") != null) { // 当前基本有编码时 String curOrgCode = orgCodeMap.get("orgCode").toString(); String pOrgCode = curOrgCode.substring(0, curOrgCode.length() - orgCodeLength); String subOrgCode = curOrgCode.substring(curOrgCode.length() - orgCodeLength, curOrgCode.length()); @@ -320,96 +327,102 @@ public class SystemServiceImpl extends CommonServiceImpl implements SystemServic return newOrgCode; } - @Override - public Set getOperationCodesByRoleIdAndruleDataId(String roleId, - String functionId) { - Set operationCodes = new HashSet(); - TSRole role = commonDao.get(TSRole.class, roleId); - CriteriaQuery cq1 = new CriteriaQuery(TSRoleFunction.class); - cq1.eq("TSRole.id", role.getId()); - cq1.eq("TSFunction.id", functionId); - cq1.add(); - List rFunctions = getListByCriteriaQuery(cq1, false); - if (null != rFunctions && rFunctions.size() > 0) { - TSRoleFunction tsRoleFunction = rFunctions.get(0); - if (null != tsRoleFunction.getDataRule()) { - String[] operationArry = tsRoleFunction.getDataRule().split(","); - for (int i = 0; i < operationArry.length; i++) { - operationCodes.add(operationArry[i]); - } - } - } - return operationCodes; - } + @Override + public Set getOperationCodesByRoleIdAndruleDataId(String roleId, + String functionId) { + Set operationCodes = new HashSet(); + TSRole role = commonDao.get(TSRole.class, roleId); + CriteriaQuery cq1 = new CriteriaQuery(TSRoleFunction.class); + cq1.eq("TSRole.id", role.getId()); + cq1.eq("TSFunction.id", functionId); + cq1.add(); + List rFunctions = getListByCriteriaQuery(cq1, false); + if (null != rFunctions && rFunctions.size() > 0) { + TSRoleFunction tsRoleFunction = rFunctions.get(0); + if (null != tsRoleFunction.getDataRule()) { + String[] operationArry = tsRoleFunction.getDataRule().split(","); + for (int i = 0; i < operationArry.length; i++) { + operationCodes.add(operationArry[i]); + } + } + } + return operationCodes; + } - @Override - public Set getOperationCodesByUserIdAndDataId(String userId, - String functionId) { - // TODO Auto-generated method stub - Set dataRulecodes = new HashSet(); - List rUsers = findByProperty(TSRoleUser.class, "TSUser.id", userId); - for (TSRoleUser ru : rUsers) { - TSRole role = ru.getTSRole(); - CriteriaQuery cq1 = new CriteriaQuery(TSRoleFunction.class); - cq1.eq("TSRole.id", role.getId()); - cq1.eq("TSFunction.id", functionId); - cq1.add(); - List rFunctions = getListByCriteriaQuery(cq1, false); - if (null != rFunctions && rFunctions.size() > 0) { - TSRoleFunction tsRoleFunction = rFunctions.get(0); - if (null != tsRoleFunction.getDataRule()) { - String[] operationArry = tsRoleFunction.getDataRule().split(","); - for (int i = 0; i < operationArry.length; i++) { - dataRulecodes.add(operationArry[i]); - } - } - } - } - return dataRulecodes; - } - /** - * 加载所有图标 - * @return - */ - @Override - public void initAllTSIcons() { - List list = this.loadAll(TSIcon.class); - for (TSIcon tsIcon : list) { - ResourceUtil.allTSIcons.put(tsIcon.getId(), tsIcon); - } - } - /** - * 更新图标 - * @param icon - */ - @Override - public void upTSIcons(TSIcon icon) { - ResourceUtil.allTSIcons.put(icon.getId(), icon); - } - /** - * 更新图标 - * @param icon - */ - @Override - public void delTSIcons(TSIcon icon) { - ResourceUtil.allTSIcons.remove(icon.getId()); - } + @Override + public Set getOperationCodesByUserIdAndDataId(String userId, + String functionId) { + // TODO Auto-generated method stub + Set dataRulecodes = new HashSet(); + List rUsers = findByProperty(TSRoleUser.class, "TSUser.id", userId); + for (TSRoleUser ru : rUsers) { + TSRole role = ru.getTSRole(); + CriteriaQuery cq1 = new CriteriaQuery(TSRoleFunction.class); + cq1.eq("TSRole.id", role.getId()); + cq1.eq("TSFunction.id", functionId); + cq1.add(); + List rFunctions = getListByCriteriaQuery(cq1, false); + if (null != rFunctions && rFunctions.size() > 0) { + TSRoleFunction tsRoleFunction = rFunctions.get(0); + if (null != tsRoleFunction.getDataRule()) { + String[] operationArry = tsRoleFunction.getDataRule().split(","); + for (int i = 0; i < operationArry.length; i++) { + dataRulecodes.add(operationArry[i]); + } + } + } + } + return dataRulecodes; + } - @Override - public void addDataLog(String tableName, String dataId, String dataContent) { + /** + * 加载所有图标 + * + * @return + */ + @Override + public void initAllTSIcons() { + List list = this.loadAll(TSIcon.class); + for (TSIcon tsIcon : list) { + ResourceUtil.allTSIcons.put(tsIcon.getId(), tsIcon); + } + } - int versionNumber = 0; + /** + * 更新图标 + * + * @param icon + */ + @Override + public void upTSIcons(TSIcon icon) { + ResourceUtil.allTSIcons.put(icon.getId(), icon); + } - Integer integer = commonDao.singleResult("select max(versionNumber) from TSDatalogEntity where tableName = '" + tableName + "' and dataId = '" + dataId + "'"); - if (integer != null) { - versionNumber = integer.intValue(); - } + /** + * 更新图标 + * + * @param icon + */ + @Override + public void delTSIcons(TSIcon icon) { + ResourceUtil.allTSIcons.remove(icon.getId()); + } - TSDatalogEntity tsDatalogEntity = new TSDatalogEntity(); - tsDatalogEntity.setTableName(tableName); - tsDatalogEntity.setDataId(dataId); - tsDatalogEntity.setDataContent(dataContent); - tsDatalogEntity.setVersionNumber(versionNumber + 1); - commonDao.save(tsDatalogEntity); - } + @Override + public void addDataLog(String tableName, String dataId, String dataContent) { + + int versionNumber = 0; + + Integer integer = commonDao.singleResult("select max(versionNumber) from TSDatalogEntity where tableName = '" + tableName + "' and dataId = '" + dataId + "'"); + if (integer != null) { + versionNumber = integer.intValue(); + } + + TSDatalogEntity tsDatalogEntity = new TSDatalogEntity(); + tsDatalogEntity.setTableName(tableName); + tsDatalogEntity.setDataId(dataId); + tsDatalogEntity.setDataContent(dataContent); + tsDatalogEntity.setVersionNumber(versionNumber + 1); + commonDao.save(tsDatalogEntity); + } } diff --git a/src/main/resources/sysConfig.properties b/src/main/resources/sysConfig.properties index ede23f2e..53b01a3b 100644 --- a/src/main/resources/sysConfig.properties +++ b/src/main/resources/sysConfig.properties @@ -203,7 +203,7 @@ wms.yskz=A sys.del=database wm.alldown=yes -wm.movesta= +wm.movesta=??? cus.role=KH sys.weight=off