Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

张天森

2022-10-11 fde937ab595fdb946bed4537e41b398323d8df8b

Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

 flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java

@@ -356,5 +356,29 @@
    }


    @ApiOperation("导办工单统计不同状态工单数")
    @GetMapping("/getWorkOrder")
    @Authorization
    public ResultData getWorkOrder(@CurrentUser SysUser sysUser)
    {
        WorkOrder workOrder=new WorkOrder();
        List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
        //状态（1待分配  2 待办结 3 已办结 4 待评价 5 已取消6 已超时   7超时未办结  8未解决  9已解决）
        workOrder.setAllNum(iGuideRepairOrderService.countStatisticsNum("",ids,null));
        workOrder.setWaitDistribution(iGuideRepairOrderService.countStatisticsNum("1",ids,null));
        workOrder.setWaitDealWith(iGuideRepairOrderService.countStatisticsNum("2",ids,null));
        workOrder.setHaveDealWith(iGuideRepairOrderService.countStatisticsNum("3",ids,null));
        workOrder.setRemainEvaluated(iGuideRepairOrderService.countStatisticsNum("4",ids,null));
        workOrder.setCanceled(iGuideRepairOrderService.countStatisticsNum("5",ids,null));
        workOrder.setOvertime(iGuideRepairOrderService.countStatisticsNum("6",ids,null));
        workOrder.setOvertimeWaitDealWith(iGuideRepairOrderService.countStatisticsNum("7",ids,null));
        workOrder.setUnsolved(iGuideRepairOrderService.countStatisticsNum("8",ids,null));
        workOrder.setResolved(iGuideRepairOrderService.countStatisticsNum("9",ids,null));
        return ResultData.success(workOrder);
    }





}

 flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java

@@ -1,11 +1,22 @@
package com.dg.core.controller;

import com.dg.core.ResultData;
import com.dg.core.db.gen.entity.CountList;
import com.dg.core.db.gen.entity.CountListNum;
import com.dg.core.db.gen.entity.TimeWorkOrder;
import com.dg.core.db.gen.entity.WorkOrder;
import com.dg.core.service.IGuideRepairOrderService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import java.util.Calendar;
import java.util.List;

@Api(tags = {"首页统计接口"})
@RestController
@@ -13,25 +24,72 @@
public class HomeStatisticsController
{

    //导办工单接口
    @Autowired
    IGuideRepairOrderService iGuideRepairOrderService;







    @ApiOperation("首页统计不同状态工单数")
    @GetMapping("/getWorkOrder")
    public ResultData getWorkOrder()
    {

        WorkOrder workOrder=new WorkOrder();




        return ResultData.success();
        //状态（1待分配  2 待办结 3 已办结 4 待评价 5 已取消6 已超时   7超时未办结  8未解决  9已解决）
        workOrder.setAllNum(iGuideRepairOrderService.countStatisticsNum("",null,null));
        workOrder.setWaitDistribution(iGuideRepairOrderService.countStatisticsNum("1",null,null));
        workOrder.setWaitDealWith(iGuideRepairOrderService.countStatisticsNum("2",null,null));
        workOrder.setHaveDealWith(iGuideRepairOrderService.countStatisticsNum("3",null,null));
        workOrder.setRemainEvaluated(iGuideRepairOrderService.countStatisticsNum("4",null,null));
        workOrder.setCanceled(iGuideRepairOrderService.countStatisticsNum("5",null,null));
        workOrder.setOvertime(iGuideRepairOrderService.countStatisticsNum("6",null,null));
        workOrder.setOvertimeWaitDealWith(iGuideRepairOrderService.countStatisticsNum("7",null,null));
        workOrder.setUnsolved(iGuideRepairOrderService.countStatisticsNum("8",null,null));
        workOrder.setResolved(iGuideRepairOrderService.countStatisticsNum("9",null,null));
        return ResultData.success(workOrder);
    }


    @ApiOperation("首页统计不同时间段的工单数量")
    @GetMapping("/getTimeWorkOrder")
    public ResultData getTimeWorkOrder()
    {
        //1 今天   2昨天   3本月   4本年度
        //累计全部 本年 本月 今日 昨日
        TimeWorkOrder timeWorkOrder=new TimeWorkOrder();
        timeWorkOrder.setAllNum(iGuideRepairOrderService.countStatisticsNum(null,null,null));
        timeWorkOrder.setYearNum(iGuideRepairOrderService.countStatisticsNum(null,null,"4"));
        timeWorkOrder.setMonthNum(iGuideRepairOrderService.countStatisticsNum(null,null,"3"));
        timeWorkOrder.setTodayNum(iGuideRepairOrderService.countStatisticsNum(null,null,"1"));
        timeWorkOrder.setYesterdayNum(iGuideRepairOrderService.countStatisticsNum(null,null,"2"));
        return ResultData.success(timeWorkOrder);
    }


    @ApiOperation("根据选择的时间段 筛选导办工单数 timeType：1 本年度 15 近15天的   30 近30天的")
    @GetMapping("/getSelectionTimeOrder")
    public ResultData getSelectionTimeOrder(@RequestParam("timeType") Integer timeType)
    {
        if(timeType<1)
        {
            return ResultData.error("请输入时间");
        }

        if(timeType==1)
        {
            Calendar calendar=Calendar.getInstance();
            timeType=calendar.get(Calendar.DAY_OF_YEAR);
        }
//        System.out.println(timeType);
        //1 本年度 15 近15天的   30 近30天的
        List<CountListNum> listOne=iGuideRepairOrderService.countListNum("2",null,timeType);
        List<CountListNum> listTwo=iGuideRepairOrderService.countListNum("3",null,timeType);
        CountList countList=new CountList();
        countList.setWaitDealWithList(listOne);
        countList.setHaveDealWith(listTwo);
        return ResultData.success(countList);
    }





}

 flower_city/src/main/java/com/dg/core/controller/UserController.java

@@ -26,7 +26,7 @@
@Api(tags = {"用户接口"})
@RestController
@RequestMapping("/user")
public class UserController extends BaseController{
public class UserController extends BaseController {
    @Autowired
    com.dg.core.service.ISysUserService IUserService;


 flower_city/src/main/java/com/dg/core/db/gen/entity/CountList.java

New file
@@ -0,0 +1,20 @@
package com.dg.core.db.gen.entity;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;
import java.util.List;

@ApiModel("时间筛选列表实体类")
@Data
public class CountList implements Serializable
{

    @ApiModelProperty("待办结列表")
    private List<CountListNum> waitDealWithList;

    @ApiModelProperty("已办结列表")
    private List<CountListNum> haveDealWith;
}

 flower_city/src/main/java/com/dg/core/db/gen/entity/CountListNum.java

New file
@@ -0,0 +1,22 @@
package com.dg.core.db.gen.entity;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.List;

@ApiModel("时间筛选实体类")
@Data
public class CountListNum implements Serializable
{
    @ApiModelProperty("时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime createTime;

    @ApiModelProperty("数量")
    private Integer num;
}

 flower_city/src/main/java/com/dg/core/db/gen/entity/RoleMenuEntity.java

New file
@@ -0,0 +1,60 @@
package com.dg.core.db.gen.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;
import java.time.LocalDateTime;


@ApiModel("角色菜单关系实体类")
@Data
@TableName("automessage_role_menu")
public class RoleMenuEntity implements Serializable
{
    /**
     * 主键id
     */
    @ApiModelProperty("主键id")
    @JsonSerialize(using = ToStringSerializer.class)
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    /**
     * 角色id
     */
    @ApiModelProperty("角色id")
    private String roleId;

