全部接口替换Map为Domain DTO: 13个DTO+9个Mapper+9个Service+9个XML

gw-hzz/src/main/java/com/goldenwater/hzz/domain/AdInfoDTO.java

@@ -0,0 +1,16 @@
+package com.goldenwater.hzz.domain;
+
+import java.io.Serializable;
+
+/** ATT_AD_BASE 行政区划 */
+public class AdInfoDTO implements Serializable {
+    private String adCode;
+    private String adName;
+    private String adGrad;
+    private String parentAdCode;
+
+    public String getAdCode() { return adCode; } public void setAdCode(String v) { adCode = v; }
+    public String getAdName() { return adName; } public void setAdName(String v) { adName = v; }
+    public String getAdGrad() { return adGrad; } public void setAdGrad(String v) { adGrad = v; }
+    public String getParentAdCode() { return parentAdCode; } public void setParentAdCode(String v) { parentAdCode = v; }
+}

gw-hzz/src/main/java/com/goldenwater/hzz/domain/ArticleDTO.java

@@ -0,0 +1,20 @@
+package com.goldenwater.hzz.domain;
+
+import java.io.Serializable;
+
+/** GW_ARTICLE 工作动态 */
+public class ArticleDTO implements Serializable {
+    private String guid;
+    private String title;
+    private String type;
+    private String pubman;
+    private String pubtime;
+    private String content;
+
+    public String getGuid() { return guid; } public void setGuid(String v) { guid = v; }
+    public String getTitle() { return title; } public void setTitle(String v) { title = v; }
+    public String getType() { return type; } public void setType(String v) { type = v; }
+    public String getPubman() { return pubman; } public void setPubman(String v) { pubman = v; }
+    public String getPubtime() { return pubtime; } public void setPubtime(String v) { pubtime = v; }
+    public String getContent() { return content; } public void setContent(String v) { content = v; }
+}

gw-hzz/src/main/java/com/goldenwater/hzz/domain/AssessFileDTO.java

@@ -0,0 +1,24 @@
+package com.goldenwater.hzz.domain;
+
+import java.io.Serializable;
+
+/** ATT_RV_ASSESS 考核文件 */
+public class AssessFileDTO implements Serializable {
+    private String adCode; private String assGuid; private String assName;
+    private String enterUnit; private String enterTm; private String totalPoints;
+    private String acceptanceLine; private String wellLine; private String excellentLine;
+    private String mdName; private String fileTitl; private String filePath;
+
+    public String getAdCode() { return adCode; } public void setAdCode(String v) { adCode = v; }
+    public String getAssGuid() { return assGuid; } public void setAssGuid(String v) { assGuid = v; }
+    public String getAssName() { return assName; } public void setAssName(String v) { assName = v; }
+    public String getEnterUnit() { return enterUnit; } public void setEnterUnit(String v) { enterUnit = v; }
+    public String getEnterTm() { return enterTm; } public void setEnterTm(String v) { enterTm = v; }
+    public String getTotalPoints() { return totalPoints; } public void setTotalPoints(String v) { totalPoints = v; }
+    public String getAcceptanceLine() { return acceptanceLine; } public void setAcceptanceLine(String v) { acceptanceLine = v; }
+    public String getWellLine() { return wellLine; } public void setWellLine(String v) { wellLine = v; }
+    public String getExcellentLine() { return excellentLine; } public void setExcellentLine(String v) { excellentLine = v; }
+    public String getMdName() { return mdName; } public void setMdName(String v) { mdName = v; }
+    public String getFileTitl() { return fileTitl; } public void setFileTitl(String v) { fileTitl = v; }
+    public String getFilePath() { return filePath; } public void setFilePath(String v) { filePath = v; }
+}

gw-hzz/src/main/java/com/goldenwater/hzz/domain/AssessScoreDTO.java

@@ -0,0 +1,22 @@
+package com.goldenwater.hzz.domain;
+
+import java.io.Serializable;
+
+/** 考核评估分数 */
+public class AssessScoreDTO implements Serializable {
+    private String adCode;
+    private String adName;
+    private String score;
+    private String assTime;
+    private String explain;
+    private String mthGuid;
+    private String mthName;
+
+    public String getAdCode() { return adCode; } public void setAdCode(String v) { adCode = v; }
+    public String getAdName() { return adName; } public void setAdName(String v) { adName = v; }
+    public String getScore() { return score; } public void setScore(String v) { score = v; }
+    public String getAssTime() { return assTime; } public void setAssTime(String v) { assTime = v; }
+    public String getExplain() { return explain; } public void setExplain(String v) { explain = v; }
+    public String getMthGuid() { return mthGuid; } public void setMthGuid(String v) { mthGuid = v; }
+    public String getMthName() { return mthName; } public void setMthName(String v) { mthName = v; }
+}

gw-hzz/src/main/java/com/goldenwater/hzz/domain/EventDTO.java

@@ -0,0 +1,38 @@
+package com.goldenwater.hzz.domain;
+
+import java.io.Serializable;
+
+/** ATT_EV_BASE 清四乱事件 */
+public class EventDTO implements Serializable {
+    private String guid;
+    private String evCode;
+    private String adCode;
+    private String adName;
+    private String objectType;
+    private String objectId;
+    private String objectName;
+    private String evType;
+    private String eventDesc;
+    private String eventAddress;
+    private String status;
+    private String dealDesc;
+    private String findTs;
+    private String doneDate;
+    private String userName;
+
+    public String getGuid() { return guid; } public void setGuid(String v) { guid = v; }
+    public String getEvCode() { return evCode; } public void setEvCode(String v) { evCode = v; }
+    public String getAdCode() { return adCode; } public void setAdCode(String v) { adCode = v; }
+    public String getAdName() { return adName; } public void setAdName(String v) { adName = v; }
+    public String getObjectType() { return objectType; } public void setObjectType(String v) { objectType = v; }
+    public String getObjectId() { return objectId; } public void setObjectId(String v) { objectId = v; }
+    public String getObjectName() { return objectName; } public void setObjectName(String v) { objectName = v; }
+    public String getEvType() { return evType; } public void setEvType(String v) { evType = v; }
+    public String getEventDesc() { return eventDesc; } public void setEventDesc(String v) { eventDesc = v; }
+    public String getEventAddress() { return eventAddress; } public void setEventAddress(String v) { eventAddress = v; }
+    public String getStatus() { return status; } public void setStatus(String v) { status = v; }
+    public String getDealDesc() { return dealDesc; } public void setDealDesc(String v) { dealDesc = v; }
+    public String getFindTs() { return findTs; } public void setFindTs(String v) { findTs = v; }
+    public String getDoneDate() { return doneDate; } public void setDoneDate(String v) { doneDate = v; }
+    public String getUserName() { return userName; } public void setUserName(String v) { userName = v; }
+}

gw-hzz/src/main/java/com/goldenwater/hzz/domain/FileWsnDTO.java

@@ -0,0 +1,22 @@
+package com.goldenwater.hzz.domain;
+
+import java.io.Serializable;
+
+/** GW_FILE_WSN 工作制度文件 */
+public class FileWsnDTO implements Serializable {
+    private String guid;
+    private String fileName;
+    private String fileType;
+    private String wh;
+    private String startDate;
+    private String url;
+    private String types;
+
+    public String getGuid() { return guid; } public void setGuid(String v) { guid = v; }
+    public String getFileName() { return fileName; } public void setFileName(String v) { fileName = v; }
+    public String getFileType() { return fileType; } public void setFileType(String v) { fileType = v; }
+    public String getWh() { return wh; } public void setWh(String v) { wh = v; }
+    public String getStartDate() { return startDate; } public void setStartDate(String v) { startDate = v; }
+    public String getUrl() { return url; } public void setUrl(String v) { url = v; }
+    public String getTypes() { return types; } public void setTypes(String v) { types = v; }
+}

gw-hzz/src/main/java/com/goldenwater/hzz/domain/RiverProjectDTO.java

