修改bug

huanghongfa

2021-07-23 cdbcb4198cb4b242c517a1b07b10b5f212a55fd0

修改bug

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WxOfficialApi.java

@@ -66,7 +66,7 @@
        HttpURLConnection connection = (HttpURLConnection) url.openConnection();
        connection.setRequestMethod("POST");
        connection.setDoOutput(true);
        connection.setRequestProperty("content-type", "application/json;charset=utf-8");
        connection.setRequestProperty("content-type", "application/json;charset=UTF-8");
        connection.connect();
        // post发送的参数
        Map<String, Object> map = new HashMap<>();
@@ -86,7 +86,7 @@
        int len = -1;
        StringBuffer sb = new StringBuffer();
        while((len = in.read(b)) != -1) {
            sb.append(new String(b,0,len));
            sb.append(new String(b,0,len,"UTF-8"));
        }

        in.close();

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDynTypeVO.java

@@ -36,4 +36,7 @@

    @ApiModelProperty("修改人")
    private String updateBy;

    @ApiModelProperty("社区id，当此值为0时，该社区动态分类为系统预设，不可操作")
    private Long communityId;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java

@@ -1249,4 +1249,12 @@
     */
    @PostMapping("/screen/getCivilDrawList")
    R getCivilDrawList(@RequestBody ScreenDrawEventListDTO eventListDTO);

    /**
     * 大屏-根据小区id查询小区统计人数
     * @param villageId 小区id
     * @return  小区统计数据
     */
    @GetMapping("/screen/village/statistics")
    R civilVillageStatistics(@RequestParam("villageId") Long villageId);
}

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BigScreenStatisticsApi.java

