diff --git a/pom.xml b/pom.xml index 662d500..f3c6cbe 100644 --- a/pom.xml +++ b/pom.xml @@ -431,7 +431,9 @@ dev - + + true + @@ -453,9 +455,7 @@ prod - - true - + diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/config/MvcConfig.java b/sa-admin/src/main/java/net/lab1024/sa/admin/config/MvcConfig.java index c8f654c..c38fe9b 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/config/MvcConfig.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/config/MvcConfig.java @@ -36,18 +36,18 @@ public class MvcConfig implements WebMvcConfigurer { registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/"); } - @Override - public void addCorsMappings(CorsRegistry registry) { - registry.addMapping("/**") // 匹配所有的路径 - .allowCredentials(true) // 设置允许凭证 - .allowedHeaders("*") // 设置请求头 - .allowedMethods("GET", "POST", "PUT", "DELETE") // 设置允许的方式 - .allowedOriginPatterns("*"); - } - - @Override - public void configurePathMatch(PathMatchConfigurer configurer) { - configurer - .addPathPrefix("/village",c -> c.isAnnotationPresent(RestController.class)); - } +// @Override +// public void addCorsMappings(CorsRegistry registry) { +// registry.addMapping("/**") // 匹配所有的路径 +// .allowCredentials(true) // 设置允许凭证 +// .allowedHeaders("*") // 设置请求头 +// .allowedMethods("GET", "POST", "PUT", "DELETE") // 设置允许的方式 +// .allowedOriginPatterns("*"); +// } +// +// @Override +// public void configurePathMatch(PathMatchConfigurer configurer) { +// configurer +// .addPathPrefix("/village",c -> c.isAnnotationPresent(RestController.class)); +// } } diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/controller/VillageIntroduceController.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/controller/VillageIntroduceController.java index eea201a..678355f 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/controller/VillageIntroduceController.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/controller/VillageIntroduceController.java @@ -1,5 +1,6 @@ package net.lab1024.sa.admin.module.business.affairs.controller; +import net.lab1024.sa.admin.module.business.affairs.domain.entity.VillageIntroduceEntity; import net.lab1024.sa.admin.module.business.affairs.domain.form.VillageIntroduceAddForm; import net.lab1024.sa.admin.module.business.affairs.domain.form.VillageIntroduceQueryForm; import net.lab1024.sa.admin.module.business.affairs.domain.form.VillageIntroduceUpdateForm; @@ -69,4 +70,11 @@ public class VillageIntroduceController { public ResponseDTO batchDelete(@PathVariable Long introduceId) { return villageIntroduceService.delete(introduceId); } + + @Operation(summary = "单个查询 @author pengjie") + @GetMapping("/villageIntroduce/queryById/{villageId}") + @SaCheckPermission("villageIntroduce:query") + public ResponseDTO queryById(@PathVariable Integer villageId) { + return villageIntroduceService.queryById(villageId); + } } diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/controller/VillageMailController.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/controller/VillageMailController.java index 492ce94..7580e91 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/controller/VillageMailController.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/controller/VillageMailController.java @@ -19,6 +19,7 @@ import io.swagger.v3.oas.annotations.Operation; import javax.annotation.Resource; import javax.validation.Valid; +import java.util.Map; /** * 内部邮件 Controller @@ -76,4 +77,18 @@ public class VillageMailController { public ResponseDTO batchDelete(@PathVariable Long mailId) { return villageMailService.delete(mailId); } + + @Operation(summary = "单个删除 @author pengjie") + @GetMapping("/villageMail/queryById/{mailId}") + @SaCheckPermission("villageMail:query") + public ResponseDTO queryById(@PathVariable Long mailId) { + return villageMailService.queryById(mailId); + } + + @Operation(summary = "查询已读未读数量 @author pengjie") + @GetMapping("/villageMail/queryState") + @SaCheckPermission("villageMail:query") + public ResponseDTO> queryState() { + return villageMailService.queryState(); + } } diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/dao/VillageMailDao.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/dao/VillageMailDao.java index 3b13bc8..94455fd 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/dao/VillageMailDao.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/dao/VillageMailDao.java @@ -31,4 +31,5 @@ public interface VillageMailDao extends BaseMapper { */ List queryPage(Page page, @Param("queryForm") VillageMailQueryForm queryForm); + VillageMailVO queryById(@Param("id") Long id); } diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/domain/entity/AffairsEntity.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/domain/entity/AffairsEntity.java index 85127f1..132204d 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/domain/entity/AffairsEntity.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/domain/entity/AffairsEntity.java @@ -34,7 +34,7 @@ public class AffairsEntity { private Integer type; /** - * 可见范围类型(1:人员;2:部门) + * 可见范围类型(1:人员;2:部门;3:全部可见) */ private Integer rangeType; diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/domain/form/AffairsAddForm.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/domain/form/AffairsAddForm.java index 9b09615..e930228 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/domain/form/AffairsAddForm.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/domain/form/AffairsAddForm.java @@ -20,7 +20,7 @@ public class AffairsAddForm { @Schema(description = "类型") private Integer type; - @Schema(description = "可见范围类型(1:人员;2:组织)") + @Schema(description = "可见范围类型(1:人员;2:组织;3:全部可见)") private Integer rangeType; @Schema(description = "发布范围") diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/domain/form/AffairsUpdateForm.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/domain/form/AffairsUpdateForm.java index ad5a618..8ee001b 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/domain/form/AffairsUpdateForm.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/domain/form/AffairsUpdateForm.java @@ -25,7 +25,7 @@ public class AffairsUpdateForm { @Schema(description = "类型") private Integer type; - @Schema(description = "可见范围类型(1:人员;2:组织)") + @Schema(description = "可见范围类型(1:人员;2:组织;3:全部可见)") private Integer rangeType; @Schema(description = "发布范围") diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/domain/form/VillageMailQueryForm.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/domain/form/VillageMailQueryForm.java index 0b8678f..6179455 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/domain/form/VillageMailQueryForm.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/domain/form/VillageMailQueryForm.java @@ -26,4 +26,10 @@ public class VillageMailQueryForm extends PageParam { @Schema(description = "主题") private String title; + @Schema(description = "阅读状态(0：未读；1：已读)") + private String state; + + @Schema(description = "是否设为星标(0/1)") + private String asterisk; + } diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/domain/vo/AffairsVO.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/domain/vo/AffairsVO.java index 73af451..6b00380 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/domain/vo/AffairsVO.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/domain/vo/AffairsVO.java @@ -27,7 +27,7 @@ public class AffairsVO { @Schema(description = "类型") private Integer type; - @Schema(description = "可见范围类型(1:人员;2:组织)") + @Schema(description = "可见范围类型(1:人员;2:组织;3:全部可见)") private Integer rangeType; @Schema(description = "发布范围") diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/domain/vo/VillageMailVO.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/domain/vo/VillageMailVO.java index 73eda66..92a9ab4 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/domain/vo/VillageMailVO.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/domain/vo/VillageMailVO.java @@ -53,6 +53,7 @@ public class VillageMailVO { private String createByName; @Schema(description = "创建人头像") + @JsonSerialize(using = FileKeyVoSerializer.class) private String createByAvatar; @Schema(description = "更新时间") diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/service/AffairsService.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/service/AffairsService.java index 1498403..94385de 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/service/AffairsService.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/service/AffairsService.java @@ -61,7 +61,7 @@ public class AffairsService { list = affairsDao.queryPage(page, queryForm); } else { list = affairsDao.queryPage(queryForm); - list = list.stream().filter(l -> (StringUtils.isBlank(l.getRangeInfo()) && l.getRangeType() == null) + list = list.stream().filter(l -> (StringUtils.isBlank(l.getRangeInfo()) && l.getRangeType() == 3) || (l.getRangeInfo().contains(requestUser.getUserId().toString()) && l.getRangeType() == 1) || (l.getRangeInfo().contains(String.valueOf(requestUser.getDepartmentId())) && l.getRangeType() == 2)) .collect(Collectors.toList()); diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/service/FundInfoService.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/service/FundInfoService.java index 26761e0..9ff6805 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/service/FundInfoService.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/service/FundInfoService.java @@ -12,6 +12,7 @@ import net.lab1024.sa.base.common.util.SmartPageUtil; import net.lab1024.sa.base.common.domain.ResponseDTO; import net.lab1024.sa.base.common.domain.PageResult; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import net.lab1024.sa.base.common.util.SmartRequestUtil; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; @@ -49,6 +50,7 @@ public class FundInfoService { */ public ResponseDTO add(FundInfoAddForm addForm) { FundInfoEntity fundInfoEntity = SmartBeanUtil.copy(addForm, FundInfoEntity.class); + fundInfoEntity.setCreateBy(SmartRequestUtil.getRequestUserId().toString()); fundInfoDao.insert(fundInfoEntity); return ResponseDTO.ok(); } diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/service/PropertyInfoService.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/service/PropertyInfoService.java index 123d4da..7c349e0 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/service/PropertyInfoService.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/service/PropertyInfoService.java @@ -15,6 +15,7 @@ import net.lab1024.sa.base.common.util.SmartPageUtil; import net.lab1024.sa.base.common.domain.ResponseDTO; import net.lab1024.sa.base.common.domain.PageResult; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import net.lab1024.sa.base.common.util.SmartRequestUtil; import net.lab1024.sa.base.module.support.dict.domain.vo.DictValueVO; import net.lab1024.sa.base.module.support.dict.service.DictCacheService; import org.apache.commons.collections4.CollectionUtils; @@ -58,6 +59,7 @@ public class PropertyInfoService { */ public ResponseDTO add(PropertyInfoAddForm addForm) { PropertyInfoEntity propertyInfoEntity = SmartBeanUtil.copy(addForm, PropertyInfoEntity.class); + propertyInfoEntity.setCreateBy(SmartRequestUtil.getRequestUserId().toString()); propertyInfoDao.insert(propertyInfoEntity); return ResponseDTO.ok(); } diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/service/ResourceInfoService.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/service/ResourceInfoService.java index 0369b1f..16c4f42 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/service/ResourceInfoService.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/service/ResourceInfoService.java @@ -17,6 +17,7 @@ import net.lab1024.sa.base.common.util.SmartPageUtil; import net.lab1024.sa.base.common.domain.ResponseDTO; import net.lab1024.sa.base.common.domain.PageResult; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import net.lab1024.sa.base.common.util.SmartRequestUtil; import net.lab1024.sa.base.module.support.dict.domain.vo.DictValueVO; import net.lab1024.sa.base.module.support.dict.service.DictCacheService; import org.apache.commons.collections4.CollectionUtils; @@ -60,6 +61,7 @@ public class ResourceInfoService { */ public ResponseDTO add(ResourceInfoAddForm addForm) { ResourceInfoEntity resourceInfoEntity = SmartBeanUtil.copy(addForm, ResourceInfoEntity.class); + resourceInfoEntity.setCreateBy(SmartRequestUtil.getRequestUserId().toString()); resourceInfoDao.insert(resourceInfoEntity); return ResponseDTO.ok(); } diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/service/VillageFrameworkService.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/service/VillageFrameworkService.java index f9860fe..6fc8d73 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/service/VillageFrameworkService.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/service/VillageFrameworkService.java @@ -12,6 +12,7 @@ import net.lab1024.sa.base.common.util.SmartPageUtil; import net.lab1024.sa.base.common.domain.ResponseDTO; import net.lab1024.sa.base.common.domain.PageResult; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import net.lab1024.sa.base.common.util.SmartRequestUtil; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; @@ -49,6 +50,7 @@ public class VillageFrameworkService { */ public ResponseDTO add(VillageFrameworkAddForm addForm) { VillageFrameworkEntity villageFrameworkEntity = SmartBeanUtil.copy(addForm, VillageFrameworkEntity.class); + villageFrameworkEntity.setCreateBy(SmartRequestUtil.getRequestUserId().toString()); villageFrameworkDao.insert(villageFrameworkEntity); return ResponseDTO.ok(); } diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/service/VillageIntroduceService.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/service/VillageIntroduceService.java index e87ed75..76c48b6 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/service/VillageIntroduceService.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/service/VillageIntroduceService.java @@ -58,6 +58,7 @@ public class VillageIntroduceService { return ResponseDTO.error(UserErrorCode.ALREADY_EXIST, "已存在乡村介绍信息"); } VillageIntroduceEntity villageIntroduceEntity = SmartBeanUtil.copy(addForm, VillageIntroduceEntity.class); + villageIntroduceEntity.setCreateBy(SmartRequestUtil.getRequestUserId().toString()); villageIntroduceDao.insert(villageIntroduceEntity); return ResponseDTO.ok(); } @@ -100,4 +101,15 @@ public class VillageIntroduceService { villageIntroduceDao.deleteById(introduceId); return ResponseDTO.ok(); } + + /** + * 单个查询 + */ + public ResponseDTO queryById(Integer villageId) { + if (null == villageId){ + return ResponseDTO.ok(); + } + + return ResponseDTO.ok(villageIntroduceDao.selectOne(Wrappers.lambdaQuery().eq(VillageIntroduceEntity::getVillageId, villageId))); + } } diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/service/VillageMailService.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/service/VillageMailService.java index bb4d908..270d6a9 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/service/VillageMailService.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/affairs/service/VillageMailService.java @@ -1,7 +1,9 @@ package net.lab1024.sa.admin.module.business.affairs.service; import java.util.Arrays; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -22,7 +24,10 @@ import net.lab1024.sa.base.common.domain.ResponseDTO; import net.lab1024.sa.base.common.domain.PageResult; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import net.lab1024.sa.base.common.util.SmartRequestUtil; +import net.lab1024.sa.base.module.support.file.service.IFileStorageService; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.BooleanUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -47,6 +52,9 @@ public class VillageMailService { @Resource private EmployeeDao employeeDao; + @Resource + private IFileStorageService fileStorageService; + /** * 分页查询 * @@ -128,6 +136,28 @@ public class VillageMailService { return ResponseDTO.ok(); } + /** + * 单个查询 + */ + public ResponseDTO queryById(Long mailId) { + if (null == mailId){ + return ResponseDTO.ok(); + } + return ResponseDTO.ok(villageMailDao.queryById(mailId)); + } + + /** + * 查询已读未读数量 + */ + public ResponseDTO> queryState() { + Map map = new HashMap<>(); + String userId = SmartRequestUtil.getRequestUserId().toString(); + map.put("read", villageMailDao.selectCount(Wrappers.lambdaQuery().eq(VillageMailEntity::getRecipient, userId).eq(VillageMailEntity::getState, 1))); + map.put("unRead", villageMailDao.selectCount(Wrappers.lambdaQuery().eq(VillageMailEntity::getRecipient, userId).eq(VillageMailEntity::getState, 0))); + return ResponseDTO.ok(map); + } + + // private void build(List list) { // List employeeEntities = employeeDao.selectList(null); // for (VillageMailVO villageMailVO : list) { diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/event/domain/entity/EventDraftEntity.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/event/domain/entity/EventDraftEntity.java index 5e0946d..5640287 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/event/domain/entity/EventDraftEntity.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/event/domain/entity/EventDraftEntity.java @@ -29,6 +29,20 @@ public class EventDraftEntity { */ private String address; + /** + * 位置 + */ + private String addressName; + + /** + * 纬度 + */ + private String latitude; + /** + * 经度 + */ + private String longitude; + /** * 发生日期 */ diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/event/domain/form/EventDraftAddForm.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/event/domain/form/EventDraftAddForm.java index 0ae63c8..1b031d0 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/event/domain/form/EventDraftAddForm.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/event/domain/form/EventDraftAddForm.java @@ -18,6 +18,15 @@ public class EventDraftAddForm { @Schema(description = "详细位置") private String address; + @Schema(description = "位置") + private String addressName; + + @Schema(description = "纬度") + private String latitude; + + @Schema(description = "经度") + private String longitude; + @Schema(description = "发生日期") private LocalDate happenTime; diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/event/domain/form/EventDraftUpdateForm.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/event/domain/form/EventDraftUpdateForm.java index 927712e..92309e1 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/event/domain/form/EventDraftUpdateForm.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/event/domain/form/EventDraftUpdateForm.java @@ -23,6 +23,15 @@ public class EventDraftUpdateForm { @Schema(description = "详细位置") private String address; + @Schema(description = "位置") + private String addressName; + + @Schema(description = "纬度") + private String latitude; + + @Schema(description = "经度") + private String longitude; + @Schema(description = "发生日期") private LocalDate happenTime; diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/event/domain/vo/EventDraftVO.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/event/domain/vo/EventDraftVO.java index a250b90..54b945f 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/event/domain/vo/EventDraftVO.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/event/domain/vo/EventDraftVO.java @@ -23,6 +23,15 @@ public class EventDraftVO { @Schema(description = "详细位置") private String address; + @Schema(description = "位置") + private String addressName; + + @Schema(description = "纬度") + private String latitude; + + @Schema(description = "经度") + private String longitude; + @Schema(description = "发生日期") private LocalDate happenTime; diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/livelihood/controller/SurveyAnswerController.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/livelihood/controller/SurveyAnswerController.java index 3d65a91..c6fd9f8 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/livelihood/controller/SurveyAnswerController.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/livelihood/controller/SurveyAnswerController.java @@ -2,6 +2,7 @@ package net.lab1024.sa.admin.module.business.livelihood.controller; import net.lab1024.sa.admin.module.business.livelihood.domain.form.SurveyAnswerAddForm; import net.lab1024.sa.admin.module.business.livelihood.domain.form.SurveyAnswerQueryForm; +import net.lab1024.sa.admin.module.business.livelihood.domain.form.SurveyAnswerSubmit; import net.lab1024.sa.admin.module.business.livelihood.domain.form.SurveyAnswerUpdateForm; import net.lab1024.sa.admin.module.business.livelihood.domain.vo.SurveyAnswerVO; import net.lab1024.sa.admin.module.business.livelihood.service.SurveyAnswerService; @@ -64,4 +65,10 @@ public class SurveyAnswerController { public ResponseDTO batchDelete(@PathVariable Long answerId) { return surveyAnswerService.delete(answerId); } + + @Operation(summary = "提交 @author pengjie") + @PostMapping("/surveyAnswer/submit") + public ResponseDTO submit(@RequestBody @Valid SurveyAnswerSubmit surveyAnswerSubmit) { + return surveyAnswerService.submit(surveyAnswerSubmit); + } } diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/livelihood/domain/form/SurveyAnswerQuestionSubmit.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/livelihood/domain/form/SurveyAnswerQuestionSubmit.java new file mode 100644 index 0000000..5781d11 --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/livelihood/domain/form/SurveyAnswerQuestionSubmit.java @@ -0,0 +1,29 @@ +package net.lab1024.sa.admin.module.business.livelihood.domain.form; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import net.lab1024.sa.admin.module.business.livelihood.domain.entity.SurveyOptionEntity; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * 民意调研问题提交 + * + * @Author pengjie + * @Date 2025-08-04 16:28:17 + * @Copyright jxj + */ + +@Data +public class SurveyAnswerQuestionSubmit { + + @Schema(description = "民意调研问题ID") + private Long questionId; + + @Schema(description = "题目类型(1:单选;2:多选;3:简答)") + private Integer type; + + @Schema(description = "选项,多选逗号隔开") + private String options; +} \ No newline at end of file diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/livelihood/domain/form/SurveyAnswerSubmit.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/livelihood/domain/form/SurveyAnswerSubmit.java new file mode 100644 index 0000000..064d149 --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/livelihood/domain/form/SurveyAnswerSubmit.java @@ -0,0 +1,25 @@ +package net.lab1024.sa.admin.module.business.livelihood.domain.form; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import net.lab1024.sa.admin.module.business.livelihood.domain.entity.SurveyQuestionEntity; + +import java.util.List; + +/** + * 民意调研结果提交 + * + * @Author pengjie + * @Date 2025-08-02 17:25:41 + * @Copyright jxj + */ + +@Data +public class SurveyAnswerSubmit { + + @Schema(description = "民意调研ID") + private Long surveyId; + + @Schema(description = "民意调研问题ID") + private List questionSubmitList; +} \ No newline at end of file diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/livelihood/domain/vo/SurveyVO.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/livelihood/domain/vo/SurveyVO.java index c5d1be1..2dca933 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/livelihood/domain/vo/SurveyVO.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/livelihood/domain/vo/SurveyVO.java @@ -46,6 +46,9 @@ public class SurveyVO { @Schema(description = "参与人数") private Integer joinNum; + @Schema(description = "当前账号是否参与") + private Integer joinFlag; + @Schema(description = "绑定的题目ID") private String questionId; diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/livelihood/service/SurveyAnswerService.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/livelihood/service/SurveyAnswerService.java index 9e1440b..5c6860e 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/livelihood/service/SurveyAnswerService.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/livelihood/service/SurveyAnswerService.java @@ -1,12 +1,14 @@ package net.lab1024.sa.admin.module.business.livelihood.service; +import java.util.ArrayList; import java.util.List; import net.lab1024.sa.admin.module.business.livelihood.dao.SurveyAnswerDao; import net.lab1024.sa.admin.module.business.livelihood.domain.entity.SurveyAnswerEntity; -import net.lab1024.sa.admin.module.business.livelihood.domain.form.SurveyAnswerAddForm; -import net.lab1024.sa.admin.module.business.livelihood.domain.form.SurveyAnswerQueryForm; -import net.lab1024.sa.admin.module.business.livelihood.domain.form.SurveyAnswerUpdateForm; +import net.lab1024.sa.admin.module.business.livelihood.domain.form.*; import net.lab1024.sa.admin.module.business.livelihood.domain.vo.SurveyAnswerVO; +import net.lab1024.sa.admin.module.business.livelihood.manager.SurveyAnswerManager; +import net.lab1024.sa.admin.module.business.livelihood.manager.SurveyManager; +import net.lab1024.sa.base.common.domain.RequestUser; import net.lab1024.sa.base.common.util.SmartBeanUtil; import net.lab1024.sa.base.common.util.SmartPageUtil; import net.lab1024.sa.base.common.domain.ResponseDTO; @@ -32,6 +34,9 @@ public class SurveyAnswerService { @Resource private SurveyAnswerDao surveyAnswerDao; + @Resource + private SurveyAnswerManager surveyAnswerManager; + /** * 分页查询 * @@ -93,4 +98,25 @@ public class SurveyAnswerService { surveyAnswerDao.deleteById(answerId); return ResponseDTO.ok(); } + + /** + * 提交 + */ + public ResponseDTO submit(SurveyAnswerSubmit surveyAnswerSubmit) { + RequestUser requestUserId = SmartRequestUtil.getRequestUser(); + List list = new ArrayList<>(); + List questionSubmitList = surveyAnswerSubmit.getQuestionSubmitList(); + for (SurveyAnswerQuestionSubmit surveyAnswerQuestionSubmit : questionSubmitList) { + SurveyAnswerEntity surveyAnswerEntity = new SurveyAnswerEntity(); + surveyAnswerEntity.setSurveyId(surveyAnswerSubmit.getSurveyId()); + surveyAnswerEntity.setSurveyQuestionId(surveyAnswerQuestionSubmit.getQuestionId()); + surveyAnswerEntity.setSurveyOptionId(surveyAnswerQuestionSubmit.getOptions()); + surveyAnswerEntity.setAnswerPersonId(requestUserId.getUserId()); + surveyAnswerEntity.setType(requestUserId.getType() == 4 ? 2 : 1); + surveyAnswerEntity.setCreateBy(requestUserId.getUserId().toString()); + list.add(surveyAnswerEntity); + } + surveyAnswerManager.saveBatch(list); + return ResponseDTO.ok(); + } } diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/livelihood/service/SurveyService.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/livelihood/service/SurveyService.java index 918fe15..9a6e0ae 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/livelihood/service/SurveyService.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/livelihood/service/SurveyService.java @@ -196,17 +196,17 @@ public class SurveyService { for (SurveyAnswerQuestionEntity surveyAnswerQuestionEntity : questionList) { List collect = optionList.stream().filter(o -> o.getQuestionId().toString() .equals(surveyAnswerQuestionEntity.getQuestionId().toString())).collect(Collectors.toList()); + List surveyAnswerList = answerList.stream().filter(a -> + a.getSurveyQuestionId().toString().equals(surveyAnswerQuestionEntity.getQuestionId().toString())).collect(Collectors.toList()); if (surveyAnswerQuestionEntity.getType() == 3) { - List surveyAnswerList = answerList.stream().filter(a -> - a.getSurveyQuestionId().toString().equals(surveyAnswerQuestionEntity.getQuestionId().toString())).collect(Collectors.toList()); surveyAnswerQuestionEntity.setAnswerList(surveyAnswerList.stream().map(s -> s.getSurveyOptionId()).collect(Collectors.toList())); } else { for (SurveyAnswerOptionEntity surveyAnswerOptionEntity : collect) { - List surveyAnswerList = answerList.stream().filter(a -> a.getSurveyQuestionId().toString().equals(surveyAnswerQuestionEntity.getQuestionId().toString()) - && Arrays.asList(a.getSurveyOptionId().split(",")).contains(surveyAnswerOptionEntity.getOptionId().toString())).collect(Collectors.toList()); - surveyAnswerOptionEntity.setHitNum(surveyAnswerList.size()); - surveyAnswerOptionEntity.setRatio(surveyDetailVO.getTotal() == 0 ? new BigDecimal(0) : - new BigDecimal(surveyAnswerList.size()).divide(new BigDecimal(surveyDetailVO.getTotal()), 2, BigDecimal.ROUND_HALF_UP) + List surveyAnswerHitList = surveyAnswerList.stream().filter(a -> + Arrays.asList(a.getSurveyOptionId().split(",")).contains(surveyAnswerOptionEntity.getOptionId().toString())).collect(Collectors.toList()); + surveyAnswerOptionEntity.setHitNum(surveyAnswerHitList.size()); + surveyAnswerOptionEntity.setRatio(surveyAnswerList.size() == 0 ? new BigDecimal(0) : + new BigDecimal(surveyAnswerHitList.size()).divide(new BigDecimal(surveyAnswerList.size()), 2, BigDecimal.ROUND_HALF_UP) .multiply(new BigDecimal(100))); } surveyAnswerQuestionEntity.setAnswerOptionList(collect); @@ -218,9 +218,12 @@ public class SurveyService { } private void build(List list) { + String string = SmartRequestUtil.getRequestUserId().toString(); for (SurveyVO surveyVO : list) { - surveyVO.setJoinNum((int) surveyAnswerManager.count(Wrappers.lambdaQuery() - .eq(SurveyAnswerEntity::getSurveyId, surveyVO.getSurveyId()))); + List answerEntityList = surveyAnswerManager.list(Wrappers.lambdaQuery() + .eq(SurveyAnswerEntity::getSurveyId, surveyVO.getSurveyId())); + surveyVO.setJoinNum((int) answerEntityList.stream().map(s -> s.getAnswerPersonId()).distinct().count()); + surveyVO.setJoinFlag(answerEntityList.stream().filter(a -> a.getAnswerPersonId().toString().equals(string)).count() > 0 ? 1 : 0); } } diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/controller/GroupController.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/controller/GroupController.java index e7089e9..dd2cd4e 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/controller/GroupController.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/controller/GroupController.java @@ -3,6 +3,9 @@ package net.lab1024.sa.admin.module.business.village.controller; import net.lab1024.sa.admin.module.business.village.domain.form.GroupAddForm; import net.lab1024.sa.admin.module.business.village.domain.form.GroupQueryForm; import net.lab1024.sa.admin.module.business.village.domain.form.GroupUpdateForm; +import net.lab1024.sa.admin.module.business.village.domain.vo.GridDetailVO; +import net.lab1024.sa.admin.module.business.village.domain.vo.GridTreeVO; +import net.lab1024.sa.admin.module.business.village.domain.vo.GroupDetailVO; import net.lab1024.sa.admin.module.business.village.domain.vo.GroupVO; import net.lab1024.sa.admin.module.business.village.service.GroupService; import net.lab1024.sa.base.common.domain.ValidateList; @@ -77,4 +80,18 @@ public class GroupController { public ResponseDTO batchDelete(@RequestBody ValidateList idList) { return groupService.batchDelete(idList); } + + @Operation(summary = "单个查询 @author pengjie") + @GetMapping("/group/queryById/{groupId}") + @SaCheckPermission("group:query") + public ResponseDTO queryById(@PathVariable Long groupId) { + return groupService.queryById(groupId); + } + + @Operation(summary = "根据当前账号查询区域小组树 @author pengjie") + @GetMapping("/group/queryGroupTree") + @SaCheckPermission("group:query") + public ResponseDTO> queryGroupTree() { + return groupService.queryGroupTree(); + } } diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/controller/NewsController.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/controller/NewsController.java index d1d3610..74e0249 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/controller/NewsController.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/controller/NewsController.java @@ -1,5 +1,6 @@ package net.lab1024.sa.admin.module.business.village.controller; +import net.lab1024.sa.admin.module.business.village.domain.entity.NewsEntity; import net.lab1024.sa.admin.module.business.village.domain.form.NewsAddForm; import net.lab1024.sa.admin.module.business.village.domain.form.NewsQueryForm; import net.lab1024.sa.admin.module.business.village.domain.form.NewsUpdateForm; @@ -70,4 +71,11 @@ public class NewsController { public ResponseDTO batchDelete(@PathVariable Long id) { return newsService.delete(id); } + + @Operation(summary = "单个查询 @author pengjie") + @GetMapping("/news/queryById/{id}") + @SaCheckPermission("news:query") + public ResponseDTO queryById(@PathVariable Long id) { + return newsService.queryById(id); + } } diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/dao/GroupDao.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/dao/GroupDao.java index 5a5d8cc..2aefe91 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/dao/GroupDao.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/dao/GroupDao.java @@ -3,6 +3,8 @@ package net.lab1024.sa.admin.module.business.village.dao; import java.util.List; import net.lab1024.sa.admin.module.business.village.domain.entity.GroupEntity; import net.lab1024.sa.admin.module.business.village.domain.form.GroupQueryForm; +import net.lab1024.sa.admin.module.business.village.domain.vo.GridDetailVO; +import net.lab1024.sa.admin.module.business.village.domain.vo.GroupDetailVO; import net.lab1024.sa.admin.module.business.village.domain.vo.GroupVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -33,4 +35,5 @@ public interface GroupDao extends BaseMapper { */ List queryPage(Page page, @Param("queryForm") GroupQueryForm queryForm); + GroupDetailVO queryById(@Param("id") Long id); } diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/form/VillagerAddForm.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/form/VillagerAddForm.java index 5122ccb..00713f6 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/form/VillagerAddForm.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/form/VillagerAddForm.java @@ -4,6 +4,8 @@ import io.swagger.v3.oas.annotations.media.Schema; import java.time.LocalDateTime; import lombok.Data; +import javax.validation.constraints.NotBlank; + /** * 村民信息 新建表单 * @@ -36,6 +38,7 @@ public class VillagerAddForm { @Schema(description = "名族") private String nation; + @NotBlank(message = "联系方式不能为空") @Schema(description = "联系方式") private String phone; diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/form/VillagerUpdateForm.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/form/VillagerUpdateForm.java index 8fbb168..0274187 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/form/VillagerUpdateForm.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/form/VillagerUpdateForm.java @@ -2,6 +2,7 @@ package net.lab1024.sa.admin.module.business.village.domain.form; import io.swagger.v3.oas.annotations.media.Schema; import java.time.LocalDateTime; +import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import lombok.Data; @@ -40,6 +41,7 @@ public class VillagerUpdateForm { @Schema(description = "名族") private String nation; + @NotBlank(message = "联系方式不能为空") @Schema(description = "联系方式") private String phone; diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/vo/GridTreeVO.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/vo/GridTreeVO.java index 90f8410..d574f03 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/vo/GridTreeVO.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/vo/GridTreeVO.java @@ -19,14 +19,20 @@ import java.util.List; public class GridTreeVO{ @Schema(description = "ID") - private Long id; + private String id; + + @Schema(description = "父级ID") + private String parentId; @Schema(description = "名称") private String name; - @Schema(description = "类型1:组织;2:网格") + @Schema(description = "类型1:组织;2:网格/小组") private Integer type; + @Schema(description = "层级") + private String level; + @Schema(description = "子级") private List chidrenList; } diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/vo/GroupDetailVO.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/vo/GroupDetailVO.java new file mode 100644 index 0000000..4f278d5 --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/vo/GroupDetailVO.java @@ -0,0 +1,68 @@ +package net.lab1024.sa.admin.module.business.village.domain.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import net.lab1024.sa.admin.module.business.village.domain.entity.EnterpriseEntity; +import net.lab1024.sa.admin.module.business.village.domain.entity.VillagerEntity; + +import java.util.List; + +/** + * 小组信息 详细VO + * + * @Author pengjie + * @Date 2025-02-18 09:55:32 + * @Copyright jxj + */ + +@Data +public class GroupDetailVO extends GroupVO{ + + @Schema(description = "总人口") + private Integer villagerTotal; + + @Schema(description = "男性") + private Integer man; + + @Schema(description = "女性") + private Integer woman; + + @Schema(description = "常住人口") + private Integer permanentVillager; + + @Schema(description = "流动人口") + private Integer flowVillager; + + @Schema(description = "外出人口") + private Integer goOutVillager; + + @Schema(description = "空挂人口") + private Integer EmptyHangingVillager; + + @Schema(description = "楼房类型数量统计") + private List buildTypeStatVOList; + + @Schema(description = "实有企业") + private List enterpriseEntityList; + + @Schema(description = "楼房数量") + private Integer floorNum; + + @Schema(description = "房屋数量") + private Integer homeNum; + + @Schema(description = "院落数量") + private Integer courtyardNum; + + @Schema(description = "户籍数量") + private Integer householdRegisterNum; + + @Schema(description = "农场数量") + private Integer farmNum; + + @Schema(description = "企业数量") + private Integer enterpriseNum; + + @Schema(description = "事件数量") + private Integer eventNum; +} diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/vo/GroupVO.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/vo/GroupVO.java index 18c27ef..eddf6cc 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/vo/GroupVO.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/domain/vo/GroupVO.java @@ -28,6 +28,12 @@ public class GroupVO { @Schema(description = "组长") private String groupMaster; + @Schema(description = "网格长") + private String gridMasterName; + + @Schema(description = "网格长联系方式") + private String gridMasterPhone; + @Schema(description = "联系方式") private String phone; diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/service/GridService.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/service/GridService.java index 346de7c..899ef3e 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/service/GridService.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/service/GridService.java @@ -5,6 +5,7 @@ import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import net.lab1024.sa.admin.module.business.event.domain.entity.EventEntity; import net.lab1024.sa.admin.module.business.event.manager.EventManager; @@ -156,10 +157,12 @@ public class GridService { } GridDetailVO gridDetailVO = gridDao.queryById(gridId); List villagerVOList = villagerDao.selectList(Wrappers.lambdaQuery().eq(VillagerEntity::getGridId, gridId)); - List list = Arrays.asList(gridDetailVO.getGridOperator().split(",")); - List gridOperatorList = villagerVOList.stream().filter(v -> list.contains(v.getVillagerId().toString())).collect(Collectors.toList()); - gridDetailVO.setGridOperatorName(gridOperatorList.stream().map(g -> g.getVillagerId().toString()).collect(Collectors.joining(","))); - gridDetailVO.setGridOperatorList(gridOperatorList); + if (StringUtils.isNotBlank(gridDetailVO.getGridOperator())) { + List list = Arrays.asList(gridDetailVO.getGridOperator().split(",")); + List gridOperatorList = villagerVOList.stream().filter(v -> list.contains(v.getVillagerId().toString())).collect(Collectors.toList()); + gridDetailVO.setGridOperatorName(gridOperatorList.stream().map(g -> g.getName().toString()).collect(Collectors.joining(","))); + gridDetailVO.setGridOperatorList(gridOperatorList); + } gridDetailVO.setVillagerTotal(villagerVOList.size()); gridDetailVO.setMan((int) villagerVOList.stream().filter(v -> v.getSex() == 1).count()); gridDetailVO.setWoman((int) villagerVOList.stream().filter(v -> v.getSex() == 2).count()); @@ -204,33 +207,68 @@ public class GridService { gridDetailVO.setFarmNum((int) farmManager.count(Wrappers.lambdaQuery().eq(FarmEntity::getGridId, gridId))); gridDetailVO.setEnterpriseNum(enterpriseEntityList.size()); gridDetailVO.setEventNum((int) eventManager.count(Wrappers.lambdaQuery().eq(EventEntity::getGridId, gridId))); - return ResponseDTO.ok(); + return ResponseDTO.ok(gridDetailVO); } /** * 根据当前账号查询区域网格树 */ public ResponseDTO> queryGridTree() { - List list = new ArrayList<>(); RequestUser requestUser = SmartRequestUtil.getRequestUser(); Integer villageId = requestUser.getVillageId(); - List parentList = villageManager.list(Wrappers.lambdaQuery() + List parents = villageManager.list(Wrappers.lambdaQuery() .eq(VillageEntity::getState, 1) .eq(VillageEntity::getId, villageId)); - List allList = new ArrayList<>(); - allList.addAll(parentList); - for (VillageEntity villageEntity : parentList) { - allList.addAll(villageManager.list(Wrappers.lambdaQuery().apply("find_in_set({0}, ancestors)", villageEntity.getId()))); + List allList = new ArrayList<>(); + List parentList = new ArrayList<>(); + for (VillageEntity villageEntity : parents) { + GridTreeVO gridTreeVO = new GridTreeVO(); + gridTreeVO.setId(villageEntity.getId().toString()); + gridTreeVO.setParentId(villageEntity.getParentId().toString()); + gridTreeVO.setName(villageEntity.getName()); + gridTreeVO.setType(1); + allList.add(gridTreeVO); + parentList.add(gridTreeVO); } - getVillageChildren(parentList, allList); - return ResponseDTO.ok(list); + for (VillageEntity villageEntity : parents) { + List villageEntityList = villageManager.list(Wrappers.lambdaQuery().apply("find_in_set({0}, ancestors)", villageEntity.getId())); + for (VillageEntity villageEntity1 : villageEntityList) { + GridTreeVO gridTreeVO = new GridTreeVO(); + gridTreeVO.setId(villageEntity1.getId().toString()); + gridTreeVO.setParentId(villageEntity1.getParentId().toString()); + gridTreeVO.setName(villageEntity1.getName()); + gridTreeVO.setType(1); + allList.add(gridTreeVO); + } + } + List gridEntityList = gridDao.selectList(null); + getVillageChildren(parentList, allList, gridEntityList); + return ResponseDTO.ok(parentList); } - private void getVillageChildren(List parentList, List allList) { - for (VillageEntity village : parentList) { - List collect = allList.stream().filter(a -> a.getParentId().toString().equals(village.getId().toString())).collect(Collectors.toList()); - getVillageChildren(collect, allList); - village.setVillageList(collect); + private void getVillageChildren(List parentList, List allList, List gridEntityList) { + for (GridTreeVO gridTreeVO : parentList) { + List collect = allList.stream().filter(a -> a.getParentId().toString().equals(gridTreeVO.getId().toString())).collect(Collectors.toList()); + if (collect.size() > 0) { + getVillageChildren(collect, allList, gridEntityList); + gridTreeVO.setChidrenList(collect); + } else { + buildGrid(gridTreeVO, gridEntityList); + } } } + + private void buildGrid(GridTreeVO gridTreeVO, List gridEntityList) { + List collect = gridEntityList.stream().filter(g -> g.getVillageId() != null && g.getVillageId().toString().equals(gridTreeVO.getId())).collect(Collectors.toList()); + List children = new ArrayList<>(); + for (GridEntity gridEntity : collect) { + GridTreeVO gridTreeVO1 = new GridTreeVO(); + gridTreeVO1.setId(gridEntity.getGridId().toString()); + gridTreeVO1.setParentId(gridTreeVO.getId()); + gridTreeVO1.setName(gridEntity.getName()); + gridTreeVO1.setType(2); + children.add(gridTreeVO1); + } + gridTreeVO.setChidrenList(children); + } } diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/service/GroupService.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/service/GroupService.java index f467947..f71982a 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/service/GroupService.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/service/GroupService.java @@ -1,12 +1,26 @@ package net.lab1024.sa.admin.module.business.village.service; +import java.util.ArrayList; +import java.util.Arrays; import java.util.List; -import net.lab1024.sa.admin.module.business.village.dao.GroupDao; -import net.lab1024.sa.admin.module.business.village.domain.entity.GroupEntity; +import java.util.stream.Collectors; + +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import net.lab1024.sa.admin.module.business.event.domain.entity.EventEntity; +import net.lab1024.sa.admin.module.business.event.manager.EventManager; +import net.lab1024.sa.admin.module.business.village.dao.*; +import net.lab1024.sa.admin.module.business.village.domain.entity.*; import net.lab1024.sa.admin.module.business.village.domain.form.GroupAddForm; import net.lab1024.sa.admin.module.business.village.domain.form.GroupQueryForm; import net.lab1024.sa.admin.module.business.village.domain.form.GroupUpdateForm; -import net.lab1024.sa.admin.module.business.village.domain.vo.GroupVO; +import net.lab1024.sa.admin.module.business.village.domain.vo.*; +import net.lab1024.sa.admin.module.business.village.manager.CourtyardManager; +import net.lab1024.sa.admin.module.business.village.manager.FarmManager; +import net.lab1024.sa.admin.module.business.village.manager.HomeManager; +import net.lab1024.sa.admin.module.business.village.manager.HouseholdRegisterManager; +import net.lab1024.sa.admin.module.system.village.domain.entity.VillageEntity; +import net.lab1024.sa.admin.module.system.village.manager.VillageManager; +import net.lab1024.sa.base.common.domain.RequestUser; import net.lab1024.sa.base.common.util.SmartBeanUtil; import net.lab1024.sa.base.common.util.SmartPageUtil; import net.lab1024.sa.base.common.domain.ResponseDTO; @@ -32,6 +46,36 @@ public class GroupService { @Resource private GroupDao groupDao; + @Resource + private VillagerDao villagerDao; + + @Resource + private EnterpriseDao enterpriseDao; + + @Resource + private BuildTypeDao buildTypeDao; + + @Resource + private FloorDao floorDao; + + @Resource + private HomeManager homeManager; + + @Resource + private CourtyardManager courtyardManager; + + @Resource + private HouseholdRegisterManager householdRegisterManager; + + @Resource + private FarmManager farmManager; + + @Resource + private EventManager eventManager; + + @Resource + private VillageManager villageManager; + /** * 分页查询 * @@ -103,4 +147,126 @@ public class GroupService { groupDao.deleteById(groupId); return ResponseDTO.ok(); } + + /** + * 单个查询 + */ + public ResponseDTO queryById(Long groupId) { + if (null == groupId){ + return ResponseDTO.ok(); + } + GroupDetailVO groupDetailVO = groupDao.queryById(groupId); + List villagerVOList = villagerDao.selectList(Wrappers.lambdaQuery().eq(VillagerEntity::getGroupId, groupId)); +// List list = Arrays.asList(groupDetailVO.getGridOperator().split(",")); +// List gridOperatorList = villagerVOList.stream().filter(v -> list.contains(v.getVillagerId().toString())).collect(Collectors.toList()); +// gridDetailVO.setGridOperatorName(gridOperatorList.stream().map(g -> g.getVillagerId().toString()).collect(Collectors.joining(","))); +// gridDetailVO.setGridOperatorList(gridOperatorList); + groupDetailVO.setVillagerTotal(villagerVOList.size()); + groupDetailVO.setMan((int) villagerVOList.stream().filter(v -> v.getSex() == 1).count()); + groupDetailVO.setWoman((int) villagerVOList.stream().filter(v -> v.getSex() == 2).count()); + List buildTypeEntityList = buildTypeDao.selectList(null); + List floorEntityList = floorDao.selectList(Wrappers.lambdaQuery().eq(FloorEntity::getGridId, groupId)); + List statVOList = new ArrayList<>(); + for (BuildTypeEntity buildTypeEntity : buildTypeEntityList) { + BuildTypeStatVO buildTypeStatVO = new BuildTypeStatVO(); + buildTypeStatVO.setName(buildTypeEntity.getName()); + buildTypeStatVO.setNum((int) floorEntityList.stream().filter(f -> f.getBuildTypeId().toString().equals(buildTypeEntity.getBuildTypeId().toString())).count()); + statVOList.add(buildTypeStatVO); + } + groupDetailVO.setBuildTypeStatVOList(statVOList); + + List homeEntityList = homeManager.list(Wrappers.lambdaQuery().eq(HomeEntity::getGridId, groupId)); + groupDetailVO.setHomeNum(homeEntityList.size()); + List courtyardEntityList = courtyardManager.list(Wrappers.lambdaQuery().eq(CourtyardEntity::getGridId, groupId)); + groupDetailVO.setCourtyardNum(courtyardEntityList.size()); + List enterpriseEntityList = new ArrayList<>(); + if (homeEntityList.size() > 0) { + enterpriseEntityList.addAll(enterpriseDao.selectList(Wrappers.lambdaQuery().eq(EnterpriseEntity::getPermanentType, 1) + .in(EnterpriseEntity::getPermanentId, homeEntityList.stream().map(h -> h.getHomeId()).collect(Collectors.toList())))); + } + if (courtyardEntityList.size() > 0) { + enterpriseEntityList.addAll(enterpriseDao.selectList(Wrappers.lambdaQuery().eq(EnterpriseEntity::getPermanentType, 2) + .in(EnterpriseEntity::getPermanentId, courtyardEntityList.stream().map(c -> c.getCourtyardId()).collect(Collectors.toList())))); + } + groupDetailVO.setEnterpriseEntityList(enterpriseEntityList); + groupDetailVO.setFloorNum(floorEntityList.size()); + int num = 0; + if (homeEntityList.size() > 0) { + num = num + (int)householdRegisterManager.count(Wrappers.lambdaQuery() + .in(HouseholdRegisterEntity::getPermanentId, homeEntityList.stream().map(h -> h.getHomeId()).collect(Collectors.toList())) + .eq(HouseholdRegisterEntity::getPermanentType, 1)); + } + if (courtyardEntityList.size() > 0) { + num = num + (int)householdRegisterManager.count(Wrappers.lambdaQuery() + .in(HouseholdRegisterEntity::getPermanentId, courtyardEntityList.stream().map(c -> c.getCourtyardId()).collect(Collectors.toList())) + .eq(HouseholdRegisterEntity::getPermanentType, 2)); + } + groupDetailVO.setHouseholdRegisterNum(num); + groupDetailVO.setFarmNum((int) farmManager.count(Wrappers.lambdaQuery().eq(FarmEntity::getGridId, groupId))); + groupDetailVO.setEnterpriseNum(enterpriseEntityList.size()); + groupDetailVO.setEventNum((int) eventManager.count(Wrappers.lambdaQuery().eq(EventEntity::getGridId, groupId))); + return ResponseDTO.ok(groupDetailVO); + } + + /** + * 根据当前账号查询区域网格树 + */ + public ResponseDTO> queryGroupTree() { + RequestUser requestUser = SmartRequestUtil.getRequestUser(); + Integer villageId = requestUser.getVillageId(); + List parents = villageManager.list(Wrappers.lambdaQuery() + .eq(VillageEntity::getState, 1) + .eq(VillageEntity::getId, villageId)); + List allList = new ArrayList<>(); + List parentList = new ArrayList<>(); + for (VillageEntity villageEntity : parents) { + GridTreeVO gridTreeVO = new GridTreeVO(); + gridTreeVO.setId(villageEntity.getId().toString()); + gridTreeVO.setParentId(villageEntity.getParentId().toString()); + gridTreeVO.setName(villageEntity.getName()); + gridTreeVO.setType(1); + allList.add(gridTreeVO); + parentList.add(gridTreeVO); + } + for (VillageEntity villageEntity : parents) { + List villageEntityList = villageManager.list(Wrappers.lambdaQuery().apply("find_in_set({0}, ancestors)", villageEntity.getId())); + for (VillageEntity villageEntity1 : villageEntityList) { + GridTreeVO gridTreeVO = new GridTreeVO(); + gridTreeVO.setId(villageEntity1.getId().toString()); + gridTreeVO.setParentId(villageEntity1.getParentId().toString()); + gridTreeVO.setName(villageEntity1.getName()); + gridTreeVO.setType(1); + allList.add(gridTreeVO); + } + } + List groupEntityList = groupDao.selectList(null); + getVillageChildren(parentList, allList, groupEntityList); + return ResponseDTO.ok(parentList); + } + + private void getVillageChildren(List parentList, List allList, List gridEntityList) { + for (GridTreeVO gridTreeVO : parentList) { + List collect = allList.stream().filter(a -> a.getParentId().toString().equals(gridTreeVO.getId().toString())).collect(Collectors.toList()); + if (collect.size() > 0) { + getVillageChildren(collect, allList, gridEntityList); + gridTreeVO.setChidrenList(collect); + } else { + buildGrid(gridTreeVO, gridEntityList); + } + } + } + + private void buildGrid(GridTreeVO gridTreeVO, List groupEntityList) { + List collect = groupEntityList.stream().filter(g -> g.getVillageId() != null && g.getVillageId().toString().equals(gridTreeVO.getId())).collect(Collectors.toList()); + List children = new ArrayList<>(); + for (GroupEntity groupEntity : collect) { + GridTreeVO gridTreeVO1 = new GridTreeVO(); + gridTreeVO1.setId(groupEntity.getGroupId().toString()); + gridTreeVO1.setParentId(gridTreeVO.getId()); + gridTreeVO1.setName(groupEntity.getName()); + gridTreeVO1.setType(2); + children.add(gridTreeVO1); + } + gridTreeVO.setChidrenList(children); + } } diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/service/NewsService.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/service/NewsService.java index 3ca03a3..12bc177 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/service/NewsService.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/service/NewsService.java @@ -94,4 +94,14 @@ public class NewsService { newsDao.deleteById(id); return ResponseDTO.ok(); } + + /** + * 单个查询 + */ + public ResponseDTO queryById(Long id) { + if (null == id){ + return ResponseDTO.ok(); + } + return ResponseDTO.ok(newsDao.selectById(id)); + } } diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/service/VillagerService.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/service/VillagerService.java index 43d652a..eca8577 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/service/VillagerService.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/village/service/VillagerService.java @@ -19,6 +19,7 @@ import net.lab1024.sa.admin.module.business.village.domain.vo.*; import net.lab1024.sa.admin.module.business.village.manager.*; import net.lab1024.sa.admin.module.system.village.domain.entity.VillageEntity; import net.lab1024.sa.admin.util.ExcelUtils; +import net.lab1024.sa.base.common.code.UserErrorCode; import net.lab1024.sa.base.common.domain.PageResult; import net.lab1024.sa.base.common.domain.ResponseDTO; import net.lab1024.sa.base.common.exception.BusinessException; @@ -137,6 +138,10 @@ public class VillagerService { * 添加 */ public ResponseDTO add(VillagerAddForm addForm) { + VillagerEntity exist = villagerDao.selectOne(Wrappers.lambdaQuery().eq(VillagerEntity::getPhone, addForm.getPhone())); + if (exist != null) { + return ResponseDTO.error(UserErrorCode.ALREADY_EXIST, "手机号码已存在"); + } VillagerEntity villagerEntity = SmartBeanUtil.copy(addForm, VillagerEntity.class); villagerEntity.setCreateBy(SmartRequestUtil.getRequestUser().getUserId().toString()); villagerDao.insert(villagerEntity); @@ -158,6 +163,12 @@ public class VillagerService { * @return */ public ResponseDTO update(VillagerUpdateForm updateForm) { + VillagerEntity exist = villagerDao.selectOne(Wrappers.lambdaQuery() + .eq(VillagerEntity::getPhone, updateForm.getPhone()) + .ne(VillagerEntity::getVillagerId, updateForm.getVillagerId())); + if (exist != null) { + return ResponseDTO.error(UserErrorCode.ALREADY_EXIST, "手机号码已存在"); + } VillagerEntity villagerEntity = SmartBeanUtil.copy(updateForm, VillagerEntity.class); villagerDao.updateById(villagerEntity); LambdaUpdateWrapper wrapper = Wrappers.lambdaUpdate(); diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeeService.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeeService.java index 2f261e5..6616607 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeeService.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeeService.java @@ -240,6 +240,7 @@ public class EmployeeService { entity.setGender(villager.getSex()); entity.setPhone(phone); entity.setDeletedFlag(Boolean.FALSE); + entity.setDisabledFlag(Boolean.FALSE); entity.setType(4); List roleIds = new ArrayList<>(); roleIds.add(role.getRoleId()); diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java index 4eb3c7e..961ca57 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java @@ -202,7 +202,7 @@ public class LoginService implements StpInterface { * 验证短信验证码 */ public ResponseDTO checkSmsCode(VillagerLoginForm villagerLoginForm) { - String redisCaptchaKey = redisService.generateRedisKey(RedisKeyConst.Support.SMS, villagerLoginForm.getPhone()); + String redisCaptchaKey = redisService.generateRedisKey(RedisKeyConst.Support.REG_SMS, villagerLoginForm.getPhone()); String codeCache = redisService.get(redisCaptchaKey); if (!villagerLoginForm.getSmsCode().equals(codeCache)) { return ResponseDTO.userErrorParam("验证码错误"); @@ -378,6 +378,7 @@ public class LoginService implements StpInterface { // 创建账号并设置默认权限 employeeService.addVillagerEmployee(villagerLoginForm.getPhone(), villager); } + employeeEntity = employeeService.getByLoginName(villagerLoginForm.getPhone() + "@4"); // 验证账号状态 if (employeeEntity.getDeletedFlag()) { saveLoginLog(employeeEntity, ip, userAgent, "账号已注销", LoginLogResultEnum.LOGIN_FAIL); @@ -427,7 +428,7 @@ public class LoginService implements StpInterface { // 设置 token loginResultVO.setToken(token); - + loginResultVO.setVillageId(villager.getVillageId()); // 清除权限缓存 permissionCache.remove(employeeEntity.getEmployeeId()); diff --git a/sa-admin/src/main/resources/mapper/business/affairs/VillageMailMapper.xml b/sa-admin/src/main/resources/mapper/business/affairs/VillageMailMapper.xml index 696ea57..3dadfd2 100644 --- a/sa-admin/src/main/resources/mapper/business/affairs/VillageMailMapper.xml +++ b/sa-admin/src/main/resources/mapper/business/affairs/VillageMailMapper.xml @@ -39,8 +39,24 @@ AND INSTR(village_mail.title,#{queryForm.title}) + + + AND village_mail.state = #{queryForm.state} + + + + AND village_mail.asterisk = #{queryForm.asterisk} + - + + diff --git a/sa-admin/src/main/resources/mapper/business/event/EventDraftMapper.xml b/sa-admin/src/main/resources/mapper/business/event/EventDraftMapper.xml index 5551023..7360111 100644 --- a/sa-admin/src/main/resources/mapper/business/event/EventDraftMapper.xml +++ b/sa-admin/src/main/resources/mapper/business/event/EventDraftMapper.xml @@ -6,6 +6,9 @@ event_draft.id, event_draft.address, + event_draft.address_name, + event_draft.latitude, + event_draft.longitude, event_draft.happen_time, event_draft.type, event_draft.event_desc, diff --git a/sa-admin/src/main/resources/mapper/business/village/GridMapper.xml b/sa-admin/src/main/resources/mapper/business/village/GridMapper.xml index 8fe9e0d..5e07cd6 100644 --- a/sa-admin/src/main/resources/mapper/business/village/GridMapper.xml +++ b/sa-admin/src/main/resources/mapper/business/village/GridMapper.xml @@ -8,6 +8,7 @@ grid.code, grid.name, grid.grid_master, + grid.grid_operator, grid.color, grid.map_data, grid.create_time, @@ -41,6 +42,6 @@ FROM grid left join villager on grid.grid_master = villager.villager_id - where grid_id = #{id} + where grid.grid_id = #{id} diff --git a/sa-admin/src/main/resources/mapper/business/village/GroupMapper.xml b/sa-admin/src/main/resources/mapper/business/village/GroupMapper.xml index a95bbbf..2528b39 100644 --- a/sa-admin/src/main/resources/mapper/business/village/GroupMapper.xml +++ b/sa-admin/src/main/resources/mapper/business/village/GroupMapper.xml @@ -14,7 +14,9 @@ group_info.create_time, group_info.create_by, group_info.update_time, - group_info.village_id + group_info.village_id, + villager.name groupMasterName, + villager.phone groupMasterPhone @@ -22,6 +24,7 @@ SELECT FROM group_info + left join villager on group_info.group_master = villager.villager_id @@ -33,5 +36,12 @@ - + +