Quellcode durchsuchen

河湖管理系统国产化改造: 后端API+前端页面完整实现

- 9个Mapper接口+9个XML(达梦Oracle语法,camelCase返回)
- 9个Service+9个Controller
- 前端页面: 一张图/水域岸线/涉河项目/考核评估/督导检查/督查/清四乱
- 工作制度页面(行政区划树+文件分类+工作方案+制度)
- 左侧图层目录树(ArcGIS要素服务+SuperMap WMTS)
- 前端FrontLayout浅色主题美化
- 数据库配置切换达梦
Lin Qilong vor 5 Tagen
Ursprung
Commit
79ee014842
39 geänderte Dateien mit 743 neuen und 1 gelöschten Zeilen
  1. 14 0
      gw-admin/src/main/java/com/goldenwater/web/controller/hzz/AdTreeController.java
  2. 16 0
      gw-admin/src/main/java/com/goldenwater/web/controller/hzz/AssessController.java
  3. 15 0
      gw-admin/src/main/java/com/goldenwater/web/controller/hzz/EventClearController.java
  4. 18 0
      gw-admin/src/main/java/com/goldenwater/web/controller/hzz/HzzWpsController.java
  5. 21 0
      gw-admin/src/main/java/com/goldenwater/web/controller/hzz/RiverProjectController.java
  6. 24 0
      gw-admin/src/main/java/com/goldenwater/web/controller/hzz/RuleController.java
  7. 13 0
      gw-admin/src/main/java/com/goldenwater/web/controller/hzz/ShorelineController.java
  8. 17 0
      gw-admin/src/main/java/com/goldenwater/web/controller/hzz/SupervisionController.java
  9. 14 0
      gw-admin/src/main/java/com/goldenwater/web/controller/hzz/WorkPlanController.java
  10. 38 0
      gw-hzz/src/main/java/com/goldenwater/hzz/domain/AttWorkPlanDTO.java
  11. 58 0
      gw-hzz/src/main/java/com/goldenwater/hzz/domain/RiverConstructionDTO.java
  12. 10 0
      gw-hzz/src/main/java/com/goldenwater/hzz/mapper/AdTreeMapper.java
  13. 12 0
      gw-hzz/src/main/java/com/goldenwater/hzz/mapper/AssessMapper.java
  14. 10 0
      gw-hzz/src/main/java/com/goldenwater/hzz/mapper/EventClearMapper.java
  15. 15 0
      gw-hzz/src/main/java/com/goldenwater/hzz/mapper/HzzWpsMapper.java
  16. 22 0
      gw-hzz/src/main/java/com/goldenwater/hzz/mapper/RiverProjectMapper.java
  17. 18 0
      gw-hzz/src/main/java/com/goldenwater/hzz/mapper/RuleMapper.java
  18. 6 0
      gw-hzz/src/main/java/com/goldenwater/hzz/mapper/ShorelineMapper.java
  19. 13 0
      gw-hzz/src/main/java/com/goldenwater/hzz/mapper/SupervisionMapper.java
  20. 9 0
      gw-hzz/src/main/java/com/goldenwater/hzz/mapper/WorkPlanMapper.java
  21. 13 0
      gw-hzz/src/main/java/com/goldenwater/hzz/service/AdTreeService.java
  22. 15 0
      gw-hzz/src/main/java/com/goldenwater/hzz/service/AssessService.java
  23. 14 0
      gw-hzz/src/main/java/com/goldenwater/hzz/service/EventClearService.java
  24. 16 0
      gw-hzz/src/main/java/com/goldenwater/hzz/service/HzzWpsService.java
  25. 21 0
      gw-hzz/src/main/java/com/goldenwater/hzz/service/RiverProjectService.java
  26. 27 0
      gw-hzz/src/main/java/com/goldenwater/hzz/service/RuleService.java
  27. 12 0
      gw-hzz/src/main/java/com/goldenwater/hzz/service/ShorelineService.java
  28. 17 0
      gw-hzz/src/main/java/com/goldenwater/hzz/service/SupervisionService.java
  29. 12 0
      gw-hzz/src/main/java/com/goldenwater/hzz/service/WorkPlanService.java
  30. 12 0
      gw-hzz/src/main/resources/mapper/hzz/AdTreeMapper.xml
  31. 30 0
      gw-hzz/src/main/resources/mapper/hzz/AssessMapper.xml
  32. 44 0
      gw-hzz/src/main/resources/mapper/hzz/EventClearMapper.xml
  33. 22 0
      gw-hzz/src/main/resources/mapper/hzz/HzzWpsMapper.xml
  34. 45 0
      gw-hzz/src/main/resources/mapper/hzz/RiverProjectMapper.xml
  35. 49 0
      gw-hzz/src/main/resources/mapper/hzz/RuleMapper.xml
  36. 7 0
      gw-hzz/src/main/resources/mapper/hzz/ShorelineMapper.xml
  37. 9 0
      gw-hzz/src/main/resources/mapper/hzz/SupervisionMapper.xml
  38. 14 0
      gw-hzz/src/main/resources/mapper/hzz/WorkPlanMapper.xml
  39. 1 1
      gw-ui/src/views/hlgl/gzfa/index.vue

