springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/api/DictionItemConstants.java
New file @@ -0,0 +1,19 @@ package com.panzhihua.common.api; /** * 攀枝花综治网格化-字段key * * @author manailin * @date 2021/06/16 */ public class DictionItemConstants { private DictionItemConstants() { throw new IllegalStateException("Utility class"); } /** * 文化层度字典编码 */ public static final String LC_CULTURE_LEVEL = "1156457421221564414"; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/api/LcApiConstants.java
@@ -9,6 +9,10 @@ public class LcApiConstants { private LcApiConstants() { throw new IllegalStateException("Utility class"); } /** * 将浪潮对接接口中所需的固定账号名称，账号和密码登陆来获取token */ springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/LcEventVisitingTasksListDTO.java
@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; import java.util.Date; import java.util.List;
New file @@ -0,0 +1,31 @@ package com.panzhihua.common.model.vos; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; /** * @author manailin * @date 2021/6/11 16:27 */ @ApiModel("字典项") @Data public class BcDictionaryItemVO implements Serializable { /** * 字典项名 */ private String dictItemName; /** * 字典项值 */ private String dictValue; /** * 助记码 */ private String mnemonicCode; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java
@@ -123,6 +123,9 @@ private String nativePlace; @ApiModelProperty("民族") private String nationCode; @ApiModelProperty("民族") private String nation; @ApiModelProperty("小区名字") @@ -156,6 +159,11 @@ @ApiModelProperty("户口所在地") private String censusRegister; /** * 居住地址 */ private String address; @ApiModelProperty("与户主关系(1.户主 2.配偶 3.子女 4.孙女 5.父母 6.其他)") private Integer relation;
@@ -2,46 +2,49 @@ import com.panzhihua.common.model.dtos.api.EventFile; import com.panzhihua.common.model.dtos.api.EventInfo; import com.panzhihua.common.model.dtos.grid.*; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.grid.*; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; import java.util.List; 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; /** * * @author manailin * desc 主要是提供给浪潮服务器上传事件 * @version 1.0 * @since 1.0 * @date 2021-05-26 * */ * @since 1.0 */ @FeignClient(name = "serviceApi") public interface ApiServiceFeign { /** * description 生成或更新redis里面的对接浪潮所需的token信息 * @param name 账号 * * @param name 账号 * @param password 密码 * @author manailin * @date 2021/6/10 17:00 */ @GetMapping("get/token") void getToken(@RequestParam("name") String name,@RequestParam("password") String password); void getToken(@RequestParam("name") String name, @RequestParam("password") String password); /** * description 向浪潮服务器提交网格事件登记 * * * @param eventInfo 事件信息对象 * @author manailin * @date 2021/6/10 17:00 */ @PostMapping("lc/event/upload") void automationUpload(@RequestBody EventInfo eventInfo); /** * description 提交事件登记关联的文件或者图片信息 * * @param eventFile 文件对象 * @return R 上传结果 * @author manailin springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -9,7 +9,6 @@ import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticAgeGenderDTO; import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticPartyActivityDTO; import com.panzhihua.common.model.dtos.community.bigscreen.PageBigScreenStatisticPartyOrg; import com.panzhihua.common.model.dtos.community.bigscreen.event.ScreenEventListDTO; import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityListDTO; import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityPeopleListDTO; import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenDiscussListDTO; @@ -21,18 +20,13 @@ import com.panzhihua.common.model.dtos.elders.ComEldersAuthUserAddAppDTO; import com.panzhihua.common.model.dtos.grid.PagePopulationListDTO; import com.panzhihua.common.model.dtos.neighbor.*; import com.panzhihua.common.model.dtos.neighbor.*; import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAdminDTO; import com.panzhihua.common.model.dtos.neighbor.AddComActNeighborCircleAppDTO; import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO; import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleDetailAppDTO; import com.panzhihua.common.model.dtos.shop.PageComShopOrderSearchDTO; import com.panzhihua.common.model.dtos.shop.*; import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO; import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO; import com.panzhihua.common.model.dtos.user.PageInputUserDTO; import com.panzhihua.common.model.dtos.vaccines.*; import com.panzhihua.common.model.vos.*; import com.panzhihua.common.model.vos.BcDictionaryItemVO; import com.panzhihua.common.model.vos.BcDictionaryVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.SystemmanagementConfigVO; import com.panzhihua.common.model.vos.community.*; import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticAgeGender; import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyActivity; @@ -45,16 +39,14 @@ import com.panzhihua.common.model.vos.neighbor.ChangeCommentReplyStatusByAdminVO; import com.panzhihua.common.model.vos.neighbor.ChangeCommentStatusByAdminVO; import com.panzhihua.common.model.vos.neighbor.EditNeighborCircleAdminVO; import com.panzhihua.common.model.vos.shop.ShopOperLogVO; import com.panzhihua.common.model.vos.shop.AddShopGoodsVO; import com.panzhihua.common.model.vos.shop.ShopOperLogVO; import com.panzhihua.common.model.vos.shop.ShopStoreVO; import com.panzhihua.common.model.vos.user.UserElectronicFileVO; import com.panzhihua.common.model.vos.user.UserPhoneVO; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; import java.util.List; /** @@ -278,7 +270,8 @@ /** * 查询随手拍是否有活动 * @return 活动详情 * * @return 活动详情 */ @PostMapping("getEasyPhotoActivity") R getEasyPhotoActivity(@RequestParam("communityId") Long communityId); @@ -480,7 +473,7 @@ * @return 增加结果 */ @GetMapping("getVolunteerById") R getVolunteerById(@RequestParam("id")Long id); R getVolunteerById(@RequestParam("id") Long id); /** * 增加志愿者 @@ -1383,7 +1376,7 @@ * @param list 便民服务集合 */ @PostMapping("/convenient/serve/import") R listSaveConvenientServeExcelVO(@RequestBody List<ComCvtServeExcelVO> list, @RequestParam(value = "communityId",required = false) Long communityId); R listSaveConvenientServeExcelVO(@RequestBody List<ComCvtServeExcelVO> list, @RequestParam(value = "communityId", required = false) Long communityId); /** * 导出房屋信息 @@ -1671,9 +1664,10 @@ /** * 确认导入实有人口（有则更新，无则新建） * @param list 用户信息 * @param communityId 社区id * @return 导入结果 * * @param list 用户信息 * @param communityId 社区id * @return 导入结果 */ @PostMapping("/common/data/population/import/confirm") R listSavePopulationConfirm(@RequestBody List<ComMngPopulationServeExcelVO> list, @RequestParam(value = "communityId") Long communityId); @@ -1694,12 +1688,13 @@ * @return 实有人口详细信息 */ @PostMapping("/common/data/population/detail") R detailPopulation(@RequestParam(value = "populationId") Long populationId); R<ComMngPopulationVO> detailPopulation(@RequestParam(value = "populationId") Long populationId); /** * 根据id查询实有人口电子档案信息 * @param populationId 实有人口id * @return 实有人口电子档信息 * * @param populationId 实有人口id * @return 实有人口电子档信息 */ @PostMapping("/common/data/population/electronicArchives") R electronicArchivesPopulation(@RequestParam(value = "populationId") Long populationId); @@ -1767,7 +1762,7 @@ * @return */ @PostMapping("/questnaire/editquestnaire") R editQuestnaire(@RequestBody QuestnaireVO questnaireVO) ; R editQuestnaire(@RequestBody QuestnaireVO questnaireVO); /** @@ -1786,7 +1781,7 @@ * @return */ @PostMapping("/questnaire/deletequestnaire") R editQuestnaireDO(@RequestParam("questId") Long questId,@RequestParam("userId") Long userId); R editQuestnaireDO(@RequestParam("questId") Long questId, @RequestParam("userId") Long userId); /** * 问卷答题结果 @@ -1799,6 +1794,7 @@ /** * 问卷调查详细 * * @param questId 问卷ID * @return 用户问卷调查详细 */ @@ -1807,7 +1803,8 @@ /** * 用户问卷调查详细 * @param userId 用户ID * * @param userId 用户ID * @param questId 问卷ID * @return 用户问卷调查详细 */ @@ -1816,6 +1813,7 @@ /** * 查看用户问卷调查统计信息 * * @param questId 问卷ID * @return 用户问卷调查统计信息 */ @@ -1834,6 +1832,7 @@ /** * 社区问卷分页 * * @param pageQuestnaireAnswerDTO 社区问卷分页参数 * @return 分页数据 */ @@ -1843,6 +1842,7 @@ /** * 居民填写问卷调查问卷 * * @param usersAnswerQuestnaireVO 填写情况 */ @PostMapping("/questnaire/usersanswequestnaire") @@ -1850,6 +1850,7 @@ /** * 店铺列表-分页查询 * * @param pageComShopStoreDTO 分页条件 */ @PostMapping("/shop/pageShopStore") @@ -1857,6 +1858,7 @@ /** * 保存店铺 * * @param storeVO 数据 */ @PostMapping("/shop/saveStore") @@ -1864,22 +1866,25 @@ /** * 新增店铺 * @param storeVO 店铺信息 * @return 新增结果 * * @param storeVO 店铺信息 * @return 新增结果 */ @PostMapping("/shop/addStore") R addStore(@RequestBody ShopStoreVO storeVO); /** * 编辑店铺、启用、禁用 * * @param storeVO 数据 * @param id 商铺id * @param id 商铺id */ @PostMapping("/shop/editStore/{id}") R editStore(@RequestBody ShopStoreVO storeVO, @PathVariable("id") Long id); /** * 删除店铺 * * @param id 商铺id */ @PostMapping("/shop/deleteStore") @@ -1887,14 +1892,16 @@ /** * 获取详情 * * @param id 商铺id */ @GetMapping("/shop/getStoreInfo") R getStoreInfo(@RequestParam("id")Long id); R getStoreInfo(@RequestParam("id") Long id); /** * 商品列表-分页查询 * * @param pageComShopGoodsDTO 添加数据 */ @PostMapping("/shop/pageGoods") @@ -1902,6 +1909,7 @@ /** * 新增商品 * * @param addShopGoodsVO * @return */ @@ -1910,29 +1918,35 @@ /** * 编辑商品 * * @param id * @param addShopGoodsVO * @return */ @PostMapping("/shop/editShopGoods/{id}") R editShopGoods(@PathVariable("id") Long id,@RequestBody AddShopGoodsVO addShopGoodsVO); R editShopGoods(@PathVariable("id") Long id, @RequestBody AddShopGoodsVO addShopGoodsVO); /** * 删除商品 * * @param id * @return */ @PostMapping("/shop/deleteShopGoods") R deleteShopGoods(@RequestBody Long[] id); /** * 修改商品状态 * * @param id * @return */ @GetMapping("/shop/changeShopGoodsStatus") R changeStatus(@RequestParam("id") Long id,@RequestParam("status")Integer status); R changeStatus(@RequestParam("id") Long id, @RequestParam("status") Integer status); /** * 结果 * * @param shopOperlog 商城后台操作日志 */ @PostMapping("/shop/addShopOperLog") @@ -1940,6 +1954,7 @@ /** * 分页查询 商家后台操作日志 * * @param pageDTO 分页数据 * @return 分页日志 */ @@ -1948,181 +1963,205 @@ /** * 订单分页查询 * * @param pageComShopOrderSearchDTO 分页数据 * @return 订单分页查询 */ @PostMapping("/shop/order/page") R pageShopOrder(@RequestBody PageComShopOrderSearchDTO pageComShopOrderSearchDTO); /** * 分页查询店铺列表 * @param comShopStoreDTO 请求参数 * @return 店铺列表 * * @param comShopStoreDTO 请求参数 * @return 店铺列表 */ @PostMapping("/shop/pageShopStore") R pageShopStore(@RequestBody PageComShopStoreDTO comShopStoreDTO); /** * 根据id查询店铺详情 * @param comShopStoreDTO 请求参数 * @return 店铺详情 * * @param comShopStoreDTO 请求参数 * @return 店铺详情 */ @PostMapping("/shop/shopStoreDetail") R shopStoreDetail(@RequestBody PageComShopStoreDTO comShopStoreDTO); /** * 分页查询商品列表 * @param comShopGoodsDTO 请求参数 * @return 商品列表 * * @param comShopGoodsDTO 请求参数 * @return 商品列表 */ @PostMapping("/shop/pageShopGoods") R pageShopGoods(@RequestBody ComShopGoodsDTO comShopGoodsDTO); /** * 根据商品id查询商品信息 * @param goodsId 商品id * @return 商品信息 * * @param goodsId 商品id * @return 商品信息 */ @PostMapping("/shop/shopGoodsDetail") R shopGoodsDetail(@RequestParam("goodsId") Long goodsId); /** * 查询用户购物车列表 * @param userId 用户id * @return 购物车列表 * * @param userId 用户id * @return 购物车列表 */ @PostMapping("/shop/shopCartList") R shopCartList(@RequestParam("userId") Long userId); /** * 查询用户购物车数量 * @param userId 用户id * @return 用户购物车商品数量 * * @param userId 用户id * @return 用户购物车商品数量 */ @PostMapping("/shop/shopCartUserTotal") R shopCartUserTotal(@RequestParam("userId") Long userId); /** * 购物车添加 * @param comShopCartDTO 请求参数 * @return 购物车列表 * * @param comShopCartDTO 请求参数 * @return 购物车列表 */ @PostMapping("/shop/shopAddCart") R shopAddCart(@RequestBody ComShopCartDTO comShopCartDTO); /** * 购物车内商品数量修改 * @param shopEditNubCartDTO 请求参数 * @return 修改结果 * * @param shopEditNubCartDTO 请求参数 * @return 修改结果 */ @PostMapping("/shop/shopEditNubCart") R shopEditNubCart(@RequestBody ComShopEditNubCartDTO shopEditNubCartDTO); /** * 删除购物车记录 * @param Ids 购物车id集合 * @return 删除结果 * * @param Ids 购物车id集合 * @return 删除结果 */ @PostMapping("/shop/shopDelCart") R shopDelCart(@RequestBody List<Long> Ids); /** * 分页查询用户收货地址列表 * @param comShopAddressDTO 请求参数 * @return 用户收货地址列表 * * @param comShopAddressDTO 请求参数 * @return 用户收货地址列表 */ @PostMapping("/shop/shopUserAddressList") R shopUserAddressList(@RequestBody PageComShopAddressDTO comShopAddressDTO); /** * 用户添加收货地址 * * @param comShopAddressDTO 请求参数 * @return 添加结果 * @return 添加结果 */ @PostMapping("/shop/shopAddUserAddress") R shopAddUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO); /** * 用户修改收货地址 * * @param comShopAddressDTO 请求参数 * @return 修改结果 * @return 修改结果 */ @PostMapping("/shop/shopEditUserAddress") R shopEditUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO); /** * 用户删除收货地址 * * @param addressId 收货地址id * @return 删除结果 * @return 删除结果 */ @PostMapping("/shop/shopDelUserAddress") R shopDelUserAddress(@RequestParam("addressId") Long addressId); /** * 订单预览 * @param orderPreviewDTO 请求参数 * @return 订单预览数据 * * @param orderPreviewDTO 请求参数 * @return 订单预览数据 */ @PostMapping("/shop/orderPreview") R orderPreview(@RequestBody ComShopOrderPreviewDTO orderPreviewDTO); /** * 创建订单 * @param orderCreateDTO 创建订单请求参数 * @return 创建结果 * * @param orderCreateDTO 创建订单请求参数 * @return 创建结果 */ @PostMapping("/shop/orderCreate") R orderCreate(@RequestBody ComShopOrderCreateDTO orderCreateDTO); /** * 分页查询用户订单列表 * @param comOrderListDTO 请求参数 * @return 查询结果 * * @param comOrderListDTO 请求参数 * @return 查询结果 */ @PostMapping("/shop/pageOrderList") R pageOrderList(@RequestBody PageComOrderListDTO comOrderListDTO); /** * 根据订单id查询订单详情 * @param orderId 订单id * @return 订单详情 * * @param orderId 订单id * @return 订单详情 */ @PostMapping("/shop/orderDetail") R orderDetail(@RequestParam("orderId") Long orderId); /** * 根据订单id取消订单 * @param comShopOrderQueryDTO 请求参数 * @return 取消结果 * * @param comShopOrderQueryDTO 请求参数 * @return 取消结果 */ @PostMapping("/shop/orderCancel") R orderCancel(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO); /** * 根据订单id删除订单 * @param orderId 订单id * @return 删除结果 * * @param orderId 订单id * @return 删除结果 */ @PostMapping("/shop/orderDelete") R orderDelete(@RequestParam("orderId") Long orderId); /** * 根据订单id确认收货 * @param comShopOrderQueryDTO 请求参数 * @return 确认结果 * * @param comShopOrderQueryDTO 请求参数 * @return 确认结果 */ @PostMapping("/shop/orderConfirm") R orderConfirm(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO); /** * 统计用户订单数量 * @param userId 用户id * @return 统计结果 * * @param userId 用户id * @return 统计结果 */ @PostMapping("/shop/orderStatistics") R orderStatistics(@RequestParam("userId") Long userId); /** * 商家资金的订单详情 * * @param id * @return */ @@ -2132,30 +2171,34 @@ /** * 订单发货 * * @param orderShipDTO 商城订单发货信息 * @return 发货结果 * @return 发货结果 */ @PostMapping("/shop/shipOrder") R shipOrder(@RequestBody ComShopOrderShipDTO orderShipDTO); /** * 订单配送 * * @param deliverDTO 订单信息 * @return 配送结果 * @return 配送结果 */ @PostMapping("/shop/deliverOrder") R deliverOrder(@RequestBody ComShopOrderDeliverDTO deliverDTO); /** * 订单完成配送 * * @param deliverDTO 订单信息 * @return 配送完成结果 * @return 配送完成结果 */ @PostMapping("/shop/finishDeliverOrder") R finishDeliverOrder(@RequestBody ComShopOrderDeliverDTO deliverDTO); /** * 获取用户商户详情 * * @param userId 用户ID */ @GetMapping("/shop/getUserStoreInfo") @@ -2163,6 +2206,7 @@ /** * 获取用户商户详情 * * @param account 用户账号 */ @GetMapping("/shop/getUserStoreInfoByAccount") @@ -2170,53 +2214,60 @@ /** * 订单导出信息 * * @param comShopOrderExportDTO 订单导出信息 * @return 订单导出信息 * @return 订单导出信息 */ @PostMapping("/shop/shopOrderExportData") R shopOrderExportData(@RequestBody ComShopOrderExportDTO comShopOrderExportDTO); /** * 资金管理导出信息 * * @param comShopFundsExportDTO 资金管理导出信息 * @return 资金管理导出信息 * @return 资金管理导出信息 */ @PostMapping("/shop/shopOrderFundsExportData") R shopOrderFundsExportData(@RequestBody ComShopFundsExportDTO comShopFundsExportDTO ); R shopOrderFundsExportData(@RequestBody ComShopFundsExportDTO comShopFundsExportDTO); /** * 店铺资金统计信息 * * @param userId 用户ID * @return 店铺资金统计信息 * @return 店铺资金统计信息 */ @GetMapping("/shop/getFundsStat") R getFundsStat(@RequestParam("userId") Long userId); /** * 店铺资金统计信息 * * @param pageComShopFundsSearchDTO 店铺资金 * @return 店铺资金统计信息 * @return 店铺资金统计信息 */ @PostMapping("/shop/pageShopFunds") R pageShopFunds(@RequestBody PageComShopFundsSearchDTO pageComShopFundsSearchDTO); /** * 微信支付订单回调 * @param wxPayNotifyOrderDTO 订单支付回调参数 * * @param wxPayNotifyOrderDTO 订单支付回调参数 */ @PostMapping("/shop/wxOrderPayNotify") void wxOrderPayNotify(@RequestBody WxPayNotifyOrderDTO wxPayNotifyOrderDTO); /** * 点击去支付订单 * @param orderPayDTO 请求参数 * @return 支付对象 * * @param orderPayDTO 请求参数 * @return 支付对象 */ @PostMapping("/shop/wxPay") R wxPay(@RequestBody OrderPayDTO orderPayDTO); /** * 编辑实有人口 * * @param populationEditDTO * @return */ @@ -2225,13 +2276,15 @@ /** * 微心愿删除 * * @param id 微心愿id */ @PostMapping("deletemicrowish") R deletemicrowish(@RequestParam("id")Long id); R deletemicrowish(@RequestParam("id") Long id); /** * 基础数据》特殊群体》分页查询 * * @param pageInputUserDTO * @return */ @@ -2240,8 +2293,9 @@ /** * 删除特殊群体人员 * @param id 特殊群体id * @return 删除结果 * * @param id 特殊群体id * @return 删除结果 */ @PostMapping("common/data/special/delete") R deleteSpecialInputUser(@RequestParam(value = "id") Long id); @@ -2249,29 +2303,34 @@ /** * 办事指南_新增 * * @param workGuideVO 新增信息 * @return 新增结果 */ @PostMapping("/addworkguide") R addWorkGuide(@RequestBody ComActWorkGuideVO workGuideVO, @RequestParam("userId")Long userId); R addWorkGuide(@RequestBody ComActWorkGuideVO workGuideVO, @RequestParam("userId") Long userId); /** * 办事指南_编辑 * * @param workGuideVO * @return 编辑结果 */ @PostMapping("/editworkguide") R editWorkGuide(@RequestBody ComActWorkGuideVO workGuideVO, @RequestParam("userId")Long userId); R editWorkGuide(@RequestBody ComActWorkGuideVO workGuideVO, @RequestParam("userId") Long userId); /** * 办事指南_详情 * * @param workGuideId * @return 详情 */ @GetMapping("/detailworkguide") R detailWorkGuide(@RequestParam("workGuideId")Long workGuideId); R detailWorkGuide(@RequestParam("workGuideId") Long workGuideId); /** * 办事指南_分页 * * @param pageActWorkGuideDTO 查询参数 * @return 分页集合 */ @@ -2280,6 +2339,7 @@ /** * 办事指南_删除 * * @param workGuideId 办事指南id * @return 删除结果 */ @@ -2288,32 +2348,36 @@ /** * 分页查询邻里圈 * @param neighborCircleAppDTO 请求参数 * @return 邻里圈列表 * * @param neighborCircleAppDTO 请求参数 * @return 邻里圈列表 */ @PostMapping("/neighbor/pageNeighborByApp") R pageNeighborByApp(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO); /** * 用户发布邻里圈审核 * @param addNeighborCircleAppDTO 邻里圈请求参数 * @return 发布结果 * * @param addNeighborCircleAppDTO 邻里圈请求参数 * @return 发布结果 */ @PostMapping("/neighbor/addNeighborByApp") R addNeighborByApp(@RequestBody AddComActNeighborCircleAppDTO addNeighborCircleAppDTO); /** * 用户查看邻里圈详情 * @param neighborCircleAppDTO 请求参数 * @return 邻里圈详情 * * @param neighborCircleAppDTO 请求参数 * @return 邻里圈详情 */ @PostMapping("/neighbor/neighborDetailByApp") R neighborDetailByApp(@RequestBody ComActNeighborCircleDetailAppDTO neighborCircleAppDTO); /** * 管理后台查询邻里圈列表 * @param comActNeighborCircleAdminDTO 请求参数 * @return 邻里圈列表 * * @param comActNeighborCircleAdminDTO 请求参数 * @return 邻里圈列表 */ @PostMapping("/neighbor/pageNeighborByAdmin") R pageNeighborByAdmin(@RequestBody ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO); @@ -2321,7 +2385,8 @@ /** * 后台修改邻里圈 * @param editNeighborCircleAdminVO 请求参数 * * @param editNeighborCircleAdminVO 请求参数 */ @PostMapping("/neighbor/changeStatusByAdmin") R changeStatusByAdmin(@RequestBody EditNeighborCircleAdminVO editNeighborCircleAdminVO); @@ -2329,22 +2394,25 @@ /** * 邻里圈_后台删除 * @param id 邻里圈id * @return 邻里圈列表 * * @param id 邻里圈id * @return 邻里圈列表 */ @PostMapping("/neighbor/deleteByAdmin") R deleteByAdmin(@RequestParam("id")Long id); R deleteByAdmin(@RequestParam("id") Long id); /** * 查看邻里圈基础_详情 * @param id 邻里圈id * @return 邻里圈列表 * * @param id 邻里圈id * @return 邻里圈列表 */ @GetMapping("/neighbor/detailNeighborByAdmin") R detailNeighborByAdmin(@RequestParam("id")Long id); R detailNeighborByAdmin(@RequestParam("id") Long id); /** * 邻里圈的所有评论_分页 * * @param dto 请求参数 * @return 评论列表 */ @@ -2353,6 +2421,7 @@ /** * 评论的状态_修改 * * @param vo 请求参数 */ @PostMapping("/neighbor/changeCommentStatusByAdmin") @@ -2360,6 +2429,7 @@ /** * 邻里圈评论_详情 * * @param id 评论id */ @GetMapping("/neighbor/detailNeighborCommentByAdmin") @@ -2368,53 +2438,60 @@ /** * 用户查询邻里圈列表 * @param neighborCircleAppDTO 请求参数 * @return 邻里圈列表 * * @param neighborCircleAppDTO 请求参数 * @return 邻里圈列表 */ @PostMapping("/neighbor/neighborExamineByApp") R neighborExamineByApp(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO); /** * 邻里圈点赞 * @param fabulousAppDTO 请求参数 * @return 点赞结果 * * @param fabulousAppDTO 请求参数 * @return 点赞结果 */ @PostMapping("/neighbor/neighborFabulousByApp") R neighborFabulousByApp(@RequestBody ComActNeighborFabulousAppDTO fabulousAppDTO); /** * 邻里圈转发 * * @param forwardAppDTO 请求参数 * @return 转发结果 * @return 转发结果 */ @PostMapping("/neighbor/neighborForwardByApp") R neighborForwardByApp(@RequestBody ComActNeighborForwardAppDTO forwardAppDTO); /** * 邻里圈评论 * * @param commentAppDTO 请求参数 * @return 评论结果 * @return 评论结果 */ @PostMapping("/neighbor/neighborCommentByApp") R neighborCommentByApp(@RequestBody ComActNeighborCommentAppDTO commentAppDTO); /** * 邻里圈回复 * @param replyAppDTO 请求参数 * @return 回复结果 * * @param replyAppDTO 请求参数 * @return 回复结果 */ @PostMapping("/neighbor/neighborReplyByApp") R neighborReplyByApp(@RequestBody ComActNeighborReplyAppDTO replyAppDTO); /** * 定时任务更新邻里圈近3天评论数/点赞数/浏览量 * @return 执行结果 * * @return 执行结果 */ @PostMapping("/neighbor/timeTaskCircleFlow") R timedTaskNeighborCircleRecord(); /** * 邻里圈评论回复_分页 * * @param dto 参数 */ @PostMapping("/neighbor/detailNeighborCommentAllReply") @@ -2422,6 +2499,7 @@ /** * 邻里圈评论回复_基本详情 * * @param id 参数 */ @GetMapping("/neighbor/detailNeighborCommentReply") @@ -2429,22 +2507,26 @@ /** * 评论回复状态_修改 * * @param changeStatusReplyVO 参数 */ @PostMapping("/neighbor/changeCommentReplyStatusByAdmin") R changeCommentReplyStatusByAdmin(@RequestBody ChangeCommentReplyStatusByAdminVO changeStatusReplyVO); /** * 邻里圈取消点赞 * @param fabulousAppDTO 请求参数 * @return 取消点赞结果 * * @param fabulousAppDTO 请求参数 * @return 取消点赞结果 */ @PostMapping("/neighbor/neighborFabulousCancelByApp") R neighborFabulousCancelByApp(@RequestBody ComActNeighborFabulousAppDTO fabulousAppDTO); /** * 添加邻里圈浏览记录 * @param addBrowseAppDTO 请求参数 * @return 返回参数 * * @param addBrowseAppDTO 请求参数 * @return 返回参数 */ @PostMapping("/neighbor/neighborAddBrowseByApp") R neighborAddBrowseByApp(@RequestBody ComActNeighborAddBrowseAppDTO addBrowseAppDTO); @@ -2452,6 +2534,7 @@ /** * 邻里圈_添加 * * @param addNeighborCircleAdminVO 参数 */ @PostMapping("/neighbor/addNeighborByAdmin") @@ -2459,23 +2542,26 @@ /** * 分页查询评论下所有回复 * @param commentReplyAppDTO 请求参数 * @return 回复列表 * * @param commentReplyAppDTO 请求参数 * @return 回复列表 */ @PostMapping("/neighbor/neighborCommentReplyByApp") R neighborCommentReplyByApp(@RequestBody ComActNeighborCommentReplyAppDTO commentReplyAppDTO); /** * 实有房屋_编辑 * @param villageId 实有房屋id * * @param villageId 实有房屋id * @param comMngVillageVO 请求参数 * @return */ @PostMapping("/editvillage/{villageId}") R editvillage(@PathVariable("villageId") Long villageId,@RequestBody ComMngVillageVO comMngVillageVO); R editvillage(@PathVariable("villageId") Long villageId, @RequestBody ComMngVillageVO comMngVillageVO); /** * 商城系统配置 * * @param comShopSysConfDTO * @return */ @@ -2484,6 +2570,7 @@ /** * 商城系统配置查询 * * @param pageComShopSysConfDTO * @return */ @@ -2492,6 +2579,7 @@ /** * 编辑实有人口_电子档案 * * @param userElectronicFileVO * @return */ @@ -2500,86 +2588,97 @@ /** * 实有人口统计 * @param communityId 社区id * @return 统计结果 * * @param communityId 社区id * @return 统计结果 */ @PostMapping("/common/data/population/statistics") R getPopulationTotalByAdmin(@RequestParam("communityId") Long communityId); /** * 查询房屋级联菜单 * @param cascadeHouseDTO 请求参数 * @return 菜单列表 * * @param cascadeHouseDTO 请求参数 * @return 菜单列表 */ @PostMapping("/common/data/population/cascade/list") R getCascadeHouseAddress(@RequestBody CascadeHouseDTO cascadeHouseDTO); /** * 分页查询房屋列表 * @param populationHouseAdminDTO 请求参数 * @return 房屋列表 * * @param populationHouseAdminDTO 请求参数 * @return 房屋列表 */ @PostMapping("/common/data/population/page/house") R pageHouse(@RequestBody ComMngPopulationHouseAdminDTO populationHouseAdminDTO); /** * 根据id查询实有房屋信息 * @param houseId 房屋id * @return 房屋信息 * * @param houseId 房屋id * @return 房屋信息 */ @PostMapping("/common/data/population/house/detail") R getHouseDetail(@RequestParam(value = "houseId") Long houseId); /** * 编辑实有房屋信息 * * @param houseEditAdminDTO 请求参数 * @return 编辑结果 * @return 编辑结果 */ @PostMapping("/common/data/population/house/edit") R editHouse(@RequestBody ComMngPopulationHouseEditAdminDTO houseEditAdminDTO); /** * 根据房屋id列表删除房屋信息 * @param Ids 请求参数 * @return 删除结果 * * @param Ids 请求参数 * @return 删除结果 */ @PostMapping("/common/data/population/house/delete") R deleteHouses(@RequestBody List<Long> Ids); /** * 实有房屋统计 * @param communityId 社区id * @return 统计结果 * * @param communityId 社区id * @return 统计结果 */ @PostMapping("/common/data/population/house/statistics") R getHouseTotalByAdmin(@RequestParam("communityId") Long communityId); /** * 根据社区id查询社区所有省市区 * @param communityId 社区id * @return 社区所在省市区 * * @param communityId 社区id * @return 社区所在省市区 */ @PostMapping("/common/data/village/getRegion") R getRegion(@RequestParam("communityId") Long communityId); /** * 统计社区内小区数量 * @param communityId 社区id * @return 统计小区数量 * * @param communityId 社区id * @return 统计小区数量 */ @PostMapping("/common/data/village/statistics") R villageStatistics(@RequestParam("communityId") Long communityId); /** * 小区详情 * * @param villageId 小区id * @return 小区详情 * @return 小区详情 */ @PostMapping("/village/getVillage") R getVillage(@RequestParam("villageId") Long villageId); /** * 新增高龄认证 * * @param eldersAuthAddDTO * @return 新增结果 */ @@ -2588,6 +2687,7 @@ /** * 修改高龄认证 * * @param eldersAuthEditDTO * @return 维护结果 */ @@ -2596,6 +2696,7 @@ /** * 分页查找高龄认证 * * @param pageEldersAuthDTO * @return 维护结果 */ @@ -2604,6 +2705,7 @@ /** * 删除高龄认证 * * @param eldersAuthDeleteDTO * @return 平台用户信息 */ @@ -2612,6 +2714,7 @@ /** * 查询高龄认证详细信息 * * @param id 高龄认证 id * @return 查找结果 */ @@ -2620,6 +2723,7 @@ /** * 获取用户家庭成员 * * @param userId 用户ID * @return */ @@ -2628,6 +2732,7 @@ /** * 查询导出高龄老人 * * @param pageEldersAuthDTO * @return */ @@ -2636,6 +2741,7 @@ /** * 通过家庭成员ID添加 * * @param eldersAuthAddByFamilyDTO 添加信息 * @return */ @@ -2645,6 +2751,7 @@ /** * 添加高龄认证反馈 * * @param eldersAuthFeedbackAddDTO * @return */ @@ -2653,107 +2760,121 @@ /** * 小程序-查询疫苗分类列表 * @return 疫苗分类列表 * * @return 疫苗分类列表 */ @PostMapping("/vaccines/app/list") R getVaccinesListByApp(); /** * 小程序-疫苗类型对应家庭成员接种列表 * @return 疫苗类型对应家庭成员接种列表 * * @return 疫苗类型对应家庭成员接种列表 */ @PostMapping("/vaccines/app/user/list") R getVaccinesUserListByApp(@RequestBody VaccinesEnrollUserByAppDTO enrollUserByAppDTO); /** * 小程序-报名疫苗 * @param enrollByAppDTO 请求参数 * @return 报名结果 * * @param enrollByAppDTO 请求参数 * @return 报名结果 */ @PostMapping("/vaccines/app/enroll") R VaccinesEnrollByApp(@RequestBody VaccinesEnrollByAppDTO enrollByAppDTO); /** * 小程序-查询用户家庭成员接种记录 * @param userId 用户id * @return 用户家庭成员接种记录 * * @param userId 用户id * @return 用户家庭成员接种记录 */ @PostMapping("/vaccines/app/user/inoculation/list") R getVaccinesUserInoculationListByApp(@RequestParam("userId") Long userId); /** * 后台管理-查询疫苗分类列表 * @param vaccinesByAdminDTO 请求参数 * @return 疫苗分类列表 * * @param vaccinesByAdminDTO 请求参数 * @return 疫苗分类列表 */ @PostMapping("/vaccines/admin/list") R getVaccinesListByAdmin(@RequestBody VaccinesByAdminDTO vaccinesByAdminDTO); /** * 修改疫苗分类信息 * @param vaccinesByAdminDTO 请求参数 * @return 修改结果 * * @param vaccinesByAdminDTO 请求参数 * @return 修改结果 */ @PostMapping("/vaccines/admin/edit") R editVaccinesByAdmin(@RequestBody VaccinesByAdminDTO vaccinesByAdminDTO); /** * 新增疫苗分类信息 * @param vaccinesByAdminDTO 请求参数 * @return 新增结果 * * @param vaccinesByAdminDTO 请求参数 * @return 新增结果 */ @PostMapping("/vaccines/admin/add") R addVaccinesByAdmin(@RequestBody VaccinesByAdminDTO vaccinesByAdminDTO); /** * 查询疫苗登记列表 * * @param vaccinesByAdminDTO 请求参数 * @return 登记列表 * @return 登记列表 */ @PostMapping("/vaccines/admin/enroll/list") R getVaccinesEnrollListByAdmin(@RequestBody VaccinesEnrollByAdminDTO vaccinesByAdminDTO); /** * 删除疫苗分类信息 * @param id 疫苗分类id * @return 删除结果 * * @param id 疫苗分类id * @return 删除结果 */ @PostMapping("/vaccines/admin/enroll/delete") R deleteVaccinesByAdmin(@RequestParam("id") Long id); /** * 根据条件导出登记列表 * @param vaccinesByAdminDTO 请求参数 * @return 登记列表 * * @param vaccinesByAdminDTO 请求参数 * @return 登记列表 */ @PostMapping("/vaccines/admin/enroll/export") R exportVaccinesEnrollListByAdmin(@RequestBody VaccinesEnrollByAdminDTO vaccinesByAdminDTO); /** * 查询接种记录列表 * @param inoculationByAdminDTO 请求参数 * @return 接种记录列表 * * @param inoculationByAdminDTO 请求参数 * @return 接种记录列表 */ @PostMapping("/vaccines/admin/inoculation/list") R getVaccinesInoculationListByAdmin(@RequestBody VaccinesInoculationByAdminDTO inoculationByAdminDTO); /** * 接种记录信息导出 * @param inoculationByAdminDTO 请求参数 * @return 导出结果 * * @param inoculationByAdminDTO 请求参数 * @return 导出结果 */ @PostMapping("/vaccines/admin/inoculation/export") R exportVaccinesInoculationListByAdmin(@RequestBody VaccinesInoculationByAdminDTO inoculationByAdminDTO); /** * 查询疫苗分类列表 * @return 疫苗分类列表 * * @return 疫苗分类列表 */ @PostMapping("/vaccines/admin/enroll/type/list") R getEnrollTypeListByAdmin(); /** * 查询老龄认证记录 * * @param pageComEldersRecordsDTO * @return */ @@ -2762,6 +2883,7 @@ /** * 查询老龄认证记录详细 * * @param id * @return */ @@ -2770,6 +2892,7 @@ /** * 查询老龄认证社区认证方式 * * @param eldersAuthTypeQueryDTO * @return */ @@ -2778,6 +2901,7 @@ /** * 分页查询高领老人列表 * * @param pageEldersAuthElderlyDTO * @return */ @@ -2786,31 +2910,47 @@ /** * 批量保存高龄老人 * * @param newVoList * @param communityId * @return */ @PostMapping("/eldersauthelderly/batchSave") R listSaveEldersAuthElderlyExcelVO(@RequestBody List<EldersAuthElderlyExcelVO> newVoList,@RequestParam("communityId") Long communityId,@RequestParam("createBy") Long createBy); R listSaveEldersAuthElderlyExcelVO(@RequestBody List<EldersAuthElderlyExcelVO> newVoList, @RequestParam("communityId") Long communityId, @RequestParam("createBy") Long createBy); /** * 批量保存楼栋 /** * 批量保存楼栋 * * @param newVoList * @param communityId * @return */ @PostMapping("/building/batchSave") R listSaveBuildingExcelVO(@RequestBody List<ComMngBuildingExcelVO> newVoList,@RequestParam("communityId") Long communityId); R listSaveBuildingExcelVO(@RequestBody List<ComMngBuildingExcelVO> newVoList, @RequestParam("communityId") Long communityId); /** * 根据字典key查询字典项 * * @param key * @return */ @GetMapping("/dictionary/listDictionaryByKey") R<List<BcDictionaryVO>> listDictionaryByKey(@RequestParam("key") String key); /** * description 根据字典code查询自典项 * * @param code 入参参数 * @return BcDictionaryVO 字典 * @author manailin * @date 2021/6/10 17:00 */ @GetMapping("/dictionary/getByCode") BcDictionaryItemVO getByCode(@RequestParam("dictId") String dictId, @RequestParam("code") String code); /** * 查看高龄老人详情 * * @param id * @return */ @@ -2819,6 +2959,7 @@ /** * 修改高龄老人信息 * * @param eldersAuthElderlyDTO * @return */ @@ -2827,6 +2968,7 @@ /** * 删除高领老人 * * @param id * @return */ @@ -2835,40 +2977,45 @@ /** * 通过老人用户id获取老人信息 * @param authUserId 老人用户id * @return 老人信息 * * @param authUserId 老人用户id * @return 老人信息 */ @PostMapping("/elders/getAuth") R getEldersAuthUserByApp(@RequestParam("authUserId") Long authUserId); /** * 人脸核验新增高龄认证记录 * @param authGetResultDTO 请求参数 * @return 新增结果 * * @param authGetResultDTO 请求参数 * @return 新增结果 */ @PostMapping("/elders/add/auth") R addEldersAuthByApp(@RequestBody ComEldersAuthGetResultDTO authGetResultDTO); /** * 高龄认证分页接口 * @param authPageDTO 请求参数 * @return 查询结果 * * @param authPageDTO 请求参数 * @return 查询结果 */ @PostMapping("/elders/page/auth") R pageEldersByApp(@RequestBody ComEldersAuthPageDTO authPageDTO); /** * 添加高龄老人接口 * * @param authUserAddAppDTO 请求参数 * @return 添加结果 * @return 添加结果 */ @PostMapping("/elders/add") R addEldersByApp(@RequestBody ComEldersAuthUserAddAppDTO authUserAddAppDTO); /** * 修改高龄老人接口 * * @param authUserAddAppDTO 请求参数 * @return 修改结果 * @return 修改结果 */ @PostMapping("/elders/edit") R editEldersByApp(@RequestBody ComEldersAuthUserAddAppDTO authUserAddAppDTO); @@ -2876,11 +3023,13 @@ /** * 分页查询生存认证记录 * * @param pageEldersAuthElderlyDTO * @return */ @PostMapping("/elders/records/page") R pageQueryEldersAuthRecord(@RequestBody PageEldersAuthRecordDTO pageEldersAuthElderlyDTO); R pageQueryEldersAuthRecord(@RequestBody PageEldersAuthRecordDTO pageEldersAuthElderlyDTO); /** * description 批量保存重点人群人员信息 * @@ -2889,20 +3038,19 @@ * @author manailin * @date 2021/6/10 17:00 */ @PostMapping("/key_person/batch/save") @PostMapping("/key_person/batch/save") R saveBatchKeyPerson(@RequestBody List<KeyPersonInfoDTO> list); @GetMapping("/screen/population/statistic") R statistic(@RequestParam("communityId")Long communityId); @GetMapping("/screen/population/statistic") R statistic(@RequestParam("communityId") Long communityId); /** * * @param communityId * @param type * @return */ @PostMapping("/elders/setCommunityAuthType") R setCommunityAuthType(@RequestParam("communityId")Long communityId,@RequestParam("type") Integer type); R setCommunityAuthType(@RequestParam("communityId") Long communityId, @RequestParam("type") Integer type); @PostMapping("/elders/getAuthHistoryList") R getAuthHistoryList(@RequestBody PageEldersAuthHistoryDTO pageEldersAuthElderlyDTO); @@ -2910,26 +3058,29 @@ @PostMapping("/elders/getAuthHistoryExport") R getAuthHistoryExport(@RequestBody PageEldersAuthHistoryDTO pageEldersAuthElderlyDTO); @GetMapping("/screen/work/neighborCircle") @GetMapping("/screen/work/neighborCircle") R statisticNeighborCircle(@RequestParam("communityId") Long communityId); /** * 党员党支部统计信息 * * @return */ @PostMapping("/bigscreen/party/orgmembers") R bigscreenPartyOrgmembers(@RequestBody PageBigScreenStatisticPartyOrg pageBigScreenStatisticPartyOrg); /** * 党员年龄占比、男女占比 * 党员年龄占比、男女占比 * * @return */ @PostMapping("/bigscreen/party/ageGender") R<BigScreenStatisticAgeGender> ageGender(@RequestBody BigScreenStatisticAgeGenderDTO bigScreenStatisticAgeGenderDTO); /** * 党建数据概览 * 党建数据概览 * * @return */ @PostMapping("/bigscreen/party/partybuild/{communityId}") @@ -2937,6 +3088,7 @@ /** * 党员活动参加用户排行榜-TOP3 * * @return */ @PostMapping("/bigscreen/party/activitytopuser/{communityId}") @@ -2944,6 +3096,7 @@ /** * 党员活动 * * @return */ @PostMapping("/bigscreen/party/bigscreenPartyactivity") @@ -2951,29 +3104,32 @@ /** * 首页大屏统计接口 * @param communityId 社区id * @return 统计结果 * * @param communityId 社区id * @return 统计结果 */ @GetMapping("/screen/getScreenIndex") R getScreenIndex(@RequestParam("communityId")Long communityId); R getScreenIndex(@RequestParam("communityId") Long communityId); /** * 事件大屏统计接口 * @param communityId 社区id * @return 统计结果 * * @param communityId 社区id * @return 统计结果 */ @GetMapping("/screen/getScreenEvent") R getScreenEvent(@RequestParam("communityId")Long communityId); R getScreenEvent(@RequestParam("communityId") Long communityId); /** * 民生大屏统计接口 * @param communityId 社区id * @return 统计结果 * * @param communityId 社区id * @return 统计结果 */ @GetMapping("/screen/getScreenCivil") R getScreenCivil(@RequestParam("communityId")Long communityId); R getScreenCivil(@RequestParam("communityId") Long communityId); /** /** * 大屏统计邻里圈 */ @GetMapping("/screen/work/wish") @@ -2981,6 +3137,7 @@ /** * 大屏统计社区-活动 * * @param communityId * @return */ @@ -2989,6 +3146,7 @@ /** * 大屏统计一起议 * * @param communityId * @return */ @@ -2997,30 +3155,33 @@ /** * 大屏统计党建工作 * * @param communityId * @return */ @GetMapping("/screen/work/pbWork") R pbWork(@RequestParam("communityId")Long communityId); R pbWork(@RequestParam("communityId") Long communityId); /** * 大屏统计随手拍 * * @param communityId * @return */ @GetMapping("/screen/work/easyPhoto") R easyPhoto(@RequestParam("communityId")Long communityId); R easyPhoto(@RequestParam("communityId") Long communityId); /** * 大屏统计工作情况 * 大屏统计工作情况 * * @param communityId * @return */ @GetMapping("/screen/work/workCount") R workCount(@RequestParam("communityId")Long communityId); R workCount(@RequestParam("communityId") Long communityId); /** /** * description 批量保存残疾人人员信息 * * @param list 疾人信息列表 @@ -3033,70 +3194,79 @@ /** * 获取社区网格 * @param communityId 社区id * @return 网格数据 * * @param communityId 社区id * @return 网格数据 */ @GetMapping("/screen/getScreenGirds") R getScreenGirds(@RequestParam("communityId")Long communityId); R getScreenGirds(@RequestParam("communityId") Long communityId); /** * 事件大屏查询事件详情 * @param eventDetailDTO 请求参数 * @return 事件详情 * * @param eventDetailDTO 请求参数 * @return 事件详情 */ @PostMapping("/screen/getScreenEventDetail") R getScreenEventDetail(@RequestBody BigScreenEventDetailDTO eventDetailDTO); /** * 工作大屏-一起议列表 * @param discussListDTO 请求参数 * @return 一起议列表 * * @param discussListDTO 请求参数 * @return 一起议列表 */ @PostMapping("/screen/work/getScreenDiscussList") R getScreenDiscussList(@RequestBody ScreenDiscussListDTO discussListDTO); /** * 工作大屏-社区活动列表 * @param actActivityListDTO 请求参数 * @return 活动列表 * * @param actActivityListDTO 请求参数 * @return 活动列表 */ @PostMapping("/screen/work/getScreenActActivityList") R getScreenActActivityList(@RequestBody ScreenActActivityListDTO actActivityListDTO); /** * 工作大屏-社区活动报名人员列表 * * @param activityPeopleListDTO 请求参数 * @return 社区活动报名人员列表 * @return 社区活动报名人员列表 */ @PostMapping("/screen/work/getActActivityPeopleList") R getActActivityPeopleList(@RequestBody ScreenActActivityPeopleListDTO activityPeopleListDTO); /** * 工作大屏-微心愿列表 * @param microListDTO 请求参数 * @return 微心愿列表 * * @param microListDTO 请求参数 * @return 微心愿列表 */ @PostMapping("/screen/work/getScreenMicroList") R getScreenMicroList(@RequestBody ScreenMicroListDTO microListDTO); /** * 获取系统参数接口 * @param code 参数code * @return 系统参数 * * @param code 参数code * @return 系统参数 */ @GetMapping("/sys/conf/get") R getConf(@RequestParam("code") String code); /** * 根据社区id获取社区下人口数据信息 * @param populationListDTO 请求参数 * @return 人口数据 * * @param populationListDTO 请求参数 * @return 人口数据 */ @PostMapping("/population/list/app") R getPopulationListByApp(@RequestBody PagePopulationListDTO populationListDTO); /** * 根据人口id获取人口详情 * * @param populationId * @return */ @@ -3105,39 +3275,44 @@ /** * 修复人口加密问题 * @return 修复结果 * * @return 修复结果 */ @GetMapping("/population/repair") R getPopulationRepairByApp(); /** * 工作大屏-社区动态模块数据统计 * @param communityId 社区id * @return 社区动态数据统计 * * @param communityId 社区id * @return 社区动态数据统计 */ @GetMapping("/screen/work/dynamic") R dynamicWork(@RequestParam("communityId")Long communityId); R dynamicWork(@RequestParam("communityId") Long communityId); /** * 查询用户钱包信息 * @param walletDetailDTO 请求参数 * @return 用户钱包信息 * * @param walletDetailDTO 请求参数 * @return 用户钱包信息 */ @PostMapping("/wallet/get/my") R getUserWalletDetail(@RequestBody ComActWalletDetailDTO walletDetailDTO); /** * 查询用户收支记录列表 * @param walletTradeDTO 请求参数 * @return 收支记录 * * @param walletTradeDTO 请求参数 * @return 收支记录 */ @PostMapping("/wallet/get/trade") R getUserWalletTrade(@RequestBody PageComActWalletTradeDTO walletTradeDTO); /** * 查询用户绑定的社区收益排行榜 * @param walletTradeDTO 请求参数 * @return 社区收益排行榜 * * @param walletTradeDTO 请求参数 * @return 社区收益排行榜 */ @PostMapping("/wallet/get/ranking") R getWalletRanking(@RequestBody PageComActWalletTradeDTO walletTradeDTO); springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/DisablePersonApi.java
@@ -3,7 +3,6 @@ import com.alibaba.excel.EasyExcel; import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.model.dtos.community.DisabledPersonsDTO; import com.panzhihua.common.model.dtos.community.KeyPersonInfoDTO; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.service.community.CommunityService; @@ -11,8 +10,6 @@ import com.panzhihua.common.utlis.ExcelUtil; import com.panzhihua.community_backstage.biz.KeyPersonBizServiceImpl; import com.panzhihua.community_backstage.listen.DisablePersonExcelListen; import com.panzhihua.community_backstage.listen.KeyPersonInfoExcelListen; import com.panzhihua.community_backstage.model.dto.KeyPersonExcelExportDto; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/impl/LcApiServiceImpl.java
@@ -7,27 +7,25 @@ import com.alibaba.fastjson.JSONObject; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.panzhihua.common.api.LcApiConstants; import com.panzhihua.common.api.LcRequestEnum; import com.panzhihua.common.api.LcReturnObject; import com.panzhihua.common.api.LcVisitRecordKeyPersonLabelEnum; import com.panzhihua.common.api.*; import com.panzhihua.common.constants.TokenConstant; import com.panzhihua.common.enums.LocalEventToLangChaoEventTypeEnum; import com.panzhihua.common.model.dtos.api.EventFile; import com.panzhihua.common.model.dtos.api.EventInfo; import com.panzhihua.common.model.dtos.grid.LcEventVisitingTasksListDTO; import com.panzhihua.common.model.vos.BcDictionaryItemVO; import com.panzhihua.common.model.vos.BcDictionaryVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComMngPopulationVO; import com.panzhihua.common.model.vos.grid.EventDetailsVO; import com.panzhihua.common.model.vos.grid.EventGridDataDetailsVO; import com.panzhihua.common.model.vos.grid.EventResourceVO; import com.panzhihua.common.service.community.CommunityService; import com.panzhihua.common.service.grid.GridService; import com.panzhihua.common.utlis.CopyUtil; import com.panzhihua.common.utlis.DateUtils; import com.panzhihua.serviceapi.biz.LcApiService; import com.panzhihua.serviceapi.model.dto.LcFlowPersonVisitRecordDTO; import com.panzhihua.serviceapi.model.dto.LcGridData; import com.panzhihua.serviceapi.model.dto.LcKeyPersonVisitRecordDTO; import com.panzhihua.serviceapi.model.dto.LcKeyPersonVisitRecordQueryDTO; import com.panzhihua.serviceapi.model.dto.*; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.StringRedisTemplate; @@ -116,7 +114,7 @@ log.info("方法submitEventRegister发生错误：{}", e.getMessage()); } HttpResponse result = request.execute(); log.info("submit上传浪潮事件信息：{}", result.body()); log.info("submitEventRegister上传浪潮事件信息：{}", result.body()); return result.body(); } @@ -137,7 +135,7 @@ file.delete(); return R.ok(result.body()); } catch (Exception e) { log.info("方法submitEventRelationFile发生错误：{}", e.getMessage()); log.info("方法submitEventOrVisitRecordRelationFile发生错误：{}", e.getMessage()); } return R.fail(); } @@ -249,7 +247,7 @@ log.info("方法uploadFlowPersonVisitRecord发生错误：{}", e.getMessage()); } HttpResponse result = request.execute(); log.info("submit上传浪潮事件信息：{}", result.body()); log.info("uploadFlowPersonVisitRecord上传浪潮事件信息：{}", result.body()); return result.body(); } @@ -266,7 +264,7 @@ log.info("方法uploadKeyPersonVisitRecord发生错误：{}", e.getMessage()); } HttpResponse result = request.execute(); log.info("submit上传浪潮事件信息：{}", result.body()); log.info("uploadKeyPersonVisitRecord上传浪潮事件信息：{}", result.body()); return result.body(); } @@ -292,19 +290,25 @@ String lcGrid = gridService.getLcGridIdByLocal(lcEventVisitingTasksListDTO.getGridId()); String lcGridUserId = gridService.getLcUserIdByLocalUserId(lcEventVisitingTasksListDTO.getGridMember().toString()); R populationDetail = communityService.detailPopulation(lcEventVisitingTasksListDTO.getVisiterId()); ComMngPopulationVO comMngPopulationVO = (ComMngPopulationVO) populationDetail.getData(); BcDictionaryItemVO diction = communityService.getByCode(DictionItemConstants.LC_CULTURE_LEVEL, comMngPopulationVO.getCultureLevel().toString()); ComMngPopulationDTO comMngPopulationDTO = CopyUtil.copyProperties(comMngPopulationVO, ComMngPopulationDTO.class); if (diction != null) { comMngPopulationDTO.setCultureLevel(diction.getDictItemName()); } R grid = gridService.eventGridDataDetails(lcEventVisitingTasksListDTO.getGridId()); EventGridDataDetailsVO gridData = (EventGridDataDetailsVO) grid.getData(); String[] data = lcEventVisitingTasksListDTO.getHappentLatLng().split(","); if (lcEventVisitingTasksListDTO.getVisiterType() != null) { log.info("上传数据导重点人口走访记录表"); LcReturnObject lcReturnObject = requestLcKeyPersonVisitRecord(lcEventVisitingTasksListDTO, lcGrid, lcGridUserId, populationDetail.getData(), gridData.getGridName(), data); LcReturnObject lcReturnObject = requestLcKeyPersonVisitRecord(lcEventVisitingTasksListDTO, lcGrid, lcGridUserId, comMngPopulationDTO, gridData.getGridName(), data); if (LcRequestEnum.SUCCESS.getCode().equals(lcReturnObject.getCode())) { uploadVisitRecord(lcEventVisitingTasksListDTO); gridService.updateLcUploadFlagVisitingTask(lcEventVisitingTasksListDTO.getId()); } } else { log.info("上传数据导流动人口走访记录表"); LcReturnObject lcReturnObject = requestLcFlowPersonVisitRecord(lcEventVisitingTasksListDTO, lcGrid, lcGridUserId, populationDetail.getData(), gridData.getGridName(), data); LcReturnObject lcReturnObject = requestLcFlowPersonVisitRecord(lcEventVisitingTasksListDTO, lcGrid, lcGridUserId, comMngPopulationDTO, gridData.getGridName(), data); if (LcRequestEnum.SUCCESS.getCode().equals(lcReturnObject.getCode())) { uploadVisitRecord(lcEventVisitingTasksListDTO); gridService.updateLcUploadFlagVisitingTask(lcEventVisitingTasksListDTO.getId()); @@ -369,10 +373,10 @@ lcFlowPersonVisitRecordDTO.setIsAbnormal(lcEventVisitingTasksListDTO.getException().toString()); lcFlowPersonVisitRecordDTO.setAbnormalSituation(lcEventVisitingTasksListDTO.getTableContentJson()); lcFlowPersonVisitRecordDTO.setRemark(lcEventVisitingTasksListDTO.getEventDes()); log.info("事件请求数据：{}", JSONObject.toJSONString(lcFlowPersonVisitRecordDTO)); log.info("requestLcFlowPersonVisitRecord事件请求数据：{}", JSONObject.toJSONString(lcFlowPersonVisitRecordDTO)); String flowPersonData = uploadFlowPersonVisitRecord(lcFlowPersonVisitRecordDTO); LcReturnObject lcReturnObject = JSONObject.parseObject(flowPersonData, LcReturnObject.class); log.info("提交浪潮服务器，接口返回结果为：{}", lcReturnObject); log.info("requestLcFlowPersonVisitRecord提交浪潮服务器，接口返回结果为：{}", lcReturnObject); return lcReturnObject; } @@ -397,10 +401,10 @@ keyPersonVisitRecordDTO.setAbnormalDes(lcEventVisitingTasksListDTO.getTableContentJson()); keyPersonVisitRecordDTO.setRemark(lcEventVisitingTasksListDTO.getEventDes()); keyPersonVisitRecordDTO.setType(LcVisitRecordKeyPersonLabelEnum.getCnDescByName(lcEventVisitingTasksListDTO.getVisiterType())); log.info("事件请求数据：{}", JSONObject.toJSONString(keyPersonVisitRecordDTO)); log.info("requestLcKeyPersonVisitRecord事件请求数据：{}", JSONObject.toJSONString(keyPersonVisitRecordDTO)); String remoteData = uploadKeyPersonVisitRecord(keyPersonVisitRecordDTO); LcReturnObject lcReturnObject = JSONObject.parseObject(remoteData, LcReturnObject.class); log.info("提交浪潮服务器，接口返回结果为：{}", remoteData); log.info("requestLcKeyPersonVisitRecord提交浪潮服务器，接口返回结果为：{}", remoteData); return lcReturnObject; }
@@ -116,6 +116,10 @@ */ private String nativePlace; /** * 民族code */ private String nativeCode; /** * 民族 */ private String nation; @@ -132,7 +136,7 @@ /** * 文化程度(1.小学 2.初中 3.高中 4.中专 5.大专 6.本科 7.硕士 8.博士 9.其他) */ private Integer cultureLevel; private String cultureLevel; /** * 婚姻状况(1.未婚 2.已婚 3.离异 4.丧偶 5.分居 6.其他) springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/DictionaryApi.java
@@ -1,5 +1,6 @@ package com.panzhihua.service_community.api; import com.panzhihua.common.model.vos.BcDictionaryItemVO; import com.panzhihua.common.model.vos.BcDictionaryVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.service_community.service.BcDictionaryService; @@ -31,4 +32,17 @@ return bcDictionaryService.getDictionaryByKey(key); } /** * description 根据字典code查询自典项 * * @param code 入参参数 * @return BcDictionaryVO 字典 * @author manailin * @date 2021/6/10 17:00 */ @GetMapping("/getByCode") BcDictionaryItemVO getByCode(@RequestParam("dictId") String dictId, @RequestParam("code")String code){ return bcDictionaryService.getByCode(dictId,code); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationDO.java
@@ -123,6 +123,10 @@ /** * 民族 */ private String nationCode; /** * 民族 */ private String nation; /** * 是否租住(0.否 1.是) springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/BcDictionaryService.java
@@ -1,6 +1,7 @@ package com.panzhihua.service_community.service; import com.baomidou.mybatisplus.extension.service.IService; import com.panzhihua.common.model.vos.BcDictionaryItemVO; import com.panzhihua.common.model.vos.BcDictionaryVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.service_community.model.dos.BcDictionaryItemDO; @@ -19,4 +20,14 @@ * @return */ R<List<BcDictionaryVO>> getDictionaryByKey(String key); /** * description 根据字典code查询自典项 * * @param dictId 字典类型 * @param code 入参参数 * @return BcDictionaryVO 字典 * @author manailin * @date 2021/6/10 17:00 */ BcDictionaryItemVO getByCode(String dictId, String code); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BcDictionaryServiceImpl.java
@@ -1,12 +1,14 @@ package com.panzhihua.service_community.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.panzhihua.common.model.vos.BcDictionaryItemVO; import com.panzhihua.common.model.vos.BcDictionaryVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.utlis.CopyUtil; import com.panzhihua.service_community.dao.BcDictionaryItemDAO; import com.panzhihua.service_community.model.dos.BcDictionaryItemDO; import com.panzhihua.service_community.service.BcDictionaryService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -24,7 +26,7 @@ public R<List<BcDictionaryVO>> getDictionaryByKey(String key) { List<BcDictionaryItemDO> list = baseMapper.getDictionaryByKey(key); List<BcDictionaryVO> listVO = new ArrayList<>(); for (BcDictionaryItemDO dictionaryItemDO:list){ for (BcDictionaryItemDO dictionaryItemDO : list) { BcDictionaryVO bcDictionaryVO = new BcDictionaryVO(); bcDictionaryVO.setCode(dictionaryItemDO.getMnemonicCode()); bcDictionaryVO.setDictName(dictionaryItemDO.getDictItemName()); @@ -33,4 +35,17 @@ } return R.ok(listVO); } @Override public BcDictionaryItemVO getByCode(String dictId, String code) { BcDictionaryItemDO dictionaryItemDO = baseMapper.selectOne( new QueryWrapper<BcDictionaryItemDO>() .eq("dict_id", dictId) .eq("dict_value", code) ); if (dictionaryItemDO != null) { return CopyUtil.copyProperties(dictionaryItemDO, BcDictionaryItemVO.class); } return null; } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComStreetServiceImpl.java
@@ -21,7 +21,6 @@ import org.springframework.util.ObjectUtils; import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; /** @@ -64,7 +63,7 @@ BeanUtils.copyProperties(comStreetDO1, comStreetVO); return R.ok(comStreetVO); } return R.fail(500,""); return R.fail(500, ""); } @@ -126,10 +125,10 @@ Long pageNum = pageComStreetDTO.getPageNum(); Long pageSize = pageComStreetDTO.getPageSize(); if (null == pageNum || 0 == pageNum) { pageNum = 1l; pageNum = 1L; } if (null == pageSize || 0 == pageSize) { pageSize = 10l; pageSize = 10L; } page.setSize(pageSize); page.setCurrent(pageNum); @@ -163,6 +162,5 @@ } return R.fail(); } } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventVisitingTasksApi.java
@@ -19,107 +19,116 @@ import java.util.List; /** * * @author cedoo email:cedoo(a)qq.com * @version 1.0 * @since 1.0 * @date 2021-05-26 * */ * @since 1.0 */ @Slf4j @RestController @RequestMapping("/eventvisitingtasks") public class EventVisitingTasksApi{ public class EventVisitingTasksApi { @Resource private EventVisitingTasksService eventVisitingTasksService; /** * 统计走访任务 * * @param communityId * @return */ @GetMapping("/count") R count(@RequestParam("communityId") Long communityId){ R count(@RequestParam("communityId") Long communityId) { return eventVisitingTasksService.count(communityId); } /** * 修改重点人群走访记录 * * @param eventVisitingTasksEditDTO * @return 维护结果 */ @PostMapping("/edit") R edit(@RequestBody EventVisitingTasksEditDTO eventVisitingTasksEditDTO){ R edit(@RequestBody EventVisitingTasksEditDTO eventVisitingTasksEditDTO) { return eventVisitingTasksService.edit(eventVisitingTasksEditDTO); } /** * 分页查找重点人群走访记录 * * @param pageEventVisitingTasksDTO * @return 维护结果 */ @PostMapping("/page") R<IPage<EventVisitingTasksVO>> query(@RequestBody PageEventVisitingTasksDTO pageEventVisitingTasksDTO){ R<IPage<EventVisitingTasksVO>> query(@RequestBody PageEventVisitingTasksDTO pageEventVisitingTasksDTO) { return eventVisitingTasksService.query(pageEventVisitingTasksDTO); } /** * 查询重点人群走访记录详细信息 * * @param id 重点人群走访记录 id * @return 查找结果 */ @PostMapping("/{id}") R<EventVisitingTasksDetailsVO> eventVisitingTasksDetails(@PathVariable("id") Long id){ R<EventVisitingTasksDetailsVO> eventVisitingTasksDetails(@PathVariable("id") Long id) { return eventVisitingTasksService.eventVisitingTasksDetails(id); } /** * 删除走访任务 * * @param ids * @param communityId * @return */ @PostMapping("/delete") R delete(@RequestParam("ids") String ids, @RequestParam("communityId") Long communityId){ return eventVisitingTasksService.delete(ids,communityId); R delete(@RequestParam("ids") String ids, @RequestParam("communityId") Long communityId) { return eventVisitingTasksService.delete(ids, communityId); } /** * 需走访人员列表 * * @param query * @return */ @PostMapping("/visitorList") R visitorList(@RequestBody EventVisitListQuery query){ R visitorList(@RequestBody EventVisitListQuery query) { return eventVisitingTasksService.visitorList(query); } /** * 新增走访任务 * * @param ids * @param communityId * @param userId * @return */ @PostMapping("/add") R add(@RequestParam("ids") String ids,@RequestParam("communityId") Long communityId,@RequestParam("userId") Long userId) throws Exception { return eventVisitingTasksService.add(ids,communityId,userId); R add(@RequestParam("ids") String ids, @RequestParam("communityId") Long communityId, @RequestParam("userId") Long userId) throws Exception { return eventVisitingTasksService.add(ids, communityId, userId); } /** * 走访记录 * * @param query * @return */ @PostMapping("/list") R list(@RequestBody EventTasksQuery query){ R list(@RequestBody EventTasksQuery query) { return eventVisitingTasksService.list(query); } /** * 走访任务列表 * * @param query * @return */ @@ -131,6 +140,7 @@ /** * app走访任务列表 * * @param query * @return * @throws Exception @@ -143,6 +153,7 @@ /** * 导出 * * @param query * @return */ @@ -153,6 +164,7 @@ /** * app走访详情 * * @param id * @return */ @@ -163,41 +175,45 @@ /** * 撤销走访 * * @param id * @return */ @PostMapping("/cancel/{id}") R cancel(@PathVariable("id") Long id){ R cancel(@PathVariable("id") Long id) { return eventVisitingTasksService.cancel(id); } /** * 恢复 * * @param id * @return */ @PostMapping("/reset/{id}") R reset(@PathVariable("id") Long id){ R reset(@PathVariable("id") Long id) { return eventVisitingTasksService.reset(id); } /** * 开始走访 * * @param id * @return */ @PostMapping("/start") R start(@RequestParam("id")Long id,@RequestParam("userId")Long userId){ return eventVisitingTasksService.start(id,userId); R start(@RequestParam("id") Long id, @RequestParam("userId") Long userId) { return eventVisitingTasksService.start(id, userId); } /** * 完成走访记录 * * @param taskCompleteDTO * @return */ @PostMapping("/complete") R complete(@RequestBody EventVisitCompleteDTO taskCompleteDTO){ R complete(@RequestBody EventVisitCompleteDTO taskCompleteDTO) { return eventVisitingTasksService.complete(taskCompleteDTO); }
@@ -1,24 +1,21 @@ package com.panzhihua.service_grid.api; import com.panzhihua.common.model.dtos.grid.*; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.grid.EventGridDataDetailsVO; import com.panzhihua.service_grid.service.EventGridDataService; import com.panzhihua.service_grid.service.LcCompareCodeService; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.util.List; /** * * @author cedoo email:cedoo(a)qq.com * @author manailin * @version 1.0 * @since 1.0 * @date 2021-05-26 * */ * @since 1.0 */ @Slf4j @RestController @RequestMapping("/lc_compare") @@ -30,26 +27,26 @@ /** * description 根据本地网格ID，查询对于的浪潮市平台对应的ID * * @param id 本地网格ID * @param id 本地网格ID * @return String 浪潮市平台对应的ID * @author manailin * @date 2021/6/10 17:00 */ @GetMapping("/{id}") String getLcGridIdByLocal(@PathVariable("id") Long id){ String getLcGridIdByLocal(@PathVariable("id") Long id) { return lcCompareCodeService.getLcGridIdByLocal(id); } /** * description 根据本地网格ID，查询对于的浪潮市平台对应的ID * * @param localUserId 本地网格员ID * @param localUserId 本地网格员ID * @return String 浪潮市平台对应的ID * @author manailin * @date 2021/6/10 17:00 */ @GetMapping("/getLcUserId") String getLcUserIdByLocalUserId(String localUserId){ String getLcUserIdByLocalUserId(String localUserId) { return lcCompareCodeService.getLcUserIdByLocal(localUserId); } } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/ApplicationAppReleaseMapper.java
@@ -4,8 +4,6 @@ import com.panzhihua.service_grid.model.dos.ApplicationAppRelease; import org.apache.ibatis.annotations.Param; import java.math.BigInteger; /** * 应用APP版本控制表Mapper * ClassName ApplicationAppReleaseMapper springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
@@ -14,7 +14,6 @@ import com.panzhihua.common.model.dtos.community.ComMngPopulationDTO; import com.panzhihua.common.model.dtos.community.bigscreen.event.ScreenEventListDTO; import com.panzhihua.common.model.dtos.grid.*; import com.panzhihua.common.model.helper.AESUtil; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActVO; import com.panzhihua.common.model.vos.community.screen.event.EventListVO; @@ -22,15 +21,14 @@ import com.panzhihua.common.model.vos.screen.*; import com.panzhihua.common.service.community.CommunityService; import com.panzhihua.common.utlis.DateUtils; import com.panzhihua.common.utlis.ExcelSelectListUtil; import com.panzhihua.common.utlis.LngLatUtils; import com.panzhihua.common.utlis.StringUtils; import com.panzhihua.service_grid.dao.*; import com.panzhihua.service_grid.model.dos.*; import com.panzhihua.service_grid.service.*; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; @@ -70,7 +68,7 @@ private final String moth_format_str = "yyyy-MM"; private final String[] monthStr = new String[]{"一","二","三","四","五","六","七","八","九","十","十一","十二"}; private final String[] monthStr = new String[]{"一", "二", "三", "四", "五", "六", "七", "八", "九", "十", "十一", "十二"}; /** * 分页查找事件 @@ -252,22 +250,22 @@ eventDetailsVO.setTrans(eventTransferRecordVOS); //查询网格员头像,姓名 Map<String,Object> gridMember = eventMapper.getUserBaseInfo(eventDO.getGridMemberId()); Map<String, Object> gridMember = eventMapper.getUserBaseInfo(eventDO.getGridMemberId()); if (!CollectionUtils.isEmpty(gridMember)) { eventDetailsVO.setGridMemberName(gridMember.get("name") == null ? "" : gridMember.get("name").toString()); eventDetailsVO.setGridMemberImageUrl(gridMember.get("image_url") == null ? "" : gridMember.get("image_url").toString()); } if(Objects.equals(eventDO.getGridMemberId(),eventDO.getCreateBy())){ if (Objects.equals(eventDO.getGridMemberId(), eventDO.getCreateBy())) { eventDetailsVO.setCreator(eventDetailsVO.getGridMemberName()); }else{ Map<String,Object> createUser = eventMapper.getUserBaseInfo(eventDO.getCreateBy()); } else { Map<String, Object> createUser = eventMapper.getUserBaseInfo(eventDO.getCreateBy()); eventDetailsVO.setCreator(createUser.get("name") == null ? "" : createUser.get("name").toString()); } //当事件为特殊人群上报时，需要查询事件与人口关联关系 if(eventDetailsVO.getEventType().equals(6)){ if (eventDetailsVO.getEventType().equals(6)) { List<EventSpecialPopulationDetailsVO> specialPopulationList = eventSpecialCrowdRecordMapper.getSpecialPopulationIds(eventDetailsVO.getId()); if(!specialPopulationList.isEmpty()){ if (!specialPopulationList.isEmpty()) { specialPopulationList.forEach(special -> { special.setAge(IdcardUtil.getAgeByIdCard(special.getIdCard())); }); @@ -296,8 +294,8 @@ } //检查特殊人群上报时参数 if(commonEventAddDTO.getEventType().equals(6)){ if(commonEventAddDTO.getPopulationIds() == null || commonEventAddDTO.getPopulationIds().size() <= 0){ if (commonEventAddDTO.getEventType().equals(6)) { if (commonEventAddDTO.getPopulationIds() == null || commonEventAddDTO.getPopulationIds().size() <= 0) { return R.fail("上报人员为空"); } } @@ -315,7 +313,7 @@ if (eventMapper.insert(eventDO) == 1) { //如果是特殊人群，则新增特殊人群与事件关系 if(commonEventAddDTO.getEventType().equals(6)){ if (commonEventAddDTO.getEventType().equals(6)) { List<EventSpecialCrowdRecordDO> crowdRecordList = new ArrayList<>(); commonEventAddDTO.getPopulationIds().forEach(populationId -> { EventSpecialCrowdRecordDO specialCrowdRecordDO = new EventSpecialCrowdRecordDO(); @@ -337,7 +335,7 @@ eventResourceDO.setRefId(eventDO.getId()); eventResourceDO.setCreateBy(commonEventAddDTO.getUserId()); eventResourceDO.setResourceTime(commonEventAddDTO.getAudioTime()); eventResourceDO.setResourceName(commonEventAddDTO.getAudio().substring(commonEventAddDTO.getAudio().lastIndexOf("/")+1)); eventResourceDO.setResourceName(commonEventAddDTO.getAudio().substring(commonEventAddDTO.getAudio().lastIndexOf("/") + 1)); int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO); if (audioAdd != 1) { throw new ServiceException("添加音频失败"); @@ -352,7 +350,7 @@ eventResourceDO.setRefId(eventDO.getId()); eventResourceDO.setCreateBy(commonEventAddDTO.getUserId()); eventResourceDO.setResourceTime(commonEventAddDTO.getVideoTime()); eventResourceDO.setResourceName(commonEventAddDTO.getVideo().substring(commonEventAddDTO.getVideo().lastIndexOf("/")+1)); eventResourceDO.setResourceName(commonEventAddDTO.getVideo().substring(commonEventAddDTO.getVideo().lastIndexOf("/") + 1)); int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO); if (videoAdd != 1) { throw new ServiceException("添加视频失败"); @@ -368,7 +366,7 @@ eventResourceDO.setUrl(pica[i]); eventResourceDO.setRefId(eventDO.getId()); eventResourceDO.setCreateBy(commonEventAddDTO.getUserId()); eventResourceDO.setResourceName(pica[i].substring(pica[i].lastIndexOf("/")+1)); eventResourceDO.setResourceName(pica[i].substring(pica[i].lastIndexOf("/") + 1)); int picAdd = eventResourceService.getBaseMapper().insert(eventResourceDO); if (picAdd != 1) { throw new ServiceException("添加图片失败"); @@ -391,8 +389,8 @@ if (commonEventEditDTO.getId() == null) { //检查特殊人群上报时参数 if(commonEventEditDTO.getEventType().equals(6)){ if(commonEventEditDTO.getPopulationIds().isEmpty()){ if (commonEventEditDTO.getEventType().equals(6)) { if (commonEventEditDTO.getPopulationIds().isEmpty()) { return R.fail("上报人员为空"); } } @@ -412,7 +410,7 @@ if (eventMapper.insert(eventDO) > 0) { //如果是特殊人群，则新增特殊人群与事件关系 if(commonEventEditDTO.getEventType().equals(6)){ if (commonEventEditDTO.getEventType().equals(6)) { List<EventSpecialCrowdRecordDO> crowdRecordList = new ArrayList<>(); commonEventEditDTO.getPopulationIds().forEach(populationId -> { EventSpecialCrowdRecordDO specialCrowdRecordDO = new EventSpecialCrowdRecordDO(); @@ -616,9 +614,9 @@ if (eventDO == null) { return R.fail("事件不存在"); } boolean canDealByUser = (eventDO.getEventStatus() == 2||eventDO.getEventStatus()==4) && eventDO.getEventProcessStatus() == 1; boolean canDealByUser = (eventDO.getEventStatus() == 2 || eventDO.getEventStatus() == 4) && eventDO.getEventProcessStatus() == 1; if (!canDealByUser) { if (eventDO.getEventStatus() != 2 ) { if (eventDO.getEventStatus() != 2) { return R.fail("事件不是发布/待处理状态"); } if (eventDO.getEventProcessStatus() != 1) { @@ -736,7 +734,7 @@ public R republishEvent(CommonEventRepublishDTO commonEventRepublishDTO) { EventDO eventDO = this.getBaseMapper().selectById(commonEventRepublishDTO.getId()); //boolean canRepublishByUser = eventDO.getEventStatus() == 4 || eventDO.getEventStatus() == 1; boolean canRepublishByUser = eventDO.getEventDealStatus() == 7|eventDO.getEventDealStatus() == 5; //已失效状态 boolean canRepublishByUser = eventDO.getEventDealStatus() == 7 | eventDO.getEventDealStatus() == 5; //已失效状态 if (!canRepublishByUser) { return R.fail("当前不是撤销/草稿状态"); } @@ -1026,9 +1024,9 @@ eventDO.setEventCategory(2l);//宣传事件 eventDO.setEventStatus(2);//事件状态 2发布 eventDO.setEventType(8); if(publicityEventAddDTO.getGridMemberId()!=null) { if (publicityEventAddDTO.getGridMemberId() != null) { eventDO.setGridMemberId(publicityEventAddDTO.getGridMemberId()); }else{ } else { eventDO.setGridMemberId(publicityEventAddDTO.getUserId()); } eventDO.setGridMemberName(publicityEventAddDTO.getUserName()); @@ -1382,7 +1380,7 @@ if (eventDO == null) { return R.fail("事件不存在"); } boolean canRepulish = eventDO.getEventDealStatus() == 7|eventDO.getEventDealStatus() == 5; //已失效状态 boolean canRepulish = eventDO.getEventDealStatus() == 7 | eventDO.getEventDealStatus() == 5; //已失效状态 if (!canRepulish) { return R.fail("当前事件不是已失效状态/草稿状态，不能重新发布"); } @@ -1737,7 +1735,7 @@ public R getNearByGrid(PageEventGridNearbyDTO pageEventGridNearbyDTO) { Page page = new Page(pageEventGridNearbyDTO.getPageNum(), pageEventGridNearbyDTO.getPageSize()); String latLng = pageEventGridNearbyDTO.getHappentLatLng(); if(!latLng.matches("^[\\-\\+]?(0(\\.\\d{1,10})?|([1-9](\\d)?)(\\.\\d{1,10})?|1[0-7]\\d{1}(\\.\\d{1,10})?|180\\.0{1,10}),[\\-\\+]?((0|([1-8]\\d?))(\\.\\d{1,10})?|90(\\.0{1,10})?)$")){ if (!latLng.matches("^[\\-\\+]?(0(\\.\\d{1,10})?|([1-9](\\d)?)(\\.\\d{1,10})?|1[0-7]\\d{1}(\\.\\d{1,10})?|180\\.0{1,10}),[\\-\\+]?((0|([1-8]\\d?))(\\.\\d{1,10})?|90(\\.0{1,10})?)$")) { return R.fail("经纬度参数错误"); } String latLngArr[] = latLng.split(","); @@ -1750,7 +1748,7 @@ List<EventGridDataVO> rtEventGridList = new ArrayList<>(); for (EventGridDataAreaVO eventGridDataDO : gridList) { String data = eventGridDataDO.getData(); if(data!=null) { if (data != null) { List<LatLngVO> latLngList = LngLatUtils.getLatLngFromText(data); boolean inGrid = LngLatUtils.isInPolygon(latLngList, lng, lat); if (inGrid) { @@ -1764,7 +1762,7 @@ } else { return R.ok("未找到社区"); } }catch (Exception e){ } catch (Exception e) { return R.fail(e.getMessage()); } } @@ -1792,7 +1790,7 @@ throw new ServiceException("删除事件失败"); } } }catch (Exception e){ } catch (Exception e) { throw new ServiceException("事件ID错误，删除失败"); } } @@ -1814,7 +1812,7 @@ Long eventId = -1L; try { eventId = Long.parseLong(id); }catch (Exception e){ } catch (Exception e) { throw new ServiceException("事件ID错误，发布失败"); } EventDO eventDO = this.getBaseMapper().selectById(eventId); @@ -1835,7 +1833,7 @@ throw new ServiceException("更新事件状态失败"); } addTransferRecord(eventDO.getId(), userId, userName, 1, "重新发布已撤销事件", userId, userName, 8); "重新发布已撤销事件", userId, userName, 8); } return R.ok(); } else { @@ -1856,7 +1854,7 @@ Long eventId = -1L; try { eventId = Long.parseLong(id); }catch (Exception e){ } catch (Exception e) { throw new ServiceException("事件ID错误，不能标记失效"); } EventDO eventDO = this.getBaseMapper().selectById(eventId); @@ -1901,36 +1899,38 @@ /** * 根据网格id查询网格统计数据 * @param gridId 网格id * @return 网格统计数据 * * @param gridId 网格id * @return 网格统计数据 */ @Override public R getGridEventStatisticsByApp(Long gridId){ public R getGridEventStatisticsByApp(Long gridId) { return R.ok(this.baseMapper.getGridEventStatisticsByApp(gridId)); } /** * 查询网格事件统计数据 * * @param statisticsDTO 请求参数 * @return 网格事件统计数据 * @return 网格事件统计数据 */ @Override public R getGridEventDetailStatisticsByApp(GridEventStatisticsDTO statisticsDTO){ public R getGridEventDetailStatisticsByApp(GridEventStatisticsDTO statisticsDTO) { GridEventStatisticsDetailVO statisticsDetailVO = this.baseMapper.getGridEventDetailStatisticsByApp(statisticsDTO); if(statisticsDetailVO == null){ if (statisticsDetailVO == null) { statisticsDetailVO = new GridEventStatisticsDetailVO(); } if(statisticsDetailVO.getEventSSPTotal() == null){ if (statisticsDetailVO.getEventSSPTotal() == null) { statisticsDetailVO.setEventSSPTotal(0); } if(statisticsDetailVO.getNoEventSSPTotal() == null){ if (statisticsDetailVO.getNoEventSSPTotal() == null) { statisticsDetailVO.setNoEventSSPTotal(0); } if(statisticsDetailVO.getEventZFTotal() == null){ if (statisticsDetailVO.getEventZFTotal() == null) { statisticsDetailVO.setEventZFTotal(0); } if(statisticsDetailVO.getNoEventZFTotal() == null){ if (statisticsDetailVO.getNoEventZFTotal() == null) { statisticsDetailVO.setNoEventZFTotal(0); } @@ -1951,7 +1951,7 @@ @Transactional(rollbackFor = Exception.class) public R reportDirect(CommonEventDirectReportDTO commonEventDirectReportDTO) { if(commonEventDirectReportDTO.getEventId()!=null){ if (commonEventDirectReportDTO.getEventId() != null) { //编辑原来的 EventDO eventDO = eventMapper.selectById(commonEventDirectReportDTO.getEventId()); if (eventDO.getEventStatus() != null && eventDO.getEventStatus() != 1 && eventDO.getEventDealStatus() != 6) { @@ -2038,7 +2038,7 @@ return R.ok(); } }else{ } else { EventDO eventDO = new EventDO(); BeanUtils.copyProperties(commonEventDirectReportDTO, eventDO); eventDO.setGridMemberId(commonEventDirectReportDTO.getUserId()); @@ -2133,21 +2133,22 @@ /** * 事件大屏查询事件列表 * @param eventListDTO 请求参数 * @return 事件列表 * * @param eventListDTO 请求参数 * @return 事件列表 */ @Override public R getScreenEventList(ScreenEventListDTO eventListDTO) { if (eventListDTO.getEventTypes() != null && !eventListDTO.getEventTypes().isEmpty()) { eventListDTO.getEventTypes().forEach(eventType -> { if(eventType.equals(ScreenEventListDTO.eventType.xc)){ if (eventType.equals(ScreenEventListDTO.eventType.xc)) { eventListDTO.setEventCategory(null); } }); } IPage<EventListVO> eventPageList = this.baseMapper.getScreenEventList(new Page(eventListDTO.getPageNum(), eventListDTO.getPageSize()), eventListDTO); if(!eventPageList.getRecords().isEmpty()){ if (!eventPageList.getRecords().isEmpty()) { eventPageList.getRecords().forEach(event -> { //查询事件关联附件 List<EventResourceDO> eventResourceDOList = @@ -2187,23 +2188,24 @@ /** * 特殊人群上报-社区人口数据列表 * @param specialPopulationDTO 请求参数 * @return 社区人口数据列表 * * @param specialPopulationDTO 请求参数 * @return 社区人口数据列表 */ @Override public R specialPopulationList(PageEventSpecialPopulationDTO specialPopulationDTO) { IPage<EventSpecialPopulationVO> specialPopulationVOIPage = this.baseMapper.specialPopulationList(new Page(specialPopulationDTO.getPageNum(), specialPopulationDTO.getPageSize()), specialPopulationDTO); if(!specialPopulationVOIPage.getRecords().isEmpty()){ if (!specialPopulationVOIPage.getRecords().isEmpty()) { specialPopulationVOIPage.getRecords().forEach(specialPopulation -> { specialPopulation.setAge(IdcardUtil.getAgeByIdCard(specialPopulation.getIdCard())); }); } return R.ok(specialPopulationVOIPage); } @Override public List<EventDetailsVO> getUnUploadEvent() { List<EventDetailsVO> eventDetailsVOList =new ArrayList<>(); List<EventDetailsVO> eventDetailsVOList = new ArrayList<>(); List<EventDO> unEventList = baseMapper.selectList( new QueryWrapper<EventDO>() .eq("upload", false) @@ -2221,46 +2223,46 @@ EventDO event = baseMapper.selectById(id); event.setUpload(true); baseMapper.updateById(event); EventResourceDO eventResourceDO =new EventResourceDO(); EventResourceDO eventResourceDO = new EventResourceDO(); eventResourceDO.setUpload(true); int flag = eventResourceMapper.update(eventResourceDO, new QueryWrapper<EventResourceDO>() .eq("ref_id", id)); if(flag>0){ if (flag > 0) { return true; } return false; } public R eventWork(Long communityId){ public R eventWork(Long communityId) { EventWorkScreenVO workScreenVO = new EventWorkScreenVO(); String date = DateUtils.getDateFormatString(new Date(),moth_format_str); Map<String,Long> countMap = this.eventMapper.countByCommunityId(communityId,date); if(!countMap.isEmpty()){ workScreenVO.setResolvedNum(countMap.get("resolvedNum")== null ? 0L : Long.valueOf(countMap.get("resolvedNum").toString())); workScreenVO.setPendingNum(countMap.get("pendingNum")== null ? 0L : Long.valueOf(countMap.get("pendingNum").toString())); workScreenVO.setPropagandaNum(countMap.get("propagandaNum")== null ? 0L : Long.valueOf(countMap.get("propagandaNum").toString())); workScreenVO.setCurrentNum(countMap.get("currentNum")== null ? 0L : Long.valueOf(countMap.get("currentNum").toString())); String date = DateUtils.getDateFormatString(new Date(), moth_format_str); Map<String, Long> countMap = this.eventMapper.countByCommunityId(communityId, date); if (!countMap.isEmpty()) { workScreenVO.setResolvedNum(countMap.get("resolvedNum") == null ? 0L : Long.valueOf(countMap.get("resolvedNum").toString())); workScreenVO.setPendingNum(countMap.get("pendingNum") == null ? 0L : Long.valueOf(countMap.get("pendingNum").toString())); workScreenVO.setPropagandaNum(countMap.get("propagandaNum") == null ? 0L : Long.valueOf(countMap.get("propagandaNum").toString())); workScreenVO.setCurrentNum(countMap.get("currentNum") == null ? 0L : Long.valueOf(countMap.get("currentNum").toString())); } //计算处理时间消耗的时间 DateScreenVO countAvg = this.eventMapper.countByAvgCommunityId(communityId); if(countAvg != null){ int second = (int) (countAvg.getStartTime().getTime() - countAvg.getEndTime().getTime())/1000; if(second > 0){ second = second/workScreenVO.getResolvedNum().intValue(); if (countAvg != null) { int second = (int) (countAvg.getStartTime().getTime() - countAvg.getEndTime().getTime()) / 1000; if (second > 0) { second = second / workScreenVO.getResolvedNum().intValue(); workScreenVO.setAvgCost(second); } } //查询最新事件轮播列表 List<EventDetailWorkVO> eventList = this.eventMapper.getWorkScreenEventList(communityId); if(!eventList.isEmpty()){ if (!eventList.isEmpty()) { workScreenVO.setEventList(eventList); } //统计近半年数据 List<EventWorkVO> list = new ArrayList<>(); for(EventWorkVO eventWorkVO: listHalfYearByDyn()){ EventWorkVO result = this.eventMapper.countByTime(eventWorkVO.getStart(),eventWorkVO.getEnd(),communityId); for (EventWorkVO eventWorkVO : listHalfYearByDyn()) { EventWorkVO result = this.eventMapper.countByTime(eventWorkVO.getStart(), eventWorkVO.getEnd(), communityId); result.setMonth(eventWorkVO.getMonth()); list.add(result); } @@ -2268,12 +2270,12 @@ //查询完成事件统计 EventTypeWorkVO complete = this.eventMapper.getComplete(communityId); if(complete != null){ if (complete != null) { workScreenVO.setComplete(complete); } //查询未完成事件统计 EventTypeWorkVO noComplete = this.eventMapper.getNoComplete(communityId); if(complete != null){ if (complete != null) { workScreenVO.setNoComplete(noComplete); } return R.ok(workScreenVO); @@ -2281,9 +2283,9 @@ private List<EventWorkVO> listHalfYearByDyn() { List<EventWorkVO> dateList = new ArrayList<>(); Date now = new Date(); for(int i= 6;i>=1;i--){ Date date = DateUtils.getDateM(now,-i); Date now = new Date(); for (int i = 6; i >= 1; i--) { Date date = DateUtils.getDateM(now, -i); DateTime endDay = DateUtil.endOfMonth(date); int m = DateUtil.month(endDay); @@ -2292,17 +2294,17 @@ // } // m--; int day = DateUtil.dayOfMonth(endDay); int half = day/2; String month = DateUtil.format(date,moth_format_str); int half = day / 2; String month = DateUtil.format(date, moth_format_str); EventWorkVO eventWorkVO = new EventWorkVO(); eventWorkVO.setMonth(monthStr[m]+"月上旬"); eventWorkVO.setStart(month+ "-01 00:00:00"); eventWorkVO.setEnd(month+ "-"+half+" 23:59:58"); eventWorkVO.setMonth(monthStr[m] + "月上旬"); eventWorkVO.setStart(month + "-01 00:00:00"); eventWorkVO.setEnd(month + "-" + half + " 23:59:58"); dateList.add(eventWorkVO); EventWorkVO eventWorkVO1 = new EventWorkVO(); eventWorkVO1.setMonth(monthStr[m]+"月下旬"); eventWorkVO1.setStart(month+ "-"+half+" 23:59:58"); eventWorkVO1.setEnd(DateUtils.getDateFormatString(endDay,"yyyy-MM-dd HH:mm:ss")); eventWorkVO1.setMonth(monthStr[m] + "月下旬"); eventWorkVO1.setStart(month + "-" + half + " 23:59:58"); eventWorkVO1.setEnd(DateUtils.getDateFormatString(endDay, "yyyy-MM-dd HH:mm:ss")); dateList.add(eventWorkVO1); } return dateList; springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java
@@ -13,7 +13,6 @@ import com.panzhihua.common.model.dtos.EventResourceDTO; import com.panzhihua.common.model.dtos.grid.*; import com.panzhihua.common.model.dtos.visit.EventVisitCompleteDTO; import com.panzhihua.common.model.helper.AESUtil; import com.panzhihua.common.model.query.visit.EventTasksQuery; import com.panzhihua.common.model.query.visit.EventVisitListQuery; import com.panzhihua.common.model.vos.R; @@ -36,10 +35,6 @@ import javax.annotation.Resource; import java.util.*; import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; /** * @auther lyq @@ -68,11 +63,11 @@ * @param eventVisitingTasksAddDTO * @return 新增结果 */ public R add(EventVisitingTasksAddDTO eventVisitingTasksAddDTO){ public R add(EventVisitingTasksAddDTO eventVisitingTasksAddDTO) { EventVisitingTasksDO eventVisitingTasksDO = new EventVisitingTasksDO(); BeanUtils.copyProperties(eventVisitingTasksAddDTO, eventVisitingTasksDO); eventVisitingTasksDO.setCreateAt(new Date()); if(eventVisitingTasksMapper.insert(eventVisitingTasksDO)>0){ if (eventVisitingTasksMapper.insert(eventVisitingTasksDO) > 0) { return R.ok(); } return R.fail(); @@ -80,14 +75,15 @@ /** * 修改重点人群走访记录 * * @param eventVisitingTasksEditDTO * @return 维护结果 */ public R edit(EventVisitingTasksEditDTO eventVisitingTasksEditDTO){ public R edit(EventVisitingTasksEditDTO eventVisitingTasksEditDTO) { EventVisitingTasksDO eventVisitingTasksDO = new EventVisitingTasksDO(); BeanUtils.copyProperties(eventVisitingTasksEditDTO, eventVisitingTasksDO); //eventVisitingTasksDO.setUpdateAt(new Date()); if(eventVisitingTasksMapper.updateById(eventVisitingTasksDO)>0){ if (eventVisitingTasksMapper.updateById(eventVisitingTasksDO) > 0) { return R.ok(); } return R.fail(); @@ -95,15 +91,16 @@ /** * 分页查找重点人群走访记录 * * @param pageEventVisitingTasksDTO * @return 维护结果 */ public R<IPage<EventVisitingTasksVO>> query(PageEventVisitingTasksDTO pageEventVisitingTasksDTO){ Page page = new Page(1,10); if(pageEventVisitingTasksDTO.getPageNum()!=null) { public R<IPage<EventVisitingTasksVO>> query(PageEventVisitingTasksDTO pageEventVisitingTasksDTO) { Page page = new Page(1, 10); if (pageEventVisitingTasksDTO.getPageNum() != null) { page.setCurrent(pageEventVisitingTasksDTO.getPageNum()); } if(pageEventVisitingTasksDTO.getPageSize()!=null) { if (pageEventVisitingTasksDTO.getPageSize() != null) { page.setSize(pageEventVisitingTasksDTO.getPageSize()); } return R.ok(); @@ -115,7 +112,7 @@ * @param EventVisitingTasksDeleteDTO * @return 平台用户信息 */ public R delete(EventVisitingTasksDeleteDTO EventVisitingTasksDeleteDTO){ public R delete(EventVisitingTasksDeleteDTO EventVisitingTasksDeleteDTO) { return R.fail(); } @@ -125,14 +122,14 @@ * @param id 重点人群走访记录 id * @return 查找结果 */ public R<EventVisitingTasksDetailsVO> eventVisitingTasksDetails(Long id){ public R<EventVisitingTasksDetailsVO> eventVisitingTasksDetails(Long id) { EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(id); if(eventVisitingTasksDO!=null) { if (eventVisitingTasksDO != null) { EventVisitingTasksDetailsVO eventVisitingTasksDetailsVO = new EventVisitingTasksDetailsVO(); BeanUtils.copyProperties(eventVisitingTasksDO, eventVisitingTasksDetailsVO); eventVisitingTasksDetailsVO.setImgList(eventResourceMapper.findListByRefId(eventVisitingTasksDO.getId(),2,1)); eventVisitingTasksDetailsVO.setVosList(eventResourceMapper.findListByRefId(eventVisitingTasksDO.getId(),2,2)); eventVisitingTasksDetailsVO.setVideoList(eventResourceMapper.findListByRefId(eventVisitingTasksDO.getId(),2,3)); eventVisitingTasksDetailsVO.setImgList(eventResourceMapper.findListByRefId(eventVisitingTasksDO.getId(), 2, 1)); eventVisitingTasksDetailsVO.setVosList(eventResourceMapper.findListByRefId(eventVisitingTasksDO.getId(), 2, 2)); eventVisitingTasksDetailsVO.setVideoList(eventResourceMapper.findListByRefId(eventVisitingTasksDO.getId(), 2, 3)); return R.ok(eventVisitingTasksDetailsVO); } return R.fail(); @@ -141,7 +138,7 @@ @Override public R count(Long communityId) { Map<String,Long> countMap = eventVisitingTasksMapper.count(communityId); Map<String, Long> countMap = eventVisitingTasksMapper.count(communityId); EventVisitCountVO eventVisitCountVO = new EventVisitCountVO(); eventVisitCountVO.setVisit(countMap.get("visit")); eventVisitCountVO.setVisited(countMap.get("visited")); @@ -150,11 +147,11 @@ } @Override public R taskList(EventTasksQuery query) throws Exception{ public R taskList(EventTasksQuery query) throws Exception { IPage<EventVisitingTasksVO> page = eventVisitingTasksMapper.findListByPage(new Page(query.getPageNum(),query.getPageSize()),query); for(EventVisitingTasksVO eventVisitingTasksVO:page.getRecords()){ if(eventVisitingTasksVO.getNationCode() != null){ IPage<EventVisitingTasksVO> page = eventVisitingTasksMapper.findListByPage(new Page(query.getPageNum(), query.getPageSize()), query); for (EventVisitingTasksVO eventVisitingTasksVO : page.getRecords()) { if (eventVisitingTasksVO.getNationCode() != null) { eventVisitingTasksVO.setNation(PopulPoliticalOutlookEnum.getCnDescByName(eventVisitingTasksVO.getNationCode())); } } @@ -162,11 +159,11 @@ } @Override public R appTaskList(EventTasksQuery query) throws Exception{ public R appTaskList(EventTasksQuery query) throws Exception { IPage<EventVisitingTasksVO> page = eventVisitingTasksMapper.appFindListByPage(new Page(query.getPageNum(),query.getPageSize()),query); for(EventVisitingTasksVO eventVisitingTasksVO:page.getRecords()){ if(eventVisitingTasksVO.getNationCode() != null){ IPage<EventVisitingTasksVO> page = eventVisitingTasksMapper.appFindListByPage(new Page(query.getPageNum(), query.getPageSize()), query); for (EventVisitingTasksVO eventVisitingTasksVO : page.getRecords()) { if (eventVisitingTasksVO.getNationCode() != null) { eventVisitingTasksVO.setNation(PopulPoliticalOutlookEnum.getCnDescByName(eventVisitingTasksVO.getNationCode())); } } @@ -177,12 +174,12 @@ @Override public R delete(String ids, Long communityId) { String[] idarr = ids.split(","); for(String id:idarr){ if(StringUtils.isEmpty(id)){ for (String id : idarr) { if (StringUtils.isEmpty(id)) { continue; } EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectOne(new QueryWrapper<EventVisitingTasksDO>().eq("id",Long.valueOf(id)).eq("grid_member_community",communityId)); if(eventVisitingTasksDO == null){ EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectOne(new QueryWrapper<EventVisitingTasksDO>().eq("id", Long.valueOf(id)).eq("grid_member_community", communityId)); if (eventVisitingTasksDO == null) { throw new RuntimeException("无权限"); } eventVisitingTasksMapper.deleteById(Long.valueOf(id)); @@ -192,10 +189,10 @@ @Override public R visitorList(EventVisitListQuery query) { IPage<EventVisitListVO> page = eventVisitingTasksMapper.visitorList(new Page(query.getPageNum(),query.getPageSize()),query); page.getRecords().stream().forEach(e->{ List<EventVisitingTasksDO> list = eventVisitingTasksMapper.selectList(new QueryWrapper<EventVisitingTasksDO>().eq("visiter_id",e.getId()).orderByDesc("id")); if(!CollectionUtils.isEmpty(list)){ IPage<EventVisitListVO> page = eventVisitingTasksMapper.visitorList(new Page(query.getPageNum(), query.getPageSize()), query); page.getRecords().stream().forEach(e -> { List<EventVisitingTasksDO> list = eventVisitingTasksMapper.selectList(new QueryWrapper<EventVisitingTasksDO>().eq("visiter_id", e.getId()).orderByDesc("id")); if (!CollectionUtils.isEmpty(list)) { e.setCreateAt(list.get(0).getCreateAt()); e.setEventStatus(list.get(0).getEventStatus()); } @@ -205,14 +202,14 @@ @Override public R list(EventTasksQuery query) { IPage<AppVisitTasksVO> page = eventVisitingTasksMapper.list(new Page(query.getPageNum(),query.getPageSize()),query); IPage<AppVisitTasksVO> page = eventVisitingTasksMapper.list(new Page(query.getPageNum(), query.getPageSize()), query); return R.ok(page); } @Override public R detail(Long id) throws Exception { EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(id); if(eventVisitingTasksDO!=null) { if (eventVisitingTasksDO != null) { EventVisitingTasksDetailsVO eventVisitingTasksDetailsVO = new EventVisitingTasksDetailsVO(); BeanUtils.copyProperties(eventVisitingTasksDO, eventVisitingTasksDetailsVO); eventVisitingTasksDetailsVO.setTableContentJson(JSONObject.parseObject(eventVisitingTasksDO.getTableContentJson())); @@ -224,16 +221,16 @@ @Transactional(rollbackFor = Exception.class) @Override public R add(String ids, Long communityId, Long userId) throws Exception { Map<String,Object> map = eventVisitingTasksMapper.findUserByCommunityId(communityId,6); if(CollectionUtils.isEmpty(map)){ Map<String, Object> map = eventVisitingTasksMapper.findUserByCommunityId(communityId, 6); if (CollectionUtils.isEmpty(map)) { return R.fail("网格员不存在"); } String[] id = ids.split(","); for(String idstr:id){ if(StringUtils.isEmpty(idstr)){ for (String idstr : id) { if (StringUtils.isEmpty(idstr)) { continue; } addVisitingTask(Long.valueOf(idstr),map,communityId,userId); addVisitingTask(Long.valueOf(idstr), map, communityId, userId); } return R.ok(); @@ -241,21 +238,20 @@ @Override public List<EventVisitingTasksVO> exportTaskList(EventTasksQuery query) throws Exception { IPage<EventVisitingTasksVO> page = eventVisitingTasksMapper.findListByPage(new Page(query.getPageNum(),query.getPageSize()),query); IPage<EventVisitingTasksVO> page = eventVisitingTasksMapper.findListByPage(new Page(query.getPageNum(), query.getPageSize()), query); return page.getRecords(); } private void addVisitingTask(Long id, Map<String, Object> gridMap,Long communityId,Long userId) throws Exception{ private void addVisitingTask(Long id, Map<String, Object> gridMap, Long communityId, Long userId) throws Exception { Integer count = eventVisitingTasksMapper.countNoneComplete(id); if(count > 0){ if (count > 0) { return; } Map<String,Object> map = eventVisitingTasksMapper.findPopulationById(id); if(CollectionUtils.isEmpty(map)){ return ; Map<String, Object> map = eventVisitingTasksMapper.findPopulationById(id); if (CollectionUtils.isEmpty(map)) { return; } EventVisitingTasksDO visitingTasksDO = new EventVisitingTasksDO(); // visitingTasksDO.setGridMemberStreet(Long.valueOf(gridMap.get("street_id").toString())); @@ -266,14 +262,14 @@ visitingTasksDO.setVisiterId(Long.valueOf(map.get("id").toString())); visitingTasksDO.setVisiterName(map.get("name").toString()); visitingTasksDO.setVisiterSex(Integer.valueOf(map.get("sex").toString())); visitingTasksDO.setVisiterTele(map.get("phone") == null ?null:map.get("phone").toString()); visitingTasksDO.setVisiterTele(map.get("phone") == null ? null : map.get("phone").toString()); StringBuilder sb = new StringBuilder(); sb.append(map.get("address")).append(map.get("road")).append(map.get("door_no")).append(map.get("floor")).append("栋").append(map.get("unit_no")).append("单元").append(map.get("house_no")).append("号"); visitingTasksDO.setVisiterAddress(sb.toString()); visitingTasksDO.setVisiterType(0); visitingTasksDO.setActOpara(0); if(map.get("lat") != null && map.get("lng") != null){ visitingTasksDO.setHappentLatLng(map.get("lat")+","+map.get("lng")); if (map.get("lat") != null && map.get("lng") != null) { visitingTasksDO.setHappentLatLng(map.get("lat") + "," + map.get("lng")); } visitingTasksDO.setEventStatus(EventTasksStatusEnum.DZF.getCode()); visitingTasksDO.setReporting(0); @@ -281,13 +277,13 @@ visitingTasksDO.setUrgent(false); visitingTasksDO.setUrgentDell(false); visitingTasksDO.setCreateBy(userId); visitingTasksDO.setOutOrLocal(map.get("out_or_local") == null?null:Integer.valueOf(map.get("out_or_local").toString())); visitingTasksDO.setOutOrLocal(map.get("out_or_local") == null ? null : Integer.valueOf(map.get("out_or_local").toString())); if(map.get("label") != null){ if (map.get("label") != null) { List<String> option = getOption(map.get("label").toString()); if(!CollectionUtils.isEmpty(option)){ if (!CollectionUtils.isEmpty(option)) { JSONObject json = new JSONObject(); json.put("option",option); json.put("option", option); visitingTasksDO.setTableContentJson(json.toJSONString()); } } @@ -297,7 +293,7 @@ private List<String> getOption(String label) { List<String> option = new ArrayList<>(); if(!Objects.isNull(label)) { if (!Objects.isNull(label)) { if (label.contains("精神障碍")) { option.add("精神障碍异常1"); option.add("精神障碍异常2"); @@ -329,11 +325,11 @@ public R cancel(Long id) { EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(id); if(eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.DZF.getCode()){ if (eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.DZF.getCode()) { return R.fail("当前状态不可撤销"); } int rt = eventVisitingTasksMapper.cancel(id,EventTasksStatusEnum.YCX.getCode()); if(rt > 0){ int rt = eventVisitingTasksMapper.cancel(id, EventTasksStatusEnum.YCX.getCode()); if (rt > 0) { return R.ok(); } return R.fail(); @@ -344,11 +340,11 @@ public R reset(Long id) { EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(id); if(eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.YCX.getCode()){ if (eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.YCX.getCode()) { return R.fail("当前状态不可恢复"); } int rt = eventVisitingTasksMapper.updateEventStatus(id,EventTasksStatusEnum.DZF.getCode()); if(rt > 0){ int rt = eventVisitingTasksMapper.updateEventStatus(id, EventTasksStatusEnum.DZF.getCode()); if (rt > 0) { return R.ok(); } return R.fail(); @@ -356,22 +352,22 @@ @Transactional(rollbackFor = Exception.class) @Override public synchronized R start(Long id,Long userId) { public synchronized R start(Long id, Long userId) { EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(id); if(eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.DZF.getCode()){ if (eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.DZF.getCode()) { return R.fail("当前状态不可开始走访"); } Map<String,Object> map = eventVisitingTasksMapper.findUserById(userId); Map<String, Object> map = eventVisitingTasksMapper.findUserById(userId); EventVisitingTasksDO start = new EventVisitingTasksDO(); start.setId(id); start.setGridMemberStreet(Long.valueOf(map.get("street_id").toString())); start.setGridMemberCommunity(Long.valueOf(map.get("community_id").toString())); start.setGridMember(Long.valueOf(map.get("user_id").toString())); start.setGridMemberName(map.get("name").toString()); start.setGridMenberTele(map.get("phone") ==null?"":map.get("phone").toString()); start.setGridMenberTele(map.get("phone") == null ? "" : map.get("phone").toString()); start.setEventStatus(EventTasksStatusEnum.JXZ.getCode()); int rt = eventVisitingTasksMapper.start(start); if(rt > 0){ if (rt > 0) { return R.ok(); } return R.fail(); @@ -381,46 +377,46 @@ @Override public R complete(EventVisitCompleteDTO taskCompleteDTO) { EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(taskCompleteDTO.getId()); if(eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.DZF.getCode()){ if (eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.DZF.getCode()) { return R.fail("当前状态不可完成走访"); } EventVisitingTasksDO complete = new EventVisitingTasksDO(); BeanUtils.copyProperties(taskCompleteDTO,complete); if(taskCompleteDTO.getException().intValue() == 0){ BeanUtils.copyProperties(taskCompleteDTO, complete); if (taskCompleteDTO.getException().intValue() == 0) { complete.setEventStatus(EventTasksStatusEnum.ZJJJ.getCode()); }else{ } else { complete.setEventStatus(EventTasksStatusEnum.YC.getCode()); } complete.setSubmitDate(DateUtil.parse(taskCompleteDTO.getSubmitDate(), DatePattern.NORM_DATETIME_FORMAT)); JSONObject json = JSONObject.parseObject(eventVisitingTasksDO.getTableContentJson()); json.put("check",taskCompleteDTO.getOption()); json.put("check", taskCompleteDTO.getOption()); complete.setTableContentJson(json.toJSONString()); if(!StringUtils.isEmpty(taskCompleteDTO.getImgList())){ taskCompleteDTO.getImgList().forEach(e->{ createResource(eventVisitingTasksDO.getId(),taskCompleteDTO.getUserId(),2,1,e); if (!StringUtils.isEmpty(taskCompleteDTO.getImgList())) { taskCompleteDTO.getImgList().forEach(e -> { createResource(eventVisitingTasksDO.getId(), taskCompleteDTO.getUserId(), 2, 1, e); }); } if(!CollectionUtils.isEmpty(taskCompleteDTO.getVosList())){ taskCompleteDTO.getVosList().forEach(e->{ createResource(eventVisitingTasksDO.getId(),taskCompleteDTO.getUserId(),2,2,e); if (!CollectionUtils.isEmpty(taskCompleteDTO.getVosList())) { taskCompleteDTO.getVosList().forEach(e -> { createResource(eventVisitingTasksDO.getId(), taskCompleteDTO.getUserId(), 2, 2, e); }); } if(!CollectionUtils.isEmpty(taskCompleteDTO.getVideoList())){ taskCompleteDTO.getVosList().forEach(e->{ createResource(eventVisitingTasksDO.getId(),taskCompleteDTO.getUserId(),2,3,e); if (!CollectionUtils.isEmpty(taskCompleteDTO.getVideoList())) { taskCompleteDTO.getVosList().forEach(e -> { createResource(eventVisitingTasksDO.getId(), taskCompleteDTO.getUserId(), 2, 3, e); }); } Map<String,Object> map = eventVisitingTasksMapper.findUserById(taskCompleteDTO.getUserId()); Map<String, Object> map = eventVisitingTasksMapper.findUserById(taskCompleteDTO.getUserId()); complete.setGridMemberStreet(Long.valueOf(map.get("street_id").toString())); complete.setGridMemberCommunity(Long.valueOf(map.get("community_id").toString())); complete.setGridMember(Long.valueOf(map.get("user_id").toString())); complete.setGridMemberName(map.get("name").toString()); complete.setGridMenberTele(map.get("phone") ==null?"":map.get("phone").toString()); complete.setGridMenberTele(map.get("phone") == null ? "" : map.get("phone").toString()); int rt = eventVisitingTasksMapper.complete(complete); if(rt > 0){ if (rt > 0) { return R.ok(); } return R.fail(); @@ -440,13 +436,13 @@ @Override public List<LcEventVisitingTasksListDTO> getUnUploadVisitingTask() { List<LcEventVisitingTasksListDTO> lcEventVisitingTasksList =new ArrayList<>(); List<LcEventVisitingTasksListDTO> lcEventVisitingTasksList = new ArrayList<>(10); List<EventVisitingTasksDO> eventVisitingTasksList = baseMapper.selectList( new QueryWrapper<EventVisitingTasksDO>() .eq("lc_upload", false) .eq("event_status",2) .eq("event_status", 2) ); lcEventVisitingTasksList= CopyUtil.beanCopyList(eventVisitingTasksList,LcEventVisitingTasksListDTO.class); lcEventVisitingTasksList = CopyUtil.beanCopyList(eventVisitingTasksList, LcEventVisitingTasksListDTO.class); lcEventVisitingTasksList.forEach(visitingTasks -> { addVisitingTasksFile(visitingTasks); }); springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/LcCompareCodeServiceImpl.java
@@ -2,7 +2,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.panzhihua.common.model.helper.AESUtil; import com.panzhihua.service_grid.dao.LcCompareCodeMapper; import com.panzhihua.service_grid.dao.LcCompareMemberCodeMapper; import com.panzhihua.service_grid.model.dos.LcCompareCodeDO; @@ -24,13 +23,13 @@ @Service public class LcCompareCodeServiceImpl extends ServiceImpl<LcCompareCodeMapper, LcCompareCodeDO> implements LcCompareCodeService { @Resource private LcCompareMemberCodeMapper compareMemberCodeMapper; @Resource private LcCompareMemberCodeMapper compareMemberCodeMapper; @Override public String getLcGridIdByLocal(Long id) { try { return baseMapper.selectOne( return baseMapper.selectOne( new QueryWrapper<LcCompareCodeDO>() .eq("local_grid_id", id) ).getLcGridId();