@@ -0,0 +1,57 @@
+package com.goldenwater.hzz.domain;
+
+import java.io.Serializable;
+
+/** GW_RIVER_PROJECT 涉河项目 */
+public class RiverProjectDTO implements Serializable {
+    private String guid;
+    private String sProjectName;
+    private String sLinkman;
+    private String sDept;
+    private String sLocation;
+    private String sType;
+    private String sPBuildStage;
+    private String sPhone;
+    private String sPgoaDate;
+    private String sUrl;
+    private String sUpOld; private String sPost; private String sPi; private String sPn;
+    private String sXBd; private String sPs; private String sPGOAName;
+    private String sYBd; private String sFax; private String sRMan;
+    private String sDs; private String sDu; private Long nId; private String sRDate;
+    private String sCode; private String sDesignName; private String sGcName;
+    private String sLimitDate; private String sPBT; private String sPlanDate; private String sGcLocation;
+    private String sUp;
+
+    public String getGuid() { return guid; } public void setGuid(String v) { guid = v; }
+    public String getSProjectName() { return sProjectName; } public void setSProjectName(String v) { sProjectName = v; }
+    public String getSLinkman() { return sLinkman; } public void setSLinkman(String v) { sLinkman = v; }
+    public String getSDept() { return sDept; } public void setSDept(String v) { sDept = v; }
+    public String getSLocation() { return sLocation; } public void setSLocation(String v) { sLocation = v; }
+    public String getSType() { return sType; } public void setSType(String v) { sType = v; }
+    public String getSPBuildStage() { return sPBuildStage; } public void setSPBuildStage(String v) { sPBuildStage = v; }
+    public String getSPhone() { return sPhone; } public void setSPhone(String v) { sPhone = v; }
+    public String getSPgoaDate() { return sPgoaDate; } public void setSPgoaDate(String v) { sPgoaDate = v; }
+    public String getSUrl() { return sUrl; } public void setSUrl(String v) { sUrl = v; }
+    public String getSUpOld() { return sUpOld; } public void setSUpOld(String v) { sUpOld = v; }
+    public String getSPost() { return sPost; } public void setSPost(String v) { sPost = v; }
+    public String getSPi() { return sPi; } public void setSPi(String v) { sPi = v; }
+    public String getSPn() { return sPn; } public void setSPn(String v) { sPn = v; }
+    public String getSXBd() { return sXBd; } public void setSXBd(String v) { sXBd = v; }
+    public String getSPs() { return sPs; } public void setSPs(String v) { sPs = v; }
+    public String getSPGOAName() { return sPGOAName; } public void setSPGOAName(String v) { sPGOAName = v; }
+    public String getSYBd() { return sYBd; } public void setSYBd(String v) { sYBd = v; }
+    public String getSFax() { return sFax; } public void setSFax(String v) { sFax = v; }
+    public String getSRMan() { return sRMan; } public void setSRMan(String v) { sRMan = v; }
+    public String getSDs() { return sDs; } public void setSDs(String v) { sDs = v; }
+    public String getSDu() { return sDu; } public void setSDu(String v) { sDu = v; }
+    public Long getNId() { return nId; } public void setNId(Long v) { nId = v; }
+    public String getSRDate() { return sRDate; } public void setSRDate(String v) { sRDate = v; }
+    public String getSCode() { return sCode; } public void setSCode(String v) { sCode = v; }
+    public String getSDesignName() { return sDesignName; } public void setSDesignName(String v) { sDesignName = v; }
+    public String getSGcName() { return sGcName; } public void setSGcName(String v) { sGcName = v; }
+    public String getSLimitDate() { return sLimitDate; } public void setSLimitDate(String v) { sLimitDate = v; }
+    public String getSPBT() { return sPBT; } public void setSPBT(String v) { sPBT = v; }
+    public String getSPlanDate() { return sPlanDate; } public void setSPlanDate(String v) { sPlanDate = v; }
+    public String getSGcLocation() { return sGcLocation; } public void setSGcLocation(String v) { sGcLocation = v; }
+    public String getSUp() { return sUp; } public void setSUp(String v) { sUp = v; }
+}

gw-hzz/src/main/java/com/goldenwater/hzz/domain/RuleExecDTO.java

@@ -0,0 +1,26 @@
+package com.goldenwater.hzz.domain;
+
+import java.io.Serializable;
+
+/** ATT_RULE_EXEC 工作制度 */
+public class RuleExecDTO implements Serializable {
+    private String sysCode;
+    private String sysName;
+    private String sysType;
+    private String attc;
+    private String fileNum;
+    private String ruleProgress;
+    private String fileTitle;
+    private String rlsTm;
+    private String releWiunName;
+
+    public String getSysCode() { return sysCode; } public void setSysCode(String v) { sysCode = v; }
+    public String getSysName() { return sysName; } public void setSysName(String v) { sysName = v; }
+    public String getSysType() { return sysType; } public void setSysType(String v) { sysType = v; }
+    public String getAttc() { return attc; } public void setAttc(String v) { attc = v; }
+    public String getFileNum() { return fileNum; } public void setFileNum(String v) { fileNum = v; }
+    public String getRuleProgress() { return ruleProgress; } public void setRuleProgress(String v) { ruleProgress = v; }
+    public String getFileTitle() { return fileTitle; } public void setFileTitle(String v) { fileTitle = v; }
+    public String getRlsTm() { return rlsTm; } public void setRlsTm(String v) { rlsTm = v; }
+    public String getReleWiunName() { return releWiunName; } public void setReleWiunName(String v) { releWiunName = v; }
+}

gw-hzz/src/main/java/com/goldenwater/hzz/domain/ShorelineDTO.java

@@ -0,0 +1,18 @@
+package com.goldenwater.hzz.domain;
+
+import java.io.Serializable;
+
+/** HZZ_LINELENG 岸线长度 */
+public class ShorelineDTO implements Serializable {
+    private String type;
+    private String belong;
+    private String lineLeng;
+    private String lineGn;
+    private String count;
+
+    public String getType() { return type; } public void setType(String v) { type = v; }
+    public String getBelong() { return belong; } public void setBelong(String v) { belong = v; }
+    public String getLineLeng() { return lineLeng; } public void setLineLeng(String v) { lineLeng = v; }
+    public String getLineGn() { return lineGn; } public void setLineGn(String v) { lineGn = v; }
+    public String getCount() { return count; } public void setCount(String v) { count = v; }
+}

gw-hzz/src/main/java/com/goldenwater/hzz/domain/SupervisionInfoDTO.java

@@ -0,0 +1,14 @@
+package com.goldenwater.hzz.domain;
+
+import java.io.Serializable;
+
+/** GW_SUPERVISION_INFO 督导信息 */
+public class SupervisionInfoDTO implements Serializable {
+    private String guid;
+    private String status;
+    private String auditInfo;
+
+    public String getGuid() { return guid; } public void setGuid(String v) { guid = v; }
+    public String getStatus() { return status; } public void setStatus(String v) { status = v; }
+    public String getAuditInfo() { return auditInfo; } public void setAuditInfo(String v) { auditInfo = v; }
+}

gw-hzz/src/main/java/com/goldenwater/hzz/domain/WpsDTO.java

@@ -0,0 +1,20 @@
+package com.goldenwater.hzz.domain;
+
+import java.io.Serializable;
+
+/** HZZ_WPS 涉河项目督查 */
+public class WpsDTO implements Serializable {
+    private String guid;
+    private String smId;
+    private String supervision;
+    private String startDate;
+    private String endDate;
+    private String sProjectName;
+
+    public String getGuid() { return guid; } public void setGuid(String v) { guid = v; }
+    public String getSmId() { return smId; } public void setSmId(String v) { smId = v; }
+    public String getSupervision() { return supervision; } public void setSupervision(String v) { supervision = v; }
+    public String getStartDate() { return startDate; } public void setStartDate(String v) { startDate = v; }
+    public String getEndDate() { return endDate; } public void setEndDate(String v) { endDate = v; }
+    public String getSProjectName() { return sProjectName; } public void setSProjectName(String v) { sProjectName = v; }
+}

gw-hzz/src/main/java/com/goldenwater/hzz/mapper/AdTreeMapper.java

@@ -1,10 +1,10 @@
 package com.goldenwater.hzz.mapper;
 
+import com.goldenwater.hzz.domain.AdInfoDTO;
 import org.apache.ibatis.annotations.Param;
 import java.util.List;
-import java.util.Map;
 
 public interface AdTreeMapper {
-    List<Map<String, Object>> getChildren(@Param("adCode") String adCode);
-    Map<String, Object> getByCode(@Param("adCode") String adCode);
+    List<AdInfoDTO> getChildren(@Param("adCode") String adCode);
+    AdInfoDTO getByCode(@Param("adCode") String adCode);
 }

gw-hzz/src/main/java/com/goldenwater/hzz/mapper/AssessMapper.java

@@ -1,12 +1,12 @@
 package com.goldenwater.hzz.mapper;
 