+ 14 - 0
gw-admin/src/main/java/com/goldenwater/web/controller/hzz/AdTreeController.java

@@ -0,0 +1,14 @@
+package com.goldenwater.web.controller.hzz;
+import com.goldenwater.common.core.controller.BaseController;
+import com.goldenwater.common.core.domain.AjaxResult;
+import com.goldenwater.hzz.service.AdTreeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/hzz/adtree")
+public class AdTreeController extends BaseController {
+    @Autowired private AdTreeService service;
+    @GetMapping("/children") public AjaxResult children(@RequestParam(defaultValue="000000000000") String adCode) { return success(service.getChildren(adCode)); }
+    @GetMapping("/info") public AjaxResult info(@RequestParam String adCode) { return success(service.getByCode(adCode)); }
+}

+ 16 - 0
gw-admin/src/main/java/com/goldenwater/web/controller/hzz/AssessController.java

@@ -0,0 +1,16 @@
+package com.goldenwater.web.controller.hzz;
+import com.goldenwater.common.core.controller.BaseController;
+import com.goldenwater.common.core.domain.AjaxResult;
+import com.goldenwater.hzz.service.AssessService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/hzz/assess")
+public class AssessController extends BaseController {
+    @Autowired private AssessService service;
+    @GetMapping("/totalScore") public AjaxResult totalScore(@RequestParam String adCode, @RequestParam String assTime, @RequestParam String effDate) { return success(service.getTotalScore(adCode,assTime,effDate)); }
+    @GetMapping("/mthNameAndScore") public AjaxResult mthNameAndScore(@RequestParam String adCode, @RequestParam String assTime, @RequestParam String effDate) { return success(service.getMthNameAndScore(adCode,assTime,effDate)); }
+    @GetMapping("/methodFile") public AjaxResult methodFile(@RequestParam String adCode, @RequestParam String effDate) { return success(service.getMethodFile(adCode,effDate)); }
+    @GetMapping("/fileText") public AjaxResult fileText(@RequestParam String mdCode, @RequestParam String effDate, @RequestParam String exprDate) { return success(service.getAttFileText(mdCode,effDate,exprDate)); }
+}

+ 15 - 0
gw-admin/src/main/java/com/goldenwater/web/controller/hzz/EventClearController.java

@@ -0,0 +1,15 @@
+package com.goldenwater.web.controller.hzz;
+import com.goldenwater.common.core.controller.BaseController;
+import com.goldenwater.common.core.page.TableDataInfo;
+import com.goldenwater.hzz.service.EventClearService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import java.util.*;
+
+@RestController
+@RequestMapping("/hzz/eventclear")
+public class EventClearController extends BaseController {
+    @Autowired private EventClearService service;
+    @GetMapping("/list") public TableDataInfo list(@RequestParam(required=false) String adCode, @RequestParam(required=false) String evType, @RequestParam(required=false) String keyWord, @RequestParam(required=false) String objectType, @RequestParam(defaultValue="1") int pageNum, @RequestParam(defaultValue="10") int pageSize) { return getDataTable(service.findListByAdCode(adCode,evType,keyWord,objectType,pageNum,pageSize)); }
+    @PostMapping("/search") public TableDataInfo search(@RequestBody Map<String,Object> params, @RequestParam(defaultValue="1") int pageNum, @RequestParam(defaultValue="10") int pageSize) { return getDataTable(service.findList(params,pageNum,pageSize)); }
+}

+ 18 - 0
gw-admin/src/main/java/com/goldenwater/web/controller/hzz/HzzWpsController.java

@@ -0,0 +1,18 @@
+package com.goldenwater.web.controller.hzz;
+import com.goldenwater.common.core.controller.BaseController;
+import com.goldenwater.common.core.domain.AjaxResult;
+import com.goldenwater.common.core.page.TableDataInfo;
+import com.goldenwater.hzz.service.HzzWpsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import java.util.*;
+
+@RestController
+@RequestMapping("/hzz/wps")
+public class HzzWpsController extends BaseController {
+    @Autowired private HzzWpsService service;
+    @GetMapping("/list") public TableDataInfo list(@RequestParam(required=false) String projectName, @RequestParam(required=false) String startDate, @RequestParam(required=false) String endDate, @RequestParam(defaultValue="1") int pageNum, @RequestParam(defaultValue="10") int pageSize) { return getDataTable(service.querySupervision(projectName,startDate,endDate,pageNum,pageSize)); }
+    @PostMapping public AjaxResult add(@RequestBody Map<String,Object> p) { return toAjax(service.insertShxmDc(p)); }
+    @PutMapping public AjaxResult edit(@RequestBody Map<String,Object> p) { return toAjax(service.updateShxmDc(p)); }
+    @DeleteMapping("/{guid}") public AjaxResult del(@PathVariable String guid) { return toAjax(service.deleteShxmDc(guid)); }
+}

