Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/urgent/action/UrgentLevelAction.java =================================================================== diff -u -r37003 -r37432 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/urgent/action/UrgentLevelAction.java (.../UrgentLevelAction.java) (revision 37003) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/urgent/action/UrgentLevelAction.java (.../UrgentLevelAction.java) (revision 37432) @@ -6,6 +6,7 @@ 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.struts2.convention.annotation.Action; import org.apache.struts2.convention.annotation.Namespace; @@ -14,6 +15,7 @@ import com.forgon.Constants; import com.forgon.disinfectsystem.basedatamanager.urgent.service.UrgentLevelManager; import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig; +import com.forgon.disinfectsystem.entity.urgent.AllUrgentAdditionalInfo; import com.forgon.disinfectsystem.entity.urgent.UrgentLevel; import com.forgon.tools.StrutsParamUtils; import com.forgon.tools.StrutsResponseUtils; @@ -46,6 +48,52 @@ UrgentLevel ul = urgentLevelManager.get(urgentLevel.getId()); StrutsResponseUtils.output(true, JSONObject.fromObject(ul)); } + /** + * 保存修改扩展信息设置 + */ + public void saveOrUpdateAllUrgentAdditionalInfo(){ + try{ + Long id = StrutsParamUtils.getPraramLongValue("id", 0L); + if(DatabaseUtil.isPoIdValid(id) || objectDao.countBySql("select 1 from " + AllUrgentAdditionalInfo.class.getSimpleName()) > 1){ + String sql = "update "+AllUrgentAdditionalInfo.class.getSimpleName() + + " set expectUseTimeDefauleValue=" + + StrutsParamUtils.getPraramValue("expectUseTimeDefauleValue", 60) + + ",expectUseTimeOflimitTime=" + + StrutsParamUtils.getPraramValue("expectUseTimeOflimitTime", 0); + objectDao.excuteSQL(sql); + }else{ + AllUrgentAdditionalInfo info = new AllUrgentAdditionalInfo(); + info.setExpectUseTimeDefauleValue(StrutsParamUtils.getPraramValue("expectUseTimeDefauleValue", 60)); + info.setExpectUseTimeOflimitTime(StrutsParamUtils.getPraramValue("expectUseTimeOflimitTime", 0)); + objectDao.save(info); + } + StrutsResponseUtils.output(true, "保存成功"); + }catch(RuntimeException e){ + StrutsResponseUtils.output(false, e.getMessage()); + }catch(Exception e){ + StrutsResponseUtils.output(false,"保存失败"); + } + } + /** + * 加载扩展信息设置 + */ + public void loadAllUrgentAdditionalInfo(){ + try { + @SuppressWarnings("unchecked") + List infos = objectDao.findByHql("select po from " + AllUrgentAdditionalInfo.class.getSimpleName() + " po "); + JSONObject obj = new JSONObject(); + if(!CollectionUtils.isEmpty(infos)){ + AllUrgentAdditionalInfo info = infos.get(0); + obj.put("id", info.getId()); + obj.put("expectUseTimeDefauleValue", info.getExpectUseTimeDefauleValue()); + obj.put("expectUseTimeOflimitTime", info.getExpectUseTimeOflimitTime()); + } + StrutsResponseUtils.output(true, obj); + } catch (Exception e) { + e.printStackTrace(); + StrutsResponseUtils.output(false, "读取扩展信息设置失败"); + } + } public void saveUrgentLevel(){ try{ if(urgentLevel != null){ Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/urgent/AllUrgentAdditionalInfo.java =================================================================== diff -u --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/urgent/AllUrgentAdditionalInfo.java (revision 0) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/urgent/AllUrgentAdditionalInfo.java (revision 37432) @@ -0,0 +1,55 @@ +package com.forgon.disinfectsystem.entity.urgent; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; + +import org.hibernate.annotations.Cache; +import org.hibernate.annotations.CacheConcurrencyStrategy; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; +@Entity +@DynamicInsert(false) +@DynamicUpdate(true) +@Table(name = "AllUrgentAdditionalInfo") +@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) +public class AllUrgentAdditionalInfo { + private Long id; + /** + * 预计使用时间默认值 + */ + private Integer expectUseTimeDefauleValue = 60; + /** + * 预计使用时间不得早于默认时间的值 + */ + private Integer expectUseTimeOflimitTime = 0; + @Id + @GeneratedValue(strategy=GenerationType.AUTO) + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + @Column(columnDefinition = "int default 60 not null ") + public Integer getExpectUseTimeDefauleValue() { + return expectUseTimeDefauleValue; + } + + public void setExpectUseTimeDefauleValue(Integer expectUseTimeDefauleValue) { + this.expectUseTimeDefauleValue = expectUseTimeDefauleValue; + } + @Column(columnDefinition = "int default 0 not null ") + public Integer getExpectUseTimeOflimitTime() { + return expectUseTimeOflimitTime; + } + + public void setExpectUseTimeOflimitTime(Integer expectUseTimeOflimitTime) { + this.expectUseTimeOflimitTime = expectUseTimeOflimitTime; + } + +}