+import com.goldenwater.hzz.domain.*;
 import org.apache.ibatis.annotations.Param;
 import java.util.List;
-import java.util.Map;
 
 public interface AssessMapper {
-    List<Map<String, Object>> getTotalScore(@Param("adCode") String adCode, @Param("assTime") String assTime, @Param("effDate") String effDate);
-    List<Map<String, Object>> getMthNameAndScore(@Param("adCode") String adCode, @Param("assTime") String assTime, @Param("effDate") String effDate);
-    List<Map<String, Object>> getMethodFile(@Param("adCode") String adCode, @Param("effDate") String effDate);
-    List<Map<String, Object>> getAttFileText(@Param("mdCode") String mdCode, @Param("effDate") String effDate, @Param("exprDate") String exprDate);
+    List<AssessScoreDTO> getTotalScore(@Param("adCode") String adCode, @Param("assTime") String at, @Param("effDate") String ed);
+    List<AssessScoreDTO> getMthNameAndScore(@Param("adCode") String adCode, @Param("assTime") String at, @Param("effDate") String ed);
+    List<AssessFileDTO> getMethodFile(@Param("adCode") String adCode, @Param("effDate") String ed);
+    List<AssessFileDTO> getAttFileText(@Param("mdCode") String mc, @Param("effDate") String ed, @Param("exprDate") String xd);
 }

gw-hzz/src/main/java/com/goldenwater/hzz/mapper/EventClearMapper.java

@@ -1,10 +1,10 @@
 package com.goldenwater.hzz.mapper;
 
+import com.goldenwater.hzz.domain.EventDTO;
 import org.apache.ibatis.annotations.Param;
 import java.util.List;
-import java.util.Map;
 
 public interface EventClearMapper {
-    List<Map<String, Object>> findList(Map<String, Object> params);
-    List<Map<String, Object>> findListByAdCode(@Param("adCode") String adCode, @Param("evType") String evType, @Param("keyWord") String keyWord, @Param("objectType") String objectType);
+    List<EventDTO> findList(EventDTO params);
+    List<EventDTO> findListByAdCode(@Param("adCode") String ad, @Param("evType") String et, @Param("keyWord") String kw, @Param("objectType") String ot);
 }

gw-hzz/src/main/java/com/goldenwater/hzz/mapper/HzzWpsMapper.java

@@ -1,15 +1,15 @@
 package com.goldenwater.hzz.mapper;
 
+import com.goldenwater.hzz.domain.WpsDTO;
 import org.apache.ibatis.annotations.Param;
 import java.util.List;
-import java.util.Map;
 
 public interface HzzWpsMapper {
-    List<Map<String, Object>> querySupervision(@Param("sProjectName") String sProjectName, @Param("startDate") String startDate, @Param("endDate") String endDate);
-    List<Map<String, Object>> queryXmList();
-    int insertShxmDc(Map<String, Object> params);
-    int insertShxmFiles(@Param("list") List<Map<String, Object>> files);
-    int updateShxmDc(Map<String, Object> params);
-    int deleteShxmDcFiles(@Param("guid") String guid);
-    int deleteShxmDc(@Param("guid") String guid);
+    List<WpsDTO> querySupervision(@Param("sProjectName") String pn, @Param("startDate") String sd, @Param("endDate") String ed);
+    List<WpsDTO> queryXmList();
+    int insertShxmDc(WpsDTO dto);
+    int insertShxmFiles(@Param("list") List<WpsDTO> files);
+    int updateShxmDc(WpsDTO dto);
+    int deleteShxmDcFiles(@Param("guid") String g);
+    int deleteShxmDc(@Param("guid") String g);
 }

gw-hzz/src/main/java/com/goldenwater/hzz/mapper/RiverProjectMapper.java

@@ -1,19 +1,18 @@
 package com.goldenwater.hzz.mapper;
 
-import com.goldenwater.hzz.domain.RiverConstructionDTO;
+import com.goldenwater.hzz.domain.*;
 import org.apache.ibatis.annotations.Param;
 import java.util.List;