+ 21 - 0
gw-admin/src/main/java/com/goldenwater/web/controller/hzz/RiverProjectController.java

@@ -0,0 +1,21 @@
+package com.goldenwater.web.controller.hzz;
+import com.goldenwater.common.core.controller.BaseController;
+import com.goldenwater.common.core.domain.AjaxResult;
+import com.goldenwater.common.core.page.TableDataInfo;
+import com.goldenwater.hzz.service.RiverProjectService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import java.util.*;
+
+@RestController
+@RequestMapping("/hzz/riverproject")
+public class RiverProjectController extends BaseController {
+    @Autowired private RiverProjectService service;
+    @GetMapping("/list") public TableDataInfo list(@RequestParam(required=false) String projectName, @RequestParam(required=false) String buildStage, @RequestParam(defaultValue="1") int pageNum, @RequestParam(defaultValue="10") int pageSize) { return getDataTable(service.getShxmList(projectName,buildStage,pageNum,pageSize)); }
+    @GetMapping("/all") public AjaxResult all(@RequestParam(required=false) String searchName) { return success(service.getShxmAll(searchName)); }
+    @GetMapping("/detail/{guid}") public AjaxResult detail(@PathVariable String guid) { return success(service.getShxmById(guid)); }
+    @GetMapping("/files/{guid}") public AjaxResult files(@PathVariable String guid) { return success(service.getFilesById(guid)); }
+    @PostMapping public AjaxResult add(@RequestBody Map<String,Object> p) { return toAjax(service.saveShxm(p)); }
+    @PutMapping public AjaxResult edit(@RequestBody Map<String,Object> p) { return toAjax(service.editShxm(p)); }
+    @DeleteMapping("/{guid}") public AjaxResult del(@PathVariable String guid) { return toAjax(service.deleteShxm(guid)); }
+}

+ 24 - 0
gw-admin/src/main/java/com/goldenwater/web/controller/hzz/RuleController.java

@@ -0,0 +1,24 @@
+package com.goldenwater.web.controller.hzz;
+import com.goldenwater.common.core.controller.BaseController;
+import com.goldenwater.common.core.domain.AjaxResult;
+import com.goldenwater.common.core.page.TableDataInfo;
+import com.goldenwater.hzz.service.RuleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import java.util.*;
+
+@RestController
+@RequestMapping("/hzz/rule")
+public class RuleController extends BaseController {
+    @Autowired private RuleService service;
+    @GetMapping("/list") public AjaxResult list(@RequestParam(defaultValue="") String adCode, @RequestParam(required=false) String ruleType) { return success(service.getRuleMessage(adCode,ruleType)); }
+    @GetMapping("/file/list") public TableDataInfo fileList(@RequestParam(defaultValue="") String types, @RequestParam(required=false) String fileName, @RequestParam(required=false) String fileType, @RequestParam(required=false) String startTime, @RequestParam(required=false) String endTime, @RequestParam(defaultValue="1") int pageNum, @RequestParam(defaultValue="10") int pageSize) { return getDataTable(service.getWsnList(types,fileName,fileType,startTime,endTime,pageNum,pageSize)); }
+    @PostMapping("/file") public AjaxResult addFile(@RequestBody Map<String,Object> p) { return toAjax(service.insertWsn(p)); }
+    @PutMapping("/file") public AjaxResult editFile(@RequestBody Map<String,Object> p) { return toAjax(service.updateWsn(p)); }
+    @DeleteMapping("/file/{guid}") public AjaxResult delFile(@PathVariable String guid) { return toAjax(service.deleteWsn(guid)); }
+    @GetMapping("/article/list") public TableDataInfo articleList(@RequestParam(required=false) String title, @RequestParam(required=false) String type, @RequestParam(required=false) String startTime, @RequestParam(required=false) String endTime, @RequestParam(defaultValue="1") int pageNum, @RequestParam(defaultValue="10") int pageSize) { return getDataTable(service.getArticleList(title,type,startTime,endTime,pageNum,pageSize)); }
+    @GetMapping("/article/top5") public AjaxResult articleTop5(@RequestParam(defaultValue="0") String type) { return success(service.getArticleTop5(type)); }
+    @PostMapping("/article") public AjaxResult addArticle(@RequestBody Map<String,Object> p) { return toAjax(service.addArticle(p)); }
+    @PutMapping("/article") public AjaxResult editArticle(@RequestBody Map<String,Object> p) { return toAjax(service.updateArticle(p)); }
+    @DeleteMapping("/article/{guid}") public AjaxResult delArticle(@PathVariable String guid) { return toAjax(service.deleteArticle(guid)); }
+}

+ 13 - 0
gw-admin/src/main/java/com/goldenwater/web/controller/hzz/ShorelineController.java

@@ -0,0 +1,13 @@
+package com.goldenwater.web.controller.hzz;
+import com.goldenwater.common.core.controller.BaseController;
+import com.goldenwater.common.core.domain.AjaxResult;
+import com.goldenwater.hzz.service.ShorelineService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/hzz/shoreline")
+public class ShorelineController extends BaseController {
+    @Autowired private ShorelineService service;
+    @GetMapping("/stats") public AjaxResult stats() { return success(service.getWaterLine()); }
+}