    /**
     * 菜单id
     */
    @ApiModelProperty("菜单id")
    private String menuId;

    /**
     *
     */
    @ApiModelProperty("创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime createTime;


    /**
     * 修改时间
     */
    @ApiModelProperty("修改时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime  updateTime;




}

 flower_city/src/main/java/com/dg/core/db/gen/entity/TimeWorkOrder.java

New file
@@ -0,0 +1,34 @@
package com.dg.core.db.gen.entity;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;

/**
 * 导办工单统计类
 */
@ApiModel("不同时间段的工单数量")
@Data
public class TimeWorkOrder implements Serializable
{
    //累计全部 本年 本月 今日 昨日
    /**
     * 总数量
     */
    @ApiModelProperty("累计总数量")
    private Integer allNum=0;

    @ApiModelProperty("本年")
    private Integer yearNum;

    @ApiModelProperty("本月")
    private Integer monthNum;

    @ApiModelProperty("今天")
    private Integer todayNum;

    @ApiModelProperty("昨天")
    private Integer yesterdayNum;
}

 flower_city/src/main/java/com/dg/core/db/gen/entity/WorkOrder.java

@@ -14,59 +14,67 @@
public class WorkOrder implements Serializable
{


    /**
     * 总数量
     */
    @ApiModelProperty("总数量")
    private Integer allNum=0;


    /**
     * 待分配
     */
    @ApiModelProperty("待分配数量")
    private String waitDistribution;
    private Integer waitDistribution=0;

    /**
     * 待办结
     */
    @ApiModelProperty("待办结")
    private String waitDealWith;
    private Integer waitDealWith=0;

    /**
     * 已办结
     */
    @ApiModelProperty("已办结")
    private String haveDealWith;
    private Integer haveDealWith=0;


    /**
     * 待评价
     */
    @ApiModelProperty("待评价")
    private String remainEvaluated;
    private Integer remainEvaluated=0;

    /**
     * 已取消
     */
    @ApiModelProperty("已取消")
    private String canceled;
    private Integer canceled=0;

    /**
     * 已超时
     */
    @ApiModelProperty("已超时")
    private String overtime;
    private Integer overtime=0;

    /**
     * 超时未办结
     */
    @ApiModelProperty("超时未办结")
    private String overtimeWaitDealWith;
    private Integer overtimeWaitDealWith=0;

    /**
     * 未解决
     */
    @ApiModelProperty("未解决")
    private String unsolved;
    private Integer unsolved=0;

    /**
     * 已解决
     */
    @ApiModelProperty("已解决")
    private String resolved;
    private Integer resolved=0;

}

 flower_city/src/main/java/com/dg/core/db/gen/mapper/GuideRepairOrderMapper.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.dg.core.db.gen.entity.AutomessageCommonProblem;
import com.dg.core.db.gen.entity.CountListNum;
import com.dg.core.db.gen.entity.GuideRepairOrder;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.data.repository.query.Param;
@@ -60,7 +61,21 @@
    int countConfigList(@Param("matterName") String matterName,@Param("ids") List<String> ids);


    /**
     * 统计工单用   1 今天   2昨天   3本月   4本年度
     * @return
     */
    int countStatisticsNum(@Param("state") String state,
                           @Param("ids") List<String> ids,
                           @Param("time") String time);

    /**
     * 统计工单用
     * @return
     */
    List<CountListNum> countListNum(@Param("state") String state,
                                    @Param("ids") List<String> ids,
                                    @Param("time") Integer time);


}

 flower_city/src/main/java/com/dg/core/db/gen/mapper/RoleMenuEntityMapper.java

New file
@@ -0,0 +1,41 @@
package com.dg.core.db.gen.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dg.core.db.gen.entity.RoleMenuEntity;

import java.util.List;

public interface RoleMenuEntityMapper  extends BaseMapper<RoleMenuEntity>
{
    /**
     * 根据角色获取菜单id
     * @param roleId
     * @return
     */
    public List<RoleMenuEntity> selectConfigList(String roleId);

    /**
     * 新增
     * @param entity
     * @return
     */
    public int insertConfig(RoleMenuEntity entity);

    /**
     * 编辑
     * @param entity
     * @return
     */
    public int updateConfig(RoleMenuEntity entity);


    /**
     * 删除
     * @param Id
     * @return
     */
    public int deleteConfigById(String Id);



}

 flower_city/src/main/java/com/dg/core/service/IGuideRepairOrderService.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.dg.core.db.gen.entity.AutomessageCommonProblem;
import com.dg.core.db.gen.entity.CountListNum;
import com.dg.core.db.gen.entity.GuideRepairOrder;
import org.springframework.data.repository.query.Param;

@@ -50,4 +51,17 @@
     */
    int countConfigList(String matterName,List<String> ids);



    /**
     * 统计工单用  1 今天   2昨天   3本月   4本年度 String time
     * @return
     */
    int countStatisticsNum(String state,List<String> ids,String time);


    List<CountListNum> countListNum(String state,
                                    List<String> ids,
                                    Integer time);

}

 flower_city/src/main/java/com/dg/core/service/IRoleMenuService.java

New file
@@ -0,0 +1,37 @@
package com.dg.core.service;

import com.dg.core.db.gen.entity.RoleMenuEntity;

import java.util.List;

public interface IRoleMenuService
{
    /**
     * 根据角色获取菜单id
     * @param roleId
     * @return
     */
    public List<RoleMenuEntity> selectConfigList(String roleId);

    /**
     * 新增
     * @param entity
     * @return
     */
    public int insertConfig(RoleMenuEntity entity);

    /**
     * 编辑
     * @param entity
     * @return
     */
    public int updateConfig(RoleMenuEntity entity);


    /**
     * 删除
     * @param Id
     * @return
     */
    public int deleteConfigById(String Id);
}

 flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java

@@ -162,5 +162,21 @@
        return baseMapper.countConfigList(matterName,ids);
    }

    /**
     * 1 今天   2昨天   3本月   4本年度 String time
     * @param state
     * @param ids
     * @return
     */
    @Override
    public int countStatisticsNum(String state,List<String> ids,String time) {
        return baseMapper.countStatisticsNum(state,ids,time);
    }

    @Override
    public List<CountListNum> countListNum(String state, List<String> ids, Integer time) {
        return baseMapper.countListNum(state, ids,time);
    }


}

 flower_city/src/main/java/com/dg/core/service/impl/IRoleMenuImpl.java

New file
@@ -0,0 +1,33 @@
package com.dg.core.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dg.core.db.gen.entity.RoleMenuEntity;
import com.dg.core.db.gen.mapper.RoleMenuEntityMapper;
import com.dg.core.service.IRoleMenuService;
import org.springframework.stereotype.Service;

import java.util.List;

@Service
public class IRoleMenuImpl extends ServiceImpl<RoleMenuEntityMapper, RoleMenuEntity> implements IRoleMenuService {

    @Override
    public List<RoleMenuEntity> selectConfigList(String roleId) {
        return baseMapper.selectConfigList(roleId);
    }

    @Override
    public int insertConfig(RoleMenuEntity entity) {
        return baseMapper.insertConfig(entity);
    }

    @Override
    public int updateConfig(RoleMenuEntity entity) {
        return baseMapper.updateConfig(entity);
    }

