From df447b2439ff45a5912361ee5622646b830f05b9 Mon Sep 17 00:00:00 2001 From: sikadi <13315935+sikadi_love@user.noreply.gitee.com> Date: Wed, 22 Nov 2023 00:47:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fate/firm/domain/FirmType.java | 14 ++++++ .../fate/firm/controller/FirmController.java | 31 ++++++------ .../firm/controller/FirmTypeController.java | 47 +++++++++++++++++++ .../java/com/fate/firm/mapper/FirmMapper.java | 10 +--- .../com/fate/firm/mapper/FirmTypeMapper.java | 9 ++++ .../com/fate/firm/service/FirmService.java | 12 ++++- .../fate/firm/service/FirmTypeService.java | 7 +++ .../firm/service/impl/FirmServiceImpl.java | 21 ++++++++- .../service/impl/FirmTypeServiceImpl.java | 17 +++++++ .../resources/mapper/frim/FirmTypeXml.xml | 8 ++++ .../main/resources/mapper/frim/FirmXml.xml | 5 -- 11 files changed, 152 insertions(+), 29 deletions(-) create mode 100644 fate-firm-server/src/main/java/com/fate/firm/controller/FirmTypeController.java create mode 100644 fate-firm-server/src/main/java/com/fate/firm/mapper/FirmTypeMapper.java create mode 100644 fate-firm-server/src/main/java/com/fate/firm/service/FirmTypeService.java create mode 100644 fate-firm-server/src/main/java/com/fate/firm/service/impl/FirmTypeServiceImpl.java create mode 100644 fate-firm-server/src/main/resources/mapper/frim/FirmTypeXml.xml diff --git a/fate-firm-common/src/main/java/com/fate/firm/domain/FirmType.java b/fate-firm-common/src/main/java/com/fate/firm/domain/FirmType.java index 998f549..59cf3ca 100644 --- a/fate-firm-common/src/main/java/com/fate/firm/domain/FirmType.java +++ b/fate-firm-common/src/main/java/com/fate/firm/domain/FirmType.java @@ -1,6 +1,10 @@ package com.fate.firm.domain; +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.fate.common.core.annotation.Excel; import com.fate.common.core.web.domain.BaseEntity; import io.swagger.annotations.Example; import lombok.*; @@ -17,5 +21,15 @@ import lombok.*; @TableName("t_firm_type") @EqualsAndHashCode(callSuper = true) public class FirmType extends BaseEntity { + private static final long serialVersionUID = 1L; + + @Excel(name = "故障码类型ID",cellType = Excel.ColumnType.NUMERIC) + @TableId(type = IdType.AUTO) + private Integer faultTypeId; + + + @Excel(name = "故障码类型") + @TableField("fault_type_name") + private Integer faultTypeName; } diff --git a/fate-firm-server/src/main/java/com/fate/firm/controller/FirmController.java b/fate-firm-server/src/main/java/com/fate/firm/controller/FirmController.java index 75fe782..e7c3bff 100644 --- a/fate-firm-server/src/main/java/com/fate/firm/controller/FirmController.java +++ b/fate-firm-server/src/main/java/com/fate/firm/controller/FirmController.java @@ -2,10 +2,11 @@ package com.fate.firm.controller; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.fate.common.datasource.annotation.Master; import com.fate.common.core.domain.Result; import com.fate.common.core.web.controller.BaseController; import com.fate.firm.domain.Firm; +import com.fate.firm.domain.FirmType; import com.fate.firm.domain.request.FirmRequest; import com.fate.firm.service.FirmService; import lombok.extern.log4j.Log4j2; @@ -27,6 +28,7 @@ import java.util.List; @RestController @RequestMapping("/firm") @Log4j2 +@Master public class FirmController extends BaseController { @Autowired private FirmService firmService; @@ -84,15 +86,24 @@ public class FirmController extends BaseController { } + + /** + * 查询企业的信息 + * @author: ZhuoXin + * @date: 2023/11/21 13:35 + * @param: [firmRequest] + * @return: com.fate.common.core.domain.Result> + **/ @PostMapping("/list") - public Result> list(@RequestBody Firm firm) { - List list = firmService.listSel(firm); + public Result> list(@RequestBody FirmRequest firmRequest) { + log.info("功能:查询企业的信息,URI:{},方法:{},参数:{}",request.getRequestURI(),request.getMethod(),JSON.toJSONString(firmRequest)); + List list = firmService.listSel(Firm.addReqBuild(firmRequest)); + log.info("功能:查询企业的信息,URI:{},方法:{},参数:{}",request.getRequestURI(),request.getMethod(),JSON.toJSONString(list)); return Result.success(list); } /** - * 查询 - * + * 管理员查看所有企业 * @author: ZhuoXin * @date: 2023/11/20 10:24 * @param: [] @@ -101,9 +112,7 @@ public class FirmController extends BaseController { @GetMapping("/listAll") public Result> listAll() { log.info("功能:查询我的公司,URI:{},方法:{}", request.getRequestURI(), request.getMethod()); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.like(Firm::getCreateBy, "1"); - List list = firmService.list(queryWrapper); + List list = firmService.list(); log.info("功能:查询我的公司,URI:{},方法:{},响应:{}", request.getRequestURI(), request.getMethod(), JSON.toJSONString(list)); return Result.success(list); } @@ -125,11 +134,5 @@ public class FirmController extends BaseController { } - - - - - - } diff --git a/fate-firm-server/src/main/java/com/fate/firm/controller/FirmTypeController.java b/fate-firm-server/src/main/java/com/fate/firm/controller/FirmTypeController.java new file mode 100644 index 0000000..eec3f8a --- /dev/null +++ b/fate-firm-server/src/main/java/com/fate/firm/controller/FirmTypeController.java @@ -0,0 +1,47 @@ +package com.fate.firm.controller; + +import com.alibaba.fastjson.JSON; +import com.fate.common.core.domain.Result; +import com.fate.common.core.web.controller.BaseController; +import com.fate.firm.domain.FirmType; +import com.fate.firm.service.FirmTypeService; +import lombok.extern.log4j.Log4j2; +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; + +import javax.servlet.http.HttpServletRequest; +import java.util.List; + +/** + * @description: TODO + * @author: SIKADI + * @date: 2023/11/22 0:31 + **/ +@RestController +@RequestMapping("/firmType") +@Log4j2 +public class FirmTypeController extends BaseController { + + @Autowired + private FirmTypeService firmTypeService; + + @Autowired + private HttpServletRequest request; + + /** + * 企业类型的数据库 + * @author: ZhuoXin + * @date: 2023/11/22 0:29 + * @param: [] + * @return: com.fate.common.core.domain.Result> + **/ + @GetMapping("/faultType") + public Result> faultType(){ + log.info("功能:查询类型,URI:{},方法:{}",request.getRequestURI(),request.getMethod()); + List firmTypes = firmTypeService.list(); + log.info("功能:查询类型,URI:{},方法:{},响应:{}",request.getRequestURI(),request.getMethod(), JSON.toJSONString(firmTypes)); + return Result.success(firmTypes); + } +} diff --git a/fate-firm-server/src/main/java/com/fate/firm/mapper/FirmMapper.java b/fate-firm-server/src/main/java/com/fate/firm/mapper/FirmMapper.java index c4052b1..34b641f 100644 --- a/fate-firm-server/src/main/java/com/fate/firm/mapper/FirmMapper.java +++ b/fate-firm-server/src/main/java/com/fate/firm/mapper/FirmMapper.java @@ -1,6 +1,7 @@ package com.fate.firm.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fate.common.datasource.annotation.Master; import com.fate.firm.domain.Firm; import org.apache.ibatis.annotations.Mapper; @@ -13,13 +14,6 @@ import org.apache.ibatis.annotations.Mapper; * @since 2023-11-18 06:27:02 */ @Mapper +@Master public interface FirmMapper extends BaseMapper { - /** - * 修改状态 - * @author: ZhuoXin - * @date: 2023/11/20 22:26 - * @param: [firm] - * @return: java.lang.Integer - **/ - Integer deleteFirm(Firm firm); } diff --git a/fate-firm-server/src/main/java/com/fate/firm/mapper/FirmTypeMapper.java b/fate-firm-server/src/main/java/com/fate/firm/mapper/FirmTypeMapper.java new file mode 100644 index 0000000..57bdbfc --- /dev/null +++ b/fate-firm-server/src/main/java/com/fate/firm/mapper/FirmTypeMapper.java @@ -0,0 +1,9 @@ +package com.fate.firm.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fate.firm.domain.FirmType; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface FirmTypeMapper extends BaseMapper { +} diff --git a/fate-firm-server/src/main/java/com/fate/firm/service/FirmService.java b/fate-firm-server/src/main/java/com/fate/firm/service/FirmService.java index ced6e8c..01e0c5f 100644 --- a/fate-firm-server/src/main/java/com/fate/firm/service/FirmService.java +++ b/fate-firm-server/src/main/java/com/fate/firm/service/FirmService.java @@ -2,6 +2,7 @@ package com.fate.firm.service; import com.baomidou.mybatisplus.extension.service.IService; import com.fate.common.core.domain.Result; +import com.fate.common.datasource.annotation.Master; import com.fate.firm.domain.Firm; import java.util.List; @@ -14,7 +15,7 @@ import java.util.List; * @author sikadi * @since 2023-11-18 06:27:02 */ - +@Master public interface FirmService extends IService { /** @@ -37,6 +38,13 @@ public interface FirmService extends IService { **/ Result updateFirm(Firm firm); + /** + * 查询公司 + * @author: ZhuoXin + * @date: 2023/11/21 13:45 + * @param: [firm] + * @return: java.util.List + **/ List listSel(Firm firm); /** @@ -57,4 +65,6 @@ public interface FirmService extends IService { * @return: com.fate.common.core.domain.Result **/ Result deleteFirm(Firm firm); + + } diff --git a/fate-firm-server/src/main/java/com/fate/firm/service/FirmTypeService.java b/fate-firm-server/src/main/java/com/fate/firm/service/FirmTypeService.java new file mode 100644 index 0000000..b665d19 --- /dev/null +++ b/fate-firm-server/src/main/java/com/fate/firm/service/FirmTypeService.java @@ -0,0 +1,7 @@ +package com.fate.firm.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.fate.firm.domain.FirmType; + +public interface FirmTypeService extends IService { +} diff --git a/fate-firm-server/src/main/java/com/fate/firm/service/impl/FirmServiceImpl.java b/fate-firm-server/src/main/java/com/fate/firm/service/impl/FirmServiceImpl.java index 55404a6..2788c5a 100644 --- a/fate-firm-server/src/main/java/com/fate/firm/service/impl/FirmServiceImpl.java +++ b/fate-firm-server/src/main/java/com/fate/firm/service/impl/FirmServiceImpl.java @@ -4,11 +4,17 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fate.common.core.domain.Result; import com.fate.common.core.utils.StringUtils; +import com.fate.common.datasource.annotation.Master; +import com.fate.common.security.utils.SecurityUtils; +import com.fate.common.system.domain.LoginUser; import com.fate.firm.domain.Firm; +import com.fate.firm.domain.FirmType; import com.fate.firm.mapper.FirmMapper; import com.fate.firm.service.FirmService; +import io.swagger.models.auth.In; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.web.bind.annotation.GetMapping; import java.util.Date; import java.util.List; @@ -22,6 +28,7 @@ import java.util.List; * @since 2023-11-18 06:27:02 */ @Service +@Master public class FirmServiceImpl extends ServiceImpl implements FirmService { @Autowired @@ -56,6 +63,14 @@ public class FirmServiceImpl extends ServiceImpl implements Fi return i > 0 ? Result.success("成功") : Result.error("失败"); } + /** + * 管理员查询 + * @author: ZhuoXin + * @date: 2023/11/21 13:45 + * @param: [firm] + * @return: java.util.List + **/ + @Override public List listSel(Firm firm) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); @@ -89,7 +104,11 @@ public class FirmServiceImpl extends ServiceImpl implements Fi **/ @Override public Result deleteFirm(Firm firm) { - Integer integer = firmMapper.deleteFirm(firm); + Integer integer = firmMapper.deleteById(firm); return integer>0?Result.success("成功"):Result.error("失败"); } + + + + } diff --git a/fate-firm-server/src/main/java/com/fate/firm/service/impl/FirmTypeServiceImpl.java b/fate-firm-server/src/main/java/com/fate/firm/service/impl/FirmTypeServiceImpl.java new file mode 100644 index 0000000..2db4200 --- /dev/null +++ b/fate-firm-server/src/main/java/com/fate/firm/service/impl/FirmTypeServiceImpl.java @@ -0,0 +1,17 @@ +package com.fate.firm.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.fate.firm.domain.FirmType; +import com.fate.firm.mapper.FirmTypeMapper; +import com.fate.firm.service.FirmService; +import com.fate.firm.service.FirmTypeService; +import org.springframework.stereotype.Service; + +/** + * @description: TODO + * @author: SIKADI + * @date: 2023/11/22 0:32 + **/ +@Service +public class FirmTypeServiceImpl extends ServiceImpl implements FirmTypeService { +} diff --git a/fate-firm-server/src/main/resources/mapper/frim/FirmTypeXml.xml b/fate-firm-server/src/main/resources/mapper/frim/FirmTypeXml.xml new file mode 100644 index 0000000..c391877 --- /dev/null +++ b/fate-firm-server/src/main/resources/mapper/frim/FirmTypeXml.xml @@ -0,0 +1,8 @@ + + + + + + diff --git a/fate-firm-server/src/main/resources/mapper/frim/FirmXml.xml b/fate-firm-server/src/main/resources/mapper/frim/FirmXml.xml index 3b545d6..b51ebfd 100644 --- a/fate-firm-server/src/main/resources/mapper/frim/FirmXml.xml +++ b/fate-firm-server/src/main/resources/mapper/frim/FirmXml.xml @@ -2,9 +2,4 @@ - - delete - from t_firm - where firm_id = #{firmId}; -