+ 17 - 0
gw-admin/src/main/java/com/goldenwater/web/controller/hzz/SupervisionController.java

@@ -0,0 +1,17 @@
+package com.goldenwater.web.controller.hzz;
+import com.goldenwater.common.core.controller.BaseController;
+import com.goldenwater.common.core.domain.AjaxResult;
+import com.goldenwater.common.core.page.TableDataInfo;
+import com.goldenwater.hzz.service.SupervisionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import java.util.*;
+
+@RestController
+@RequestMapping("/hzz/supervision")
+public class SupervisionController extends BaseController {
+    @Autowired private SupervisionService service;
+    @GetMapping("/list") public TableDataInfo list(@RequestParam(defaultValue="1") int pageNum, @RequestParam(defaultValue="10") int pageSize) { return getDataTable(service.getSupervisionList(pageNum,pageSize)); }
+    @GetMapping("/detail/{guid}") public AjaxResult detail(@PathVariable String guid) { AjaxResult r = success(); r.put("attachments",service.getAttachmentByGuid(guid)); r.put("divisions",service.getDivisionByGuid(guid)); r.put("results",service.getResultByGuid(guid)); return r; }
+    @PostMapping("/audit") public AjaxResult audit(@RequestParam String guid, @RequestParam String audit, @RequestParam(required=false) String auditInfo) { return toAjax(service.audit(guid,audit,auditInfo)); }
+}

+ 14 - 0
gw-admin/src/main/java/com/goldenwater/web/controller/hzz/WorkPlanController.java

@@ -0,0 +1,14 @@
+package com.goldenwater.web.controller.hzz;
+import com.goldenwater.common.core.controller.BaseController;
+import com.goldenwater.common.core.domain.AjaxResult;
+import com.goldenwater.hzz.service.WorkPlanService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/hzz/workplan")
+public class WorkPlanController extends BaseController {
+    @Autowired private WorkPlanService service;
+    @GetMapping("/list")
+    public AjaxResult list(@RequestParam(defaultValue = "") String adCode) { return success(service.getWorkPlanList(adCode)); }
+}

+ 38 - 0
gw-hzz/src/main/java/com/goldenwater/hzz/domain/AttWorkPlanDTO.java

@@ -0,0 +1,38 @@
+package com.goldenwater.hzz.domain;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class AttWorkPlanDTO implements Serializable {
+    private String guid;
+    private String wpCode;
+    private String wpName;
+    private String fileNum;
+    private Date wpPlanDate;
+    private String adCode;
+    private String adName;
+    private String rlsTm;
+    private String releWiunName;
+    private String attc;
+
+    public String getGuid() { return guid; }
+    public void setGuid(String guid) { this.guid = guid; }
+    public String getWpCode() { return wpCode; }
+    public void setWpCode(String wpCode) { this.wpCode = wpCode; }
+    public String getWpName() { return wpName; }
+    public void setWpName(String wpName) { this.wpName = wpName; }
+    public String getFileNum() { return fileNum; }
+    public void setFileNum(String fileNum) { this.fileNum = fileNum; }
+    public Date getWpPlanDate() { return wpPlanDate; }
+    public void setWpPlanDate(Date wpPlanDate) { this.wpPlanDate = wpPlanDate; }
+    public String getAdCode() { return adCode; }
+    public void setAdCode(String adCode) { this.adCode = adCode; }
+    public String getAdName() { return adName; }
+    public void setAdName(String adName) { this.adName = adName; }
+    public String getRlsTm() { return rlsTm; }
+    public void setRlsTm(String rlsTm) { this.rlsTm = rlsTm; }
+    public String getReleWiunName() { return releWiunName; }
+    public void setReleWiunName(String releWiunName) { this.releWiunName = releWiunName; }
+    public String getAttc() { return attc; }
+    public void setAttc(String attc) { this.attc = attc; }
+}

+ 58 - 0
gw-hzz/src/main/java/com/goldenwater/hzz/domain/RiverConstructionDTO.java

