diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/controller/BAdministrativeDivisionController.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/controller/BAdministrativeDivisionController.java index ffb35ee..3cc57d8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/controller/BAdministrativeDivisionController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/controller/BAdministrativeDivisionController.java @@ -1,31 +1,21 @@ package com.ruoyi.programManagement.controller; -import java.util.ArrayList; -import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import com.ruoyi.programManagement.entity.request.BAdministrativeDistrictRequest; -import com.ruoyi.programManagement.entity.request.BAdministrativeTreeRequest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.programManagement.domain.BAdministrativeDivision; +import com.ruoyi.programManagement.entity.request.BAdministrativeDistrictRequest; +import com.ruoyi.programManagement.entity.request.BAdministrativeTreeRequest; import com.ruoyi.programManagement.service.IBAdministrativeDivisionService; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; +import java.util.List; /** * 行政区划Controller diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/controller/BPlanEnterpriseController.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/controller/BPlanEnterpriseController.java index 53c630e..f2bc6d7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/controller/BPlanEnterpriseController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/controller/BPlanEnterpriseController.java @@ -4,7 +4,6 @@ package com.ruoyi.programManagement.controller; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.utils.bean.BeanUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.programManagement.entity.BPlanEnterprise; import com.ruoyi.programManagement.entity.request.BPlanEnterprisePageRequest; @@ -15,13 +14,9 @@ import com.ruoyi.programManagement.entity.response.BPlanEnterPriseTreeResponse; import com.ruoyi.programManagement.entity.response.BPlanEnterpriseResponse; import com.ruoyi.programManagement.entity.response.BPlanEnterpriseZhifaResponse; import com.ruoyi.programManagement.mapper.BPlanEnterpriseMapper; -import com.ruoyi.programManagement.service.BKeyEnterpriseService; import com.ruoyi.programManagement.service.BPlanEnterpriseService; -import com.ruoyi.programManagement.service.IBAdministrativeDivisionService; -import com.ruoyi.programManagement.service.IBAdministrativeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; @@ -162,7 +157,7 @@ public class BPlanEnterpriseController extends BaseController { public void export(HttpServletResponse response, checkResultRequest req) { List list = bPlanEnterpriseMapper.getZhifa(req); ExcelUtil util = new ExcelUtil(BPlanEnterpriseZhifaResponse.class); - util.exportExcel( list, "导出执法结果"); + util.exportExcel(list, "导出执法结果"); } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/controller/SzsAdministrativeDivisionController.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/controller/SzsAdministrativeDivisionController.java index 137c735..2cdf482 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/controller/SzsAdministrativeDivisionController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/controller/SzsAdministrativeDivisionController.java @@ -5,15 +5,12 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.programManagement.entity.SzsAdministrativeDivision; -import com.ruoyi.programManagement.entity.request.BAdministrativeTreeRequest; import com.ruoyi.programManagement.service.ISzsAdministrativeDivisionService; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; import java.util.List; /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/controller/SzsEnterpriseInformationController.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/controller/SzsEnterpriseInformationController.java index 13041cb..5efd8c2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/controller/SzsEnterpriseInformationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/controller/SzsEnterpriseInformationController.java @@ -1,41 +1,29 @@ package com.ruoyi.programManagement.controller; -import java.util.List; -import javax.servlet.http.HttpServletResponse; - +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.programManagement.entity.SzsEnterpriseInformation; +import com.ruoyi.programManagement.service.ISzsEnterpriseInformationService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; +import org.springframework.web.bind.annotation.*; -import com.ruoyi.programManagement.service.ISzsEnterpriseInformationService; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 省-企业基本信息Controller - * + * * @author ruoyi * @date 2023-10-17 */ @Api(tags = "省-企业基本信息") @RestController @RequestMapping("/pharmaceuticals/info") -public class SzsEnterpriseInformationController extends BaseController -{ +public class SzsEnterpriseInformationController extends BaseController { @Autowired private ISzsEnterpriseInformationService szsEnterpriseInformationService; @@ -44,8 +32,7 @@ public class SzsEnterpriseInformationController extends BaseController */ @ApiOperation("查询省-企业基本信息列表") @GetMapping("/list") - public TableDataInfo list(SzsEnterpriseInformation szsEnterpriseInformation) - { + public TableDataInfo list(SzsEnterpriseInformation szsEnterpriseInformation) { startPage(); List list = szsEnterpriseInformationService.selectSzsEnterpriseInformationList(szsEnterpriseInformation); return getDataTable(list); @@ -56,8 +43,7 @@ public class SzsEnterpriseInformationController extends BaseController */ @PostMapping("/export") - public void export(HttpServletResponse response, SzsEnterpriseInformation szsEnterpriseInformation) - { + public void export(HttpServletResponse response, SzsEnterpriseInformation szsEnterpriseInformation) { List list = szsEnterpriseInformationService.selectSzsEnterpriseInformationList(szsEnterpriseInformation); ExcelUtil util = new ExcelUtil(SzsEnterpriseInformation.class); util.exportExcel(response, list, "省-企业基本信息数据"); @@ -68,8 +54,7 @@ public class SzsEnterpriseInformationController extends BaseController */ @GetMapping(value = "/{ID}") - public AjaxResult getInfo(@PathVariable("ID") String ID) - { + public AjaxResult getInfo(@PathVariable("ID") String ID) { return success(szsEnterpriseInformationService.selectSzsEnterpriseInformationByID(ID)); } @@ -78,8 +63,7 @@ public class SzsEnterpriseInformationController extends BaseController */ @PostMapping - public AjaxResult add(@RequestBody SzsEnterpriseInformation szsEnterpriseInformation) - { + public AjaxResult add(@RequestBody SzsEnterpriseInformation szsEnterpriseInformation) { return toAjax(szsEnterpriseInformationService.insertSzsEnterpriseInformation(szsEnterpriseInformation)); } @@ -88,8 +72,7 @@ public class SzsEnterpriseInformationController extends BaseController */ @PutMapping - public AjaxResult edit(@RequestBody SzsEnterpriseInformation szsEnterpriseInformation) - { + public AjaxResult edit(@RequestBody SzsEnterpriseInformation szsEnterpriseInformation) { return toAjax(szsEnterpriseInformationService.updateSzsEnterpriseInformation(szsEnterpriseInformation)); } @@ -97,9 +80,8 @@ public class SzsEnterpriseInformationController extends BaseController * 删除省-企业基本信息 */ - @DeleteMapping("/{IDs}") - public AjaxResult remove(@PathVariable String[] IDs) - { + @DeleteMapping("/{IDs}") + public AjaxResult remove(@PathVariable String[] IDs) { return toAjax(szsEnterpriseInformationService.deleteSzsEnterpriseInformationByIDs(IDs)); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/controller/UserController.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/controller/UserController.java index f9d594e..9209b40 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/controller/UserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/controller/UserController.java @@ -6,7 +6,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import springfox.documentation.service.ResponseMessage; /** * @Project: emergency-management2 @@ -28,7 +27,7 @@ public class UserController { @ApiOperation(value = "获取用户信息", notes = "根据code获取用户信息") @GetMapping("/getUserInfo") - public AjaxResult getAllGeoLayers(@RequestParam String code) { + public AjaxResult getAllGeoLayers(@RequestParam String code) { return AjaxResult.success(userService.getUserByCode(code)); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/BEnterpriseNew.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/BEnterpriseNew.java index cb38d19..fa25bf3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/BEnterpriseNew.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/BEnterpriseNew.java @@ -1,15 +1,11 @@ package com.ruoyi.programManagement.entity; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import java.util.Date; @@ -109,5 +105,4 @@ public class BEnterpriseNew { private Long deptId; - } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/BKeyEnterprise.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/BKeyEnterprise.java index 1c3e5b8..0b3d1af 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/BKeyEnterprise.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/BKeyEnterprise.java @@ -2,15 +2,11 @@ package com.ruoyi.programManagement.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; -import javax.validation.Valid; import java.io.Serializable; import java.util.Date; @@ -111,6 +107,5 @@ public class BKeyEnterprise implements Serializable { private String enterpriseName; - } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/BPlanEnterprise.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/BPlanEnterprise.java index 370dbcd..827ae23 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/BPlanEnterprise.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/BPlanEnterprise.java @@ -4,16 +4,13 @@ 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 com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; -import java.io.Serializable; import java.util.Date; @@ -26,7 +23,7 @@ import java.util.Date; @Data @ApiModel("计划企业表实体类") @TableName("b_plan_enterprise") -public class BPlanEnterprise { +public class BPlanEnterprise { private static final long serialVersionUID = -98531345456142440L; /** @@ -169,7 +166,7 @@ public class BPlanEnterprise { /** * 0:草稿 1:正式 */ - @Excel(name = "状态",readConverterExp = "0=草稿,1=正式") + @Excel(name = "状态", readConverterExp = "0=草稿,1=正式") @ApiModelProperty(value = "0:草稿 1:正式") private Integer status; @@ -188,7 +185,6 @@ public class BPlanEnterprise { private Long lawSort; - /** * 0:未检查 1:已检查 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/DictData.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/DictData.java index 25f61ab..c229a4f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/DictData.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/DictData.java @@ -8,52 +8,69 @@ import lombok.Data; /** * 字典数据表 - * + * * @author ruoyi */ @Data @ApiModel("字典数据实体类") -public class DictData -{ +public class DictData { private static final long serialVersionUID = 1L; - /** 字典编码 */ + /** + * 字典编码 + */ @ApiModelProperty(value = "字典编码") @Excel(name = "字典编码", cellType = Excel.ColumnType.NUMERIC) private Long dictCode; - /** 字典排序 */ + /** + * 字典排序 + */ @ApiModelProperty(value = "字典排序") @Excel(name = "字典排序", cellType = Excel.ColumnType.NUMERIC) private Long dictSort; - /** 字典标签 */ + /** + * 字典标签 + */ @ApiModelProperty(value = "字典标签") @Excel(name = "字典标签") private String dictLabel; - /** 字典键值 */ + /** + * 字典键值 + */ @Excel(name = "字典键值") @ApiModelProperty(value = "字典键值") private String dictValue; - /** 字典类型 */ + /** + * 字典类型 + */ @Excel(name = "字典类型") @ApiModelProperty(value = "字典类型") private String dictType; - /** 样式属性(其他样式扩展) */ + /** + * 样式属性(其他样式扩展) + */ private String cssClass; - /** 表格字典样式 */ + /** + * 表格字典样式 + */ private String listClass; - /** 是否默认(Y是 N否) */ + /** + * 是否默认(Y是 N否) + */ @Excel(name = "是否默认", readConverterExp = "Y=是,N=否") private String isDefault; - /** 状态(0正常 1停用) */ + /** + * 状态(0正常 1停用) + */ @Excel(name = "状态", readConverterExp = "0=正常,1=停用") private String status; @@ -61,5 +78,5 @@ public class DictData /** * 字典数组 */ - private String[] dictTypes; + private String[] dictTypes; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/GeoLayer.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/GeoLayer.java index 0790099..d35bdd5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/GeoLayer.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/GeoLayer.java @@ -15,7 +15,7 @@ import java.math.BigDecimal; /** *

- * + * *

* * @author Jason @@ -25,7 +25,7 @@ import java.math.BigDecimal; @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) @TableName("ent_geo_layer") -@ApiModel(value="GeoLayer对象", description="") +@ApiModel(value = "GeoLayer对象", description = "") public class GeoLayer implements Serializable { private static final long serialVersionUID = 1L; @@ -109,6 +109,6 @@ public class GeoLayer implements Serializable { private String shape; @ApiModelProperty(value = "空间字符串") - @TableField(value = "shape_str",exist = false) + @TableField(value = "shape_str", exist = false) private String shapeStr; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/SzEnforExamine.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/SzEnforExamine.java index fe96460..9dbd5cb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/SzEnforExamine.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/SzEnforExamine.java @@ -1,6 +1,5 @@ package com.ruoyi.programManagement.entity; -import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; @@ -9,135 +8,184 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; +import java.util.Date; + /** * 现场检查记录对象 sz_enfor_examine - * + * * @author ruoyi * @date 2023-09-26 */ @Data @ApiModel("现场检查记录对象") -public class SzEnforExamine extends BaseEntity -{ +public class SzEnforExamine extends BaseEntity { private static final long serialVersionUID = 1L; - /** $column.columnComment */ + /** + * $column.columnComment + */ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") private Date dmsTimestamp; - /** ID */ + /** + * ID + */ @ApiModelProperty(value = "ID") private String ID; - /** 检查方案id */ + /** + * 检查方案id + */ @Excel(name = "检查方案id") @ApiModelProperty(value = "检查方案id") private String planExamineId; - /** 企业名称 */ + /** + * 企业名称 + */ @Excel(name = "企业名称") @ApiModelProperty(value = "企业名称") private String entprName; - /** 统一社会信用代码 */ + /** + * 统一社会信用代码 + */ @Excel(name = "统一社会信用代码") @ApiModelProperty(value = "统一社会信用代码") private String uscCode; - /** 检查场所 */ + /** + * 检查场所 + */ @Excel(name = "检查场所") @ApiModelProperty(value = "检查场所") private String examineSite; - /** 检查来源 */ + /** + * 检查来源 + */ @Excel(name = "检查来源") @ApiModelProperty(value = "检查来源") private String examineSource; - /** 检查开始时间 */ + /** + * 检查开始时间 + */ @JsonFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "检查开始时间") @Excel(name = "检查开始时间", width = 30, dateFormat = "yyyy-MM-dd") private Date examineStartTime; - /** 检查结束时间 */ + /** + * 检查结束时间 + */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "检查结束时间", width = 30, dateFormat = "yyyy-MM-dd") @ApiModelProperty(value = "检查结束时间") private Date examineEndTime; - /** 检查人员id */ + /** + * 检查人员id + */ @ApiModelProperty(value = "检查人员id") @Excel(name = "检查人员id") private String executorId; - /** 检查情况 */ + /** + * 检查情况 + */ @Excel(name = "检查情况") @ApiModelProperty(value = "检查情况") private String examineSituation; - /** 文书文号 */ + /** + * 文书文号 + */ @Excel(name = "文书文号") @ApiModelProperty(value = "文书文号") private String writNo; - /** 文书类型 */ + /** + * 文书类型 + */ @Excel(name = "文书类型") @ApiModelProperty(value = "文书类型") private String typeCode; - /** 现场证据附件 */ + /** + * 现场证据附件 + */ @Excel(name = "现场证据附件") @ApiModelProperty(value = "现场证据附件") private String EVIDENCE; - /** 执法部门 */ + /** + * 执法部门 + */ @Excel(name = "执法部门") @ApiModelProperty(value = "执法部门") private String executorDept; - /** 执法部门代码 */ + /** + * 执法部门代码 + */ @ApiModelProperty(value = "执法部门代码") @Excel(name = "执法部门代码") private String executorDeptCode; - /** 检查方式 */ + /** + * 检查方式 + */ @Excel(name = "检查方式") @ApiModelProperty(value = "检查方式") private String examineType; - /** 是否是三年专项 */ + /** + * 是否是三年专项 + */ @ApiModelProperty(value = "是否是三年专项") @Excel(name = "是否是三年专项") private String threeSpecialType; - /** 钢铁三年专项时,企业设施的版本号 */ + /** + * 钢铁三年专项时,企业设施的版本号 + */ @ApiModelProperty(value = "钢铁三年专项时,企业设施的版本号") @Excel(name = "钢铁三年专项时,企业设施的版本号") private String enterpriseUnitVersion; - /** 创建人 */ + /** + * 创建人 + */ @ApiModelProperty(value = "创建人") @Excel(name = "创建人") private String CREATER; - /** 更新人 */ + /** + * 更新人 + */ @ApiModelProperty(value = "更新人") @Excel(name = "更新人") private String UPDATER; - /** 数据来源 */ + /** + * 数据来源 + */ @ApiModelProperty(value = "数据来源") @Excel(name = "数据来源") private String sourceData; - /** 是否专家参与 */ + /** + * 是否专家参与 + */ @ApiModelProperty(value = "是否专家参与") @Excel(name = "是否专家参与") private Long expertsInFlag; - /** 专家姓名 */ + /** + * 专家姓名 + */ @ApiModelProperty(value = "专家姓名") @Excel(name = "专家姓名") private String expertsName; @@ -152,7 +200,6 @@ public class SzEnforExamine extends BaseEntity private Date CREATETIME; - /** * 修改时间 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/SzEntBasicInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/SzEntBasicInfo.java index c51f584..f41c6a5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/SzEntBasicInfo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/SzEntBasicInfo.java @@ -3,7 +3,6 @@ package com.ruoyi.programManagement.entity; 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 com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/SzsAdministrativeDivision.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/SzsAdministrativeDivision.java index b527242..47370cb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/SzsAdministrativeDivision.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/SzsAdministrativeDivision.java @@ -1,82 +1,109 @@ package com.ruoyi.programManagement.entity; -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import lombok.Data; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +import java.util.Date; /** * 省-工业企业风险评估上报系统_行政区划字典对象 szs_administrative_division - * + * * @author ruoyi * @date 2023-10-17 */ @Data @ApiModel("省-工业企业风险评估上报系统_行政区划") -public class SzsAdministrativeDivision extends BaseEntity -{ +public class SzsAdministrativeDivision extends BaseEntity { private static final long serialVersionUID = 1L; - /** $column.columnComment */ + /** + * $column.columnComment + */ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") private Date jhptUpdateTime; - /** 纬度 */ + /** + * 纬度 + */ @Excel(name = "纬度") private String LATITUDE; - /** 区划名称 */ + /** + * 区划名称 + */ @Excel(name = "区划名称") private String districtName; - /** 1省级2地市级以此类推 */ + /** + * 1省级2地市级以此类推 + */ @Excel(name = "1省级2地市级以此类推") private String distLevel; - /** 全称 */ + /** + * 全称 + */ @Excel(name = "全称") private String fullName; - /** 区划编码 */ + /** + * 区划编码 + */ @Excel(name = "区划编码") private String districtCode; - /** 上级编码 */ + /** + * 上级编码 + */ @Excel(name = "上级编码") private String parentCode; - /** 简称 */ + /** + * 简称 + */ @Excel(name = "简称") private String shortName; - /** 主键ID */ + /** + * 主键ID + */ private String ID; - /** 区划编码排序 */ + /** + * 区划编码排序 + */ @Excel(name = "区划编码排序") private String districtCodeSort; - /** 经度 */ + /** + * 经度 + */ @Excel(name = "经度") private Long LONGITUDE; - /** 创建人 */ + /** + * 创建人 + */ @Excel(name = "创建人") private String CREATER; - /** 修改人 */ + /** + * 修改人 + */ @Excel(name = "修改人") private String UPDATER; - /** 拼写 */ + /** + * 拼写 + */ @Excel(name = "拼写") private String SPELLING; - /** 删除标识 */ + /** + * 删除标识 + */ @Excel(name = "删除标识") private String isDelete; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/BAdministrativeDistrictRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/BAdministrativeDistrictRequest.java index a2780d8..b1253e4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/BAdministrativeDistrictRequest.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/BAdministrativeDistrictRequest.java @@ -19,7 +19,7 @@ public class BAdministrativeDistrictRequest { private String district; private List children; - public BAdministrativeDistrictRequest(String districtCode,String district) { + public BAdministrativeDistrictRequest(String districtCode, String district) { this.districtCode = districtCode; this.district = district; this.children = new ArrayList<>(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/BAdministrativeTreeRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/BAdministrativeTreeRequest.java index e2b6763..b0bd753 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/BAdministrativeTreeRequest.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/BAdministrativeTreeRequest.java @@ -2,9 +2,6 @@ package com.ruoyi.programManagement.entity.request; import lombok.Data; -import java.util.ArrayList; -import java.util.List; - /** * 行政区划书请求类 */ @@ -34,13 +31,11 @@ public class BAdministrativeTreeRequest { private String sort; - public BAdministrativeTreeRequest(String county, String countyCode,String sort) { + public BAdministrativeTreeRequest(String county, String countyCode, String sort) { this.county = county; this.countyCode = countyCode; this.sort = sort; } - - } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/BEnterpriseNewRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/BEnterpriseNewRequest.java index ba427fe..7d9fb56 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/BEnterpriseNewRequest.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/BEnterpriseNewRequest.java @@ -39,7 +39,7 @@ public class BEnterpriseNewRequest { */ @Excel(name = "行政区划") @ApiModelProperty(value = "行政区划") - private String[] district; + private String district; /** * 行业监管大类编码 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/BKeyEnterprisePageRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/BKeyEnterprisePageRequest.java index 2e59bcf..d6d0a40 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/BKeyEnterprisePageRequest.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/BKeyEnterprisePageRequest.java @@ -1,15 +1,10 @@ package com.ruoyi.programManagement.entity.request; -import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.annotation.Excel; import io.swagger.annotations.ApiModelProperty; -import io.swagger.annotations.ApiOperation; import lombok.Data; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; -import java.util.Date; /** * 省重点企业表请求类 @@ -18,7 +13,6 @@ import java.util.Date; public class BKeyEnterprisePageRequest implements Serializable { - /** * 年份 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/BPlanEnterprisePageRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/BPlanEnterprisePageRequest.java index 7fa1301..0ea0eb8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/BPlanEnterprisePageRequest.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/BPlanEnterprisePageRequest.java @@ -1,6 +1,5 @@ package com.ruoyi.programManagement.entity.request; -import com.ruoyi.common.annotation.Excel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -32,7 +31,4 @@ public class BPlanEnterprisePageRequest { private String lawAreas; - - - } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/BPlanEnterpriseRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/BPlanEnterpriseRequest.java index 1573972..a7dba31 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/BPlanEnterpriseRequest.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/BPlanEnterpriseRequest.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -18,7 +17,7 @@ import java.util.Date; */ @Data @ApiModel("计划企业新增请求类") -public class BPlanEnterpriseRequest { +public class BPlanEnterpriseRequest { private static final long serialVersionUID = -98531345456142440L; /** * 编号 @@ -157,7 +156,7 @@ public class BPlanEnterpriseRequest { /** * 0:草稿 1:正式 */ - @Excel(name = "状态",readConverterExp = "0=草稿,1=正式") + @Excel(name = "状态", readConverterExp = "0=草稿,1=正式") @ApiModelProperty(value = "0:草稿 1:正式") private Integer status; @@ -176,10 +175,6 @@ public class BPlanEnterpriseRequest { private Long lawSort; - - - - /** * 0:未检查 1:已检查 */ @@ -191,7 +186,7 @@ public class BPlanEnterpriseRequest { * 检查id */ @ApiModelProperty(value = "检查id") - private String checkId; + private String checkId; /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/PlanMxRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/PlanMxRequest.java index ee6fb54..fe6948e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/PlanMxRequest.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/PlanMxRequest.java @@ -1,6 +1,5 @@ package com.ruoyi.programManagement.entity.request; -import com.ruoyi.common.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/checkResultRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/checkResultRequest.java index 347fad2..f3a9e83 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/checkResultRequest.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/checkResultRequest.java @@ -2,7 +2,6 @@ package com.ruoyi.programManagement.entity.request; import com.ruoyi.common.annotation.Excel; import io.swagger.annotations.ApiModelProperty; -import io.swagger.models.auth.In; import lombok.Data; /** @@ -15,20 +14,20 @@ public class checkResultRequest { * 计划年份 */ @ApiModelProperty(value = "计划年份") - private String plannedYear; + private String plannedYear; /** * 计划月份 */ @ApiModelProperty(value = "计划月份") - private String[] plannedMonth; + private String[] plannedMonth; /** * 行政区划 */ @ApiModelProperty(value = "行政区划") - private String district; + private String district; /** * 企业名称 @@ -48,8 +47,7 @@ public class checkResultRequest { * 0:草稿 1:正式 */ @ApiModelProperty(value = "0:草稿 1:正式") - private Integer status ; - + private Integer status; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/zhifaRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/zhifaRequest.java index ef4890d..e177ced 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/zhifaRequest.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/zhifaRequest.java @@ -16,14 +16,14 @@ public class zhifaRequest { * 计划年份 */ @ApiModelProperty(value = "计划年份") - private String plannedYear; + private String plannedYear; /** * 区县id */ @ApiModelProperty(value = "区县id") - private String deptName; + private String deptName; /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/BPlanEnterPriseTreeResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/BPlanEnterPriseTreeResponse.java index 4cc05bf..d91e777 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/BPlanEnterPriseTreeResponse.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/BPlanEnterPriseTreeResponse.java @@ -48,5 +48,4 @@ public class BPlanEnterPriseTreeResponse { private double completionRate; - } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/BPlanEnterpriseResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/BPlanEnterpriseResponse.java index 57bb11b..4b2035c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/BPlanEnterpriseResponse.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/BPlanEnterpriseResponse.java @@ -3,13 +3,11 @@ package com.ruoyi.programManagement.entity.response; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; -import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; @@ -162,7 +160,7 @@ public class BPlanEnterpriseResponse extends BaseEntity { /** * 0:草稿 1:正式 */ - @Excel(name = "状态",readConverterExp = "0=草稿,1=正式") + @Excel(name = "状态", readConverterExp = "0=草稿,1=正式") @ApiModelProperty(value = "0:草稿 1:正式") private Integer status; @@ -181,10 +179,6 @@ public class BPlanEnterpriseResponse extends BaseEntity { private Long lawSort; - - - - /** * 0:未检查 1:已检查 */ @@ -234,6 +228,4 @@ public class BPlanEnterpriseResponse extends BaseEntity { private Date examineEndTime; - - } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/BPlanEnterpriseZhifaResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/BPlanEnterpriseZhifaResponse.java index 432930d..b1aa841 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/BPlanEnterpriseZhifaResponse.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/BPlanEnterpriseZhifaResponse.java @@ -106,8 +106,6 @@ public class BPlanEnterpriseZhifaResponse { private String plannedYear; - - /** * 是否重点企业1:是2:否 */ @@ -169,7 +167,7 @@ public class BPlanEnterpriseZhifaResponse { * 0:草稿 1:正式 */ @ApiModelProperty(value = "0:草稿 1:正式") - private Integer status ; + private Integer status; /** @@ -200,7 +198,6 @@ public class BPlanEnterpriseZhifaResponse { private Integer RISK_LEVEL; - /** * 安全风险等级 */ @@ -215,7 +212,6 @@ public class BPlanEnterpriseZhifaResponse { private String standLevel; - /** * 上次检查时间 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/PlanMxResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/PlanMxResponse.java index dae2aa2..eab0d72 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/PlanMxResponse.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/PlanMxResponse.java @@ -3,7 +3,6 @@ package com.ruoyi.programManagement.entity.response; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -95,8 +94,6 @@ public class PlanMxResponse { private String district; - - /** * 计划年份 */ @@ -110,7 +107,6 @@ public class PlanMxResponse { private String planName; - /** * 计划内容 */ @@ -118,7 +114,6 @@ public class PlanMxResponse { private String planContent; - /** * 是否重点企业1:是2:否 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/SzEntBasicInfoPageResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/SzEntBasicInfoPageResponse.java index 925221f..8a410a9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/SzEntBasicInfoPageResponse.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/SzEntBasicInfoPageResponse.java @@ -595,8 +595,6 @@ public class SzEntBasicInfoPageResponse { private String sourceData; - - /** * 是否重点企业1:是 2:否 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/zhifaCountResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/zhifaCountResponse.java index 722cee5..3c553d8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/zhifaCountResponse.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/zhifaCountResponse.java @@ -24,7 +24,6 @@ public class zhifaCountResponse { private String deptName; - /** * 省重点企业数量 */ @@ -32,8 +31,6 @@ public class zhifaCountResponse { private Integer keyPlan; - - /** * 非省重点企业数量 */ @@ -48,7 +45,6 @@ public class zhifaCountResponse { private Integer keyCompleted; - /** * 非省重点完成数 */ @@ -56,7 +52,6 @@ public class zhifaCountResponse { private Integer nonKeyCompleted; - /** * 省重点完成比 */ @@ -64,7 +59,6 @@ public class zhifaCountResponse { private Integer percentageCompleted; - /** * 非省重点完成比 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/zhifaPlanResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/zhifaPlanResponse.java index b862ab8..7aadd4b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/zhifaPlanResponse.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/zhifaPlanResponse.java @@ -2,7 +2,6 @@ package com.ruoyi.programManagement.entity.response; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import io.swagger.models.auth.In; import lombok.Data; /** @@ -19,7 +18,6 @@ public class zhifaPlanResponse { private Integer count; - /** * 部门 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/BAdministrativeDivisionMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/BAdministrativeDivisionMapper.java index b1e6d6f..61976b3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/BAdministrativeDivisionMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/BAdministrativeDivisionMapper.java @@ -1,11 +1,11 @@ package com.ruoyi.programManagement.mapper; -import java.util.List; - import com.ruoyi.programManagement.domain.BAdministrativeDivision; import com.ruoyi.programManagement.entity.request.BAdministrativeDistrictRequest; import com.ruoyi.programManagement.entity.request.BAdministrativeTreeRequest; +import java.util.List; + /** * 行政区划Mapper接口 * @@ -64,6 +64,7 @@ public interface BAdministrativeDivisionMapper { /** * 行政区划树结构 + * * @return list */ List selectByDistctList(); @@ -77,11 +78,4 @@ public interface BAdministrativeDivisionMapper { List selectBycountyList(); - - - - - - - } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/BAdministrativeMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/BAdministrativeMapper.java deleted file mode 100644 index e16cc1f..0000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/BAdministrativeMapper.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.ruoyi.programManagement.mapper; - -import com.ruoyi.programManagement.entity.BAdministrative; -import com.ruoyi.programManagement.entity.request.BAdministrativeTreeRequest; -import com.ruoyi.programManagement.entity.response.BPlanEnterPriseTreeResponse; -import com.ruoyi.programManagement.entity.request.BPlanEnterprisePageRequest; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 行政区划Mapper接口 - * - * @author ruoyi - * @date 2023-09-11 - */ -public interface BAdministrativeMapper { - /** - * 查询行政区划 - * - * @param id 行政区划主键 - * @return 行政区划 - */ - public BAdministrative selectBAdministrativeById(Long id); - - /** - * 查询行政区划列表 - * - * @param bAdministrative 行政区划 - * @return 行政区划集合 - */ - public List selectBAdministrativeList(BAdministrative bAdministrative); - - /** - * 新增行政区划 - * - * @param bAdministrative 行政区划 - * @return 结果 - */ - public int insertBAdministrative(BAdministrative bAdministrative); - - /** - * 修改行政区划 - * - * @param bAdministrative 行政区划 - * @return 结果 - */ - public int updateBAdministrative(BAdministrative bAdministrative); - - /** - * 删除行政区划 - * - * @param id 行政区划主键 - * @return 结果 - */ - public int deleteBAdministrativeById(Long id); - - /** - * 批量删除行政区划 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteBAdministrativeByIds(Long[] ids); - - - /** - * 行政获取县区 - * - * @return - */ - List selectBAdministrativeTreeRequestList(); - - - /** - * 行政获取乡镇 - * - * @return - */ - List selectcascadingSelectDataList(); - - - List selectBPlanEnterPriseTreeRequestRequestList(@Param("req") BPlanEnterprisePageRequest req); - - -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/BEnterpriseNewMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/BEnterpriseNewMapper.java index 52d6354..3af62bd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/BEnterpriseNewMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/BEnterpriseNewMapper.java @@ -73,6 +73,7 @@ public interface BEnterpriseNewMapper extends BaseMapper { /** * 定时任务三表关联查询数据 + * * @return */ List seletAll(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/BKeyEnterpriseMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/BKeyEnterpriseMapper.java index 9f6c6b5..ff05ef7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/BKeyEnterpriseMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/BKeyEnterpriseMapper.java @@ -1,7 +1,6 @@ package com.ruoyi.programManagement.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.programManagement.entity.BKeyEnterprise; import com.ruoyi.programManagement.entity.request.BKeyEnterprisePageRequest; import org.apache.ibatis.annotations.Param; @@ -23,14 +22,14 @@ public interface BKeyEnterpriseMapper extends BaseMapper { * @param bKeyEnterprise 重点企业 * @return 结果 */ - public int bKeyEnterpriseAdd(BKeyEnterprise bKeyEnterprise ); + public int bKeyEnterpriseAdd(BKeyEnterprise bKeyEnterprise); /** * 分页条件查询所有数据 * * @param - * @param req 查询条件 + * @param req 查询条件 * @return 所有数据 */ public List page(@Param("req") BKeyEnterprisePageRequest req); @@ -46,6 +45,7 @@ public interface BKeyEnterpriseMapper extends BaseMapper { /** * 根据企业代码和年份查询数据 + * * @param req * @return */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/BPlanEnterpriseMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/BPlanEnterpriseMapper.java index 013ee79..1881635 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/BPlanEnterpriseMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/BPlanEnterpriseMapper.java @@ -26,6 +26,7 @@ public interface BPlanEnterpriseMapper extends BaseMapper { /** * 执法 + * * @param req * @return */ @@ -85,30 +86,33 @@ public interface BPlanEnterpriseMapper extends BaseMapper { /** * 查询首页数据 + * * @param req * @return */ - List getShouyeList(@Param("req")BPlanEnterprisePageRequest req); + List getShouyeList(@Param("req") BPlanEnterprisePageRequest req); /** * 查询首页明细数据 + * * @param req * @return */ - ListgetShouYeMxList(@Param("req") BPlanEnterprisePageRequest req); - + List getShouYeMxList(@Param("req") BPlanEnterprisePageRequest req); /** * 批量更新状态 + * * @param idList */ - void updateIdList(List idList); + void updateIdList(List idList); /** * 新增 + * * @param bPlanEnterprise */ void insertPlan(BPlanEnterpriseRequest bPlanEnterprise); @@ -116,6 +120,7 @@ public interface BPlanEnterpriseMapper extends BaseMapper { /** * 新增 + * * @param bPlanEnterprise */ void updatePlan(BPlanEnterpriseRequest bPlanEnterprise); @@ -123,6 +128,7 @@ public interface BPlanEnterpriseMapper extends BaseMapper { /** * 定时任务修改更新计划表的检查状态、检查id、检查时效字段 + * * @return */ List selectUpdateAll(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/DictDataDao.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/DictDataDao.java index 36413b2..ed432db 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/DictDataDao.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/DictDataDao.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.programManagement.entity.DictData; import com.ruoyi.programManagement.entity.response.DictDataResponse; - import java.util.List; public interface DictDataDao extends BaseMapper { @@ -18,9 +17,4 @@ public interface DictDataDao extends BaseMapper { List getDicttypeList(List list); - - - - - } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/GeoLayerMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/GeoLayerMapper.java index 280a637..bf65ecd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/GeoLayerMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/GeoLayerMapper.java @@ -3,7 +3,6 @@ package com.ruoyi.programManagement.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; - import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.programManagement.entity.GeoLayer; import org.apache.ibatis.annotations.Param; @@ -14,7 +13,7 @@ import java.util.Map; /** *

- * Mapper 接口 + * Mapper 接口 *

* * @author Jason @@ -24,10 +23,10 @@ public interface GeoLayerMapper extends BaseMapper { @Select("SELECT t.id,t.origin_id,t.origin_table,t.name,t.address,t.type1,t.type2,t.type3,t.county,t.town,t.lng,t.lat,ST_AsGeoJson( t.shape) as shape_str FROM ent_geo_layer t ${ew.customSqlSegment} ") - List getGeoLayerById( @Param(Constants.WRAPPER) Wrapper wrapper); + List getGeoLayerById(@Param(Constants.WRAPPER) Wrapper wrapper); @Select("SELECT t.id,t.origin_id,t.origin_table,t.name,t.address,t.type1,t.type2,t.type3,t.county,t.town,t.lng,t.lat,ST_AsGeoJson( t.shape) as shape_str FROM ent_geo_layer t ${ew.customSqlSegment} ") - List getGeoLayerByCondition( @Param(Constants.WRAPPER) Wrapper wrapper); + List getGeoLayerByCondition(@Param(Constants.WRAPPER) Wrapper wrapper); @Select("SELECT t.id,t.origin_id,t.origin_table,t.name,t.address,t.type1,t.type2,t.type3,t.type4,t.type5,t.type6,t.type7,t.type8,t.type9,t.type10,t.county,t.town,t.lng,t.lat,ST_AsGeoJson( t.shape) as shape_str FROM ent_geo_layer t ${ew.customSqlSegment} ") List getGeoLayerByPage(Page page, @Param(Constants.WRAPPER) Wrapper wrapper); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/IBAdministrativeService.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/IBAdministrativeService.java deleted file mode 100644 index 3cd5acc..0000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/IBAdministrativeService.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.ruoyi.programManagement.service; - -import com.ruoyi.programManagement.entity.BAdministrative; -import com.ruoyi.programManagement.entity.response.BPlanEnterPriseTreeResponse; -import com.ruoyi.programManagement.entity.request.BPlanEnterprisePageRequest; - -import java.util.List; - - -/** - * 行政区划Service接口 - * - * @author ruoyi - * @date 2023-09-11 - */ -public interface IBAdministrativeService { - /** - * 查询行政区划 - * - * @param id 行政区划主键 - * @return 行政区划 - */ - public BAdministrative selectBAdministrativeById(Long id); - - /** - * 查询行政区划列表 - * - * @param bAdministrative 行政区划 - * @return 行政区划集合 - */ - public List selectBAdministrativeList(BAdministrative bAdministrative); - - /** - * 新增行政区划 - * - * @param bAdministrative 行政区划 - * @return 结果 - */ - public int insertBAdministrative(BAdministrative bAdministrative); - - /** - * 修改行政区划 - * - * @param bAdministrative 行政区划 - * @return 结果 - */ - public int updateBAdministrative(BAdministrative bAdministrative); - - /** - * 批量删除行政区划 - * - * @param ids 需要删除的行政区划主键集合 - * @return 结果 - */ - public int deleteBAdministrativeByIds(Long[] ids); - - /** - * 删除行政区划信息 - * - * @param id 行政区划主键 - * @return 结果 - */ - public int deleteBAdministrativeById(Long id); - - - List selectBPlanEnterPriseTreeRequestRequestList(BPlanEnterprisePageRequest req); - - - -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/impl/BAdministrativeServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/impl/BAdministrativeServiceImpl.java deleted file mode 100644 index 949f236..0000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/impl/BAdministrativeServiceImpl.java +++ /dev/null @@ -1,101 +0,0 @@ -package com.ruoyi.programManagement.service.impl; - - -import com.ruoyi.programManagement.entity.BAdministrative; -import com.ruoyi.programManagement.entity.response.BPlanEnterPriseTreeResponse; -import com.ruoyi.programManagement.entity.request.BPlanEnterprisePageRequest; -import com.ruoyi.programManagement.mapper.BAdministrativeMapper; -import com.ruoyi.programManagement.service.IBAdministrativeService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 行政区划Service业务层处理 - * - * @author ruoyi - * @date 2023-09-11 - */ -@Service -public class BAdministrativeServiceImpl implements IBAdministrativeService { - @Autowired - private BAdministrativeMapper bAdministrativeMapper; - - /** - * 查询行政区划 - * - * @param id 行政区划主键 - * @return 行政区划 - */ - @Override - public BAdministrative selectBAdministrativeById(Long id) { - return bAdministrativeMapper.selectBAdministrativeById(id); - } - - /** - * 查询行政区划列表 - * - * @param bAdministrative 行政区划 - * @return 行政区划 - */ - @Override - public List selectBAdministrativeList(BAdministrative bAdministrative) { - return bAdministrativeMapper.selectBAdministrativeList(bAdministrative); - } - - /** - * 新增行政区划 - * - * @param bAdministrative 行政区划 - * @return 结果 - */ - @Override - public int insertBAdministrative(BAdministrative bAdministrative) { - return bAdministrativeMapper.insertBAdministrative(bAdministrative); - } - - /** - * 修改行政区划 - * - * @param bAdministrative 行政区划 - * @return 结果 - */ - @Override - public int updateBAdministrative(BAdministrative bAdministrative) { - return bAdministrativeMapper.updateBAdministrative(bAdministrative); - } - - /** - * 批量删除行政区划 - * - * @param ids 需要删除的行政区划主键 - * @return 结果 - */ - @Override - public int deleteBAdministrativeByIds(Long[] ids) { - return bAdministrativeMapper.deleteBAdministrativeByIds(ids); - } - - /** - * 删除行政区划信息 - * - * @param id 行政区划主键 - * @return 结果 - */ - @Override - public int deleteBAdministrativeById(Long id) { - return bAdministrativeMapper.deleteBAdministrativeById(id); - } - - - - @Override - public List selectBPlanEnterPriseTreeRequestRequestList(BPlanEnterprisePageRequest req) { - return bAdministrativeMapper.selectBPlanEnterPriseTreeRequestRequestList(req); - } - - - - -}