    @Override
    public int deleteConfigById(String Id) {
        return baseMapper.deleteConfigById(Id);
    }
}

 flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml

@@ -138,10 +138,63 @@
        where  id= #{id}
    </update>


    <select id="countNum" resultType="integer">
        select count(id) from automessage_guide_repair_order
    </select>


    <select id="countStatisticsNum" parameterType="string" resultType="integer">
        select count(id) from automessage_guide_repair_order
        <where>
            <if test="state != null and state != ''">
                automessage_guide_repair_order.state=#{state}
            </if>
            <if test="ids != null">
                and department_id IN
                <foreach collection="ids" item="param"  open="(" close=")" separator=",">
                    #{param}
                </foreach>
            </if>
            <if test="time != null and time == 1 ">
                and to_days(automessage_guide_repair_order.create_time) = to_days(now())
            </if>
            <if test="time != null and time == 2 ">
                and TO_DAYS(NOW()) - TO_DAYS(automessage_guide_repair_order.create_time) = 1
            </if>
            <if test="time != null and time == 3 ">
                and DATE_FORMAT( automessage_guide_repair_order.create_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )
            </if>
            <if test="time != null and time == 4 ">
                and YEAR(automessage_guide_repair_order.create_time)=YEAR(NOW())
            </if>
        </where>
    </select>



    <select id="countListNum"  resultType="com.dg.core.db.gen.entity.CountListNum">
        select create_time,count(id) as num from automessage_guide_repair_order
        <where>
            <if test="state != null and state != ''">
                automessage_guide_repair_order.state=#{state}
            </if>
            <if test="ids != null">
                and department_id IN
                <foreach collection="ids" item="param"  open="(" close=")" separator=",">
                    #{param}
                </foreach>
            </if>
        </where>
        GROUP BY
            date_format(create_time,'%y%m%d')
        ORDER BY
            create_time DESC
            LIMIT #{time}
    </select>






</mapper>

 flower_city/src/main/resources/mapper/RoleMenuMapper.xml

New file
@@ -0,0 +1,75 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dg.core.db.gen.mapper.RoleMenuEntityMapper">

    <resultMap type="com.dg.core.db.gen.entity.RoleMenuEntity" id="RoleMenuEntityResult">
        <id     property="id"      column="id"      />
        <id     property="roleId"      column="role_id"      />
        <id     property="menuId"      column="menu_id"      />
        <id     property="createTime"      column="create_time"      />
        <id     property="updateTime"      column="update_time"      />

    </resultMap>

    <sql id="selectRoleManagementEntityVo">
        SELECT
            id,
            role_id,
            menu_id,
            create_time,
            update_time
        FROM
            automessage_role_menu
    </sql>

    <select id="selectConfigList" parameterType="string" resultMap="RoleMenuEntityResult">
        <include refid="selectRoleManagementEntityVo"/>
        <where>
            <if test="roleId!=null and roleId!=''">
                and role_id=#{roleId}
            </if>

        </where>
    </select>

    <insert id="insertConfig" parameterType="com.dg.core.db.gen.entity.RoleManagementEntity">
        insert into automessage_role_menu (
        <if test="id != null">id,</if>
        <if test="roleId != null and roleId != '' ">role_id,</if>
        <if test="menuId != null and menuId != '' ">menu_id,</if>
        update_time,
        create_time
        )values(
        <if test="id != null">#{id},</if>
        <if test="roleId != null and roleId != '' ">#{roleId},</if>
        <if test="menuId != null and menuId != '' ">#{menuId},</if>
        sysdate(),
        sysdate()
        )
    </insert>

    <update id="updateConfig" parameterType="com.dg.core.db.gen.entity.RoleManagementEntity">
        update automessage_role_menu
        <set>
            <if test="id != null">id=#{id},</if>
            <if test="roleId != null and roleId != '' ">role_id=#{roleId},</if>
            <if test="menuId != null and menuId != '' ">menu_id=#{menuId},</if>
            update_time=sysdate()
        </set>
        where  id= #{Id}
    </update>

    <delete id="deleteConfigById" parameterType="string">
        delete from automessage_role_menu where id= #{Id}
    </delete>

    <select id="countNum" resultType="integer">
        select count(id) from automessage_role_menu
    </select>

</mapper>






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

@@ -14,6 +14,7 @@
import com.alibaba.excel.write.metadata.WriteSheet;
import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
import com.alibaba.fastjson.JSONArray;
import com.panzhihua.common.interfaces.OperLog;
import com.panzhihua.common.model.dtos.community.building.admin.*;
import com.panzhihua.common.model.vos.community.ComMngPopulationImportErrorVO;
import com.panzhihua.common.model.vos.community.ComMngVillageVO;
@@ -73,6 +74,7 @@

    @ApiOperation(value = "excel导入楼栋信息--注：以前的接口，不需要对接")
    @PostMapping(value = "/import", consumes = "multipart/*", headers = "content-type=multipart/form-date")
    @OperLog(operModul = "房屋信息管理", operType = 0, businessType = "导入楼栋信息")
    public R downloadPopulationTemplate(@RequestParam MultipartFile file) {
        InputStream inputStream;
        try {
@@ -146,6 +148,7 @@

    @ApiOperation(value = "添加单元")
    @PostMapping("/add/unit")
    @OperLog(operModul = "房屋信息管理", operType = 1, businessType = "添加单元")
    public R addUnit(@RequestBody AddBuildingUnitDto addBuildingUnitDto) {
        // 获取登陆用户绑定社区id
        Long communityId = this.getLoginUserInfo().getCommunityId();
@@ -159,6 +162,7 @@

    @ApiOperation(value = "修改单元")
    @PostMapping("/edit/unit")
    @OperLog(operModul = "房屋信息管理", operType = 2, businessType = "修改单元")
    public R editUnit(@RequestBody EditBuildingUnitDto editBuildingUnitDto) {
        // 获取登陆用户绑定社区id
        Long communityId = this.getLoginUserInfo().getCommunityId();
@@ -331,6 +335,7 @@

    @ApiOperation("删除楼栋")
    @GetMapping("/delete")
    @OperLog(operModul = "房屋信息管理", operType = 3, businessType = "删除")
    public R delete(@RequestParam("id")Long id){
        return communityService.buildingDelete(id);
    }

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

@@ -155,6 +155,7 @@
    //@OperLog(operModul = "党支部管理", operType = 1)
    @ApiOperation(value = "新增党支部")
    @PostMapping("addpartyorganization")
    @OperLog(operModul = "报道党员管理", operType = 1, businessType = "新增党支部")
    public R addPartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO) {
        Long communityId = this.getCommunityId();
        partyOrganizationVO.setCommunityId(communityId);
@@ -165,6 +166,7 @@
    //@OperLog(operModul = "党支部管理", operType = 2)
    @ApiOperation(value = "编辑党支部")
    @PostMapping("updatepartyorganization")
    @OperLog(operModul = "报道党员管理", operType = 2, businessType = "编辑党支部")
    public R updatePartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO) {
        Long id = partyOrganizationVO.getId();
        if (null == id || 0 == id) {

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

@@ -139,7 +139,7 @@
        return partyBuildingWestService.getPbOrgAllList(partyOrganizationVO);
    }

    @OperLog(operModul = "党支部管理", operType = 1)
    @OperLog(operModul = "党支部管理", operType = 1,businessType = "新增党支部")
    @ApiOperation(value = "新增党支部")
    @PostMapping("addpartyorganization")
    public R addPartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO) {
@@ -149,7 +149,7 @@
        return r;
    }

    @OperLog(operModul = "党支部管理", operType = 2)
    @OperLog(operModul = "党支部管理", operType = 2,businessType = "编辑党支部")
    @ApiOperation(value = "编辑党支部")
    @PostMapping("updatepartyorganization")
    public R updatePartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO) {
@@ -160,7 +160,7 @@
        return partyBuildingWestService.updatePartyOrganization(partyOrganizationVO);
    }

    @OperLog(operModul = "党支部管理", operType = 3)
    @OperLog(operModul = "党支部管理", operType = 3,businessType = "启用、禁用党支部")
    @ApiOperation(value = "启用、禁用党支部")
    @PutMapping("resetpartyorganization")
    public R resetPartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO) {
@@ -175,7 +175,7 @@
        return partyBuildingWestService.resetPartyOrganization(partyOrganizationVO);
    }

    @OperLog(operModul = "党支部管理", operType = 4)
    @OperLog(operModul = "党支部管理", operType = 3,businessType = "删除党支部")
    @ApiOperation(value = "删除党支部")
    @DeleteMapping("deletepartyorganization")
    public R deletePartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO) {
@@ -186,7 +186,7 @@
        return partyBuildingWestService.deletePartyOrganization(partyOrganizationVO);
    }