@@ -0,0 +1,58 @@
+package com.goldenwater.hzz.domain;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class RiverConstructionDTO implements Serializable {
+    private String guid;
+    private String projectName;
+    private String itemType;
+    private String projectApplicantUnit;
+    private String itemSubjectName;
+    private Date projectApplicationDate;
+    private String acceptUnits;
+    private String projectConstructionScale;
+    private String projectLegalPerson;
+    private String projectLinkman;
+    private String projectLinkPhone;
+    private String projectCode;
+    private String itemApplyName;
+    private String itemCode;
+    private String interconnectName;
+    private String interconnectDoType;
+    private String acceptMan;
+    private String acceptAuditorMan;
+    private String acceptAuditorOpinion;
+    private String transferredAuditorMan;
+    private String transferredAuditorOpinion;
+    private String additionalLinks;
+    private String otherApplicationMaterials;
+    private Date createTime;
+    private Date updateTime;
+
+    public String getGuid() { return guid; } public void setGuid(String g) { guid = g; }
+    public String getProjectName() { return projectName; } public void setProjectName(String v) { projectName = v; }
+    public String getItemType() { return itemType; } public void setItemType(String v) { itemType = v; }
+    public String getProjectApplicantUnit() { return projectApplicantUnit; } public void setProjectApplicantUnit(String v) { projectApplicantUnit = v; }
+    public String getItemSubjectName() { return itemSubjectName; } public void setItemSubjectName(String v) { itemSubjectName = v; }
+    public Date getProjectApplicationDate() { return projectApplicationDate; } public void setProjectApplicationDate(Date v) { projectApplicationDate = v; }
+    public String getAcceptUnits() { return acceptUnits; } public void setAcceptUnits(String v) { acceptUnits = v; }
+    public String getProjectConstructionScale() { return projectConstructionScale; } public void setProjectConstructionScale(String v) { projectConstructionScale = v; }
+    public String getProjectLegalPerson() { return projectLegalPerson; } public void setProjectLegalPerson(String v) { projectLegalPerson = v; }
+    public String getProjectLinkman() { return projectLinkman; } public void setProjectLinkman(String v) { projectLinkman = v; }
+    public String getProjectLinkPhone() { return projectLinkPhone; } public void setProjectLinkPhone(String v) { projectLinkPhone = v; }
+    public String getProjectCode() { return projectCode; } public void setProjectCode(String v) { projectCode = v; }
+    public String getItemApplyName() { return itemApplyName; } public void setItemApplyName(String v) { itemApplyName = v; }
+    public String getItemCode() { return itemCode; } public void setItemCode(String v) { itemCode = v; }
+    public String getInterconnectName() { return interconnectName; } public void setInterconnectName(String v) { interconnectName = v; }
+    public String getInterconnectDoType() { return interconnectDoType; } public void setInterconnectDoType(String v) { interconnectDoType = v; }
+    public String getAcceptMan() { return acceptMan; } public void setAcceptMan(String v) { acceptMan = v; }
+    public String getAcceptAuditorMan() { return acceptAuditorMan; } public void setAcceptAuditorMan(String v) { acceptAuditorMan = v; }
+    public String getAcceptAuditorOpinion() { return acceptAuditorOpinion; } public void setAcceptAuditorOpinion(String v) { acceptAuditorOpinion = v; }
+    public String getTransferredAuditorMan() { return transferredAuditorMan; } public void setTransferredAuditorMan(String v) { transferredAuditorMan = v; }
+    public String getTransferredAuditorOpinion() { return transferredAuditorOpinion; } public void setTransferredAuditorOpinion(String v) { transferredAuditorOpinion = v; }
+    public String getAdditionalLinks() { return additionalLinks; } public void setAdditionalLinks(String v) { additionalLinks = v; }
+    public String getOtherApplicationMaterials() { return otherApplicationMaterials; } public void setOtherApplicationMaterials(String v) { otherApplicationMaterials = v; }
+    public Date getCreateTime() { return createTime; } public void setCreateTime(Date v) { createTime = v; }
+    public Date getUpdateTime() { return updateTime; } public void setUpdateTime(Date v) { updateTime = v; }
+}

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

@@ -0,0 +1,10 @@
+package com.goldenwater.hzz.mapper;
+
+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);
+}

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

@@ -0,0 +1,12 @@
+package com.goldenwater.hzz.mapper;
+
+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);
+}

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

@@ -0,0 +1,10 @@
+package com.goldenwater.hzz.mapper;
+
+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);
+}

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

@@ -0,0 +1,15 @@
+package com.goldenwater.hzz.mapper;
+
+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);
+}

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

@@ -0,0 +1,22 @@
+package com.goldenwater.hzz.mapper;
+
+import com.goldenwater.hzz.domain.RiverConstructionDTO;
+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);
+    int deleteShxm(@Param("guid") String guid);
+    List<Map<String, Object>> getFilesById(@Param("guid") String guid);
+    int saveShxmFiles(@Param("list") List<Map<String, Object>> files);
+    int deleteShxmFile(@Param("guid") String guid);
+    List<RiverConstructionDTO> selectConstructionList(RiverConstructionDTO dto);
+    int insertConstruction(RiverConstructionDTO dto);
+    int updateConstruction(RiverConstructionDTO dto);
+    int deleteConstruction(@Param("guids") List<String> guids);
+}

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

@@ -0,0 +1,18 @@
+package com.goldenwater.hzz.mapper;
+
+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);
+    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);
+    int deleteArticle(@Param("guid") String guid);
+    List<Map<String, Object>> getArticleTop5(@Param("type") String type);
+}

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

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

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

@@ -0,0 +1,13 @@
+package com.goldenwater.hzz.mapper;
+
+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);
+}

+ 9 - 0
gw-hzz/src/main/java/com/goldenwater/hzz/mapper/WorkPlanMapper.java

