diff --git a/juvenile-prosecution-boot/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/common/constant/ProvinceCityArea.class b/juvenile-prosecution-boot/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/common/constant/ProvinceCityArea.class index 6f51e81..cd89f14 100644 --- a/juvenile-prosecution-boot/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/common/constant/ProvinceCityArea.class +++ b/juvenile-prosecution-boot/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/common/constant/ProvinceCityArea.class diff --git a/juvenile-prosecution-boot/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/common/system/base/controller/JeecgController.class b/juvenile-prosecution-boot/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/common/system/base/controller/JeecgController.class index aad7aac..0118726 100644 --- a/juvenile-prosecution-boot/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/common/system/base/controller/JeecgController.class +++ b/juvenile-prosecution-boot/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/common/system/base/controller/JeecgController.class diff --git a/juvenile-prosecution-boot/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/common/util/CommonUtils.class b/juvenile-prosecution-boot/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/common/util/CommonUtils.class index 35f134b..c3c264b 100644 --- a/juvenile-prosecution-boot/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/common/util/CommonUtils.class +++ b/juvenile-prosecution-boot/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/common/util/CommonUtils.class diff --git a/juvenile-prosecution-boot/jeecg-boot-base/jeecg-boot-base-tools/target/classes/org/jeecg/common/modules/redis/writer/JeecgRedisCacheWriter.class b/juvenile-prosecution-boot/jeecg-boot-base/jeecg-boot-base-tools/target/classes/org/jeecg/common/modules/redis/writer/JeecgRedisCacheWriter.class index 196a62f..512cedc 100644 --- a/juvenile-prosecution-boot/jeecg-boot-base/jeecg-boot-base-tools/target/classes/org/jeecg/common/modules/redis/writer/JeecgRedisCacheWriter.class +++ b/juvenile-prosecution-boot/jeecg-boot-base/jeecg-boot-base-tools/target/classes/org/jeecg/common/modules/redis/writer/JeecgRedisCacheWriter.class diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/pom.xml b/juvenile-prosecution-boot/jeecg-boot-module-system/pom.xml index 057cb58..d8ddb46 100644 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/pom.xml +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/pom.xml @@ -39,8 +39,13 @@ jeewx-api 1.4.2 + + org.jeecgframework + jeewx-api + 1.4.7 + - + diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/AnalyzeController.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/AnalyzeController.java new file mode 100644 index 0000000..215f314 --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/AnalyzeController.java @@ -0,0 +1,343 @@ +package org.jeecg.modules.system.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.jeecg.common.system.base.controller.JeecgController; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.system.entity.Family; +import org.jeecg.modules.system.entity.GaDemographic; +import org.jeecg.modules.system.entity.Minor; +import org.jeecg.modules.system.entity.SysDepart; +import org.jeecg.modules.system.service.*; +import org.jeecg.modules.system.util.IDNumberUtil; +import org.jeecg.modules.system.util.MultiThreadUtil; +import org.jeecg.modules.system.vo.FamilyVo; +import org.jeecg.modules.system.vo.GaPunishVo; +import org.jeecg.modules.system.vo.SpecialStudentVo; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; + +/** +* @Description: 数据分析 +* @Author: jeecg-boot +* @Date: 2022-07-13 +* @Version: V1.0 +*/ +@Api(tags="数据分析") +@RestController +@RequestMapping("/sys/analyze") +@Slf4j +public class AnalyzeController extends JeecgController { + @Resource + private IGaDemographicService gaDemographicService; + @Resource + private IGaHouseholdService gaHouseholdService; + @Resource + private ISysDepartService sysDepartService; + @Resource + private IGaPunishService gaPunishService; + @Resource + private IGaJuvenilesStayService gaJuvenilesStayService; + @Resource + private IMzAdoptionService mzAdoptionService; + @Resource + private IMzLeftBehindChildrenService mzLeftBehindChildrenService; + @Resource + private IMzOrphanService mzOrphanService; + @Resource + private IMzUnsupportedService mzUnsupportedService; + @Resource + private ISpecialStudentService specialStudentService; + @Resource + private IFamilyService familyService; + @Resource + private IMinorService minorService; + @Resource + private IMrSchoolService schoolService; + + private Integer queryNum=0; + private Integer pageSize=200000; + private List gaPunishVos=new ArrayList<>(); + private List rasultFamily=new ArrayList<>();//分析后家庭的数据 + private List rasultMinor=new ArrayList<>();//分析后未成年人的信息 + private List specialStudentVos=new ArrayList<>(); + @AutoLog(value = "来源数据管理-分页列表查询") + @ApiOperation(value="来源数据管理-分页列表查询", notes="来源数据管理-分页列表查询") + @GetMapping(value = "/doAnalyzeData") + public void doAnalyzeData() { + +// List allData=new ArrayList<>() + LambdaQueryWrapper cfq = new LambdaQueryWrapper<>(); + cfq.isNotNull(SysDepart::getParentId); + List departs= sysDepartService.list(cfq); + gaPunishVos.addAll(gaPunishService.queryAll()); + specialStudentVos.addAll(specialStudentService.queryList()); + +// List familyVos=queryByThread(new ArrayList<>(),departs); + //获取当前系统时间 +// long startTime = System.currentTimeMillis(); + queryByThread(departs); +// long endTime = System.currentTimeMillis(); +// System.out.println(endTime-startTime); +// long startTime1 = System.currentTimeMillis(); +// long endTime1 = System.currentTimeMillis(); +// System.out.println("***********************结束时间"+(endTime1-startTime1)); + } + + /** + * 分页列表查询 + * @param allData + * @return + */ + public List queryPageList(List allData,List departs){ + try { +// List familyVos=gaDemographicService.queryPageList(queryNum,pageSize); +//// allData.addAll(familyVos); +// if(oConvertUtils.isNotEmpty(familyVos)){ +// //当查出来的数据等于分页的数量说明还有数据需要查询 +// if(familyVos.size() == pageSize){ +// queryNum=queryNum+pageSize; +//// queryPageList(allData); +// analyzeData(familyVos,departs); +// }else { +// +// } +// } + + }catch (Exception e){ + System.out.println(e); + } + return allData; + } + + public void analyzeData(List allData,List departs){ + List familyMajors=new ArrayList<>();//户籍信息里的成年人 + List familyMinors=new ArrayList<>();//户籍信息里的未成年人 + if(oConvertUtils.isNotEmpty(allData) && oConvertUtils.isNotEmpty(departs)){ + for(SysDepart d:departs){ + for(Family f:allData){ + if(d.getAbbreviation().contains(f.getDivision())){ + f.setSysOrgCode(d.getId()); + } + if(oConvertUtils.isNotEmpty(f.getIdentity())){ + f.setGender(Integer.valueOf(IDNumberUtil.judgeGender(f.getIdentity()))); + Integer age=IDNumberUtil.countAge(f.getIdentity()); + if(age<18){ + familyMinors.add(f); + }else { + familyMajors.add(f); + } + } + } + } + } + doFamilyMajors(familyMajors);//处理成年人 + doFamilyMinors(familyMinors);//处理成年人 + } + + public void doFamilyMajors(List familyMajors){ + if(oConvertUtils.isNotEmpty(gaPunishVos) && oConvertUtils.isNotEmpty(familyMajors)){ + for(GaPunishVo p:gaPunishVos){ + for(Family f:familyMajors){ + if(p.getDxsfzh().equals(f.getIdentity())){ + f.setOther(p.getAjmc()); + f.setReason(p.getSldwmc()); + f.setCrime(Family.IS_CRIME); + gaPunishVos.remove(p); + }else { + f.setCrime(Family.IS_NOT_CRIME); + } + } + } + } +// familyService.saveBatch(familyMajors); + } + + public void doFamilyMinors(List familyMinors){ + if(oConvertUtils.isNotEmpty(specialStudentVos) && oConvertUtils.isNotEmpty(familyMinors)){ + for (SpecialStudentVo s:specialStudentVos){ + for(Family f:familyMinors){ + Minor minor=new Minor(); + if(s.getIdentity().equals(f.getIdentity())){ + minor.setReason(s.getReason()); + minor.setRemark(s.getRemark()); + specialStudentVos.remove(s); + } + minor.setAddress(f.getAddress()); + minor.setGender(f.getGender()); + minor.setHouseholdNum(f.getHouseholdNum()); + minor.setName(f.getName()); + minor.setRelation(f.getRelation()); + minor.setNumber(f.getNumber()); + minor.setSysOrgCode(f.getSysOrgCode()); + } + } + } + familyService.saveBatch(familyMinors); +// minorService.saveBatch(); + } + + public void queryByThread(List departs) { + long startTime = System.currentTimeMillis(); + // 数据集合大小，由调用者自己指定 + int listSize = gaDemographicService.count(); + // 开启的线程数 + int runSize = 20; + // 一个线程处理数据条数，如果库中有100条数据，开启20个线程，那么每一个线程执行的条数就是5条 + int count = listSize / runSize;//5 + // 创建一个线程池，数量和开启线程的数量一样 + ExecutorService executor = MultiThreadUtil.createThread(runSize); + // 计算sql语句中每个分页查询的起始和结束数据下标 + // 循环创建线程 + //此处调用具体的查询方法 + System.out.println("开始查询线程总数"+runSize); + for (int i = 0; i < runSize; i++) { + int index = i * count; + int num = count; + executor.execute(new Runnable() { + @Override + public void run() { + try { + //查询的结果如何保存下来，会不会存在覆盖的问题 + System.out.println("每次查询的下标:" + index + ",条数:" + num); + List familyVos=gaDemographicService.queryPageList(index,num); + //行政处罚数据查询 +// gaPunishService + //这里做处理信息的方法 + analyzeData(familyVos,departs); + } catch (Exception e) { + System.out.println("查询失败" + e); + } + } + }); + } + // 执行完关闭线程池 + executor.shutdown(); + long endTime = System.currentTimeMillis(); + System.out.println(endTime-startTime); + } + + +// public static void exec(List list) throws InterruptedException{ +// int count = 300; //一个线程处理300条数据 +// int listSize = list.size(); //数据集合大小 +// int runSize = (listSize/count)+1; //开启的线程数 +// List newlist = null; //存放每个线程的执行数据 +// ExecutorService executor = Executors.newFixedThreadPool(runSize); //创建一个线程池，数量和开启线程的数量一样 +// //创建两个个计数器 +// CountDownLatch begin = new CountDownLatch(1); +// CountDownLatch end = new CountDownLatch(runSize); +// //循环创建线程 +// for (int i = 0; i < runSize ; i++) { +// //计算每个线程执行的数据 +// if((i+1)==runSize){ +// int startIndex = (i*count); +// int endIndex = list.size(); +// newlist= list.subList(startIndex, endIndex); +// }else{ +// int startIndex = (i*count); +// int endIndex = (i+1)*count; +// newlist= list.subList(startIndex, endIndex); +// } +// //线程类 +// MyThread mythead = new MyThread(newlist,begin,end); +// //这里执行线程的方式是调用线程池里的executor.execute(mythead)方法。 +// +// executor.execute(mythead); +// } +// +// begin.countDown(); +// end.await(); +// +// //执行完关闭线程池 +// executor.shutdown(); +// } + +// /** +// * 分割list集合 +// * +// * @param dataList +// * @return +// */ +// public List subList(List dataList) { +// List resultlist = new ArrayList<>();//存放批量数据处理的总结果集 +// if (null != dataList && dataList.size() > 0) { +// int pointsDataLimit = 100;//限制条数 10条一批 也是线程池线程数量 +// Integer size = dataList.size(); +// List cardlist=new ArrayList<>(); +// //判断是否有必要分批 +// if (pointsDataLimit < size) {//大于10条 +// int part = size / pointsDataLimit;//分批数 +// for (int i = 0; i < part; i++) { +// List listPage = dataList.subList(0, pointsDataLimit); //10条数据 +// Integer start = cardlist.size();//10条数据在总结果集的开始下标 +// cardlist = testTime(listPage, resultlist );//返回拼接后的总结果集 +// Integer end = resultlist .size();//10条数据在总结果集的结束下标 +// for (i = start; i < end; i++) { +// //对总数据集的10条数据进行业务处理 +// } +// //剔除已经处理过的10条数据 +// dataList.subList(0, pointsDataLimit).clear(); +// } +// if (!dataList.isEmpty()) {//小于10条 +// cardlist = testTime(dataList, cardlist);//处理最后的数据 +// } +// } else { +// } +// } +// +// return resultlist ; +// } +// +// /** +// * 多线程处理批量数据 +// * +// * @param splitList 处理数据 +// * @param cardlist 处理后总数据 +// * +// * @return +// */ +// public List testTime(List splitList, List cardlist) { +// List list = null; +// try { +// MultiThreadUtil multiThread = new MultiThreadUtil(splitList) { +// @Override +// public FamilyVo outExecute(int currentThread, FamilyVo data) { +// //业务处理 +// /* String iccid = data.getIccid(); +// String allOrder = cardServerService.findAllOrder(iccid); +// String allFlow = cardServerService.allFlowByiccid(iccid); +// String allUseFlow = cardServerService.allUseFlowByiccid(iccid); +// Card card = cardMapper.findByIccid(iccid); +// String monthFlow = card.getMonthFlow(); +// data.setMonthFlow(monthFlow); +// data.setAllOrder(allOrder); +// data.setAllFlow(allFlow); +// data.setAllUseFlow(allUseFlow); +// return data;*/ +// //业务处理end +// return data; +// } +// }; +// list = multiThread.getResult();//返回结果 +// for (FamilyVo ccar : list) { +// cardlist.add(ccar);//批量数据遍历放入总结果 +// } +// } catch (Exception e) { +// e.printStackTrace(); +// } +// return cardlist; +// +// } + + +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/DivisionController.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/DivisionController.java new file mode 100644 index 0000000..2e3ac24 --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/DivisionController.java @@ -0,0 +1,226 @@ +package org.jeecg.modules.system.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.shiro.SecurityUtils; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.constant.CommonConstant; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.system.vo.LoginUser; +import org.jeecg.common.util.oConvertUtils; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecg.modules.system.entity.Division; +import org.jeecg.modules.system.model.DivisionModel; +import org.jeecg.modules.system.model.SysDepartTreeModel; +import org.jeecg.modules.system.service.IDivisionService; +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 行政区划 + * @Author: jeecg-boot + * @Date: 2022-07-12 + * @Version: V1.0 + */ +@Api(tags="行政区划") +@RestController +@RequestMapping("/sys/division") +@Slf4j +public class DivisionController extends JeecgController{ + @Autowired + private IDivisionService divisionService; + + /** + * 查询数据 查出所有部门,并以树结构数据格式响应给前端 + * + * @return + */ + @RequestMapping(value = "/queryTreeList", method = RequestMethod.GET) + public Result> queryTreeList(@RequestParam(name = "ids", required = false) String ids) { + Result> result = new Result<>(); + try { + // 从内存中读取 +// List list =FindsDepartsChildrenUtil.getSysDepartTreeList(); +// if (CollectionUtils.isEmpty(list)) { +// list = sysDepartService.queryTreeList(); +// } + if(oConvertUtils.isNotEmpty(ids)){ + List list = divisionService.queryTreeList(ids); + result.setResult(list); + }else{ + List list = divisionService.queryTreeList(); + result.setResult(list); + } + result.setSuccess(true); + } catch (Exception e) { + log.error(e.getMessage(),e); + } + return result; + } + + /** + * 获取子数据 + * @param division + * @param req + * @return + */ + @AutoLog(value = "行政区划-获取子数据") + @ApiOperation(value="行政区划-获取子数据", notes="行政区划-获取子数据") + @GetMapping(value = "/childList") + public Result queryPageList(Division division,HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(division, req.getParameterMap()); + List list = divisionService.list(queryWrapper); + IPage pageList = new Page<>(1, 10, list.size()); + pageList.setRecords(list); + return Result.OK(pageList); + } + + /** + * 批量查询子节点 + * @param parentIds 父ID（多个采用半角逗号分割） + * @return 返回 IPage + * @param parentIds + * @return + */ + @AutoLog(value = "行政区划-批量获取子数据") + @ApiOperation(value="行政区划-批量获取子数据", notes="行政区划-批量获取子数据") + @GetMapping("/getChildListBatch") + public Result getChildListBatch(@RequestParam("parentIds") String parentIds) { + try { + QueryWrapper queryWrapper = new QueryWrapper<>(); + List parentIdList = Arrays.asList(parentIds.split(",")); + queryWrapper.in("pid", parentIdList); + List list = divisionService.list(queryWrapper); + IPage pageList = new Page<>(1, 10, list.size()); + pageList.setRecords(list); + return Result.OK(pageList); + } catch (Exception e) { + log.error(e.getMessage(), e); + return Result.error("批量查询子节点失败：" + e.getMessage()); + } + } + + /** + * 添加 + * + * @param division + * @return + */ + @AutoLog(value = "行政区划-添加") + @ApiOperation(value="行政区划-添加", notes="行政区划-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody Division division) { + divisionService.addDivision(division); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param division + * @return + */ + @AutoLog(value = "行政区划-编辑") + @ApiOperation(value="行政区划-编辑", notes="行政区划-编辑") + @PutMapping(value = "/edit") + public Result edit(@RequestBody Division division) { + divisionService.updateDivision(division); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "行政区划-通过id删除") + @ApiOperation(value="行政区划-通过id删除", notes="行政区划-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + divisionService.delete(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "行政区划-批量删除") + @ApiOperation(value="行政区划-批量删除", notes="行政区划-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + divisionService.deleteBatchWithChildren(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功！"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "行政区划-通过id查询") + @ApiOperation(value="行政区划-通过id查询", notes="行政区划-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + Division division = divisionService.getById(id); + if(division==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(division); + } + + /** + * 导出excel + * + * @param request + * @param division + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, Division division) { + return super.exportXls(request, division, Division.class, "行政区划"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, Division.class); + } + + +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/MinorController.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/MinorController.java new file mode 100644 index 0000000..81de6de --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/MinorController.java @@ -0,0 +1,261 @@ +package org.jeecg.modules.system.controller; + +import java.io.UnsupportedEncodingException; +import java.io.IOException; +import java.net.URLDecoder; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.jeecg.modules.system.entity.Family; +import org.jeecg.modules.system.entity.Minor; +import org.jeecg.modules.system.service.IFamilyService; +import org.jeecg.modules.system.service.IMinorService; +import org.jeecg.modules.system.vo.MinorPage; +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.vo.LoginUser; +import org.apache.shiro.SecurityUtils; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 未成年人 + * @Author: jeecg-boot + * @Date: 2022-07-13 + * @Version: V1.0 + */ +@Api(tags="未成年人") +@RestController +@RequestMapping("/sys/minor") +@Slf4j +public class MinorController { + @Autowired + private IMinorService minorService; + @Autowired + private IFamilyService familyService; + + /** + * 分页列表查询 + * + * @param minor + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "未成年人-分页列表查询") + @ApiOperation(value="未成年人-分页列表查询", notes="未成年人-分页列表查询") + @GetMapping(value = "/list") + public Result queryPageList(Minor minor, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(minor, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = minorService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param minorPage + * @return + */ + @AutoLog(value = "未成年人-添加") + @ApiOperation(value="未成年人-添加", notes="未成年人-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody MinorPage minorPage) { + Minor minor = new Minor(); + BeanUtils.copyProperties(minorPage, minor); + minorService.saveMain(minor, minorPage.getFamilyList()); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param minorPage + * @return + */ + @AutoLog(value = "未成年人-编辑") + @ApiOperation(value="未成年人-编辑", notes="未成年人-编辑") + @PutMapping(value = "/edit") + public Result edit(@RequestBody MinorPage minorPage) { + Minor minor = new Minor(); + BeanUtils.copyProperties(minorPage, minor); + Minor minorEntity = minorService.getById(minor.getId()); + if(minorEntity==null) { + return Result.error("未找到对应数据"); + } + minorService.updateMain(minor, minorPage.getFamilyList()); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "未成年人-通过id删除") + @ApiOperation(value="未成年人-通过id删除", notes="未成年人-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + minorService.delMain(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "未成年人-批量删除") + @ApiOperation(value="未成年人-批量删除", notes="未成年人-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.minorService.delBatchMain(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功！"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "未成年人-通过id查询") + @ApiOperation(value="未成年人-通过id查询", notes="未成年人-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + Minor minor = minorService.getById(id); + if(minor==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(minor); + + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "家庭成员表通过主表ID查询") + @ApiOperation(value="家庭成员表主表ID查询", notes="家庭成员表-通主表ID查询") + @GetMapping(value = "/queryFamilyByMainId") + public Result queryFamilyListByMainId(@RequestParam(name="id",required=true) String id) { + List familyList = familyService.selectByMainId(id); + return Result.OK(familyList); + } + + /** + * 导出excel + * + * @param request + * @param minor + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, Minor minor) { + // Step.1 组装查询条件查询数据 + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(minor, request.getParameterMap()); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + + //Step.2 获取导出数据 + List queryList = minorService.list(queryWrapper); + // 过滤选中数据 + String selections = request.getParameter("selections"); + List minorList = new ArrayList(); + if(oConvertUtils.isEmpty(selections)) { + minorList = queryList; + }else { + List selectionList = Arrays.asList(selections.split(",")); + minorList = queryList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList()); + } + + // Step.3 组装pageList + List pageList = new ArrayList(); + for (Minor main : minorList) { + MinorPage vo = new MinorPage(); + BeanUtils.copyProperties(main, vo); + List familyList = familyService.selectByMainId(main.getId()); + vo.setFamilyList(familyList); + pageList.add(vo); + } + + // Step.4 AutoPoi 导出Excel + ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); + mv.addObject(NormalExcelConstants.FILE_NAME, "未成年人列表"); + mv.addObject(NormalExcelConstants.CLASS, MinorPage.class); + mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("未成年人数据", "导出人:"+sysUser.getRealname(), "未成年人")); + mv.addObject(NormalExcelConstants.DATA_LIST, pageList); + return mv; + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; + Map fileMap = multipartRequest.getFileMap(); + for (Map.Entry entity : fileMap.entrySet()) { + MultipartFile file = entity.getValue();// 获取上传文件对象 + ImportParams params = new ImportParams(); + params.setTitleRows(2); + params.setHeadRows(1); + params.setNeedSave(true); + try { + List list = ExcelImportUtil.importExcel(file.getInputStream(), MinorPage.class, params); + for (MinorPage page : list) { + Minor po = new Minor(); + BeanUtils.copyProperties(page, po); + minorService.saveMain(po, page.getFamilyList()); + } + return Result.OK("文件导入成功！数据行数:" + list.size()); + } catch (Exception e) { + log.error(e.getMessage(),e); + return Result.error("文件导入失败:"+e.getMessage()); + } finally { + try { + file.getInputStream().close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + return Result.OK("文件导入失败！"); + } + +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SourceController.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SourceController.java new file mode 100644 index 0000000..f4f546d --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SourceController.java @@ -0,0 +1,191 @@ +package org.jeecg.modules.system.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecg.modules.system.entity.SourceData; +import org.jeecg.modules.system.service.ISourceService; +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 来源数据管理 + * @Author: jeecg-boot + * @Date: 2022-07-13 + * @Version: V1.0 + */ +@Api(tags="来源数据管理") +@RestController +@RequestMapping("/sys/source") +@Slf4j +public class SourceController extends JeecgController { + @Autowired + private ISourceService sourceService; + + /** + * 分页列表查询 + * + * @param source + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "来源数据管理-分页列表查询") + @ApiOperation(value="来源数据管理-分页列表查询", notes="来源数据管理-分页列表查询") + @GetMapping(value = "/list") + public Result queryPageList(SourceData source, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(source, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = sourceService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 根据单位名称分组查询数据 + * @param source + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "来源数据管理-根据单位名称分组查询数据") + @ApiOperation(value="来源数据管理-根据单位名称分组查询数据", notes="来源数据管理-根据单位名称分组查询数据") + @GetMapping(value = "/getListGroupByName") + public Result getListGroupByName(SourceData source,String name, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + Page page = new Page(pageNo, pageSize); + IPage pageList = sourceService.getListGroupByName(page,name); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param source + * @return + */ + @AutoLog(value = "来源数据管理-添加") + @ApiOperation(value="来源数据管理-添加", notes="来源数据管理-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody SourceData source) { + sourceService.save(source); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param source + * @return + */ + @AutoLog(value = "来源数据管理-编辑") + @ApiOperation(value="来源数据管理-编辑", notes="来源数据管理-编辑") + @PutMapping(value = "/edit") + public Result edit(@RequestBody SourceData source) { + sourceService.updateById(source); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "来源数据管理-通过id删除") + @ApiOperation(value="来源数据管理-通过id删除", notes="来源数据管理-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + sourceService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "来源数据管理-批量删除") + @ApiOperation(value="来源数据管理-批量删除", notes="来源数据管理-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.sourceService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "来源数据管理-通过id查询") + @ApiOperation(value="来源数据管理-通过id查询", notes="来源数据管理-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + SourceData source = sourceService.getById(id); + if(source==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(source); + } + + /** + * 导出excel + * + * @param request + * @param source + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, SourceData source) { + return super.exportXls(request, source, SourceData.class, "来源数据管理"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, SourceData.class); + } + +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/Division.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/Division.java new file mode 100644 index 0000000..5a331fe --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/Division.java @@ -0,0 +1,75 @@ +package org.jeecg.modules.system.entity; + +import java.io.Serializable; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.io.UnsupportedEncodingException; + +/** + * @Description: 行政区划 + * @Author: jeecg-boot + * @Date: 2022-07-12 + * @Version: V1.0 + */ +@Data +@TableName("mr_division") +@ApiModel(value="mr_division对象", description="行政区划") +public class Division implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + /**名称*/ + @Excel(name = "名称", width = 15) + @ApiModelProperty(value = "名称") + private String name; + /**常用名称*/ + @Excel(name = "常用名称", width = 15) + @ApiModelProperty(value = "常用名称") + private String abbreviation; + /**编码*/ + @Excel(name = "编码", width = 15) + @ApiModelProperty(value = "编码") + private String code; + /**常用编码*/ + @Excel(name = "常用编码", width = 15) + @ApiModelProperty(value = "常用编码") + private String commonCode; + /**父级节点*/ + @Excel(name = "父级节点", width = 15) + @ApiModelProperty(value = "父级节点") + private String pid; + /**是否有子节点*/ + @Excel(name = "是否有子节点", width = 15, dicCode = "yn") + @Dict(dicCode = "yn") + @ApiModelProperty(value = "是否有子节点") + private String hasChild; +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/Family.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/Family.java new file mode 100644 index 0000000..23da77c --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/Family.java @@ -0,0 +1,110 @@ +package org.jeecg.modules.system.entity; + +import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.jeecg.common.aspect.annotation.Dict; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import java.util.Date; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.io.UnsupportedEncodingException; + +/** + * @Description: 家庭成员表 + * @Author: jeecg-boot + * @Date: 2022-07-13 + * @Version: V1.0 + */ +@ApiModel(value="mr_family对象", description="家庭成员表") +@Data +@TableName("mr_family") +public class Family implements Serializable { + private static final long serialVersionUID = 1L; + //是否犯罪 + public static final Integer IS_CRIME=1;//是 + public static final Integer IS_NOT_CRIME=0;//否 + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private String sysOrgCode; + /**姓名*/ + @Excel(name = "姓名", width = 15) + @ApiModelProperty(value = "姓名") + private String name; + /**性别*/ + @Excel(name = "性别", width = 15,dicCode = "sex") + @ApiModelProperty(value = "性别") + @Dict(dicCode = "sex") + private Integer gender; + /**身份证号*/ + @Excel(name = "身份证号", width = 15) + @ApiModelProperty(value = "身份证号") + private String identity; + /**户号*/ + @Excel(name = "户号", width = 15) + @ApiModelProperty(value = "户号") + private String householdNum; + /**人员编号*/ + @Excel(name = "人员编号", width = 15) + @ApiModelProperty(value = "人员编号") + private String number; + /**婚姻状况*/ + @Excel(name = "婚姻状况", width = 15,dicCode = "marital_status") + @ApiModelProperty(value = "婚姻状况") + @Dict(dicCode = "marital_status") + private Integer marital; + /**是否犯罪*/ + @Excel(name = "是否犯罪", width = 15,dicCode = "is_crime") + @ApiModelProperty(value = "是否犯罪") + @Dict(dicCode = "is_crime") + private Integer crime; + /**犯罪原因*/ + @Excel(name = "犯罪原因", width = 15) + @ApiModelProperty(value = "犯罪原因") + private String reason; + /**其他参考信息*/ + @Excel(name = "其他参考信息", width = 15) + @ApiModelProperty(value = "其他参考信息") + private String other; + /**行政区划*/ + @Excel(name = "行政区划", width = 15) + @ApiModelProperty(value = "行政区划") + private String division; + @Excel(name = "与户主的关系", width = 15) + @ApiModelProperty(value = "与户主的关系") + private String relation; + /**现住址*/ + @Excel(name = "现住址", width = 15) + @ApiModelProperty(value = "现住址") + private String address; + /**未成年人表id*/ + @ApiModelProperty(value = "未成年人表id") + private String minorId; + +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/GaDemographic.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/GaDemographic.java new file mode 100644 index 0000000..d0a7aaf --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/GaDemographic.java @@ -0,0 +1,66 @@ +package org.jeecg.modules.system.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: ga_demographic + * @Author: jeecg-boot + * @Date: 2022-07-14 + * @Version: V1.0 + */ +@Data +@TableName("ga_demographic") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="ga_demographic对象", description="ga_demographic") +public class GaDemographic implements Serializable { + private static final long serialVersionUID = 1L; + + /**人员编号*/ + @Excel(name = "人员编号", width = 15) + @ApiModelProperty(value = "人员编号") + private String rybh; + /**姓名*/ + @Excel(name = "姓名", width = 15) + @ApiModelProperty(value = "姓名") + private String xm; + /**身份证号*/ + @Excel(name = "身份证号", width = 15) + @ApiModelProperty(value = "身份证号") + private String gmsfhm; + /**曾用名*/ + @Excel(name = "曾用名", width = 15) + @ApiModelProperty(value = "曾用名") + private String cym; + /**性别*/ + @Excel(name = "性别", width = 15) + @ApiModelProperty(value = "性别") + private String xb; + /**出生日期*/ + @Excel(name = "出生日期", width = 15) + @ApiModelProperty(value = "出生日期") + private String csrq; + /**民族*/ + @Excel(name = "民族", width = 15) + @ApiModelProperty(value = "民族") + private String mz; + /**户籍祥址*/ + @Excel(name = "户籍祥址", width = 15) + @ApiModelProperty(value = "户籍祥址") + private String hjxz; +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/GaHousehold.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/GaHousehold.java new file mode 100644 index 0000000..986748e --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/GaHousehold.java @@ -0,0 +1,94 @@ +package org.jeecg.modules.system.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: ga_household + * @Author: jeecg-boot + * @Date: 2022-07-14 + * @Version: V1.0 + */ +@Data +@TableName("ga_household") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="ga_household对象", description="ga_household") +public class GaHousehold implements Serializable { + private static final long serialVersionUID = 1L; + + /**人员编号*/ + @Excel(name = "人员编号", width = 15) + @ApiModelProperty(value = "人员编号") + private String rybh; + /**姓名*/ + @Excel(name = "姓名", width = 15) + @ApiModelProperty(value = "姓名") + private String xm; + /**身份证号*/ + @Excel(name = "身份证号", width = 15) + @ApiModelProperty(value = "身份证号") + private String gmsfhm; + /**曾用名*/ + @Excel(name = "曾用名", width = 15) + @ApiModelProperty(value = "曾用名") + private String cym; + /**性别*/ + @Excel(name = "性别", width = 15) + @ApiModelProperty(value = "性别") + private String xb; + /**出生日期*/ + @Excel(name = "出生日期", width = 15) + @ApiModelProperty(value = "出生日期") + private String csrq; + /**民族*/ + @Excel(name = "民族", width = 15) + @ApiModelProperty(value = "民族") + private String mz; + /**户籍祥址*/ + @Excel(name = "户籍祥址", width = 15) + @ApiModelProperty(value = "户籍祥址") + private String hjxz; + /**现住祥址*/ + @Excel(name = "现住祥址", width = 15) + @ApiModelProperty(value = "现住祥址") + private String xzxz; + /**户号*/ + @Excel(name = "户号", width = 15) + @ApiModelProperty(value = "户号") + private String hh; + /**人员状态*/ + @Excel(name = "人员状态", width = 15) + @ApiModelProperty(value = "人员状态") + private String ryzt; + /**行政区划*/ + @Excel(name = "行政区划", width = 15) + @ApiModelProperty(value = "行政区划") + private String xzqhmc; + /**jgxzqh*/ + @Excel(name = "jgxzqh", width = 15) + @ApiModelProperty(value = "jgxzqh") + private String jgxzqh; + /**与户主关系*/ + @Excel(name = "与户主关系", width = 15) + @ApiModelProperty(value = "与户主关系") + private String yhzgxmc; + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private Integer id; +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/GaJuvenilesStay.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/GaJuvenilesStay.java new file mode 100644 index 0000000..c6c2461 --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/GaJuvenilesStay.java @@ -0,0 +1,80 @@ +package org.jeecg.modules.system.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 公安_未成年人住宿信息 + * @Author: jeecg-boot + * @Date: 2022-07-14 + * @Version: V1.0 + */ +@Data +@TableName("ga_juveniles_stay") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="ga_juveniles_stay对象", description="ga_juveniles_stay") +public class GaJuvenilesStay implements Serializable { + private static final long serialVersionUID = 1L; + + /**姓名*/ + @Excel(name = "姓名", width = 15) + @ApiModelProperty(value = "姓名") + private String xm; + /**身份证号*/ + @Excel(name = "身份证号", width = 15) + @ApiModelProperty(value = "身份证号") + private String gmsfhm; + /**出生日期*/ + @Excel(name = "出生日期", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "出生日期") + private Date csrq; + /**入住时间*/ + @Excel(name = "入住时间", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "入住时间") + private Date rzsj; + /**退房时间*/ + @Excel(name = "退房时间", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "退房时间") + private Date tfsj; + /**旅馆名称*/ + @Excel(name = "旅馆名称", width = 15) + @ApiModelProperty(value = "旅馆名称") + private String lgbm; + /**入住房号*/ + @Excel(name = "入住房号", width = 15) + @ApiModelProperty(value = "入住房号") + private String rzfh; + /**dwmc*/ + @Excel(name = "dwmc", width = 15) + @ApiModelProperty(value = "dwmc") + private String dwmc; + /**dwdz*/ + @Excel(name = "dwdz", width = 15) + @ApiModelProperty(value = "dwdz") + private String dwdz; + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private Integer id; +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/GaPunish.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/GaPunish.java new file mode 100644 index 0000000..ae71cef --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/GaPunish.java @@ -0,0 +1,78 @@ +package org.jeecg.modules.system.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 公安_行政处罚打处人员信息 + * @Author: jeecg-boot + * @Date: 2022-07-14 + * @Version: V1.0 + */ +@Data +@TableName("ga_punish") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="ga_punish对象", description="ga_punish") +public class GaPunish implements Serializable { + private static final long serialVersionUID = 1L; + + /**姓名*/ + @Excel(name = "姓名", width = 15) + @ApiModelProperty(value = "姓名") + private String xm; + /**身份证号*/ + @Excel(name = "身份证号", width = 15) + @ApiModelProperty(value = "身份证号") + private String dxsfzh; + /**受理单位*/ + @Excel(name = "受理单位", width = 15) + @ApiModelProperty(value = "受理单位") + private String sldw; + /**案件编号*/ + @Excel(name = "案件编号", width = 15) + @ApiModelProperty(value = "案件编号") + private String ajbh; + /**案件名称*/ + @Excel(name = "案件名称", width = 15) + @ApiModelProperty(value = "案件名称") + private String ajmc; + /**案件类别*/ + @Excel(name = "案件类别", width = 15) + @ApiModelProperty(value = "案件类别") + private String ajlb; + /**决定结果*/ + @Excel(name = "决定结果", width = 15) + @ApiModelProperty(value = "决定结果") + private String jdjg; + /**案件编码*/ + @Excel(name = "案件编码", width = 15) + @ApiModelProperty(value = "案件编码") + private String ajlbmc; + /**sldwmc*/ + @Excel(name = "sldwmc", width = 15) + @ApiModelProperty(value = "sldwmc") + private String sldwmc; + /**jdjgmc*/ + @Excel(name = "jdjgmc", width = 15) + @ApiModelProperty(value = "jdjgmc") + private String jdjgmc; + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private Integer id; +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/HighSchool.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/HighSchool.java new file mode 100644 index 0000000..78f6f8c --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/HighSchool.java @@ -0,0 +1,82 @@ +package org.jeecg.modules.system.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: mr_high_school + * @Author: jeecg-boot + * @Date: 2022-07-15 + * @Version: V1.0 + */ +@Data +@TableName("mr_high_school") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="mr_high_school对象", description="mr_high_school") +public class HighSchool implements Serializable { + private static final long serialVersionUID = 1L; + + /**姓名*/ + @Excel(name = "姓名", width = 15) + @ApiModelProperty(value = "姓名") + private String xm; + /**身份证件号*/ + @Excel(name = "身份证件号", width = 15) + @ApiModelProperty(value = "身份证件号") + private String sfzjh; + /**学校名称*/ + @Excel(name = "学校名称", width = 15) + @ApiModelProperty(value = "学校名称") + private String xxmc; + /**年级名称*/ + @Excel(name = "年级名称", width = 15) + @ApiModelProperty(value = "年级名称") + private String njmc; + /**入学年份*/ + @Excel(name = "入学年份", width = 15) + @ApiModelProperty(value = "入学年份") + private String rxnf; + /**家庭住址*/ + @Excel(name = "家庭住址", width = 15) + @ApiModelProperty(value = "家庭住址") + private String jtzz; + /**联系电话*/ + @Excel(name = "联系电话", width = 15) + @ApiModelProperty(value = "联系电话") + private String lxdh; + /**成员姓名1*/ + @Excel(name = "成员姓名1", width = 15) + @ApiModelProperty(value = "成员姓名1") + private String cyxm1; + /**联系电话1*/ + @Excel(name = "联系电话1", width = 15) + @ApiModelProperty(value = "联系电话1") + private String lxdh1; + /**成员姓名2*/ + @Excel(name = "成员姓名2", width = 15) + @ApiModelProperty(value = "成员姓名2") + private String cyxm2; + /**联系电话2*/ + @Excel(name = "联系电话2", width = 15) + @ApiModelProperty(value = "联系电话2") + private String lxdh2; + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private Integer id; +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/Minor.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/Minor.java new file mode 100644 index 0000000..1b03f1b --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/Minor.java @@ -0,0 +1,110 @@ +package org.jeecg.modules.system.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * @Description: 未成年人 + * @Author: jeecg-boot + * @Date: 2022-07-13 + * @Version: V1.0 + */ +@ApiModel(value="mr_minor对象", description="未成年人") +@Data +@TableName("mr_minor") +public class Minor implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + @Dict(dictTable ="sys_depart",dicText = "depart_name",dicCode = "id") + private String sysOrgCode; + /**姓名*/ + @Excel(name = "姓名", width = 15) + @ApiModelProperty(value = "姓名") + private String name; + /**性别*/ + @Excel(name = "性别", width = 15,dicCode = "sex") + @ApiModelProperty(value = "性别") + @Dict(dicCode = "sex") + private Integer gender; + /**家庭住址*/ + @Excel(name = "家庭住址", width = 15) + @ApiModelProperty(value = "家庭住址") + private String address; + /**身份证号*/ + @Excel(name = "身份证号", width = 15) + @ApiModelProperty(value = "身份证号") + private String identity; + /**重点关注原因*/ + @Excel(name = "重点关注原因", width = 15) + @ApiModelProperty(value = "重点关注原因") + private String reason; + /**备注*/ + @Excel(name = "备注", width = 15) + @ApiModelProperty(value = "备注") + private String remark; + + /** + * 监护人 + */ + @Excel(name = "监护人", width = 15) + @ApiModelProperty(value = "监护人") + private String guardian; + + /** + * 监护人关系 + */ + @Excel(name = "监护人关系", width = 15) + @ApiModelProperty(value = "监护人关系") + private String relation; + + /**是否失学*/ + @Excel(name = "是否失学", width = 15,dicCode = "school_status") + @ApiModelProperty(value = "是否失学") + @Dict(dicCode = "school_status") + private Integer school; + + /**人员编号*/ + @Excel(name = "人员编号", width = 15) + @ApiModelProperty(value = "人员编号") + private String number; + + /**户号*/ + @Excel(name = "户号", width = 15) + @ApiModelProperty(value = "户号") + private String householdNum; + +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/MrSchool.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/MrSchool.java new file mode 100644 index 0000000..a716d58 --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/MrSchool.java @@ -0,0 +1,109 @@ +package org.jeecg.modules.system.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 学校 + * @Author: jeecg-boot + * @Date: 2022-07-15 + * @Version: V1.0 + */ +@Data +@TableName("mr_school") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="mr_school对象", description="学校") +public class MrSchool implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private String sysOrgCode; + /**姓名*/ + @Excel(name = "姓名", width = 15) + @ApiModelProperty(value = "姓名") + private String name; + /**身份证件号*/ + @Excel(name = "身份证件号", width = 15) + @ApiModelProperty(value = "身份证件号") + private String identity; + /**学校名称*/ + @Excel(name = "学校名称", width = 15) + @ApiModelProperty(value = "学校名称") + private String school; + /**入学日期*/ + @Excel(name = "入学日期", width = 15) + @ApiModelProperty(value = "入学日期") + private String admissionDate; + /**班级名称*/ + @Excel(name = "班级名称", width = 15) + @ApiModelProperty(value = "班级名称") + private String className; + /**现住址*/ + @Excel(name = "现住址", width = 15) + @ApiModelProperty(value = "现住址") + private String address; + /**成员姓名1*/ + @Excel(name = "成员姓名1", width = 15) + @ApiModelProperty(value = "成员姓名1") + private String memberOne; + /**联系电话1*/ + @Excel(name = "联系电话1", width = 15) + @ApiModelProperty(value = "联系电话1") + private String connectOne; + /**手机号码1*/ + @Excel(name = "手机号码1", width = 15) + @ApiModelProperty(value = "手机号码1") + private String phoneOne; + /**成员姓名2*/ + @Excel(name = "成员姓名2", width = 15) + @ApiModelProperty(value = "成员姓名2") + private String memberTwo; + /**联系电话2*/ + @Excel(name = "联系电话2", width = 15) + @ApiModelProperty(value = "联系电话2") + private String connectTwo; + /**手机号码2*/ + @Excel(name = "手机号码2", width = 15) + @ApiModelProperty(value = "手机号码2") + private String phoneTwo; + /**联系电话*/ + @Excel(name = "联系电话", width = 15) + @ApiModelProperty(value = "联系电话") + private String phone; +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/MzAdoption.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/MzAdoption.java new file mode 100644 index 0000000..010b504 --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/MzAdoption.java @@ -0,0 +1,174 @@ +package org.jeecg.modules.system.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: mz_adoption + * @Author: jeecg-boot + * @Date: 2022-07-14 + * @Version: V1.0 + */ +@Data +@TableName("mz_adoption") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="mz_adoption对象", description="mz_adoption") +public class MzAdoption implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private Integer id; + /**序号*/ + @Excel(name = "序号", width = 15) + @ApiModelProperty(value = "序号") + private String num; + /**区划代码*/ + @Excel(name = "区划代码", width = 15) + @ApiModelProperty(value = "区划代码") + private String areaCode; + /**收养日期*/ + @Excel(name = "收养日期", width = 15) + @ApiModelProperty(value = "收养日期") + private String adoptionDate; + /**登记字号*/ + @Excel(name = "登记字号", width = 15) + @ApiModelProperty(value = "登记字号") + private String registerNum; + /**登记日期*/ + @Excel(name = "登记日期", width = 15) + @ApiModelProperty(value = "登记日期") + private String registerDate; + /**办理机构*/ + @Excel(name = "办理机构", width = 15) + @ApiModelProperty(value = "办理机构") + private String agency; + /**业务类别*/ + @Excel(name = "业务类别", width = 15) + @ApiModelProperty(value = "业务类别") + private String category; + /**是否补录*/ + @Excel(name = "是否补录", width = 15) + @ApiModelProperty(value = "是否补录") + private String isRepair; + /**收养类别*/ + @Excel(name = "收养类别", width = 15) + @ApiModelProperty(value = "收养类别") + private String adoptionType; + /**被收养人身份类别*/ + @Excel(name = "被收养人身份类别", width = 15) + @ApiModelProperty(value = "被收养人身份类别") + private String identityCategory; + /**被收养人姓名*/ + @Excel(name = "被收养人姓名", width = 15) + @ApiModelProperty(value = "被收养人姓名") + private String initialName; + /**被收养人*/ + @Excel(name = "被收养人", width = 15) + @ApiModelProperty(value = "被收养人") + private String adoptedName; + /**被收养人性别*/ + @Excel(name = "被收养人性别", width = 15) + @ApiModelProperty(value = "被收养人性别") + private String gender; + /**被收养人身份证号*/ + @Excel(name = "被收养人身份证号", width = 15) + @ApiModelProperty(value = "被收养人身份证号") + private String identity; + /**被收养人出生年月*/ + @Excel(name = "被收养人出生年月", width = 15) + @ApiModelProperty(value = "被收养人出生年月") + private String birthday; + /**被收养人民族*/ + @Excel(name = "被收养人民族", width = 15) + @ApiModelProperty(value = "被收养人民族") + private String nation; + /**被收养人健康状况*/ + @Excel(name = "被收养人健康状况", width = 15) + @ApiModelProperty(value = "被收养人健康状况") + private String health; + /**被收养人住址*/ + @Excel(name = "被收养人住址", width = 15) + @ApiModelProperty(value = "被收养人住址") + private String address; + /**被收养人所在福利组织机构名称*/ + @Excel(name = "被收养人所在福利组织机构名称", width = 15) + @ApiModelProperty(value = "被收养人所在福利组织机构名称") + private String orgName; + /**主收养人男方姓名*/ + @Excel(name = "主收养人男方姓名", width = 15) + @ApiModelProperty(value = "主收养人男方姓名") + private String mName; + /**主收养人男方身份证号*/ + @Excel(name = "主收养人男方身份证号", width = 15) + @ApiModelProperty(value = "主收养人男方身份证号") + private String mIdentity; + /**主收养人男方民族*/ + @Excel(name = "主收养人男方民族", width = 15) + @ApiModelProperty(value = "主收养人男方民族") + private String mNation; + /**主收养人男方国籍*/ + @Excel(name = "主收养人男方国籍", width = 15) + @ApiModelProperty(value = "主收养人男方国籍") + private String mNationality; + /**主收养人男方住址*/ + @Excel(name = "主收养人男方住址", width = 15) + @ApiModelProperty(value = "主收养人男方住址") + private String mAddress; + /**主收养人男方电话*/ + @Excel(name = "主收养人男方电话", width = 15) + @ApiModelProperty(value = "主收养人男方电话") + private String mPhone; + /**主收养人男方婚姻状况*/ + @Excel(name = "主收养人男方婚姻状况", width = 15) + @ApiModelProperty(value = "主收养人男方婚姻状况") + private String mMarital; + /**主收养人女方姓名*/ + @Excel(name = "主收养人女方姓名", width = 15) + @ApiModelProperty(value = "主收养人女方姓名") + private String wName; + /**主收养人女方身份证号*/ + @Excel(name = "主收养人女方身份证号", width = 15) + @ApiModelProperty(value = "主收养人女方身份证号") + private String wIdentity; + /**主收养人女方民族*/ + @Excel(name = "主收养人女方民族", width = 15) + @ApiModelProperty(value = "主收养人女方民族") + private String wNation; + /**主收养人女方国籍*/ + @Excel(name = "主收养人女方国籍", width = 15) + @ApiModelProperty(value = "主收养人女方国籍") + private String wNationality; + /**主收养人女方住址*/ + @Excel(name = "主收养人女方住址", width = 15) + @ApiModelProperty(value = "主收养人女方住址") + private String wAddress; + /**主收养人女方电话*/ + @Excel(name = "主收养人女方电话", width = 15) + @ApiModelProperty(value = "主收养人女方电话") + private String wPhone; + /**主收养人女方婚姻状况*/ + @Excel(name = "主收养人女方婚姻状况", width = 15) + @ApiModelProperty(value = "主收养人女方婚姻状况") + private String wMarital; + /**送养人姓名（名称）*/ + @Excel(name = "送养人姓名（名称）", width = 15) + @ApiModelProperty(value = "送养人姓名（名称）") + private String adopteeGuardian; +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/MzLeftBehindChildren.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/MzLeftBehindChildren.java new file mode 100644 index 0000000..9f0e4ff --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/MzLeftBehindChildren.java @@ -0,0 +1,270 @@ +package org.jeecg.modules.system.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 民政_全市在册农村留守儿童数据 + * @Author: jeecg-boot + * @Date: 2022-07-14 + * @Version: V1.0 + */ +@Data +@TableName("mz_left_behind_children") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="mz_left_behind_children对象", description="mz_left_behind_children") +public class MzLeftBehindChildren implements Serializable { + private static final long serialVersionUID = 1L; + + /**区域*/ + @Excel(name = "区域", width = 15) + @ApiModelProperty(value = "区域") + private String area; + /**儿童姓名*/ + @Excel(name = "儿童姓名", width = 15) + @ApiModelProperty(value = "儿童姓名") + private String name; + /**身份证号*/ + @Excel(name = "身份证号", width = 15) + @ApiModelProperty(value = "身份证号") + private String identity; + /**儿童性别*/ + @Excel(name = "儿童性别", width = 15) + @ApiModelProperty(value = "儿童性别") + private String gender; + /**民族*/ + @Excel(name = "民族", width = 15) + @ApiModelProperty(value = "民族") + private String nation; + /**出生日期*/ + @Excel(name = "出生日期", width = 15) + @ApiModelProperty(value = "出生日期") + private String birthday; + /**户口分类*/ + @Excel(name = "户口分类", width = 15) + @ApiModelProperty(value = "户口分类") + private String type; + /**户籍状况*/ + @Excel(name = "户籍状况", width = 15) + @ApiModelProperty(value = "户籍状况") + private String censusStatus; + /**户籍所在地*/ + @Excel(name = "户籍所在地", width = 15) + @ApiModelProperty(value = "户籍所在地") + private String domicile; + /**现住址*/ + @Excel(name = "现住址", width = 15) + @ApiModelProperty(value = "现住址") + private String currentAddress; + /**健康状况*/ + @Excel(name = "健康状况", width = 15) + @ApiModelProperty(value = "健康状况") + private String health; + /**患艾滋病情况*/ + @Excel(name = "患艾滋病情况", width = 15) + @ApiModelProperty(value = "患艾滋病情况") + private String hivStatus; + /**学业状况*/ + @Excel(name = "学业状况", width = 15) + @ApiModelProperty(value = "学业状况") + private String academicStatus; + /**就学状况*/ + @Excel(name = "就学状况", width = 15) + @ApiModelProperty(value = "就学状况") + private String schoolStatus; + /**是否学校寄宿*/ + @Excel(name = "是否学校寄宿", width = 15) + @ApiModelProperty(value = "是否学校寄宿") + private String board; + /**监护类型*/ + @Excel(name = "监护类型", width = 15) + @ApiModelProperty(value = "监护类型") + private String guardianshipType; + /**监护不当情形*/ + @Excel(name = "监护不当情形", width = 15) + @ApiModelProperty(value = "监护不当情形") + private String improperGuardianship; + /**救助措施*/ + @Excel(name = "救助措施", width = 15) + @ApiModelProperty(value = "救助措施") + private String reliefMeasures; + /**其他特殊情况*/ + @Excel(name = "其他特殊情况", width = 15) + @ApiModelProperty(value = "其他特殊情况") + private String specialCase; + /**父亲姓名*/ + @Excel(name = "父亲姓名", width = 15) + @ApiModelProperty(value = "父亲姓名") + private String fName; + /**父亲证件类型*/ + @Excel(name = "父亲证件类型", width = 15) + @ApiModelProperty(value = "父亲证件类型") + private String fCredentials; + /**证件号码*/ + @Excel(name = "证件号码", width = 15) + @ApiModelProperty(value = "证件号码") + private String fIdentity; + /**父亲联系电话*/ + @Excel(name = "父亲联系电话", width = 15) + @ApiModelProperty(value = "父亲联系电话") + private String fPhone; + /**父亲现住址情况*/ + @Excel(name = "父亲现住址情况", width = 15) + @ApiModelProperty(value = "父亲现住址情况") + private String fAddressStatus; + /**父亲户籍所在地*/ + @Excel(name = "父亲户籍所在地", width = 15) + @ApiModelProperty(value = "父亲户籍所在地") + private String fDomicile; + /**父亲现住址*/ + @Excel(name = "父亲现住址", width = 15) + @ApiModelProperty(value = "父亲现住址") + private String fCurrentAddress; + /**父亲健康状况*/ + @Excel(name = "父亲健康状况", width = 15) + @ApiModelProperty(value = "父亲健康状况") + private String fHealth; + /**父亲家庭经济来源*/ + @Excel(name = "父亲家庭经济来源", width = 15) + @ApiModelProperty(value = "父亲家庭经济来源") + private String fEconomicSource; + /**父亲其他特殊情况*/ + @Excel(name = "父亲其他特殊情况", width = 15) + @ApiModelProperty(value = "父亲其他特殊情况") + private String fSpecialCase; + /**母亲姓名*/ + @Excel(name = "母亲姓名", width = 15) + @ApiModelProperty(value = "母亲姓名") + private String mName; + /**母亲证件类型*/ + @Excel(name = "母亲证件类型", width = 15) + @ApiModelProperty(value = "母亲证件类型") + private String mCredentials; + /**母亲证件号码*/ + @Excel(name = "母亲证件号码", width = 15) + @ApiModelProperty(value = "母亲证件号码") + private String mIdentity; + /**母亲联系电话*/ + @Excel(name = "母亲联系电话", width = 15) + @ApiModelProperty(value = "母亲联系电话") + private String mPhone; + /**母亲现住址情况*/ + @Excel(name = "母亲现住址情况", width = 15) + @ApiModelProperty(value = "母亲现住址情况") + private String mAddressStatus; + /**母亲户籍所在地*/ + @Excel(name = "母亲户籍所在地", width = 15) + @ApiModelProperty(value = "母亲户籍所在地") + private String mDomicile; + /**母亲现住址*/ + @Excel(name = "母亲现住址", width = 15) + @ApiModelProperty(value = "母亲现住址") + private String mCurrentAddress; + /**母亲健康状况*/ + @Excel(name = "母亲健康状况", width = 15) + @ApiModelProperty(value = "母亲健康状况") + private String mHealth; + /**母亲家庭经济来源*/ + @Excel(name = "母亲家庭经济来源", width = 15) + @ApiModelProperty(value = "母亲家庭经济来源") + private String mEconomicSource; + /**母亲其他特殊情况*/ + @Excel(name = "母亲其他特殊情况", width = 15) + @ApiModelProperty(value = "母亲其他特殊情况") + private String mSpecialCase; + /**委托照料原因情况*/ + @Excel(name = "委托照料原因情况", width = 15) + @ApiModelProperty(value = "委托照料原因情况") + private String reason; + /**父母外出有无委托照料人*/ + @Excel(name = "父母外出有无委托照料人", width = 15) + @ApiModelProperty(value = "父母外出有无委托照料人") + private String falg; + /**委托照料人姓名*/ + @Excel(name = "委托照料人姓名", width = 15) + @ApiModelProperty(value = "委托照料人姓名") + private String zName; + /**委托照料人证件类型*/ + @Excel(name = "委托照料人证件类型", width = 15) + @ApiModelProperty(value = "委托照料人证件类型") + private String zCredentials; + /**委托照料人证件号码*/ + @Excel(name = "委托照料人证件号码", width = 15) + @ApiModelProperty(value = "委托照料人证件号码") + private String zIdentity; + /**委托照料人联系电话*/ + @Excel(name = "委托照料人联系电话", width = 15) + @ApiModelProperty(value = "委托照料人联系电话") + private String zPhone; + /**委托照料人与儿童关系*/ + @Excel(name = "委托照料人与儿童关系", width = 15) + @ApiModelProperty(value = "委托照料人与儿童关系") + private String zRelation; + /**委托照料人健康状况*/ + @Excel(name = "委托照料人健康状况", width = 15) + @ApiModelProperty(value = "委托照料人健康状况") + private String zHealth; + /**委托照料人特殊情况*/ + @Excel(name = "委托照料人特殊情况", width = 15) + @ApiModelProperty(value = "委托照料人特殊情况") + private String zSpecialCase; + /**祖父姓名*/ + @Excel(name = "祖父姓名", width = 15) + @ApiModelProperty(value = "祖父姓名") + private String gfName; + /**祖父出生日期*/ + @Excel(name = "祖父出生日期", width = 15) + @ApiModelProperty(value = "祖父出生日期") + private String gfBirthday; + /**祖母名称*/ + @Excel(name = "祖母名称", width = 15) + @ApiModelProperty(value = "祖母名称") + private String gmName; + /**祖母出生日期*/ + @Excel(name = "祖母出生日期", width = 15) + @ApiModelProperty(value = "祖母出生日期") + private String gmBirthday; + /**外祖父姓名*/ + @Excel(name = "外祖父姓名", width = 15) + @ApiModelProperty(value = "外祖父姓名") + private String wgfName; + /**外祖父出生日期*/ + @Excel(name = "外祖父出生日期", width = 15) + @ApiModelProperty(value = "外祖父出生日期") + private String wgfBirthday; + /**外祖母姓名*/ + @Excel(name = "外祖母姓名", width = 15) + @ApiModelProperty(value = "外祖母姓名") + private String wgmName; + /**外祖母出生日期*/ + @Excel(name = "外祖母出生日期", width = 15) + @ApiModelProperty(value = "外祖母出生日期") + private String gwmBirthday; + /**帮扶建议*/ + @Excel(name = "帮扶建议", width = 15) + @ApiModelProperty(value = "帮扶建议") + private String suggest; + /**2022年春节父母是否回家*/ + @Excel(name = "2022年春节父母是否回家", width = 15) + @ApiModelProperty(value = "2022年春节父母是否回家") + private String goHome; + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private Integer id; +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/MzOrphan.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/MzOrphan.java new file mode 100644 index 0000000..20b6600 --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/MzOrphan.java @@ -0,0 +1,162 @@ +package org.jeecg.modules.system.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 民政_全市在册孤儿数据 + * @Author: jeecg-boot + * @Date: 2022-07-14 + * @Version: V1.0 + */ +@Data +@TableName("mz_orphan") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="mz_orphan对象", description="mz_orphan") +public class MzOrphan implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private Integer id; + /**序号*/ + @Excel(name = "序号", width = 15) + @ApiModelProperty(value = "序号") + private String sort; + /**姓名*/ + @Excel(name = "姓名", width = 15) + @ApiModelProperty(value = "姓名") + private String name; + /**性别*/ + @Excel(name = "性别", width = 15) + @ApiModelProperty(value = "性别") + private String gender; + /**民族*/ + @Excel(name = "民族", width = 15) + @ApiModelProperty(value = "民族") + private String nation; + /**出生日期*/ + @Excel(name = "出生日期", width = 15) + @ApiModelProperty(value = "出生日期") + private String birthday; + /**身份证号*/ + @Excel(name = "身份证号", width = 15) + @ApiModelProperty(value = "身份证号") + private String identity; + /**儿童类别*/ + @Excel(name = "儿童类别", width = 15) + @ApiModelProperty(value = "儿童类别") + private String category; + /**户籍状况*/ + @Excel(name = "户籍状况", width = 15) + @ApiModelProperty(value = "户籍状况") + private String censusStatus; + /**户籍地*/ + @Excel(name = "户籍地", width = 15) + @ApiModelProperty(value = "户籍地") + private String domicile; + /**现住址*/ + @Excel(name = "现住址", width = 15) + @ApiModelProperty(value = "现住址") + private String currentAddress; + /**申请日期*/ + @Excel(name = "申请日期", width = 15) + @ApiModelProperty(value = "申请日期") + private String applyDate; + /**所属机构*/ + @Excel(name = "所属机构", width = 15) + @ApiModelProperty(value = "所属机构") + private String org; + /**养育类型*/ + @Excel(name = "养育类型", width = 15) + @ApiModelProperty(value = "养育类型") + private String parentType; + /**工学情况*/ + @Excel(name = "工学情况", width = 15) + @ApiModelProperty(value = "工学情况") + private String engineerSituation; + /**健康状况*/ + @Excel(name = "健康状况", width = 15) + @ApiModelProperty(value = "健康状况") + private String health; + /**患病类型*/ + @Excel(name = "患病类型", width = 15) + @ApiModelProperty(value = "患病类型") + private String diseaseType; + /**残疾类型*/ + @Excel(name = "残疾类型", width = 15) + @ApiModelProperty(value = "残疾类型") + private String deformityType; + /**残疾级别*/ + @Excel(name = "残疾级别", width = 15) + @ApiModelProperty(value = "残疾级别") + private String deformityLevel; + /**特教类型*/ + @Excel(name = "特教类型", width = 15) + @ApiModelProperty(value = "特教类型") + private String specialEducation; + /**患艾滋病情况*/ + @Excel(name = "患艾滋病情况", width = 15) + @ApiModelProperty(value = "患艾滋病情况") + private String hivStatus; + /**起领年月*/ + @Excel(name = "起领年月", width = 15) + @ApiModelProperty(value = "起领年月") + private String startYear; + /**当前末领年月*/ + @Excel(name = "当前末领年月", width = 15) + @ApiModelProperty(value = "当前末领年月") + private String unReceiveDate; + /**监护人姓名*/ + @Excel(name = "监护人姓名", width = 15) + @ApiModelProperty(value = "监护人姓名") + private String guardianName; + /**监护人身份证号*/ + @Excel(name = "监护人身份证号", width = 15) + @ApiModelProperty(value = "监护人身份证号") + private String guardianIdentity; + /**监护人联系电话*/ + @Excel(name = "监护人联系电话", width = 15) + @ApiModelProperty(value = "监护人联系电话") + private String guardianPhone; + /**与儿童关系*/ + @Excel(name = "与儿童关系", width = 15) + @ApiModelProperty(value = "与儿童关系") + private String relation; + /**是否同住*/ + @Excel(name = "是否同住", width = 15) + @ApiModelProperty(value = "是否同住") + private String liveTogether; + /**数据来源*/ + @Excel(name = "数据来源", width = 15) + @ApiModelProperty(value = "数据来源") + private String source; + /**续发开始日期*/ + @Excel(name = "续发开始日期", width = 15) + @ApiModelProperty(value = "续发开始日期") + private String startDate; + /**续发截止日期*/ + @Excel(name = "续发截止日期", width = 15) + @ApiModelProperty(value = "续发截止日期") + private String endDate; + /**减员日期*/ + @Excel(name = "减员日期", width = 15) + @ApiModelProperty(value = "减员日期") + private String attritionDate; +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/MzUnsupported.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/MzUnsupported.java new file mode 100644 index 0000000..eb4843f --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/MzUnsupported.java @@ -0,0 +1,170 @@ +package org.jeecg.modules.system.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 民政_全市在册事实无人抚养儿童数据 + * @Author: jeecg-boot + * @Date: 2022-07-14 + * @Version: V1.0 + */ +@Data +@TableName("mz_unsupported") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="mz_unsupported对象", description="mz_unsupported") +public class MzUnsupported implements Serializable { + private static final long serialVersionUID = 1L; + + /**序号*/ + @Excel(name = "序号", width = 15) + @ApiModelProperty(value = "序号") + private String sort; + /**区域*/ + @Excel(name = "区域", width = 15) + @ApiModelProperty(value = "区域") + private String area; + /**儿童姓名*/ + @Excel(name = "儿童姓名", width = 15) + @ApiModelProperty(value = "儿童姓名") + private String name; + /**儿童性别*/ + @Excel(name = "儿童性别", width = 15) + @ApiModelProperty(value = "儿童性别") + private String gender; + /**民族*/ + @Excel(name = "民族", width = 15) + @ApiModelProperty(value = "民族") + private String nation; + /**出生日期*/ + @Excel(name = "出生日期", width = 15) + @ApiModelProperty(value = "出生日期") + private String birthday; + /**身份证号*/ + @Excel(name = "身份证号", width = 15) + @ApiModelProperty(value = "身份证号") + private String identity; + /**户籍所在地详情*/ + @Excel(name = "户籍所在地详情", width = 15) + @ApiModelProperty(value = "户籍所在地详情") + private String domicile; + /**现住址详情*/ + @Excel(name = "现住址详情", width = 15) + @ApiModelProperty(value = "现住址详情") + private String currentAddress; + /**儿童类别名称*/ + @Excel(name = "儿童类别名称", width = 15) + @ApiModelProperty(value = "儿童类别名称") + private String category; + /**申请日期*/ + @Excel(name = "申请日期", width = 15) + @ApiModelProperty(value = "申请日期") + private String applyDate; + /**审批日期*/ + @Excel(name = "审批日期", width = 15) + @ApiModelProperty(value = "审批日期") + private String approvalDate; + /**户籍状况*/ + @Excel(name = "户籍状况", width = 15) + @ApiModelProperty(value = "户籍状况") + private String censusStatus; + /**健康状况*/ + @Excel(name = "健康状况", width = 15) + @ApiModelProperty(value = "健康状况") + private String health; + /**就学状况*/ + @Excel(name = "就学状况", width = 15) + @ApiModelProperty(value = "就学状况") + private String schoolStatus; + /**数据来源*/ + @Excel(name = "数据来源", width = 15) + @ApiModelProperty(value = "数据来源") + private String source; + /**父亲姓名*/ + @Excel(name = "父亲姓名", width = 15) + @ApiModelProperty(value = "父亲姓名") + private String fName; + /**父亲身份证号*/ + @Excel(name = "父亲身份证号", width = 15) + @ApiModelProperty(value = "父亲身份证号") + private String fIdentity; + /**父亲现状况*/ + @Excel(name = "父亲现状况", width = 15) + @ApiModelProperty(value = "父亲现状况") + private String fStatus; + /**父亲联系电话*/ + @Excel(name = "父亲联系电话", width = 15) + @ApiModelProperty(value = "父亲联系电话") + private String fPhone; + /**父亲是否为监护人*/ + @Excel(name = "父亲是否为监护人", width = 15) + @ApiModelProperty(value = "父亲是否为监护人") + private String fGuardian; + /**母亲姓名*/ + @Excel(name = "母亲姓名", width = 15) + @ApiModelProperty(value = "母亲姓名") + private String mName; + /**母亲身份证号*/ + @Excel(name = "母亲身份证号", width = 15) + @ApiModelProperty(value = "母亲身份证号") + private String mIdentity; + /**母亲现状况*/ + @Excel(name = "母亲现状况", width = 15) + @ApiModelProperty(value = "母亲现状况") + private String mStatus; + /**母亲联系电话*/ + @Excel(name = "母亲联系电话", width = 15) + @ApiModelProperty(value = "母亲联系电话") + private String mPhone; + /**母亲是否为监护人*/ + @Excel(name = "母亲是否为监护人", width = 15) + @ApiModelProperty(value = "母亲是否为监护人") + private String mGuardian; + /**其他监护人姓名*/ + @Excel(name = "其他监护人姓名", width = 15) + @ApiModelProperty(value = "其他监护人姓名") + private String oName; + /**其他监护人身份证号*/ + @Excel(name = "其他监护人身份证号", width = 15) + @ApiModelProperty(value = "其他监护人身份证号") + private String oIdentity; + /**其他监护人联系电话*/ + @Excel(name = "其他监护人联系电话", width = 15) + @ApiModelProperty(value = "其他监护人联系电话") + private String oPhone; + /**其他监护人与儿童关系*/ + @Excel(name = "其他监护人与儿童关系", width = 15) + @ApiModelProperty(value = "其他监护人与儿童关系") + private String oRelation; + /**起领年月*/ + @Excel(name = "起领年月", width = 15) + @ApiModelProperty(value = "起领年月") + private String startYear; + /**当前末领年月*/ + @Excel(name = "当前末领年月", width = 15) + @ApiModelProperty(value = "当前末领年月") + private String unReceiveDate; + /**保障措施*/ + @Excel(name = "保障措施", width = 15) + @ApiModelProperty(value = "保障措施") + private String assure; + /**是否集中供养*/ + @Excel(name = "是否集中供养", width = 15) + @ApiModelProperty(value = "是否集中供养") + private String focusSupport; +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/PrimarySchool.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/PrimarySchool.java new file mode 100644 index 0000000..407b041 --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/PrimarySchool.java @@ -0,0 +1,86 @@ +package org.jeecg.modules.system.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: mr_primary_school + * @Author: jeecg-boot + * @Date: 2022-07-15 + * @Version: V1.0 + */ +@Data +@TableName("mr_primary_school") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="mr_primary_school对象", description="mr_primary_school") +public class PrimarySchool implements Serializable { + private static final long serialVersionUID = 1L; + + /**姓名*/ + @Excel(name = "姓名", width = 15) + @ApiModelProperty(value = "姓名") + private String xm; + /**身份证件号*/ + @Excel(name = "身份证件号", width = 15) + @ApiModelProperty(value = "身份证件号") + private String sfzjh; + /**学校名称*/ + @Excel(name = "学校名称", width = 15) + @ApiModelProperty(value = "学校名称") + private String xxmc; + /**入学日期*/ + @Excel(name = "入学日期", width = 15) + @ApiModelProperty(value = "入学日期") + private String ryrq; + /**班级名称*/ + @Excel(name = "班级名称", width = 15) + @ApiModelProperty(value = "班级名称") + private String bjmc; + /**现住址*/ + @Excel(name = "现住址", width = 15) + @ApiModelProperty(value = "现住址") + private String xzz; + /**成员姓名1*/ + @Excel(name = "成员姓名1", width = 15) + @ApiModelProperty(value = "成员姓名1") + private String cyxm1; + /**联系电话1*/ + @Excel(name = "联系电话1", width = 15) + @ApiModelProperty(value = "联系电话1") + private String lxdh1; + /**手机号码1*/ + @Excel(name = "手机号码1", width = 15) + @ApiModelProperty(value = "手机号码1") + private String sjhm1; + /**成员姓名2*/ + @Excel(name = "成员姓名2", width = 15) + @ApiModelProperty(value = "成员姓名2") + private String cyxm2; + /**联系电话2*/ + @Excel(name = "联系电话2", width = 15) + @ApiModelProperty(value = "联系电话2") + private String lxdh2; + /**手机号码2*/ + @Excel(name = "手机号码2", width = 15) + @ApiModelProperty(value = "手机号码2") + private String sjhm2; + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private Integer id; +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SourceData.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SourceData.java new file mode 100644 index 0000000..6da7fba --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SourceData.java @@ -0,0 +1,67 @@ +package org.jeecg.modules.system.entity; + +import java.io.Serializable; +import java.util.Date; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 来源数据管理 + * @Author: jeecg-boot + * @Date: 2022-07-13 + * @Version: V1.0 + */ +@Data +@TableName("mr_source") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="mr_source对象", description="来源数据管理") +public class SourceData implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private String sysOrgCode; + /**单位名称*/ + @Excel(name = "单位名称", width = 15) + @ApiModelProperty(value = "单位名称") + private String name; + /**数据批次*/ + @Excel(name = "数据批次", width = 15) + @ApiModelProperty(value = "数据批次") + private Integer batch; + /**总条数*/ + @Excel(name = "总条数", width = 15) + @ApiModelProperty(value = "总条数") + private Integer total; +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SpecialStudent.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SpecialStudent.java new file mode 100644 index 0000000..1367c9b --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SpecialStudent.java @@ -0,0 +1,70 @@ +package org.jeecg.modules.system.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: mr_special_student + * @Author: jeecg-boot + * @Date: 2022-07-14 + * @Version: V1.0 + */ +@Data +@TableName("mr_special_student") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="mr_special_student对象", description="mr_special_student") +public class SpecialStudent implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private Integer id; + /**sort*/ + @Excel(name = "sort", width = 15) + @ApiModelProperty(value = "sort") + private String sort; + /**school*/ + @Excel(name = "school", width = 15) + @ApiModelProperty(value = "school") + private String school; + /**name*/ + @Excel(name = "name", width = 15) + @ApiModelProperty(value = "name") + private String name; + /**class*/ + @Excel(name = "grade ", width = 15) + @ApiModelProperty(value = "class") + private String grade; + /**identity*/ + @Excel(name = "identity", width = 15) + @ApiModelProperty(value = "identity") + private String identity; + /**区域*/ + @Excel(name = "区域", width = 15) + @ApiModelProperty(value = "区域") + private String reason; + /**备注*/ + @Excel(name = "备注", width = 15) + @ApiModelProperty(value = "备注") + private String remark; + /**area*/ + @Excel(name = "area", width = 15) + @ApiModelProperty(value = "area") + private String area; +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDepart.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDepart.java index b84181e..4a776ca 100644 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDepart.java +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDepart.java @@ -4,6 +4,7 @@ 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 io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.jeecg.common.aspect.annotation.Dict; import org.jeecgframework.poi.excel.annotation.Excel; @@ -85,6 +86,14 @@ public class SysDepart implements Serializable { @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date updateTime; + /**常用名称*/ + @Excel(name = "常用名称", width = 15) + @ApiModelProperty(value = "常用名称") + private String abbreviation; + /**常用编码*/ + @Excel(name = "常用编码", width = 15) + @ApiModelProperty(value = "常用编码") + private String commonCode; /** * 重写equals方法 @@ -120,7 +129,9 @@ public class SysDepart implements Serializable { Objects.equals(createBy, depart.createBy) && Objects.equals(createTime, depart.createTime) && Objects.equals(updateBy, depart.updateBy) && - Objects.equals(updateTime, depart.updateTime); + Objects.equals(updateTime, depart.updateTime)&& + Objects.equals(abbreviation, depart.abbreviation)&& + Objects.equals(commonCode, depart.commonCode); } /** @@ -132,6 +143,6 @@ public class SysDepart implements Serializable { return Objects.hash(super.hashCode(), id, parentId, departName, departNameEn, departNameAbbr, departOrder, description,orgCategory, orgType, orgCode, mobile, fax, address, memo, status, - delFlag, createBy, createTime, updateBy, updateTime); + delFlag, createBy, createTime, updateBy, updateTime,abbreviation,commonCode); } } diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/DivisionMapper.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/DivisionMapper.java new file mode 100644 index 0000000..1bc6efd --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/DivisionMapper.java @@ -0,0 +1,22 @@ +package org.jeecg.modules.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.system.entity.Division; + +/** + * @Description: 行政区划 + * @Author: jeecg-boot + * @Date: 2022-07-12 + * @Version: V1.0 + */ +public interface DivisionMapper extends BaseMapper { + + /** + * 编辑节点状态 + * @param id + * @param status + */ + void updateTreeNodeStatus(@Param("id") String id,@Param("status") String status); + +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/FamilyMapper.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/FamilyMapper.java new file mode 100644 index 0000000..522b70d --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/FamilyMapper.java @@ -0,0 +1,20 @@ +package org.jeecg.modules.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.system.entity.Family; + +import java.util.List; + +/** + * @Description: 家庭成员表 + * @Author: jeecg-boot + * @Date: 2022-07-13 + * @Version: V1.0 + */ +public interface FamilyMapper extends BaseMapper { + + public boolean deleteByMainId(@Param("mainId") String mainId); + + public List selectByMainId(@Param("mainId") String mainId); +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/GaDemographicMapper.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/GaDemographicMapper.java new file mode 100644 index 0000000..333050a --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/GaDemographicMapper.java @@ -0,0 +1,29 @@ +package org.jeecg.modules.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import io.lettuce.core.dynamic.annotation.Param; +import org.jeecg.modules.system.entity.Family; +import org.jeecg.modules.system.entity.GaDemographic; +import org.jeecg.modules.system.vo.FamilyVo; + +import java.util.List; + +/** + * @Description: ga_demographic + * @Author: jeecg-boot + * @Date: 2022-07-14 + * @Version: V1.0 + */ +public interface GaDemographicMapper extends BaseMapper { + + /** + * 分页关联查询人口基础信息和户籍信息 + * @param pageSize + * @param queryNum + * @return + */ + public List queryPageList(@Param("queryNum") Integer queryNum, @Param("pageSize") Integer pageSize); + + public List getIdentityS(); + +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/GaHouseholdMapper.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/GaHouseholdMapper.java new file mode 100644 index 0000000..c42a617 --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/GaHouseholdMapper.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.system.entity.GaHousehold; + +/** + * @Description: ga_household + * @Author: jeecg-boot + * @Date: 2022-07-14 + * @Version: V1.0 + */ +public interface GaHouseholdMapper extends BaseMapper { + +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/GaJuvenilesStayMapper.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/GaJuvenilesStayMapper.java new file mode 100644 index 0000000..f82dd50 --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/GaJuvenilesStayMapper.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.system.entity.GaJuvenilesStay; + +/** + * @Description: ga_juveniles_stay + * @Author: jeecg-boot + * @Date: 2022-07-14 + * @Version: V1.0 + */ +public interface GaJuvenilesStayMapper extends BaseMapper { + +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/GaPunishMapper.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/GaPunishMapper.java new file mode 100644 index 0000000..4893ace --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/GaPunishMapper.java @@ -0,0 +1,24 @@ +package org.jeecg.modules.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import io.lettuce.core.dynamic.annotation.Param; +import org.jeecg.modules.system.entity.Family; +import org.jeecg.modules.system.entity.GaPunish; +import org.jeecg.modules.system.vo.GaPunishVo; + +import java.util.List; + +/** + * @Description: ga_punish + * @Author: jeecg-boot + * @Date: 2022-07-14 + * @Version: V1.0 + */ +public interface GaPunishMapper extends BaseMapper { + + /** + * 查询 + * @return + */ + public List queryAll(); +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/HighSchoolMapper.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/HighSchoolMapper.java new file mode 100644 index 0000000..f855a0b --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/HighSchoolMapper.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.system.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.system.entity.HighSchool; +import org.jeecg.modules.system.entity.MrSchool; + +/** + * @Description: mr_high_school + * @Author: jeecg-boot + * @Date: 2022-07-15 + * @Version: V1.0 + */ +public interface HighSchoolMapper extends BaseMapper { + + public List getList(); +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/MinorMapper.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/MinorMapper.java new file mode 100644 index 0000000..e45170a --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/MinorMapper.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.system.entity.Minor; + +/** + * @Description: 未成年人 + * @Author: jeecg-boot + * @Date: 2022-07-13 + * @Version: V1.0 + */ +public interface MinorMapper extends BaseMapper { + +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/MrSchoolMapper.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/MrSchoolMapper.java new file mode 100644 index 0000000..d3e4495 --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/MrSchoolMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.system.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.system.entity.MrSchool; + +/** + * @Description: 学校 + * @Author: jeecg-boot + * @Date: 2022-07-15 + * @Version: V1.0 + */ +public interface MrSchoolMapper extends BaseMapper { + +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/MzAdoptionMapper.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/MzAdoptionMapper.java new file mode 100644 index 0000000..2360abf --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/MzAdoptionMapper.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.system.entity.MzAdoption; + +/** + * @Description: mz_adoption + * @Author: jeecg-boot + * @Date: 2022-07-14 + * @Version: V1.0 + */ +public interface MzAdoptionMapper extends BaseMapper { + +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/MzLeftBehindChildrenMapper.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/MzLeftBehindChildrenMapper.java new file mode 100644 index 0000000..a61e2fe --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/MzLeftBehindChildrenMapper.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.system.entity.MzLeftBehindChildren; + +/** + * @Description: mz_left_behind_children + * @Author: jeecg-boot + * @Date: 2022-07-14 + * @Version: V1.0 + */ +public interface MzLeftBehindChildrenMapper extends BaseMapper { + +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/MzOrphanMapper.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/MzOrphanMapper.java new file mode 100644 index 0000000..3ae7c0d --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/MzOrphanMapper.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.system.entity.MzOrphan; + +/** + * @Description: mz_orphan + * @Author: jeecg-boot + * @Date: 2022-07-14 + * @Version: V1.0 + */ +public interface MzOrphanMapper extends BaseMapper { + +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/MzUnsupportedMapper.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/MzUnsupportedMapper.java new file mode 100644 index 0000000..7aad5a3 --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/MzUnsupportedMapper.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.system.entity.MzUnsupported; + +/** + * @Description: mz_unsupported + * @Author: jeecg-boot + * @Date: 2022-07-14 + * @Version: V1.0 + */ +public interface MzUnsupportedMapper extends BaseMapper { + +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/PrimarySchoolMapper.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/PrimarySchoolMapper.java new file mode 100644 index 0000000..be6b9c5 --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/PrimarySchoolMapper.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.system.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.system.entity.MrSchool; +import org.jeecg.modules.system.entity.PrimarySchool; + +/** + * @Description: mr_primary_school + * @Author: jeecg-boot + * @Date: 2022-07-15 + * @Version: V1.0 + */ +public interface PrimarySchoolMapper extends BaseMapper { + + public List getList(); +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SourceMapper.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SourceMapper.java new file mode 100644 index 0000000..f90439f --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SourceMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.jeecg.modules.system.entity.SourceData; + +import java.util.List; + +/** + * @Description: 来源数据管理 + * @Author: jeecg-boot + * @Date: 2022-07-13 + * @Version: V1.0 + */ +public interface SourceMapper extends BaseMapper { + public List getListGroupByName(Page page,String name); +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SpecialStudentMapper.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SpecialStudentMapper.java new file mode 100644 index 0000000..ca8363c --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SpecialStudentMapper.java @@ -0,0 +1,22 @@ +package org.jeecg.modules.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.system.entity.SpecialStudent; +import org.jeecg.modules.system.vo.GaPunishVo; +import org.jeecg.modules.system.vo.SpecialStudentVo; + +import java.util.List; + +/** + * @Description: mr_special_student + * @Author: jeecg-boot + * @Date: 2022-07-14 + * @Version: V1.0 + */ +public interface SpecialStudentMapper extends BaseMapper { + /** + * 查询 + * @return + */ + public List queryList(); +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementMapper.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementMapper.java index 9c6f3ce..2af6869 100644 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementMapper.java +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementMapper.java @@ -1,12 +1,11 @@ package org.jeecg.modules.system.mapper; -import java.util.List; - +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.jeecg.modules.system.entity.SysAnnouncement; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; /** * @Description: 系统通告表 diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementSendMapper.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementSendMapper.java index 56b25c6..0f8fff7 100644 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementSendMapper.java +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementSendMapper.java @@ -1,13 +1,12 @@ package org.jeecg.modules.system.mapper; -import java.util.List; - +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.jeecg.modules.system.entity.SysAnnouncementSend; import org.jeecg.modules.system.model.AnnouncementSendModel; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; /** * @Description: 用户通告阅读标记表 diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysCategoryMapper.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysCategoryMapper.java index c5f2fd7..98f3eb2 100644 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysCategoryMapper.java +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysCategoryMapper.java @@ -1,14 +1,13 @@ package org.jeecg.modules.system.mapper; -import java.util.List; -import java.util.Map; - +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.jeecg.modules.system.entity.SysCategory; import org.jeecg.modules.system.model.TreeSelectModel; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.List; +import java.util.Map; /** * @Description: 分类字典 diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDataLogMapper.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDataLogMapper.java index e6abc3b..ebbf730 100644 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDataLogMapper.java +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDataLogMapper.java @@ -1,10 +1,9 @@ package org.jeecg.modules.system.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.jeecg.modules.system.entity.SysDataLog; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - public interface SysDataLogMapper extends BaseMapper{ /** * 通过表名及数据Id获取最大版本 diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDepartMapper.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDepartMapper.java index f5a32b4..46bedb9 100644 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDepartMapper.java +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDepartMapper.java @@ -3,8 +3,6 @@ package org.jeecg.modules.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Select; import org.jeecg.modules.system.entity.SysDepart; -import org.jeecg.modules.system.model.SysDepartTreeModel; -import org.jeecg.modules.system.model.TreeModel; import org.springframework.data.repository.query.Param; import java.util.List; diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDepartPermissionMapper.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDepartPermissionMapper.java index bfc44f4..3848cf0 100644 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDepartPermissionMapper.java +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDepartPermissionMapper.java @@ -1,10 +1,7 @@ package org.jeecg.modules.system.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.system.entity.SysDepartPermission; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.system.entity.SysDepartPermission; /** * @Description: 部门权限表 diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDepartRoleMapper.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDepartRoleMapper.java index 8ee074e..fca9761 100644 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDepartRoleMapper.java +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDepartRoleMapper.java @@ -1,10 +1,10 @@ package org.jeecg.modules.system.mapper; -import java.util.List; - +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.jeecg.modules.system.entity.SysDepartRole; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; /** * @Description: 部门角色 diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDepartRolePermissionMapper.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDepartRolePermissionMapper.java index 8fc9848..5453744 100644 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDepartRolePermissionMapper.java +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDepartRolePermissionMapper.java @@ -1,10 +1,7 @@ package org.jeecg.modules.system.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.system.entity.SysDepartRolePermission; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.system.entity.SysDepartRolePermission; /** * @Description: 部门角色权限 diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDepartRoleUserMapper.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDepartRoleUserMapper.java index 9e57c6d..bb18056 100644 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDepartRoleUserMapper.java +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDepartRoleUserMapper.java @@ -1,10 +1,7 @@ package org.jeecg.modules.system.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.system.entity.SysDepartRoleUser; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.system.entity.SysDepartRoleUser; /** * @Description: 部门角色人员信息 diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDictItemMapper.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDictItemMapper.java index 0502f98..de72079 100644 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDictItemMapper.java +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDictItemMapper.java @@ -1,8 +1,8 @@ package org.jeecg.modules.system.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Select; import org.jeecg.modules.system.entity.SysDictItem; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import java.util.List; diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDictMapper.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDictMapper.java index ab35a5d..0cbdedb 100644 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDictMapper.java +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDictMapper.java @@ -1,8 +1,6 @@ package org.jeecg.modules.system.mapper; -import java.util.List; -import java.util.Map; - +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; @@ -14,7 +12,8 @@ import org.jeecg.modules.system.entity.SysDict; import org.jeecg.modules.system.model.DuplicateCheckVo; import org.jeecg.modules.system.model.TreeSelectModel; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.List; +import java.util.Map; /** *

diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysLogMapper.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysLogMapper.java index 81fe4d5..c6f329d 100644 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysLogMapper.java +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysLogMapper.java @@ -1,13 +1,12 @@ package org.jeecg.modules.system.mapper; -import java.util.Date; -import java.util.List; -import java.util.Map; - +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.jeecg.modules.system.entity.SysLog; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.Date; +import java.util.List; +import java.util.Map; /** *

diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysPermissionDataRuleMapper.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysPermissionDataRuleMapper.java index 61a55a4..a1dabfd 100644 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysPermissionDataRuleMapper.java +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysPermissionDataRuleMapper.java @@ -1,11 +1,10 @@ package org.jeecg.modules.system.mapper; -import java.util.List; - +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.jeecg.modules.system.entity.SysPermissionDataRule; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.List; /** *

diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysPermissionMapper.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysPermissionMapper.java index 37f375f..a8f3d87 100644 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysPermissionMapper.java +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysPermissionMapper.java @@ -1,14 +1,13 @@ package org.jeecg.modules.system.mapper; -import java.util.List; - +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; import org.jeecg.modules.system.entity.SysPermission; import org.jeecg.modules.system.model.TreeModel; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.List; /** *

diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysRoleMapper.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysRoleMapper.java index 9d8f20b..5a90c13 100644 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysRoleMapper.java +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysRoleMapper.java @@ -1,12 +1,10 @@ package org.jeecg.modules.system.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Update; import org.jeecg.modules.system.entity.SysRole; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - /** *

* 角色表 Mapper 接口 diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysRolePermissionMapper.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysRolePermissionMapper.java index 25c08d2..34407b9 100644 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysRolePermissionMapper.java +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysRolePermissionMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.mapper; -import org.jeecg.modules.system.entity.SysRolePermission; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.system.entity.SysRolePermission; /** *

diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserAgentMapper.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserAgentMapper.java index 346933b..4c9a8c1 100644 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserAgentMapper.java +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserAgentMapper.java @@ -1,10 +1,7 @@ package org.jeecg.modules.system.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.system.entity.SysUserAgent; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.system.entity.SysUserAgent; /** * @Description: 用户代理人设置 diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserDepartMapper.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserDepartMapper.java index a7139d4..6334f7c 100644 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserDepartMapper.java +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserDepartMapper.java @@ -1,12 +1,13 @@ package org.jeecg.modules.system.mapper; -import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.jeecg.modules.system.entity.SysUser; import org.jeecg.modules.system.entity.SysUserDepart; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; public interface SysUserDepartMapper extends BaseMapper{ diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java index bdaca9b..f87105b 100644 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java @@ -1,12 +1,12 @@ package org.jeecg.modules.system.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.jeecg.modules.system.entity.SysUser; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.jeecg.modules.system.model.SysUserSysDepartModel; import org.jeecg.modules.system.vo.SysUserDepVo; diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserRoleMapper.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserRoleMapper.java index 2465fff..14c68f3 100644 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserRoleMapper.java +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserRoleMapper.java @@ -1,10 +1,11 @@ package org.jeecg.modules.system.mapper; -import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.jeecg.modules.system.entity.SysUserRole; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; /** *

diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/DivisionMapper.xml b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/DivisionMapper.xml new file mode 100644 index 0000000..c83b34d --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/DivisionMapper.xml @@ -0,0 +1,9 @@ + + + + + + update mr_division set has_child = #{status} where id = #{id} + + + \ No newline at end of file diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/FamilyMapper.xml b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/FamilyMapper.xml new file mode 100644 index 0000000..93135dc --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/FamilyMapper.xml @@ -0,0 +1,16 @@ + + + + + + DELETE + FROM mr_family + WHERE + minor_id = #{mainId} + + + diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/GaDemographicMapper.xml b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/GaDemographicMapper.xml new file mode 100644 index 0000000..5829bd8 --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/GaDemographicMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/GaHouseholdMapper.xml b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/GaHouseholdMapper.xml new file mode 100644 index 0000000..ca00c0c --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/GaHouseholdMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/GaJuvenilesStayMapper.xml b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/GaJuvenilesStayMapper.xml new file mode 100644 index 0000000..ad017a3 --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/GaJuvenilesStayMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/GaPunishMapper.xml b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/GaPunishMapper.xml new file mode 100644 index 0000000..9403be9 --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/GaPunishMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/HighSchoolMapper.xml b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/HighSchoolMapper.xml new file mode 100644 index 0000000..13b092c --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/HighSchoolMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/MinorMapper.xml b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/MinorMapper.xml new file mode 100644 index 0000000..2ff566b --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/MinorMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/MrSchoolMapper.xml b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/MrSchoolMapper.xml new file mode 100644 index 0000000..69aa0eb --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/MrSchoolMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/MzAdoptionMapper.xml b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/MzAdoptionMapper.xml new file mode 100644 index 0000000..e88c28d --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/MzAdoptionMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/MzLeftBehindChildrenMapper.xml b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/MzLeftBehindChildrenMapper.xml new file mode 100644 index 0000000..2ce4a9e --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/MzLeftBehindChildrenMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/MzOrphanMapper.xml b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/MzOrphanMapper.xml new file mode 100644 index 0000000..3a81d26 --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/MzOrphanMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/MzUnsupportedMapper.xml b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/MzUnsupportedMapper.xml new file mode 100644 index 0000000..7c2286a --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/MzUnsupportedMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/PrimarySchoolMapper.xml b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/PrimarySchoolMapper.xml new file mode 100644 index 0000000..af1c5b8 --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/PrimarySchoolMapper.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SourceMapper.xml b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SourceMapper.xml new file mode 100644 index 0000000..c58d8c2 --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SourceMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SpecialStudentMapper.xml b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SpecialStudentMapper.xml new file mode 100644 index 0000000..ec3095e --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SpecialStudentMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/DivisionIdModel.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/DivisionIdModel.java new file mode 100644 index 0000000..47abd6f --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/DivisionIdModel.java @@ -0,0 +1,91 @@ +package org.jeecg.modules.system.model; + + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +/** + *

+ * 部门表 封装树结构的部门的名称的实体类 + *

+ * + * @Author Steve + * @Since 2019-01-22 + * + */ +public class DivisionIdModel implements Serializable { + + private static final long serialVersionUID = 1L; + + // 主键ParentCode + private String key; + + // 主键ParentCode + private String value; + + // 部门名称 + private String title; + + List children = new ArrayList<>(); + + /** + * 将SysDepartTreeModel的部分数据放在该对象当中 + * @param treeModel + * @return + */ + public DivisionIdModel convert(DivisionModel treeModel) { + this.key = treeModel.getKey(); + this.value = treeModel.getValue(); + this.title = treeModel.getTitle(); + return this; + } + + /** + * 该方法为用户部门的实现类所使用 + * @param treeModel + * @return + */ + public DivisionIdModel convertByUserDepart(DivisionModel treeModel) { + this.key = treeModel.getKey(); + this.value = treeModel.getValue(); + this.title = treeModel.getTitle(); + return this; + } + + public List getChildren() { + return children; + } + + public void setChildren(List children) { + this.children = children; + } + + public static long getSerialVersionUID() { + return serialVersionUID; + } + + public String getKey() { + return key; + } + + public void setKey(String key) { + this.key = key; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/DivisionModel.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/DivisionModel.java new file mode 100644 index 0000000..8a59648 --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/DivisionModel.java @@ -0,0 +1,261 @@ +package org.jeecg.modules.system.model; + + + +import org.jeecg.modules.system.entity.Division; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; + +/** + *

+ * 部门表 存储树结构数据的实体类 + *

+ * + * @Author Steve + * @Since 2019-01-22 + */ +public class DivisionModel implements Serializable{ + + private static final long serialVersionUID = 1L; + + /** 对应SysDepart中的id字段,前端数据树中的key*/ + private String key; + + /** 对应SysDepart中的id字段,前端数据树中的value*/ + private String value; + + /** 对应depart_name字段,前端数据树中的title*/ + private String title; + + + private boolean isLeaf; + // 以下所有字段均与division相同 + + /** + * 主键 + */ + private String id; + + private String name; + + private String abbreviation; + + private String code; + + private String commonCode; + + private String pid; + + /** + * 创建人 + */ + private String createBy; + /** + * 创建日期 + */ + private Date createTime; + /** + * 更新人 + */ + private String updateBy; + /** + * 更新日期 + */ + private Date updateTime; + + + private String hasChild; + + private List children = new ArrayList<>(); + + + public DivisionModel(Division division) { + this.key = division.getId(); + this.value = division.getId(); + this.title = division.getName(); + this.id = division.getId(); + this.pid = division.getPid(); + this.name=division.getName(); + this.code=division.getCode(); + this.abbreviation=division.getAbbreviation(); + this.commonCode=division.getCommonCode(); + this.createBy = division.getCreateBy(); + this.createTime = division.getCreateTime(); + this.updateBy = division.getUpdateBy(); + this.updateTime = division.getUpdateTime(); + this.hasChild=division.getHasChild(); + } + + public String getKey() { + return key; + } + + public void setKey(String key) { + this.key = key; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public boolean getIsLeaf() { + return isLeaf; + } + + public void setIsLeaf(boolean isleaf) { + this.isLeaf = isleaf; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getAbbreviation() { + return abbreviation; + } + + public void setAbbreviation(String abbreviation) { + this.abbreviation = abbreviation; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getCommonCode() { + return commonCode; + } + + public void setCommonCode(String commonCode) { + this.commonCode = commonCode; + } + + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; + } + + public String getCreateBy() { + return createBy; + } + + public void setCreateBy(String createBy) { + this.createBy = createBy; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public String getUpdateBy() { + return updateBy; + } + + public void setUpdateBy(String updateBy) { + this.updateBy = updateBy; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + public String getHasChild() { + return hasChild; + } + + public void setHasChild(String hasChild) { + this.hasChild = hasChild; + } + + public List getChildren() { + return children; + } + + public void setChildren(List children) { + if (children==null){ + this.isLeaf=true; + } + this.children = children; + } + + /** + * 重写equals方法 + */ + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + DivisionModel model = (DivisionModel) o; + return Objects.equals(id, model.id) && + Objects.equals(name, model.name) && + Objects.equals(abbreviation, model.abbreviation) && + Objects.equals(code, model.code) && + Objects.equals(commonCode, model.commonCode) && + Objects.equals(pid, model.pid) && + Objects.equals(createBy, model.createBy) && + Objects.equals(createTime, model.createTime) && + Objects.equals(updateBy, model.updateBy) && + Objects.equals(updateTime, model.updateTime) && + Objects.equals(hasChild,model.hasChild) && + Objects.equals(children, model.children); + } + + /** + * 重写hashCode方法 + */ + @Override + public int hashCode() { + + return Objects.hash(id,name, abbreviation, code, + commonCode, pid, createBy, createTime, updateBy, updateTime,hasChild, + children); + } + +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java index 86f5411..208d87f 100644 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java @@ -75,6 +75,10 @@ public class SysDepartTreeModel implements Serializable{ private Date updateTime; + private String abbreviation; + + private String commonCode; + private List children = new ArrayList<>(); @@ -107,6 +111,8 @@ public class SysDepartTreeModel implements Serializable{ this.createTime = sysDepart.getCreateTime(); this.updateBy = sysDepart.getUpdateBy(); this.updateTime = sysDepart.getUpdateTime(); + this.abbreviation = sysDepart.getAbbreviation(); + this.commonCode = sysDepart.getCommonCode(); } public boolean getIsLeaf() { @@ -330,6 +336,22 @@ public class SysDepartTreeModel implements Serializable{ this.updateTime = updateTime; } + public String getAbbreviation() { + return abbreviation; + } + + public void setAbbreviation(String abbreviation) { + this.abbreviation = abbreviation; + } + + public String getCommonCode() { + return commonCode; + } + + public void setCommonCode(String commonCode) { + this.commonCode = commonCode; + } + public SysDepartTreeModel() { } /** @@ -365,7 +387,9 @@ public class SysDepartTreeModel implements Serializable{ Objects.equals(createTime, model.createTime) && Objects.equals(updateBy, model.updateBy) && Objects.equals(updateTime, model.updateTime) && - Objects.equals(children, model.children); + Objects.equals(children, model.children) && + Objects.equals(abbreviation, model.abbreviation)&& + Objects.equals(commonCode, model.commonCode); } /** @@ -376,7 +400,7 @@ public class SysDepartTreeModel implements Serializable{ return Objects.hash(id, parentId, departName, departNameEn, departNameAbbr, departOrder, description, orgCategory, orgType, orgCode, mobile, fax, address, - memo, status, delFlag, qywxIdentifier, createBy, createTime, updateBy, updateTime, + memo, status, delFlag, qywxIdentifier, createBy, createTime, updateBy, updateTime,abbreviation,commonCode, children); } diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IDivisionService.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IDivisionService.java new file mode 100644 index 0000000..0832c5c --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IDivisionService.java @@ -0,0 +1,56 @@ +package org.jeecg.modules.system.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.common.exception.JeecgBootException; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import org.jeecg.modules.system.entity.Division; +import org.jeecg.modules.system.model.DivisionModel; + +import java.util.List; + +/** + * @Description: 行政区划 + * @Author: jeecg-boot + * @Date: 2022-07-12 + * @Version: V1.0 + */ +public interface IDivisionService extends IService { + + /**根节点父ID的值*/ + public static final String ROOT_PID_VALUE = "0"; + + /**树节点有子节点状态值*/ + public static final String HASCHILD = "1"; + + /**树节点无子节点状态值*/ + public static final String NOCHILD = "0"; + + /**新增节点*/ + void addDivision(Division division); + + /**修改节点*/ + void updateDivision(Division division) throws JeecgBootException; + + /** + * 根据部门id删除并删除其可能存在的子级部门 + * @param id + * @return + */ + boolean delete(String id); + + + void deleteBatchWithChildren(List ids); + + /** + * 查询所有部门信息,并分节点进行显示 + * @return + */ + List queryTreeList(String ids); + + /** + * 查询所有部门信息,并分节点进行显示 + * @return + */ + List queryTreeList(); + +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IFamilyService.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IFamilyService.java new file mode 100644 index 0000000..e847298 --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IFamilyService.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.system.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.system.entity.Family; + +import java.util.List; + +/** + * @Description: 家庭成员表 + * @Author: jeecg-boot + * @Date: 2022-07-13 + * @Version: V1.0 + */ +public interface IFamilyService extends IService { + + public List selectByMainId(String mainId); +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IGaDemographicService.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IGaDemographicService.java new file mode 100644 index 0000000..8b267df --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IGaDemographicService.java @@ -0,0 +1,27 @@ +package org.jeecg.modules.system.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.system.entity.Family; +import org.jeecg.modules.system.entity.GaDemographic; +import org.jeecg.modules.system.vo.FamilyVo; + +import java.util.List; + +/** + * @Description: 公安_人口基础信息 + * @Author: jeecg-boot + * @Date: 2022-07-14 + * @Version: V1.0 + */ +public interface IGaDemographicService extends IService { + + /** + * 分页关联查询人口基础信息和户籍信息 + * @param startNum + * @param endNum + * @return + */ + public List queryPageList(Integer startNum, Integer endNum); + + public List getIdentityS(); +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IGaHouseholdService.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IGaHouseholdService.java new file mode 100644 index 0000000..97789c6 --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IGaHouseholdService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.system.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.system.entity.GaHousehold; + +/** + * @Description: 公安_居民户籍信息 + * @Author: jeecg-boot + * @Date: 2022-07-14 + * @Version: V1.0 + */ +public interface IGaHouseholdService extends IService { + +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IGaJuvenilesStayService.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IGaJuvenilesStayService.java new file mode 100644 index 0000000..e91d2bc --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IGaJuvenilesStayService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.system.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.system.entity.GaJuvenilesStay; + +/** + * @Description: 公安_未成年人住宿信息 + * @Author: jeecg-boot + * @Date: 2022-07-14 + * @Version: V1.0 + */ +public interface IGaJuvenilesStayService extends IService { + +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IGaPunishService.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IGaPunishService.java new file mode 100644 index 0000000..eb3ebfb --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IGaPunishService.java @@ -0,0 +1,21 @@ +package org.jeecg.modules.system.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.system.entity.GaPunish; +import org.jeecg.modules.system.vo.GaPunishVo; + +import java.util.List; + +/** + * @Description: 公安_行政处罚打处人员信息 + * @Author: jeecg-boot + * @Date: 2022-07-14 + * @Version: V1.0 + */ +public interface IGaPunishService extends IService { + /** + * 查询数据 + * @return + */ + public List queryAll(); +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IHighSchoolService.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IHighSchoolService.java new file mode 100644 index 0000000..e086c2d --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IHighSchoolService.java @@ -0,0 +1,18 @@ +package org.jeecg.modules.system.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.system.entity.HighSchool; +import org.jeecg.modules.system.entity.MrSchool; + +import java.util.List; + +/** + * @Description: mr_high_school + * @Author: jeecg-boot + * @Date: 2022-07-15 + * @Version: V1.0 + */ +public interface IHighSchoolService extends IService { + public List getList(); +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IMinorService.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IMinorService.java new file mode 100644 index 0000000..3edd669 --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IMinorService.java @@ -0,0 +1,41 @@ +package org.jeecg.modules.system.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.system.entity.Family; +import org.jeecg.modules.system.entity.Minor; + +import java.io.Serializable; +import java.util.Collection; +import java.util.List; + +/** + * @Description: 未成年人 + * @Author: jeecg-boot + * @Date: 2022-07-13 + * @Version: V1.0 + */ +public interface IMinorService extends IService { + + /** + * 添加一对多 + * + */ + public void saveMain(Minor minor,List familyList) ; + + /** + * 修改一对多 + * + */ + public void updateMain(Minor minor,List familyList); + + /** + * 删除一对多 + */ + public void delMain (String id); + + /** + * 批量删除一对多 + */ + public void delBatchMain (Collection idList); + +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IMrSchoolService.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IMrSchoolService.java new file mode 100644 index 0000000..4ac4ed9 --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IMrSchoolService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.system.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.system.entity.MrSchool; + +/** + * @Description: 学校 + * @Author: jeecg-boot + * @Date: 2022-07-15 + * @Version: V1.0 + */ +public interface IMrSchoolService extends IService { + +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IMzAdoptionService.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IMzAdoptionService.java new file mode 100644 index 0000000..d6907c9 --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IMzAdoptionService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.system.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.system.entity.MzAdoption; + +/** + * @Description:民政_全市收养登记数据 + * @Author: jeecg-boot + * @Date: 2022-07-14 + * @Version: V1.0 + */ +public interface IMzAdoptionService extends IService { + +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IMzLeftBehindChildrenService.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IMzLeftBehindChildrenService.java new file mode 100644 index 0000000..78c8dc1 --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IMzLeftBehindChildrenService.java @@ -0,0 +1,15 @@ +package org.jeecg.modules.system.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.system.entity.MzLeftBehindChildren; + +/** + * @Description: 民政_全市在册农村留守儿童数据 + * @Author: jeecg-boot + * @Date: 2022-07-14 + * @Version: V1.0 + */ +public interface IMzLeftBehindChildrenService extends IService { + +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IMzOrphanService.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IMzOrphanService.java new file mode 100644 index 0000000..773247a --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IMzOrphanService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.system.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.system.entity.MzOrphan; + +/** + * @Description: 民政_全市在册孤儿数据 + * @Author: jeecg-boot + * @Date: 2022-07-14 + * @Version: V1.0 + */ +public interface IMzOrphanService extends IService { + +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IMzUnsupportedService.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IMzUnsupportedService.java new file mode 100644 index 0000000..37792d8 --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IMzUnsupportedService.java @@ -0,0 +1,15 @@ +package org.jeecg.modules.system.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.system.entity.MzUnsupported; + +/** + * @Description: 民政_全市在册事实无人抚养儿童数据 + * @Author: jeecg-boot + * @Date: 2022-07-14 + * @Version: V1.0 + */ +public interface IMzUnsupportedService extends IService { + +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IPrimarySchoolService.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IPrimarySchoolService.java new file mode 100644 index 0000000..f629486 --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IPrimarySchoolService.java @@ -0,0 +1,18 @@ +package org.jeecg.modules.system.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.system.entity.MrSchool; +import org.jeecg.modules.system.entity.PrimarySchool; + +import java.util.List; + +/** + * @Description: mr_primary_school + * @Author: jeecg-boot + * @Date: 2022-07-15 + * @Version: V1.0 + */ +public interface IPrimarySchoolService extends IService { + public List getList(); +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISourceService.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISourceService.java new file mode 100644 index 0000000..3f2e4e7 --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISourceService.java @@ -0,0 +1,21 @@ +package org.jeecg.modules.system.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.system.entity.SourceData; + +/** + * @Description: 来源数据管理 + * @Author: jeecg-boot + * @Date: 2022-07-13 + * @Version: V1.0 + */ +public interface ISourceService extends IService { + /** + * 根据单位名称分组查询数据 + * @param page + * @return + */ + public IPage getListGroupByName(Page page,String name); +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISpecialStudentService.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISpecialStudentService.java new file mode 100644 index 0000000..af09d0d --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISpecialStudentService.java @@ -0,0 +1,21 @@ +package org.jeecg.modules.system.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.system.entity.SpecialStudent; +import org.jeecg.modules.system.vo.SpecialStudentVo; + +import java.util.List; + +/** + * @Description: mr_special_student + * @Author: jeecg-boot + * @Date: 2022-07-14 + * @Version: V1.0 + */ +public interface ISpecialStudentService extends IService { + /** + * 查询 + * @return + */ + public List queryList(); +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/DivisionServiceImpl.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/DivisionServiceImpl.java new file mode 100644 index 0000000..f0d0a68 --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/DivisionServiceImpl.java @@ -0,0 +1,198 @@ +package org.jeecg.modules.system.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import org.apache.logging.log4j.util.Strings; +import org.apache.shiro.SecurityUtils; +import org.jeecg.common.constant.CommonConstant; +import org.jeecg.common.exception.JeecgBootException; +import org.jeecg.common.system.vo.LoginUser; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.system.entity.Division; +import org.jeecg.modules.system.mapper.DivisionMapper; +import org.jeecg.modules.system.model.DivisionModel; +import org.jeecg.modules.system.service.IDivisionService; +import org.jeecg.modules.system.util.FindsDivisionsChildrenUtil; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 行政区划 + * @Author: jeecg-boot + * @Date: 2022-07-12 + * @Version: V1.0 + */ +@Service +public class DivisionServiceImpl extends ServiceImpl implements IDivisionService { + + @Override + public void addDivision(Division division) { + //新增时设置hasChild为0 + division.setHasChild(IDivisionService.NOCHILD); + if(oConvertUtils.isEmpty(division.getPid())){ + division.setPid(IDivisionService.ROOT_PID_VALUE); + }else{ + //如果当前节点父ID不为空 则设置父节点的hasChildren 为1 + LambdaQueryWrapper query = new LambdaQueryWrapper(); + query.eq(Division::getId, division.getPid()); + Division parent = baseMapper.selectOne(query); + if(parent!=null && !"1".equals(parent.getHasChild())){ + parent.setHasChild("1"); + baseMapper.updateById(parent); + } + } + baseMapper.insert(division); + } + + @Override + public void updateDivision(Division division) { + baseMapper.updateById(division); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean delete(String id) { + List idList = new ArrayList<>(); + idList.add(id); + this.checkChildrenExists(id, idList); + boolean ok = this.removeByIds(idList); + + return ok; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void deleteBatchWithChildren(List ids) { + List idList = new ArrayList(); + for(String id: ids) { + idList.add(id); + this.checkChildrenExists(id, idList); + } + this.removeByIds(idList); + } + /** + * delete 方法调用 + * @param id + * @param idList + */ + private void checkChildrenExists(String id, List idList) { + LambdaQueryWrapper query = new LambdaQueryWrapper(); + query.eq(Division::getPid,id); + List facilityList = this.list(query); + if(facilityList != null && facilityList.size() > 0) { + for(Division facility : facilityList) { + idList.add(facility.getId()); + this.checkChildrenExists(facility.getId(), idList); + } + } + } + + /** + * 根据所传pid查询旧的父级节点的子节点并修改相应状态值 + * @param pid + */ + private void updateOldParentNode(String pid) { + if(!IDivisionService.ROOT_PID_VALUE.equals(pid)) { + Integer count = baseMapper.selectCount(new QueryWrapper().eq("pid", pid)); + if(count==null || count<=1) { + baseMapper.updateTreeNodeStatus(pid, IDivisionService.NOCHILD); + } + } + } + + /** + * 递归查询节点的根节点 + * @param pidVal + * @return + */ + private Division getTreeRoot(String pidVal){ + Division data = baseMapper.selectById(pidVal); + if(data != null && !"0".equals(data.getPid())){ + return this.getTreeRoot(data.getPid()); + }else{ + return data; + } + } + + /** + * 根据id查询所有子节点id + * @param ids + * @return + */ + private String queryTreeChildIds(String ids) { + //获取id数组 + String[] idArr = ids.split(","); + StringBuffer sb = new StringBuffer(); + for (String pidVal : idArr) { + if(pidVal != null){ + if(!sb.toString().contains(pidVal)){ + if(sb.toString().length() > 0){ + sb.append(","); + } + sb.append(pidVal); + this.getTreeChildIds(pidVal,sb); + } + } + } + return sb.toString(); + } + + /** + * 递归查询所有子节点 + * @param pidVal + * @param sb + * @return + */ + private StringBuffer getTreeChildIds(String pidVal,StringBuffer sb){ + List dataList = baseMapper.selectList(new QueryWrapper().eq("pid", pidVal)); + if(dataList != null && dataList.size()>0){ + for(Division tree : dataList) { + if(!sb.toString().contains(tree.getId())){ + sb.append(",").append(tree.getId()); + } + this.getTreeChildIds(tree.getId(),sb); + } + } + return sb; + } + + /** + * queryTreeList 对应 queryTreeList 查询所有的部门数据,以树结构形式响应给前端 + */ + @Override + public List queryTreeList() { + LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + + LambdaQueryWrapper query = new LambdaQueryWrapper(); + List list = this.list(query); + + // 调用wrapTreeDataToTreeList方法生成树状数据 + List listResult = FindsDivisionsChildrenUtil.wrapTreeDataToTreeList(list); + return listResult; + } + + /** + * queryTreeList 根据部门id查询,前端回显调用 + */ + @Override + public List queryTreeList(String ids) { + List listResult=new ArrayList<>(); + LambdaQueryWrapper query = new LambdaQueryWrapper(); + if(oConvertUtils.isNotEmpty(ids)){ + query.in(true,Division::getId,ids.split(",")); + } + List list= this.list(query); + for (Division depart : list) { + listResult.add(new DivisionModel(depart)); + } + return listResult; + + } + + +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/FamilyServiceImpl.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/FamilyServiceImpl.java new file mode 100644 index 0000000..e40dbf3 --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/FamilyServiceImpl.java @@ -0,0 +1,29 @@ +package org.jeecg.modules.system.service.impl; + +import org.jeecg.modules.system.entity.Family; +import org.jeecg.modules.system.mapper.FamilyMapper; +import org.jeecg.modules.system.service.IFamilyService; +import org.springframework.stereotype.Service; +import java.util.List; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; + +import javax.annotation.Resource; + +/** + * @Description: 家庭成员表 + * @Author: jeecg-boot + * @Date: 2022-07-13 + * @Version: V1.0 + */ +@Service +public class FamilyServiceImpl extends ServiceImpl implements IFamilyService { + + @Resource + private FamilyMapper familyMapper; + + @Override + public List selectByMainId(String mainId) { + return familyMapper.selectByMainId(mainId); + } +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/GaDemographicServiceImpl.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/GaDemographicServiceImpl.java new file mode 100644 index 0000000..01db7f1 --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/GaDemographicServiceImpl.java @@ -0,0 +1,42 @@ +package org.jeecg.modules.system.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.jeecg.modules.system.entity.Family; +import org.jeecg.modules.system.entity.GaDemographic; +import org.jeecg.modules.system.mapper.GaDemographicMapper; +import org.jeecg.modules.system.service.IGaDemographicService; +import org.jeecg.modules.system.vo.FamilyVo; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @Description: ga_demographic + * @Author: jeecg-boot + * @Date: 2022-07-14 + * @Version: V1.0 + */ +@Service +public class GaDemographicServiceImpl extends ServiceImpl implements IGaDemographicService { + @Resource + private GaDemographicMapper gaDemographicMapper; + + /** + * 分页关联查询人口基础信息和户籍信息 + * @param startNum + * @param endNum + * @return + */ + @Override + public List queryPageList(Integer startNum, Integer endNum) { + return gaDemographicMapper.queryPageList(startNum,endNum); + } + + @Override + public List getIdentityS() { + return gaDemographicMapper.getIdentityS(); + } + + +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/GaHouseholdServiceImpl.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/GaHouseholdServiceImpl.java new file mode 100644 index 0000000..a9ead20 --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/GaHouseholdServiceImpl.java @@ -0,0 +1,18 @@ +package org.jeecg.modules.system.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.jeecg.modules.system.entity.GaHousehold; +import org.jeecg.modules.system.mapper.GaHouseholdMapper; +import org.jeecg.modules.system.service.IGaHouseholdService; +import org.springframework.stereotype.Service; + +/** + * @Description: ga_household + * @Author: jeecg-boot + * @Date: 2022-07-14 + * @Version: V1.0 + */ +@Service +public class GaHouseholdServiceImpl extends ServiceImpl implements IGaHouseholdService { + +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/GaJuvenilesStayServiceImpl.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/GaJuvenilesStayServiceImpl.java new file mode 100644 index 0000000..5f5b079 --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/GaJuvenilesStayServiceImpl.java @@ -0,0 +1,18 @@ +package org.jeecg.modules.system.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.jeecg.modules.system.entity.GaJuvenilesStay; +import org.jeecg.modules.system.mapper.GaJuvenilesStayMapper; +import org.jeecg.modules.system.service.IGaJuvenilesStayService; +import org.springframework.stereotype.Service; + +/** + * @Description: ga_juveniles_stay + * @Author: jeecg-boot + * @Date: 2022-07-14 + * @Version: V1.0 + */ +@Service +public class GaJuvenilesStayServiceImpl extends ServiceImpl implements IGaJuvenilesStayService { + +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/GaPunishServiceImpl.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/GaPunishServiceImpl.java new file mode 100644 index 0000000..4db07c1 --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/GaPunishServiceImpl.java @@ -0,0 +1,34 @@ +package org.jeecg.modules.system.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.jeecg.modules.system.entity.GaPunish; +import org.jeecg.modules.system.mapper.GaDemographicMapper; +import org.jeecg.modules.system.mapper.GaPunishMapper; +import org.jeecg.modules.system.service.IGaPunishService; +import org.jeecg.modules.system.vo.GaPunishVo; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @Description: ga_punish + * @Author: jeecg-boot + * @Date: 2022-07-14 + * @Version: V1.0 + */ +@Service +public class GaPunishServiceImpl extends ServiceImpl implements IGaPunishService { + + @Resource + private GaPunishMapper gaPunishMapper; + /** + * 查询数据 + * @return + */ + @Override + public List queryList() { + return gaPunishMapper.queryList(); + } + +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/HighSchoolServiceImpl.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/HighSchoolServiceImpl.java new file mode 100644 index 0000000..200d3df --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/HighSchoolServiceImpl.java @@ -0,0 +1,31 @@ +package org.jeecg.modules.system.service.impl; + +import org.jeecg.modules.system.entity.HighSchool; +import org.jeecg.modules.system.entity.MrSchool; +import org.jeecg.modules.system.mapper.GaDemographicMapper; +import org.jeecg.modules.system.mapper.HighSchoolMapper; +import org.jeecg.modules.system.service.IHighSchoolService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @Description: mr_high_school + * @Author: jeecg-boot + * @Date: 2022-07-15 + * @Version: V1.0 + */ +@Service +public class HighSchoolServiceImpl extends ServiceImpl implements IHighSchoolService { + + @Resource + private HighSchoolMapper highSchoolMapper; + + @Override + public List getList() { + return highSchoolMapper.getList(); + } +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/MinorServiceImpl.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/MinorServiceImpl.java new file mode 100644 index 0000000..88bc7a1 --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/MinorServiceImpl.java @@ -0,0 +1,78 @@ +package org.jeecg.modules.system.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.jeecg.modules.system.entity.Family; +import org.jeecg.modules.system.entity.Minor; +import org.jeecg.modules.system.mapper.FamilyMapper; +import org.jeecg.modules.system.mapper.MinorMapper; +import org.jeecg.modules.system.service.IMinorService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.io.Serializable; +import java.util.Collection; +import java.util.List; + +/** + * @Description: 未成年人 + * @Author: jeecg-boot + * @Date: 2022-07-13 + * @Version: V1.0 + */ +@Service +public class MinorServiceImpl extends ServiceImpl implements IMinorService { + + @Resource + private MinorMapper minorMapper; + @Resource + private FamilyMapper familyMapper; + + @Override + @Transactional + public void saveMain(Minor minor, List familyList) { + minorMapper.insert(minor); + if(familyList!=null && familyList.size()>0) { + for(Family entity:familyList) { + //外键设置 + entity.setMinorId(minor.getId()); + familyMapper.insert(entity); + } + } + } + + @Override + @Transactional + public void updateMain(Minor minor,List familyList) { + minorMapper.updateById(minor); + + //1.先删除子表数据 + familyMapper.deleteByMainId(minor.getId()); + + //2.子表数据重新插入 + if(familyList!=null && familyList.size()>0) { + for(Family entity:familyList) { + //外键设置 + entity.setMinorId(minor.getId()); + familyMapper.insert(entity); + } + } + } + + @Override + @Transactional + public void delMain(String id) { + familyMapper.deleteByMainId(id); + minorMapper.deleteById(id); + } + + @Override + @Transactional + public void delBatchMain(Collection idList) { + for(Serializable id:idList) { + familyMapper.deleteByMainId(id.toString()); + minorMapper.deleteById(id); + } + } + +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/MrSchoolServiceImpl.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/MrSchoolServiceImpl.java new file mode 100644 index 0000000..d140061 --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/MrSchoolServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.system.service.impl; + +import org.jeecg.modules.system.entity.MrSchool; +import org.jeecg.modules.system.mapper.MrSchoolMapper; +import org.jeecg.modules.system.service.IMrSchoolService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 学校 + * @Author: jeecg-boot + * @Date: 2022-07-15 + * @Version: V1.0 + */ +@Service +public class MrSchoolServiceImpl extends ServiceImpl implements IMrSchoolService { + +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/MzAdoptionServiceImpl.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/MzAdoptionServiceImpl.java new file mode 100644 index 0000000..1903c50 --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/MzAdoptionServiceImpl.java @@ -0,0 +1,18 @@ +package org.jeecg.modules.system.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.jeecg.modules.system.entity.MzAdoption; +import org.jeecg.modules.system.mapper.MzAdoptionMapper; +import org.jeecg.modules.system.service.IMzAdoptionService; +import org.springframework.stereotype.Service; + +/** + * @Description: mz_adoption + * @Author: jeecg-boot + * @Date: 2022-07-14 + * @Version: V1.0 + */ +@Service +public class MzAdoptionServiceImpl extends ServiceImpl implements IMzAdoptionService { + +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/MzLeftBehindChildrenServiceImpl.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/MzLeftBehindChildrenServiceImpl.java new file mode 100644 index 0000000..e6a0278 --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/MzLeftBehindChildrenServiceImpl.java @@ -0,0 +1,18 @@ +package org.jeecg.modules.system.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.jeecg.modules.system.entity.MzLeftBehindChildren; +import org.jeecg.modules.system.mapper.MzLeftBehindChildrenMapper; +import org.jeecg.modules.system.service.IMzLeftBehindChildrenService; +import org.springframework.stereotype.Service; + +/** + * @Description: mz_left_behind_children + * @Author: jeecg-boot + * @Date: 2022-07-14 + * @Version: V1.0 + */ +@Service +public class MzLeftBehindChildrenServiceImpl extends ServiceImpl implements IMzLeftBehindChildrenService { + +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/MzOrphanServiceImpl.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/MzOrphanServiceImpl.java new file mode 100644 index 0000000..7e83fa8 --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/MzOrphanServiceImpl.java @@ -0,0 +1,18 @@ +package org.jeecg.modules.system.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.jeecg.modules.system.entity.MzOrphan; +import org.jeecg.modules.system.mapper.MzOrphanMapper; +import org.jeecg.modules.system.service.IMzOrphanService; +import org.springframework.stereotype.Service; + +/** + * @Description: mz_orphan + * @Author: jeecg-boot + * @Date: 2022-07-14 + * @Version: V1.0 + */ +@Service +public class MzOrphanServiceImpl extends ServiceImpl implements IMzOrphanService { + +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/MzUnsupportedServiceImpl.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/MzUnsupportedServiceImpl.java new file mode 100644 index 0000000..d092a08 --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/MzUnsupportedServiceImpl.java @@ -0,0 +1,18 @@ +package org.jeecg.modules.system.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.jeecg.modules.system.entity.MzUnsupported; +import org.jeecg.modules.system.mapper.MzUnsupportedMapper; +import org.jeecg.modules.system.service.IMzUnsupportedService; +import org.springframework.stereotype.Service; + +/** + * @Description: mz_unsupported + * @Author: jeecg-boot + * @Date: 2022-07-14 + * @Version: V1.0 + */ +@Service +public class MzUnsupportedServiceImpl extends ServiceImpl implements IMzUnsupportedService { + +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/PrimarySchoolServiceImpl.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/PrimarySchoolServiceImpl.java new file mode 100644 index 0000000..f7ebd73 --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/PrimarySchoolServiceImpl.java @@ -0,0 +1,30 @@ +package org.jeecg.modules.system.service.impl; + +import org.jeecg.modules.system.entity.MrSchool; +import org.jeecg.modules.system.entity.PrimarySchool; +import org.jeecg.modules.system.mapper.HighSchoolMapper; +import org.jeecg.modules.system.mapper.PrimarySchoolMapper; +import org.jeecg.modules.system.service.IPrimarySchoolService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @Description: mr_primary_school + * @Author: jeecg-boot + * @Date: 2022-07-15 + * @Version: V1.0 + */ +@Service +public class PrimarySchoolServiceImpl extends ServiceImpl implements IPrimarySchoolService { + @Resource + private HighSchoolMapper highSchoolMapper; + + @Override + public List getList() { + return highSchoolMapper.getList(); + } +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SourceServiceImpl.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SourceServiceImpl.java new file mode 100644 index 0000000..3dd5f0d --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SourceServiceImpl.java @@ -0,0 +1,29 @@ +package org.jeecg.modules.system.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.jeecg.modules.system.entity.SourceData; +import org.jeecg.modules.system.mapper.SourceMapper; +import org.jeecg.modules.system.service.ISourceService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import javax.annotation.Resource; + +/** + * @Description: 来源数据管理 + * @Author: jeecg-boot + * @Date: 2022-07-13 + * @Version: V1.0 + */ +@Service +public class SourceServiceImpl extends ServiceImpl implements ISourceService { + @Resource + private SourceMapper sourceMapper; + + @Override + public IPage getListGroupByName(Page page,String name) { + return page.setRecords(sourceMapper.getListGroupByName(page,name)); + } +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SpecialStudentServiceImpl.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SpecialStudentServiceImpl.java new file mode 100644 index 0000000..2bdf05d --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SpecialStudentServiceImpl.java @@ -0,0 +1,28 @@ +package org.jeecg.modules.system.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.jeecg.modules.system.entity.SpecialStudent; +import org.jeecg.modules.system.mapper.GaPunishMapper; +import org.jeecg.modules.system.mapper.SpecialStudentMapper; +import org.jeecg.modules.system.service.ISpecialStudentService; +import org.jeecg.modules.system.vo.SpecialStudentVo; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @Description: mr_special_student + * @Author: jeecg-boot + * @Date: 2022-07-14 + * @Version: V1.0 + */ +@Service +public class SpecialStudentServiceImpl extends ServiceImpl implements ISpecialStudentService { + @Resource + private SpecialStudentMapper specialStudentMapper; + @Override + public List queryList() { + return specialStudentMapper.queryList(); + } +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/util/FindsDivisionsChildrenUtil.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/util/FindsDivisionsChildrenUtil.java new file mode 100644 index 0000000..b7a2b37 --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/util/FindsDivisionsChildrenUtil.java @@ -0,0 +1,127 @@ +package org.jeecg.modules.system.util; + +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.system.entity.Division; +import org.jeecg.modules.system.model.DivisionIdModel; +import org.jeecg.modules.system.model.DivisionModel; +import org.jeecg.modules.system.service.IDivisionService; + +import java.util.ArrayList; +import java.util.List; + +/** + *

+ * 对应部门的表,处理并查找树级数据 + *

+ * + * @Author: Steve + * @Date: 2019-01-22 + */ +public class FindsDivisionsChildrenUtil { + + //部门树信息-树结构 + //private static List sysDepartTreeList = new ArrayList(); + + //部门树id-树结构 + //private static List idList = new ArrayList<>(); + + + /** + * queryTreeList的子方法 ====1===== + * 该方法是s将SysDepart类型的list集合转换成CorrectionalFacilityModel类型的集合 + */ + public static List wrapTreeDataToTreeList(List recordList) { + // 在该方法每请求一次,都要对全局list集合进行一次清理 + //idList.clear(); + List idList = new ArrayList(); + List records = new ArrayList<>(); + for (int i = 0; i < recordList.size(); i++) { + Division depart = recordList.get(i); + records.add(new DivisionModel(depart)); + } + List tree = findChildren(records, idList); + setEmptyChildrenAsNull(tree); + return tree; + } + + /** + * 获取 FacilityIdModel + * @param recordList + * @return + */ + public static List wrapTreeDataToDepartIdTreeList(List recordList) { + // 在该方法每请求一次,都要对全局list集合进行一次清理 + //idList.clear(); + List idList = new ArrayList(); + List records = new ArrayList<>(); + for (int i = 0; i < recordList.size(); i++) { + Division depart = recordList.get(i); + records.add(new DivisionModel(depart)); + } + findChildren(records, idList); + return idList; + } + + /** + * queryTreeList的子方法 ====2===== + * 该方法是找到并封装顶级父类的节点到TreeList集合 + */ + private static List findChildren(List recordList, + List departIdList) { + List treeList = new ArrayList<>(); + for (int i = 0; i < recordList.size(); i++) { + DivisionModel branch = recordList.get(i); + if (oConvertUtils.isEmpty(branch.getPid()) || branch.getPid().equals(IDivisionService.ROOT_PID_VALUE)) { + treeList.add(branch); + DivisionIdModel departIdModel = new DivisionIdModel().convert(branch); + departIdList.add(departIdModel); + } + } + getGrandChildren(treeList,recordList,departIdList); + + //idList = departIdList; + return treeList; + } + + /** + * queryTreeList的子方法====3==== + *该方法是找到顶级父类下的所有子节点集合并封装到TreeList集合 + */ + private static void getGrandChildren(List treeList,List recordList,List idList) { + + for (int i = 0; i < treeList.size(); i++) { + DivisionModel model = treeList.get(i); + DivisionIdModel idModel = idList.get(i); + for (int i1 = 0; i1 < recordList.size(); i1++) { + DivisionModel m = recordList.get(i1); + if (m.getPid()!=null && m.getPid().equals(model.getId())) { + model.getChildren().add(m); + DivisionIdModel dim = new DivisionIdModel().convert(m); + idModel.getChildren().add(dim); + } + } + getGrandChildren(treeList.get(i).getChildren(), recordList, idList.get(i).getChildren()); + } + + } + + + /** + * queryTreeList的子方法 ====4==== + * 该方法是将子节点为空的List集合设置为Null值 + */ + private static void setEmptyChildrenAsNull(List treeList) { + + for (int i = 0; i < treeList.size(); i++) { + DivisionModel model = treeList.get(i); + if (model.getChildren().size() == 0) { + model.setChildren(null); + model.setIsLeaf(true); + }else{ + setEmptyChildrenAsNull(model.getChildren()); + model.setIsLeaf(false); + } + } + // sysDepartTreeList = treeList; + } +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/util/IDNumberUtil.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/util/IDNumberUtil.java new file mode 100644 index 0000000..3e2f916 --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/util/IDNumberUtil.java @@ -0,0 +1,91 @@ +package org.jeecg.modules.system.util; + +import javax.imageio.ImageIO; +import javax.servlet.http.HttpServletResponse; +import java.awt.*; +import java.awt.image.BufferedImage; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.text.SimpleDateFormat; +import java.util.Base64; +import java.util.Date; +import java.util.Random; + +/** + * 登录验证码工具类 + */ +public class IDNumberUtil { + + /** + * 根据身份证号判断性别 + * @param idNumber + * @return + */ + public static String judgeGender(String idNumber) throws IllegalArgumentException{ + System.out.println(idNumber.length()); + if(idNumber.length() != 18 && idNumber.length() != 15){ + throw new IllegalArgumentException("身份证号长度错误"); + } + int gender = 0; + if(idNumber.length() == 18){ + //如果身份证号18位，取身份证号倒数第二位 + char c = idNumber.charAt(idNumber.length() - 2); + gender = Integer.parseInt(String.valueOf(c)); + }else{ + //如果身份证号15位，取身份证号最后一位 + char c = idNumber.charAt(idNumber.length() - 1); + gender = Integer.parseInt(String.valueOf(c)); + } + System.out.println("gender = " + gender); + if(gender % 2 == 1){ + return "男"; + }else{ + return "女"; + } + } + /** + * 根据身份证的号码算出当前身份证持有者的年龄 + * + * @return + */ + public static int countAge(String idNumber) { + if(idNumber.length() != 18 && idNumber.length() != 15){ + throw new IllegalArgumentException("身份证号长度错误"); + } + String year; + String yue; + String day; + if(idNumber.length() == 18){ + year = idNumber.substring(6).substring(0, 4);// 得到年份 + yue = idNumber.substring(10).substring(0, 2);// 得到月份 + day = idNumber.substring(12).substring(0,2);//得到日 + }else{ + year = "19" + idNumber.substring(6, 8);// 年份 + yue = idNumber.substring(8, 10);// 月份 + day = idNumber.substring(10, 12);//日 + } + Date date = new Date();// 得到当前的系统时间 + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); + String fyear = format.format(date).substring(0, 4);// 当前年份 + String fyue = format.format(date).substring(5, 7);// 月份 + String fday=format.format(date).substring(8,10);// + int age = 0; + if(Integer.parseInt(yue) == Integer.parseInt(fyue)){//如果月份相同 + if(Integer.parseInt(day) <= Integer.parseInt(fday)){//说明已经过了生日或者今天是生日 + age = Integer.parseInt(fyear) - Integer.parseInt(year); + } + }else{ + + if(Integer.parseInt(yue) < Integer.parseInt(fyue)){ + //如果当前月份大于出生月份 + age = Integer.parseInt(fyear) - Integer.parseInt(year); + }else{ + //如果当前月份小于出生月份,说明生日还没过 + age = Integer.parseInt(fyear) - Integer.parseInt(year) - 1; + } + } + System.out.println("age = " + age); + return age; + } + +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/util/MultiThreadUtil.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/util/MultiThreadUtil.java new file mode 100644 index 0000000..4cf2ece --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/util/MultiThreadUtil.java @@ -0,0 +1,132 @@ +package org.jeecg.modules.system.util;//package org.jeecg.modules.system.util; +// +//import java.util.ArrayList; +//import java.util.List; +//import java.util.concurrent.*; +// +///** +// * @param 为被处理的数据类型 +// * @param 返回数据类型 +// */ +//public abstract class MultiThreadUtil{ +// private final ExecutorService exec; //线程池 +// private final BlockingQueue> queue = new LinkedBlockingQueue<>(); +// private final CountDownLatch startLock = new CountDownLatch(1); //启动门，当所有线程就绪时调用countDown +// private final CountDownLatch endLock; //结束门 +// private final List listData;//被处理的数据 +// +// +// /** +// * @param list list.size()为多少个线程处理，list里面的H为被处理的数据 +// */ +// public MultiThreadUtil(List list){ +// if(list!=null&&list.size()>0){ +// this.listData = list; +// exec = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors()); //创建线程池，线程池共有nThread个线程 +// endLock = new CountDownLatch(list.size()); //设置结束门计数器，当一个线程结束时调用countDown +// }else{ +// listData = null; +// exec = null; +// endLock = null; +// } +// } +// +// /** +// * +// * @return 获取每个线程处理结速的数组 +// * @throws InterruptedException +// * @throws ExecutionException +// */ +// public List getResult() throws InterruptedException, ExecutionException{ +// List resultList = new ArrayList<>(); +// if(listData!=null&&listData.size()>0){ +// int nThread = listData.size(); //线程数量 +// for(int i = 0; i < nThread; i++){ +// H data = listData.get(i); +// Future future = exec.submit(new Task(i,data){ +// @Override +// public T execute(int currentThread,H data) { +// return outExecute(currentThread,data); +// } +// }); //将任务提交到线程池 +// queue.add(future); //将Future实例添加至队列 +// } +// startLock.countDown(); //所有任务添加完毕，启动门计数器减1，这时计数器为0，所有添加的任务开始执行 +// endLock.await(); //主线程阻塞，直到所有线程执行完成 +// for(Future future : queue) { +// resultList.add(future.get()); +// } +// exec.shutdown(); //关闭线程池 +// } +// return resultList; +// } +// /** +// * 每一个线程执行的功能，需要调用者来实现 +// * @param currentThread 线程号 +// * @param data 每个线程被处理的数据 +// * @return T返回对象 +// */ +// public abstract T outExecute(int currentThread,H data); +// +// /** +// * 线程类 +// */ +// private abstract class Task implements Callable{ +// private int currentThread;//当前线程号 +// private H data; +// public Task(int currentThread,H data){ +// this.currentThread=currentThread; +// this.data=data; +// } +// @Override +// public T call() throws Exception { +// startLock.await(); //线程启动后调用await，当前线程阻塞，只有启动门计数器为0时当前线程才会往下执行 +// T t =null; +// try{ +// t = execute(currentThread,data); +// }finally{ +// endLock.countDown(); //线程执行完毕，结束门计数器减1 +// } +// return t; +// } +// +// /** +// * 每一个线程执行的功能 +// * @param currentThread 线程号 +// * @param data 每个线程被处理的数据 +// * @return T返回对象 +// */ +// public abstract T execute(int currentThread,H data); +// } +// +// +// +//} +// + + +import com.google.common.util.concurrent.ThreadFactoryBuilder; + +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; + +public class MultiThreadUtil { + + public static ThreadPoolExecutor createThread(int runSize) + { + ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() + .setNameFormat("测试信息").build();//创建线程工厂 + + //创建线程池 + ThreadPoolExecutor executor = new ThreadPoolExecutor(runSize, + runSize, + 0L, + TimeUnit.MILLISECONDS, + new LinkedBlockingQueue<>(1024), + namedThreadFactory, + new ThreadPoolExecutor.AbortPolicy()); + return executor; + } +} \ No newline at end of file diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/FamilyVo.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/FamilyVo.java new file mode 100644 index 0000000..243d4be --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/FamilyVo.java @@ -0,0 +1,54 @@ +package org.jeecg.modules.system.vo; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; + +import java.io.Serializable; + +/** + * @Description: + * @Author: jeecg-boot + * @Date: 2022-07-14 + * @Version: V1.0 + */ +@Data +@TableName("ga_household") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="ga_household对象", description="ga_household") +public class FamilyVo implements Serializable { + private static final long serialVersionUID = 1L; + + /**姓名*/ + @Excel(name = "姓名", width = 15) + @ApiModelProperty(value = "姓名") + private String name; + /**身份证号*/ + @Excel(name = "身份证号", width = 15) + @ApiModelProperty(value = "身份证号") + private String identity; + /**户号*/ + @Excel(name = "户号", width = 15) + @ApiModelProperty(value = "户号") + private String householdNum; + /**人员编号*/ + @Excel(name = "人员编号", width = 15) + @ApiModelProperty(value = "人员编号") + private String num; + /**行政区划*/ + @Excel(name = "行政区划", width = 15) + @ApiModelProperty(value = "行政区划") + private String division; + @Excel(name = "与户主的关系", width = 15) + @ApiModelProperty(value = "与户主的关系") + private String relation; + @Excel(name = "现住址", width = 15) + @ApiModelProperty(value = "现住址") + private String address; + +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/GaPunishVo.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/GaPunishVo.java new file mode 100644 index 0000000..020bb62 --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/GaPunishVo.java @@ -0,0 +1,41 @@ +package org.jeecg.modules.system.vo; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; + +import java.io.Serializable; + +/** + * @Description: 公安_行政处罚打处人员信息 + * @Author: jeecg-boot + * @Date: 2022-07-14 + * @Version: V1.0 + */ +@Data +@TableName("ga_punish") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="ga_punish对象", description="ga_punish") +public class GaPunishVo implements Serializable { + private static final long serialVersionUID = 1L; + + /**身份证号*/ + @Excel(name = "身份证号", width = 15) + @ApiModelProperty(value = "身份证号") + private String dxsfzh; + /**案件名称*/ + @Excel(name = "案件名称", width = 15) + @ApiModelProperty(value = "案件名称") + private String ajmc; + /**sldwmc*/ + @Excel(name = "sldwmc", width = 15) + @ApiModelProperty(value = "sldwmc") + private String sldwmc; +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/MinorPage.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/MinorPage.java new file mode 100644 index 0000000..808fd05 --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/MinorPage.java @@ -0,0 +1,109 @@ +package org.jeecg.modules.system.vo; + +import java.util.List; +import lombok.Data; +import org.jeecg.modules.system.entity.Family; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecgframework.poi.excel.annotation.ExcelEntity; +import org.jeecgframework.poi.excel.annotation.ExcelCollection; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import java.util.Date; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * @Description: 未成年人 + * @Author: jeecg-boot + * @Date: 2022-07-13 + * @Version: V1.0 + */ +@Data +@ApiModel(value="mr_minorPage对象", description="未成年人") +public class MinorPage { + + /**主键*/ + @ApiModelProperty(value = "主键") + private String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + @Dict(dictTable ="sys_depart",dicText = "depart_name",dicCode = "id") + private String sysOrgCode; + /**姓名*/ + @Excel(name = "姓名", width = 15) + @ApiModelProperty(value = "姓名") + private String name; + /**性别*/ + @Excel(name = "性别", width = 15,dicCode = "sex") + @ApiModelProperty(value = "性别") + @Dict(dicCode = "sex") + private Integer gender; + /**家庭住址*/ + @Excel(name = "家庭住址", width = 15) + @ApiModelProperty(value = "家庭住址") + private String address; + /**身份证号*/ + @Excel(name = "身份证号", width = 15) + @ApiModelProperty(value = "身份证号") + private String identity; + /**重点关注原因*/ + @Excel(name = "重点关注原因", width = 15) + @ApiModelProperty(value = "重点关注原因") + private String reason; + /**备注*/ + @Excel(name = "备注", width = 15) + @ApiModelProperty(value = "备注") + private String remark; + + /** + * 监护人 + */ + @Excel(name = "监护人", width = 15) + @ApiModelProperty(value = "监护人") + private String guardian; + + /**是否失学*/ + @Excel(name = "是否失学", width = 15,dicCode = "school_status") + @ApiModelProperty(value = "是否失学") + @Dict(dicCode = "school_status") + private Integer school; + + /** + * 监护人关系 + */ + @Excel(name = "监护人关系", width = 15) + @ApiModelProperty(value = "监护人关系") + private String relation; + + /**人员编号*/ + @Excel(name = "人员编号", width = 15) + @ApiModelProperty(value = "人员编号") + private String number; + + /**户号*/ + @Excel(name = "户号", width = 15) + @ApiModelProperty(value = "户号") + private String householdNum; + + @ExcelCollection(name="家庭成员表") + @ApiModelProperty(value = "家庭成员表") + private List familyList; + +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/SpecialStudentVo.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/SpecialStudentVo.java new file mode 100644 index 0000000..5e3d59b --- /dev/null +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/SpecialStudentVo.java @@ -0,0 +1,44 @@ +package org.jeecg.modules.system.vo; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; + +import java.io.Serializable; + +/** + * @Description: mr_special_student + * @Author: jeecg-boot + * @Date: 2022-07-14 + * @Version: V1.0 + */ +@Data +@TableName("mr_special_student") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="mr_special_student对象", description="mr_special_student") +public class SpecialStudentVo implements Serializable { + private static final long serialVersionUID = 1L; + /**school*/ + @Excel(name = "school", width = 15) + @ApiModelProperty(value = "school") + private String school; + /**identity*/ + @Excel(name = "identity", width = 15) + @ApiModelProperty(value = "identity") + private String identity; + /**原因*/ + @Excel(name = "区域", width = 15) + @ApiModelProperty(value = "区域") + private String reason; + /**备注*/ + @Excel(name = "备注", width = 15) + @ApiModelProperty(value = "备注") + private String remark; +} diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/target/classes/org/jeecg/modules/quartz/controller/QuartzJobController.class b/juvenile-prosecution-boot/jeecg-boot-module-system/target/classes/org/jeecg/modules/quartz/controller/QuartzJobController.class index a680d4a..b3efb06 100644 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/target/classes/org/jeecg/modules/quartz/controller/QuartzJobController.class +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/target/classes/org/jeecg/modules/quartz/controller/QuartzJobController.class diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/target/classes/org/jeecg/modules/system/controller/CommonController.class b/juvenile-prosecution-boot/jeecg-boot-module-system/target/classes/org/jeecg/modules/system/controller/CommonController.class index 355e198..de6b3d0 100644 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/target/classes/org/jeecg/modules/system/controller/CommonController.class +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/target/classes/org/jeecg/modules/system/controller/CommonController.class diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/target/classes/org/jeecg/modules/system/controller/SysAnnouncementController.class b/juvenile-prosecution-boot/jeecg-boot-module-system/target/classes/org/jeecg/modules/system/controller/SysAnnouncementController.class index 0e78535..50ad86a 100644 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/target/classes/org/jeecg/modules/system/controller/SysAnnouncementController.class +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/target/classes/org/jeecg/modules/system/controller/SysAnnouncementController.class diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/target/classes/org/jeecg/modules/system/controller/SysCategoryController.class b/juvenile-prosecution-boot/jeecg-boot-module-system/target/classes/org/jeecg/modules/system/controller/SysCategoryController.class index eaf9d52..1da9ded 100644 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/target/classes/org/jeecg/modules/system/controller/SysCategoryController.class +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/target/classes/org/jeecg/modules/system/controller/SysCategoryController.class diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/target/classes/org/jeecg/modules/system/controller/SysDepartController.class b/juvenile-prosecution-boot/jeecg-boot-module-system/target/classes/org/jeecg/modules/system/controller/SysDepartController.class index 77af9d8..0e42e24 100644 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/target/classes/org/jeecg/modules/system/controller/SysDepartController.class +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/target/classes/org/jeecg/modules/system/controller/SysDepartController.class diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/target/classes/org/jeecg/modules/system/controller/SysDictController.class b/juvenile-prosecution-boot/jeecg-boot-module-system/target/classes/org/jeecg/modules/system/controller/SysDictController.class index a8bd921..4ed09ff 100644 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/target/classes/org/jeecg/modules/system/controller/SysDictController.class +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/target/classes/org/jeecg/modules/system/controller/SysDictController.class diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/target/classes/org/jeecg/modules/system/controller/SysPositionController.class b/juvenile-prosecution-boot/jeecg-boot-module-system/target/classes/org/jeecg/modules/system/controller/SysPositionController.class index 6e8c8d0..f7c5f76 100644 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/target/classes/org/jeecg/modules/system/controller/SysPositionController.class +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/target/classes/org/jeecg/modules/system/controller/SysPositionController.class diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/target/classes/org/jeecg/modules/system/controller/SysRoleController.class b/juvenile-prosecution-boot/jeecg-boot-module-system/target/classes/org/jeecg/modules/system/controller/SysRoleController.class index 382d605..8c92133 100644 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/target/classes/org/jeecg/modules/system/controller/SysRoleController.class +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/target/classes/org/jeecg/modules/system/controller/SysRoleController.class diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/target/classes/org/jeecg/modules/system/controller/SysUserAgentController.class b/juvenile-prosecution-boot/jeecg-boot-module-system/target/classes/org/jeecg/modules/system/controller/SysUserAgentController.class index 6094a18..02a4d40 100644 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/target/classes/org/jeecg/modules/system/controller/SysUserAgentController.class +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/target/classes/org/jeecg/modules/system/controller/SysUserAgentController.class diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/target/classes/org/jeecg/modules/system/controller/SysUserController.class b/juvenile-prosecution-boot/jeecg-boot-module-system/target/classes/org/jeecg/modules/system/controller/SysUserController.class index 091ce16..0fb83f2 100644 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/target/classes/org/jeecg/modules/system/controller/SysUserController.class +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/target/classes/org/jeecg/modules/system/controller/SysUserController.class diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/target/classes/org/jeecg/modules/system/entity/SysDepart.class b/juvenile-prosecution-boot/jeecg-boot-module-system/target/classes/org/jeecg/modules/system/entity/SysDepart.class index becfbe4..951dcdd 100644 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/target/classes/org/jeecg/modules/system/entity/SysDepart.class +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/target/classes/org/jeecg/modules/system/entity/SysDepart.class diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/target/classes/org/jeecg/modules/system/model/SysDepartTreeModel.class b/juvenile-prosecution-boot/jeecg-boot-module-system/target/classes/org/jeecg/modules/system/model/SysDepartTreeModel.class index 5dd4413..e8c35b6 100644 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/target/classes/org/jeecg/modules/system/model/SysDepartTreeModel.class +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/target/classes/org/jeecg/modules/system/model/SysDepartTreeModel.class diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/target/classes/org/jeecg/modules/system/service/impl/SysBaseApiImpl.class b/juvenile-prosecution-boot/jeecg-boot-module-system/target/classes/org/jeecg/modules/system/service/impl/SysBaseApiImpl.class index 1d8e92a..862efb2 100644 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/target/classes/org/jeecg/modules/system/service/impl/SysBaseApiImpl.class +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/target/classes/org/jeecg/modules/system/service/impl/SysBaseApiImpl.class diff --git a/juvenile-prosecution-vue/public/index.html b/juvenile-prosecution-vue/public/index.html index 79a6cab..ca90ba7 100644 --- a/juvenile-prosecution-vue/public/index.html +++ b/juvenile-prosecution-vue/public/index.html @@ -5,7 +5,7 @@ - Boot平台 + 阳新检察大数据平台 + \ No newline at end of file diff --git a/juvenile-prosecution-vue/src/views/business/MinorList.vue b/juvenile-prosecution-vue/src/views/business/MinorList.vue new file mode 100644 index 0000000..46ddbc2 --- /dev/null +++ b/juvenile-prosecution-vue/src/views/business/MinorList.vue @@ -0,0 +1,229 @@ + + + + \ No newline at end of file diff --git a/juvenile-prosecution-vue/src/views/business/SourceList.vue b/juvenile-prosecution-vue/src/views/business/SourceList.vue new file mode 100644 index 0000000..08c07e7 --- /dev/null +++ b/juvenile-prosecution-vue/src/views/business/SourceList.vue @@ -0,0 +1,123 @@ + + + + \ No newline at end of file diff --git a/juvenile-prosecution-vue/src/views/business/SourceStatistics.vue b/juvenile-prosecution-vue/src/views/business/SourceStatistics.vue new file mode 100644 index 0000000..3fe1edd --- /dev/null +++ b/juvenile-prosecution-vue/src/views/business/SourceStatistics.vue @@ -0,0 +1,131 @@ + + + + \ No newline at end of file diff --git a/juvenile-prosecution-vue/src/views/business/modules/DivisionModal.vue b/juvenile-prosecution-vue/src/views/business/modules/DivisionModal.vue new file mode 100644 index 0000000..eec504d --- /dev/null +++ b/juvenile-prosecution-vue/src/views/business/modules/DivisionModal.vue @@ -0,0 +1,172 @@ + + + \ No newline at end of file diff --git a/juvenile-prosecution-vue/src/views/business/modules/MinorModal.vue b/juvenile-prosecution-vue/src/views/business/modules/MinorModal.vue new file mode 100644 index 0000000..fae20ed --- /dev/null +++ b/juvenile-prosecution-vue/src/views/business/modules/MinorModal.vue @@ -0,0 +1,349 @@ + + + + + \ No newline at end of file diff --git a/juvenile-prosecution-vue/src/views/system/DepartList.vue b/juvenile-prosecution-vue/src/views/system/DepartList.vue index b6ce4d7..f30c9fd 100644 --- a/juvenile-prosecution-vue/src/views/system/DepartList.vue +++ b/juvenile-prosecution-vue/src/views/system/DepartList.vue @@ -76,9 +76,9 @@ - + - + - - - + + + + + @@ -130,11 +117,11 @@ - 请先选择一个部门! + 请先选择一个机构! - + @@ -156,15 +143,20 @@ dataIndex: 'departName' }, { - title: '机构类型', - align: 'center', - dataIndex: 'orgType' - }, - { title: '机构编码', dataIndex: 'orgCode', }, { + title:'常用名称', + align:"left", + dataIndex: 'abbreviation' + }, + { + title:'常用编码', + align:"left", + dataIndex: 'commonCode' + }, + { title: '手机号', dataIndex: 'mobile' }, @@ -550,7 +542,7 @@ } } //---- author:os_chengtgen -- date:20190827 -- for:切换父子勾选模式 =======------ - + }, created() { this.currFlowId = this.$route.params.id diff --git a/juvenile-prosecution-vue/src/views/system/UserList.vue b/juvenile-prosecution-vue/src/views/system/UserList.vue index 3cdf383..41499eb 100644 --- a/juvenile-prosecution-vue/src/views/system/UserList.vue +++ b/juvenile-prosecution-vue/src/views/system/UserList.vue @@ -93,6 +93,7 @@ + 数据分析 @@ -184,7 +185,7 @@