-import java.util.Map;
 
 public interface RiverProjectMapper {
-    List<Map<String, Object>> getShxmAll(@Param("searchName") String searchName);
-    List<Map<String, Object>> getShxmList(@Param("sProjectName") String sProjectName, @Param("sPBuildStage") String sPBuildStage);
-    Map<String, Object> getShxmById(@Param("guid") String guid);
-    int saveShxm(Map<String, Object> params);
-    int editShxm(Map<String, Object> params);
+    List<RiverProjectDTO> getShxmAll(@Param("searchName") String sn);
+    List<RiverProjectDTO> getShxmList(@Param("sProjectName") String pn, @Param("sPBuildStage") String bs);
+    RiverProjectDTO getShxmById(@Param("guid") String guid);
+    int saveShxm(RiverProjectDTO dto);
+    int editShxm(RiverProjectDTO dto);
     int deleteShxm(@Param("guid") String guid);
-    List<Map<String, Object>> getFilesById(@Param("guid") String guid);
-    int saveShxmFiles(@Param("list") List<Map<String, Object>> files);
+    List<RiverProjectDTO> getFilesById(@Param("guid") String guid);
+    int saveShxmFiles(@Param("list") List<RiverProjectDTO> files);
     int deleteShxmFile(@Param("guid") String guid);
     List<RiverConstructionDTO> selectConstructionList(RiverConstructionDTO dto);
     int insertConstruction(RiverConstructionDTO dto);

gw-hzz/src/main/java/com/goldenwater/hzz/mapper/RuleMapper.java

@@ -1,18 +1,18 @@
 package com.goldenwater.hzz.mapper;
 
+import com.goldenwater.hzz.domain.*;
 import org.apache.ibatis.annotations.Param;
 import java.util.List;
-import java.util.Map;
 
 public interface RuleMapper {
-    List<Map<String, Object>> getRuleMessage(@Param("adCode") String adCode, @Param("ruleType") String ruleType);
-    List<Map<String, Object>> getWsnList(@Param("types") String types, @Param("fileName") String fileName, @Param("fileType") String fileType, @Param("startTime") String startTime, @Param("endTime") String endTime);
-    int insertWsn(Map<String, Object> params);
-    int updateWsn(Map<String, Object> params);
+    List<RuleExecDTO> getRuleMessage(@Param("adCode") String adCode, @Param("ruleType") String ruleType);
+    List<FileWsnDTO> getWsnList(@Param("types") String types, @Param("fileName") String f, @Param("fileType") String ft, @Param("startTime") String st, @Param("endTime") String et);
+    int insertWsn(FileWsnDTO dto);
+    int updateWsn(FileWsnDTO dto);
     int deleteWsn(@Param("guid") String guid);
-    List<Map<String, Object>> getArticleList(@Param("title") String title, @Param("type") String type, @Param("startTime") String startTime, @Param("endTime") String endTime);
-    int addArticle(Map<String, Object> params);
-    int updateArticle(Map<String, Object> params);
+    List<ArticleDTO> getArticleList(@Param("title") String t, @Param("type") String ty, @Param("startTime") String st, @Param("endTime") String et);
+    int addArticle(ArticleDTO dto);
+    int updateArticle(ArticleDTO dto);
     int deleteArticle(@Param("guid") String guid);
-    List<Map<String, Object>> getArticleTop5(@Param("type") String type);
+    List<ArticleDTO> getArticleTop5(@Param("type") String type);
 }

gw-hzz/src/main/java/com/goldenwater/hzz/mapper/ShorelineMapper.java

@@ -1,6 +1,7 @@
 package com.goldenwater.hzz.mapper;
+import com.goldenwater.hzz.domain.ShorelineDTO;
 import java.util.List;
-import java.util.Map;
+
 public interface ShorelineMapper {
-    List<Map<String, Object>> getWaterLine();
+    List<ShorelineDTO> getWaterLine();
 }

gw-hzz/src/main/java/com/goldenwater/hzz/mapper/SupervisionMapper.java

@@ -1,13 +1,13 @@
 package com.goldenwater.hzz.mapper;
 
+import com.goldenwater.hzz.domain.*;
 import org.apache.ibatis.annotations.Param;
 import java.util.List;
-import java.util.Map;
 
 public interface SupervisionMapper {
-    List<Map<String, Object>> getSupervisionList();
-    List<Map<String, Object>> getAttachmentByGuid(@Param("guid") String guid);
-    List<Map<String, Object>> getDivisionByGuid(@Param("guid") String guid);
-    List<Map<String, Object>> getResultByGuid(@Param("guid") String guid);
-    int audit(@Param("guid") String guid, @Param("audit") String audit, @Param("auditInfo") String auditInfo);
+    List<SupervisionInfoDTO> getSupervisionList();
+    List<SupervisionInfoDTO> getAttachmentByGuid(@Param("guid") String g);
+    List<SupervisionInfoDTO> getDivisionByGuid(@Param("guid") String g);
+    List<SupervisionInfoDTO> getResultByGuid(@Param("guid") String g);
+    int audit(@Param("guid") String g, @Param("audit") String a, @Param("auditInfo") String ai);
 }

gw-hzz/src/main/java/com/goldenwater/hzz/service/AdTreeService.java

@@ -1,13 +1,13 @@
 package com.goldenwater.hzz.service;
+import com.goldenwater.hzz.domain.AdInfoDTO;
 import com.goldenwater.hzz.mapper.AdTreeMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import java.util.List;
-import java.util.Map;
 
 @Service
 public class AdTreeService {
     @Autowired private AdTreeMapper mapper;
-    public List<Map<String, Object>> getChildren(String adCode) { return mapper.getChildren(adCode); }
-    public Map<String, Object> getByCode(String adCode) { return mapper.getByCode(adCode); }
+    public List<AdInfoDTO> getChildren(String adCode) { return mapper.getChildren(adCode); }
+    public AdInfoDTO getByCode(String adCode) { return mapper.getByCode(adCode); }
 }

gw-hzz/src/main/java/com/goldenwater/hzz/service/AssessService.java

@@ -1,15 +1,15 @@
 package com.goldenwater.hzz.service;
+import com.goldenwater.hzz.domain.*;
 import com.goldenwater.hzz.mapper.AssessMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import java.util.List;
-import java.util.Map;
 
 @Service
 public class AssessService {
     @Autowired private AssessMapper mapper;
-    public List<Map<String, Object>> getTotalScore(String adCode, String assTime, String effDate) { return mapper.getTotalScore(adCode, assTime, effDate); }
-    public List<Map<String, Object>> getMthNameAndScore(String adCode, String assTime, String effDate) { return mapper.getMthNameAndScore(adCode, assTime, effDate); }
-    public List<Map<String, Object>> getMethodFile(String adCode, String effDate) { return mapper.getMethodFile(adCode, effDate); }
-    public List<Map<String, Object>> getAttFileText(String mdCode, String effDate, String exprDate) { return mapper.getAttFileText(mdCode, effDate, exprDate); }
+    public List<AssessScoreDTO> getTotalScore(String ad, String at, String ed) { return mapper.getTotalScore(ad,at,ed); }
+    public List<AssessScoreDTO> getMthNameAndScore(String ad, String at, String ed) { return mapper.getMthNameAndScore(ad,at,ed); }
+    public List<AssessFileDTO> getMethodFile(String ad, String ed) { return mapper.getMethodFile(ad,ed); }
+    public List<AssessFileDTO> getAttFileText(String mc, String ed, String xd) { return mapper.getAttFileText(mc,ed,xd); }
 }

gw-hzz/src/main/java/com/goldenwater/hzz/service/EventClearService.java

@@ -1,14 +1,14 @@
 package com.goldenwater.hzz.service;
+import com.goldenwater.hzz.domain.EventDTO;
 import com.goldenwater.hzz.mapper.EventClearMapper;
 import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import java.util.List;
-import java.util.Map;
 
 @Service
 public class EventClearService {
     @Autowired private EventClearMapper mapper;
-    public List<Map<String, Object>> findList(Map<String, Object> p, int pn, int ps) { PageHelper.startPage(pn,ps); return mapper.findList(p); }
-    public List<Map<String, Object>> findListByAdCode(String ad, String et, String kw, String ot, int pn, int ps) { PageHelper.startPage(pn,ps); return mapper.findListByAdCode(ad,et,kw,ot); }
+    public List<EventDTO> findList(EventDTO p, int pn, int ps) { PageHelper.startPage(pn,ps); return mapper.findList(p); }
+    public List<EventDTO> findListByAdCode(String ad, String et, String kw, String ot, int pn, int ps) { PageHelper.startPage(pn,ps); return mapper.findListByAdCode(ad,et,kw,ot); }
 }

gw-hzz/src/main/java/com/goldenwater/hzz/service/HzzWpsService.java

@@ -1,4 +1,5 @@
 package com.goldenwater.hzz.service;
+import com.goldenwater.hzz.domain.WpsDTO;
 import com.goldenwater.hzz.mapper.HzzWpsMapper;
 import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -8,9 +9,9 @@ import java.util.*;
 @Service
 public class HzzWpsService {
     @Autowired private HzzWpsMapper mapper;
-    public List<Map<String, Object>> querySupervision(String pn, String sd, String ed, int page, int size) { PageHelper.startPage(page,size); return mapper.querySupervision(pn,sd,ed); }
-    public int insertShxmDc(Map<String, Object> p) { if(!p.containsKey("guid")) p.put("guid",UUID.randomUUID().toString().replace("-","")); return mapper.insertShxmDc(p); }
-    public int updateShxmDc(Map<String, Object> p) { return mapper.updateShxmDc(p); }
+    public List<WpsDTO> querySupervision(String pn, String sd, String ed, int p, int s) { PageHelper.startPage(p,s); return mapper.querySupervision(pn,sd,ed); }
+    public int insertShxmDc(WpsDTO dto) { if(dto.getGuid()==null) dto.setGuid(UUID.randomUUID().toString().replace("-","")); return mapper.insertShxmDc(dto); }
+    public int updateShxmDc(WpsDTO dto) { return mapper.updateShxmDc(dto); }
     public int deleteShxmDc(String g) { mapper.deleteShxmDcFiles(g); return mapper.deleteShxmDc(g); }
-    public int insertShxmFiles(List<Map<String, Object>> f) { return mapper.insertShxmFiles(f); }
+    public int insertShxmFiles(List<WpsDTO> f) { return mapper.insertShxmFiles(f); }
 }

gw-hzz/src/main/java/com/goldenwater/hzz/service/RiverProjectService.java

@@ -1,5 +1,5 @@
 package com.goldenwater.hzz.service;
-import com.goldenwater.hzz.domain.RiverConstructionDTO;
+import com.goldenwater.hzz.domain.*;
 import com.goldenwater.hzz.mapper.RiverProjectMapper;
 import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -9,13 +9,13 @@ import java.util.*;
 @Service
 public class RiverProjectService {
     @Autowired private RiverProjectMapper mapper;
-    public List<Map<String, Object>> getShxmAll(String sn) { return mapper.getShxmAll(sn); }
-    public List<Map<String, Object>> getShxmList(String pn, String bs, int pn2, int ps) { PageHelper.startPage(pn2,ps); return mapper.getShxmList(pn,bs); }
-    public Map<String, Object> getShxmById(String g) { return mapper.getShxmById(g); }
-    public int saveShxm(Map<String, Object> p) { if(!p.containsKey("guid")) p.put("guid",UUID.randomUUID().toString().replace("-","")); return mapper.saveShxm(p); }
-    public int editShxm(Map<String, Object> p) { return mapper.editShxm(p); }
+    public List<RiverProjectDTO> getShxmAll(String sn) { return mapper.getShxmAll(sn); }
+    public List<RiverProjectDTO> getShxmList(String pn, String bs, int p, int s) { PageHelper.startPage(p,s); return mapper.getShxmList(pn,bs); }
+    public RiverProjectDTO getShxmById(String g) { return mapper.getShxmById(g); }
+    public int saveShxm(RiverProjectDTO dto) { if(dto.getGuid()==null) dto.setGuid(UUID.randomUUID().toString().replace("-","")); return mapper.saveShxm(dto); }
+    public int editShxm(RiverProjectDTO dto) { return mapper.editShxm(dto); }
     public int deleteShxm(String g) { return mapper.deleteShxm(g); }
-    public List<Map<String, Object>> getFilesById(String g) { return mapper.getFilesById(g); }
-    public int saveShxmFiles(List<Map<String, Object>> f) { return mapper.saveShxmFiles(f); }
-    public List<RiverConstructionDTO> selectConstructionList(RiverConstructionDTO d, int pn, int ps) { PageHelper.startPage(pn,ps); return mapper.selectConstructionList(d); }
+    public List<RiverProjectDTO> getFilesById(String g) { return mapper.getFilesById(g); }
+    public int saveShxmFiles(List<RiverProjectDTO> f) { return mapper.saveShxmFiles(f); }
+    public List<RiverConstructionDTO> selectConstructionList(RiverConstructionDTO d, int p, int s) { PageHelper.startPage(p,s); return mapper.selectConstructionList(d); }
 }

gw-hzz/src/main/java/com/goldenwater/hzz/service/RuleService.java

@@ -1,4 +1,5 @@
 package com.goldenwater.hzz.service;
+import com.goldenwater.hzz.domain.*;
 import com.goldenwater.hzz.mapper.RuleMapper;
 import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -8,20 +9,14 @@ import java.util.*;
 @Service
 public class RuleService {
     @Autowired private RuleMapper mapper;
-    public List<Map<String, Object>> getRuleMessage(String adCode, String ruleType) { return mapper.getRuleMessage(adCode, ruleType); }
-    public List<Map<String, Object>> getWsnList(String types, String fileName, String fileType, String startTime, String endTime, int pageNum, int pageSize) {
-        PageHelper.startPage(pageNum, pageSize);
-        return mapper.getWsnList(types, fileName, fileType, startTime, endTime);
-    }
-    public int insertWsn(Map<String, Object> p) { if(!p.containsKey("guid")) p.put("guid", UUID.randomUUID().toString().replace("-","")); return mapper.insertWsn(p); }
-    public int updateWsn(Map<String, Object> p) { return mapper.updateWsn(p); }
+    public List<RuleExecDTO> getRuleMessage(String adCode, String ruleType) { return mapper.getRuleMessage(adCode, ruleType); }
+    public List<FileWsnDTO> getWsnList(String types, String fn, String ft, String st, String et, int pn, int ps) { PageHelper.startPage(pn,ps); return mapper.getWsnList(types,fn,ft,st,et); }
+    public int insertWsn(FileWsnDTO dto) { if(dto.getGuid()==null) dto.setGuid(UUID.randomUUID().toString().replace("-","")); return mapper.insertWsn(dto); }
+    public int updateWsn(FileWsnDTO dto) { return mapper.updateWsn(dto); }
     public int deleteWsn(String guid) { return mapper.deleteWsn(guid); }
-    public List<Map<String, Object>> getArticleList(String title, String type, String startTime, String endTime, int pageNum, int pageSize) {
-        PageHelper.startPage(pageNum, pageSize);
-        return mapper.getArticleList(title, type, startTime, endTime);
-    }
-    public int addArticle(Map<String, Object> p) { if(!p.containsKey("guid")) p.put("guid", UUID.randomUUID().toString().replace("-","")); return mapper.addArticle(p); }
-    public int updateArticle(Map<String, Object> p) { return mapper.updateArticle(p); }
-    public int deleteArticle(String guid) { return mapper.deleteArticle(guid); }
-    public List<Map<String, Object>> getArticleTop5(String type) { return mapper.getArticleTop5(type); }
+    public List<ArticleDTO> getArticleList(String t, String ty, String st, String et, int pn, int ps) { PageHelper.startPage(pn,ps); return mapper.getArticleList(t,ty,st,et); }
+    public int addArticle(ArticleDTO dto) { if(dto.getGuid()==null) dto.setGuid(UUID.randomUUID().toString().replace("-","")); return mapper.addArticle(dto); }
+    public int updateArticle(ArticleDTO dto) { return mapper.updateArticle(dto); }
+    public int deleteArticle(String g) { return mapper.deleteArticle(g); }
+    public List<ArticleDTO> getArticleTop5(String type) { return mapper.getArticleTop5(type); }
 }

gw-hzz/src/main/java/com/goldenwater/hzz/service/ShorelineService.java

@@ -1,12 +1,12 @@
 package com.goldenwater.hzz.service;
+import com.goldenwater.hzz.domain.ShorelineDTO;
 import com.goldenwater.hzz.mapper.ShorelineMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import java.util.List;
-import java.util.Map;
 
 @Service
 public class ShorelineService {
     @Autowired private ShorelineMapper mapper;
-    public List<Map<String, Object>> getWaterLine() { return mapper.getWaterLine(); }
+    public List<ShorelineDTO> getWaterLine() { return mapper.getWaterLine(); }
 }

gw-hzz/src/main/java/com/goldenwater/hzz/service/SupervisionService.java

@@ -1,17 +1,17 @@
 package com.goldenwater.hzz.service;
+import com.goldenwater.hzz.domain.SupervisionInfoDTO;
 import com.goldenwater.hzz.mapper.SupervisionMapper;
 import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import java.util.List;
-import java.util.Map;
 
 @Service
 public class SupervisionService {
     @Autowired private SupervisionMapper mapper;
-    public List<Map<String, Object>> getSupervisionList(int pn, int ps) { PageHelper.startPage(pn,ps); return mapper.getSupervisionList(); }
-    public List<Map<String, Object>> getAttachmentByGuid(String g) { return mapper.getAttachmentByGuid(g); }
-    public List<Map<String, Object>> getDivisionByGuid(String g) { return mapper.getDivisionByGuid(g); }
-    public List<Map<String, Object>> getResultByGuid(String g) { return mapper.getResultByGuid(g); }
-    public int audit(String g, String a, String ai) { return mapper.audit(g, a, ai); }
+    public List<SupervisionInfoDTO> getSupervisionList(int p, int s) { PageHelper.startPage(p,s); return mapper.getSupervisionList(); }
+    public List<SupervisionInfoDTO> getAttachmentByGuid(String g) { return mapper.getAttachmentByGuid(g); }
+    public List<SupervisionInfoDTO> getDivisionByGuid(String g) { return mapper.getDivisionByGuid(g); }
+    public List<SupervisionInfoDTO> getResultByGuid(String g) { return mapper.getResultByGuid(g); }
+    public int audit(String g, String a, String ai) { return mapper.audit(g,a,ai); }
 }

gw-hzz/src/main/resources/mapper/hzz/AdTreeMapper.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.goldenwater.hzz.mapper.AdTreeMapper">
-    <select id="getChildren" resultType="java.util.HashMap">
-        SELECT AD_CODE AS "adCode", AD_NAME AS "adName", AD_GRAD AS "adGrad", UP_AD_CODE AS "parentAdCode"
+    <select id="getChildren" resultType="com.goldenwater.hzz.domain.AdInfoDTO">
+        SELECT AD_CODE, AD_NAME, AD_GRAD, UP_AD_CODE
         FROM ATT_AD_BASE WHERE EXPR_DATE IS NULL AND UP_AD_CODE = #{adCode} ORDER BY AD_CODE
     </select>
-    <select id="getByCode" resultType="java.util.HashMap">
-        SELECT AD_CODE AS "adCode", AD_NAME AS "adName", AD_GRAD AS "adGrad", UP_AD_CODE AS "parentAdCode"
+    <select id="getByCode" resultType="com.goldenwater.hzz.domain.AdInfoDTO">
+        SELECT AD_CODE, AD_NAME, AD_GRAD, UP_AD_CODE
         FROM ATT_AD_BASE WHERE AD_CODE = #{adCode} AND EXPR_DATE IS NULL
     </select>
 </mapper>

gw-hzz/src/main/resources/mapper/hzz/AssessMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.goldenwater.hzz.mapper.AssessMapper">
-    <select id="getTotalScore" resultType="java.util.HashMap">
+    <select id="getTotalScore" resultType="com.goldenwater.hzz.domain.AssessScoreDTO">
         SELECT C.AD_CODE AS "adCode", D.AD_NAME AS "adName", C.SCORE AS "score"
         FROM (SELECT A.AD_CODE,SUM(A.SCORE) AS SCORE FROM ATT_ASS_GRADE A
         LEFT JOIN ATT_AD_EXPD B ON A.AD_CODE=B.AD_CODE AND B.PARENT_AD_CODE=${adCode} AND B.EFF_DATE&lt;=TO_DATE(${effDate},'YYYY-MM-DD') AND (TO_DATE(${effDate},'YYYY-MM-DD')&lt;=B.EXPR_DATE OR B.EXPR_DATE IS NULL)
@@ -9,7 +9,7 @@
         GROUP BY A.AD_CODE) C
         LEFT JOIN OBJ_AD D ON C.AD_CODE=D.AD_CODE AND D.FROM_DATE&lt;=TO_DATE(${effDate},'YYYY-MM-DD') AND (TO_DATE(${effDate},'YYYY-MM-DD')&lt;=D.TO_DATE OR D.TO_DATE IS NULL)
     </select>
-    <select id="getMthNameAndScore" resultType="java.util.HashMap">
+    <select id="getMthNameAndScore" resultType="com.goldenwater.hzz.domain.AssessScoreDTO">
         SELECT A.AD_CODE AS "adCode", B.AD_NAME AS "adName", C.SCORE AS "score", TO_CHAR(C.ASS_TIME,'YYYY-MM-DD') AS "assTime", C.EXPLAIN AS "explain", D.MTH_GUID AS "mthGuid", D.MTH_NAME AS "mthName"
         FROM ATT_AD_EXPD A
         LEFT JOIN ATT_AD_BASE B ON A.AD_CODE=B.AD_CODE AND B.EFF_DATE&lt;=TO_DATE(${effDate},'YYYY-MM-DD') AND (B.EXPR_DATE IS NULL OR TO_DATE(${effDate},'YYYY-MM-DD')&lt;=B.EXPR_DATE)
@@ -17,14 +17,14 @@
         LEFT JOIN ATT_ASSESS_METHOD D ON C.MTH_GUID=D.MTH_GUID AND D.EFF_DATE&lt;=TO_DATE(${effDate},'YYYY-MM-DD') AND (D.EXPR_DATE IS NULL OR TO_DATE(${effDate},'YYYY-MM-DD')&lt;=D.EXPR_DATE)
         WHERE A.PARENT_AD_CODE=${adCode} AND A.EFF_DATE&lt;=TO_DATE(${effDate},'YYYY-MM-DD') AND (A.EXPR_DATE IS NULL OR TO_DATE(${effDate},'YYYY-MM-DD')&lt;=A.EXPR_DATE)
     </select>
-    <select id="getMethodFile" resultType="java.util.HashMap">
+    <select id="getMethodFile" resultType="com.goldenwater.hzz.domain.AssessFileDTO">
         SELECT A.AD_CODE AS "adCode", A.ASS_GUID AS "assGuid", A.ASS_NAME AS "assName", A.ENTER_UNIT AS "enterUnit", TO_CHAR(A.ENTER_TM,'YYYY-MM-DD') AS "enterTm", A.TOTAL_POINTS AS "totalPoints", A.ACCEPTANCE_LINE AS "acceptanceLine", A.WELL_LINE AS "wellLine", A.EXCELLENT_LINE AS "excellentLine", C.MD_NAME AS "mdName", C.FILE_TITL AS "fileTitl", C.FILE_PATH AS "filePath"
         FROM ATT_RV_ASSESS A
         LEFT JOIN REL_MD_OBJ B ON A.ASS_GUID=B.OBJ_GUID AND B.OBJ_TAB_CODE='ATT_RV_ASSESS' AND B.FROM_DATE&lt;=TO_DATE(#{effDate},'YYYY-MM-DD') AND (B.TO_DATE IS NULL OR B.TO_DATE&gt;=TO_DATE(#{effDate},'YYYY-MM-DD'))
         LEFT JOIN ATT_MD_BASE C ON B.MD_GUID=C.MD_CODE AND C.FROM_DATE&lt;=TO_DATE(#{effDate},'YYYY-MM-DD') AND (C.TO_DATE IS NULL OR TO_DATE(#{effDate},'YYYY-MM-DD')&gt;=C.TO_DATE)
         WHERE A.AD_CODE=#{adCode} AND A.EFF_DATE&lt;TO_DATE(#{effDate},'YYYY-MM-DD') AND (A.EXPR_DATE IS NULL OR TO_DATE(#{effDate},'YYYY-MM-DD')&gt;A.EXPR_DATE)
     </select>
-    <select id="getAttFileText" resultType="java.util.HashMap">
+    <select id="getAttFileText" resultType="com.goldenwater.hzz.domain.AssessScoreDTO">
         SELECT * FROM ATT_FILE_TEXT WHERE MD_CODE=#{mdCode} AND EFF_DATE&lt;#{effDate} AND (EXPR_DATE&gt;#{exprDate} OR EXPR_DATE IS NULL)
     </select>
 </mapper>

gw-hzz/src/main/resources/mapper/hzz/EventClearMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.goldenwater.hzz.mapper.EventClearMapper">
-    <select id="findList" resultType="java.util.HashMap" parameterType="java.util.Map">
+    <select id="findList" resultType="com.goldenwater.hzz.domain.EventDTO" parameterType="java.util.Map">
         SELECT EV.GUID AS "guid", EV.EV_CODE AS "evCode", EV.AD_CODE AS "adCode", AD.AD_NAME AS "adName",
                EV.OBJ_TYPE AS "objectType", EV.OBJ_CODE AS "objectId",
                CASE WHEN EV.OBJ_TYPE='REA' THEN REA.REA_NAME WHEN EV.OBJ_TYPE='LKS' THEN LKS.LKS_NAME ELSE RER.RER_NAME END AS "objectName",
@@ -21,7 +21,7 @@
         <if test="key_word != null and key_word != ''">AND (REA.REA_NAME LIKE '%'||#{key_word}||'%' OR AD.AD_NAME LIKE '%'||#{key_word}||'%' OR EV.EV_DESC LIKE '%'||#{key_word}||'%')</if>
         ORDER BY EV.FIND_TS DESC
     </select>
-    <select id="findListByAdCode" resultType="java.util.HashMap">
+    <select id="findListByAdCode" resultType="com.goldenwater.hzz.domain.EventDTO">
         SELECT EV.GUID AS "guid", EV.EV_CODE AS "evCode", EV.AD_CODE AS "adCode", AD.AD_NAME AS "adName",
                EV.OBJ_TYPE AS "objectType", EV.OBJ_CODE AS "objectId",
                CASE WHEN EV.OBJ_TYPE='REA' THEN REA.REA_NAME WHEN EV.OBJ_TYPE='LKS' THEN LKS.LKS_NAME ELSE RER.RER_NAME END AS "objectName",

gw-hzz/src/main/resources/mapper/hzz/HzzWpsMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.goldenwater.hzz.mapper.HzzWpsMapper">
-    <select id="querySupervision" resultType="java.util.HashMap">
+    <select id="querySupervision" resultType="com.goldenwater.hzz.domain.WpsDTO">
         SELECT hw.GUID AS "guid", hw.SM_ID AS "smId", hw.SUPERVISION AS "supervision",
                TO_CHAR(hw.START_DATE,'YYYY-MM-DD HH24:MI:SS') AS "startDate",
                TO_CHAR(hw.END_DATE,'YYYY-MM-DD HH24:MI:SS') AS "endDate",
@@ -13,7 +13,7 @@
         <if test="endDate != null and endDate != ''">AND hw.END_DATE&lt;=TO_DATE(#{endDate},'YYYY-MM-DD HH24:MI:SS')</if>
         ORDER BY hw.START_DATE DESC
     </select>
-    <select id="queryXmList" resultType="java.util.HashMap">SELECT GUID AS "guid",S_PROJECT_NAME AS "sProjectName" FROM GW_RIVER_PROJECT</select>
+    <select id="queryXmList" resultType="com.goldenwater.hzz.domain.WpsDTO">SELECT GUID AS "guid",S_PROJECT_NAME AS "sProjectName" FROM GW_RIVER_PROJECT</select>
     <insert id="insertShxmDc">INSERT INTO HZZ_WPS(GUID,SM_ID,SUPERVISION,START_DATE,END_DATE) VALUES(#{guid},#{smId},#{supervision},TO_DATE(#{startDate},'YYYY-MM-DD HH24:MI:SS'),TO_DATE(#{endDate},'YYYY-MM-DD HH24:MI:SS'))</insert>
     <insert id="insertShxmFiles" parameterType="java.util.List">INSERT ALL <foreach collection="list" item="item">INTO HZZ_WPS_FILE(GUID,WPS_ID,URL) VALUES(#{item.guid},#{item.wpsId},#{item.url})</foreach> SELECT 1 FROM DUAL</insert>
     <update id="updateShxmDc">UPDATE HZZ_WPS SET SM_ID=#{smId},SUPERVISION=#{supervision},START_DATE=TO_DATE(#{startDate},'YYYY-MM-DD HH24:MI:SS'),END_DATE=TO_DATE(#{endDate},'YYYY-MM-DD HH24:MI:SS') WHERE GUID=#{guid}</update>

gw-hzz/src/main/resources/mapper/hzz/RiverProjectMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.goldenwater.hzz.mapper.RiverProjectMapper">
-    <select id="getShxmAll" resultType="java.util.HashMap">
+    <select id="getShxmAll" resultType="com.goldenwater.hzz.domain.RiverProjectDTO">
         SELECT GUID AS "guid", S_LINKMAN AS "sLinkman", S_PROJECT_NAME AS "sProjectName",
                S_DEPT AS "sDept", S_LOCATION AS "sLocation", S_TYPE AS "sType",
                S_P_BUILD_STAGE AS "sPBuildStage", S_PHONE AS "sPhone",
@@ -9,13 +9,13 @@
         FROM GW_RIVER_PROJECT WHERE 1=1
         <if test="searchName != null and searchName != ''">AND S_PROJECT_NAME LIKE '%'||#{searchName}||'%'</if>
     </select>
-    <select id="getShxmList" resultType="java.util.HashMap">
+    <select id="getShxmList" resultType="com.goldenwater.hzz.domain.RiverProjectDTO">
         SELECT * FROM GW_RIVER_PROJECT WHERE 1=1
         <if test="sProjectName != null and sProjectName != ''">AND S_PROJECT_NAME LIKE '%'||#{sProjectName}||'%'</if>
         <if test="sPBuildStage != null and sPBuildStage != ''">AND S_P_BUILD_STAGE LIKE '%'||#{sPBuildStage}||'%'</if>
         ORDER BY S_PGOA_DATE DESC NULLS LAST
     </select>
-    <select id="getShxmById" resultType="java.util.HashMap">SELECT * FROM GW_RIVER_PROJECT WHERE GUID=#{guid}</select>
+    <select id="getShxmById" resultType="com.goldenwater.hzz.domain.RiverProjectDTO">SELECT * FROM GW_RIVER_PROJECT WHERE GUID=#{guid}</select>
     <insert id="saveShxm" parameterType="java.util.Map">
         INSERT INTO GW_RIVER_PROJECT(GUID,S_LINKMAN,S_UP_OLD,S_POST,S_PI,S_PN,S_X_BD,S_PS,S_PGOA_NAME,S_Y_BD,S_FAX,S_R_MAN,S_DS,S_DU,N_ID,S_R_DATE,S_DEPT,S_P_BUILD_STAGE,S_PHONE,S_LOCATION,S_UP,S_TYPE,S_PGOA_DATE,S_CODE,S_DESIGN_NAME,S_GC_NAME,S_LIMIT_DATE,S_PBT,S_PLAN_DATE,S_GC_LOCATION,S_PROJECT_NAME,S_URL)
         VALUES(#{guid},#{sLinkman},#{sUpOld},#{sPost},#{sPi},#{sPn},#{sXBd},#{sPs},#{sPGOAName},#{sYBd},#{sFax},#{sRMan},#{sDs},#{sDu},#{nId},TO_DATE(#{sRDate},'YYYY-MM-DD'),#{sDept},#{sPBuildStage},#{sPhone},#{sLocation},#{sUp},#{sType},TO_DATE(#{sPGOADate},'YYYY-MM-DD'),#{sCode},#{sDesignName},#{sGcName},TO_DATE(#{sLimitDate},'YYYY-MM-DD'),#{sPBT},TO_DATE(#{sPlanDate},'YYYY-MM-DD'),#{sGcLocation},#{sProjectName},#{sUrl})
@@ -24,7 +24,7 @@
         UPDATE GW_RIVER_PROJECT SET S_LINKMAN=#{sLinkman},S_PROJECT_NAME=#{sProjectName},S_DEPT=#{sDept},S_LOCATION=#{sLocation},S_TYPE=#{sType},S_P_BUILD_STAGE=#{sPBuildStage},S_PHONE=#{sPhone},S_PGOA_DATE=TO_DATE(#{sPGOADate},'YYYY-MM-DD'),S_URL=#{sUrl} WHERE GUID=#{guid}
     </update>
     <delete id="deleteShxm">DELETE FROM GW_RIVER_PROJECT WHERE GUID=#{guid}</delete>
-    <select id="getFilesById" resultType="java.util.HashMap">SELECT GUID AS "guid",PRO_ID AS "proId",URL AS "url" FROM GW_RIVER_PROJECT_FILE WHERE PRO_ID=#{guid}</select>
+    <select id="getFilesById" resultType="com.goldenwater.hzz.domain.RiverProjectDTO">SELECT GUID AS "guid",PRO_ID AS "proId",URL AS "url" FROM GW_RIVER_PROJECT_FILE WHERE PRO_ID=#{guid}</select>
     <insert id="saveShxmFiles" parameterType="java.util.List">
         INSERT ALL
         <foreach collection="list" item="item">INTO GW_RIVER_PROJECT_FILE(GUID,PRO_ID,URL) VALUES(#{item.guid},#{item.proId},#{item.url})</foreach>

gw-hzz/src/main/resources/mapper/hzz/RuleMapper.xml

@@ -1,49 +1,47 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.goldenwater.hzz.mapper.RuleMapper">
-    <select id="getRuleMessage" resultType="java.util.HashMap">
-        SELECT A.RULE_CODE AS "sysCode", D.MD_NAME AS "sysName", A.RULE_TYPE AS "sysType",
-               D.FILE_PATH AS "attc", A.FILE_NUM AS "fileNum", A.RULE_PROGRESS AS "ruleProgress",
-               D.FILE_TITL AS "fileTitle", TO_CHAR(D.RELE_DATE,'YYYY-MM-DD') AS "rlsTm",
-               D.RELE_WIUN_NAME AS "releWiunName"
+    <select id="getRuleMessage" resultType="com.goldenwater.hzz.domain.RuleExecDTO">
+        SELECT A.RULE_CODE AS sysCode, D.MD_NAME AS sysName, A.RULE_TYPE AS sysType,
+               D.FILE_PATH AS attc, A.FILE_NUM AS fileNum, A.RULE_PROGRESS AS ruleProgress,
+               D.FILE_TITL AS fileTitle, TO_CHAR(D.RELE_DATE,'YYYY-MM-DD') AS rlsTm,
+               D.RELE_WIUN_NAME AS releWiunName
         FROM ATT_RULE_EXEC A
-        INNER JOIN REL_WORK_RULE_AD B ON A.RULE_CODE = B.rule_code AND B.TO_DATE IS NULL AND B.AD_CODE = #{adCode}
-        INNER JOIN REL_MD_OBJ C ON A.GUID = C.OBJ_GUID AND C.TO_DATE IS NULL
-        INNER JOIN ATT_MD_BASE D ON C.MD_GUID = D.GUID AND D.TO_DATE IS NULL
+        INNER JOIN REL_WORK_RULE_AD B ON A.RULE_CODE=B.rule_code AND B.TO_DATE IS NULL AND B.AD_CODE=#{adCode}
+        INNER JOIN REL_MD_OBJ C ON A.GUID=C.OBJ_GUID AND C.TO_DATE IS NULL
+        INNER JOIN ATT_MD_BASE D ON C.MD_GUID=D.GUID AND D.TO_DATE IS NULL
         WHERE A.EXPR_DATE IS NULL
-        <if test="ruleType != null and ruleType != ''">AND A.RULE_TYPE = #{ruleType}</if>
+        <if test="ruleType != null and ruleType != ''">AND A.RULE_TYPE=#{ruleType}</if>
     </select>
-    <select id="getWsnList" resultType="java.util.HashMap">
-        SELECT GUID AS "guid", FILE_NAME AS "fileName", FILE_TYPE AS "fileType", WH AS "wh",
-               TO_CHAR(START_DATE,'YYYY-MM-DD HH24:MI:SS') AS "startDate", URL AS "url", TYPES AS "types"
-        FROM GW_FILE_WSN WHERE TYPES = #{types}
+    <select id="getWsnList" resultType="com.goldenwater.hzz.domain.FileWsnDTO">
+        SELECT GUID,FILE_NAME AS fileName,FILE_TYPE AS fileType,WH,TO_CHAR(START_DATE,'YYYY-MM-DD HH24:MI:SS') AS startDate,URL AS url,TYPES AS types
+        FROM GW_FILE_WSN WHERE TYPES=#{types}
         <if test="fileName != null and fileName != ''">AND FILE_NAME LIKE '%'||#{fileName}||'%'</if>
-        <if test="fileType != null and fileType != ''">AND FILE_TYPE = #{fileType}</if>
-        <if test="startTime != null and startTime != ''">AND START_DATE &gt;= TO_DATE(#{startTime},'YYYY-MM-DD HH24:MI:SS')</if>
-        <if test="endTime != null and endTime != ''">AND START_DATE &lt;= TO_DATE(#{endTime},'YYYY-MM-DD HH24:MI:SS')</if>
+        <if test="fileType != null and fileType != ''">AND FILE_TYPE=#{fileType}</if>
+        <if test="startTime != null and startTime != ''">AND START_DATE&gt;=TO_DATE(#{startTime},'YYYY-MM-DD HH24:MI:SS')</if>
+        <if test="endTime != null and endTime != ''">AND START_DATE&lt;=TO_DATE(#{endTime},'YYYY-MM-DD HH24:MI:SS')</if>
         ORDER BY START_DATE DESC
     </select>
-    <insert id="insertWsn" parameterType="java.util.Map">
+    <insert id="insertWsn" parameterType="com.goldenwater.hzz.domain.FileWsnDTO">
         INSERT INTO GW_FILE_WSN(GUID,FILE_NAME,FILE_TYPE,WH,START_DATE,URL,TYPES)
         VALUES(#{guid},#{fileName},#{fileType},#{wh},TO_DATE(#{startDate},'YYYY-MM-DD HH24:MI:SS'),#{url},#{types})
     </insert>
     <update id="updateWsn">UPDATE GW_FILE_WSN SET FILE_NAME=#{fileName},FILE_TYPE=#{fileType},WH=#{wh},START_DATE=TO_DATE(#{startDate},'YYYY-MM-DD HH24:MI:SS'),URL=#{url} WHERE GUID=#{guid}</update>
     <delete id="deleteWsn">DELETE FROM GW_FILE_WSN WHERE GUID=#{guid}</delete>
-    <select id="getArticleList" resultType="java.util.HashMap">
-        SELECT GUID AS "guid", TITLE AS "title", TYPE AS "type", PUBMAN AS "pubman",
-               TO_CHAR(PUBTIME,'YYYY-MM-DD HH24:MI:SS') AS "pubtime", CONTENT AS "content"
+    <select id="getArticleList" resultType="com.goldenwater.hzz.domain.ArticleDTO">
+        SELECT GUID,TITLE,TYPE,PUBMAN AS pubman,TO_CHAR(PUBTIME,'YYYY-MM-DD HH24:MI:SS') AS pubtime,CONTENT
         FROM GW_ARTICLE WHERE 1=1
         <if test="title != null and title != ''">AND TITLE LIKE '%'||#{title}||'%'</if>
-        <if test="type != null and type != ''">AND TYPE = #{type}</if>
-        <if test="startTime != null and startTime != ''">AND PUBTIME &gt;= TO_DATE(#{startTime},'YYYY-MM-DD HH24:MI:SS')</if>
-        <if test="endTime != null and endTime != ''">AND PUBTIME &lt;= TO_DATE(#{endTime},'YYYY-MM-DD HH24:MI:SS')</if>
+        <if test="type != null and type != ''">AND TYPE=#{type}</if>
+        <if test="startTime != null and startTime != ''">AND PUBTIME&gt;=TO_DATE(#{startTime},'YYYY-MM-DD HH24:MI:SS')</if>
+        <if test="endTime != null and endTime != ''">AND PUBTIME&lt;=TO_DATE(#{endTime},'YYYY-MM-DD HH24:MI:SS')</if>
         ORDER BY PUBTIME DESC
     </select>
-    <insert id="addArticle">INSERT INTO GW_ARTICLE(GUID,TITLE,TYPE,PUBMAN,PUBTIME,CONTENT) VALUES(#{guid},#{title},#{type},#{pubman},TO_DATE(#{pubtime},'YYYY-MM-DD HH24:MI:SS'),#{content})</insert>
+    <insert id="addArticle" parameterType="com.goldenwater.hzz.domain.ArticleDTO">INSERT INTO GW_ARTICLE(GUID,TITLE,TYPE,PUBMAN,PUBTIME,CONTENT) VALUES(#{guid},#{title},#{type},#{pubman},TO_DATE(#{pubtime},'YYYY-MM-DD HH24:MI:SS'),#{content})</insert>
     <update id="updateArticle">UPDATE GW_ARTICLE SET TITLE=#{title},TYPE=#{type},CONTENT=#{content} WHERE GUID=#{guid}</update>
     <delete id="deleteArticle">DELETE FROM GW_ARTICLE WHERE GUID=#{guid}</delete>
-    <select id="getArticleTop5" resultType="java.util.HashMap">
-        SELECT GUID AS "guid",TITLE AS "title",TYPE AS "type",PUBMAN AS "pubman",TO_CHAR(PUBTIME,'YYYY-MM-DD HH24:MI:SS') AS "pubtime",CONTENT AS "content"
-        FROM GW_ARTICLE WHERE TYPE=#{type} AND ROWNUM &lt; 6 ORDER BY PUBTIME DESC
+    <select id="getArticleTop5" resultType="com.goldenwater.hzz.domain.ArticleDTO">
+        SELECT GUID,TITLE,TYPE,PUBMAN AS pubman,TO_CHAR(PUBTIME,'YYYY-MM-DD HH24:MI:SS') AS pubtime,CONTENT
+        FROM GW_ARTICLE WHERE TYPE=#{type} AND ROWNUM &lt;6 ORDER BY PUBTIME DESC
     </select>
 </mapper>

gw-hzz/src/main/resources/mapper/hzz/ShorelineMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.goldenwater.hzz.mapper.ShorelineMapper">
-    <select id="getWaterLine" resultType="java.util.HashMap">
+    <select id="getWaterLine" resultType="com.goldenwater.hzz.domain.ShorelineDTO">
         SELECT TYPE AS "type", BELONG AS "belong", LINELENG AS "lineLeng", LINEGN AS "lineGn", COUNT AS "count" FROM HZZ_LINELENG
     </select>
 </mapper>

gw-hzz/src/main/resources/mapper/hzz/SupervisionMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.goldenwater.hzz.mapper.SupervisionMapper">
-    <select id="getSupervisionList" resultType="java.util.HashMap">SELECT * FROM GW_SUPERVISION_INFO</select>
-    <select id="getAttachmentByGuid" resultType="java.util.HashMap">SELECT * FROM GW_SUPERVISION_ATTACHMENT WHERE SUPERVISION_GUID=#{guid}</select>
-    <select id="getDivisionByGuid" resultType="java.util.HashMap">SELECT * FROM GW_SUPERVISION_DIVISION WHERE SUPERVISION_GUID=#{guid}</select>
-    <select id="getResultByGuid" resultType="java.util.HashMap">SELECT * FROM GW_SUPERVISION_RESULT WHERE SUPERVISION_GUID=#{guid}</select>
+    <select id="getSupervisionList" resultType="com.goldenwater.hzz.domain.SupervisionInfoDTO">SELECT * FROM GW_SUPERVISION_INFO</select>
+    <select id="getAttachmentByGuid" resultType="com.goldenwater.hzz.domain.SupervisionInfoDTO">SELECT * FROM GW_SUPERVISION_ATTACHMENT WHERE SUPERVISION_GUID=#{guid}</select>
+    <select id="getDivisionByGuid" resultType="com.goldenwater.hzz.domain.SupervisionInfoDTO">SELECT * FROM GW_SUPERVISION_DIVISION WHERE SUPERVISION_GUID=#{guid}</select>
+    <select id="getResultByGuid" resultType="com.goldenwater.hzz.domain.SupervisionInfoDTO">SELECT * FROM GW_SUPERVISION_RESULT WHERE SUPERVISION_GUID=#{guid}</select>
     <update id="audit">UPDATE GW_SUPERVISION_INFO SET STATUS=#{audit}, AUDIT_INFO=#{auditInfo} WHERE GUID=#{guid}</update>
 </mapper>

gw-hzz/src/main/resources/mapper/hzz/WorkPlanMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.goldenwater.hzz.mapper.WorkPlanMapper">
-    <select id="getWorkPlan" resultType="java.util.HashMap">
+    <select id="getWorkPlan" resultType="com.goldenwater.hzz.domain.AttWorkPlanDTO">
         SELECT A.WP_CODE AS "wpCode", A.WP_NAME AS "wpName", A.FILE_NUM AS "fileNum",
                TO_CHAR(C.RELE_DATE,'YYYY-MM-DD') AS "rlsTm", C.RELE_WIUN_NAME AS "releWiunName",
                C.FILE_PATH AS "attc"