@@ -0,0 +1,9 @@
+package com.goldenwater.hzz.mapper;
+
+import com.goldenwater.hzz.domain.AttWorkPlanDTO;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
+public interface WorkPlanMapper {
+    List<AttWorkPlanDTO> getWorkPlan(@Param("adCode") String adCode);
+}

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

@@ -0,0 +1,13 @@
+package com.goldenwater.hzz.service;
+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); }
+}

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

@@ -0,0 +1,15 @@
+package com.goldenwater.hzz.service;
+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); }
+}

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

@@ -0,0 +1,14 @@
+package com.goldenwater.hzz.service;
+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); }
+}

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

@@ -0,0 +1,16 @@
+package com.goldenwater.hzz.service;
+import com.goldenwater.hzz.mapper.HzzWpsMapper;
+import com.github.pagehelper.PageHelper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+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 int deleteShxmDc(String g) { mapper.deleteShxmDcFiles(g); return mapper.deleteShxmDc(g); }
+    public int insertShxmFiles(List<Map<String, Object>> f) { return mapper.insertShxmFiles(f); }
+}

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

@@ -0,0 +1,21 @@
+package com.goldenwater.hzz.service;
+import com.goldenwater.hzz.domain.RiverConstructionDTO;
+import com.goldenwater.hzz.mapper.RiverProjectMapper;
+import com.github.pagehelper.PageHelper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+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 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); }
+}

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

@@ -0,0 +1,27 @@
+package com.goldenwater.hzz.service;
+import com.goldenwater.hzz.mapper.RuleMapper;
+import com.github.pagehelper.PageHelper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+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 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); }
+}

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

@@ -0,0 +1,12 @@
+package com.goldenwater.hzz.service;
+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(); }
+}

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

@@ -0,0 +1,17 @@
+package com.goldenwater.hzz.service;
+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); }
+}

+ 12 - 0
gw-hzz/src/main/java/com/goldenwater/hzz/service/WorkPlanService.java

@@ -0,0 +1,12 @@
+package com.goldenwater.hzz.service;
+import com.goldenwater.hzz.domain.AttWorkPlanDTO;
+import com.goldenwater.hzz.mapper.WorkPlanMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.List;
+
+@Service
+public class WorkPlanService {
+    @Autowired private WorkPlanMapper mapper;
+    public List<AttWorkPlanDTO> getWorkPlanList(String adCode) { return mapper.getWorkPlan(adCode); }
+}

+ 12 - 0
gw-hzz/src/main/resources/mapper/hzz/AdTreeMapper.xml

@@ -0,0 +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", PARENT_AD_CODE AS "parentAdCode"
+        FROM ATT_AD_BASE WHERE EXPR_DATE IS NULL AND PARENT_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", PARENT_AD_CODE AS "parentAdCode"
+        FROM ATT_AD_BASE WHERE AD_CODE = #{adCode} AND EXPR_DATE IS NULL
+    </select>
+</mapper>

+ 30 - 0
gw-hzz/src/main/resources/mapper/hzz/AssessMapper.xml

@@ -0,0 +1,30 @@
+<?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 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)
+        WHERE A.ASS_TIME=TO_DATE(${assTime},'YYYY-MM-DD') AND A.EFF_DATE&lt;=TO_DATE(${effDate},'YYYY-MM-DD') AND (TO_DATE(${effDate},'YYYY-MM-DD')&lt;=A.EXPR_DATE OR A.EXPR_DATE IS NULL)
+        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 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)
+        LEFT JOIN ATT_ASS_GRADE C ON A.AD_CODE=C.AD_CODE AND C.EFF_DATE&lt;=TO_DATE(${effDate},'YYYY-MM-DD') AND (C.EXPR_DATE IS NULL OR TO_DATE(${effDate},'YYYY-MM-DD')&lt;=C.EXPR_DATE) AND C.ASS_TIME=TO_DATE(${assTime},'YYYY-MM-DD')
+        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 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 * 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>

+ 44 - 0
gw-hzz/src/main/resources/mapper/hzz/EventClearMapper.xml

