批量导出

wxy
1 parent d5531b6c
Showing 25 changed files with 190 additions and 189 deletions
juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/AnalyzeController.java
juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/MinorController.java
juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/Family.java
juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/GaDemographic.java
juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/Minor.java
juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/MrSchool.java
juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/MzUnsupported.java
juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/FamilyMapper.java
juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/MinorMapper.java
juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/FamilyMapper.xml
juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/MinorMapper.xml
juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IFamilyService.java
juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IMinorService.java
juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/FamilyServiceImpl.java
juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/GaHouseholdServiceImpl.java
juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/MinorServiceImpl.java
juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/MrSchoolServiceImpl.java
juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/util/getRandomId.java
juvenile-prosecution-vue/public/logo.png
juvenile-prosecution-vue/src/components/page/GlobalFooter.vue
@@ -116,6 +116,9 @@ public class AnalyzeController extends JeecgController&lt;GaDemographic, IGaDemogra
             getSourceData();
             log.info("来源数据入库时间" + (System.currentTimeMillis() - startTime4) / 1000 + "秒");
             log.info("*********************************总用时" + (System.currentTimeMillis() - startTime) / 1000 + "秒");
+            resultMinor = null;//分析后未成年人的信息
+            resultSchools = null;//分析后学籍的信息
+            testIdCards = null;//存储户号
         } catch (Exception e) {
             e.printStackTrace();
             log.info(String.valueOf(e));
@@ -136,40 +139,29 @@ public class AnalyzeController extends JeecgController&lt;GaDemographic, IGaDemogra
             CompletableFuture<List<MrSchool>> f7 = CompletableFuture.supplyAsync(() -> highSchoolService.getList(), executor);
             CompletableFuture<List<MrSchool>> f8 = CompletableFuture.supplyAsync(() -> primarySchoolService.getList(), executor);
             //行政处罚数据
-//            Map<String,GaPunishVo> gaPunishVos = gaPunishService.queryAll();
             Map<String, GaPunishVo> gaPunishVos = new HashMap<>();
             gaPunishVos.putAll(f1.get());
-//            List<SpecialStudentVo> specialStudentVos = specialStudentService.queryList();
             List<SpecialStudentVo> specialStudentVos = new ArrayList<>();
             specialStudentVos.addAll(f2.get());
             //孤儿数据
-//            List<String> mzOrphans  = mzOrphanService.getIdentityS();
             List<String> mzOrphans = new ArrayList<>();
             mzOrphans.addAll(f3.get());
             //无人抚养
-//            List<String> mzUnsupporteds =  mzUnsupportedService.getIdentityS();
             List<String> mzUnsupporteds = new ArrayList<>();
             mzUnsupporteds.addAll(f4.get());
             //留守儿童
-//            List<String> mzLeftBehinds =mzLeftBehindChildrenService.getIdentityS();
             List<String> mzLeftBehinds = new ArrayList<>();
             mzLeftBehinds.addAll(f5.get());
             //领养
-//            List<String> mzAdoptions =mzAdoptionService.getIdentityS();
             List<String> mzAdoptions = new ArrayList<>();
             mzAdoptions.addAll(f6.get());
             //获取初高中学生信息
-//            List<MrSchool> highSchools = highSchoolService.getList();
             List<MrSchool> highSchools = new ArrayList<>();
             highSchools.addAll(f7.get());
             //获取幼小学生信息
-//            List<MrSchool> primarySchools = primarySchoolService.getList();
             List<MrSchool> primarySchools = new ArrayList<>();
             primarySchools.addAll(f8.get());
             //人口基本信息小于18岁
-//            Map<String,String> gaDemographics =gaDemographicService.getIdentityS();
-//            Map<String,String> gaDemographics =new HashMap<>();
-//            gaDemographics.putAll(f9.get());
             //关闭线程池
             pool.shutdown();
             Map<String, String> gaDemographics = gaDemographicService.getIdentityS();
@@ -177,7 +169,6 @@ public class AnalyzeController extends JeecgController&lt;GaDemographic, IGaDemogra
             long startTime1 = System.currentTimeMillis();
             //户籍信息
             Map<String, Family> familyMap = gaHouseholdService.getGaHouseholds(gaDemographics);
-//            Map<String,Family> familyMap = queryByThread();
             log.info("户籍信息数据查询时间" + (System.currentTimeMillis() - startTime1) / 1000 + "秒");
             log.info("判断初高中学生信息和人口基本信息的交集和差集开始时间" + (System.currentTimeMillis() - startTime) / 1000 + "秒");
             judgeHighSchoolsAndDemographics(highSchools, gaDemographics, departs, specialStudentVos, mzUnsupporteds, mzLeftBehinds, mzAdoptions, familyMap, gaPunishVos, mzOrphans);
@@ -406,7 +397,7 @@ public class AnalyzeController extends JeecgController&lt;GaDemographic, IGaDemogra
                     if (oConvertUtils.isNotEmpty(idCard) && oConvertUtils.isNotEmpty(gaHouseholds.get(idCard)) && IDNumberUtil.checkID(idCard)) {
                         Minor minor = new Minor();
                         minor.setSchool(Minor.SCHOOL_STATUS_YES);
-                        minor.setName(gaHouseholds.get(idCard).getName());
+                        minor.setName(gaHouseholds.get(idCard).getName().trim());
                         minor.setGender(Integer.parseInt(IDNumberUtil.judgeGender(idCard)));
                         minor.setAddress(gaHouseholds.get(idCard).getAddress());
                         minor.setIdentity(idCard);
@@ -477,7 +468,7 @@ public class AnalyzeController extends JeecgController&lt;GaDemographic, IGaDemogra
                                 }
                                 minor.setSchool(Minor.SCHOOL_STATUS_NO);
                                 if (oConvertUtils.isNotEmpty(i.getName())) {
-                                    minor.setName(i.getName());
+                                    minor.setName(i.getName().trim());
                                 }
                                 minor.setGender(Integer.valueOf(IDNumberUtil.judgeGender(i.getIdentity())));
                                 if (oConvertUtils.isNotEmpty(i.getAddress())) {
@@ -552,14 +543,14 @@ public class AnalyzeController extends JeecgController&lt;GaDemographic, IGaDemogra
                                 }
                                 minor.setSchool(Minor.SCHOOL_STATUS_NO);
                                 if (oConvertUtils.isNotEmpty(m.getName())) {
-                                    minor.setName(m.getName());
+                                    minor.setName(m.getName().trim());
                                 }
                                 minor.setGender(Integer.valueOf(IDNumberUtil.judgeGender(m.getIdentity())));
                                 if (oConvertUtils.isNotEmpty(m.getAddress())) {
                                     minor.setAddress(m.getAddress());
                                 }
                                 if (oConvertUtils.isNotEmpty(m.getSchool())) {
-                                    minor.setSchoolName(m.getSchool());
+                                    minor.setSchoolName(m.getSchool().trim());
                                 }
                                 if (oConvertUtils.isNotEmpty(m.getAdmissionDate())) {
                                     minor.setStartYear(m.getAdmissionDate());
@@ -760,10 +751,10 @@ public class AnalyzeController extends JeecgController&lt;GaDemographic, IGaDemogra
                         if (oConvertUtils.isNotEmpty(gaPunishVos) && oConvertUtils.isNotEmpty(gaPunishVos.get(mapKey))) {
                             family.setCrime(Family.IS_CRIME);
                             if (oConvertUtils.isNotEmpty(gaPunishVos.get(mapKey).getAjmc())) {
-                                family.setOther(gaPunishVos.get(mapKey).getAjmc());
+                                family.setOther(gaPunishVos.get(mapKey).getAjmc().trim());
                             }
                             if (oConvertUtils.isNotEmpty(gaPunishVos.get(mapKey).getSldwmc())) {
-                                family.setReason(gaPunishVos.get(mapKey).getSldwmc());
+                                family.setReason(gaPunishVos.get(mapKey).getSldwmc().trim());
                             }
                         } else {
                             family.setCrime(Family.IS_NOT_CRIME);
@@ -771,7 +762,7 @@ public class AnalyzeController extends JeecgController&lt;GaDemographic, IGaDemogra
                         if (IDNumberUtil.checkID(mapKey)) {
                             family.setGender(Integer.valueOf(IDNumberUtil.judgeGender(mapKey)));
                         }
-                        family.setId(String.valueOf(id));
+//                        family.setId(Math.toIntExact(id));
                         family.setCreateTime(createTime);
                     }
                     if (oConvertUtils.isNotEmpty(family) && oConvertUtils.isNotEmpty(family.getHouseholdNum()) && oConvertUtils.isNotEmpty(family.getIdentity())) {
@@ -107,11 +107,11 @@ public class MinorController {
         if(oConvertUtils.isNotEmpty(sysUser) && oConvertUtils.isNotEmpty(sysUser.getOrgCode())){
             sysOrgCode=sysUser.getOrgCode();
         }
-        String isReason="";
-        if(oConvertUtils.isNotEmpty(minor) && oConvertUtils.isNotEmpty(minor.getIsReason()) && minor.getIsReason().equals("1")){
-            isReason=minor.getIsReason();
-        }
-        IPage<Minor> pageList = minorService.queryPageList(page,minor.getName(),sysOrgCode,isReason);
+//        String isReason="";
+//        if(oConvertUtils.isNotEmpty(minor) && oConvertUtils.isNotEmpty(minor.getIsReason()) && minor.getIsReason().equals("1")){
+//            isReason=minor.getIsReason();
+//        }
+        IPage<Minor> pageList = minorService.queryPageList(page,minor.getName(),sysOrgCode,minor.getIsReason());
         return Result.OK(pageList);
     }
@@ -219,6 +219,20 @@ public class MinorController {
         return Result.OK(familyList);
     }
+    /**
+     * 通过householdNum查询
+     *
+     * @param householdNum
+     * @return
+     */
+    @AutoLog(value = "家庭成员表通过主表householdNum查询")
+    @ApiOperation(value = "家庭成员表主表householdNum查询", notes = "家庭成员表-通主表householdNum查询")
+    @GetMapping(value = "/getFamilysByHouseholdNum")
+    public Result<?> getFamilysByHouseholdNum(@RequestParam(name = "householdNum", required = true) String householdNum) {
+        List<Family> familyList = familyService.getFamilysByHouseholdNum(householdNum);
+        return Result.OK(familyList);
+    }
+
 	/**
 	 * 导出excel
 	 *
@@ -226,9 +240,19 @@ public class MinorController {
 	 * @param minor
 	 */
 	@RequestMapping(value = "/exportXls")
-	public ModelAndView exportXls(HttpServletRequest request, Minor minor) {
+	public ModelAndView exportXls(HttpServletRequest request, Minor minor,  @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                  @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
         // Step.1 组装查询条件查询数据
-        Page<Minor> page = new Page<Minor>(1, 1);
+        // 过滤选中数据
+        String selections = request.getParameter("selections");
+        List<Long> ids=new ArrayList<>();
+        if(oConvertUtils.isEmpty(selections)){
+            pageSize=1;
+        }else {
+            List<String> selectionList = Arrays.asList(selections.split(","));
+            selectionList.stream().forEach(s -> ids.add(Long.valueOf(s)));
+        }
+        Page<Minor> page = new Page<Minor>(pageNo, pageSize);
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         String sysOrgCode="";
         if(oConvertUtils.isNotEmpty(sysUser) && oConvertUtils.isNotEmpty(sysUser.getOrgCode())){
@@ -237,18 +261,15 @@ public class MinorController {
         IPage<Minor> pageList = minorService.queryPageList(page,minor.getName(),sysOrgCode,minor.getIsReason());
         //Step.2 获取导出数据
         List<Minor> queryList = pageList.getRecords();
-        // 过滤选中数据
-        String selections = request.getParameter("selections");
         List<Minor> minorList = new ArrayList<Minor>();
         if (oConvertUtils.isEmpty(selections)) {
             minorList = queryList;
         } else {
-            List<String> selectionList = Arrays.asList(selections.split(","));
-            minorList = queryList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList());
+            minorList = queryList.stream().filter(item -> ids.contains(item.getId())).collect(Collectors.toList());
         }
         List<Family> familyList = new ArrayList<>();
         for (Minor main : minorList) {
-            familyList = familyService.selectByHouseholdNum(main.getHouseholdNum());
+            familyList .addAll(familyService.selectByHouseholdNum(main.getHouseholdNum()));
         }
         // Step.3 多sheet处理
         List<Map<String, Object>> listMap = new ArrayList<Map<String, Object>>();
@@ -30,9 +30,9 @@ public class Family implements Serializable {
     public static  final Integer IS_CRIME=1;//是
     public static  final Integer IS_NOT_CRIME=0;//否
-    @TableId(type = IdType.ASSIGN_ID)
+    @TableId(type = IdType.NONE)
     @ApiModelProperty(value = "主键")
-    private String id;
+    private Long id;
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
@@ -77,6 +77,7 @@ public class Family implements Serializable {
     @ApiModelProperty(value = "与户主的关系")
     private String relation;
     /**行政区划*/
+    @Excel(name = "行政区划", width = 15)
     @ApiModelProperty(value = "行政区划")
     private String division;
     /**现住址*/
@@ -31,6 +31,7 @@ import lombok.experimental.Accessors;
 public class GaDemographic implements Serializable {
     private static final long serialVersionUID = 1L;
+
 	/**人员编号*/
 	@Excel(name = "人员编号", width = 15)
     @ApiModelProperty(value = "人员编号")
@@ -40,6 +41,7 @@ public class GaDemographic implements Serializable {
     @ApiModelProperty(value = "姓名")
     private String xm;
 	/**身份证号*/
+    @TableId(type = IdType.NONE)
 	@Excel(name = "身份证号", width = 15)
     @ApiModelProperty(value = "身份证号")
     private String gmsfhm;
@@ -42,9 +42,9 @@ public class Minor implements Serializable {
     public static  final Integer ATTENTION_REASON_STUDENT=6;//特殊学生
 	/**主键*/
-	@TableId(type = IdType.ASSIGN_ID)
+	@TableId(type = IdType.NONE)
     @ApiModelProperty(value = "主键")
-    private String id;
+    private Long id;
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
@@ -32,9 +32,9 @@ public class MrSchool implements Serializable {
     private static final long serialVersionUID = 1L;
 	/**主键*/
-    @TableId(type = IdType.ASSIGN_ID)
+    @TableId(type = IdType.NONE)
     @ApiModelProperty(value = "主键")
-    private String id;
+    private Long id;
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
@@ -56,6 +56,7 @@ public class MzUnsupported implements Serializable {
     @ApiModelProperty(value = "出生日期")
     private String birthday;
 	/**身份证号*/
+    @TableId(type = IdType.NONE)
 	@Excel(name = "身份证号", width = 15)
     @ApiModelProperty(value = "身份证号")
     private String identity;
@@ -27,4 +27,6 @@ public interface FamilyMapper extends BaseMapper&lt;Family&gt; {
 	 * @return
 	 */
 	public Integer insertBatch(List<Family> list);
+
+	public List<Family>	getFamilysByHouseholdNum(@Param("householdNum") String householdNum);
 }
@@ -35,4 +35,12 @@ public interface MinorMapper extends BaseMapper&lt;Minor&gt; {
      */
     Integer getMinorByIdCard(@Param("identity") String identity);
+    /**
+     * 查询未成年人信息
+     * @param name
+     * @param sysOrgCode
+     * @param isReason
+     * @return
+     */
+    List<Minor> queryPageList(@Param("name") String name,@Param("sysOrgCode") String sysOrgCode,@Param("isReason")String isReason);
 }
@@ -9,17 +9,24 @@
 			household_num = #{householdNum} 	</delete>
 	<select id="selectByHouseholdNum" parameterType="java.lang.String" resultType="org.jeecg.modules.system.entity.Family">
-		SELECT * 
+		SELECT household_num as householdNum,number,name,identity,relation,address,crime,reason,other,division
 		FROM  mr_family
 		WHERE
 			household_num = #{householdNum}
 	</select>
 	<insert id="insertBatch" >
-		INSERT INTO mr_family (id,create_time,sys_org_code,household_num,number,name,identity,gender,relation,address,crime,reason,other)VALUES
+		INSERT INTO mr_family (id,create_time,sys_org_code,household_num,number,name,identity,gender,relation,address,crime,reason,other,division)VALUES
 		<foreach collection="list" item="b"  separator=",">
-			(#{b.id},#{b.createTime},#{b.sysOrgCode},#{b.householdNum},#{b.number},#{b.name},#{b.identity},#{b.gender},#{b.relation},#{b.address},#{b.crime},#{b.reason},#{b.other})
+			(#{b.id},#{b.createTime},#{b.sysOrgCode},#{b.householdNum},#{b.number},#{b.name},#{b.identity},#{b.gender},#{b.relation},#{b.address},#{b.crime},#{b.reason},#{b.other},#{b.division})
 		</foreach>
 	</insert>
+	<select id="getFamilysByHouseholdNum" parameterType="java.lang.String" resultType="org.jeecg.modules.system.entity.Family">
+		SELECT id,household_num as householdNum,number,name,identity,relation,address,crime,reason,other,division
+		FROM  mr_family
+		WHERE
+			household_num = #{householdNum}
+	</select>
+
 </mapper>
@@ -43,9 +43,17 @@
         <if test="sysOrgCode!=null and sysOrgCode!=''">
             and sys_org_code like concat(#{sysOrgCode},'%')
         </if>
-        <if test="isReason!=null and isReason!=''">
-            and reason !=''
-        </if>
+        <choose>
+            <when test='isReason=="1"'>
+                and reason !=''
+            </when>
+            <when test='isReason=="2"'>
+                and ISNULL(reason)
+            </when>
+            <otherwise>
+
+            </otherwise>
+        </choose>
         ORDER BY create_time desc
     </select>
@@ -18,6 +18,7 @@ public interface IFamilyService extends IService&lt;Family&gt; {
 	public List<Family> selectByHouseholdNum(String householdNum);
+	public List<Family> getFamilysByHouseholdNum(String householdNum);
 	public Integer insertBatch(List<Family> list);
 }
@@ -45,10 +45,23 @@ public interface IMinorService extends IService&lt;Minor&gt; {
 	public Integer insertBatch(List<Minor> list);
-
+	/**
+	 * 分页查询未成年人信息
+	 * @param page
+	 * @return
+	 */
 	IPage<Minor> queryPageList(Page<Minor> page,String name,String sysOrgCode,String isReason);
 	/**
+	 * 查询未成年人信息
+	 * @param name
+	 * @param sysOrgCode
+	 * @param isReason
+	 * @return
+	 */
+	List<Minor> queryList(String name, String sysOrgCode, String isReason);
+
+	/**
 	 * 添加多对多
 	 *
 	 */
@@ -29,7 +29,8 @@ import javax.annotation.Resource;
  */
 @Service
 public class FamilyServiceImpl extends ServiceImpl<FamilyMapper, Family> implements IFamilyService {
-	
+	private Integer random_number=00000000;
+
 	@Resource
 	private FamilyMapper familyMapper;
@@ -44,7 +45,10 @@ public class FamilyServiceImpl extends ServiceImpl&lt;FamilyMapper, Family&gt; impleme
 		return familyMapper.selectByHouseholdNum(householdNum);
 	}
-	private Integer random_number=00000000;
+	@Override
+	public List<Family> getFamilysByHouseholdNum(String householdNum) {
+		return familyMapper.getFamilysByHouseholdNum(householdNum);
+	}
 	/**
 	 * 批量新增
@@ -32,7 +32,6 @@ public class GaHouseholdServiceImpl extends ServiceImpl&lt;GaHouseholdMapper, GaHou
         try {
             long startTime = System.currentTimeMillis();
             List<Family> families = gaHouseholdMapper.getGaHouseholds();
-            System.out.println("数据查询时间" + (System.currentTimeMillis() - startTime) / 1000 + "秒");
             long startTime2 = System.currentTimeMillis();
             if (oConvertUtils.isNotEmpty(families)) {
                 families.stream().forEach(g -> {
@@ -41,7 +40,6 @@ public class GaHouseholdServiceImpl extends ServiceImpl&lt;GaHouseholdMapper, GaHou
                     }
                 });
             }
-            System.out.println("数据处理时间" + (System.currentTimeMillis() - startTime2) / 1000 + "秒");
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -14,6 +14,7 @@ import org.jeecg.modules.system.entity.SysDepart;
 import org.jeecg.modules.system.mapper.FamilyMapper;
 import org.jeecg.modules.system.mapper.MinorMapper;
 import org.jeecg.modules.system.service.IMinorService;
+import org.jeecg.modules.system.util.getRandomId;
 import org.jeecg.modules.system.vo.MinorVo;
 import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 import org.springframework.stereotype.Service;
@@ -56,7 +57,7 @@ public class MinorServiceImpl extends ServiceImpl&lt;MinorMapper, Minor&gt; implements
 	@Override
 	@Transactional
 	public void saveMain(Minor minor, List<Family> familyList) {
-
+		getRandomId idWorker = new getRandomId(0, 0);
 		if(familyList!=null && familyList.size()>0) {
 			//判断家庭成员信息里的数据是否包含未成年人,默认包含
 			Boolean falg=true;
@@ -71,12 +72,13 @@ public class MinorServiceImpl extends ServiceImpl&lt;MinorMapper, Minor&gt; implements
 				if(oConvertUtils.isNotEmpty(entity.getCrime()) && entity.getCrime().equals(Family.IS_CRIME)){
 					isCrime=true;
 				}
+				entity.setId(idWorker.nextId());
 			}
 			if(isCrime){
 				minor.setReason(String.valueOf(Minor.ATTENTION_REASON_CRIME));
 			}
 		}
-
+		minor.setId(idWorker.nextId());
 		familyMapper.insertBatch(familyList);
 		minorMapper.insert(minor);
 	}
@@ -159,20 +161,37 @@ public class MinorServiceImpl extends ServiceImpl&lt;MinorMapper, Minor&gt; implements
 		if(oConvertUtils.isNotEmpty(list)){
 			for(int i=0;i<list.size();i++){
 				String id=System.currentTimeMillis()+String.valueOf((random_number+i));
-				list.get(i).setId(id);
+				list.get(i).setId(Long.valueOf(id));
 			}
 		}
 		updateStudentWithThreads(list);
 		return list.size();
 	}
+	/**
+	 * 分页查询未成年人信息
+	 * @param page
+	 * @return
+	 */
 	@Override
 	public IPage<Minor> queryPageList(Page<Minor> page,String name,String sysOrgCode,String isReason) {
 		return minorMapper.queryPageList(page,name,sysOrgCode,isReason);
 	}
-
 	/**
+	 * 查询未成年人信息
+	 * @param name
+	 * @param sysOrgCode
+	 * @param isReason
+	 * @return
+	 */
+    @Override
+    public List<Minor> queryList(String name, String sysOrgCode, String isReason) {
+        return minorMapper.queryPageList(name,sysOrgCode,isReason);
+    }
+
+
+    /**
 	 * 添加多对多
 	 *
 	 */
@@ -185,6 +204,7 @@ public class MinorServiceImpl extends ServiceImpl&lt;MinorMapper, Minor&gt; implements
 			sysOrgCode=sysUser.getOrgCode();
 		}
 		Date createTime=new Date();
+		getRandomId idWorker = new getRandomId(0, 0);
 		//存放户号和犯罪的某一个家庭成员信息
 		Map<String,Family> houseFamily=new HashMap<>();
 		if(oConvertUtils.isNotEmpty(familyList) ){
@@ -196,6 +216,7 @@ public class MinorServiceImpl extends ServiceImpl&lt;MinorMapper, Minor&gt; implements
 					if(oConvertUtils.isNotEmpty(family.getCrime()) && family.getCrime().equals(Family.IS_CRIME) && oConvertUtils.isNotEmpty(family.getHouseholdNum())){
 						houseFamily.put(family.getHouseholdNum(),family);
 					}
+					family.setId(idWorker.nextId());
 				}
 			});
 		}
@@ -204,6 +225,7 @@ public class MinorServiceImpl extends ServiceImpl&lt;MinorMapper, Minor&gt; implements
 			minors.stream().forEach(minor -> {
 				if(oConvertUtils.isNotEmpty(minor)){
 					minor.setCreateTime(createTime);
+					minor.setId(idWorker.nextId());
 					if(oConvertUtils.isNotEmpty(houseFamily) && oConvertUtils.isNotEmpty(minor.getHouseholdNum())){
 						String houseNum=minor.getHouseholdNum();
 						Family family=houseFamily.get(houseNum);
@@ -50,7 +50,7 @@ public class MrSchoolServiceImpl extends ServiceImpl&lt;MrSchoolMapper, MrSchool&gt; i
         if(oConvertUtils.isNotEmpty(list)){
             for(int i=0;i<list.size();i++){
                 String id=System.currentTimeMillis()+String.valueOf((random_number+i));
-                list.get(i).setId(id);
+                list.get(i).setId(Long.valueOf(id));
             }
         }
         updateStudentWithThreads(list);
@@ -18,12 +18,12 @@ public class getRandomId {
     /**
      * 机器id所占的位数
      */
-    private final long workerIdBits = 5L;
+    private final long workerIdBits = 1L;
     /**
      * 数据标识id所占的位数
      */
-    private final long datacenterIdBits = 5L;
+    private final long datacenterIdBits = 1L;
     /**
      * 支持的最大机器id，结果是31 (这个移位算法可以很快的计算出几位二进制数所能表示的最大十进制数)
@@ -38,7 +38,7 @@ public class getRandomId {
     /**
      * 序列在id中占的位数
      */
-    private final long sequenceBits = 12L;
+    private final long sequenceBits = 1L;
     /**
      * 机器ID向左移12位
@@ -167,98 +167,17 @@ public class getRandomId {
     /**
      * 测试
      */
-//    public static void main(String[] args) {
-//        long startTime = System.currentTimeMillis();
-//        Set<Family> familys = new HashSet<>();
-//        //存放已经被放入minor里面的户号，避免数据重复
-//        Set<String> houseSet=new HashSet<>();
-//        Map<String, Minor> minors=getMinors();
-//        Map<String, List<Family>> familyMaps=getFamilyMaps();
-//        if (oConvertUtils.isNotEmpty(minors)) {
-//            for (Map.Entry<String, Minor> m : minors.entrySet()) {
-//                String idCard = m.getKey();
-//                Minor minor = m.getValue();
-//                Set<Family> f=new HashSet<>();
-//                //判断是否是一个家庭的人员
-//                if (oConvertUtils.isNotEmpty(minor.getHouseholdNum())) {
-//                    String houseNum = minor.getHouseholdNum();
-//                    if(oConvertUtils.isNotEmpty(familyMaps) && oConvertUtils.isNotEmpty(familyMaps.get(houseNum)) ){
-//                        if(!houseSet.contains(houseNum) ){
-//                            familys.addAll(familyMaps.get(houseNum));
-//                            houseSet.add(houseNum);
-//                        }
-//                    }
-//                    minor.setFamilies(f);
-//                }
-//            }
-//        }
-//        long endTime = System.currentTimeMillis();
-//
-//        System.out.println("endTime-startTime:" + (endTime - startTime));
-//    }
-//    public static Map<String, List<Family>> getFamilyMaps(){
-//        Map<String,  List<Family>> familyMaps=new HashMap<>();
-//        List<Family> familys=getFamilys();
-//        for(int i=0;i<familys.size();i++){
-//            Family family=familys.get(i);
-//            if(oConvertUtils.isNotEmpty(family.getHouseholdNum())){
-//                if(oConvertUtils.isNotEmpty(familyMaps) && oConvertUtils.isNotEmpty(familyMaps.get(family.getHouseholdNum()))){
-//                    familyMaps.get(family.getHouseholdNum()).add(family);
-//                }else {
-//                    List<Family> list = new ArrayList<>();
-//                    list.add(family);
-//                    familyMaps.put(family.getHouseholdNum(),list);
-//                }
-//
-//            }
-//        }
-//        return familyMaps;
-//
-//    }
-//
-//    public static List<Family> getFamilys(){
-//        List<Family> familys=new ArrayList<>();
-//        for(int i=0;i<25;i++){
-//            Family f=new Family();
-//            if(i<5){
-//                f.setIdentity("#####################"+i);
-//                f.setHouseholdNum("**************house"+0);
-//            }else if(i<10){
-//                f.setIdentity("#####################"+i);
-//                f.setHouseholdNum("**************house"+1);
-//            }else if(i<15){
-//                f.setIdentity("#####################"+i);
-//                f.setHouseholdNum("**************house"+2);
-//            }else if(i<20){
-//                f.setIdentity("#####################"+i);
-//                f.setHouseholdNum("**************house"+3);
-//            }else if(i<25){
-//                f.setIdentity("#####################"+i);
-//                f.setHouseholdNum("**************house"+4);
-//            }
-//            familys.add(f);
-//        }
-//        return familys;
-//
-//    }
-//
-//    public static Map<String, Minor> getMinors(){
-//        Map<String, Minor> minors=new HashMap<>();
-//        for(int i=0;i<10;i++){
-//           if(i<5){
-//               Minor m=new Minor();
-//               m.setIdentity("**************id"+i);
-//               m.setHouseholdNum("**************house"+i);
-//               minors.put("**************id"+i,m);
-//           }else if(i<10){
-//               Minor m=new Minor();
-//               m.setIdentity("**************id"+i);
-//               m.setHouseholdNum("**************house"+(i-5));
-//               minors.put("**************id"+i,m);
-//           }
-//        }
-//        return minors;
-//
-//    }
+    public static void main(String[] args) {
+        long startTime = System.currentTimeMillis();
+        Set<Long> ids=new HashSet<>();
+        getRandomId idWorker = new getRandomId(0, 0);
+        for(int i=0;i<100;i++){
+            ids.add(idWorker.nextId());
+        }
+        System.out.println(ids.size());
+        long endTime = System.currentTimeMillis();
+
+        System.out.println("endTime-startTime:" + (endTime - startTime));
+    }
 }
@@ -3,7 +3,7 @@
     <div class="copyright">
       Copyright
       <a-icon type="copyright"/>
-      2021 <span></span>
+      2022 <span></span>
     </div>
   </div>
 </template>
@@ -12,6 +12,7 @@
           <a-col :md="6" :sm="12">
             <a-form-item label="是否重点关注">
               <a-select v-model="queryParam.isReason"  placeholder="请选择" >
+                <a-select-option value="0">全部</a-select-option>
                 <a-select-option value="1">是</a-select-option>
                 <a-select-option value="2">否</a-select-option>
               </a-select>
@@ -234,7 +235,7 @@ export default {
         deleteBatch: '/sys/minor/deleteBatch',
         exportXlsUrl: '/sys/minor/exportXls',
         importExcelUrl: 'sys/minor/importExcel',
-        familys: '/sys/minor/queryFamilyByMainId'
+        familys: '/sys/minor/getFamilysByHouseholdNum'
       },
       dictOptions: {},
       superFieldList: [],
@@ -312,7 +313,11 @@ export default {
         showQuickJumper: true,
         total: 0
       },
-      familyLoading: false
+      familyLoading: false,
+      queryParam:{
+        name:'',
+        isReason:'0'
+      }
     }
   },
   created() {
@@ -324,6 +329,35 @@ export default {
     }
   },
   methods: {
+    handleExportXls(fileName){
+      if(!fileName || typeof fileName != "string"){
+        fileName = "导出文件"
+      }
+      let param = this.getQueryParams();
+      if(this.selectedRowKeys && this.selectedRowKeys.length>0){
+        param['selections'] = this.selectedRowKeys.join(",")
+      }
+      console.log("导出参数",param)
+      downFile(this.url.exportXlsUrl,param).then((data)=>{
+        if (!data) {
+          this.$message.warning("文件下载失败")
+          return
+        }
+        if (typeof window.navigator.msSaveBlob !== 'undefined') {
+          window.navigator.msSaveBlob(new Blob([data],{type: 'application/vnd.ms-excel'}), fileName+'.xls')
+        }else{
+          let url = window.URL.createObjectURL(new Blob([data],{type: 'application/vnd.ms-excel'}))
+          let link = document.createElement('a')
+          link.style.display = 'none'
+          link.href = url
+          link.setAttribute('download', fileName+'.xls')
+          document.body.appendChild(link)
+          link.click()
+          document.body.removeChild(link); //下载完成移除元素
+          window.URL.revokeObjectURL(url); //释放掉blob对象
+        }
+      })
+    },
     getAgeByIdentity(identity) {
       return GetAge(identity)
     },
@@ -345,38 +379,6 @@ export default {
         })
       }
     },
-    handleImportModel: function(name, type) {
-      if (!name || typeof name != 'string') {
-        name = '导出文件'
-      }
-      let param = { 'fileName': name, 'type': type }
-      console.log('导出参数', param)
-      downFile(this.url.exportXlsUrl, param).then((data) => {
-        console.log(data)
-        if (!data) {
-          this.$message.warning('文件下载失败')
-          return
-        }
-        console.log(window.navigator.msSaveBlob)
-        if (typeof window.navigator.msSaveBlob !== 'undefined') {
-          window.navigator.msSaveBlob(new Blob([data]), name + '.xlsx')
-        } else {
-          let url = window.URL.createObjectURL(new Blob([data]))
-          console.log(url)
-          let link = document.createElement('a')
-          console.log(link)
-          link.style.display = 'none'
-          link.href = url
-          link.setAttribute('download', name + '.xlsx')
-          console.log(link)
-          document.body.appendChild(link)
-          link.click()
-          console.log(link)
-          document.body.removeChild(link) //下载完成移除元素
-          window.URL.revokeObjectURL(url) //释放掉blob对象
-        }
-      })
-    },
     initDictConfig() {
     },
     getSuperFieldList() {
@@ -301,6 +301,7 @@ export default {
     },
     edit(record) {
       this.model = Object.assign({}, record)
+      this.dataSource=[]
       this.visible = true
       // 加载子表数据
       if (this.model.householdNum) {
@@ -310,9 +311,10 @@ export default {
     },
     /** 查询某个tab的数据 */
     requestTableData(url, params) {
+      console.log("单一查询")
       this.familyLoading = true
       getAction(url, params).then(res => {
-        console.log(this.dataSource)
+        console.log(res)
         this.dataSource = res.result || []
         console.log(this.dataSource)
       }).finally(() => {
@@ -117,11 +117,11 @@
           </a-card>
           <a-card v-else >
             <a-empty>
-              <span slot="description"> 请先选择一个机构! </span>
+              <span slot="description"> 请先选择一个单位! </span>
             </a-empty>
           </a-card>
         </a-tab-pane>
-        <a-tab-pane tab="机构权限" key="2" forceRender>
+        <a-tab-pane tab="单位权限" key="2" forceRender>
           <depart-auth-modal ref="departAuth"/>
         </a-tab-pane>
       </a-tabs>
@@ -86,7 +86,6 @@
           <a-icon type="down"/>
         </a-button>
       </a-dropdown>
-      <j-super-query :fieldList="superQueryFieldList" @handleSuperQuery="handleSuperQuery"/>
       <a-button @click="doAnalyze" type="primary" icon="control-outlined" >数据分析</a-button>
     </div>
@@ -44,7 +44,7 @@
     </template>
     <a-card v-else :bordered="false" style="height:200px">
       <a-empty>
-        <span slot="description"> 请先选择一个部门! </span>
+        <span slot="description"> 请先选择一个单位! </span>
       </a-empty>
     </a-card>
     <depart-datarule-modal ref="datarule"/>