From a4a3f30fa1868c7c8b823a947a5cda423acce57d Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期六, 31 七月 2021 10:08:58 +0800
Subject: [PATCH] 防火防汛接口开发
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwRotaVO.java | 89 +++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwDangerReportVO.java | 53 -
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwSafetyWorkRecordVO.java | 18
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordPageDTO.java | 12
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwSafetyWorkRecordServiceImpl.java | 2
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbServiceTeamServiceImpl.java | 8
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComPbServiceTeamService.java | 9
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSwPatrolRecordApi.java | 54 +
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationMistakeExcelVO.java | 3
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComSwPatrolRecordService.java | 8
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/ServiceDangjianApplication.java | 2
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 284 +++++++---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwPatrolRecordMapper.xml | 18
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwRotaMapper.xml | 47 +
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java | 2
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbServiceTeamDAO.java | 14
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComSwPatrolRecordApi.java | 96 +++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwPatrolRecordStatisticsVO.java | 6
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwRotaSaveDTO.java | 78 +++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComSwDangerReportDO.java | 14
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComSwRotaDO.java | 89 +++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComSwPatrolRecordDO.java | 32
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java | 14
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwPatrolRecordServiceImpl.java | 16
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwSafetyWorkRecordMapper.xml | 18
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordAddDTO.java | 50 +
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwRotaPageDTO.java | 49 +
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwPatrolRecordVO.java | 30
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwRotaPersonVO.java | 43 +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSwPatrolRecordApi.java | 79 ++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComSwSafetyWorkRecordDAO.java | 9
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwDangerReportMapper.xml | 18
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComSwRotaDAO.java | 30 +
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java | 11
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwRotaServiceImpl.java | 151 +++++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwDangerReportServiceImpl.java | 16
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComSwRotaService.java | 61 ++
37 files changed, 1,244 insertions(+), 289 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSwPatrolRecordApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSwPatrolRecordApi.java
index 025af16..50d54ad 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSwPatrolRecordApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSwPatrolRecordApi.java
@@ -9,6 +9,7 @@
import com.panzhihua.common.model.vos.community.ComSwPatrolRecordVO;
import com.panzhihua.common.model.vos.community.ComSwSafetyWorkRecordVO;
import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.service.partybuilding.PartyBuildingService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -30,13 +31,16 @@
@Resource
private CommunityService communityService;
+ @Resource
+ private PartyBuildingService partyBuildingService;
+
/**
* 分页查询巡查记录
* @param comSwPatrolRecordPageDTO 查询参数
* @return 分页集合
*/
@ApiOperation(value = "分页查询巡查记录", response = ComSwPatrolRecordVO.class)
- @PostMapping("/pagePatrolRecord")
+ @PostMapping("/app/pagePatrolRecord")
public R pagePatrolRecord(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO){
Long communityId = this.getCommunityId();
if (comSwPatrolRecordPageDTO.getSelectPerson().equals(1)) {
@@ -52,7 +56,7 @@
* @return 新增结果
*/
@ApiOperation(value = "新增巡查记录")
- @PostMapping("/addPatrolRecord")
+ @PostMapping("/app/addPatrolRecord")
public R addPatrolRecord(@RequestBody ComSwPatrolRecordAddDTO comSwPatrolRecordAddDTO){
Long communityId = this.getCommunityId();
comSwPatrolRecordAddDTO.setCommunityId(communityId);
@@ -66,7 +70,7 @@
* @return 巡查记录详情查询结果
*/
@ApiOperation(value = "根据巡查记录id查询详情", response = ComSwPatrolRecordVO.class)
- @PostMapping("/detailPatrolRecord")
+ @GetMapping("/app/detailPatrolRecord")
public R detailPatrolRecord(@RequestParam(value = "patrolRecordId") Long patrolRecordId) {
return communityService.detailPatrolRecord(patrolRecordId);
}
@@ -77,7 +81,7 @@
* @return 安全工作记录分页集合
*/
@ApiOperation(value = "分页查询安全工作记录", response = ComSwSafetyWorkRecordVO.class)
- @PostMapping("/pageSafetyWorkRecord")
+ @PostMapping("/app/pageSafetyWorkRecord")
public R pageSafetyWorkRecord(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO){
Long communityId = this.getCommunityId();
comSwPatrolRecordPageDTO.setCommunityId(communityId);
@@ -91,7 +95,7 @@
* @return 安全工作记录详情查询结果
*/
@ApiOperation(value = "根据安全工作记录id查询详情", response = ComSwSafetyWorkRecordVO.class)
- @PostMapping("/detailSafetyWorkRecord")
+ @GetMapping("/app/detailSafetyWorkRecord")
public R detailSafetyWorkRecord(@RequestParam(value = "safetyWorkRecordId") Long safetyWorkRecordId) {
return communityService.detailSafetyWorkRecord(safetyWorkRecordId);
}
@@ -102,7 +106,7 @@
* @return 隐患报告分页集合
*/
@ApiOperation(value = "分页查询隐患报告", response = ComSwDangerReportVO.class)
- @PostMapping("/pageDangerReport")
+ @PostMapping("/app/pageDangerReport")
public R pageDangerReport(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO){
Long communityId = this.getCommunityId();
comSwPatrolRecordPageDTO.setCommunityId(communityId);
@@ -116,7 +120,7 @@
* @return 隐患报告详情查询结果
*/
@ApiOperation(value = "根据隐患报告id查询详情", response = ComSwDangerReportVO.class)
- @PostMapping("/detailDangerReport")
+ @GetMapping("/app/detailDangerReport")
public R detailDangerReport(@RequestParam(value = "dangerReportId") Long dangerReportId) {
return communityService.detailDangerReport(dangerReportId);
}
@@ -128,7 +132,7 @@
* @return 隐患报告详情查询结果
*/
@ApiOperation(value = "根据巡查记录id查询隐患报告详情", response = ComSwDangerReportVO.class)
- @PostMapping("/detailDangerReportByPrId")
+ @GetMapping("/app/detailDangerReportByPrId")
public R detailDangerReportByPrId(@RequestParam(value = "patrolRecordId") Long patrolRecordId) {
return communityService.detailDangerReportByPrId(patrolRecordId);
}
@@ -140,10 +144,42 @@
* @return 整改结果
*/
@ApiOperation(value = "整改隐患报告")
- @PostMapping("/rectifyDangerReport")
+ @PostMapping("/app/rectifyDangerReport")
public R rectifyDangerReport(@RequestBody ComSwDangerReportRectifyDTO comSwDangerReportRectifyDTO){
return communityService.rectifyDangerReport(comSwDangerReportRectifyDTO);
}
+ /**
+ * 根据日期查询值班人员
+ * @return 查询结果
+ */
+ @ApiOperation(value = "根据日期查询值班人员")
+ @GetMapping("/app/getRotaPersonByDate")
+ public R getRotaPersonByDate(@RequestParam(value = "rotaDate") String rotaDate){
+ return communityService.getRotaPersonByDate(rotaDate);
+ }
+
+ /**
+ * 根据日期查询值班领导
+ * @return 查询结果
+ */
+ @ApiOperation(value = "根据日期查询值班领导")
+ @GetMapping("/app/getRotaLeaderByDate")
+ public R getRotaLeaderByDate(@RequestParam(value = "rotaDate") String rotaDate){
+ return communityService.getRotaLeaderByDate(rotaDate);
+ }
+
+ /**
+ * 选择人员
+ * @param param 查询条件
+ * @return 查询结果
+ */
+ @ApiOperation(value = "选择人员")
+ @PostMapping("/app/getTotlePerson")
+ public R getTotlePerson(@RequestParam(value = "param", required = false) String param){
+ Long communityId = this.getLoginUserInfo().getCommunityId();
+ return partyBuildingService.getTotlePerson(param,communityId);
+ }
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordAddDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordAddDTO.java
index d105252..00c4b46 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordAddDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordAddDTO.java
@@ -8,7 +8,6 @@
import lombok.Data;
import java.io.Serializable;
-import java.util.Date;
/**
@@ -34,26 +33,7 @@
* 巡查时间
*/
@ApiModelProperty("巡查时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date PatrolTime;
-
- /**
- * 天气
- */
- @ApiModelProperty("天气")
- private String weather;
-
- /**
- * 温度
- */
- @ApiModelProperty("温度")
- private String temperature;
-
- /**
- * 风
- */
- @ApiModelProperty("风")
- private String wind;
+ private String PatrolTime;
/**
* (取字典表国家标准编码)巡查类型(1.防火巡查2.防汛巡查3.防疫巡查)
@@ -72,6 +52,18 @@
*/
@ApiModelProperty("巡查人员")
private String patrolPerson;
+
+ /**
+ * 巡查人员名字，多个以逗号隔开
+ */
+ @ApiModelProperty("巡查人员名字，多个以逗号隔开")
+ private String pPersonName;
+
+ /**
+ * 巡查人员电话，多个以逗号隔开
+ */
+ @ApiModelProperty("巡查人员电话，多个以逗号隔开")
+ private String pPersonPhone;
/**
* 巡查地址
@@ -119,7 +111,7 @@
* 接班时间
*/
@ApiModelProperty("接班时间")
- private Date successionTime;
+ private String successionTime;
/**
* 是否存在隐患（1是 、0否）
@@ -137,7 +129,7 @@
* 排查时间
*/
@ApiModelProperty("排查时间")
- private Date checkTime;
+ private String checkTime;
/**
* 主体部门、单位或个人全称
@@ -175,6 +167,18 @@
@ApiModelProperty("整改人员")
private String rectifyPerson;
+ /**
+ * 整改人员名字，多个以逗号隔开
+ */
+ @ApiModelProperty("整改人员名字，多个以逗号隔开")
+ private String dPersonName;
+
+ /**
+ * 整改人员电话，多个以逗号隔开
+ */
+ @ApiModelProperty("整改人员电话，多个以逗号隔开")
+ private String dPersonPhone;
+
/**
* 创建人
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordPageDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordPageDTO.java
index 1706212..958e2f4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordPageDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordPageDTO.java
@@ -39,12 +39,18 @@
private Long communityId;
@ApiModelProperty("巡查开始时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date patrolAtBegin;
+ private String patrolAtBegin;
@ApiModelProperty("巡查结束时间")
+ private String patrolAtEnd;
+
+ @ApiModelProperty(value = "巡查开始时间(日期格式)", hidden = true)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date patrolAtEnd;
+ private Date patrolAtBeginDate;
+
+ @ApiModelProperty(value = "巡查结束时间(日期格式)", hidden = true)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date patrolAtEndDate;
/**
* (取字典表国家标准编码)巡查类型(1.防火巡查2.防汛巡查3.防疫巡查)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwRotaPageDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwRotaPageDTO.java
new file mode 100644
index 0000000..f432077
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwRotaPageDTO.java
@@ -0,0 +1,49 @@
+package com.panzhihua.common.model.dtos.community;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 分页查询值班表DTO
+ */
+@Data
+@ApiModel("分页查询值班表DTO")
+public class ComSwRotaPageDTO implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 分页-当前页数
+ */
+ @ApiModelProperty(value = "分页-当前页数",example = "1")
+ private Long pageNum;
+
+ /**
+ * 分页-每页记录数
+ */
+ @ApiModelProperty(value = "分页-每页记录数",example = "10")
+ private Long pageSize;
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty("社区id")
+ private Long communityId;
+
+ /**
+ * 值班人员
+ */
+ @ApiModelProperty("值班人员")
+ private String rotaPerson;
+
+ /**
+ * 联系电话
+ */
+ @ApiModelProperty("联系电话")
+ private Integer phone;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwRotaSaveDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwRotaSaveDTO.java
new file mode 100644
index 0000000..ecb60cf
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwRotaSaveDTO.java
@@ -0,0 +1,78 @@
+package com.panzhihua.common.model.dtos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 新增值班表DTO
+ */
+@Data
+@ApiModel("新增值班表DTO")
+public class ComSwRotaSaveDTO implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * id
+ */
+ @ApiModelProperty("id")
+ private Long id;
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty("社区id")
+ private Long communityId;
+
+ /**
+ * 值班时间
+ */
+ @ApiModelProperty("值班时间")
+ private String rotaDate;
+
+ /**
+ * 值班领导，多个以逗号隔开
+ */
+ @ApiModelProperty("值班领导，多个以逗号隔开")
+ private String rotaLeader;
+
+ /**
+ * 领导名字，多个以逗号隔开
+ */
+ @ApiModelProperty("领导名字，多个以逗号隔开")
+ private String leaderName;
+
+ /**
+ * 领导电话，多个以逗号隔开
+ */
+ @ApiModelProperty("领导电话，多个以逗号隔开")
+ private String leaderPhone;
+
+ /**
+ * 值班人员，多个以逗号隔开
+ */
+ @ApiModelProperty("值班人员，多个以逗号隔开")
+ private String rotaPerson;
+
+ /**
+ * 人员名字，多个以逗号隔开
+ */
+ @ApiModelProperty("人员名字，多个以逗号隔开")
+ private String personName;
+
+ /**
+ * 人员电话，多个以逗号隔开
+ */
+ @ApiModelProperty("人员电话，多个以逗号隔开")
+ private String personPhone;
+
+ /**
+ * 创建人
+ */
+ @ApiModelProperty("创建人")
+ private Long createBy;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationMistakeExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationMistakeExcelVO.java
index 5fdd5cf..e5b378f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationMistakeExcelVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationMistakeExcelVO.java
@@ -14,13 +14,12 @@
* @author: llming
*/
@Data
-@EncryptDecryptClass
public class ComMngPopulationMistakeExcelVO implements Serializable {
@ExcelProperty(value = "姓名", index = 0)
private String name;
- @EncryptDecryptField
+ @ExcelProperty(value = "身份证号", index = 1)
private String cardNo;
@ExcelProperty(value = "民族", index = 2)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwDangerReportVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwDangerReportVO.java
index 86de551..6680eb2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwDangerReportVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwDangerReportVO.java
@@ -41,26 +41,7 @@
* 巡查时间
*/
@ApiModelProperty("巡查时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date PatrolTime;
-
- /**
- * 天气
- */
- @ApiModelProperty("天气")
- private String weather;
-
- /**
- * 温度
- */
- @ApiModelProperty("温度")
- private String temperature;
-
- /**
- * 风
- */
- @ApiModelProperty("风")
- private String wind;
+ private String PatrolTime;
/**
* (取字典表国家标准编码)巡查类型(1.防火巡查2.防汛巡查3.防疫巡查)
@@ -71,14 +52,20 @@
/**
* 巡查人员，多个以逗号隔开
*/
- @ApiModelProperty("巡查人员，多个以逗号隔开")
+ @ApiModelProperty("巡查人员id，多个以逗号隔开")
private String patrolPerson;
/**
- * 巡查人员联系电话，多个以逗号隔开
+ * 巡查人员名字，多个以逗号隔开
*/
- @ApiModelProperty("巡查人员联系电话，多个以逗号隔开")
- private String patrolPersonPhone;
+ @ApiModelProperty("巡查人员名字，多个以逗号隔开")
+ private String pPersonName;
+
+ /**
+ * 巡查人员电话，多个以逗号隔开
+ */
+ @ApiModelProperty("巡查人员电话，多个以逗号隔开")
+ private String pPersonPhone;
/**
* 巡查地址
@@ -120,8 +107,7 @@
* 排查时间
*/
@ApiModelProperty("排查时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date checkTime;
+ private String checkTime;
/**
* 主体部门、单位或个人全称
@@ -178,17 +164,22 @@
private String rectifyPerson;
/**
- * 整改人员联系电话，多个以逗号隔开
+ * 整改人员名字，多个以逗号隔开
*/
- @ApiModelProperty("整改人员联系电话，多个以逗号隔开")
- private String rectifyPersonPhone;
+ @ApiModelProperty("整改人员名字，多个以逗号隔开")
+ private String dPersonName;
+
+ /**
+ * 整改人员电话，多个以逗号隔开
+ */
+ @ApiModelProperty("整改人员电话，多个以逗号隔开")
+ private String dPersonPhone;
/**
* 整改时间
*/
@ApiModelProperty("整改时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date rectifyTime;
+ private String rectifyTime;
/**
* 社区处理建议
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwPatrolRecordStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwPatrolRecordStatisticsVO.java
index 625099b..74f38e5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwPatrolRecordStatisticsVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwPatrolRecordStatisticsVO.java
@@ -20,16 +20,16 @@
* 防火巡查
*/
@ApiModelProperty("防火巡查")
- private Integer localTotal;
+ private Integer huoTotal;
/**
* 防汛巡查
*/
@ApiModelProperty("防汛巡查")
- private Integer outTotal;
+ private Integer xunTotal;
/**
* 防疫巡查
*/
@ApiModelProperty("防疫巡查")
- private Integer specialTotal;
+ private Integer yiTotal;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwPatrolRecordVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwPatrolRecordVO.java
index 03c27cd..8665e10 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwPatrolRecordVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwPatrolRecordVO.java
@@ -52,24 +52,6 @@
private Date patrolTime;
/**
- * 天气
- */
- @ApiModelProperty("天气")
- private String weather;
-
- /**
- * 温度
- */
- @ApiModelProperty("温度")
- private String temperature;
-
- /**
- * 风
- */
- @ApiModelProperty("风")
- private String wind;
-
- /**
* (取字典表国家标准编码)巡查类型(1.防火巡查2.防汛巡查3.防疫巡查)
*/
@ApiModelProperty("巡查类型(1.防火巡查2.防汛巡查3.防疫巡查)，多条以逗号隔开")
@@ -88,6 +70,18 @@
private String patrolPerson;
/**
+ * 巡查人员名字，多个以逗号隔开
+ */
+ @ApiModelProperty("巡查人员名字，多个以逗号隔开")
+ private String personName;
+
+ /**
+ * 巡查人员电话，多个以逗号隔开
+ */
+ @ApiModelProperty("巡查人员电话，多个以逗号隔开")
+ private String personPhone;
+
+ /**
* 巡查地址
*/
@ApiModelProperty("巡查地址")
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwRotaPersonVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwRotaPersonVO.java
new file mode 100644
index 0000000..7882eb2
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwRotaPersonVO.java
@@ -0,0 +1,43 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * @auther txb
+ * @create 2021-07-23 14:38:38
+ * @describe 社区》安全工作》值班人员信息
+ */
+
+@Data
+@ApiModel("值班人员信息")
+public class ComSwRotaPersonVO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * id
+ */
+ @ApiModelProperty("id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ /**
+ * 值班人
+ */
+ @ApiModelProperty("值班人")
+ private String name;
+
+ /**
+ * 联系电话
+ */
+ @ApiModelProperty("联系电话")
+ private Long phone;
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwRotaVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwRotaVO.java
new file mode 100644
index 0000000..5aad827
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwRotaVO.java
@@ -0,0 +1,89 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * @auther txb
+ * @create 2021-07-23 14:38:38
+ * @describe 社区》安全工作》值班表
+ */
+
+@Data
+@ApiModel("值班表")
+public class ComSwRotaVO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 值班表id
+ */
+ @ApiModelProperty("值班表id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty("社区id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long communityId;
+
+ /**
+ * 星期
+ */
+ @ApiModelProperty("星期")
+ private String weekDay;
+
+ /**
+ * 值班时间
+ */
+ @ApiModelProperty("值班时间")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date rotaDate;
+
+ /**
+ * 值班领导，多个以逗号隔开
+ */
+ @ApiModelProperty("值班领导，多个以逗号隔开")
+ private String rotaLeader;
+
+ /**
+ * 领导名字，多个以逗号隔开
+ */
+ @ApiModelProperty("领导名字，多个以逗号隔开")
+ private String leaderName;
+
+ /**
+ * 领导联系电话，多个以逗号隔开
+ */
+ @ApiModelProperty("领导联系电话，多个以逗号隔开")
+ private String leaderPhone;
+
+ /**
+ * 值班人员，多个以逗号隔开
+ */
+ @ApiModelProperty("值班人员，多个以逗号隔开")
+ private String rotaPerson;
+
+ /**
+ * 人员联系电话，多个以逗号隔开
+ */
+ @ApiModelProperty("人员联系电话，多个以逗号隔开")
+ private String personName;
+
+ /**
+ * 人员联系电话，多个以逗号隔开
+ */
+ @ApiModelProperty("人员联系电话，多个以逗号隔开")
+ private String personPhone;
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwSafetyWorkRecordVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwSafetyWorkRecordVO.java
index 2ee565f..22db060 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwSafetyWorkRecordVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwSafetyWorkRecordVO.java
@@ -45,24 +45,6 @@
private Date PatrolTime;
/**
- * 天气
- */
- @ApiModelProperty("天气")
- private String weather;
-
- /**
- * 温度
- */
- @ApiModelProperty("温度")
- private String temperature;
-
- /**
- * 风
- */
- @ApiModelProperty("风")
- private String wind;
-
- /**
* (取字典表国家标准编码)巡查类型(1.防火巡查2.防汛巡查3.防疫巡查)
*/
@ApiModelProperty("巡查类型(1.防火巡查2.防汛巡查3.防疫巡查)，多条以逗号隔开")
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index e4986ac..d8e7446 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -118,7 +118,7 @@
* @return 详情
*/
@PostMapping("detailactivity")
- R detailActivity(@RequestParam("id") Long id, @RequestParam(value = "userId",required = false) Long userId);
+ R detailActivity(@RequestParam("id") Long id, @RequestParam(value = "userId", required = false) Long userId);
/**
* 分页活动报名名单
@@ -1674,7 +1674,7 @@
* @return 查询结果
*/
@PostMapping("/getVillageById")
- R getVillageById(@RequestParam(value = "villageId")Long villageId);
+ R getVillageById(@RequestParam(value = "villageId") Long villageId);
/**
* 批量导入实有房屋
@@ -2974,22 +2974,26 @@
/**
* 插入字典
- * @param dictionaryVO 字典数据
+ *
+ * @param dictionaryVO 字典数据
* @return R 是否保存成功
* @author manailin
* @date 2021/6/10 17:00
*/
@PostMapping("/dictionary/insertDiction")
- R insertDiction(@RequestBody DictionaryVO dictionaryVO);
+ R insertDiction(@RequestBody DictionaryVO dictionaryVO);
+
/**
* 插入字典项
- * @param dictionaryVO 字典数据
+ *
+ * @param dictionaryVO 字典数据
* @return R 是否保存成功
* @author manailin
* @date 2021/6/10 17:00
*/
@PostMapping("/dictionary/insertDictionItem")
- R insertDictionItem(@RequestBody BcDictionaryVO dictionaryVO);
+ R insertDictionItem(@RequestBody BcDictionaryVO dictionaryVO);
+
/**
* 根据字典key查询字典项
*
@@ -3329,8 +3333,8 @@
/**
* 根据人口id获取人口详情
*
- * @param populationId 人口id
- * @return 人口详情
+ * @param populationId 人口id
+ * @return 人口详情
*/
@GetMapping("/population/detail/app")
R getPopulationDetailByApp(@RequestParam("populationId") Long populationId);
@@ -3381,276 +3385,311 @@
/**
* 综治后台-居民列表
+ *
* @param populationListDTO 请求参数
- * @return 居民列表
+ * @return 居民列表
*/
@PostMapping("/population/grid/list")
R getGridPopulationList(@RequestBody ComMngPopulationListDTO populationListDTO);
/**
* 综治后台-删除居民
- * @param ids 居民id集合
- * @return 删除结果
+ *
+ * @param ids 居民id集合
+ * @return 删除结果
*/
@PostMapping("/population/grid/del")
R delGridPopulation(@RequestBody List<Long> ids);
/**
* 综治后台-居民详情
- * @param populationId 居民id
- * @return 居民详情
+ *
+ * @param populationId 居民id
+ * @return 居民详情
*/
@GetMapping("/population/grid/get")
- R getGridPopulationDetail(@RequestParam("populationId")Long populationId);
+ R getGridPopulationDetail(@RequestParam("populationId") Long populationId);
/**
* 综治app-小区列表
+ *
* @param villageListAppDTO 请求参数
- * @return 小区列表
+ * @return 小区列表
*/
@PostMapping("/village/grid/list")
R getGridVillageList(@RequestBody ComMngVillageListAppDTO villageListAppDTO);
/**
* 综治app-根据小区id查询小区下楼栋列表
+ *
* @param villageId 小区id
- * @return 楼栋列表
+ * @return 楼栋列表
*/
@PostMapping("/village/grid/building/list")
- R getGridVillageBuildingList(@RequestParam("villageId")Long villageId);
+ R getGridVillageBuildingList(@RequestParam("villageId") Long villageId);
/**
* 小区楼栋下房屋列表
- * @param buildHouseAppDTO 请求参数
- * @return 房屋列表
+ *
+ * @param buildHouseAppDTO 请求参数
+ * @return 房屋列表
*/
@PostMapping("/village/grid/building/house/list")
R getGridVillageBuildingHouseList(@RequestBody PageComMngVillageBuildHouseAppDTO buildHouseAppDTO);
/**
* 小区楼栋下房屋信息
- * @param houseId 房屋id
- * @return 房屋信息
+ *
+ * @param houseId 房屋id
+ * @return 房屋信息
*/
@PostMapping("/village/grid/building/house/detail")
- R getGridVillageBuildingHouseDetail(@RequestParam("houseId")Long houseId);
+ R getGridVillageBuildingHouseDetail(@RequestParam("houseId") Long houseId);
/**
* 查询平台人口列表
+ *
* @param populationDTO 请求参数
- * @return 人口列表
+ * @return 人口列表
*/
@PostMapping("/village/grid/building/house/population/list")
R getBuildingHousePopulationList(@RequestBody PageComMngPopulationDTO populationDTO);
/**
* 批量向房屋新增人员
- * @param housePopulationDTO 请求参数
- * @return 添加结果
+ *
+ * @param housePopulationDTO 请求参数
+ * @return 添加结果
*/
@PostMapping("/village/grid/building/house/add/population")
R addBuildingHousePopulation(@RequestBody AddComMngHousePopulationDTO housePopulationDTO);
/**
* 批量删除房屋内人员
- * @param housePopulationDTO 请求参数
- * @return 删除结果
+ *
+ * @param housePopulationDTO 请求参数
+ * @return 删除结果
*/
@PostMapping("/village/grid/building/house/del/population")
R delBuildingHousePopulation(@RequestBody DelComMngHousePopulationDTO housePopulationDTO);
/**
* 综治后台-居民标签栏统计
- * @return 居民统计
+ *
+ * @return 居民统计
*/
@GetMapping("/population/grid/statistics")
R getGridPopulationStatistics(@RequestParam("communityId") Long communityId);
/**
* 综治后台-居民导出查询居民数据
- * @param populationExportDTO 请求参数
- * @return 导出结果
+ *
+ * @param populationExportDTO 请求参数
+ * @return 导出结果
*/
@PostMapping("/population/grid/export")
R getGridPopulationExport(@RequestBody ComMngPopulationExportDTO populationExportDTO);
/**
* 综治后台-居民管理小区列表
- * @param name 小区名字
- * @return 小区列表
+ *
+ * @param name 小区名字
+ * @return 小区列表
*/
@GetMapping("/population/village/relation")
R relationVillage(@RequestParam("name") String name);
/**
* 综治后台-居民管理-级联列表
- * @param subordinateDTO 请求参数
- * @return 级联列表
+ *
+ * @param subordinateDTO 请求参数
+ * @return 级联列表
*/
@PostMapping("/population/subordinate")
R subordinate(@RequestBody ComMngPopulationSubordinateDTO subordinateDTO);
/**
* 综治后台-居民关联房屋
- * @param relationHouseDTO 请求参数
- * @return 关联结果
+ *
+ * @param relationHouseDTO 请求参数
+ * @return 关联结果
*/
@PostMapping("/population/relation/house")
R populationRelationHouse(@RequestBody ComMngPopulationRelationHouseDTO relationHouseDTO);
/**
* 综治后台-批量删除小区
- * @param villageIds 小区id集合
- * @return 删除结果
+ *
+ * @param villageIds 小区id集合
+ * @return 删除结果
*/
@PostMapping("/village/admin/del")
R delGridVillage(@RequestBody List<Long> villageIds);
/**
* 综治后台-小区内居民列表
- * @param villagePopulationDTO 请求参数
- * @return 居民列表
+ *
+ * @param villagePopulationDTO 请求参数
+ * @return 居民列表
*/
@PostMapping("/village/admin/population/list")
R getVillagePopulationAdmin(@RequestBody PageComMngVillagePopulationDTO villagePopulationDTO);
/**
* 综治后台-居民下房屋列表
+ *
* @param villagePopulationHouseDTO 请求参数
- * @return 房屋列表
+ * @return 房屋列表
*/
@PostMapping("/village/admin/population/house/list")
R getVillagePopulationHouseAdmin(@RequestBody PageComMngVillagePopulationHouseDTO villagePopulationHouseDTO);
/**
* 综治后台-小区统计
- * @return 小区统计结果
+ *
+ * @return 小区统计结果
*/
@GetMapping("/village/admin/statistics")
R getGridVillageStatistics();
/**
* 综治后台-小区列表导出
+ *
* @param villageListAppDTO 请求参数
- * @return 小区列表
+ * @return 小区列表
*/
@PostMapping("/village/admin/export")
R getGridVillageListExport(@RequestBody ComMngVillageListExportAdminDTO villageListAppDTO);
/**
* 社区后台-分页查询随手拍活动列表
- * @param pageEasyPhotoActivityDTO 请求参数
- * @return 随手拍活动列表
+ *
+ * @param pageEasyPhotoActivityDTO 请求参数
+ * @return 随手拍活动列表
*/
@PostMapping("/easy/photo/activity/page")
R pageEasyPhotoActivity(@RequestBody PageEasyPhotoActivityDTO pageEasyPhotoActivityDTO);
/**
* 社区后台-添加随手拍活动
- * @param addEasyPhotoActivityDTO 请求参数
- * @return 添加结果
+ *
+ * @param addEasyPhotoActivityDTO 请求参数
+ * @return 添加结果
*/
@PostMapping("/easy/photo/activity/add")
R addEasyPhotoActivity(@RequestBody AddEasyPhotoActivityDTO addEasyPhotoActivityDTO);
/**
* 社区后台-编辑随手拍活动
- * @param editEasyPhotoActivityDTO 请求参数
- * @return 编辑结果
+ *
+ * @param editEasyPhotoActivityDTO 请求参数
+ * @return 编辑结果
*/
@PostMapping("/easy/photo/activity/edit")
R editEasyPhotoActivity(@RequestBody EditEasyPhotoActivityDTO editEasyPhotoActivityDTO);
/**
* 社区后台-取消随手拍活动
- * @param id 随手拍活动id
- * @return 取消结果
+ *
+ * @param id 随手拍活动id
+ * @return 取消结果
*/
@GetMapping("/easy/photo/activity/cancel")
R cancelEasyPhotoActivity(@RequestParam("id") Long id);
/**
* 分页查询随手拍活动下居民参与记录
- * @param pageEasyPhotoActivityUserDTO 请求参数
- * @return 居民参与记录
+ *
+ * @param pageEasyPhotoActivityUserDTO 请求参数
+ * @return 居民参与记录
*/
@PostMapping("/easy/photo/activity/page/user")
R pageEasyPhotoActivityUser(@RequestBody PageEasyPhotoActivityUserDTO pageEasyPhotoActivityUserDTO);
/**
* 随手拍活动定时任务
- * @return 执行结果
+ *
+ * @return 执行结果
*/
@PostMapping("timeTaskEasyPhotoActivity")
R timedTaskEasyPhotoActivity();
/**
* 分页查询收益结算列表
- * @param pageWalletAdminDTO 请求参数
- * @return 收益结算列表
+ *
+ * @param pageWalletAdminDTO 请求参数
+ * @return 收益结算列表
*/
@PostMapping("/user/wallet/page")
R pageUserWalletAdmin(@RequestBody PageComActWalletAdminDTO pageWalletAdminDTO);
/**
* 用户结算收益
- * @param settlementAdminDTO 请求参数
- * @return 结算结果
+ *
+ * @param settlementAdminDTO 请求参数
+ * @return 结算结果
*/
@PostMapping("/user/wallet/settlement")
R userWalletSettlementAdmin(@RequestBody ComActWalletSettlementAdminDTO settlementAdminDTO);
/**
* 分页查询交易记录
+ *
* @param pageTradeAdminDTO 请求参数
- * @return 交易记录列表
+ * @return 交易记录列表
*/
@PostMapping("/user/wallet/trade/page")
R pageUserWalletTradeAdmin(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO);
/**
* 社区随手拍列表统计
- * @param communityId 社区id
- * @return 统计结果
+ *
+ * @param communityId 社区id
+ * @return 统计结果
*/
@GetMapping("/easyphoto/statistics")
R easyPhotoStatistics(@RequestParam("communityId") Long communityId);
/**
* 分页查询邻里圈话题列表
- * @param circleTopicAdminDTO 请求参数
- * @return 邻里圈话题列表
+ *
+ * @param circleTopicAdminDTO 请求参数
+ * @return 邻里圈话题列表
*/
@PostMapping("/neighbor/pageNeighborTopicByAdmin")
R pageNeighborTopicByAdmin(@RequestBody ComActNeighborCircleTopicAdminDTO circleTopicAdminDTO);
/**
* 添加邻里圈话题
- * @param addCircleTopicAdminDTO 请求参数
- * @return 添加结果
+ *
+ * @param addCircleTopicAdminDTO 请求参数
+ * @return 添加结果
*/
@PostMapping("/neighbor/addNeighborTopicByAdmin")
R addNeighborTopicByAdmin(@RequestBody AddNeighborCircleTopicAdminDTO addCircleTopicAdminDTO);
/**
* 编辑邻里圈话题
- * @param addCircleTopicAdminDTO 请求参数
- * @return 编辑结果
+ *
+ * @param addCircleTopicAdminDTO 请求参数
+ * @return 编辑结果
*/
@PostMapping("/neighbor/editNeighborTopicByAdmin")
R editNeighborTopicByAdmin(@RequestBody AddNeighborCircleTopicAdminDTO addCircleTopicAdminDTO);
/**
* 小程序查询邻里圈话题列表
- * @param communityId 社区id
- * @return 邻里圈话题列表
+ *
+ * @param communityId 社区id
+ * @return 邻里圈话题列表
*/
@GetMapping("/neighbor/getNeighborTopicByApp")
R getNeighborTopicByApp(@RequestParam("communityId") Long communityId);
/**
* 综治后台-查询社区列表
- * @return 社区列表
+ *
+ * @return 社区列表
*/
@GetMapping("/eventgrid/community/list")
R getCommunityLists();
@@ -3666,71 +3705,80 @@
/**
* 分页查询社区动态分类列表
- * @param comActDynTypeDTO 请求参数
- * @return 动态分类列表
+ *
+ * @param comActDynTypeDTO 请求参数
+ * @return 动态分类列表
*/
@PostMapping("/dyn/type/page")
R pageDynTypeByAdmin(@RequestBody PageComActDynTypeDTO comActDynTypeDTO);
/**
* 查询社区下所有动态分类列表
- * @param comActDynTypeDTO 请求参数
- * @return 动态分类列表
+ *
+ * @param comActDynTypeDTO 请求参数
+ * @return 动态分类列表
*/
@PostMapping("/dyn/type/list")
R getDynTypeListByAdmin(@RequestBody PageComActDynTypeDTO comActDynTypeDTO);
/**
* 添加社区动态分类
- * @param comActDynTypeDTO 请求参数
- * @return 添加结果
+ *
+ * @param comActDynTypeDTO 请求参数
+ * @return 添加结果
*/
@PostMapping("/dyn/type/add")
R addDynTypeByAdmin(@RequestBody AddComActDynTypeDTO comActDynTypeDTO);
/**
* 编辑社区动态分类
- * @param comActDynTypeDTO 请求参数
- * @return 编辑结果
+ *
+ * @param comActDynTypeDTO 请求参数
+ * @return 编辑结果
*/
@PostMapping("/dyn/type/edit")
R editDynTypeByAdmin(@RequestBody EditComActDynTypeDTO comActDynTypeDTO);
/**
* 删除社区动态分类
- * @param ids 社区动态分类id集合
- * @return 删除结果
+ *
+ * @param ids 社区动态分类id集合
+ * @return 删除结果
*/
@PostMapping("/dyn/type/delete")
R deleteDynTypeByAdmin(@RequestBody List<Long> ids);
/**
* 随手拍发放奖励
- * @param grantRewardDTO 请求参数
- * @return 发放结果
+ *
+ * @param grantRewardDTO 请求参数
+ * @return 发放结果
*/
@PostMapping("/easyphoto/grantReward")
R grantReward(@RequestBody GrantRewardDTO grantRewardDTO);
/**
* 获取最新活动和用户最新收益
- * @param userId 用户id
- * @param communityId 社区id
- * @return 最新活动和用户最新收益
+ *
+ * @param userId 用户id
+ * @param communityId 社区id
+ * @return 最新活动和用户最新收益
*/
@PostMapping("/easyphoto/getUserReward")
- R getUserReward(@RequestParam("userId") Long userId,@RequestParam("communityId") Long communityId);
+ R getUserReward(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId);
/**
* 读取用户随手拍奖励
- * @param userId 用户id
- * @return 读取结果
+ *
+ * @param userId 用户id
+ * @return 读取结果
*/
@PostMapping("/easyphoto/readUserReward")
- R readUserReward(@RequestParam("userId") Long userId,@RequestParam("communityId") Long communityId);
+ R readUserReward(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId);
/**
* 分页查询巡查记录
+ *
* @param comSwPatrolRecordPageDTO 查询参数
* @return 分页集合
*/
@@ -3739,6 +3787,7 @@
/**
* 新增巡查记录
+ *
* @param comSwPatrolRecordAddDTO 新增参数
* @return 新增结果
*/
@@ -3751,11 +3800,12 @@
* @param patrolRecordId 巡查记录id
* @return 巡查记录详情查询结果
*/
- @PostMapping("/patrolRecord/detail")
+ @GetMapping("/patrolRecord/detail")
R detailPatrolRecord(@RequestParam("patrolRecordId") Long patrolRecordId);
/**
* 分页查询安全工作记录
+ *
* @param comSwPatrolRecordPageDTO 查询参数
* @return 安全工作记录分页集合
*/
@@ -3768,7 +3818,7 @@
* @param safetyWorkRecordId 安全工作记录
* @return 安全工作记录详情查询结果
*/
- @PostMapping("/patrolRecord/safetyWorkRecord/detail")
+ @GetMapping("/patrolRecord/safetyWorkRecord/detail")
R detailSafetyWorkRecord(@RequestParam(value = "safetyWorkRecordId") Long safetyWorkRecordId);
/**
@@ -3777,11 +3827,12 @@
* @param patrolRecordId 巡查记录id
* @return 安全工作记录详情查询结果
*/
- @PostMapping("/patrolRecord/safetyWorkRecord/detailByPrId")
+ @GetMapping("/patrolRecord/safetyWorkRecord/detailByPrId")
R detailSafetyWorkRecordByPrId(@RequestParam(value = "patrolRecordId") Long patrolRecordId);
/**
* 分页查询隐患报告
+ *
* @param comSwPatrolRecordPageDTO 查询参数
* @return 隐患报告分页集合
*/
@@ -3794,7 +3845,7 @@
* @param dangerReportId 隐患报告id
* @return 隐患报告详情查询结果
*/
- @PostMapping("/patrolRecord/dangerReport/detail")
+ @GetMapping("/patrolRecord/dangerReport/detail")
R detailDangerReport(@RequestParam(value = "dangerReportId") Long dangerReportId);
/**
@@ -3803,7 +3854,7 @@
* @param patrolRecordId 巡查记录id
* @return 隐患报告详情查询结果
*/
- @PostMapping("/patrolRecord/dangerReport/detailByPrId")
+ @GetMapping("/patrolRecord/dangerReport/detailByPrId")
R detailDangerReportByPrId(@RequestParam(value = "patrolRecordId") Long patrolRecordId);
/**
@@ -3838,6 +3889,49 @@
*
* @return 统计结果
*/
- @PostMapping("/patrolRecord/statistics")
+ @GetMapping("/patrolRecord/statistics")
R patrolRecordStatistics(@RequestParam(value = "communityId") Long communityId);
+
+ /**
+ * 分页查询值班表
+ *
+ * @param comSwRotaPageDTO 查询参数
+ * @return 值班表分页集合
+ */
+ @PostMapping("/patrolRecord/rota/page")
+ R pageRota(@RequestBody ComSwRotaPageDTO comSwRotaPageDTO);
+
+ /**
+ * 新增值班表
+ *
+ * @param comSwRotaSaveDTOs 新增参数
+ * @return 新增结果
+ */
+ @PostMapping("/patrolRecord/rota/add")
+ R addRota(@RequestBody List<ComSwRotaSaveDTO> comSwRotaSaveDTOs);
+
+ /**
+ * 批量删除值班表
+ * @param rotaIds 值班ids
+ * @return 删除结果
+ */
+ @PostMapping("/patrolRecord/rota/delete")
+ R deleteRota(@RequestBody List<Long> rotaIds);
+
+ /**
+ * 根据日期查询值班人员
+ *
+ * @return 查询结果
+ */
+ @GetMapping("/patrolRecord/rota/getRotaPersonByDate")
+ R getRotaPersonByDate(@RequestParam(value = "rotaDate") String rotaDate);
+
+ /**
+ * 根据日期查询值班领导
+ *
+ * @return 查询结果
+ */
+ @GetMapping("/patrolRecord/rota/getRotaLeaderByDate")
+ R getRotaLeaderByDate(@RequestParam(value = "rotaDate") String rotaDate);
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java
index b120014..5da03aa 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java
@@ -4,6 +4,7 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActActivityVO;
import com.panzhihua.common.model.vos.partybuilding.*;
+import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -407,4 +408,14 @@
*/
@PostMapping("/partybuildIng/exportPbMember")
R exportPbMember(@RequestBody PagePartyOrganizationVO organizationVO);
+
+
+ /**
+ * 选择人员
+ * @param param 查询条件
+ * @param communityId 社区id
+ * @return 查询结果
+ */
+ @PostMapping("/partybuildIng/getTotlePerson")
+ R getTotlePerson(@RequestParam(value = "param", required = false)String param, @RequestParam(value = "communityId") Long communityId);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComSwPatrolRecordApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComSwPatrolRecordApi.java
index 1c8be1d..9ec6969 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComSwPatrolRecordApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComSwPatrolRecordApi.java
@@ -6,13 +6,11 @@
import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
import com.alibaba.fastjson.JSONArray;
import com.panzhihua.common.controller.BaseController;
-import com.panzhihua.common.model.dtos.community.ComSwDangerReportHandleDTO;
-import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordAddDTO;
-import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordPageDTO;
-import com.panzhihua.common.model.dtos.community.ExportComMngCarExcelDTO;
+import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.service.partybuilding.PartyBuildingService;
import com.panzhihua.common.utlis.SFTPUtil;
import com.panzhihua.community_backstage.excel.CustomSheetWriteHandler;
import io.swagger.annotations.Api;
@@ -41,6 +39,8 @@
@Resource
private CommunityService communityService;
+ @Resource
+ private PartyBuildingService partyBuildingService;
// FTP 登录用户名
@Value("${ftp.username}")
@@ -91,7 +91,7 @@
* @return 巡查记录详情查询结果
*/
@ApiOperation(value = "根据巡查记录id查询详情")
- @PostMapping("/detailPatrolRecord")
+ @GetMapping("/detailPatrolRecord")
public R detailPatrolRecord(@RequestParam(value = "patrolRecordId") Long patrolRecordId) {
return communityService.detailPatrolRecord(patrolRecordId);
}
@@ -116,7 +116,7 @@
* @return 安全工作记录详情查询结果
*/
@ApiOperation(value = "根据安全工作记录id查询详情")
- @PostMapping("/detailSafetyWorkRecord")
+ @GetMapping("/detailSafetyWorkRecord")
public R detailSafetyWorkRecord(@RequestParam(value = "safetyWorkRecordId") Long safetyWorkRecordId) {
return communityService.detailSafetyWorkRecord(safetyWorkRecordId);
}
@@ -128,7 +128,7 @@
* @return 安全工作记录详情查询结果
*/
@ApiOperation(value = "根据巡查记录id查询安全工作记录详情")
- @PostMapping("/detailSafetyWorkRecordByPrId")
+ @GetMapping("/detailSafetyWorkRecordByPrId")
public R detailSafetyWorkRecordByPrId(@RequestParam(value = "patrolRecordId") Long patrolRecordId) {
return communityService.detailSafetyWorkRecordByPrId(patrolRecordId);
}
@@ -153,7 +153,7 @@
* @return 隐患报告详情查询结果
*/
@ApiOperation(value = "根据隐患报告id查询详情")
- @PostMapping("/detailDangerReport")
+ @GetMapping("/detailDangerReport")
public R detailDangerReport(@RequestParam(value = "dangerReportId") Long dangerReportId) {
return communityService.detailDangerReport(dangerReportId);
}
@@ -164,8 +164,8 @@
* @param patrolRecordId 巡查记录id
* @return 隐患报告详情查询结果
*/
- @ApiOperation(value = "根据隐患报告id查询详情")
- @PostMapping("/detailDangerReportByPrId")
+ @ApiOperation(value = "根据巡查记录id查询隐患报告详情")
+ @GetMapping("/detailDangerReportByPrId")
public R detailDangerReportByPrId(@RequestParam(value = "patrolRecordId") Long patrolRecordId) {
return communityService.detailDangerReportByPrId(patrolRecordId);
}
@@ -247,12 +247,86 @@
* @return 统计结果
*/
@ApiOperation(value = "巡查记录统计接口", response = ComSwPatrolRecordStatisticsVO.class)
- @PostMapping("/patrolRecordStatistics")
+ @GetMapping("/patrolRecordStatistics")
public R patrolRecordStatistics() {
//获取登陆用户绑定社区id
Long communityId = this.getLoginUserInfo().getCommunityId();
return communityService.patrolRecordStatistics(communityId);
}
+ /**
+ * 分页查询值班表
+ * @param comSwRotaPageDTO 查询参数
+ * @return 值班表分页集合
+ */
+ @PostMapping("/pageRota")
+ @ApiOperation(value = "分页查询值班表", response = ComSwRotaVO.class)
+ public R pageRota(@RequestBody ComSwRotaPageDTO comSwRotaPageDTO){
+ //获取登陆用户绑定社区id
+ Long communityId = this.getLoginUserInfo().getCommunityId();
+ comSwRotaPageDTO.setCommunityId(communityId);
+ return communityService.pageRota(comSwRotaPageDTO);
+ }
+
+ /**
+ * 新增值班表
+ * @param comSwRotaSaveDTOs 新增参数
+ * @return 新增结果
+ */
+ @ApiOperation(value = "新增值班表")
+ @PostMapping("/addRota")
+ public R addRota(@RequestBody List<ComSwRotaSaveDTO> comSwRotaSaveDTOs){
+ Long communityId = this.getLoginUserInfo().getCommunityId();
+ Long createBy = this.getLoginUserInfo().getUserId();
+ comSwRotaSaveDTOs.forEach(comSwRotaSaveDTO -> {
+ comSwRotaSaveDTO.setCommunityId(communityId);
+ comSwRotaSaveDTO.setCreateBy(createBy);
+ });
+ return communityService.addRota(comSwRotaSaveDTOs);
+ }
+
+ /**
+ * 批量删除值班表
+ * @param rotaIds 值班ids
+ * @return 删除结果
+ */
+ @ApiOperation(value = "批量删除值班表")
+ @PostMapping("/deleteRota")
+ public R deleteRota(@RequestBody List<Long> rotaIds){
+ return communityService.deleteRota(rotaIds);
+ }
+
+ /**
+ * 根据日期查询值班人员
+ * @return 查询结果
+ */
+ @ApiOperation(value = "根据日期查询值班人员")
+ @GetMapping("/getRotaPersonByDate")
+ public R getRotaPersonByDate(@RequestParam(value = "rotaDate") String rotaDate){
+ return communityService.getRotaPersonByDate(rotaDate);
+ }
+
+ /**
+ * 根据日期查询值班领导
+ * @return 查询结果
+ */
+ @ApiOperation(value = "根据日期查询值班领导")
+ @GetMapping("/getRotaLeaderByDate")
+ public R getRotaLeaderByDate(@RequestParam(value = "rotaDate") String rotaDate){
+ return communityService.getRotaLeaderByDate(rotaDate);
+ }
+
+ /**
+ * 选择人员
+ * @param param 查询条件
+ * @return 查询结果
+ */
+ @ApiOperation(value = "选择人员")
+ @PostMapping("/getTotlePerson")
+ public R getTotlePerson(@RequestParam(value = "param", required = false) String param){
+ Long communityId = this.getLoginUserInfo().getCommunityId();
+ return partyBuildingService.getTotlePerson(param,communityId);
+ }
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSwPatrolRecordApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSwPatrolRecordApi.java
index 5b366ee..5be004c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSwPatrolRecordApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSwPatrolRecordApi.java
@@ -1,19 +1,20 @@
package com.panzhihua.service_community.api;
-import com.panzhihua.common.model.dtos.community.ComSwDangerReportHandleDTO;
-import com.panzhihua.common.model.dtos.community.ComSwDangerReportRectifyDTO;
-import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordAddDTO;
-import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordPageDTO;
+import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComSwPatrolRecordStatisticsVO;
import com.panzhihua.service_community.dao.ComSwSafetyWorkRecordDAO;
import com.panzhihua.service_community.service.ComSwDangerReportService;
import com.panzhihua.service_community.service.ComSwPatrolRecordService;
+import com.panzhihua.service_community.service.ComSwRotaService;
import com.panzhihua.service_community.service.ComSwSafetyWorkRecordService;
+import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.Date;
import java.util.List;
/**
@@ -34,6 +35,9 @@
@Resource
private ComSwDangerReportService comSwDangerReportService;
+
+ @Resource
+ private ComSwRotaService comSwRotaService;
/**
* 分页查询巡查记录
@@ -62,9 +66,19 @@
* @param patrolRecordId 巡查记录id
* @return 巡查记录详情查询结果
*/
- @PostMapping("/detail")
+ @GetMapping("/detail")
public R detailPatrolRecord(@RequestParam(value = "patrolRecordId") Long patrolRecordId) {
return comSwPatrolRecordService.detailPatrolRecord(patrolRecordId);
+ }
+
+ /**
+ * 巡查记录统计接口
+ *
+ * @return 统计结果
+ */
+ @GetMapping("/statistics")
+ public R patrolRecordStatistics(@RequestParam(value = "communityId") Long communityId) {
+ return comSwPatrolRecordService.patrolRecordStatistics(communityId);
}
/**
@@ -83,7 +97,7 @@
* @param safetyWorkRecordId 安全工作记录
* @return 安全工作记录详情查询结果
*/
- @PostMapping("/safetyWorkRecord/detail")
+ @GetMapping("/safetyWorkRecord/detail")
public R detailSafetyWorkRecord(@RequestParam(value = "safetyWorkRecordId") Long safetyWorkRecordId) {
return comSwSafetyWorkRecordService.detailSafetyWorkRecord(safetyWorkRecordId);
}
@@ -94,7 +108,7 @@
* @param patrolRecordId 巡查记录id
* @return 安全工作记录详情查询结果
*/
- @PostMapping("/safetyWorkRecord/detailByPrId")
+ @GetMapping("/safetyWorkRecord/detailByPrId")
public R detailSafetyWorkRecordByPrId(@RequestParam(value = "patrolRecordId") Long patrolRecordId) {
return comSwSafetyWorkRecordService.detailSafetyWorkRecordByPrId(patrolRecordId);
}
@@ -115,7 +129,7 @@
* @param dangerReportId 隐患报告id
* @return 隐患报告详情查询结果
*/
- @PostMapping("/dangerReport/detail")
+ @GetMapping("/dangerReport/detail")
public R detailDangerReport(@RequestParam(value = "dangerReportId") Long dangerReportId) {
return comSwDangerReportService.detailDangerReport(dangerReportId);
}
@@ -126,7 +140,7 @@
* @param patrolRecordId 巡查记录id
* @return 隐患报告详情查询结果
*/
- @PostMapping("/dangerReport/detailByPrId")
+ @GetMapping("/dangerReport/detailByPrId")
public R detailDangerReportByPrId(@RequestParam(value = "patrolRecordId") Long patrolRecordId) {
return comSwDangerReportService.detailDangerReportByPrId(patrolRecordId);
}
@@ -164,5 +178,52 @@
return comSwDangerReportService.exportDangerReport(dangerReportIds);
}
+ /**
+ * 分页查询值班表
+ * @param comSwRotaPageDTO 查询参数
+ * @return 值班表分页集合
+ */
+ @PostMapping("/rota/page")
+ public R pageRota(@RequestBody ComSwRotaPageDTO comSwRotaPageDTO){
+ return comSwRotaService.pageRota(comSwRotaPageDTO);
+ }
+
+ /**
+ * 新增值班表
+ * @param comSwRotaSaveDTOs 新增参数
+ * @return 新增结果
+ */
+ @PostMapping("/rota/add")
+ public R addRota(@RequestBody List<ComSwRotaSaveDTO> comSwRotaSaveDTOs){
+ return comSwRotaService.addRota(comSwRotaSaveDTOs);
+ }
+
+ /**
+ * 批量删除值班表
+ * @param rotaIds 值班ids
+ * @return 删除结果
+ */
+ @PostMapping("/rota/delete")
+ public R deleteRota(@RequestBody List<Long> rotaIds){
+ return comSwRotaService.deleteRota(rotaIds);
+ }
+
+ /**
+ * 根据日期查询值班人员
+ * @return 查询结果
+ */
+ @GetMapping("/rota/getRotaPersonByDate")
+ public R getRotaPersonByDate(@RequestParam(value = "rotaDate") String rotaDate){
+ return comSwRotaService.getRotaPersonByDate(rotaDate);
+ }
+
+ /**
+ * 根据日期查询值班领导
+ * @return 查询结果
+ */
+ @GetMapping("/rota/getRotaLeaderByDate")
+ public R getRotaLeaderByDate(@RequestParam(value = "rotaDate") String rotaDate){
+ return comSwRotaService.getRotaLeaderByDate(rotaDate);
+ }
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComSwRotaDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComSwRotaDAO.java
new file mode 100644
index 0000000..6d7562c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComSwRotaDAO.java
@@ -0,0 +1,30 @@
+package com.panzhihua.service_community.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordPageDTO;
+import com.panzhihua.common.model.dtos.community.ComSwRotaPageDTO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComSwPatrolRecordVO;
+import com.panzhihua.common.model.vos.community.ComSwRotaVO;
+import com.panzhihua.service_community.model.dos.ComSwRotaDO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @auther txb
+ * @create 2021-07-30 09:48:54
+ * @describe 社区》安全工作》值班表mapper类
+ */
+@Mapper
+public interface ComSwRotaDAO extends BaseMapper<ComSwRotaDO> {
+
+ /**
+ * 分页查询值班表
+ * @param comSwRotaPageDTO 查询参数
+ * @return 值班表分页集合
+ */
+ IPage<ComSwRotaVO> pageRota(Page page, @Param("comSwRotaPageDTO") ComSwRotaPageDTO comSwRotaPageDTO);
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComSwSafetyWorkRecordDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComSwSafetyWorkRecordDAO.java
index 4da9108..44c2305 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComSwSafetyWorkRecordDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComSwSafetyWorkRecordDAO.java
@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordPageDTO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationTotalVO;
+import com.panzhihua.common.model.vos.community.ComSwPatrolRecordStatisticsVO;
import com.panzhihua.common.model.vos.community.ComSwPatrolRecordVO;
import com.panzhihua.common.model.vos.community.ComSwSafetyWorkRecordVO;
import com.panzhihua.service_community.model.dos.ComSwSafetyWorkRecordDO;
@@ -25,4 +27,11 @@
*/
IPage<ComSwSafetyWorkRecordVO> pageSafetyWorkRecord(Page page, @Param("comSwPatrolRecordDTO") ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO);
+ /**
+ * 巡查记录统计接口
+ *
+ * @return 统计结果
+ */
+ ComSwPatrolRecordStatisticsVO patrolRecordStatistics(@Param("communityId") Long communityId);
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComSwDangerReportDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComSwDangerReportDO.java
index 40bd988..61f641c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComSwDangerReportDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComSwDangerReportDO.java
@@ -53,7 +53,7 @@
/**
* 排查时间
*/
- private Date checkTime;
+ private String checkTime;
/**
* 主体部门、单位或个人全称
@@ -86,9 +86,19 @@
private String rectifyPerson;
/**
+ * 人员名字，多个以逗号隔开
+ */
+ private String personName;
+
+ /**
+ * 人员电话，多个以逗号隔开
+ */
+ private String personPhone;
+
+ /**
* 整改时间
*/
- private Date rectifyTime;
+ private String rectifyTime;
/**
* 社区处理建议
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComSwPatrolRecordDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComSwPatrolRecordDO.java
index ddd074a..854ba1a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComSwPatrolRecordDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComSwPatrolRecordDO.java
@@ -33,22 +33,7 @@
/**
* 巡查时间
*/
- private Date patrolTime;
-
- /**
- * 天气
- */
- private String weather;
-
- /**
- * 温度
- */
- private String temperature;
-
- /**
- * 风
- */
- private String wind;
+ private String patrolTime;
/**
* 巡查类型(1.防火巡查2.防汛巡查3.防疫巡查),多条以逗号隔开
@@ -64,6 +49,16 @@
* 巡查人员
*/
private String patrolPerson;
+
+ /**
+ * 人员名字，多个以逗号隔开
+ */
+ private String personName;
+
+ /**
+ * 人员电话，多个以逗号隔开
+ */
+ private String personPhone;
/**
* 巡查地址
@@ -103,7 +98,7 @@
/**
* 接班时间
*/
- private Date successionTime;
+ private String successionTime;
/**
* 是否存在隐患（1是 、0否）
@@ -138,9 +133,6 @@
return "ComSwPatrolRecordDO{" +
"id=" + id +
", patrolTime=" + patrolTime +
- ", weather=" + weather +
- ", temperature=" + temperature +
- ", wind=" + wind +
", patrolType=" + patrolType +
", patrolLeader=" + patrolLeader +
", patrolPerson=" + patrolPerson +
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComSwRotaDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComSwRotaDO.java
new file mode 100644
index 0000000..5ad5941
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComSwRotaDO.java
@@ -0,0 +1,89 @@
+package com.panzhihua.service_community.model.dos;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * @auther txb
+ * @create 2021-07-30 10:24:56
+ * @describe 社区》安全工作》值班表实体类
+ */
+
+@Data
+@TableName("com_sw_rota")
+public class ComSwRotaDO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 值班表主键id
+ */
+ @TableId(type = IdType.INPUT)
+ private Long id;
+
+ /**
+ * 社区ID
+ */
+ private Long communityId;
+
+ /**
+ * 值班时间
+ */
+ private Date rotaDate;
+
+ /**
+ * 值班领导，多个以逗号隔开
+ */
+ private String rotaLeader;
+
+ /**
+ * 领导联系电话，多个以逗号隔开
+ */
+ private String leaderName;
+
+ /**
+ * 领导联系电话，多个以逗号隔开
+ */
+ private String leaderPhone;
+
+ /**
+ * 值班人员，多个以逗号隔开
+ */
+ private String rotaPerson;
+
+ /**
+ * 人员联系电话，多个以逗号隔开
+ */
+ private String personName;
+
+ /**
+ * 人员联系电话，多个以逗号隔开
+ */
+ private String personPhone;
+
+ /**
+ * 创建时间
+ */
+ @TableField(fill = FieldFill.INSERT)
+ private Date createAt;
+
+ /**
+ * 创建人
+ */
+ private Long createBy;
+
+ /**
+ * 更新时间
+ */
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Date updateAt;
+
+ /**
+ * 修改人
+ */
+ private Long updateBy;
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComSwPatrolRecordService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComSwPatrolRecordService.java
index e17d2d0..660b87d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComSwPatrolRecordService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComSwPatrolRecordService.java
@@ -5,6 +5,7 @@
import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordPageDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.model.dos.ComSwPatrolRecordDO;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
@@ -39,4 +40,11 @@
* @return 巡查记录详情查询结果
*/
R detailPatrolRecord(Long patrolRecordId);
+
+ /**
+ * 巡查记录统计接口
+ *
+ * @return 统计结果
+ */
+ R patrolRecordStatistics(Long communityId);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComSwRotaService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComSwRotaService.java
new file mode 100644
index 0000000..e38cf3a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComSwRotaService.java
@@ -0,0 +1,61 @@
+package com.panzhihua.service_community.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.panzhihua.common.model.dtos.community.ComSwRotaPageDTO;
+import com.panzhihua.common.model.dtos.community.ComSwRotaSaveDTO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.service_community.model.dos.ComSwRotaDO;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @auther txb
+ * @create 2021-07-30 09:48:54
+ * @describe 社区》安全工作》值班表服务类
+ */
+public interface ComSwRotaService extends IService<ComSwRotaDO> {
+
+ /**
+ * 分页查询值班表
+ * @param comSwRotaPageDTO 查询参数
+ * @return 值班表分页集合
+ */
+ R pageRota(ComSwRotaPageDTO comSwRotaPageDTO);
+
+ /**
+ * 新增值班表
+ * @param comSwRotaSaveDTOs 新增参数
+ * @return 新增结果
+ */
+ R addRota(List<ComSwRotaSaveDTO> comSwRotaSaveDTOs);
+
+ /**
+ * 批量删除值班表
+ * @param rotaIds 值班ids
+ * @return 删除结果
+ */
+ R deleteRota(List<Long> rotaIds);
+
+ /**
+ * 查询当天值班人员
+ * @return 查询结果
+ */
+ R getRotaPersonByDate(String rotaDate);
+
+ /**
+ * 查询当天值班领导
+ * @return 查询结果
+ */
+ R getRotaLeaderByDate(String rotaDate);
+
+ /**
+ * 选择人员
+ * @return 查询结果
+ */
+ R getTotlePerson(String param,Long communityId);
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwDangerReportServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwDangerReportServiceImpl.java
index a659935..d0a3837 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwDangerReportServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwDangerReportServiceImpl.java
@@ -29,6 +29,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -76,21 +77,6 @@
}else {
comSwDangerReportVO.setIsAssign(ComSwDangerReportVO.isOk.yes);
}
- List<String> patrolUserIds = Arrays.asList(comSwDangerReportVO.getPatrolPerson().split(","));
- List<String> patrolPhones = new ArrayList<>();
- for (String userId : patrolUserIds) {
- LoginUserInfoVO loginUserInfoVO = userService.getUserInfoByUserId(userId).getData();
- patrolPhones.add(loginUserInfoVO.getPhone());
- }
- comSwDangerReportVO.setPatrolPersonPhone(StringUtils.join(patrolPhones,","));
-
- List<String> rectifyUserIds = Arrays.asList(comSwDangerReportVO.getRectifyPerson().split(","));
- List<String> rectifyPhones = new ArrayList<>();
- for (String userId : rectifyUserIds) {
- LoginUserInfoVO loginUserInfoVO = userService.getUserInfoByUserId(userId).getData();
- rectifyPhones.add(loginUserInfoVO.getPhone());
- }
- comSwDangerReportVO.setRectifyPersonPhone(StringUtils.join(rectifyPhones,","));
});
}
return R.ok(iPage);
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwPatrolRecordServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwPatrolRecordServiceImpl.java
index 47097d4..303b27f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwPatrolRecordServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwPatrolRecordServiceImpl.java
@@ -23,6 +23,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
import java.util.Date;
/**
@@ -71,6 +72,8 @@
BeanUtils.copyProperties(comSwPatrolRecordAddDTO, comSwPatrolRecordDO);
Long patrolRecordId = Snowflake.getId();
comSwPatrolRecordDO.setId(patrolRecordId);
+ comSwPatrolRecordDO.setPersonName(comSwPatrolRecordAddDTO.getPPersonName());
+ comSwPatrolRecordDO.setPersonPhone(comSwPatrolRecordAddDTO.getPPersonPhone());
comSwPatrolRecordDAO.insert(comSwPatrolRecordDO);
//巡查记录和关联报告信息
ComSwPatrolRecordReportDO comSwPatrolRecordReportDO = new ComSwPatrolRecordReportDO();
@@ -80,15 +83,19 @@
if (comSwPatrolRecordAddDTO.getIsHiddenDanger().intValue() == ComSwPatrolRecordAddDTO.isOk.yes) {
//如果存在安全隐患，自动生成安全隐患报告
ComSwDangerReportDO comSwDangerReportDO = new ComSwDangerReportDO();
- BeanUtils.copyProperties(comSwPatrolRecordAddDTO, comSwDangerReportDO);
Long dangerReportId = Snowflake.getId();
comSwDangerReportDO.setId(dangerReportId);
comSwPatrolRecordReportDO.setReportId(dangerReportId);
comSwDangerReportDO.setDangerType(comSwPatrolRecordAddDTO.getPatrolType());
if (comSwPatrolRecordAddDTO.getIsRectifyImmediately().intValue() == ComSwPatrolRecordAddDTO.isOk.yes && StringUtils.isNotEmpty(comSwPatrolRecordAddDTO.getTakeSteps())) {
comSwDangerReportDO.setStatus(String.valueOf(SafeWordStatusEnum.YZG.getCode()));
+ comSwDangerReportDO.setRectifyTime(new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
+ }else {
+ comSwDangerReportDO.setStatus(String.valueOf(SafeWordStatusEnum.DCL.getCode()));
}
- comSwDangerReportDO.setRectifyTime(new Date());
+ BeanUtils.copyProperties(comSwPatrolRecordAddDTO, comSwDangerReportDO);
+ comSwDangerReportDO.setPersonName(comSwPatrolRecordAddDTO.getDPersonName());
+ comSwDangerReportDO.setPersonPhone(comSwPatrolRecordAddDTO.getDPersonPhone());
comSwDangerReportDAO.insert(comSwDangerReportDO);
}else {
//不存在安全隐患，生成安全工作记录
@@ -127,4 +134,9 @@
}
return R.ok(comSwPatrolRecordVO);
}
+
+ @Override
+ public R patrolRecordStatistics(Long communityId) {
+ return R.ok(this.comSwSafetyWorkRecordDAO.patrolRecordStatistics(communityId));
+ }
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwRotaServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwRotaServiceImpl.java
new file mode 100644
index 0000000..e623c1a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwRotaServiceImpl.java
@@ -0,0 +1,151 @@
+package com.panzhihua.service_community.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.panzhihua.common.model.dtos.community.ComSwRotaPageDTO;
+import com.panzhihua.common.model.dtos.community.ComSwRotaSaveDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComSwPatrolRecordVO;
+import com.panzhihua.common.model.vos.community.ComSwRotaPersonVO;
+import com.panzhihua.common.model.vos.community.ComSwRotaVO;
+import com.panzhihua.common.model.vos.partybuilding.PartyBuildingComPbDynVO;
+import com.panzhihua.common.service.user.UserService;
+import com.panzhihua.common.utlis.Snowflake;
+import com.panzhihua.common.utlis.StringUtils;
+import com.panzhihua.service_community.dao.ComOpsAccUserDAO;
+import com.panzhihua.service_community.dao.ComSwRotaDAO;
+import com.panzhihua.service_community.model.dos.ComMngUserTagDO;
+import com.panzhihua.service_community.model.dos.ComSwRotaDO;
+import com.panzhihua.service_community.service.ComSwRotaService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @auther txb
+ * @create 2021-07-30 09:48:54
+ * @describe 社区》安全工作》值班表服务实现类
+ */
+@Slf4j
+@Service
+public class ComSwRotaServiceImpl extends ServiceImpl<ComSwRotaDAO, ComSwRotaDO> implements ComSwRotaService {
+
+ @Resource
+ private ComSwRotaDAO comSwRotaDAO;
+ @Resource
+ private UserService userService;
+
+ @Override
+ public R pageRota(ComSwRotaPageDTO comSwRotaPageDTO) {
+ Page page = new Page<>();
+ Long pageNum = comSwRotaPageDTO.getPageNum();
+ Long pageSize = comSwRotaPageDTO.getPageSize();
+ if (null == pageNum || 0 == pageNum) {
+ pageNum = 1L;
+ }
+ if (null == pageSize || 0 == pageSize) {
+ pageSize = 10L;
+ }
+ page.setSize(pageSize);
+ page.setCurrent(pageNum);
+
+ IPage<ComSwRotaVO> iPage = comSwRotaDAO.pageRota(page, comSwRotaPageDTO);
+ return R.ok(iPage);
+ }
+
+ @Override
+ public R addRota(List<ComSwRotaSaveDTO> comSwRotaSaveDTOs) {
+ comSwRotaSaveDTOs.forEach(comSwRotaSaveDTO -> {
+ try {
+ if (comSwRotaSaveDTO.getId() != null && comSwRotaSaveDTO.getId() != 0) {
+ ComSwRotaDO comSwRotaDO = new ComSwRotaDO();
+ BeanUtils.copyProperties(comSwRotaSaveDTO, comSwRotaDO);
+ comSwRotaDO.setRotaDate(new SimpleDateFormat("yyyy-MM-dd").parse(comSwRotaSaveDTO.getRotaDate()));
+ comSwRotaDAO.updateById(comSwRotaDO);
+ } else {
+ ComSwRotaDO comSwRotaDO = new ComSwRotaDO();
+ BeanUtils.copyProperties(comSwRotaSaveDTO, comSwRotaDO);
+ comSwRotaDO.setId(Snowflake.getId());
+ comSwRotaDO.setRotaDate(new SimpleDateFormat("yyyy-MM-dd").parse(comSwRotaSaveDTO.getRotaDate()));
+ comSwRotaDAO.insert(comSwRotaDO);
+ }
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ });
+ return R.ok();
+ }
+
+ @Override
+ public R deleteRota(List<Long> rotaIds) {
+ int delete = comSwRotaDAO.deleteBatchIds(rotaIds);
+ if (delete > 0) {
+ return R.ok();
+ }
+ return R.fail("删除失败");
+ }
+
+ @Override
+ public R getRotaPersonByDate(String rotaDate) {
+ ComSwRotaDO comSwRotaDO = new ComSwRotaDO();
+ try {
+ comSwRotaDO = comSwRotaDAO.selectOne(new QueryWrapper<ComSwRotaDO>().lambda().eq(ComSwRotaDO::getRotaDate, new SimpleDateFormat("yyyy-MM-dd").parse(rotaDate)));
+ }catch (ParseException e) {
+ e.printStackTrace();
+ }
+ List<ComSwRotaPersonVO> rotaPersons = new ArrayList<>();
+ if (null != comSwRotaDO){
+ String rotaPerson = comSwRotaDO.getRotaPerson();
+ String rotaPersonName = comSwRotaDO.getPersonName();
+ String[] rotaPersonArray = rotaPerson.split(",");
+ String[] rotaPersonNameArray = rotaPersonName.split(",");
+ for (int i = 0; i <= rotaPersonArray.length - 1; i++){
+ ComSwRotaPersonVO comSwRotaPersonVO = new ComSwRotaPersonVO();
+ comSwRotaPersonVO.setId(Long.valueOf(rotaPersonArray[i]));
+ comSwRotaPersonVO.setName(rotaPersonNameArray[i]);
+ rotaPersons.add(comSwRotaPersonVO);
+ }
+ }
+ return R.ok(rotaPersons);
+ }
+
+ @Override
+ public R getRotaLeaderByDate(String rotaDate) {
+ ComSwRotaDO comSwRotaDO = new ComSwRotaDO();
+ try {
+ comSwRotaDO = comSwRotaDAO.selectOne(new QueryWrapper<ComSwRotaDO>().lambda().eq(ComSwRotaDO::getRotaDate, new SimpleDateFormat("yyyy-MM-dd").parse(rotaDate)));
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ List<ComSwRotaPersonVO> rotaLeaders = new ArrayList<>();
+ if (null != comSwRotaDO){
+ String rotaPerson = comSwRotaDO.getRotaLeader();
+ String rotaPersonName = comSwRotaDO.getLeaderName();
+ String[] rotaPersonArray = rotaPerson.split(",");
+ String[] rotaPersonNameArray = rotaPersonName.split(",");
+ for (int i = 0; i <= rotaPersonArray.length - 1; i++){
+ ComSwRotaPersonVO comSwRotaPersonVO = new ComSwRotaPersonVO();
+ comSwRotaPersonVO.setId(Long.valueOf(rotaPersonArray[i]));
+ comSwRotaPersonVO.setName(rotaPersonNameArray[i]);
+ rotaLeaders.add(comSwRotaPersonVO);
+ }
+ }
+ return R.ok(rotaLeaders);
+ }
+
+ @Override
+ public R getTotlePerson(String param, Long communityId) {
+ return userService.listActivityManager(param,communityId);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwSafetyWorkRecordServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwSafetyWorkRecordServiceImpl.java
index e331396..323571f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwSafetyWorkRecordServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwSafetyWorkRecordServiceImpl.java
@@ -8,6 +8,7 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComSwPatrolRecordVO;
import com.panzhihua.common.model.vos.community.ComSwSafetyWorkRecordVO;
+import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.ComSwPatrolRecordDAO;
import com.panzhihua.service_community.dao.ComSwPatrolRecordReportDAO;
import com.panzhihua.service_community.dao.ComSwSafetyWorkRecordDAO;
@@ -20,6 +21,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
/**
* @auther txb
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwDangerReportMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwDangerReportMapper.xml
index bb722f8..5b976da 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwDangerReportMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwDangerReportMapper.xml
@@ -40,11 +40,10 @@
csdr.id,
cspr.community_id AS communityId,
cspr.patrol_time AS patrolTime,
- cspr.weather,
- cspr.temperature,
- cspr.wind,
cspr.patrol_type AS patrolType,
cspr.patrol_person AS patrolPerson,
+ cspr.person_name AS pPersonName,
+ cspr.person_phone AS pPersonPhone,
cspr.address,
cspr.record_content AS recordContent,
cspr.find_record AS findRecord,
@@ -63,6 +62,8 @@
csdr.take_steps AS takeSteps,
csdr.steps_photo AS stepsPhoto,
csdr.rectify_person AS rectifyPerson,
+ csdr.rectify_person AS dPatrolPerson,
+ csdr.person_name AS dPersonName,
csdr.rectify_time AS rectifyTime,
csdr.community_suggestion AS communitySuggestion,
csdr.street_suggestion AS streetSuggestion,
@@ -86,11 +87,11 @@
<if test='comSwPatrolRecordDTO.status != null and comSwPatrolRecordDTO.status != ""'>
AND cspr.patrol_type = #{comSwPatrolRecordDTO.patrolType}
</if>
- <if test='comSwPatrolRecordDTO.patrolAtBegin != null '>
- AND cspr.patrol_time <![CDATA[ >= ]]> #{comSwPatrolRecordDTO.patrolTime}
+ <if test='comSwPatrolRecordDTO.patrolAtBegin != null and comSwPatrolRecordDTO.patrolAtBegin != ""'>
+ AND cspr.patrol_time <![CDATA[ >= ]]> #{comSwPatrolRecordDTO.patrolAtBegin}
</if>
- <if test='comSwPatrolRecordDTO.patrolAtEnd != null '>
- AND cspr.patrol_time <![CDATA[ <= ]]> #{comSwPatrolRecordDTO.patrolTime}
+ <if test='comSwPatrolRecordDTO.patrolAtEnd != null and comSwPatrolRecordDTO.patrolAtEnd != ""'>
+ AND cspr.patrol_time <![CDATA[ <= ]]> #{comSwPatrolRecordDTO.patrolAtEnd}
</if>
</where>
order by csdr.create_at desc
@@ -101,9 +102,6 @@
csdr.id,
cspr.community_id AS communityId,
cspr.patrol_time AS patrolTime,
- cspr.weather,
- cspr.temperature,
- cspr.wind,
cspr.patrol_type AS patrolType,
cspr.patrol_person AS patrolPerson,
cspr.address,
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwPatrolRecordMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwPatrolRecordMapper.xml
index 3a5fcd3..fee9db0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwPatrolRecordMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwPatrolRecordMapper.xml
@@ -7,9 +7,6 @@
<id column="id" property="id" />
<result column="community_id" property="communityId" />
<result column="patrol_time" property="patrolTime" />
- <result column="weather" property="weather" />
- <result column="temperature" property="temperature" />
- <result column="wind" property="wind" />
<result column="patrol_type" property="patrolType" />
<result column="patrol_leader" property="patrolLeader" />
<result column="patrol_person" property="patrolPerson" />
@@ -30,7 +27,7 @@
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
- id, community_id, patrol_time, weather, temperature, wind, patrol_type, patrol_leader, patrol_person, address, record_content, find_record, record_photo, remark, succession_leader, succession_person, succession_time, is_hidden_danger, create_at, create_by, update_at, update_by
+ id, community_id, patrol_time, patrol_type, patrol_leader, patrol_person, address, record_content, find_record, record_photo, remark, succession_leader, succession_person, succession_time, is_hidden_danger, create_at, create_by, update_at, update_by
</sql>
<select id="pagePatrolRecord" resultType="com.panzhihua.common.model.vos.community.ComSwPatrolRecordVO">
@@ -38,11 +35,10 @@
cspr.id,
cspr.community_id AS communityId,
cspr.patrol_time AS patrolTime,
- cspr.weather,
- cspr.temperature,
- cspr.wind,
cspr.patrol_type AS patrolType,
cspr.patrol_person AS patrolPerson,
+ cspr.person_name AS personName,
+ cspr.person_phone AS personPhone,
cspr.address,
cspr.record_content AS recordContent,
cspr.find_record AS findRecord,
@@ -66,11 +62,11 @@
<if test='comSwPatrolRecordDTO.patrolType != null and comSwPatrolRecordDTO.patrolType != ""'>
AND cspr.patrol_type = #{comSwPatrolRecordDTO.patrolType}
</if>
- <if test='comSwPatrolRecordDTO.patrolAtBegin != null '>
- AND cspr.patrol_time <![CDATA[ >= ]]> #{comSwPatrolRecordDTO.patrolTime}
+ <if test='comSwPatrolRecordDTO.patrolAtBegin != null and comSwPatrolRecordDTO.patrolAtBegin != ""'>
+ AND cspr.patrol_time <![CDATA[ >= ]]> #{comSwPatrolRecordDTO.patrolAtBegin}
</if>
- <if test='comSwPatrolRecordDTO.patrolAtEnd != null '>
- AND cspr.patrol_time <![CDATA[ <= ]]> #{comSwPatrolRecordDTO.patrolTime}
+ <if test='comSwPatrolRecordDTO.patrolAtEnd != null and comSwPatrolRecordDTO.patrolAtEnd != ""'>
+ AND cspr.patrol_time <![CDATA[ <= ]]> #{comSwPatrolRecordDTO.patrolAtEnd}
</if>
</where>
order by cspr.create_at desc
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwRotaMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwRotaMapper.xml
new file mode 100644
index 0000000..92a514c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwRotaMapper.xml
@@ -0,0 +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.panzhihua.service_community.dao.ComSwRotaDAO">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ComSwRotaDO">
+ <id column="id" property="id" />
+ <result column="community_id" property="communityId" />
+ <result column="rota_date" property="rotaDate" />
+ <result column="rota_leader" property="rotaLeader" />
+ <result column="leader_phone" property="leaderPhone" />
+ <result column="rota_person" property="rotaPerson" />
+ <result column="person_phone" property="personPhone" />
+ <result column="create_at" property="createAt" />
+ <result column="create_by" property="createBy" />
+ <result column="update_at" property="updateAt" />
+ <result column="update_by" property="updateBy" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, community_id, rota_date, rota_leader, leader_phone, rota_person, person_phone, create_at, create_by, update_at, update_by
+ </sql>
+
+ <select id="pageRota" resultType="com.panzhihua.common.model.vos.community.ComSwRotaVO">
+ SELECT
+ csr.id,
+ csr.community_id,
+ csr.rota_date,
+ csr.rota_leader,
+ csr.leader_name,
+ csr.leader_phone,
+ csr.rota_person,
+ csr.person_name,
+ csr.person_phone
+ FROM
+ com_sw_rota csr
+ where csr.community_id = #{comSwRotaPageDTO.communityId}
+ <if test='comSwRotaPageDTO.rotaPerson != null and comSwRotaPageDTO.rotaPerson != ""'>
+ AND csr.rota_person LIKE concat('%',#{comSwRotaPageDTO.rotaPerson},'%')
+ </if>
+ <if test='comSwRotaPageDTO.phone != null and comSwRotaPageDTO.phone != ""'>
+ AND csr.person_phone LIKE concat('%',#{comSwRotaPageDTO.phone},'%')
+ </if>
+ order by csr.create_at desc
+ </select>
+</mapper>
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwSafetyWorkRecordMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwSafetyWorkRecordMapper.xml
index 88b3522..cf15c81 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwSafetyWorkRecordMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwSafetyWorkRecordMapper.xml
@@ -22,9 +22,6 @@
csswr.id,
cspr.community_id AS communityId,
cspr.patrol_time AS patrolTime,
- cspr.weather,
- cspr.temperature,
- cspr.wind,
cspr.patrol_type AS patrolType,
cspr.patrol_person AS patrolPerson,
cspr.address,
@@ -48,15 +45,22 @@
<if test='comSwPatrolRecordDTO.patrolType != null and comSwPatrolRecordDTO.patrolType != ""'>
AND cspr.patrol_type = #{comSwPatrolRecordDTO.patrolType}
</if>
- <if test='comSwPatrolRecordDTO.patrolAtBegin != null '>
- AND cspr.patrol_time <![CDATA[ >= ]]> #{comSwPatrolRecordDTO.patrolTime}
+ <if test='comSwPatrolRecordDTO.patrolAtBegin != null and comSwPatrolRecordDTO.patrolAtBegin != ""'>
+ AND cspr.patrol_time <![CDATA[ >= ]]> #{comSwPatrolRecordDTO.patrolAtBegin}
</if>
- <if test='comSwPatrolRecordDTO.patrolAtEnd != null '>
- AND cspr.patrol_time <![CDATA[ <= ]]> #{comSwPatrolRecordDTO.patrolTime}
+ <if test='comSwPatrolRecordDTO.patrolAtEnd != null and comSwPatrolRecordDTO.patrolAtEnd != ""'>
+ AND cspr.patrol_time <![CDATA[ <= ]]> #{comSwPatrolRecordDTO.patrolAtEnd}
</if>
</where>
order by csswr.create_at desc
</select>
+ <select id="patrolRecordStatistics" resultType="com.panzhihua.common.model.vos.community.ComSwPatrolRecordStatisticsVO">
+ select count(id) as patrolRecordTotal
+ ,(select count(id) from com_sw_patrol_record where community_id = #{communityId} and patrol_type = 1) as huoTotal
+ ,(select count(id) from com_sw_patrol_record where community_id = #{communityId} and patrol_type = 2) as xunTotal
+ ,(select count(id) from com_sw_patrol_record where community_id = #{communityId} and patrol_type = 3) as yiTotal
+ from com_sw_patrol_record as cmp where community_id = #{communityId}
+ </select>
</mapper>
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/ServiceDangjianApplication.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/ServiceDangjianApplication.java
index e455483..5f90736 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/ServiceDangjianApplication.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/ServiceDangjianApplication.java
@@ -4,11 +4,13 @@
import org.springframework.cloud.client.SpringCloudApplication;
import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.context.annotation.ComponentScan;
@SpringCloudApplication
@EnableEurekaClient
@EnableCircuitBreaker
+@EnableFeignClients(basePackages = {"com.panzhihua.common.service"})
@ComponentScan({"com.panzhihua.service_dangjian","com.panzhihua.common"})
public class ServiceDangjianApplication {
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java
index 603bf22..bc4cafd 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java
@@ -6,6 +6,7 @@
import com.panzhihua.common.model.dtos.partybuilding.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.partybuilding.*;
+import com.panzhihua.common.service.partybuilding.PartyBuildingService;
import com.panzhihua.service_dangjian.dao.ComPbOrgDAO;
import com.panzhihua.service_dangjian.model.dos.ComPbMemberDO;
import com.panzhihua.service_dangjian.model.dos.ComPbOrgDO;
@@ -13,6 +14,7 @@
import com.panzhihua.service_dangjian.service.ComPbMemberService;
import com.panzhihua.service_dangjian.service.ComPbServiceTeamService;
import com.panzhihua.service_dangjian.service.PartyOrganizationService;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
@@ -40,6 +42,8 @@
private ComPbServiceTeamService comPbServiceTeamService;
@Resource
private ComPbOrgDAO comPbOrgDAO;
+ @Resource
+ private PartyBuildingService partyBuildingService;
/**
* 社区所有启用的党组织列表
@@ -570,4 +574,14 @@
public R exportPbMember(@RequestBody PagePartyOrganizationVO organizationVO){
return comPbMemberService.exportPbMember(organizationVO);
}
+
+ /**
+ * 选择人员
+ * @param param 查询条件
+ * @return 查询结果
+ */
+ @PostMapping("getTotlePerson")
+ public R getTotlePerson(@RequestParam(value = "param", required = false) String param, @RequestParam(value = "communityId") Long communityId){
+ return comPbServiceTeamService.getTotlePerson(param,communityId);
+ }
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbServiceTeamDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbServiceTeamDAO.java
index 505ee70..4f2cbec 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbServiceTeamDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbServiceTeamDAO.java
@@ -12,6 +12,8 @@
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
+import java.util.List;
+
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
* @description: 服务团队
@@ -39,4 +41,16 @@
IPage<ComPbServiceTeamVO> PageComPbServiceTeamDTO(Page page, @Param("pageComPbServiceTeamDTO") PageComPbServiceTeamDTO pageComPbServiceTeamDTO);
@Select("select * from com_pb_service_team where id=#{id}")
ComPbServiceTeamDO selectComPbServiceTeamById(@Param("id")Long id);
+
+ @Select("<script> " +
+ "SELECT\n" +
+ "* \n" +
+ "FROM\n" +
+ "com_pb_service_team \n" +
+ " where community_id=#{communityId}" +
+ "<if test='param != null and param != ""'>" +
+ " and name LIKE concat( #{param}, '%' ) \n" +
+ " </if> " +
+ "</script>")
+ List<ComPbServiceTeamVO> getTotlePerson(@Param("param") String param, @Param("communityId") Long communityId);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComPbServiceTeamService.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComPbServiceTeamService.java
index c71e31a..700d226 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComPbServiceTeamService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComPbServiceTeamService.java
@@ -3,6 +3,8 @@
import com.panzhihua.common.model.dtos.partybuilding.ComPbServiceTeamDTO;
import com.panzhihua.common.model.dtos.partybuilding.PageComPbServiceTeamDTO;
import com.panzhihua.common.model.vos.R;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -36,4 +38,11 @@
* @return 删除结果
*/
R deleteServiceTeam(ComPbServiceTeamDTO comPbServiceTeamDTO);
+
+ /**
+ * 选择人员
+ * @param param 查询条件
+ * @return 查询结果
+ */
+ R getTotlePerson(String param,Long communityId);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbServiceTeamServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbServiceTeamServiceImpl.java
index 2873b98..d19a1a6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbServiceTeamServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbServiceTeamServiceImpl.java
@@ -20,6 +20,8 @@
import org.springframework.util.ObjectUtils;
import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -134,4 +136,10 @@
}
return R.fail();
}
+
+ @Override
+ public R getTotlePerson(String param, Long communityId) {
+ List<ComPbServiceTeamVO> comPbServiceTeamVOS = comPbServiceTeamDAO.getTotlePerson(param, communityId);
+ return R.ok(comPbServiceTeamVOS);
+ }
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
index 5ebcb3e..a18c5b9 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
@@ -14,6 +14,7 @@
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.common.model.vos.user.*;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
@@ -471,4 +472,5 @@
R getGridIsOk(Long userId);
R getGridsMemberList(Long communityId);
+
}
--
Gitblit v1.7.1