diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index c9a3564..49a246c 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -14,7 +14,6 @@ private static final long serialVersionUID = 1L; private long id; - private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private int active;//状态位 private List partitionList; @@ -29,15 +28,6 @@ this.id = id; } - @Column(name = "PG_CODE") - public String getPgCode() { - return pgCode; - } - - public void setPgCode(String pgCode) { - this.pgCode = pgCode; - } - @Column(name = "PG_NAME") public String getPgName() { return pgName; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index c9a3564..49a246c 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -14,7 +14,6 @@ private static final long serialVersionUID = 1L; private long id; - private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private int active;//状态位 private List partitionList; @@ -29,15 +28,6 @@ this.id = id; } - @Column(name = "PG_CODE") - public String getPgCode() { - return pgCode; - } - - public void setPgCode(String pgCode) { - this.pgCode = pgCode; - } - @Column(name = "PG_NAME") public String getPgName() { return pgName; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java index cf299e5..b846952 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java @@ -103,7 +103,7 @@ public PgTextureDto(PgTexture pgTexture) { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); this.setId(String.valueOf(pgTexture.getId())); this.setTextureCode(pgTexture.getTextureCode()); diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index c9a3564..49a246c 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -14,7 +14,6 @@ private static final long serialVersionUID = 1L; private long id; - private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private int active;//状态位 private List partitionList; @@ -29,15 +28,6 @@ this.id = id; } - @Column(name = "PG_CODE") - public String getPgCode() { - return pgCode; - } - - public void setPgCode(String pgCode) { - this.pgCode = pgCode; - } - @Column(name = "PG_NAME") public String getPgName() { return pgName; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java index cf299e5..b846952 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java @@ -103,7 +103,7 @@ public PgTextureDto(PgTexture pgTexture) { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); this.setId(String.valueOf(pgTexture.getId())); this.setTextureCode(pgTexture.getTextureCode()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java index 17b2517..b40ce84 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java @@ -10,7 +10,6 @@ public class PipeGalleryDto implements Serializable { private String id; - private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private String active;//状态位 @@ -22,14 +21,6 @@ this.id = id; } - public String getPgCode() { - return pgCode; - } - - public void setPgCode(String pgCode) { - this.pgCode = pgCode; - } - public String getPgName() { return pgName; } @@ -49,7 +40,6 @@ public PipeGalleryDto(PipeGallery pipeGallery) { this.setId(String.valueOf(pipeGallery.getId())); - this.setPgCode(pipeGallery.getPgCode()); this.setPgName(pipeGallery.getPgName()); this.setActive(String.valueOf(pipeGallery.getActive())); } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index c9a3564..49a246c 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -14,7 +14,6 @@ private static final long serialVersionUID = 1L; private long id; - private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private int active;//状态位 private List partitionList; @@ -29,15 +28,6 @@ this.id = id; } - @Column(name = "PG_CODE") - public String getPgCode() { - return pgCode; - } - - public void setPgCode(String pgCode) { - this.pgCode = pgCode; - } - @Column(name = "PG_NAME") public String getPgName() { return pgName; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java index cf299e5..b846952 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java @@ -103,7 +103,7 @@ public PgTextureDto(PgTexture pgTexture) { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); this.setId(String.valueOf(pgTexture.getId())); this.setTextureCode(pgTexture.getTextureCode()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java index 17b2517..b40ce84 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java @@ -10,7 +10,6 @@ public class PipeGalleryDto implements Serializable { private String id; - private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private String active;//状态位 @@ -22,14 +21,6 @@ this.id = id; } - public String getPgCode() { - return pgCode; - } - - public void setPgCode(String pgCode) { - this.pgCode = pgCode; - } - public String getPgName() { return pgName; } @@ -49,7 +40,6 @@ public PipeGalleryDto(PipeGallery pipeGallery) { this.setId(String.valueOf(pipeGallery.getId())); - this.setPgCode(pipeGallery.getPgCode()); this.setPgName(pipeGallery.getPgName()); this.setActive(String.valueOf(pipeGallery.getActive())); } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java index b2b2a3c..16370c6 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java @@ -16,7 +16,7 @@ @Service public class PipeGalleryManager extends HibernateEntityDao { - public PipeGallery getPipeGalleryByPPgName(String pgName) { + public PipeGallery getPipeGalleryByPgName(String pgName) { Criteria criteria = getSession().createCriteria(PipeGallery.class); criteria.add(Restrictions.eq("pgName", pgName)); criteria.add(Restrictions.eq("active",1)); @@ -36,7 +36,7 @@ criteria.add(Restrictions.eq("active",1)); criteria.addOrder(Order.desc("id")); - List pipeGalleryList=new ArrayList(); + List pipeGalleryList=criteria.list(); if(pipeGalleryList.size()==0||pipeGalleryList==null) return null; List pipeGalleryDtoList=new ArrayList(); diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index c9a3564..49a246c 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -14,7 +14,6 @@ private static final long serialVersionUID = 1L; private long id; - private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private int active;//状态位 private List partitionList; @@ -29,15 +28,6 @@ this.id = id; } - @Column(name = "PG_CODE") - public String getPgCode() { - return pgCode; - } - - public void setPgCode(String pgCode) { - this.pgCode = pgCode; - } - @Column(name = "PG_NAME") public String getPgName() { return pgName; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java index cf299e5..b846952 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java @@ -103,7 +103,7 @@ public PgTextureDto(PgTexture pgTexture) { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); this.setId(String.valueOf(pgTexture.getId())); this.setTextureCode(pgTexture.getTextureCode()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java index 17b2517..b40ce84 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java @@ -10,7 +10,6 @@ public class PipeGalleryDto implements Serializable { private String id; - private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private String active;//状态位 @@ -22,14 +21,6 @@ this.id = id; } - public String getPgCode() { - return pgCode; - } - - public void setPgCode(String pgCode) { - this.pgCode = pgCode; - } - public String getPgName() { return pgName; } @@ -49,7 +40,6 @@ public PipeGalleryDto(PipeGallery pipeGallery) { this.setId(String.valueOf(pipeGallery.getId())); - this.setPgCode(pipeGallery.getPgCode()); this.setPgName(pipeGallery.getPgName()); this.setActive(String.valueOf(pipeGallery.getActive())); } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java index b2b2a3c..16370c6 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java @@ -16,7 +16,7 @@ @Service public class PipeGalleryManager extends HibernateEntityDao { - public PipeGallery getPipeGalleryByPPgName(String pgName) { + public PipeGallery getPipeGalleryByPgName(String pgName) { Criteria criteria = getSession().createCriteria(PipeGallery.class); criteria.add(Restrictions.eq("pgName", pgName)); criteria.add(Restrictions.eq("active",1)); @@ -36,7 +36,7 @@ criteria.add(Restrictions.eq("active",1)); criteria.addOrder(Order.desc("id")); - List pipeGalleryList=new ArrayList(); + List pipeGalleryList=criteria.list(); if(pipeGalleryList.size()==0||pipeGalleryList==null) return null; List pipeGalleryDtoList=new ArrayList(); diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index ef26845..e9536d8 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -123,7 +123,7 @@ String msg = ""; PgDevice pgDevice = new PgDevice(); - PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName); PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); if (pgPartition == null) { result = "false"; @@ -175,7 +175,7 @@ String result = ""; String msg = ""; - PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName); PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); if (pgPartition == null) { result = "false"; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index c9a3564..49a246c 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -14,7 +14,6 @@ private static final long serialVersionUID = 1L; private long id; - private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private int active;//状态位 private List partitionList; @@ -29,15 +28,6 @@ this.id = id; } - @Column(name = "PG_CODE") - public String getPgCode() { - return pgCode; - } - - public void setPgCode(String pgCode) { - this.pgCode = pgCode; - } - @Column(name = "PG_NAME") public String getPgName() { return pgName; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java index cf299e5..b846952 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java @@ -103,7 +103,7 @@ public PgTextureDto(PgTexture pgTexture) { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); this.setId(String.valueOf(pgTexture.getId())); this.setTextureCode(pgTexture.getTextureCode()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java index 17b2517..b40ce84 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java @@ -10,7 +10,6 @@ public class PipeGalleryDto implements Serializable { private String id; - private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private String active;//状态位 @@ -22,14 +21,6 @@ this.id = id; } - public String getPgCode() { - return pgCode; - } - - public void setPgCode(String pgCode) { - this.pgCode = pgCode; - } - public String getPgName() { return pgName; } @@ -49,7 +40,6 @@ public PipeGalleryDto(PipeGallery pipeGallery) { this.setId(String.valueOf(pipeGallery.getId())); - this.setPgCode(pipeGallery.getPgCode()); this.setPgName(pipeGallery.getPgName()); this.setActive(String.valueOf(pipeGallery.getActive())); } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java index b2b2a3c..16370c6 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java @@ -16,7 +16,7 @@ @Service public class PipeGalleryManager extends HibernateEntityDao { - public PipeGallery getPipeGalleryByPPgName(String pgName) { + public PipeGallery getPipeGalleryByPgName(String pgName) { Criteria criteria = getSession().createCriteria(PipeGallery.class); criteria.add(Restrictions.eq("pgName", pgName)); criteria.add(Restrictions.eq("active",1)); @@ -36,7 +36,7 @@ criteria.add(Restrictions.eq("active",1)); criteria.addOrder(Order.desc("id")); - List pipeGalleryList=new ArrayList(); + List pipeGalleryList=criteria.list(); if(pipeGalleryList.size()==0||pipeGalleryList==null) return null; List pipeGalleryDtoList=new ArrayList(); diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index ef26845..e9536d8 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -123,7 +123,7 @@ String msg = ""; PgDevice pgDevice = new PgDevice(); - PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName); PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); if (pgPartition == null) { result = "false"; @@ -175,7 +175,7 @@ String result = ""; String msg = ""; - PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName); PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); if (pgPartition == null) { result = "false"; diff --git a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java index 6d55e33..94ca5eb 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java @@ -61,7 +61,7 @@ PgPartition pgPartition = new PgPartition(); pgPartition.setParCode(parCode); pgPartition.setParName(parName); - pgPartition.setPipeGalleryId(pipeGalleryManager.getPipeGalleryByPPgName(pgName)); + pgPartition.setPipeGalleryId(pipeGalleryManager.getPipeGalleryByPgName(pgName)); pgPartition.setActive(1); logger.info("成功保存"); @@ -105,12 +105,6 @@ return resultMap; } - private String parCode;//分区唯一编号 - private String parName;//分区名称 - private PipeGallery pipeGalleryId;//管廊仓 - private int active;//状态位 - - @POST @Path("editPartition") @Produces(MediaType.APPLICATION_JSON) @@ -126,7 +120,7 @@ PgPartition partition=new PgPartition(); try { - PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName); if (pipeGallery == null) { result = "false"; msg = "不存在该管廊信息"; @@ -146,6 +140,9 @@ msg = "编辑失败"; e.printStackTrace(); } + + resultMap.put("result",result); + resultMap.put("msg",msg); return resultMap; } @@ -172,12 +169,12 @@ { pgPartition.setActive(0); pgPartitionManager.save(pgPartition); - msg="设备分区成功"; + msg="分区删除成功"; result="true"; } }catch(Exception e){ e.printStackTrace(); - msg="设备分区失败"; + msg="分区删除失败"; result="false"; } resultMap.put("msg",msg); diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index c9a3564..49a246c 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -14,7 +14,6 @@ private static final long serialVersionUID = 1L; private long id; - private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private int active;//状态位 private List partitionList; @@ -29,15 +28,6 @@ this.id = id; } - @Column(name = "PG_CODE") - public String getPgCode() { - return pgCode; - } - - public void setPgCode(String pgCode) { - this.pgCode = pgCode; - } - @Column(name = "PG_NAME") public String getPgName() { return pgName; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java index cf299e5..b846952 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java @@ -103,7 +103,7 @@ public PgTextureDto(PgTexture pgTexture) { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); this.setId(String.valueOf(pgTexture.getId())); this.setTextureCode(pgTexture.getTextureCode()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java index 17b2517..b40ce84 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java @@ -10,7 +10,6 @@ public class PipeGalleryDto implements Serializable { private String id; - private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private String active;//状态位 @@ -22,14 +21,6 @@ this.id = id; } - public String getPgCode() { - return pgCode; - } - - public void setPgCode(String pgCode) { - this.pgCode = pgCode; - } - public String getPgName() { return pgName; } @@ -49,7 +40,6 @@ public PipeGalleryDto(PipeGallery pipeGallery) { this.setId(String.valueOf(pipeGallery.getId())); - this.setPgCode(pipeGallery.getPgCode()); this.setPgName(pipeGallery.getPgName()); this.setActive(String.valueOf(pipeGallery.getActive())); } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java index b2b2a3c..16370c6 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java @@ -16,7 +16,7 @@ @Service public class PipeGalleryManager extends HibernateEntityDao { - public PipeGallery getPipeGalleryByPPgName(String pgName) { + public PipeGallery getPipeGalleryByPgName(String pgName) { Criteria criteria = getSession().createCriteria(PipeGallery.class); criteria.add(Restrictions.eq("pgName", pgName)); criteria.add(Restrictions.eq("active",1)); @@ -36,7 +36,7 @@ criteria.add(Restrictions.eq("active",1)); criteria.addOrder(Order.desc("id")); - List pipeGalleryList=new ArrayList(); + List pipeGalleryList=criteria.list(); if(pipeGalleryList.size()==0||pipeGalleryList==null) return null; List pipeGalleryDtoList=new ArrayList(); diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index ef26845..e9536d8 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -123,7 +123,7 @@ String msg = ""; PgDevice pgDevice = new PgDevice(); - PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName); PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); if (pgPartition == null) { result = "false"; @@ -175,7 +175,7 @@ String result = ""; String msg = ""; - PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName); PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); if (pgPartition == null) { result = "false"; diff --git a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java index 6d55e33..94ca5eb 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java @@ -61,7 +61,7 @@ PgPartition pgPartition = new PgPartition(); pgPartition.setParCode(parCode); pgPartition.setParName(parName); - pgPartition.setPipeGalleryId(pipeGalleryManager.getPipeGalleryByPPgName(pgName)); + pgPartition.setPipeGalleryId(pipeGalleryManager.getPipeGalleryByPgName(pgName)); pgPartition.setActive(1); logger.info("成功保存"); @@ -105,12 +105,6 @@ return resultMap; } - private String parCode;//分区唯一编号 - private String parName;//分区名称 - private PipeGallery pipeGalleryId;//管廊仓 - private int active;//状态位 - - @POST @Path("editPartition") @Produces(MediaType.APPLICATION_JSON) @@ -126,7 +120,7 @@ PgPartition partition=new PgPartition(); try { - PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName); if (pipeGallery == null) { result = "false"; msg = "不存在该管廊信息"; @@ -146,6 +140,9 @@ msg = "编辑失败"; e.printStackTrace(); } + + resultMap.put("result",result); + resultMap.put("msg",msg); return resultMap; } @@ -172,12 +169,12 @@ { pgPartition.setActive(0); pgPartitionManager.save(pgPartition); - msg="设备分区成功"; + msg="分区删除成功"; result="true"; } }catch(Exception e){ e.printStackTrace(); - msg="设备分区失败"; + msg="分区删除失败"; result="false"; } resultMap.put("msg",msg); diff --git a/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java b/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java index cf2520c..f90c57e 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java @@ -164,12 +164,12 @@ { pgPatroler.setActive(0); pgPatrolerManager.save(pgPatroler); - msg="设备人员成功"; + msg="删除人员成功"; result="true"; } }catch(Exception e){ e.printStackTrace(); - msg="设备人员失败"; + msg="删除人员失败"; result="false"; } resultMap.put("msg",msg); diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index c9a3564..49a246c 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -14,7 +14,6 @@ private static final long serialVersionUID = 1L; private long id; - private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private int active;//状态位 private List partitionList; @@ -29,15 +28,6 @@ this.id = id; } - @Column(name = "PG_CODE") - public String getPgCode() { - return pgCode; - } - - public void setPgCode(String pgCode) { - this.pgCode = pgCode; - } - @Column(name = "PG_NAME") public String getPgName() { return pgName; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java index cf299e5..b846952 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java @@ -103,7 +103,7 @@ public PgTextureDto(PgTexture pgTexture) { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); this.setId(String.valueOf(pgTexture.getId())); this.setTextureCode(pgTexture.getTextureCode()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java index 17b2517..b40ce84 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java @@ -10,7 +10,6 @@ public class PipeGalleryDto implements Serializable { private String id; - private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private String active;//状态位 @@ -22,14 +21,6 @@ this.id = id; } - public String getPgCode() { - return pgCode; - } - - public void setPgCode(String pgCode) { - this.pgCode = pgCode; - } - public String getPgName() { return pgName; } @@ -49,7 +40,6 @@ public PipeGalleryDto(PipeGallery pipeGallery) { this.setId(String.valueOf(pipeGallery.getId())); - this.setPgCode(pipeGallery.getPgCode()); this.setPgName(pipeGallery.getPgName()); this.setActive(String.valueOf(pipeGallery.getActive())); } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java index b2b2a3c..16370c6 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java @@ -16,7 +16,7 @@ @Service public class PipeGalleryManager extends HibernateEntityDao { - public PipeGallery getPipeGalleryByPPgName(String pgName) { + public PipeGallery getPipeGalleryByPgName(String pgName) { Criteria criteria = getSession().createCriteria(PipeGallery.class); criteria.add(Restrictions.eq("pgName", pgName)); criteria.add(Restrictions.eq("active",1)); @@ -36,7 +36,7 @@ criteria.add(Restrictions.eq("active",1)); criteria.addOrder(Order.desc("id")); - List pipeGalleryList=new ArrayList(); + List pipeGalleryList=criteria.list(); if(pipeGalleryList.size()==0||pipeGalleryList==null) return null; List pipeGalleryDtoList=new ArrayList(); diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index ef26845..e9536d8 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -123,7 +123,7 @@ String msg = ""; PgDevice pgDevice = new PgDevice(); - PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName); PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); if (pgPartition == null) { result = "false"; @@ -175,7 +175,7 @@ String result = ""; String msg = ""; - PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName); PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); if (pgPartition == null) { result = "false"; diff --git a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java index 6d55e33..94ca5eb 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java @@ -61,7 +61,7 @@ PgPartition pgPartition = new PgPartition(); pgPartition.setParCode(parCode); pgPartition.setParName(parName); - pgPartition.setPipeGalleryId(pipeGalleryManager.getPipeGalleryByPPgName(pgName)); + pgPartition.setPipeGalleryId(pipeGalleryManager.getPipeGalleryByPgName(pgName)); pgPartition.setActive(1); logger.info("成功保存"); @@ -105,12 +105,6 @@ return resultMap; } - private String parCode;//分区唯一编号 - private String parName;//分区名称 - private PipeGallery pipeGalleryId;//管廊仓 - private int active;//状态位 - - @POST @Path("editPartition") @Produces(MediaType.APPLICATION_JSON) @@ -126,7 +120,7 @@ PgPartition partition=new PgPartition(); try { - PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName); if (pipeGallery == null) { result = "false"; msg = "不存在该管廊信息"; @@ -146,6 +140,9 @@ msg = "编辑失败"; e.printStackTrace(); } + + resultMap.put("result",result); + resultMap.put("msg",msg); return resultMap; } @@ -172,12 +169,12 @@ { pgPartition.setActive(0); pgPartitionManager.save(pgPartition); - msg="设备分区成功"; + msg="分区删除成功"; result="true"; } }catch(Exception e){ e.printStackTrace(); - msg="设备分区失败"; + msg="分区删除失败"; result="false"; } resultMap.put("msg",msg); diff --git a/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java b/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java index cf2520c..f90c57e 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java @@ -164,12 +164,12 @@ { pgPatroler.setActive(0); pgPatrolerManager.save(pgPatroler); - msg="设备人员成功"; + msg="删除人员成功"; result="true"; } }catch(Exception e){ e.printStackTrace(); - msg="设备人员失败"; + msg="删除人员失败"; result="false"; } resultMap.put("msg",msg); diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java index df10aa6..99ca7fe 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java @@ -97,7 +97,7 @@ String msg = ""; PgPipeLine pgPipeLine=new PgPipeLine(); - PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName); PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); if (pgPartition == null) { result = "false"; @@ -151,7 +151,7 @@ String result = ""; String msg = ""; - PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName); PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); if (pgPartition == null) { result = "false"; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index c9a3564..49a246c 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -14,7 +14,6 @@ private static final long serialVersionUID = 1L; private long id; - private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private int active;//状态位 private List partitionList; @@ -29,15 +28,6 @@ this.id = id; } - @Column(name = "PG_CODE") - public String getPgCode() { - return pgCode; - } - - public void setPgCode(String pgCode) { - this.pgCode = pgCode; - } - @Column(name = "PG_NAME") public String getPgName() { return pgName; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java index cf299e5..b846952 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java @@ -103,7 +103,7 @@ public PgTextureDto(PgTexture pgTexture) { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); this.setId(String.valueOf(pgTexture.getId())); this.setTextureCode(pgTexture.getTextureCode()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java index 17b2517..b40ce84 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java @@ -10,7 +10,6 @@ public class PipeGalleryDto implements Serializable { private String id; - private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private String active;//状态位 @@ -22,14 +21,6 @@ this.id = id; } - public String getPgCode() { - return pgCode; - } - - public void setPgCode(String pgCode) { - this.pgCode = pgCode; - } - public String getPgName() { return pgName; } @@ -49,7 +40,6 @@ public PipeGalleryDto(PipeGallery pipeGallery) { this.setId(String.valueOf(pipeGallery.getId())); - this.setPgCode(pipeGallery.getPgCode()); this.setPgName(pipeGallery.getPgName()); this.setActive(String.valueOf(pipeGallery.getActive())); } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java index b2b2a3c..16370c6 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java @@ -16,7 +16,7 @@ @Service public class PipeGalleryManager extends HibernateEntityDao { - public PipeGallery getPipeGalleryByPPgName(String pgName) { + public PipeGallery getPipeGalleryByPgName(String pgName) { Criteria criteria = getSession().createCriteria(PipeGallery.class); criteria.add(Restrictions.eq("pgName", pgName)); criteria.add(Restrictions.eq("active",1)); @@ -36,7 +36,7 @@ criteria.add(Restrictions.eq("active",1)); criteria.addOrder(Order.desc("id")); - List pipeGalleryList=new ArrayList(); + List pipeGalleryList=criteria.list(); if(pipeGalleryList.size()==0||pipeGalleryList==null) return null; List pipeGalleryDtoList=new ArrayList(); diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index ef26845..e9536d8 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -123,7 +123,7 @@ String msg = ""; PgDevice pgDevice = new PgDevice(); - PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName); PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); if (pgPartition == null) { result = "false"; @@ -175,7 +175,7 @@ String result = ""; String msg = ""; - PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName); PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); if (pgPartition == null) { result = "false"; diff --git a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java index 6d55e33..94ca5eb 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java @@ -61,7 +61,7 @@ PgPartition pgPartition = new PgPartition(); pgPartition.setParCode(parCode); pgPartition.setParName(parName); - pgPartition.setPipeGalleryId(pipeGalleryManager.getPipeGalleryByPPgName(pgName)); + pgPartition.setPipeGalleryId(pipeGalleryManager.getPipeGalleryByPgName(pgName)); pgPartition.setActive(1); logger.info("成功保存"); @@ -105,12 +105,6 @@ return resultMap; } - private String parCode;//分区唯一编号 - private String parName;//分区名称 - private PipeGallery pipeGalleryId;//管廊仓 - private int active;//状态位 - - @POST @Path("editPartition") @Produces(MediaType.APPLICATION_JSON) @@ -126,7 +120,7 @@ PgPartition partition=new PgPartition(); try { - PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName); if (pipeGallery == null) { result = "false"; msg = "不存在该管廊信息"; @@ -146,6 +140,9 @@ msg = "编辑失败"; e.printStackTrace(); } + + resultMap.put("result",result); + resultMap.put("msg",msg); return resultMap; } @@ -172,12 +169,12 @@ { pgPartition.setActive(0); pgPartitionManager.save(pgPartition); - msg="设备分区成功"; + msg="分区删除成功"; result="true"; } }catch(Exception e){ e.printStackTrace(); - msg="设备分区失败"; + msg="分区删除失败"; result="false"; } resultMap.put("msg",msg); diff --git a/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java b/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java index cf2520c..f90c57e 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java @@ -164,12 +164,12 @@ { pgPatroler.setActive(0); pgPatrolerManager.save(pgPatroler); - msg="设备人员成功"; + msg="删除人员成功"; result="true"; } }catch(Exception e){ e.printStackTrace(); - msg="设备人员失败"; + msg="删除人员失败"; result="false"; } resultMap.put("msg",msg); diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java index df10aa6..99ca7fe 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java @@ -97,7 +97,7 @@ String msg = ""; PgPipeLine pgPipeLine=new PgPipeLine(); - PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName); PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); if (pgPartition == null) { result = "false"; @@ -151,7 +151,7 @@ String result = ""; String msg = ""; - PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName); PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); if (pgPartition == null) { result = "false"; diff --git a/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java b/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java index cf48cb6..fabc113 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java @@ -57,7 +57,7 @@ @POST @Path("getPgTextureByCode") @Produces(MediaType.APPLICATION_JSON) - public Map getPgTexture(String textureCode) throws Exception { + public Map getPgTexture(@FormParam("textureCode") String textureCode) throws Exception { Map resultMap = new HashMap(); String msg = ""; PgTextureDto pgTextureDto=null; @@ -89,14 +89,14 @@ @FormParam("pgName") String pgName, @FormParam("parName") String parName) throws Exception { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); Map resultMap = new HashMap(); String result = ""; String msg = ""; PgTexture pgTexture = new PgTexture(); - PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName); PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); if (pgPartition == null) { result = "false"; @@ -123,6 +123,8 @@ resultMap.put("success", result); resultMap.put("msg", msg); } + resultMap.put("result",result); + resultMap.put("msg",msg); return resultMap; } @@ -142,13 +144,13 @@ @FormParam("pgName") String pgName, @FormParam("parName") String parName) throws Exception { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); Map resultMap = new HashMap(); String result = ""; String msg = ""; - PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName); PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); if (pgPartition == null) { result = "false"; @@ -174,6 +176,8 @@ e.printStackTrace(); } } + resultMap.put("result",result); + resultMap.put("msg",msg); return resultMap; } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index c9a3564..49a246c 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -14,7 +14,6 @@ private static final long serialVersionUID = 1L; private long id; - private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private int active;//状态位 private List partitionList; @@ -29,15 +28,6 @@ this.id = id; } - @Column(name = "PG_CODE") - public String getPgCode() { - return pgCode; - } - - public void setPgCode(String pgCode) { - this.pgCode = pgCode; - } - @Column(name = "PG_NAME") public String getPgName() { return pgName; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java index cf299e5..b846952 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java @@ -103,7 +103,7 @@ public PgTextureDto(PgTexture pgTexture) { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); this.setId(String.valueOf(pgTexture.getId())); this.setTextureCode(pgTexture.getTextureCode()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java index 17b2517..b40ce84 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java @@ -10,7 +10,6 @@ public class PipeGalleryDto implements Serializable { private String id; - private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private String active;//状态位 @@ -22,14 +21,6 @@ this.id = id; } - public String getPgCode() { - return pgCode; - } - - public void setPgCode(String pgCode) { - this.pgCode = pgCode; - } - public String getPgName() { return pgName; } @@ -49,7 +40,6 @@ public PipeGalleryDto(PipeGallery pipeGallery) { this.setId(String.valueOf(pipeGallery.getId())); - this.setPgCode(pipeGallery.getPgCode()); this.setPgName(pipeGallery.getPgName()); this.setActive(String.valueOf(pipeGallery.getActive())); } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java index b2b2a3c..16370c6 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java @@ -16,7 +16,7 @@ @Service public class PipeGalleryManager extends HibernateEntityDao { - public PipeGallery getPipeGalleryByPPgName(String pgName) { + public PipeGallery getPipeGalleryByPgName(String pgName) { Criteria criteria = getSession().createCriteria(PipeGallery.class); criteria.add(Restrictions.eq("pgName", pgName)); criteria.add(Restrictions.eq("active",1)); @@ -36,7 +36,7 @@ criteria.add(Restrictions.eq("active",1)); criteria.addOrder(Order.desc("id")); - List pipeGalleryList=new ArrayList(); + List pipeGalleryList=criteria.list(); if(pipeGalleryList.size()==0||pipeGalleryList==null) return null; List pipeGalleryDtoList=new ArrayList(); diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index ef26845..e9536d8 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -123,7 +123,7 @@ String msg = ""; PgDevice pgDevice = new PgDevice(); - PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName); PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); if (pgPartition == null) { result = "false"; @@ -175,7 +175,7 @@ String result = ""; String msg = ""; - PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName); PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); if (pgPartition == null) { result = "false"; diff --git a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java index 6d55e33..94ca5eb 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java @@ -61,7 +61,7 @@ PgPartition pgPartition = new PgPartition(); pgPartition.setParCode(parCode); pgPartition.setParName(parName); - pgPartition.setPipeGalleryId(pipeGalleryManager.getPipeGalleryByPPgName(pgName)); + pgPartition.setPipeGalleryId(pipeGalleryManager.getPipeGalleryByPgName(pgName)); pgPartition.setActive(1); logger.info("成功保存"); @@ -105,12 +105,6 @@ return resultMap; } - private String parCode;//分区唯一编号 - private String parName;//分区名称 - private PipeGallery pipeGalleryId;//管廊仓 - private int active;//状态位 - - @POST @Path("editPartition") @Produces(MediaType.APPLICATION_JSON) @@ -126,7 +120,7 @@ PgPartition partition=new PgPartition(); try { - PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName); if (pipeGallery == null) { result = "false"; msg = "不存在该管廊信息"; @@ -146,6 +140,9 @@ msg = "编辑失败"; e.printStackTrace(); } + + resultMap.put("result",result); + resultMap.put("msg",msg); return resultMap; } @@ -172,12 +169,12 @@ { pgPartition.setActive(0); pgPartitionManager.save(pgPartition); - msg="设备分区成功"; + msg="分区删除成功"; result="true"; } }catch(Exception e){ e.printStackTrace(); - msg="设备分区失败"; + msg="分区删除失败"; result="false"; } resultMap.put("msg",msg); diff --git a/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java b/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java index cf2520c..f90c57e 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java @@ -164,12 +164,12 @@ { pgPatroler.setActive(0); pgPatrolerManager.save(pgPatroler); - msg="设备人员成功"; + msg="删除人员成功"; result="true"; } }catch(Exception e){ e.printStackTrace(); - msg="设备人员失败"; + msg="删除人员失败"; result="false"; } resultMap.put("msg",msg); diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java index df10aa6..99ca7fe 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java @@ -97,7 +97,7 @@ String msg = ""; PgPipeLine pgPipeLine=new PgPipeLine(); - PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName); PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); if (pgPartition == null) { result = "false"; @@ -151,7 +151,7 @@ String result = ""; String msg = ""; - PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName); PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); if (pgPartition == null) { result = "false"; diff --git a/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java b/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java index cf48cb6..fabc113 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java @@ -57,7 +57,7 @@ @POST @Path("getPgTextureByCode") @Produces(MediaType.APPLICATION_JSON) - public Map getPgTexture(String textureCode) throws Exception { + public Map getPgTexture(@FormParam("textureCode") String textureCode) throws Exception { Map resultMap = new HashMap(); String msg = ""; PgTextureDto pgTextureDto=null; @@ -89,14 +89,14 @@ @FormParam("pgName") String pgName, @FormParam("parName") String parName) throws Exception { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); Map resultMap = new HashMap(); String result = ""; String msg = ""; PgTexture pgTexture = new PgTexture(); - PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName); PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); if (pgPartition == null) { result = "false"; @@ -123,6 +123,8 @@ resultMap.put("success", result); resultMap.put("msg", msg); } + resultMap.put("result",result); + resultMap.put("msg",msg); return resultMap; } @@ -142,13 +144,13 @@ @FormParam("pgName") String pgName, @FormParam("parName") String parName) throws Exception { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); Map resultMap = new HashMap(); String result = ""; String msg = ""; - PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName); PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); if (pgPartition == null) { result = "false"; @@ -174,6 +176,8 @@ e.printStackTrace(); } } + resultMap.put("result",result); + resultMap.put("msg",msg); return resultMap; } diff --git a/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java b/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java index 2f180a1..52a7b71 100644 --- a/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java @@ -62,20 +62,25 @@ @POST @Path("addPipeGallery") @Produces(MediaType.APPLICATION_JSON) - public Map addPipeGallery(@FormParam("pgCode") String pgCode, - @FormParam("pgName") String pgName) throws Exception { + public Map addPipeGallery(@FormParam("pgName") String pgName) throws Exception { Map resultMap = new HashMap(); String result = ""; String msg = ""; PipeGallery pipeGallery = new PipeGallery(); try { - pipeGallery.setPgCode(pgCode); - pipeGallery.setPgName(pgName); - pipeGallery.setActive(1); - logger.info("成功保存"); - pipeGalleryManager.save(pipeGallery); - result = "true"; - msg = "保存成功"; + if(pipeGalleryManager.getPipeGalleryByPgName(pgName)!=null) + { + result = "false"; + msg = "已存在相同管廊"; + } + else { + pipeGallery.setPgName(pgName); + pipeGallery.setActive(1); + logger.info("成功保存"); + pipeGalleryManager.save(pipeGallery); + result = "true"; + msg = "保存成功"; + } } catch (Exception e) { result = "false"; msg = "保存失败"; @@ -94,7 +99,6 @@ @Path("editPipeGallery") @Produces(MediaType.APPLICATION_JSON) public Map editPipeGallery(@FormParam("id") String id, - @FormParam("pgCode") String pgCode, @FormParam("pgName") String pgName) throws Exception { Map resultMap = new HashMap(); @@ -107,19 +111,27 @@ result = "false"; msg = "不存在该管廊信息"; } else { - pipeGallery.setPgName(pgName); - pipeGallery.setPgCode(pgCode); - pipeGallery.setActive(1); + if(pipeGalleryManager.getPipeGalleryByPgName(pgName)!=null) + { + result = "false"; + msg = "已存在相同管廊"; + } + else { + pipeGallery.setPgName(pgName); + pipeGallery.setActive(1); - pipeGalleryManager.save(pipeGallery); - result = "true"; - msg = "编辑成功"; + pipeGalleryManager.save(pipeGallery); + result = "true"; + msg = "编辑成功"; + } } } catch (Exception e) { result = "false"; msg = "编辑失败"; e.printStackTrace(); } + resultMap.put("result",result); + resultMap.put("msg",msg); return resultMap; } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index c9a3564..49a246c 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -14,7 +14,6 @@ private static final long serialVersionUID = 1L; private long id; - private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private int active;//状态位 private List partitionList; @@ -29,15 +28,6 @@ this.id = id; } - @Column(name = "PG_CODE") - public String getPgCode() { - return pgCode; - } - - public void setPgCode(String pgCode) { - this.pgCode = pgCode; - } - @Column(name = "PG_NAME") public String getPgName() { return pgName; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java index cf299e5..b846952 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java @@ -103,7 +103,7 @@ public PgTextureDto(PgTexture pgTexture) { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); this.setId(String.valueOf(pgTexture.getId())); this.setTextureCode(pgTexture.getTextureCode()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java index 17b2517..b40ce84 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java @@ -10,7 +10,6 @@ public class PipeGalleryDto implements Serializable { private String id; - private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private String active;//状态位 @@ -22,14 +21,6 @@ this.id = id; } - public String getPgCode() { - return pgCode; - } - - public void setPgCode(String pgCode) { - this.pgCode = pgCode; - } - public String getPgName() { return pgName; } @@ -49,7 +40,6 @@ public PipeGalleryDto(PipeGallery pipeGallery) { this.setId(String.valueOf(pipeGallery.getId())); - this.setPgCode(pipeGallery.getPgCode()); this.setPgName(pipeGallery.getPgName()); this.setActive(String.valueOf(pipeGallery.getActive())); } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java index b2b2a3c..16370c6 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java @@ -16,7 +16,7 @@ @Service public class PipeGalleryManager extends HibernateEntityDao { - public PipeGallery getPipeGalleryByPPgName(String pgName) { + public PipeGallery getPipeGalleryByPgName(String pgName) { Criteria criteria = getSession().createCriteria(PipeGallery.class); criteria.add(Restrictions.eq("pgName", pgName)); criteria.add(Restrictions.eq("active",1)); @@ -36,7 +36,7 @@ criteria.add(Restrictions.eq("active",1)); criteria.addOrder(Order.desc("id")); - List pipeGalleryList=new ArrayList(); + List pipeGalleryList=criteria.list(); if(pipeGalleryList.size()==0||pipeGalleryList==null) return null; List pipeGalleryDtoList=new ArrayList(); diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index ef26845..e9536d8 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -123,7 +123,7 @@ String msg = ""; PgDevice pgDevice = new PgDevice(); - PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName); PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); if (pgPartition == null) { result = "false"; @@ -175,7 +175,7 @@ String result = ""; String msg = ""; - PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName); PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); if (pgPartition == null) { result = "false"; diff --git a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java index 6d55e33..94ca5eb 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java @@ -61,7 +61,7 @@ PgPartition pgPartition = new PgPartition(); pgPartition.setParCode(parCode); pgPartition.setParName(parName); - pgPartition.setPipeGalleryId(pipeGalleryManager.getPipeGalleryByPPgName(pgName)); + pgPartition.setPipeGalleryId(pipeGalleryManager.getPipeGalleryByPgName(pgName)); pgPartition.setActive(1); logger.info("成功保存"); @@ -105,12 +105,6 @@ return resultMap; } - private String parCode;//分区唯一编号 - private String parName;//分区名称 - private PipeGallery pipeGalleryId;//管廊仓 - private int active;//状态位 - - @POST @Path("editPartition") @Produces(MediaType.APPLICATION_JSON) @@ -126,7 +120,7 @@ PgPartition partition=new PgPartition(); try { - PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName); if (pipeGallery == null) { result = "false"; msg = "不存在该管廊信息"; @@ -146,6 +140,9 @@ msg = "编辑失败"; e.printStackTrace(); } + + resultMap.put("result",result); + resultMap.put("msg",msg); return resultMap; } @@ -172,12 +169,12 @@ { pgPartition.setActive(0); pgPartitionManager.save(pgPartition); - msg="设备分区成功"; + msg="分区删除成功"; result="true"; } }catch(Exception e){ e.printStackTrace(); - msg="设备分区失败"; + msg="分区删除失败"; result="false"; } resultMap.put("msg",msg); diff --git a/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java b/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java index cf2520c..f90c57e 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java @@ -164,12 +164,12 @@ { pgPatroler.setActive(0); pgPatrolerManager.save(pgPatroler); - msg="设备人员成功"; + msg="删除人员成功"; result="true"; } }catch(Exception e){ e.printStackTrace(); - msg="设备人员失败"; + msg="删除人员失败"; result="false"; } resultMap.put("msg",msg); diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java index df10aa6..99ca7fe 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java @@ -97,7 +97,7 @@ String msg = ""; PgPipeLine pgPipeLine=new PgPipeLine(); - PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName); PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); if (pgPartition == null) { result = "false"; @@ -151,7 +151,7 @@ String result = ""; String msg = ""; - PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName); PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); if (pgPartition == null) { result = "false"; diff --git a/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java b/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java index cf48cb6..fabc113 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java @@ -57,7 +57,7 @@ @POST @Path("getPgTextureByCode") @Produces(MediaType.APPLICATION_JSON) - public Map getPgTexture(String textureCode) throws Exception { + public Map getPgTexture(@FormParam("textureCode") String textureCode) throws Exception { Map resultMap = new HashMap(); String msg = ""; PgTextureDto pgTextureDto=null; @@ -89,14 +89,14 @@ @FormParam("pgName") String pgName, @FormParam("parName") String parName) throws Exception { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); Map resultMap = new HashMap(); String result = ""; String msg = ""; PgTexture pgTexture = new PgTexture(); - PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName); PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); if (pgPartition == null) { result = "false"; @@ -123,6 +123,8 @@ resultMap.put("success", result); resultMap.put("msg", msg); } + resultMap.put("result",result); + resultMap.put("msg",msg); return resultMap; } @@ -142,13 +144,13 @@ @FormParam("pgName") String pgName, @FormParam("parName") String parName) throws Exception { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); Map resultMap = new HashMap(); String result = ""; String msg = ""; - PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName); PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); if (pgPartition == null) { result = "false"; @@ -174,6 +176,8 @@ e.printStackTrace(); } } + resultMap.put("result",result); + resultMap.put("msg",msg); return resultMap; } diff --git a/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java b/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java index 2f180a1..52a7b71 100644 --- a/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java @@ -62,20 +62,25 @@ @POST @Path("addPipeGallery") @Produces(MediaType.APPLICATION_JSON) - public Map addPipeGallery(@FormParam("pgCode") String pgCode, - @FormParam("pgName") String pgName) throws Exception { + public Map addPipeGallery(@FormParam("pgName") String pgName) throws Exception { Map resultMap = new HashMap(); String result = ""; String msg = ""; PipeGallery pipeGallery = new PipeGallery(); try { - pipeGallery.setPgCode(pgCode); - pipeGallery.setPgName(pgName); - pipeGallery.setActive(1); - logger.info("成功保存"); - pipeGalleryManager.save(pipeGallery); - result = "true"; - msg = "保存成功"; + if(pipeGalleryManager.getPipeGalleryByPgName(pgName)!=null) + { + result = "false"; + msg = "已存在相同管廊"; + } + else { + pipeGallery.setPgName(pgName); + pipeGallery.setActive(1); + logger.info("成功保存"); + pipeGalleryManager.save(pipeGallery); + result = "true"; + msg = "保存成功"; + } } catch (Exception e) { result = "false"; msg = "保存失败"; @@ -94,7 +99,6 @@ @Path("editPipeGallery") @Produces(MediaType.APPLICATION_JSON) public Map editPipeGallery(@FormParam("id") String id, - @FormParam("pgCode") String pgCode, @FormParam("pgName") String pgName) throws Exception { Map resultMap = new HashMap(); @@ -107,19 +111,27 @@ result = "false"; msg = "不存在该管廊信息"; } else { - pipeGallery.setPgName(pgName); - pipeGallery.setPgCode(pgCode); - pipeGallery.setActive(1); + if(pipeGalleryManager.getPipeGalleryByPgName(pgName)!=null) + { + result = "false"; + msg = "已存在相同管廊"; + } + else { + pipeGallery.setPgName(pgName); + pipeGallery.setActive(1); - pipeGalleryManager.save(pipeGallery); - result = "true"; - msg = "编辑成功"; + pipeGalleryManager.save(pipeGallery); + result = "true"; + msg = "编辑成功"; + } } } catch (Exception e) { result = "false"; msg = "编辑失败"; e.printStackTrace(); } + resultMap.put("result",result); + resultMap.put("msg",msg); return resultMap; } diff --git "a/~$\346\216\245\345\217\243\350\257\264\346\230\216.docx" "b/~$\346\216\245\345\217\243\350\257\264\346\230\216.docx" new file mode 100644 index 0000000..e2dbc1c --- /dev/null +++ "b/~$\346\216\245\345\217\243\350\257\264\346\230\216.docx" Binary files differ diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index c9a3564..49a246c 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -14,7 +14,6 @@ private static final long serialVersionUID = 1L; private long id; - private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private int active;//状态位 private List partitionList; @@ -29,15 +28,6 @@ this.id = id; } - @Column(name = "PG_CODE") - public String getPgCode() { - return pgCode; - } - - public void setPgCode(String pgCode) { - this.pgCode = pgCode; - } - @Column(name = "PG_NAME") public String getPgName() { return pgName; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java index cf299e5..b846952 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java @@ -103,7 +103,7 @@ public PgTextureDto(PgTexture pgTexture) { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); this.setId(String.valueOf(pgTexture.getId())); this.setTextureCode(pgTexture.getTextureCode()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java index 17b2517..b40ce84 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java @@ -10,7 +10,6 @@ public class PipeGalleryDto implements Serializable { private String id; - private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private String active;//状态位 @@ -22,14 +21,6 @@ this.id = id; } - public String getPgCode() { - return pgCode; - } - - public void setPgCode(String pgCode) { - this.pgCode = pgCode; - } - public String getPgName() { return pgName; } @@ -49,7 +40,6 @@ public PipeGalleryDto(PipeGallery pipeGallery) { this.setId(String.valueOf(pipeGallery.getId())); - this.setPgCode(pipeGallery.getPgCode()); this.setPgName(pipeGallery.getPgName()); this.setActive(String.valueOf(pipeGallery.getActive())); } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java index b2b2a3c..16370c6 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java @@ -16,7 +16,7 @@ @Service public class PipeGalleryManager extends HibernateEntityDao { - public PipeGallery getPipeGalleryByPPgName(String pgName) { + public PipeGallery getPipeGalleryByPgName(String pgName) { Criteria criteria = getSession().createCriteria(PipeGallery.class); criteria.add(Restrictions.eq("pgName", pgName)); criteria.add(Restrictions.eq("active",1)); @@ -36,7 +36,7 @@ criteria.add(Restrictions.eq("active",1)); criteria.addOrder(Order.desc("id")); - List pipeGalleryList=new ArrayList(); + List pipeGalleryList=criteria.list(); if(pipeGalleryList.size()==0||pipeGalleryList==null) return null; List pipeGalleryDtoList=new ArrayList(); diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index ef26845..e9536d8 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -123,7 +123,7 @@ String msg = ""; PgDevice pgDevice = new PgDevice(); - PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName); PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); if (pgPartition == null) { result = "false"; @@ -175,7 +175,7 @@ String result = ""; String msg = ""; - PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName); PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); if (pgPartition == null) { result = "false"; diff --git a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java index 6d55e33..94ca5eb 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java @@ -61,7 +61,7 @@ PgPartition pgPartition = new PgPartition(); pgPartition.setParCode(parCode); pgPartition.setParName(parName); - pgPartition.setPipeGalleryId(pipeGalleryManager.getPipeGalleryByPPgName(pgName)); + pgPartition.setPipeGalleryId(pipeGalleryManager.getPipeGalleryByPgName(pgName)); pgPartition.setActive(1); logger.info("成功保存"); @@ -105,12 +105,6 @@ return resultMap; } - private String parCode;//分区唯一编号 - private String parName;//分区名称 - private PipeGallery pipeGalleryId;//管廊仓 - private int active;//状态位 - - @POST @Path("editPartition") @Produces(MediaType.APPLICATION_JSON) @@ -126,7 +120,7 @@ PgPartition partition=new PgPartition(); try { - PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName); if (pipeGallery == null) { result = "false"; msg = "不存在该管廊信息"; @@ -146,6 +140,9 @@ msg = "编辑失败"; e.printStackTrace(); } + + resultMap.put("result",result); + resultMap.put("msg",msg); return resultMap; } @@ -172,12 +169,12 @@ { pgPartition.setActive(0); pgPartitionManager.save(pgPartition); - msg="设备分区成功"; + msg="分区删除成功"; result="true"; } }catch(Exception e){ e.printStackTrace(); - msg="设备分区失败"; + msg="分区删除失败"; result="false"; } resultMap.put("msg",msg); diff --git a/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java b/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java index cf2520c..f90c57e 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java @@ -164,12 +164,12 @@ { pgPatroler.setActive(0); pgPatrolerManager.save(pgPatroler); - msg="设备人员成功"; + msg="删除人员成功"; result="true"; } }catch(Exception e){ e.printStackTrace(); - msg="设备人员失败"; + msg="删除人员失败"; result="false"; } resultMap.put("msg",msg); diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java index df10aa6..99ca7fe 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java @@ -97,7 +97,7 @@ String msg = ""; PgPipeLine pgPipeLine=new PgPipeLine(); - PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName); PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); if (pgPartition == null) { result = "false"; @@ -151,7 +151,7 @@ String result = ""; String msg = ""; - PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName); PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); if (pgPartition == null) { result = "false"; diff --git a/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java b/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java index cf48cb6..fabc113 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java @@ -57,7 +57,7 @@ @POST @Path("getPgTextureByCode") @Produces(MediaType.APPLICATION_JSON) - public Map getPgTexture(String textureCode) throws Exception { + public Map getPgTexture(@FormParam("textureCode") String textureCode) throws Exception { Map resultMap = new HashMap(); String msg = ""; PgTextureDto pgTextureDto=null; @@ -89,14 +89,14 @@ @FormParam("pgName") String pgName, @FormParam("parName") String parName) throws Exception { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); Map resultMap = new HashMap(); String result = ""; String msg = ""; PgTexture pgTexture = new PgTexture(); - PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName); PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); if (pgPartition == null) { result = "false"; @@ -123,6 +123,8 @@ resultMap.put("success", result); resultMap.put("msg", msg); } + resultMap.put("result",result); + resultMap.put("msg",msg); return resultMap; } @@ -142,13 +144,13 @@ @FormParam("pgName") String pgName, @FormParam("parName") String parName) throws Exception { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); Map resultMap = new HashMap(); String result = ""; String msg = ""; - PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName); PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); if (pgPartition == null) { result = "false"; @@ -174,6 +176,8 @@ e.printStackTrace(); } } + resultMap.put("result",result); + resultMap.put("msg",msg); return resultMap; } diff --git a/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java b/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java index 2f180a1..52a7b71 100644 --- a/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java @@ -62,20 +62,25 @@ @POST @Path("addPipeGallery") @Produces(MediaType.APPLICATION_JSON) - public Map addPipeGallery(@FormParam("pgCode") String pgCode, - @FormParam("pgName") String pgName) throws Exception { + public Map addPipeGallery(@FormParam("pgName") String pgName) throws Exception { Map resultMap = new HashMap(); String result = ""; String msg = ""; PipeGallery pipeGallery = new PipeGallery(); try { - pipeGallery.setPgCode(pgCode); - pipeGallery.setPgName(pgName); - pipeGallery.setActive(1); - logger.info("成功保存"); - pipeGalleryManager.save(pipeGallery); - result = "true"; - msg = "保存成功"; + if(pipeGalleryManager.getPipeGalleryByPgName(pgName)!=null) + { + result = "false"; + msg = "已存在相同管廊"; + } + else { + pipeGallery.setPgName(pgName); + pipeGallery.setActive(1); + logger.info("成功保存"); + pipeGalleryManager.save(pipeGallery); + result = "true"; + msg = "保存成功"; + } } catch (Exception e) { result = "false"; msg = "保存失败"; @@ -94,7 +99,6 @@ @Path("editPipeGallery") @Produces(MediaType.APPLICATION_JSON) public Map editPipeGallery(@FormParam("id") String id, - @FormParam("pgCode") String pgCode, @FormParam("pgName") String pgName) throws Exception { Map resultMap = new HashMap(); @@ -107,19 +111,27 @@ result = "false"; msg = "不存在该管廊信息"; } else { - pipeGallery.setPgName(pgName); - pipeGallery.setPgCode(pgCode); - pipeGallery.setActive(1); + if(pipeGalleryManager.getPipeGalleryByPgName(pgName)!=null) + { + result = "false"; + msg = "已存在相同管廊"; + } + else { + pipeGallery.setPgName(pgName); + pipeGallery.setActive(1); - pipeGalleryManager.save(pipeGallery); - result = "true"; - msg = "编辑成功"; + pipeGalleryManager.save(pipeGallery); + result = "true"; + msg = "编辑成功"; + } } } catch (Exception e) { result = "false"; msg = "编辑失败"; e.printStackTrace(); } + resultMap.put("result",result); + resultMap.put("msg",msg); return resultMap; } diff --git "a/~$\346\216\245\345\217\243\350\257\264\346\230\216.docx" "b/~$\346\216\245\345\217\243\350\257\264\346\230\216.docx" new file mode 100644 index 0000000..e2dbc1c --- /dev/null +++ "b/~$\346\216\245\345\217\243\350\257\264\346\230\216.docx" Binary files differ diff --git "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216.docx" "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216.docx" new file mode 100644 index 0000000..293a96b --- /dev/null +++ "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216.docx" Binary files differ diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index c9a3564..49a246c 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -14,7 +14,6 @@ private static final long serialVersionUID = 1L; private long id; - private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private int active;//状态位 private List partitionList; @@ -29,15 +28,6 @@ this.id = id; } - @Column(name = "PG_CODE") - public String getPgCode() { - return pgCode; - } - - public void setPgCode(String pgCode) { - this.pgCode = pgCode; - } - @Column(name = "PG_NAME") public String getPgName() { return pgName; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java index cf299e5..b846952 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java @@ -103,7 +103,7 @@ public PgTextureDto(PgTexture pgTexture) { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); this.setId(String.valueOf(pgTexture.getId())); this.setTextureCode(pgTexture.getTextureCode()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java index 17b2517..b40ce84 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java @@ -10,7 +10,6 @@ public class PipeGalleryDto implements Serializable { private String id; - private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private String active;//状态位 @@ -22,14 +21,6 @@ this.id = id; } - public String getPgCode() { - return pgCode; - } - - public void setPgCode(String pgCode) { - this.pgCode = pgCode; - } - public String getPgName() { return pgName; } @@ -49,7 +40,6 @@ public PipeGalleryDto(PipeGallery pipeGallery) { this.setId(String.valueOf(pipeGallery.getId())); - this.setPgCode(pipeGallery.getPgCode()); this.setPgName(pipeGallery.getPgName()); this.setActive(String.valueOf(pipeGallery.getActive())); } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java index b2b2a3c..16370c6 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java @@ -16,7 +16,7 @@ @Service public class PipeGalleryManager extends HibernateEntityDao { - public PipeGallery getPipeGalleryByPPgName(String pgName) { + public PipeGallery getPipeGalleryByPgName(String pgName) { Criteria criteria = getSession().createCriteria(PipeGallery.class); criteria.add(Restrictions.eq("pgName", pgName)); criteria.add(Restrictions.eq("active",1)); @@ -36,7 +36,7 @@ criteria.add(Restrictions.eq("active",1)); criteria.addOrder(Order.desc("id")); - List pipeGalleryList=new ArrayList(); + List pipeGalleryList=criteria.list(); if(pipeGalleryList.size()==0||pipeGalleryList==null) return null; List pipeGalleryDtoList=new ArrayList(); diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index ef26845..e9536d8 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -123,7 +123,7 @@ String msg = ""; PgDevice pgDevice = new PgDevice(); - PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName); PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); if (pgPartition == null) { result = "false"; @@ -175,7 +175,7 @@ String result = ""; String msg = ""; - PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName); PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); if (pgPartition == null) { result = "false"; diff --git a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java index 6d55e33..94ca5eb 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java @@ -61,7 +61,7 @@ PgPartition pgPartition = new PgPartition(); pgPartition.setParCode(parCode); pgPartition.setParName(parName); - pgPartition.setPipeGalleryId(pipeGalleryManager.getPipeGalleryByPPgName(pgName)); + pgPartition.setPipeGalleryId(pipeGalleryManager.getPipeGalleryByPgName(pgName)); pgPartition.setActive(1); logger.info("成功保存"); @@ -105,12 +105,6 @@ return resultMap; } - private String parCode;//分区唯一编号 - private String parName;//分区名称 - private PipeGallery pipeGalleryId;//管廊仓 - private int active;//状态位 - - @POST @Path("editPartition") @Produces(MediaType.APPLICATION_JSON) @@ -126,7 +120,7 @@ PgPartition partition=new PgPartition(); try { - PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName); if (pipeGallery == null) { result = "false"; msg = "不存在该管廊信息"; @@ -146,6 +140,9 @@ msg = "编辑失败"; e.printStackTrace(); } + + resultMap.put("result",result); + resultMap.put("msg",msg); return resultMap; } @@ -172,12 +169,12 @@ { pgPartition.setActive(0); pgPartitionManager.save(pgPartition); - msg="设备分区成功"; + msg="分区删除成功"; result="true"; } }catch(Exception e){ e.printStackTrace(); - msg="设备分区失败"; + msg="分区删除失败"; result="false"; } resultMap.put("msg",msg); diff --git a/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java b/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java index cf2520c..f90c57e 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java @@ -164,12 +164,12 @@ { pgPatroler.setActive(0); pgPatrolerManager.save(pgPatroler); - msg="设备人员成功"; + msg="删除人员成功"; result="true"; } }catch(Exception e){ e.printStackTrace(); - msg="设备人员失败"; + msg="删除人员失败"; result="false"; } resultMap.put("msg",msg); diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java index df10aa6..99ca7fe 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java @@ -97,7 +97,7 @@ String msg = ""; PgPipeLine pgPipeLine=new PgPipeLine(); - PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName); PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); if (pgPartition == null) { result = "false"; @@ -151,7 +151,7 @@ String result = ""; String msg = ""; - PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName); PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); if (pgPartition == null) { result = "false"; diff --git a/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java b/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java index cf48cb6..fabc113 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java @@ -57,7 +57,7 @@ @POST @Path("getPgTextureByCode") @Produces(MediaType.APPLICATION_JSON) - public Map getPgTexture(String textureCode) throws Exception { + public Map getPgTexture(@FormParam("textureCode") String textureCode) throws Exception { Map resultMap = new HashMap(); String msg = ""; PgTextureDto pgTextureDto=null; @@ -89,14 +89,14 @@ @FormParam("pgName") String pgName, @FormParam("parName") String parName) throws Exception { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); Map resultMap = new HashMap(); String result = ""; String msg = ""; PgTexture pgTexture = new PgTexture(); - PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName); PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); if (pgPartition == null) { result = "false"; @@ -123,6 +123,8 @@ resultMap.put("success", result); resultMap.put("msg", msg); } + resultMap.put("result",result); + resultMap.put("msg",msg); return resultMap; } @@ -142,13 +144,13 @@ @FormParam("pgName") String pgName, @FormParam("parName") String parName) throws Exception { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); Map resultMap = new HashMap(); String result = ""; String msg = ""; - PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName); PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); if (pgPartition == null) { result = "false"; @@ -174,6 +176,8 @@ e.printStackTrace(); } } + resultMap.put("result",result); + resultMap.put("msg",msg); return resultMap; } diff --git a/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java b/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java index 2f180a1..52a7b71 100644 --- a/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java @@ -62,20 +62,25 @@ @POST @Path("addPipeGallery") @Produces(MediaType.APPLICATION_JSON) - public Map addPipeGallery(@FormParam("pgCode") String pgCode, - @FormParam("pgName") String pgName) throws Exception { + public Map addPipeGallery(@FormParam("pgName") String pgName) throws Exception { Map resultMap = new HashMap(); String result = ""; String msg = ""; PipeGallery pipeGallery = new PipeGallery(); try { - pipeGallery.setPgCode(pgCode); - pipeGallery.setPgName(pgName); - pipeGallery.setActive(1); - logger.info("成功保存"); - pipeGalleryManager.save(pipeGallery); - result = "true"; - msg = "保存成功"; + if(pipeGalleryManager.getPipeGalleryByPgName(pgName)!=null) + { + result = "false"; + msg = "已存在相同管廊"; + } + else { + pipeGallery.setPgName(pgName); + pipeGallery.setActive(1); + logger.info("成功保存"); + pipeGalleryManager.save(pipeGallery); + result = "true"; + msg = "保存成功"; + } } catch (Exception e) { result = "false"; msg = "保存失败"; @@ -94,7 +99,6 @@ @Path("editPipeGallery") @Produces(MediaType.APPLICATION_JSON) public Map editPipeGallery(@FormParam("id") String id, - @FormParam("pgCode") String pgCode, @FormParam("pgName") String pgName) throws Exception { Map resultMap = new HashMap(); @@ -107,19 +111,27 @@ result = "false"; msg = "不存在该管廊信息"; } else { - pipeGallery.setPgName(pgName); - pipeGallery.setPgCode(pgCode); - pipeGallery.setActive(1); + if(pipeGalleryManager.getPipeGalleryByPgName(pgName)!=null) + { + result = "false"; + msg = "已存在相同管廊"; + } + else { + pipeGallery.setPgName(pgName); + pipeGallery.setActive(1); - pipeGalleryManager.save(pipeGallery); - result = "true"; - msg = "编辑成功"; + pipeGalleryManager.save(pipeGallery); + result = "true"; + msg = "编辑成功"; + } } } catch (Exception e) { result = "false"; msg = "编辑失败"; e.printStackTrace(); } + resultMap.put("result",result); + resultMap.put("msg",msg); return resultMap; } diff --git "a/~$\346\216\245\345\217\243\350\257\264\346\230\216.docx" "b/~$\346\216\245\345\217\243\350\257\264\346\230\216.docx" new file mode 100644 index 0000000..e2dbc1c --- /dev/null +++ "b/~$\346\216\245\345\217\243\350\257\264\346\230\216.docx" Binary files differ diff --git "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216.docx" "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216.docx" new file mode 100644 index 0000000..293a96b --- /dev/null +++ "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216.docx" Binary files differ diff --git "a/\346\216\245\345\217\243\350\257\264\346\230\216.docx" "b/\346\216\245\345\217\243\350\257\264\346\230\216.docx" index 3bb93da..19f5ddf 100644 --- "a/\346\216\245\345\217\243\350\257\264\346\230\216.docx" +++ "b/\346\216\245\345\217\243\350\257\264\346\230\216.docx" Binary files differ diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index c9a3564..49a246c 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -14,7 +14,6 @@ private static final long serialVersionUID = 1L; private long id; - private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private int active;//状态位 private List partitionList; @@ -29,15 +28,6 @@ this.id = id; } - @Column(name = "PG_CODE") - public String getPgCode() { - return pgCode; - } - - public void setPgCode(String pgCode) { - this.pgCode = pgCode; - } - @Column(name = "PG_NAME") public String getPgName() { return pgName; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java index cf299e5..b846952 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java @@ -103,7 +103,7 @@ public PgTextureDto(PgTexture pgTexture) { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); this.setId(String.valueOf(pgTexture.getId())); this.setTextureCode(pgTexture.getTextureCode()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java index 17b2517..b40ce84 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java @@ -10,7 +10,6 @@ public class PipeGalleryDto implements Serializable { private String id; - private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private String active;//状态位 @@ -22,14 +21,6 @@ this.id = id; } - public String getPgCode() { - return pgCode; - } - - public void setPgCode(String pgCode) { - this.pgCode = pgCode; - } - public String getPgName() { return pgName; } @@ -49,7 +40,6 @@ public PipeGalleryDto(PipeGallery pipeGallery) { this.setId(String.valueOf(pipeGallery.getId())); - this.setPgCode(pipeGallery.getPgCode()); this.setPgName(pipeGallery.getPgName()); this.setActive(String.valueOf(pipeGallery.getActive())); } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java index b2b2a3c..16370c6 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java @@ -16,7 +16,7 @@ @Service public class PipeGalleryManager extends HibernateEntityDao { - public PipeGallery getPipeGalleryByPPgName(String pgName) { + public PipeGallery getPipeGalleryByPgName(String pgName) { Criteria criteria = getSession().createCriteria(PipeGallery.class); criteria.add(Restrictions.eq("pgName", pgName)); criteria.add(Restrictions.eq("active",1)); @@ -36,7 +36,7 @@ criteria.add(Restrictions.eq("active",1)); criteria.addOrder(Order.desc("id")); - List pipeGalleryList=new ArrayList(); + List pipeGalleryList=criteria.list(); if(pipeGalleryList.size()==0||pipeGalleryList==null) return null; List pipeGalleryDtoList=new ArrayList(); diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index ef26845..e9536d8 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -123,7 +123,7 @@ String msg = ""; PgDevice pgDevice = new PgDevice(); - PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName); PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); if (pgPartition == null) { result = "false"; @@ -175,7 +175,7 @@ String result = ""; String msg = ""; - PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName); PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); if (pgPartition == null) { result = "false"; diff --git a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java index 6d55e33..94ca5eb 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java @@ -61,7 +61,7 @@ PgPartition pgPartition = new PgPartition(); pgPartition.setParCode(parCode); pgPartition.setParName(parName); - pgPartition.setPipeGalleryId(pipeGalleryManager.getPipeGalleryByPPgName(pgName)); + pgPartition.setPipeGalleryId(pipeGalleryManager.getPipeGalleryByPgName(pgName)); pgPartition.setActive(1); logger.info("成功保存"); @@ -105,12 +105,6 @@ return resultMap; } - private String parCode;//分区唯一编号 - private String parName;//分区名称 - private PipeGallery pipeGalleryId;//管廊仓 - private int active;//状态位 - - @POST @Path("editPartition") @Produces(MediaType.APPLICATION_JSON) @@ -126,7 +120,7 @@ PgPartition partition=new PgPartition(); try { - PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName); if (pipeGallery == null) { result = "false"; msg = "不存在该管廊信息"; @@ -146,6 +140,9 @@ msg = "编辑失败"; e.printStackTrace(); } + + resultMap.put("result",result); + resultMap.put("msg",msg); return resultMap; } @@ -172,12 +169,12 @@ { pgPartition.setActive(0); pgPartitionManager.save(pgPartition); - msg="设备分区成功"; + msg="分区删除成功"; result="true"; } }catch(Exception e){ e.printStackTrace(); - msg="设备分区失败"; + msg="分区删除失败"; result="false"; } resultMap.put("msg",msg); diff --git a/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java b/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java index cf2520c..f90c57e 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java @@ -164,12 +164,12 @@ { pgPatroler.setActive(0); pgPatrolerManager.save(pgPatroler); - msg="设备人员成功"; + msg="删除人员成功"; result="true"; } }catch(Exception e){ e.printStackTrace(); - msg="设备人员失败"; + msg="删除人员失败"; result="false"; } resultMap.put("msg",msg); diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java index df10aa6..99ca7fe 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java @@ -97,7 +97,7 @@ String msg = ""; PgPipeLine pgPipeLine=new PgPipeLine(); - PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName); PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); if (pgPartition == null) { result = "false"; @@ -151,7 +151,7 @@ String result = ""; String msg = ""; - PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName); PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); if (pgPartition == null) { result = "false"; diff --git a/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java b/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java index cf48cb6..fabc113 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java @@ -57,7 +57,7 @@ @POST @Path("getPgTextureByCode") @Produces(MediaType.APPLICATION_JSON) - public Map getPgTexture(String textureCode) throws Exception { + public Map getPgTexture(@FormParam("textureCode") String textureCode) throws Exception { Map resultMap = new HashMap(); String msg = ""; PgTextureDto pgTextureDto=null; @@ -89,14 +89,14 @@ @FormParam("pgName") String pgName, @FormParam("parName") String parName) throws Exception { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); Map resultMap = new HashMap(); String result = ""; String msg = ""; PgTexture pgTexture = new PgTexture(); - PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName); PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); if (pgPartition == null) { result = "false"; @@ -123,6 +123,8 @@ resultMap.put("success", result); resultMap.put("msg", msg); } + resultMap.put("result",result); + resultMap.put("msg",msg); return resultMap; } @@ -142,13 +144,13 @@ @FormParam("pgName") String pgName, @FormParam("parName") String parName) throws Exception { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); Map resultMap = new HashMap(); String result = ""; String msg = ""; - PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPgName(pgName); PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); if (pgPartition == null) { result = "false"; @@ -174,6 +176,8 @@ e.printStackTrace(); } } + resultMap.put("result",result); + resultMap.put("msg",msg); return resultMap; } diff --git a/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java b/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java index 2f180a1..52a7b71 100644 --- a/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java @@ -62,20 +62,25 @@ @POST @Path("addPipeGallery") @Produces(MediaType.APPLICATION_JSON) - public Map addPipeGallery(@FormParam("pgCode") String pgCode, - @FormParam("pgName") String pgName) throws Exception { + public Map addPipeGallery(@FormParam("pgName") String pgName) throws Exception { Map resultMap = new HashMap(); String result = ""; String msg = ""; PipeGallery pipeGallery = new PipeGallery(); try { - pipeGallery.setPgCode(pgCode); - pipeGallery.setPgName(pgName); - pipeGallery.setActive(1); - logger.info("成功保存"); - pipeGalleryManager.save(pipeGallery); - result = "true"; - msg = "保存成功"; + if(pipeGalleryManager.getPipeGalleryByPgName(pgName)!=null) + { + result = "false"; + msg = "已存在相同管廊"; + } + else { + pipeGallery.setPgName(pgName); + pipeGallery.setActive(1); + logger.info("成功保存"); + pipeGalleryManager.save(pipeGallery); + result = "true"; + msg = "保存成功"; + } } catch (Exception e) { result = "false"; msg = "保存失败"; @@ -94,7 +99,6 @@ @Path("editPipeGallery") @Produces(MediaType.APPLICATION_JSON) public Map editPipeGallery(@FormParam("id") String id, - @FormParam("pgCode") String pgCode, @FormParam("pgName") String pgName) throws Exception { Map resultMap = new HashMap(); @@ -107,19 +111,27 @@ result = "false"; msg = "不存在该管廊信息"; } else { - pipeGallery.setPgName(pgName); - pipeGallery.setPgCode(pgCode); - pipeGallery.setActive(1); + if(pipeGalleryManager.getPipeGalleryByPgName(pgName)!=null) + { + result = "false"; + msg = "已存在相同管廊"; + } + else { + pipeGallery.setPgName(pgName); + pipeGallery.setActive(1); - pipeGalleryManager.save(pipeGallery); - result = "true"; - msg = "编辑成功"; + pipeGalleryManager.save(pipeGallery); + result = "true"; + msg = "编辑成功"; + } } } catch (Exception e) { result = "false"; msg = "编辑失败"; e.printStackTrace(); } + resultMap.put("result",result); + resultMap.put("msg",msg); return resultMap; } diff --git "a/~$\346\216\245\345\217\243\350\257\264\346\230\216.docx" "b/~$\346\216\245\345\217\243\350\257\264\346\230\216.docx" new file mode 100644 index 0000000..e2dbc1c --- /dev/null +++ "b/~$\346\216\245\345\217\243\350\257\264\346\230\216.docx" Binary files differ diff --git "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216.docx" "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216.docx" new file mode 100644 index 0000000..293a96b --- /dev/null +++ "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216.docx" Binary files differ diff --git "a/\346\216\245\345\217\243\350\257\264\346\230\216.docx" "b/\346\216\245\345\217\243\350\257\264\346\230\216.docx" index 3bb93da..19f5ddf 100644 --- "a/\346\216\245\345\217\243\350\257\264\346\230\216.docx" +++ "b/\346\216\245\345\217\243\350\257\264\346\230\216.docx" Binary files differ diff --git "a/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216.docx" "b/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216.docx" index d120f9c..0bb6284 100644 --- "a/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216.docx" +++ "b/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216.docx" Binary files differ