    @OperLog(operModul = "党员管理", operType = 1)
    @OperLog(operModul = "党员管理", operType = 1,businessType = "新增党员")
    @ApiOperation(value = "新增党员")
    @PostMapping("addpartybuildingmember")
    public R addPartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO) {
@@ -199,7 +199,7 @@
        return r;
    }

    @OperLog(operModul = "党员管理", operType = 2)
    @OperLog(operModul = "党员管理", operType = 2,businessType = "编辑党员")
    @ApiOperation(value = "编辑党员")
    @PutMapping("updatepartybuildingmember")
    public R updatePartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO) {

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

@@ -1,23 +1,5 @@
package com.panzhihua.community_backstage.api;

import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;

import com.panzhihua.common.exceptions.ServiceException;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.data.redis.core.ValueOperations;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.write.metadata.WriteSheet;
@@ -27,6 +9,8 @@
import com.panzhihua.common.constants.Constants;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.enums.*;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.interfaces.OperLog;
import com.panzhihua.common.listen.*;
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
@@ -40,10 +24,24 @@
import com.panzhihua.common.utlis.SFTPUtil;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.community_backstage.excel.CustomSheetWriteHandler;

import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.data.redis.core.ValueOperations;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;

@Slf4j
@Api(tags = {"社区管理/基础数据库/实有人口"})
@@ -91,6 +89,7 @@

    @ApiOperation(value = "excel导入实有人口")
    @PostMapping(value = "/serve/import", consumes = "multipart/*", headers = "content-type=multipart/form-date")
    @OperLog(operModul = "居民信息管理", operType = 0, businessType = "实有人口导入")
    public R downloadPopulationTemplate(@RequestParam MultipartFile file, HttpServletRequest request) {
        // 获取文件名
        String fileName = file.getOriginalFilename();
@@ -99,7 +98,7 @@
        try {
            inputStream = file.getInputStream();
            ComMngPopulationServeExcelListen comMngPopulationServeExcelListen = new ComMngPopulationServeExcelListen(
                communityService, this.getCommunityId(), this.getLoginUserInfo().getUserId(), stringRedisTemplate);
                    communityService, this.getCommunityId(), this.getLoginUserInfo().getUserId(), stringRedisTemplate);
            EasyExcel.read(inputStream, null, comMngPopulationServeExcelListen).sheet().doRead();
        } catch (IOException e) {
            log.error("导入模板失败【{}】", e.getMessage());
@@ -132,6 +131,7 @@

    @ApiOperation(value = "excel导入吸毒人员")
    @PostMapping(value = "/serve/importDrug", consumes = "multipart/*", headers = "content-type=multipart/form-date")
    @OperLog(operModul = "居民信息管理", operType = 0, businessType = "吸毒人员导入")
    public R importDrug(@RequestParam MultipartFile file, HttpServletRequest request) {
        // 获取文件名
        String fileName = file.getOriginalFilename();
@@ -140,7 +140,7 @@
        try {
            inputStream = file.getInputStream();
            ComMngPopulationDrugExcelListen comMngPopulationDrugExcelListen = new ComMngPopulationDrugExcelListen(
                communityService, this.getCommunityId(), this.getLoginUserInfo().getUserId(), stringRedisTemplate);
                    communityService, this.getCommunityId(), this.getLoginUserInfo().getUserId(), stringRedisTemplate);
            EasyExcel.read(inputStream, null, comMngPopulationDrugExcelListen).sheet().doRead();
        } catch (IOException e) {
            log.error("导入模板失败【{}】", e.getMessage());
@@ -151,6 +151,7 @@

    @ApiOperation(value = "excel导入社区矫正人员")
    @PostMapping(value = "/serve/importCorrect", consumes = "multipart/*", headers = "content-type=multipart/form-date")
    @OperLog(operModul = "居民信息管理", operType = 0, businessType = "社区矫正人员导入")
    public R importCorrect(@RequestParam MultipartFile file, HttpServletRequest request) {
        // 获取文件名
        String fileName = file.getOriginalFilename();
@@ -159,8 +160,8 @@
        try {
            inputStream = file.getInputStream();
            ComMngPopulationCorrectExcelListen comMngPopulationCorrectExcelListen =
                new ComMngPopulationCorrectExcelListen(communityService, this.getCommunityId(),
                    this.getLoginUserInfo().getUserId(), stringRedisTemplate);
                    new ComMngPopulationCorrectExcelListen(communityService, this.getCommunityId(),
                            this.getLoginUserInfo().getUserId(), stringRedisTemplate);
            EasyExcel.read(inputStream, null, comMngPopulationCorrectExcelListen).sheet().doRead();
        } catch (IOException e) {
            log.error("导入模板失败【{}】", e.getMessage());
@@ -171,6 +172,7 @@

    @ApiOperation(value = "excel导入重精人员")
    @PostMapping(value = "/serve/importMajor", consumes = "multipart/*", headers = "content-type=multipart/form-date")
    @OperLog(operModul = "居民信息管理", operType = 0, businessType = "重精人员导入")
    public R importMajor(@RequestParam MultipartFile file, HttpServletRequest request) {
        // 获取文件名
        String fileName = file.getOriginalFilename();
@@ -179,7 +181,7 @@
        try {
            inputStream = file.getInputStream();
            ComMngPopulationMajorExcelListen comMngPopulationMajorExcelListen = new ComMngPopulationMajorExcelListen(
                communityService, this.getCommunityId(), this.getLoginUserInfo().getUserId(), stringRedisTemplate);
                    communityService, this.getCommunityId(), this.getLoginUserInfo().getUserId(), stringRedisTemplate);
            EasyExcel.read(inputStream, null, comMngPopulationMajorExcelListen).sheet().doRead();
        } catch (IOException e) {
            log.error("导入模板失败【{}】", e.getMessage());
@@ -190,6 +192,7 @@

    @ApiOperation(value = "excel导入邪教人员")
    @PostMapping(value = "/serve/importCult", consumes = "multipart/*", headers = "content-type=multipart/form-date")
    @OperLog(operModul = "居民信息管理", operType = 0, businessType = "邪教人员导入")
    public R importCult(@RequestParam MultipartFile file, HttpServletRequest request) {
        // 获取文件名
        String fileName = file.getOriginalFilename();
@@ -198,7 +201,7 @@
        try {
            inputStream = file.getInputStream();
            ComMngPopulationCultExcelListen comMngPopulationCultExcelListen = new ComMngPopulationCultExcelListen(
                communityService, this.getCommunityId(), this.getLoginUserInfo().getUserId(), stringRedisTemplate);
                    communityService, this.getCommunityId(), this.getLoginUserInfo().getUserId(), stringRedisTemplate);
            EasyExcel.read(inputStream, null, comMngPopulationCultExcelListen).sheet().doRead();
        } catch (IOException e) {
            log.error("导入模板失败【{}】", e.getMessage());
@@ -209,7 +212,8 @@

    @ApiOperation(value = "excel导入刑释人员")
    @PostMapping(value = "/serve/importRehabilitation", consumes = "multipart/*",
        headers = "content-type=multipart/form-date")
            headers = "content-type=multipart/form-date")
    @OperLog(operModul = "居民信息管理", operType = 0, businessType = "刑释人员导入")
    public R importRehabilitation(@RequestParam MultipartFile file, HttpServletRequest request) {
        // 获取文件名
        String fileName = file.getOriginalFilename();
@@ -218,8 +222,8 @@
        try {
            inputStream = file.getInputStream();
            ComMngPopulationRehabilitationExcelListen comMngPopulationRehabilitationExcelListen =
                new ComMngPopulationRehabilitationExcelListen(communityService, this.getCommunityId(),
                    this.getLoginUserInfo().getUserId(), stringRedisTemplate);
                    new ComMngPopulationRehabilitationExcelListen(communityService, this.getCommunityId(),
                            this.getLoginUserInfo().getUserId(), stringRedisTemplate);
            EasyExcel.read(inputStream, null, comMngPopulationRehabilitationExcelListen).sheet().doRead();
        } catch (IOException e) {
            log.error("导入模板失败【{}】", e.getMessage());
@@ -230,6 +234,7 @@

    @ApiOperation(value = "excel导入重点上访人员")
    @PostMapping(value = "/serve/importKey", consumes = "multipart/*", headers = "content-type=multipart/form-date")
    @OperLog(operModul = "居民信息管理", operType = 0, businessType = "重点上访人员导入")
    public R importKey(@RequestParam MultipartFile file, HttpServletRequest request) {
        // 获取文件名
        String fileName = file.getOriginalFilename();
@@ -238,7 +243,7 @@
        try {
            inputStream = file.getInputStream();
            ComMngPopulationKeyExcelListen mngPopulationKeyExcelListen = new ComMngPopulationKeyExcelListen(
                communityService, this.getCommunityId(), this.getLoginUserInfo().getUserId(), stringRedisTemplate);
                    communityService, this.getCommunityId(), this.getLoginUserInfo().getUserId(), stringRedisTemplate);
            EasyExcel.read(inputStream, null, mngPopulationKeyExcelListen).sheet().doRead();
        } catch (IOException e) {
            log.error("导入模板失败【{}】", e.getMessage());
@@ -249,7 +254,8 @@

    @ApiOperation(value = "excel导入服刑人员")
    @PostMapping(value = "/serve/importSentence", consumes = "multipart/*",
        headers = "content-type=multipart/form-date")
            headers = "content-type=multipart/form-date")
    @OperLog(operModul = "居民信息管理", operType = 0, businessType = "服刑人员导入")
    public R importSentence(@RequestParam MultipartFile file, HttpServletRequest request) {
        // 获取文件名
        String fileName = file.getOriginalFilename();
@@ -258,8 +264,8 @@
        try {
            inputStream = file.getInputStream();
            ComMngPopulationSentenceExcelListen comMngPopulationSentenceExcelListen =
                new ComMngPopulationSentenceExcelListen(communityService, this.getCommunityId(),
                    this.getLoginUserInfo().getUserId(), stringRedisTemplate);
                    new ComMngPopulationSentenceExcelListen(communityService, this.getCommunityId(),
                            this.getLoginUserInfo().getUserId(), stringRedisTemplate);
            EasyExcel.read(inputStream, null, comMngPopulationSentenceExcelListen).sheet().doRead();
        } catch (IOException e) {
            log.error("导入模板失败【{}】", e.getMessage());
@@ -270,7 +276,8 @@

    @ApiOperation(value = "excel导入退役军人")
    @PostMapping(value = "/serve/importVeterans", consumes = "multipart/*",
        headers = "content-type=multipart/form-date")
            headers = "content-type=multipart/form-date")
    @OperLog(operModul = "居民信息管理", operType = 0, businessType = "退役军人导入")
    public R importVeterans(@RequestParam MultipartFile file, HttpServletRequest request) {
        // 获取文件名
        String fileName = file.getOriginalFilename();
@@ -279,8 +286,8 @@
        try {
            inputStream = file.getInputStream();
            ComMngPopulationVeteransExcelListen comMngPopulationVeteransExcelListen =
                new ComMngPopulationVeteransExcelListen(communityService, this.getCommunityId(),
                    this.getLoginUserInfo().getUserId(), stringRedisTemplate);
                    new ComMngPopulationVeteransExcelListen(communityService, this.getCommunityId(),
                            this.getLoginUserInfo().getUserId(), stringRedisTemplate);
            EasyExcel.read(inputStream, null, comMngPopulationVeteransExcelListen).sheet().doRead();
        } catch (IOException e) {
            log.error("导入模板失败【{}】", e.getMessage());
@@ -291,7 +298,8 @@

    @ApiOperation(value = "excel导入残疾人")
    @PostMapping(value = "/serve/importDisability", consumes = "multipart/*",
        headers = "content-type=multipart/form-date")
            headers = "content-type=multipart/form-date")
    @OperLog(operModul = "居民信息管理", operType = 0, businessType = "残疾人导入")
    public R importDisability(@RequestParam MultipartFile file, HttpServletRequest request) {
        // 获取文件名
        String fileName = file.getOriginalFilename();
@@ -300,8 +308,8 @@
        try {
            inputStream = file.getInputStream();
            ComMngPopulationDisabilityExcelListen mngPopulationDisabilityExcelListen =
                new ComMngPopulationDisabilityExcelListen(communityService, this.getCommunityId(),
                    this.getLoginUserInfo().getUserId(), stringRedisTemplate);
                    new ComMngPopulationDisabilityExcelListen(communityService, this.getCommunityId(),
                            this.getLoginUserInfo().getUserId(), stringRedisTemplate);
            EasyExcel.read(inputStream, null, mngPopulationDisabilityExcelListen).sheet().doRead();
        } catch (IOException e) {
            log.error("导入模板失败【{}】", e.getMessage());
@@ -312,7 +320,8 @@

    @ApiOperation(value = "excel导入低保户")
    @PostMapping(value = "/serve/importLowSecurity", consumes = "multipart/*",
        headers = "content-type=multipart/form-date")
            headers = "content-type=multipart/form-date")
    @OperLog(operModul = "居民信息管理", operType = 0, businessType = "低保户导入")
    public R importLowSecurity(@RequestParam MultipartFile file, HttpServletRequest request) {
        // 获取文件名
        String fileName = file.getOriginalFilename();
@@ -321,8 +330,8 @@
        try {
            inputStream = file.getInputStream();
            ComMngPopulationLowSecurityExcelListen mngPopulationDisabilityExcelListen =
                new ComMngPopulationLowSecurityExcelListen(communityService, this.getCommunityId(),
                    this.getLoginUserInfo().getUserId(), stringRedisTemplate);
                    new ComMngPopulationLowSecurityExcelListen(communityService, this.getCommunityId(),
                            this.getLoginUserInfo().getUserId(), stringRedisTemplate);
            EasyExcel.read(inputStream, null, mngPopulationDisabilityExcelListen).sheet().doRead();
        } catch (IOException e) {
            log.error("导入模板失败【{}】", e.getMessage());
@@ -334,6 +343,7 @@
    @ApiOperation(value = "excel导入高龄老人")
    @PostMapping(value = "/serve/importElder", consumes = "multipart/*",
            headers = "content-type=multipart/form-date")
    @OperLog(operModul = "居民信息管理", operType = 0, businessType = "高龄老人导入")
    public R importElder(@RequestParam MultipartFile file, HttpServletRequest request) {
        // 获取文件名
        String fileName = file.getOriginalFilename();
@@ -355,6 +365,7 @@
    @ApiOperation(value = "excel导入养老金人员")
    @PostMapping(value = "/serve/importPension", consumes = "multipart/*",
            headers = "content-type=multipart/form-date")
    @OperLog(operModul = "居民信息管理", operType = 0, businessType = "养老金人员导入")
    public R importPension(@RequestParam MultipartFile file, HttpServletRequest request) {
        // 获取文件名
        String fileName = file.getOriginalFilename();
@@ -382,6 +393,7 @@
     */
    @ApiOperation(value = "excel-确认导入实有人口")
    @PostMapping(value = "/import/confirm", consumes = "multipart/*", headers = "content-type=multipart/form-date")
    @OperLog(operModul = "居民信息管理", operType = 0, businessType = "实有人口导入")
    public R listSavePopulationConfirm(@RequestParam MultipartFile file, HttpServletRequest request) {
        // 获取文件名
        String fileName = file.getOriginalFilename();
@@ -390,7 +402,7 @@
        try {
            inputStream = file.getInputStream();
            ComMngPopulationConfirmServeExcelListen comMngPopulationConfirmServeExcelListen =
                new ComMngPopulationConfirmServeExcelListen(communityService, this.getCommunityId());
                    new ComMngPopulationConfirmServeExcelListen(communityService, this.getCommunityId());
            EasyExcel.read(inputStream, null, comMngPopulationConfirmServeExcelListen).sheet().doRead();
        } catch (IOException e) {
            log.error("导入模板失败【{}】", e.getMessage());
@@ -401,7 +413,7 @@

    @ApiOperation(value = "excel导入实有人口notoken")
    @PostMapping(value = "/serve/import/noToken", consumes = "multipart/*",
        headers = "content-type=multipart/form-date")
            headers = "content-type=multipart/form-date")
    public R downloadPopulationTemplateno(@RequestParam MultipartFile file, HttpServletRequest request) {
        // 获取文件名
        String fileName = file.getOriginalFilename();
@@ -411,7 +423,7 @@
            Long communityId = Long.valueOf(request.getParameter("communityId"));
            inputStream = file.getInputStream();
            ComMngPopulationServeExcelListen comMngPopulationServeExcelListen = new ComMngPopulationServeExcelListen(
                communityService, communityId, this.getLoginUserInfo().getUserId(), stringRedisTemplate);
                    communityService, communityId, this.getLoginUserInfo().getUserId(), stringRedisTemplate);
            EasyExcel.read(inputStream, null, comMngPopulationServeExcelListen).sheet().doRead();
        } catch (IOException e) {
            log.error("导入模板失败【{}】", e.getMessage());
@@ -422,6 +434,7 @@

    @ApiOperation(value = "编辑实有人口")
    @PostMapping(value = "/edit")
    @OperLog(operModul = "居民信息管理", operType = 2, businessType = "编辑")
    public R editPopulationInfo(@RequestBody ComMngPopulationEditDTO populationEditDTO) {
        LoginUserInfoVO loginUserInfo = getLoginUserInfo();
        return communityService.editPopulation(populationEditDTO, loginUserInfo.getCommunityId());
@@ -474,7 +487,7 @@
                    // 查询当前社区标签列表
                    R tagsResult = userService.listTags();
                    if (Constants.SUCCESS.equals(tagsResult.getCode())) {
                        List<String> TagsList = (List<String>)tagsResult.getData();
                        List<String> TagsList = (List<String>) tagsResult.getData();
                        // 动态加载标签列表到表头
                        for (int i = 0; i < TagsList.size(); i++) {
                            List<String> head = new ArrayList<>();
@@ -534,7 +547,7 @@
                    // 查询当前社区标签列表
                    R tagsResult = userService.listTags();
                    if (Constants.SUCCESS.equals(tagsResult.getCode())) {
                        List<String> TagsList = (List<String>)tagsResult.getData();
                        List<String> TagsList = (List<String>) tagsResult.getData();
                        // 动态加载标签列表到表头
                        for (int i = 0; i < TagsList.size(); i++) {
                            if (!"吸毒人员".equals(TagsList.get(i))) {
@@ -594,7 +607,7 @@
                    // 查询当前社区标签列表
                    R tagsResult = userService.listTags();
                    if (Constants.SUCCESS.equals(tagsResult.getCode())) {
                        List<String> TagsList = (List<String>)tagsResult.getData();
                        List<String> TagsList = (List<String>) tagsResult.getData();
                        // 动态加载标签列表到表头
                        for (int i = 0; i < TagsList.size(); i++) {
                            if (!"社区矫正".equals(TagsList.get(i))) {
@@ -654,7 +667,7 @@
                    // 查询当前社区标签列表
                    R tagsResult = userService.listTags();
                    if (Constants.SUCCESS.equals(tagsResult.getCode())) {
                        List<String> TagsList = (List<String>)tagsResult.getData();
                        List<String> TagsList = (List<String>) tagsResult.getData();
                        // 动态加载标签列表到表头
                        for (int i = 0; i < TagsList.size(); i++) {
                            if (!"精神障碍患者".equals(TagsList.get(i))) {
@@ -714,7 +727,7 @@
                    // 查询当前社区标签列表
                    R tagsResult = userService.listTags();
                    if (Constants.SUCCESS.equals(tagsResult.getCode())) {
                        List<String> TagsList = (List<String>)tagsResult.getData();
                        List<String> TagsList = (List<String>) tagsResult.getData();
                        // 动态加载标签列表到表头
                        for (int i = 0; i < TagsList.size(); i++) {
                            if (!"邪教人员".equals(TagsList.get(i))) {
@@ -774,7 +787,7 @@
                    // 查询当前社区标签列表
                    R tagsResult = userService.listTags();
                    if (Constants.SUCCESS.equals(tagsResult.getCode())) {
                        List<String> TagsList = (List<String>)tagsResult.getData();
                        List<String> TagsList = (List<String>) tagsResult.getData();
                        // 动态加载标签列表到表头
                        for (int i = 0; i < TagsList.size(); i++) {
                            if (!"刑满释放".equals(TagsList.get(i))) {
@@ -834,7 +847,7 @@
                    // 查询当前社区标签列表
                    R tagsResult = userService.listTags();
                    if (Constants.SUCCESS.equals(tagsResult.getCode())) {
                        List<String> TagsList = (List<String>)tagsResult.getData();
                        List<String> TagsList = (List<String>) tagsResult.getData();
                        // 动态加载标签列表到表头
                        for (int i = 0; i < TagsList.size(); i++) {
                            if (!"重点人员".equals(TagsList.get(i))) {
@@ -894,7 +907,7 @@
                    // 查询当前社区标签列表
                    R tagsResult = userService.listTags();
                    if (Constants.SUCCESS.equals(tagsResult.getCode())) {
                        List<String> TagsList = (List<String>)tagsResult.getData();
                        List<String> TagsList = (List<String>) tagsResult.getData();
                        // 动态加载标签列表到表头
                        for (int i = 0; i < TagsList.size(); i++) {
                            if (!"服刑人员".equals(TagsList.get(i))) {
@@ -954,7 +967,7 @@
                    // 查询当前社区标签列表
                    R tagsResult = userService.listTags();
                    if (Constants.SUCCESS.equals(tagsResult.getCode())) {
                        List<String> TagsList = (List<String>)tagsResult.getData();
                        List<String> TagsList = (List<String>) tagsResult.getData();
                        // 动态加载标签列表到表头
                        for (int i = 0; i < TagsList.size(); i++) {
                            if (!"退役军人".equals(TagsList.get(i))) {
@@ -1014,7 +1027,7 @@
                    // 查询当前社区标签列表
                    R tagsResult = userService.listTags();
                    if (Constants.SUCCESS.equals(tagsResult.getCode())) {
                        List<String> TagsList = (List<String>)tagsResult.getData();
                        List<String> TagsList = (List<String>) tagsResult.getData();
                        // 动态加载标签列表到表头
                        for (int i = 0; i < TagsList.size(); i++) {
                            if (!"残疾人".equals(TagsList.get(i))) {
@@ -1074,7 +1087,7 @@
                    // 查询当前社区标签列表
                    R tagsResult = userService.listTags();
                    if (Constants.SUCCESS.equals(tagsResult.getCode())) {
                        List<String> TagsList = (List<String>)tagsResult.getData();
                        List<String> TagsList = (List<String>) tagsResult.getData();
                        // 动态加载标签列表到表头
                        for (int i = 0; i < TagsList.size(); i++) {
                            if (!"低保户".equals(TagsList.get(i))) {
@@ -1134,7 +1147,7 @@
                    // 查询当前社区标签列表
                    R tagsResult = userService.listTags();
                    if (Constants.SUCCESS.equals(tagsResult.getCode())) {
                        List<String> TagsList = (List<String>)tagsResult.getData();
                        List<String> TagsList = (List<String>) tagsResult.getData();
                        // 动态加载标签列表到表头
                        for (int i = 0; i < TagsList.size(); i++) {
                            if (!"高龄老人".equals(TagsList.get(i))) {
@@ -1194,7 +1207,7 @@
                    // 查询当前社区标签列表
                    R tagsResult = userService.listTags();
                    if (Constants.SUCCESS.equals(tagsResult.getCode())) {
                        List<String> TagsList = (List<String>)tagsResult.getData();
                        List<String> TagsList = (List<String>) tagsResult.getData();
                        // 动态加载标签列表到表头
                        for (int i = 0; i < TagsList.size(); i++) {
                            if (!"养老金居民".equals(TagsList.get(i))) {
@@ -1230,8 +1243,9 @@

    @ApiOperation(value = "批量删除实有人口")
    @PostMapping("/delete")
    @OperLog(operModul = "居民信息管理", operType = 3, businessType = "批量删除实有人口")
    public R deletePopulations(@RequestBody List<Long> ids) {
        return communityService.deletePopulations(ids,this.getCommunityId());
        return communityService.deletePopulations(ids, this.getCommunityId());
    }

    private List<List<String>> headDataFilling() {
@@ -2653,6 +2667,7 @@

    @ApiOperation(value = "实有人口-数据导出")
    @PostMapping("/data/export")
    @OperLog(operModul = "居民信息管理", operType = 0, businessType = "实有人口导出")
    public R dataExportPopulation(@RequestBody List<Long> Ids) {
        // 获取登陆用户
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
@@ -2678,23 +2693,23 @@
                            R r = communityService.getVillageById(Ids.get(0));
                            if (R.isOk(r)) {
                                populList = JSON.parseArray(
                                    JSON.toJSONString(
                                        communityService.getPopulationListByVillageId(Ids.get(0)).getData()),
                                    ComMngPopulationVO.class);
                                        JSON.toJSONString(
                                                communityService.getPopulationListByVillageId(Ids.get(0)).getData()),
                                        ComMngPopulationVO.class);
                            } else {
                                populList = JSON.parseArray(
                                    JSON.toJSONString(communityService.getPopulationLists(Ids).getData()),
                                    ComMngPopulationVO.class);
                                        JSON.toJSONString(communityService.getPopulationLists(Ids).getData()),
                                        ComMngPopulationVO.class);
                            }
                        } else {
                            populList =
                                JSON.parseArray(JSON.toJSONString(communityService.getPopulationLists(Ids).getData()),
                                    ComMngPopulationVO.class);
                                    JSON.parseArray(JSON.toJSONString(communityService.getPopulationLists(Ids).getData()),
                                            ComMngPopulationVO.class);
                        }
                    } else {// 导出全部
                        populList = JSON.parseArray(
                            JSON.toJSONString(communityService.getPopulationListByCommunityId(communityId).getData()),
                            ComMngPopulationVO.class);
                                JSON.toJSONString(communityService.getPopulationListByCommunityId(communityId).getData()),
                                ComMngPopulationVO.class);
                    }

                    List<ComMngPopulationExcelVo> populationExcelVoList = new ArrayList<>();
@@ -2706,7 +2721,7 @@
                            populationExcelVo.setSex(PopulSexEnum.getCnDescByName(popul.getSex()));
                            // 设置政治面貌
                            populationExcelVo.setPoliticalOutlook(
                                PopulPoliticalOutlookEnum.getCnDescByName(popul.getPoliticalOutlook()));
                                    PopulPoliticalOutlookEnum.getCnDescByName(popul.getPoliticalOutlook()));
                            // 设置是否租住
                            // populationExcelVo.setIsRent(PopulIsOkEnum.getCnDescByName(popul.getIsRent()));
                            // 设置本地或外地
@@ -2715,7 +2730,7 @@
                            populationExcelVo.setMarriage(PopulMarriageEnum.getCnDescByName(popul.getMarriage()));
                            // 设置文化程度
                            populationExcelVo
                                .setCultureLevel(PopulCultureLevelEnum.getCnDescByName(popul.getCultureLevel()));
                                    .setCultureLevel(PopulCultureLevelEnum.getCnDescByName(popul.getCultureLevel()));
                            // 设置年龄
                            if (StringUtils.isNotEmpty(popul.getBirthday())) {
                                populationExcelVo.setAge(AgeUtils.getAgeFromBirthTimes(popul.getBirthday()));
@@ -2729,8 +2744,8 @@
                    }

                    excelWriter = EasyExcel.write(fileName, ComMngPopulationExcelVo.class)
                        .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                        .registerWriteHandler(new CustomSheetWriteHandler()).build();
                            .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                            .registerWriteHandler(new CustomSheetWriteHandler()).build();
                    WriteSheet writeSheet = EasyExcel.writerSheet("实有人口导出数据").build();
                    excelWriter.write(populationExcelVoList, writeSheet);
                    excelWriter.finish();
@@ -2783,9 +2798,9 @@
                InputStream inputStream = null;
                try {
                    List<ComMngPopulationVO> populList = null;
                        populList = JSON.parseArray(
                                JSON.toJSONString(communityService.exportOld(comMngPopulationVO).getData()),
                                ComMngPopulationVO.class);
                    populList = JSON.parseArray(
                            JSON.toJSONString(communityService.exportOld(comMngPopulationVO).getData()),
                            ComMngPopulationVO.class);
                    List<ComMngPopulationExcelVo> populationExcelVoList = new ArrayList<>();
                    if (populList != null && populList.size() > 0) {
                        for (ComMngPopulationVO popul : populList) {
@@ -2865,8 +2880,7 @@
    /**
     * 查询房屋二级级联菜单
     *
     * @param cascadeHouseDTO
     *            请求参数
     * @param cascadeHouseDTO 请求参数
     * @return 菜单列表
     */
    @ApiOperation(value = "房屋级联菜单查询")
@@ -2879,8 +2893,7 @@
    /**
     * 查询房屋二级级联菜单后台
     *
     * @param cascadeHouseDTO
     *            请求参数
     * @param cascadeHouseDTO 请求参数
     * @return 菜单列表
     */
    @ApiOperation(value = "房屋级联菜单查询")
@@ -2965,8 +2978,8 @@
                InputStream inputStream = null;
                try {
                    excelWriter = EasyExcel.write(fileName, ComMngPopulationMistakeExcelVO.class)
                        .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                        .registerWriteHandler(new CustomSheetWriteHandler()).build();
                            .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                            .registerWriteHandler(new CustomSheetWriteHandler()).build();
                    WriteSheet writeSheet = EasyExcel.writerSheet("实有人口错误数据").build();
                    excelWriter.write(list, writeSheet);
                    excelWriter.finish();
@@ -3023,8 +3036,8 @@
                InputStream inputStream = null;
                try {
                    excelWriter = EasyExcel.write(fileName, ComMngPopulationDrugMistakeExcelVO.class)
                        .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                        .registerWriteHandler(new CustomSheetWriteHandler()).build();
                            .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                            .registerWriteHandler(new CustomSheetWriteHandler()).build();
                    WriteSheet writeSheet = EasyExcel.writerSheet("吸毒人员错误数据").build();
                    excelWriter.write(list, writeSheet);
                    excelWriter.finish();
@@ -3081,8 +3094,8 @@
                InputStream inputStream = null;
                try {
                    excelWriter = EasyExcel.write(fileName, ComMngPopulationCorrectMistakeExcelVO.class)
                        .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                        .registerWriteHandler(new CustomSheetWriteHandler()).build();
                            .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                            .registerWriteHandler(new CustomSheetWriteHandler()).build();
                    WriteSheet writeSheet = EasyExcel.writerSheet("社区矫正人员错误数据").build();
                    excelWriter.write(list, writeSheet);
                    excelWriter.finish();
@@ -3139,8 +3152,8 @@
                InputStream inputStream = null;
                try {
                    excelWriter = EasyExcel.write(fileName, ComMngPopulationMajorMistakeExcelVO.class)
                        .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                        .registerWriteHandler(new CustomSheetWriteHandler()).build();
                            .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                            .registerWriteHandler(new CustomSheetWriteHandler()).build();
                    WriteSheet writeSheet = EasyExcel.writerSheet("重精人员错误数据").build();
                    excelWriter.write(list, writeSheet);
                    excelWriter.finish();
@@ -3197,8 +3210,8 @@
                InputStream inputStream = null;
                try {
                    excelWriter = EasyExcel.write(fileName, ComMngPopulationCultMistakeExcelVO.class)
                        .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                        .registerWriteHandler(new CustomSheetWriteHandler()).build();
                            .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                            .registerWriteHandler(new CustomSheetWriteHandler()).build();
                    WriteSheet writeSheet = EasyExcel.writerSheet("邪教人员错误数据").build();
                    excelWriter.write(list, writeSheet);
                    excelWriter.finish();
@@ -3255,8 +3268,8 @@
                InputStream inputStream = null;
                try {
                    excelWriter = EasyExcel.write(fileName, ComMngPopulationRehabilitationMistakeExcelVO.class)
                        .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                        .registerWriteHandler(new CustomSheetWriteHandler()).build();
                            .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                            .registerWriteHandler(new CustomSheetWriteHandler()).build();
                    WriteSheet writeSheet = EasyExcel.writerSheet("刑释人员错误数据").build();
                    excelWriter.write(list, writeSheet);
                    excelWriter.finish();
@@ -3313,8 +3326,8 @@
                InputStream inputStream = null;
                try {
                    excelWriter = EasyExcel.write(fileName, ComMngPopulationKeyMistakeExcelVO.class)
                        .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                        .registerWriteHandler(new CustomSheetWriteHandler()).build();
                            .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                            .registerWriteHandler(new CustomSheetWriteHandler()).build();
                    WriteSheet writeSheet = EasyExcel.writerSheet("重点上访人员错误数据").build();
                    excelWriter.write(list, writeSheet);
                    excelWriter.finish();
@@ -3371,8 +3384,8 @@
                InputStream inputStream = null;
                try {
                    excelWriter = EasyExcel.write(fileName, ComMngPopulationSentenceMistakeExcelVO.class)
                        .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                        .registerWriteHandler(new CustomSheetWriteHandler()).build();
                            .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                            .registerWriteHandler(new CustomSheetWriteHandler()).build();
                    WriteSheet writeSheet = EasyExcel.writerSheet("服刑人员错误数据").build();
                    excelWriter.write(list, writeSheet);
                    excelWriter.finish();
@@ -3429,8 +3442,8 @@
                InputStream inputStream = null;
                try {
                    excelWriter = EasyExcel.write(fileName, ComMngPopulationVeteransMistakeExcelVO.class)
                        .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                        .registerWriteHandler(new CustomSheetWriteHandler()).build();
                            .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                            .registerWriteHandler(new CustomSheetWriteHandler()).build();
                    WriteSheet writeSheet = EasyExcel.writerSheet("退役军人错误数据").build();
                    excelWriter.write(list, writeSheet);
                    excelWriter.finish();
@@ -3487,8 +3500,8 @@
                InputStream inputStream = null;
                try {
                    excelWriter = EasyExcel.write(fileName, ComMngPopulationDisabilityMistakeExcelVO.class)
                        .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                        .registerWriteHandler(new CustomSheetWriteHandler()).build();
                            .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                            .registerWriteHandler(new CustomSheetWriteHandler()).build();
                    WriteSheet writeSheet = EasyExcel.writerSheet("残疾人错误数据").build();
                    excelWriter.write(list, writeSheet);
                    excelWriter.finish();
@@ -3545,8 +3558,8 @@
                InputStream inputStream = null;
                try {
                    excelWriter = EasyExcel.write(fileName, ComMngPopulationLowSecurityMistakeExcelVO.class)
                        .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                        .registerWriteHandler(new CustomSheetWriteHandler()).build();
                            .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                            .registerWriteHandler(new CustomSheetWriteHandler()).build();
                    WriteSheet writeSheet = EasyExcel.writerSheet("低保户错误数据").build();
                    excelWriter.write(list, writeSheet);
                    excelWriter.finish();