@@ -8,6 +8,7 @@
import com.panzhihua.common.model.vos.community.screen.civil.CivilStatisticsVO;
import com.panzhihua.common.model.vos.community.screen.event.*;
import com.panzhihua.common.model.vos.community.screen.index.IndexStatisticsVO;
import com.panzhihua.common.model.vos.screen.ScreenDrawEventPopulationTotalVO;
import com.panzhihua.common.model.vos.screen.ScreenDrawEventVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.grid.GridService;
@@ -97,4 +98,13 @@
        }
        return gridService.getCivilDrawList(eventListDTO);
    }

    @ApiOperation(value = "事件大屏画圈展示事件坐标点接口@lyq",response = ScreenDrawEventPopulationTotalVO.class)
    @GetMapping("/civil/village/statistics/noToken")
    public R civilVillageStatistics(@RequestParam("villageId") Long villageId) {
        if(villageId == null){
            return R.fail("参数错误");
        }
        return gridService.civilVillageStatistics(villageId);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ActDynTypeApi.java

@@ -22,26 +22,51 @@
    @Resource
    private ComActDynTypeService comActDynTypeService;

    /**
     * 分页查询社区动态分类列表
     * @param comActDynTypeDTO  请求参数
     * @return  动态分类列表
     */
    @PostMapping("/page")
    public R pageDynTypeByAdmin(@RequestBody PageComActDynTypeDTO comActDynTypeDTO) {
        return comActDynTypeService.pageDynTypeByAdmin(comActDynTypeDTO);
    }

    /**
     * 查询社区下所有动态分类列表
     * @param comActDynTypeDTO  请求参数
     * @return  动态分类列表
     */
    @PostMapping("/list")
    public R getDynTypeListByAdmin(@RequestBody PageComActDynTypeDTO comActDynTypeDTO) {
        return comActDynTypeService.getDynTypeListByAdmin(comActDynTypeDTO);
    }

    /**
     * 添加社区动态分类
     * @param comActDynTypeDTO  请求参数
     * @return  添加结果
     */
    @PostMapping("/add")
    public R addDynTypeByAdmin(@RequestBody AddComActDynTypeDTO comActDynTypeDTO) {
        return comActDynTypeService.addDynTypeByAdmin(comActDynTypeDTO);
    }

    /**
     * 编辑社区动态分类
     * @param comActDynTypeDTO  请求参数
     * @return  编辑结果
     */
    @PostMapping("/edit")
    public R editDynTypeByAdmin(@RequestBody EditComActDynTypeDTO comActDynTypeDTO) {
        return comActDynTypeService.editDynTypeByAdmin(comActDynTypeDTO);
    }

    /**
     * 删除社区动态分类
     * @param ids   社区动态分类id集合
     * @return  删除结果
     */
    @PostMapping("/delete")
    public R deleteDynTypeByAdmin(@RequestBody List<Long> ids) {
        return comActDynTypeService.deleteDynTypeByAdmin(ids);

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynTypeMapper.java

@@ -19,8 +19,18 @@
@Mapper
public interface ComActDynTypeMapper extends BaseMapper<ComActDynTypeDO> {

    /**
     * 分页查询社区动态分类列表
     * @param comActDynTypeDTO  请求参数
     * @return  动态分类列表
     */
    IPage<ComActDynTypeVO> pageDynTypeByAdmin(Page page, @Param("comActDynTypeDTO") PageComActDynTypeDTO comActDynTypeDTO);

    /**
     * 查询社区下所有动态分类列表
     * @param comActDynTypeDTO  请求参数
     * @return  动态分类列表
     */
    List<ComActDynTypeVO> getDynTypeListByAdmin(@Param("comActDynTypeDTO") PageComActDynTypeDTO comActDynTypeDTO);

    Integer getDynCountByDynTypeIds(@Param("ids") List<Long> ids);

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActDynTypeService.java

@@ -16,14 +16,39 @@
 */
public interface ComActDynTypeService extends IService<ComActDynTypeDO> {

    /**
     * 分页查询社区动态分类列表
     * @param comActDynTypeDTO  请求参数
     * @return  动态分类列表
     */
    R pageDynTypeByAdmin(PageComActDynTypeDTO comActDynTypeDTO);

    /**
     * 查询社区下所有动态分类列表
     * @param comActDynTypeDTO  请求参数
     * @return  动态分类列表
     */
    R getDynTypeListByAdmin(PageComActDynTypeDTO comActDynTypeDTO);

    /**
     * 添加社区动态分类
     * @param comActDynTypeDTO  请求参数
     * @return  添加结果
     */
    R addDynTypeByAdmin(AddComActDynTypeDTO comActDynTypeDTO);

    /**
     * 编辑社区动态分类
     * @param comActDynTypeDTO  请求参数
     * @return  编辑结果
     */
    R editDynTypeByAdmin(EditComActDynTypeDTO comActDynTypeDTO);

    /**
     * 删除社区动态分类
     * @param ids   社区动态分类id集合
     * @return  删除结果
     */
    R deleteDynTypeByAdmin(List<Long> ids);

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynTypeServiceImpl.java

@@ -14,6 +14,7 @@
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

import java.util.Arrays;
import java.util.Date;
import java.util.List;

@@ -26,16 +27,31 @@
@Service
public class ComActDynTypeServiceImpl extends ServiceImpl<ComActDynTypeMapper, ComActDynTypeDO> implements ComActDynTypeService {

    /**
     * 分页查询社区动态分类列表
     * @param comActDynTypeDTO  请求参数
     * @return  动态分类列表
     */
    @Override
    public R pageDynTypeByAdmin(PageComActDynTypeDTO comActDynTypeDTO){
        return R.ok(this.baseMapper.pageDynTypeByAdmin(new Page(comActDynTypeDTO.getPageNum(),comActDynTypeDTO.getPageSize()),comActDynTypeDTO));
    }

    /**
     * 查询社区下所有动态分类列表
     * @param comActDynTypeDTO  请求参数
     * @return  动态分类列表
     */
    @Override
    public R getDynTypeListByAdmin(PageComActDynTypeDTO comActDynTypeDTO){
        return R.ok(this.baseMapper.getDynTypeListByAdmin(comActDynTypeDTO));
    }

    /**
     * 添加社区动态分类
     * @param comActDynTypeDTO  请求参数
     * @return  添加结果
     */
    @Override
    public R addDynTypeByAdmin(AddComActDynTypeDTO comActDynTypeDTO){

@@ -58,8 +74,17 @@
        }
    }

    /**
     * 编辑社区动态分类
     * @param comActDynTypeDTO  请求参数
     * @return  编辑结果
     */
    @Override
    public R editDynTypeByAdmin(EditComActDynTypeDTO comActDynTypeDTO){

        if(comActDynTypeDTO.getId().equals(1L) || comActDynTypeDTO.getId().equals(2L)){
            return R.fail("系统预设社区动态分类不可修改");
        }

        ComActDynTypeDO dynTypeDO = this.baseMapper.selectById(comActDynTypeDTO.getId());
        if(dynTypeDO == null){
@@ -87,8 +112,14 @@
        }
    }

    /**
     * 删除社区动态分类
     * @param ids   社区动态分类id集合
     * @return  删除结果
     */
    @Override
    public R deleteDynTypeByAdmin(List<Long> ids){

        Integer count = this.baseMapper.getDynCountByDynTypeIds(ids);
        if(count > 0){
            return R.fail("您选中的分类中包含已被引用，无法删除！");

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDynTypeDOMapper.xml

@@ -26,6 +26,7 @@
            cadt.id,
            cadt.`name`,
            cadt.color,
            cadt.community_id,
            cadt.create_at,
            cadt.update_at,
            su.`name` AS createBy,
@@ -44,6 +45,7 @@
            cadt.id,
            cadt.`name`,
            cadt.color,
            cadt.community_id,
            cadt.create_at,
            cadt.update_at,
            su.`name` AS createBy,
@@ -67,6 +69,7 @@
        cadt.id,
        cadt.`name`,
        cadt.color,
        cadt.community_id,
        cadt.create_at,
        cadt.update_at,
        su.`name` AS createBy,
@@ -85,6 +88,7 @@
        cadt.id,
        cadt.`name`,
        cadt.color,
        cadt.community_id,
        cadt.create_at,
        cadt.update_at,
        su.`name` AS createBy,

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/BigScreenApi.java

@@ -45,9 +45,24 @@
        return eventService.eventWork(communityId);
    }

    /**
     * 绘制多边形统计数据
     * @param eventListDTO  请求参数
     * @return  统计数据
     */
    @PostMapping("/getCivilDrawList")
    public R getCivilDrawList(@RequestBody ScreenDrawEventListDTO eventListDTO) {
        return eventService.getCivilDrawList(eventListDTO);
    }

    /**
     * 大屏-根据小区id查询小区统计人数
     * @param villageId 小区id
     * @return  小区统计数据
     */
    @GetMapping("/village/statistics")
    public R civilVillageStatistics(@RequestParam("villageId") Long villageId) {
        return eventService.civilVillageStatistics(villageId);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventService.java

@@ -277,5 +277,17 @@

    R eventWork(Long communityId);

    /**
     * 绘制多边形统计数据
     * @param eventListDTO  请求参数
     * @return  统计数据
     */
    R getCivilDrawList(ScreenDrawEventListDTO eventListDTO);

    /**
     * 大屏-根据小区id查询小区统计人数
     * @param villageId 小区id
     * @return  小区统计数据
     */
    R civilVillageStatistics(Long villageId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java

@@ -2354,6 +2354,11 @@
        return dateList;
    }

    /**
     * 绘制多边形统计数据
     * @param eventListDTO  请求参数
     * @return  统计数据
     */
    @Override
    public R getCivilDrawList(ScreenDrawEventListDTO eventListDTO){

@@ -2534,4 +2539,16 @@
        drawEventVO.setDrawEventPopulationTotalVO(drawEventPopulationTotalVO);
        return R.ok(drawEventVO);
    }

    /**
     * 大屏-根据小区id查询小区统计人数
     * @param villageId 小区id
     * @return  小区统计数据
     */
    @Override
    public R civilVillageStatistics(Long villageId){
        ScreenDrawEventPopulationTotalVO result = this.baseMapper.getVillagePopulationTotal(villageId);
        result.setVillageTotal(1);
        return R.ok(result);
    }
}