Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/taskGroup/service/TaskGroupManagerImpl.java =================================================================== diff -u -r16719 -r20793 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/taskGroup/service/TaskGroupManagerImpl.java (.../TaskGroupManagerImpl.java) (revision 16719) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/taskGroup/service/TaskGroupManagerImpl.java (.../TaskGroupManagerImpl.java) (revision 20793) @@ -3,66 +3,22 @@ import java.util.List; import java.util.Map; +import org.apache.commons.lang.StringUtils; + import com.forgon.directory.acegi.tools.AcegiHelper; import com.forgon.directory.vo.LoginUserData; +import com.forgon.disinfectsystem.entity.basedatamanager.taskGroup.TaskGroup; +import com.forgon.tools.hibernate.BasePoManagerImpl; import com.forgon.tools.util.ExtJsUtil; -import org.apache.commons.lang.StringUtils; -import com.forgon.disinfectsystem.entity.basedatamanager.container.Container; -import com.forgon.disinfectsystem.entity.basedatamanager.taskGroup.TaskGroup; -import com.forgon.tools.hibernate.ObjectDao; +public class TaskGroupManagerImpl extends BasePoManagerImpl implements TaskGroupManager { -public class TaskGroupManagerImpl implements TaskGroupManager { - - private ObjectDao objectDao; - - public void setObjectDao(ObjectDao objectDao) { - this.objectDao = objectDao; - } - - - public void save(TaskGroup taskGroup) { - objectDao.save(taskGroup); - } - - - public void update(TaskGroup taskGroup) { - objectDao.update(taskGroup); - } - - - public void delete(TaskGroup taskGroup) { - objectDao.delete(taskGroup); - } - - - public TaskGroup getTaskGroupByID(String id) { - return (TaskGroup) objectDao.getByProperty(TaskGroup.class.getSimpleName(), "id", Long.valueOf(id)); - } - @Override public TaskGroup getTaskGroup(String taskGroupName) { return (TaskGroup) objectDao.getByProperty(TaskGroup.class.getSimpleName(), "taskGroupName", taskGroupName); } - - /** - * 获取系统上的所有任务组 - * @return - */ - @SuppressWarnings("unchecked") - public List findAllTaskGroup() { - return objectDao.findAllObjects(TaskGroup.class.getSimpleName()); - } - @Override - public void deleteTaskGroup(String id) { - objectDao.delete(getTaskGroupByID(id)); - - } - - - @Override public boolean verifyTaskGroup(String id, String taskGroupName) { String sql = "where po.taskGroupName = '" + taskGroupName + "'"; if (StringUtils.isNotEmpty(id)) { @@ -75,10 +31,11 @@ } } + @Override @SuppressWarnings("unchecked") public List findTaskGroupByDepartCode(String departCode) { String sql = "where po.departCode = '"+departCode+"'"; - return (List)objectDao.findBySql(TaskGroup.class.getSimpleName(), sql); + return objectDao.findBySql(TaskGroup.class.getSimpleName(), sql); } @Override Index: ssts-web/src/test/java/test/forgon/disinfectsystem/importbasedata/TestImportbaseData.java =================================================================== diff -u -r19533 -r20793 --- ssts-web/src/test/java/test/forgon/disinfectsystem/importbasedata/TestImportbaseData.java (.../TestImportbaseData.java) (revision 19533) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/importbasedata/TestImportbaseData.java (.../TestImportbaseData.java) (revision 20793) @@ -139,7 +139,7 @@ } // 任务组 private void verifyTaskGroup(){ - List tgs = taskGroupManager.findAllTaskGroup(); + List tgs = taskGroupManager.getAll(); assertNotNull(tgs); List tgNames = new ArrayList(); for(TaskGroup tg : tgs){ Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r20708 -r20793 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 20708) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 20793) @@ -1302,7 +1302,7 @@ return retObj.toString(); } - private List getWaitPackingTaskTaskVoList(String taskGroup, String basketBarcode) { + public List getWaitPackingTaskTaskVoList(String taskGroup, String basketBarcode) { List taskVos = new ArrayList(); if(StringUtils.isBlank(taskGroup)){ @@ -6659,6 +6659,7 @@ } } + @Override public void interfere_modifyPackingTime(String id,String packingTime){ PackingRecord pr = (PackingRecord)objectDao.getByID_ForUpdate(PackingRecord.class.getSimpleName(), id); if(pr == null){ Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/taskGroup/service/TaskGroupManager.java =================================================================== diff -u -r16719 -r20793 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/taskGroup/service/TaskGroupManager.java (.../TaskGroupManager.java) (revision 16719) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/taskGroup/service/TaskGroupManager.java (.../TaskGroupManager.java) (revision 20793) @@ -4,34 +4,19 @@ import java.util.Map; import com.forgon.disinfectsystem.entity.basedatamanager.taskGroup.TaskGroup; +import com.forgon.tools.hibernate.BasePoManager; -public interface TaskGroupManager { +public interface TaskGroupManager extends BasePoManager { - public void save(TaskGroup taskGroup); - - public void update(TaskGroup taskGroup); - - public void delete(TaskGroup taskGroup); - - public void deleteTaskGroup(String id); - public boolean verifyTaskGroup(String id,String taskGroupName); - public TaskGroup getTaskGroupByID(String id); - /** * 根据任务组的名称获取任务组 * @param taskGroupName 任务组的名称，在数据库中是唯一的，界面添加的时候有做校验 * @return 返回名称对应的任务组。如果没有找到，返回null。 */ public TaskGroup getTaskGroup(String taskGroupName); - /** - * 获取系统上的所有任务组 - * @return - */ - public List findAllTaskGroup(); - public List findTaskGroupByDepartCode(String departCode); /** Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBaseDataFromZipManagerImpl.java =================================================================== diff -u -r20001 -r20793 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBaseDataFromZipManagerImpl.java (.../ImportBaseDataFromZipManagerImpl.java) (revision 20001) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBaseDataFromZipManagerImpl.java (.../ImportBaseDataFromZipManagerImpl.java) (revision 20793) @@ -279,6 +279,7 @@ } private ThreadLocal defaultGson = new ThreadLocal(){ + @Override protected Gson initialValue() { return new Gson(); }; @@ -493,7 +494,7 @@ private void importTaskGroup(JsonObject root){ String[] taskGroupsFromJson = defaultGson.get().fromJson(root.get("TaskGroups"), String[].class); - Collection taskGroupsFromDB = taskGroupManager.findAllTaskGroup(); + Collection taskGroupsFromDB = taskGroupManager.getAll(); for(final String taskGroupFromJson : taskGroupsFromJson){ boolean exists = CollectionUtils.exists(taskGroupsFromDB, new Predicate() { @Override Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java =================================================================== diff -u -r20497 -r20793 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java (.../TousseDefinitionAction.java) (revision 20497) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java (.../TousseDefinitionAction.java) (revision 20793) @@ -1241,7 +1241,7 @@ // } //处理科室 String handlerDepartCode = StrutsParamUtils.getPraramValue("handlerDepartCode", ""); - List taskGroupList = taskGroupManager.findAllTaskGroup(); + List taskGroupList = taskGroupManager.getAll(); List> taskGroupNameList = new ArrayList>(); for(TaskGroup taskGroup : taskGroupList){ List tempList = new ArrayList(); @@ -1266,7 +1266,7 @@ * [['任务组1','科室编码1','科室名称1'],['任务组2','科室编码2','科室名称2']] */ public void getTaskGroupList() { - List taskGroupList = taskGroupManager.findAllTaskGroup(); + List taskGroupList = taskGroupManager.getAll(); List> taskGroupNameList = new ArrayList>(); for(TaskGroup taskGroup : taskGroupList){ List tempList = new ArrayList(); Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/taskGroup/action/TaskGroupAction.java =================================================================== diff -u -r16631 -r20793 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/taskGroup/action/TaskGroupAction.java (.../TaskGroupAction.java) (revision 16631) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/taskGroup/action/TaskGroupAction.java (.../TaskGroupAction.java) (revision 20793) @@ -5,24 +5,12 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; import javax.servlet.http.HttpServletResponse; -import com.forgon.directory.acegi.tools.AcegiHelper; -import com.forgon.directory.vo.LoginUserData; -import com.forgon.tools.StrutsResponseUtils; -import com.forgon.tools.util.PageUtil; import net.sf.json.JSONArray; import net.sf.json.JSONObject; - - - - - - - import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; @@ -33,6 +21,8 @@ import com.forgon.disinfectsystem.basedatamanager.taskGroup.service.TaskGroupManager; import com.forgon.disinfectsystem.entity.basedatamanager.taskGroup.TaskGroup; import com.forgon.tools.StrutsParamUtils; +import com.forgon.tools.StrutsResponseUtils; +import com.forgon.tools.util.PageUtil; import com.opensymphony.xwork2.ModelDriven; import com.opensymphony.xwork2.Preparable; @@ -81,14 +71,8 @@ public void saveTaskGroup(){ if(taskGroup != null){ - String taskGroupName = StrutsParamUtils.getPraramValue("taskGroupName", ""); taskGroupManager.save(taskGroup); - HttpServletResponse httpServletResponse = StrutsParamUtils.getResponse(); - try { - httpServletResponse.getWriter().print("{success:true}"); - } catch (Exception e) { - e.printStackTrace(); - } + StrutsResponseUtils.output(true); } } @@ -153,38 +137,30 @@ public void deleteTaskGroup(){ String ids = StrutsParamUtils.getPraramValue("ids", ""); - String message = ""; + boolean success = false; try { if (StringUtils.isNotBlank(ids)) { - String[] str = ids.split(";"); - for (String id : str) { - taskGroupManager.deleteTaskGroup(id); - } - message = "{success:true}"; + taskGroupManager.delete(ids, ";"); + success = true; } } catch (Exception e) { - message = "{success:false}"; + success = false; e.printStackTrace(); } - HttpServletResponse httpServletResponse = StrutsParamUtils - .getResponse(); - httpServletResponse.setCharacterEncoding("UTF-8"); - try { - httpServletResponse.getWriter().print(message); - } catch (IOException e) { - e.printStackTrace(); - } + StrutsResponseUtils.output(success); } + @Override public TaskGroup getModel() { return taskGroup; } + @Override public void prepare() throws Exception { String id = StrutsParamUtils.getPraramValue("id", ""); if(StringUtils.isNotBlank(id) && !id.equals("0")){ - taskGroup = taskGroupManager.getTaskGroupByID(id); + taskGroup = taskGroupManager.get(id); }else{ taskGroup = new TaskGroup(); } Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java =================================================================== diff -u -r20708 -r20793 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java (.../PackingManager.java) (revision 20708) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java (.../PackingManager.java) (revision 20793) @@ -23,6 +23,7 @@ import com.forgon.disinfectsystem.entity.returngoodsrecord.ReturnGoodsRecord; import com.forgon.disinfectsystem.packing.vo.PackingTaskForDisplay; import com.forgon.disinfectsystem.packing.vo.ReviewerVo; +import com.forgon.disinfectsystem.packing.vo.WaitPackingTaskVo; import com.forgon.tools.hibernate.BasePoManager; /** @@ -125,6 +126,13 @@ public String getWaitPackingTaskJson(String taskGroup,String basketBarcode); public JSONArray getWaitPackingTaskJson(String taskGroup); + /** + * 获取装配任务，返回vo对象 + * @param taskGroup + * @param basketBarcode + * @return + */ + public List getWaitPackingTaskTaskVoList(String taskGroup, String basketBarcode); public void createWashedClassifyBasketPackingTask();