企业入驻完善改动

src/main/java/com/god/system/controller/SysFirmController.java

@@ -1,13 +1,12 @@
 package com.god.system.controller;
 
 import com.god.common.core.domain.Result;
+import com.god.system.domain.Firm;
 import com.god.system.domain.req.FirmDataReq;
 import com.god.system.service.SysFirmService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PatchMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 企业信息处理
@@ -26,30 +25,26 @@ public class SysFirmController {
      * @return
      */
     @GetMapping("findFirmData")
-    public Result<FirmDataReq> findFirmData(){
+    public Result<Firm> findFirmData(){
-        FirmDataReq firmDataByUserId = sysFirmService.findFirmDataByUserId();
+        Firm firm = sysFirmService.findFirmDataByUserId();
-        return Result.success(firmDataByUserId);
+        return Result.success(firm);
     }
 
     /**
      * 企业认证
-     * @param firmDataReq
-     * @return
      */
-    @PatchMapping("insertFirm")
+    @PostMapping
-    public Result insertFirm(FirmDataReq firmDataReq){
+    public Result insertFirm(@RequestBody @Validated FirmDataReq firmDataReq){
-        sysFirmService.insertFirm(firmDataReq);
+        sysFirmService.insertFirm(Firm.FirmDataReqBuild(firmDataReq));
         return Result.success();
     }
 
     /**
      * 修改企业认证信息
-     * @param firmDataReq
-     * @return
      */
-    @PatchMapping("updateFirm")
+    @PostMapping
-    public Result updateFirm(FirmDataReq firmDataReq){
+    public Result updateFirm(@RequestBody @Validated FirmDataReq firmDataReq){
-        sysFirmService.updateFirmData(firmDataReq);
+        sysFirmService.updateFirmData(Firm.FirmDataReqBuild(firmDataReq));
         return Result.success();
     }
 }

src/main/java/com/god/system/domain/Firm.java

@@ -0,0 +1,60 @@
+package com.god.system.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.god.common.core.annotation.Excel;
+import com.god.system.domain.req.FirmDataReq;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import javax.validation.constraints.NotEmpty;
+
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@TableName("sys_fire")
+@NotEmpty(message = "参数不能为空")
+public class Firm {
+    /**
+     * 参数主键
+     */
+    @Excel(name = "参数主键", cellType = Excel.ColumnType.NUMERIC)
+    @TableId( type = IdType.AUTO)
+    private Long userId;
+
+    /**
+     * 企业名称
+     */
+    @Excel(name = "参数名称")
+    @NotEmpty(message = "公司名称不能为空")
+    private String fireName;
+
+    /**
+     * 注册金额
+     */
+    @Excel(name = "注册金额")
+    @NotEmpty(message = "注册金额不能为空")
+    private Double registeredAmount;
+
+    /**
+     * 地址
+     */
+    @Excel(name = "地址")
+    @NotEmpty(message = "公司地址不能为空")
+    private String address;
+
+    public static Firm FirmDataReqBuild(FirmDataReq firmDataReq){
+        return Firm.builder()
+                .userId(firmDataReq.getUserId())
+                .fireName(firmDataReq.getFireName())
+                .registeredAmount(firmDataReq.getRegisteredAmount())
+                .address(firmDataReq.getAddress())
+                .build();
+    }
+
+}

src/main/java/com/god/system/domain/req/FirmDataReq.java

@@ -9,6 +9,8 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
+import javax.validation.constraints.NotNull;
+
 @Data
 @SuperBuilder
 @NoArgsConstructor
@@ -19,13 +21,13 @@ public class FirmDataReq {
      * 参数主键
      */
     @Excel(name = "参数主键", cellType = Excel.ColumnType.NUMERIC)
-    @TableId( type = IdType.AUTO)
     private Long userId;
 
     /**
      * 企业名称
      */
     @Excel(name = "参数名称")
+    @NotNull(message = "公司名称不能为空")
     private String fireName;
 
     /**

src/main/java/com/god/system/domain/resp/AuthRoleResp.java

@@ -30,4 +30,6 @@ public class AuthRoleResp {
      * 角色集合
      */
     private List<SysRole> roles;
+
+
 }

src/main/java/com/god/system/mapper/SysFirmMapper.java

@@ -1,6 +1,7 @@
 package com.god.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.god.system.domain.Firm;
 import com.god.system.domain.req.FirmDataReq;
 import org.apache.ibatis.annotations.Param;
 
@@ -9,11 +10,6 @@ import org.apache.ibatis.annotations.Param;
  * @description: 配置mybatis配置
  * @Date 2023-11-13 上午 10:05
  */
-public interface SysFirmMapper {
+public interface SysFirmMapper  extends BaseMapper<Firm> {
-    FirmDataReq findFirmDataByUserId(@Param("userId") Long userId);
 
-
-    int insertFirm(FirmDataReq firmDataReq);
-
-    int updateFirmData(FirmDataReq firmDataReq);
 }

src/main/java/com/god/system/service/SysFirmService.java

@@ -1,6 +1,8 @@
 package com.god.system.service;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.god.system.domain.Firm;
 import com.god.system.domain.req.FirmDataReq;
 
 import java.util.List;
@@ -10,22 +12,22 @@ import java.util.List;
  * @description: 配置plus业务层
  * @Date 2023-11-13 上午 10:06
  */
-public interface SysFirmService {
+public interface SysFirmService extends IService<Firm>{
     /**
      * 根据用户id查询企业
-     * @return
+     * @return FirmDataReq
      */
-    FirmDataReq findFirmDataByUserId ();
+    Firm findFirmDataByUserId ();
 
     /**
      * 企业入驻
      */
-    void insertFirm (FirmDataReq firmDataReq);
+    void insertFirm (Firm firm);
 
     /**
      * 修改企业信息
      */
-    public void updateFirmData (FirmDataReq firmDataReq);
+    public void updateFirmData (Firm firm);
 
 
 }

src/main/java/com/god/system/service/impl/SysFirmServiceImpl.java

@@ -1,14 +1,15 @@
 package com.god.system.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.god.common.core.exception.ServiceException;
 import com.god.common.core.utils.StringUtils;
-import com.god.common.redis.service.RedisService;
 import com.god.common.security.utils.SecurityUtils;
+import com.god.system.domain.Firm;
 import com.god.system.domain.req.FirmDataReq;
 import com.god.system.mapper.SysFirmMapper;
 import com.god.system.service.SysFirmService;
-import org.apache.poi.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -25,7 +26,7 @@ import java.util.Objects;
  * @Date 2023-11-13 上午 10:06
  */
 @Service
-public class SysFirmServiceImpl implements SysFirmService {
+public class SysFirmServiceImpl extends ServiceImpl<SysFirmMapper,Firm> implements SysFirmService{
 
     @Autowired
     private SysFirmMapper sysFirmMapper;
@@ -34,42 +35,45 @@ public class SysFirmServiceImpl implements SysFirmService {
     /**
      * 根据用户查询企业
      *
-     * @return
+     * @return firmDataReq
      */
     @Override
-    public FirmDataReq findFirmDataByUserId() {
+    public Firm findFirmDataByUserId() {
         Long userId = SecurityUtils.getUserId();
-        FirmDataReq firmDataReq = sysFirmMapper.findFirmDataByUserId(userId);
+        QueryWrapper<Firm> firmDataReqQueryWrapper = new QueryWrapper<>();
-        if (StringUtils.isNull(firmDataReq)){
+        firmDataReqQueryWrapper.eq(true,"userId",userId);
+        Firm firm = sysFirmMapper.selectById(firmDataReqQueryWrapper);
+        if (StringUtils.isNull(firm)){
             throw  new ServiceException("请先进行企业认证");
         }
-        return firmDataReq;
+        return firm;
     }
 
     /**
      * 企业入驻
-     * @param firmDataReq
+     * @param firm
      */
     @Override
-    public void insertFirm(FirmDataReq firmDataReq) {
+    public void insertFirm(Firm firm) {
         Long userId = SecurityUtils.getUserId();
-        firmDataReq.setUserId(userId);
+        firm.setUserId(userId);
-        int i = sysFirmMapper.insertFirm(firmDataReq);
+        boolean save = this.save(firm);
-        if (i<1){
+        if (!save){
             throw  new ServiceException("企业认证失败");
         }
     }
 
     /**
      * 更改企业信息
-     * @param firmDataReq
+     * @param firm
      */
     @Override
-    public void updateFirmData(FirmDataReq firmDataReq) {
+    public void updateFirmData(Firm firm) {
         Long userId = SecurityUtils.getUserId();
-        firmDataReq.setUserId(userId);
+        firm.setUserId(userId);
-        int i = sysFirmMapper.updateFirmData(firmDataReq);
+        UpdateWrapper<Firm> firmUpdateWrapper = new UpdateWrapper<>();
-        if (i<1){
+        boolean update = this.update(firm, firmUpdateWrapper);
+        if (!update){
             throw  new ServiceException("修改失败");
         }
     }

src/main/resources/mapper/system/SysFirmMapper.xml

@@ -4,19 +4,4 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.god.system.mapper.SysFirmMapper">
 
-    <insert id="insertFirm">
-        insert into sys_firm (user_id,firm_name,registered_amount,address)
-        values (#{userId},#{fireName},#{registeredAmount},#{address})
-    </insert>
-
-    <update id="updateFirmData">
-        update sys_firm
-        set firm_name = #{fireName},registered_amount=#{registeredAmount},address=#{address}
-        where user_id = #{userId}
-    </update>
-
-    <select id="findFirmDataByUserId" resultType="com.god.system.domain.req.FirmDataReq">
-        select user_id,firm_name,registered_amount,address from sys_firm
-        where user_id = #{userId}
-    </select>
 </mapper>