From 7cb207ce2f773d2364b7809a4097aac8098cd3ec Mon Sep 17 00:00:00 2001 From: Ivanyany <754339948@qq.com> Date: Mon, 31 Aug 2020 13:54:51 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9F=9B=E7=9B=BE=E7=BA=A0=E7=BA=B7=E5=8C=96?= =?UTF-8?q?=E8=A7=A3=E6=95=B0=E6=8D=AE=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 7 + .../ConflictDisputeResolveController.java | 40 ++++ .../entity/ConflictDisputeResolve.java | 154 ++++++++++++++ .../pzhdata/excel/ConflictExcelData.java | 106 ++++++++++ .../pzhdata/excel/ConflictExcelListener.java | 197 ++++++++++++++++++ .../mapper/ConflictDisputeResolveMapper.java | 15 ++ .../ConflictDisputeResolveService.java | 12 ++ .../ConflictDisputeResolveServiceImpl.java | 37 ++++ .../server/pzhdata/utils/CommonResult.java | 92 ++++++++ .../server/pzhdata/utils/IvanTool.java | 23 ++ src/main/resources/application.yml | 15 +- .../mapper/ConflictDisputeResolveMapper.xml | 67 ++++++ 12 files changed, 762 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/hncy/datatrans/server/pzhdata/controller/ConflictDisputeResolveController.java create mode 100644 src/main/java/com/hncy/datatrans/server/pzhdata/entity/ConflictDisputeResolve.java create mode 100644 src/main/java/com/hncy/datatrans/server/pzhdata/excel/ConflictExcelData.java create mode 100644 src/main/java/com/hncy/datatrans/server/pzhdata/excel/ConflictExcelListener.java create mode 100644 src/main/java/com/hncy/datatrans/server/pzhdata/mapper/ConflictDisputeResolveMapper.java create mode 100644 src/main/java/com/hncy/datatrans/server/pzhdata/service/ConflictDisputeResolveService.java create mode 100644 src/main/java/com/hncy/datatrans/server/pzhdata/service/impl/ConflictDisputeResolveServiceImpl.java create mode 100644 src/main/java/com/hncy/datatrans/server/pzhdata/utils/CommonResult.java create mode 100644 src/main/java/com/hncy/datatrans/server/pzhdata/utils/IvanTool.java create mode 100644 src/main/resources/mapper/ConflictDisputeResolveMapper.xml diff --git a/pom.xml b/pom.xml index 0697489..93a9c32 100644 --- a/pom.xml +++ b/pom.xml @@ -34,6 +34,13 @@ spring-boot-starter-actuator + + + com.alibaba + easyexcel + 2.1.1 + + org.mybatis.spring.boot diff --git a/src/main/java/com/hncy/datatrans/server/pzhdata/controller/ConflictDisputeResolveController.java b/src/main/java/com/hncy/datatrans/server/pzhdata/controller/ConflictDisputeResolveController.java new file mode 100644 index 0000000..562c1ac --- /dev/null +++ b/src/main/java/com/hncy/datatrans/server/pzhdata/controller/ConflictDisputeResolveController.java @@ -0,0 +1,40 @@ +package com.hncy.datatrans.server.pzhdata.controller; + +import com.hncy.datatrans.server.pzhdata.service.ConflictDisputeResolveService; +import com.hncy.datatrans.server.pzhdata.utils.CommonResult; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; + +/** + * @Author Ivan + * @Description 矛盾纠纷化解controller + * @Date 2020/8/25 11:21 + */ +@RestController +@RequestMapping("/conflict") +@CrossOrigin +public class ConflictDisputeResolveController { + + @Autowired + ConflictDisputeResolveService conflictDisputeResolveService; + + /** + * @Author Ivan + * @Description 导入excel中的矛盾纠纷数据到数据库中 + * @Date 2020/8/25 11:23 + * @Param + * @return + */ + @PostMapping("addConflict") + @ApiOperation(value = "导入excel中的矛盾纠纷数据到数据库中") + public CommonResult addConflict(MultipartFile file) { + //上传过来excel文件 + conflictDisputeResolveService.addConflict(file, conflictDisputeResolveService); + return CommonResult.success(); + } +} diff --git a/src/main/java/com/hncy/datatrans/server/pzhdata/entity/ConflictDisputeResolve.java b/src/main/java/com/hncy/datatrans/server/pzhdata/entity/ConflictDisputeResolve.java new file mode 100644 index 0000000..179c0b4 --- /dev/null +++ b/src/main/java/com/hncy/datatrans/server/pzhdata/entity/ConflictDisputeResolve.java @@ -0,0 +1,154 @@ +package com.hncy.datatrans.server.pzhdata.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; +import java.util.Date; + +/** + * @Author Ivan + * @Description 矛盾纠纷化实体类 + * @Date 2020/6/3 12:02 + * @Param + * @return + */ +@Table(name = "conflict_dispute_resolve") +@Data +@AllArgsConstructor +@NoArgsConstructor +public class ConflictDisputeResolve { + //主键id + @Id//根据主键删除时需要使用 + @GeneratedValue(strategy = GenerationType.IDENTITY) + @ApiModelProperty(value = "主键id^_^") + private String id; + + @ApiModelProperty(value = "档案编号") + private String fileNo; + + @ApiModelProperty(value = "事件名称") + private String eventName; + + @ApiModelProperty(value = "发生日期（YYYYMMDD）^_^") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date happenDate; + + @ApiModelProperty(value = "所属网格id") + private String areaId; + + @ApiModelProperty(value = "所属网格name") + private String areaName; + + @ApiModelProperty(value = "发生地点^_^") + private String happenAddress; + + @ApiModelProperty(value = "事件规模代码") + private String eventScaleCode; + + @ApiModelProperty(value = "事件规模") + private String eventScale; + + @ApiModelProperty(value = "事件类别代码") + private String eventTypeCode; + + @ApiModelProperty(value = "事件类别^_^") + private String eventType; + + @ApiModelProperty(value = "涉及人数^_^") + private Integer involvePersonNumber; + + @ApiModelProperty(value = "事件简述^_^") + private String eventDescription; + + @ApiModelProperty(value = "涉及单位") + private String involveUnit; + + @ApiModelProperty(value = "主要当事人证件代码") + private String mainPersonCertificateCode; + + @ApiModelProperty(value = "主要当事人证件号码") + private String mainPersonCertificateNumber; + + @ApiModelProperty(value = "主要当事人姓名") + private String mainPersonName; + + @ApiModelProperty(value = "主要当事人性别代码") + private String mainPersonGenderCode; + + @ApiModelProperty(value = "主要当事人性别") + private String mainPersonGender; + + @ApiModelProperty(value = "主要当事人民族代码") + private String mainPersonNationCode; + + @ApiModelProperty(value = "主要当事人民族") + private String mainPersonNation; + + @ApiModelProperty(value = "主要当事人学历代码") + private String mainPersonEducationCode; + + @ApiModelProperty(value = "主要当事人学历") + private String mainPersonEducation; + + @ApiModelProperty(value = "主要当事人人员类别代码") + private String mainPersonTypeCode; + + @ApiModelProperty(value = "主要当事人人员类别") + private String mainPersonType; + + @ApiModelProperty(value = "主要当事人居住详址") + private String mainPersonHouseDetail; + + @ApiModelProperty(value = "化解时限") + private Integer resolveLimit; + + @ApiModelProperty(value = "化解方式代码") + private String resolveTypeCode; + + @ApiModelProperty(value = "化解方式") + private String resolveType; + + @ApiModelProperty(value = "化解组织^_^") + private String resolveOrganization; + + @ApiModelProperty(value = "化解责任人姓名^_^") + private String resolvePersonName; + + @ApiModelProperty(value = "化解责任人联系方式") + private String resolvePersonPhone; + + @ApiModelProperty(value = "化解是否成功（1成功 0失败）^_^") + private Integer isResolveSuccess; + + @ApiModelProperty(value = "化解情况^_^") + private String resolveDescription; + + @ApiModelProperty(value = "考评日期（YYYYMMDD）") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date assessmentDate; + + @ApiModelProperty(value = "考评意见") + private String assessmentOpinion; + + @ApiModelProperty(value = "经度") + private Double longitude; + + @ApiModelProperty(value = "纬度") + private Double latitude; + + @ApiModelProperty(value = "修改时间") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date updateTime; + +} diff --git a/src/main/java/com/hncy/datatrans/server/pzhdata/excel/ConflictExcelData.java b/src/main/java/com/hncy/datatrans/server/pzhdata/excel/ConflictExcelData.java new file mode 100644 index 0000000..c033c68 --- /dev/null +++ b/src/main/java/com/hncy/datatrans/server/pzhdata/excel/ConflictExcelData.java @@ -0,0 +1,106 @@ +package com.hncy.datatrans.server.pzhdata.excel; + +import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author Ivan + * @Description 矛盾纠纷化解excel数据列 + * @String 2020/8/25 10:57 + */ +@Data +public class ConflictExcelData { + + @ApiModelProperty(value = "档案编号") + @ExcelProperty(index = 0) + private String fileNo; + + @ApiModelProperty(value = "纠纷发生地") + @ExcelProperty(index = 1) + private String happenAddress; + + @ApiModelProperty(value = "排查受理单位") + @ExcelProperty(index = 2) + private String involveUnit; + + @ApiModelProperty(value = "排查受理人员") + @ExcelProperty(index = 3) + private String acceptPerson; + + @ApiModelProperty(value = "排查受理时间") + @ExcelProperty(index = 4) + private String acceptDate; + + @ApiModelProperty(value = "纠纷涉及人数") + @ExcelProperty(index = 5) + private String involvePersonNumber; + + @ApiModelProperty(value = "纠纷影响程度") + @ExcelProperty(index = 6) + private String influenceDegree; + + @ApiModelProperty(value = "纠纷类别") + @ExcelProperty(index = 7) + private String eventType; + + @ApiModelProperty(value = "纠纷来源") + @ExcelProperty(index = 8) + private String conflictResource; + + @ApiModelProperty(value = "纠纷简述") + @ExcelProperty(index = 9) + private String eventDescription; + + @ApiModelProperty(value = "工作措施") + @ExcelProperty(index = 10) + private String resolveDescription; + + @ApiModelProperty(value = "纠纷发生时间") + @ExcelProperty(index = 11) + private String happenDate; + + @ApiModelProperty(value = "调解组织") + @ExcelProperty(index = 12) + private String resolveOrganization; + + @ApiModelProperty(value = "主办调解员") + @ExcelProperty(index = 13) + private String resolvePersonName; + + @ApiModelProperty(value = "协办调解员") + @ExcelProperty(index = 14) + private String coResolvePerson; + + @ApiModelProperty(value = "责任领导") + @ExcelProperty(index = 15) + private String responsibleLeader; + + @ApiModelProperty(value = "调解开始时间") + @ExcelProperty(index = 16) + private String resolveBeginTime; + + @ApiModelProperty(value = "调解成功时间") + @ExcelProperty(index = 17) + private String resolveSuccessTime; + + @ApiModelProperty(value = "调解结果") + @ExcelProperty(index = 18) + private String isResolveSuccess; + + @ApiModelProperty(value = "申请人") + @ExcelProperty(index = 19) + private String mainPersonName; + + @ApiModelProperty(value = "被申请人") + @ExcelProperty(index = 20) + private String appliedPerson; + + @ApiModelProperty(value = "申请单位") + @ExcelProperty(index = 21) + private String applyUnit; + + @ApiModelProperty(value = "被申请单位") + @ExcelProperty(index = 22) + private String appliedUnit; +} diff --git a/src/main/java/com/hncy/datatrans/server/pzhdata/excel/ConflictExcelListener.java b/src/main/java/com/hncy/datatrans/server/pzhdata/excel/ConflictExcelListener.java new file mode 100644 index 0000000..217abeb --- /dev/null +++ b/src/main/java/com/hncy/datatrans/server/pzhdata/excel/ConflictExcelListener.java @@ -0,0 +1,197 @@ +package com.hncy.datatrans.server.pzhdata.excel; + +import com.alibaba.excel.context.AnalysisContext; +import com.alibaba.excel.event.AnalysisEventListener; +import com.hncy.datatrans.server.pzhdata.entity.ConflictDisputeResolve; +import com.hncy.datatrans.server.pzhdata.mapper.ConflictDisputeResolveMapper; +import com.hncy.datatrans.server.pzhdata.utils.IvanTool; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; + +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * @Author Ivan + * @Description 矛盾纠纷excel监听器 + * @Date 2020/8/25 11:13 + */ +@Slf4j +public class ConflictExcelListener extends AnalysisEventListener { + + /** + * 每隔1000条存储数据库，实际使用中可以3000条，然后清理list ，方便内存回收 + */ + private static final int BATCH_COUNT = 500; + + //因为ExcelListener不能交给spring进行管理，需要自己new，不能注入其他对象 不能实现数据库操作 + public ConflictDisputeResolveMapper conflictMapper; + + //存储数据 + List dataList = new ArrayList<>(); + + //无参构造函数 + public ConflictExcelListener() {} + //有参构造函数 + public ConflictExcelListener(ConflictDisputeResolveMapper conflictMapper) { + this.conflictMapper = conflictMapper; + } + + //读取excel内容，一行一行进行读取 + @Override + public void invoke(ConflictExcelData conflictExcelData, AnalysisContext analysisContext) { + if(conflictExcelData == null) { + System.out.println("文件数据为空..."); + throw new RuntimeException("文件数据为空..."); + } +// System.out.println(conflictExcelData); + dataList.add(conflictExcelData); + // 达到BATCH_COUNT了，需要去存储一次数据库，防止数据几万条数据在内存，容易OOM + if (dataList.size() >= BATCH_COUNT) { + //保存到数据库 + saveConflict(); + // 存储完成清理 list + dataList.clear(); + } + } + + @Override + public void doAfterAllAnalysed(AnalysisContext analysisContext) { + // 这里也要保存数据，确保最后遗留的数据也存储到数据库 + saveConflict(); + log.info("所有数据解析完成！"); + } + + /** + * 加上存储数据库 + */ + private void saveConflict() { + //日期格式 + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + log.info("{}条数据，开始存储数据库！", dataList.size()); + //处理数据 + if (dataList!=null&&dataList.size()>0){ + List conflicts = new ArrayList<>(); + for (ConflictExcelData data : dataList){ + ConflictDisputeResolve conflict = new ConflictDisputeResolve(); + + //复制相同的字段 + BeanUtils.copyProperties(data,conflict); + + //主键id + conflict.setId(IvanTool.getId()); + //档案编号 + String fileNoData = data.getFileNo(); + if (fileNoData!=null){ + conflict.setFileNo(fileNoData.substring(fileNoData.indexOf("：") + 1)); + } + + try { + //处理特殊类型字段：辖区、Date、int等 + if (data.getHappenDate()!=null){ + Date happenDate = sdf.parse(data.getHappenDate()); + conflict.setHappenDate(happenDate); + } + + //名称 + conflict.setEventName(data.getEventType()); + + //涉及人数 + if (data.getInvolvePersonNumber()!=null){ + conflict.setInvolvePersonNumber(Integer.parseInt(data.getInvolvePersonNumber())); + } + //化解是否成功 + if (data.getIsResolveSuccess()!=null){ + int success = data.getIsResolveSuccess().contains("成功") ? 1 : 0; + conflict.setIsResolveSuccess(success); + } + + //辖区 + String address = data.getHappenAddress(); + if (address!=null){ + String areaId = null; + String areaName = null; + if (address.contains("东区")){ + areaId = "2"; + areaName = "东区"; + } + if (address.contains("西区")){ + areaId = "3"; + areaName = "西区"; + } + if (address.contains("仁和区")){ + areaId = "4"; + areaName = "仁和区"; + } + if (address.contains("米易县")){ + areaId = "5"; + areaName = "米易县"; + } + if (address.contains("盐边县")){ + areaId = "6"; + areaName = "盐边县"; + } + if (address.contains("钒钛")){ + areaId = "7"; + areaName = "钒钛新城"; + } + conflict.setAreaId(areaId); + conflict.setAreaName(areaName); + } + + + //纠纷类别 + String eventType = data.getEventType(); + if (eventType!=null){ + if (eventType.contains("婚姻")){ + conflict.setEventTypeCode("217065"); + } else if (eventType.contains("邻里")){ + conflict.setEventTypeCode("217073"); + } else if (eventType.contains("人格")){ + conflict.setEventTypeCode("217078"); + } else if (eventType.contains("物权")){ + conflict.setEventTypeCode("217083"); + } else if (eventType.contains("侵权")){ + conflict.setEventTypeCode("217088"); + } else if (eventType.contains("合同")){ + conflict.setEventTypeCode("217097"); + } else if (eventType.contains("劳动")){ + conflict.setEventTypeCode("217103"); + } else if (eventType.contains("金融")){ + conflict.setEventTypeCode("217109"); + } else if (eventType.contains("土地")){ + conflict.setEventTypeCode("217115"); + } else if (eventType.contains("民商")){ + conflict.setEventTypeCode("217121"); + } else if (eventType.contains("城乡")){ + conflict.setEventTypeCode("217129"); + } else if (eventType.contains("民政")){ + conflict.setEventTypeCode("217136"); + } else if (eventType.contains("行政")){ + conflict.setEventTypeCode("217141"); + } else if (eventType.contains("诉讼")){ + conflict.setEventTypeCode("217150"); + } else if (eventType.contains("组织")){ + conflict.setEventTypeCode("217155"); + } else if (eventType.contains("民族")){ + conflict.setEventTypeCode("217159"); + } else { +// conflict.setEventType("其他"); + conflict.setEventTypeCode("217162"); + } + } + + } catch (Exception e){ + e.printStackTrace(); + } + + //添加一条数据 + conflicts.add(conflict); + } + int result = conflictMapper.saveConflict(conflicts); + log.info(result + "条数据保存成功！"); + } + } +} diff --git a/src/main/java/com/hncy/datatrans/server/pzhdata/mapper/ConflictDisputeResolveMapper.java b/src/main/java/com/hncy/datatrans/server/pzhdata/mapper/ConflictDisputeResolveMapper.java new file mode 100644 index 0000000..845a66b --- /dev/null +++ b/src/main/java/com/hncy/datatrans/server/pzhdata/mapper/ConflictDisputeResolveMapper.java @@ -0,0 +1,15 @@ +package com.hncy.datatrans.server.pzhdata.mapper; + +import com.hncy.datatrans.server.pzhdata.entity.ConflictDisputeResolve; + +import java.util.List; + +/** + * @Author Ivan + * @Description 矛盾纠纷化解mapper + * @Date 2020/8/25 10:55 + */ +public interface ConflictDisputeResolveMapper { + //保存数据 + int saveConflict(List conflicts); +} diff --git a/src/main/java/com/hncy/datatrans/server/pzhdata/service/ConflictDisputeResolveService.java b/src/main/java/com/hncy/datatrans/server/pzhdata/service/ConflictDisputeResolveService.java new file mode 100644 index 0000000..3a7b12f --- /dev/null +++ b/src/main/java/com/hncy/datatrans/server/pzhdata/service/ConflictDisputeResolveService.java @@ -0,0 +1,12 @@ +package com.hncy.datatrans.server.pzhdata.service; + +import org.springframework.web.multipart.MultipartFile; + +/** + * @Author Ivan + * @Description 矛盾纠纷化解service + * @Date 2020/8/25 11:15 + */ +public interface ConflictDisputeResolveService { + void addConflict(MultipartFile file, ConflictDisputeResolveService conflictDisputeResolveService); +} diff --git a/src/main/java/com/hncy/datatrans/server/pzhdata/service/impl/ConflictDisputeResolveServiceImpl.java b/src/main/java/com/hncy/datatrans/server/pzhdata/service/impl/ConflictDisputeResolveServiceImpl.java new file mode 100644 index 0000000..fd6cc13 --- /dev/null +++ b/src/main/java/com/hncy/datatrans/server/pzhdata/service/impl/ConflictDisputeResolveServiceImpl.java @@ -0,0 +1,37 @@ +package com.hncy.datatrans.server.pzhdata.service.impl; + +import com.alibaba.excel.EasyExcel; +import com.hncy.datatrans.server.pzhdata.excel.ConflictExcelData; +import com.hncy.datatrans.server.pzhdata.excel.ConflictExcelListener; +import com.hncy.datatrans.server.pzhdata.mapper.ConflictDisputeResolveMapper; +import com.hncy.datatrans.server.pzhdata.service.ConflictDisputeResolveService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import java.io.InputStream; + +/** + * @Author Ivan + * @Description 矛盾纠纷化解service实现类 + * @Date 2020/8/25 11:15 + */ +@Service +public class ConflictDisputeResolveServiceImpl implements ConflictDisputeResolveService { + + @Autowired + ConflictDisputeResolveMapper conflictMapper; + + @Override + public void addConflict(MultipartFile file, ConflictDisputeResolveService conflictDisputeResolveService) { + + try { + //文件输入流 + InputStream in = file.getInputStream(); + //调用方法进行读取 + EasyExcel.read(in, ConflictExcelData.class, new ConflictExcelListener(conflictMapper)).sheet().doRead(); + }catch(Exception e){ + e.printStackTrace(); + } + } +} diff --git a/src/main/java/com/hncy/datatrans/server/pzhdata/utils/CommonResult.java b/src/main/java/com/hncy/datatrans/server/pzhdata/utils/CommonResult.java new file mode 100644 index 0000000..a7ec55c --- /dev/null +++ b/src/main/java/com/hncy/datatrans/server/pzhdata/utils/CommonResult.java @@ -0,0 +1,92 @@ +package com.hncy.datatrans.server.pzhdata.utils; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.HashMap; +import java.util.Map; + +/** + * @Author Ivan + * @Description + * @Date 2020/8/25 11:25 + */ +@Data +public class CommonResult { + + @ApiModelProperty(value = "返回码") + private Integer code; + + @ApiModelProperty(value = "返回消息") + private String message; + + @ApiModelProperty(value = "返回数据") + private Map data = new HashMap<>(); + + //把构造方法私有 + private CommonResult() {} + + /** + * @author Ivan + * @date 2020/7/19 22:31 + * @Description: 成功静态方法 + */ + public static CommonResult success() { + CommonResult result = new CommonResult(); + result.setCode(200); + result.setMessage("操作成功!"); + return result; + } + + /** + * @author Ivan + * @date 2020/7/19 22:31 + * @Description: 失败静态方法 + */ + public static CommonResult fail() { + CommonResult result = new CommonResult(); + result.setCode(-1); + result.setMessage("操作失败!"); + return result; + } + + /** + * @author Ivan + * @date 2020/7/19 22:31 + * @Description: 设置返回消息 + */ + public CommonResult message(String message){ + this.setMessage(message); + return this; + } + + /** + * @author Ivan + * @date 2020/7/19 22:31 + * @Description: 设置返回状态码 + */ + public CommonResult code(Integer code){ + this.setCode(code); + return this; + } + + /** + * @author Ivan + * @date 2020/7/19 22:31 + * @Description: 设置返回数据的键值对 + */ + public CommonResult data(String key, Object value){ + this.data.put(key, value); + return this; + } + + /** + * @author Ivan + * @date 2020/7/19 22:31 + * @Description: 设置返回数据 + */ + public CommonResult data(Map map){ + this.setData(map); + return this; + } +} diff --git a/src/main/java/com/hncy/datatrans/server/pzhdata/utils/IvanTool.java b/src/main/java/com/hncy/datatrans/server/pzhdata/utils/IvanTool.java new file mode 100644 index 0000000..286b980 --- /dev/null +++ b/src/main/java/com/hncy/datatrans/server/pzhdata/utils/IvanTool.java @@ -0,0 +1,23 @@ +package com.hncy.datatrans.server.pzhdata.utils; + +import java.util.UUID; + +/** + * @Author Ivan + * @Description 工具类 + * @Date 2020/8/25 15:51 + */ +public class IvanTool { + + /** + * @Author Ivan + * @Description 利用UUID生成主键id + * @Date 2020/8/25 15:51 + * @Param + * @return + */ + public static String getId(){ + return UUID.randomUUID().toString().replace("-", ""); + } + +} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 623b3f9..7947a2d 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -5,19 +5,28 @@ spring: application: name: pzhdata-resource-yxf + servlet: + multipart: + max-file-size: 100MB # 文件上传大小限制为100Mb + max-request-size: 50MB # 请求大小限制为50Mb + # 数据库 datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://172.18.23.15:3306/pzhdata?characterEncoding=utf-8&serverTimezone=GMT%2B8 # GMT%2B8表示北京时间 也可以UTC +# url: jdbc:mysql://172.18.23.15:3306/pzhdata?characterEncoding=utf-8&serverTimezone=GMT%2B8 # GMT%2B8表示北京时间 也可以UTC +# username: root +# password: root + url: jdbc:mysql://192.168.0.242:3306/grid-resource-server?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull username: root - password: root + password: Admin@zfy.123 eureka: client: register-with-eureka: true #是否将自己注册到注册中心,集群必须设置为true配合ribbon fetch-registry: true #是否从服务端抓取已有的注册信息 service-url: - defaultZone: http://127.0.0.1:7001/eureka # 单机版 +# defaultZone: http://127.0.0.1:7001/eureka # 单机版 + defaultZone: http://192.168.0.177:9999/eureka/ # defaultZone: http://eureka7001.com:7001/eureka,http://eureka7002.com:7002/eureka # 集群版 instance: instance-id: pzhdata-yxf #对外显示的名称,隐藏主机名 diff --git a/src/main/resources/mapper/ConflictDisputeResolveMapper.xml b/src/main/resources/mapper/ConflictDisputeResolveMapper.xml new file mode 100644 index 0000000..d509210 --- /dev/null +++ b/src/main/resources/mapper/ConflictDisputeResolveMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO conflict_dispute_resolve VALUES + + ( + #{conflict.id}, #{conflict.fileNo}, #{conflict.eventName}, #{conflict.happenDate},#{conflict.areaId}, #{conflict.areaName}, + #{conflict.happenAddress}, #{conflict.eventScaleCode}, #{conflict.eventScale}, #{conflict.eventTypeCode}, + #{conflict.eventType}, #{conflict.involvePersonNumber}, #{conflict.eventDescription}, #{conflict.involveUnit}, + #{conflict.mainPersonCertificateCode}, #{conflict.mainPersonCertificateNumber},#{conflict.mainPersonName}, + #{conflict.mainPersonGenderCode}, #{conflict.mainPersonGender}, #{conflict.mainPersonNationCode}, + #{conflict.mainPersonNation}, #{conflict.mainPersonEducationCode},#{conflict.mainPersonEducation}, + #{conflict.mainPersonTypeCode}, #{conflict.mainPersonType}, #{conflict.mainPersonHouseDetail}, + #{conflict.resolveLimit}, #{conflict.resolveTypeCode},#{conflict.resolveType}, #{conflict.resolveOrganization}, + #{conflict.resolvePersonName}, #{conflict.resolvePersonPhone}, #{conflict.isResolveSuccess}, + #{conflict.resolveDescription}, #{conflict.assessmentDate}, #{conflict.assessmentOpinion}, #{conflict.longitude}, + #{conflict.latitude}, #{conflict.updateTime} + ) + + + + + \ No newline at end of file -- GitLab