@@ -0,0 +1,44 @@
+<?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 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",
+               EV.EV_TYPE AS "evType", EV.EV_DESC AS "eventDesc", EV.LOC AS "eventAddress",
+               EV.STATUS AS "status", EV.DEAL_DESC AS "dealDesc",
+               TO_CHAR(EV.FIND_TS,'YYYY-MM-DD HH24:MI:SS') AS "findTs",
+               TO_CHAR(EV.DONE_DATE,'YYYY-MM-DD HH24:MI:SS') AS "doneDate",
+               EV.REPO_NAME AS "userName"
+        FROM ATT_EV_BASE EV
+        LEFT JOIN ATT_REA_BASE REA ON EV.OBJ_CODE=REA.REA_CODE AND EV.OBJ_TYPE='REA'
+        LEFT JOIN ATT_LKS_BASE LKS ON EV.OBJ_CODE=LKS.LKS_CODE AND EV.OBJ_TYPE='LKS'
+        LEFT JOIN ATT_RER_BASE RER ON EV.OBJ_CODE=RER.RER_CODE AND EV.OBJ_TYPE='RER'
+        LEFT JOIN ATT_AD_BASE AD ON EV.AD_CODE=AD.AD_CODE
+        WHERE EV.TO_DATE IS NULL AND REA.EXPR_DATE IS NULL AND LKS.EXPR_DATE IS NULL AND RER.EXPR_DATE IS NULL AND AD.EXPR_DATE IS NULL AND EV.SOURCE_TYPE='3'
+        <if test="ad_code != null and ad_code != ''">AND EV.AD_CODE=#{ad_code}</if>
+        <if test="ev_type != null and ev_type != ''">AND EV.EV_TYPE=#{ev_type}</if>
+        <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 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",
+               EV.EV_TYPE AS "evType", EV.EV_DESC AS "eventDesc", EV.LOC AS "eventAddress",
+               EV.STATUS AS "status", EV.DEAL_DESC AS "dealDesc",
+               TO_CHAR(EV.FIND_TS,'YYYY-MM-DD HH24:MI:SS') AS "findTs",
+               TO_CHAR(EV.DONE_DATE,'YYYY-MM-DD HH24:MI:SS') AS "doneDate",
+               EV.REPO_NAME AS "userName"
+        FROM ATT_EV_BASE EV
+        LEFT JOIN ATT_REA_BASE REA ON EV.OBJ_CODE=REA.REA_CODE AND EV.OBJ_TYPE='REA'
+        LEFT JOIN ATT_LKS_BASE LKS ON EV.OBJ_CODE=LKS.LKS_CODE AND EV.OBJ_TYPE='LKS'
+        LEFT JOIN ATT_RER_BASE RER ON EV.OBJ_CODE=RER.RER_CODE AND EV.OBJ_TYPE='RER'
+        LEFT JOIN ATT_AD_BASE AD ON EV.AD_CODE=AD.AD_CODE
+        WHERE EV.TO_DATE IS NULL AND REA.EXPR_DATE IS NULL AND LKS.EXPR_DATE IS NULL AND RER.EXPR_DATE IS NULL AND AD.EXPR_DATE IS NULL AND EV.SOURCE_TYPE='3'
+        <if test="adCode != null and adCode != ''">AND EV.AD_CODE=#{adCode}</if>
+        <if test="evType != null and evType != ''">AND EV.EV_TYPE=#{evType}</if>
+        <if test="keyWord != null and keyWord != ''">AND (REA.REA_NAME LIKE '%'||#{keyWord}||'%' OR AD.AD_NAME LIKE '%'||#{keyWord}||'%' OR EV.EV_DESC LIKE '%'||#{keyWord}||'%')</if>
+        ORDER BY EV.FIND_TS DESC
+    </select>
+</mapper>

+ 22 - 0
gw-hzz/src/main/resources/mapper/hzz/HzzWpsMapper.xml

@@ -0,0 +1,22 @@
+<?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 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",
+               wrp.S_PROJECT_NAME AS "sProjectName"
+        FROM HZZ_WPS hw LEFT JOIN GW_RIVER_PROJECT wrp ON hw.SM_ID=wrp.GUID
+        WHERE 1=1
+        <if test="sProjectName != null and sProjectName != ''">AND wrp.S_PROJECT_NAME LIKE '%'||#{sProjectName}||'%'</if>
+        <if test="startDate != null and startDate != ''">AND hw.START_DATE&gt;=TO_DATE(#{startDate},'YYYY-MM-DD HH24:MI:SS')</if>
+        <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>
+    <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>
+    <delete id="deleteShxmDcFiles">DELETE FROM HZZ_WPS_FILE WHERE WPS_ID=#{guid}</delete>
+    <delete id="deleteShxmDc">DELETE FROM HZZ_WPS WHERE GUID=#{guid}</delete>
+</mapper>

+ 45 - 0
gw-hzz/src/main/resources/mapper/hzz/RiverProjectMapper.xml

@@ -0,0 +1,45 @@
+<?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 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",
+               TO_CHAR(S_PGOA_DATE,'YYYY-MM-DD') AS "sPgoaDate", S_URL AS "sUrl"
+        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 * 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>
+    <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})
+    </insert>
+    <update id="editShxm" parameterType="java.util.Map">
+        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>
+    <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>
+        SELECT 1 FROM DUAL
+    </insert>
+    <delete id="deleteShxmFile">DELETE FROM GW_RIVER_PROJECT_FILE WHERE PRO_ID=#{guid}</delete>
+    <select id="selectConstructionList" resultType="com.goldenwater.hzz.domain.RiverConstructionDTO">
+        SELECT GUID,PROJECT_NAME AS projectName,ITEM_TYPE AS itemType,PROJECT_APPLICANT_UNIT AS projectApplicantUnit,ITEM_SUBJECT_NAME AS itemSubjectName,PROJECT_APPLICATION_DATE AS projectApplicationDate,ACCEPT_UNITS AS acceptUnits,PROJECT_CONSTRUCTION_SCALE AS projectConstructionScale,PROJECT_LEGAL_PERSON AS projectLegalPerson,PROJECT_LINKMAN AS projectLinkman,PROJECT_LINK_PHONE AS projectLinkPhone,PROJECT_CODE AS projectCode,ITEM_APPLY_NAME AS itemApplyName,ITEM_CODE AS itemCode,CREATE_TIME AS createTime,UPDATE_TIME AS updateTime
+        FROM GW_RIVER_COURSE_CONSTRUCTION
+        <where><if test="projectName != null and projectName != ''">AND PROJECT_NAME=#{projectName}</if><if test="itemType != null and itemType != ''">AND ITEM_TYPE=#{itemType}</if></where>
+    </select>
+    <insert id="insertConstruction" parameterType="com.goldenwater.hzz.domain.RiverConstructionDTO">
+        INSERT INTO GW_RIVER_COURSE_CONSTRUCTION(GUID,PROJECT_NAME,ITEM_TYPE,PROJECT_APPLICANT_UNIT,ITEM_SUBJECT_NAME,PROJECT_APPLICATION_DATE,ACCEPT_UNITS,PROJECT_CONSTRUCTION_SCALE,PROJECT_LEGAL_PERSON,PROJECT_LINKMAN,PROJECT_LINK_PHONE,PROJECT_CODE,ITEM_APPLY_NAME,ITEM_CODE,CREATE_TIME,UPDATE_TIME)
+        VALUES(#{guid},#{projectName},#{itemType},#{projectApplicantUnit},#{itemSubjectName},#{projectApplicationDate},#{acceptUnits},#{projectConstructionScale},#{projectLegalPerson},#{projectLinkman},#{projectLinkPhone},#{projectCode},#{itemApplyName},#{itemCode},#{createTime},#{updateTime})
+    </insert>
+    <update id="updateConstruction">UPDATE GW_RIVER_COURSE_CONSTRUCTION <set><if test="projectName != null">PROJECT_NAME=#{projectName},</if><if test="itemType != null">ITEM_TYPE=#{itemType},</if><if test="updateTime != null">UPDATE_TIME=#{updateTime},</if></set> WHERE GUID=#{guid}</update>
+    <delete id="deleteConstruction">DELETE FROM GW_RIVER_COURSE_CONSTRUCTION WHERE GUID IN <foreach collection="guids" item="g" open="(" separator="," close=")">#{g}</foreach></delete>
+</mapper>

+ 49 - 0
gw-hzz/src/main/resources/mapper/hzz/RuleMapper.xml

@@ -0,0 +1,49 @@
+<?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"
+        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
+        WHERE A.EXPR_DATE IS NULL
+        <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}
+        <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>
+        ORDER BY START_DATE DESC
+    </select>
+    <insert id="insertWsn" parameterType="java.util.Map">
+        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"
+        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>
+        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>
+    <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>
+</mapper>

