From e12b4ff3f9435aaca382cbec4ef956a621984e22 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Tue, 21 Feb 2023 10:23:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=94=B9=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CommonController.java | 24 ------------ .../EnterpriseInformationController.java | 19 +++++++--- .../EscalateHiddenDangerController.java | 2 + .../mapper/EnterpriseInformationMapper.java | 5 +-- .../pojo/EnterpriseInformation.java | 38 +++++++++++-------- .../IEnterpriseInformationService.java | 5 +-- .../EnterpriseInformationServiceImpl.java | 5 +-- 7 files changed, 44 insertions(+), 54 deletions(-) delete mode 100644 hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/CommonController.java diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/CommonController.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/CommonController.java deleted file mode 100644 index d4c980d..0000000 --- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/CommonController.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.hbt.safety.supervision.controller; - -import com.hbt.common.core.domain.R; -import com.hbt.common.core.web.controller.BaseController; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -@RequestMapping("/ep") -@Api(tags = "ep common", description = "ep 通用接口") -public class CommonController extends BaseController { - - @Autowired - @GetMapping("/action") - @ApiOperation("通用接口") - public R action() { - return R.ok("success"); - } - -} \ No newline at end of file diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/EnterpriseInformationController.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/EnterpriseInformationController.java index 1cdd1fa..7e832f9 100644 --- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/EnterpriseInformationController.java +++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/EnterpriseInformationController.java @@ -5,6 +5,9 @@ import java.util.List; import com.alibaba.fastjson.JSONObject; import com.hbt.safety.supervision.pojo.EnterpriseInformation; import com.hbt.safety.supervision.service.IEnterpriseInformationService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -19,6 +22,7 @@ import com.hbt.common.core.web.page.TableDataInfo; * * @author zhangyu */ +@Api(tags = "企业信息相关") @RestController @RequestMapping("/information") public class EnterpriseInformationController extends BaseController @@ -29,18 +33,19 @@ public class EnterpriseInformationController extends BaseController /** * 查询企业信息列表 */ + @ApiOperation("查询企业信息列表") @GetMapping("/list") - public String list(EnterpriseInformation enterpriseInformation) + @ApiResponse(code = 200, message = "ok", response = EnterpriseInformation.class) + public String list() { - startPage(); - List list = enterpriseInformationService.selectEnterpriseInformationList(enterpriseInformation); - TableDataInfo tableDataInfo = getDataTable(list); - return JSONObject.toJSONString(tableDataInfo); + List list = enterpriseInformationService.selectEnterpriseInformationList(); + return JSONObject.toJSONString(list); } /** * 获取企业信息详细信息 */ + @ApiOperation("获取企业信息详细信息") @GetMapping(value = "/getInfo") public String getInfo(int id) { @@ -51,6 +56,7 @@ public class EnterpriseInformationController extends BaseController /** * 新增企业信息 */ + @ApiOperation("新增企业信息") @GetMapping("/add") public String add(@RequestBody EnterpriseInformation enterpriseInformation) { @@ -61,6 +67,7 @@ public class EnterpriseInformationController extends BaseController /** * 修改企业信息 */ + @ApiOperation("修改企业信息") @GetMapping("/edit") public String edit(@RequestBody EnterpriseInformation enterpriseInformation) { @@ -71,6 +78,7 @@ public class EnterpriseInformationController extends BaseController /** * 删除企业信息 */ + @ApiOperation("删除企业信息") @GetMapping("/remove") public String remove(int[] ids) { @@ -81,6 +89,7 @@ public class EnterpriseInformationController extends BaseController /** * 在管企业分类统计 */ + @ApiOperation("在管企业分类统计") @GetMapping("/enterpriseStatistics") public String enterpriseStatistics() { diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/EscalateHiddenDangerController.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/EscalateHiddenDangerController.java index 6da3c5e..79a0818 100644 --- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/EscalateHiddenDangerController.java +++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/EscalateHiddenDangerController.java @@ -4,6 +4,7 @@ import java.util.List; import com.alibaba.fastjson.JSONObject; import com.hbt.safety.supervision.pojo.EscalateHiddenDanger; +import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -19,6 +20,7 @@ import com.hbt.common.core.web.page.TableDataInfo; * * @author 张雨 */ +@Api(tags = "上报隐患") @RestController @RequestMapping("/danger") public class EscalateHiddenDangerController extends BaseController diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/EnterpriseInformationMapper.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/EnterpriseInformationMapper.java index edb9937..097cc15 100644 --- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/EnterpriseInformationMapper.java +++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/EnterpriseInformationMapper.java @@ -22,11 +22,10 @@ public interface EnterpriseInformationMapper /** * 查询企业信息列表 - * - * @param enterpriseInformation 企业信息 + * * @return 企业信息集合 */ - List selectEnterpriseInformationList(EnterpriseInformation enterpriseInformation); + List selectEnterpriseInformationList(); /** * 新增企业信息 diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/EnterpriseInformation.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/EnterpriseInformation.java index 6e9c021..2eecc0f 100644 --- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/EnterpriseInformation.java +++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/EnterpriseInformation.java @@ -2,68 +2,74 @@ package com.hbt.safety.supervision.pojo; import com.hbt.common.core.annotation.Excel; import com.hbt.common.core.web.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; +import javax.validation.constraints.NotBlank; + /** * 企业信息对象 enterprise_information * * @author zhangyu * @date 2023-02-14 */ +@ApiModel public class EnterpriseInformation extends BaseEntity { private static final long serialVersionUID = 1L; /** 企业id */ + @ApiModelProperty(value = "企业id") private int id; /** 统一社会信用代码 */ - @Excel(name = "统一社会信用代码") + @ApiModelProperty(value = "统一社会信用代码") private String unifySocialCreditCode; /** 企业名称 */ - @Excel(name = "企业名称") + @ApiModelProperty(value = "企业名称") private String name; /** 注册号 */ - @Excel(name = "注册号") + @ApiModelProperty(value = "注册号") private String registrationNumber; /** 法定代表人 */ - @Excel(name = "法定代表人") + @ApiModelProperty(value = "法定代表人") private String legalRepresentative; - /** 类型 */ - @Excel(name = "类型") - private String type; + /** 类型 1-国有， 2-集体企业 3-私营企业*/ + @ApiModelProperty(value = "企业类型") + private int type; /** 成立日期 */ - @Excel(name = "成立日期") + @ApiModelProperty(value = "成立日期") private String establishmentDate; /** 出资额 */ - @Excel(name = "出资额") + @ApiModelProperty(value = "出资额") private String fundAmount; /** 核准日期 */ - @Excel(name = "核准日期") + @ApiModelProperty(value = "核准日期") private String approvalDate; /** 登记机关 */ - @Excel(name = "登记机关") + @ApiModelProperty(value = "登记机关") private String registrationAuthority; /** 等级状态 */ - @Excel(name = "等级状态") + @ApiModelProperty(value = "等级状态") private String registrationStatus; /** 住所 */ - @Excel(name = "住所") + @ApiModelProperty(value = "住所") private String dwellingPlace; /** 经营范围 */ - @Excel(name = "经营范围") + @ApiModelProperty(value = "经营范围") private String businessScope; public void setId(int id) @@ -111,12 +117,12 @@ public class EnterpriseInformation extends BaseEntity { return legalRepresentative; } - public void setType(String type) + public void setType(int type) { this.type = type; } - public String getType() + public int getType() { return type; } diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IEnterpriseInformationService.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IEnterpriseInformationService.java index e442cc1..06ec284 100644 --- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IEnterpriseInformationService.java +++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IEnterpriseInformationService.java @@ -22,11 +22,10 @@ public interface IEnterpriseInformationService /** * 查询企业信息列表 - * - * @param enterpriseInformation 企业信息 + * * @return 企业信息集合 */ - List selectEnterpriseInformationList(EnterpriseInformation enterpriseInformation); + List selectEnterpriseInformationList(); /** * 新增企业信息 diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/EnterpriseInformationServiceImpl.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/EnterpriseInformationServiceImpl.java index 82a7ea2..8b1fb66 100644 --- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/EnterpriseInformationServiceImpl.java +++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/EnterpriseInformationServiceImpl.java @@ -40,12 +40,11 @@ public class EnterpriseInformationServiceImpl implements IEnterpriseInformationS /** * 查询企业信息列表 * - * @param enterpriseInformation 企业信息 * @return 企业信息 */ @Override - public List selectEnterpriseInformationList(EnterpriseInformation enterpriseInformation) { - return enterpriseInformationMapper.selectEnterpriseInformationList(enterpriseInformation); + public List selectEnterpriseInformationList() { + return enterpriseInformationMapper.selectEnterpriseInformationList(); } /**