Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManagerImpl.java =================================================================== diff -u -r31368 -r31894 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManagerImpl.java (.../MaintainManagerImpl.java) (revision 31368) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManagerImpl.java (.../MaintainManagerImpl.java) (revision 31894) @@ -202,6 +202,8 @@ import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseDefinitionManager; import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseInstanceManager; import com.forgon.disinfectsystem.washanddisinfectmanager.washanddisinfectrecord.service.WashAndDisinfectRecordManager; +import com.forgon.security.model.Operation; +import com.forgon.security.model.Role; import com.forgon.systemsetting.model.HttpOption; import com.forgon.tools.GB2Alpha; import com.forgon.tools.GB2WB; @@ -1552,9 +1554,49 @@ case "4.9.75_4.9.76": UpdateData_4_9_75_4_9_76(updateDataContext); break; + case "4.9.79_4.9.80": + UpdateData_4_9_79_4_9_80(updateDataContext); + break; } return false; } + + /** + * 配置项enableUrgentFunction的值为true的项目,要给系统中的所有角色,都赋予【显示加急级别和加急数量】的权限。 + * @param updateDataContext + */ + @SuppressWarnings("unchecked") + private void UpdateData_4_9_79_4_9_80(UpdateDataContext updateDataContext){ + boolean enableUrgentFunction = ConfigUtils.getSystemSetConfigByNameBool("enableUrgentFunction"); + if(!enableUrgentFunction){ + return; + } + List operationList = objectDao.findByProperty(Operation.class.getSimpleName(), "operationId", "SSTS_ShowUrgentLevelAndUrgentAmount"); + if(CollectionUtils.isEmpty(operationList)){ + return; + } + Operation operation = operationList.get(0); + String hql = String.format("select po from %s po where po.name <> '%s'", Role.class.getSimpleName(), "ROLE_ADMINISTRATOR_0"); + List roleList = objectDao.findByHql(hql); + if(CollectionUtils.isEmpty(roleList)){ + return; + } + for (Role role : roleList) { + Set operationSet = role.getOperations(); + if(CollectionUtils.isEmpty(operationSet)){ + continue; + } + operationSet.add(operation); + role.setOperations(operationSet); + } + objectDao.batchSaveOrUpdate(roleList); + DataUpdater dataUpdater = updateDataContext.getDataUpdater(); + String msg = null; + msg = String.format("已执行方法(%s.%s)!", + MaintainManagerImpl.class.getName(), + "UpdateData_4_9_79_4_9_80()"); + dataUpdater.logInfo(msg); + } /** * 装配采集图片和装配采集视频改为绑定器械包实例(原来是绑定器械包定义的): @@ -1563,6 +1605,13 @@ * @param updateDataContext */ private void UpdateData_4_9_75_4_9_76(UpdateDataContext updateDataContext) { + + DataUpdater dataUpdater = updateDataContext.getDataUpdater(); + String msg = null; + msg = String.format("已执行方法(%s.%s)!", + MaintainManagerImpl.class.getName(), + "UpdateData_4_9_75_4_9_76()"); + String imageHql = String.format("select po from %s po where po.packingTaskId is null and po.objectId = po.tousseDefinition_id and po.imageType = '%s' ", ImageFile.class.getSimpleName(), ImageFile.IMAGE_TYPE_CAMERA_PACKING); List imageList = objectDao.findByHql(imageHql); @@ -1648,6 +1697,8 @@ objectDao.batchSaveOrUpdate(newVideoFiles); objectDao.batchSaveOrUpdate(delVideoFiles); } + + dataUpdater.logInfo(msg); } private void UpdateData_3_3_8__3_3_9(UpdateDataContext updateDataContext) { Index: forgon-tools/src/main/java/com/forgon/Constants.java =================================================================== diff -u -r31557 -r31894 --- forgon-tools/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 31557) +++ forgon-tools/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 31894) @@ -26,7 +26,7 @@ "4.9.7","4.9.8","4.9.9","4.9.10","4.9.11","4.9.12","4.9.13","4.9.14","4.9.15","4.9.16","4.9.17","4.9.18","4.9.19","4.9.20","4.9.21","4.9.22","4.9.23","4.9.24", "4.9.25","4.9.26","4.9.27","4.9.28","4.9.29","4.9.30","4.9.31","4.9.32","4.9.33","4.9.34","4.9.35","4.9.36","4.9.37","4.9.38","4.9.39","4.9.40","4.9.41","4.9.42","4.9.43","4.9.44", "4.9.45","4.9.46","4.9.47","4.9.48","4.9.49","4.9.50","4.9.51","4.9.52","4.9.53","4.9.54","4.9.55","4.9.56","4.9.57","4.9.58","4.9.59","4.9.60","4.9.61","4.9.62", - "4.9.63","4.9.64","4.9.65","4.9.66","4.9.67","4.9.68","4.9.69","4.9.70","4.9.71","4.9.72","4.9.73","4.9.74","4.9.75","4.9.76","4.9.77","4.9.78","4.9.79"}; + "4.9.63","4.9.64","4.9.65","4.9.66","4.9.67","4.9.68","4.9.69","4.9.70","4.9.71","4.9.72","4.9.73","4.9.74","4.9.75","4.9.76","4.9.77","4.9.78","4.9.79","4.9.80"}; // 版本列表(4.0版本升级4.1版需要分两步:先从4.0升到4.1.0、然后从4.1.0升级4.1最新版本) /*public final static String[] SOFTWARE_VERSION_ARRAY = new String[] {