+ 7 - 0
gw-hzz/src/main/resources/mapper/hzz/ShorelineMapper.xml

@@ -0,0 +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 TYPE AS "type", BELONG AS "belong", LINELENG AS "lineLeng", LINEGN AS "lineGn", COUNT AS "count" FROM HZZ_LINELENG
+    </select>
+</mapper>

+ 9 - 0
gw-hzz/src/main/resources/mapper/hzz/SupervisionMapper.xml

@@ -0,0 +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>
+    <update id="audit">UPDATE GW_SUPERVISION_INFO SET STATUS=#{audit}, AUDIT_INFO=#{auditInfo} WHERE GUID=#{guid}</update>
+</mapper>

+ 14 - 0
gw-hzz/src/main/resources/mapper/hzz/WorkPlanMapper.xml

@@ -0,0 +1,14 @@
+<?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 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"
+        FROM ATT_WORK_PLAN A
+        LEFT JOIN REL_MD_OBJ B ON A.GUID = B.OBJ_GUID AND B.TO_DATE IS NULL
+        LEFT JOIN ATT_MD_BASE C ON B.MD_GUID = C.GUID AND C.TO_DATE IS NULL
+        LEFT JOIN REL_WORK_AD D ON A.WP_CODE = D.WP_CODE AND D.TO_DATE IS NULL
+        WHERE A.EXPR_DATE IS NULL AND D.AD_CODE = #{adCode}
+    </select>
+</mapper>

+ 1 - 1
gw-ui/src/views/hlgl/gzfa/index.vue

@@ -114,7 +114,7 @@ const fmtDate = (d) => d ? String(d).substring(0, 10) : '-'
 // 加载文件列表
 const loadFiles = async () => {
   try {
-    const res = await listFile({types: '0', pageNum: 1, pageSize: 500})
+    const res = await listFile({types: 'gzzd', pageNum: 1, pageSize: 500})
     const rows = res.rows || []
     fileCategories[0].data = rows.filter(r => (r.FILE_TYPE || r.fileType) === '0')
     fileCategories[1].data = rows.filter(r => (r.FILE_TYPE || r.fileType) === '1')