diff --git a/fate-firm-common/pom.xml b/fate-firm-common/pom.xml index 27e6229..df452cf 100644 --- a/fate-firm-common/pom.xml +++ b/fate-firm-common/pom.xml @@ -21,12 +21,10 @@ com.fate fate-common-core - 3.6.3 com.fate fate-common-redis - 3.6.3 org.projectlombok @@ -40,5 +38,33 @@ org.springframework.boot spring-boot-actuator-autoconfigure + + com.baomidou + mybatis-plus-boot-starter + 3.5.0 + + + + com.fate + fate-common-datasource + + + + + com.fate + fate-common-datascope + + + + + com.fate + fate-common-log + + + + + com.fate + fate-common-swagger + diff --git a/fate-firm-common/src/main/java/com/fate/firm/domain/Firm.java b/fate-firm-common/src/main/java/com/fate/firm/domain/Firm.java index 3b9d0ff..76cc230 100644 --- a/fate-firm-common/src/main/java/com/fate/firm/domain/Firm.java +++ b/fate-firm-common/src/main/java/com/fate/firm/domain/Firm.java @@ -1,6 +1,8 @@ package com.fate.firm.domain; import com.baomidou.mybatisplus.annotation.*; +import com.fate.common.core.annotation.Excel; +import com.fate.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; @@ -20,49 +22,53 @@ import java.util.Date; @SuperBuilder @NoArgsConstructor @AllArgsConstructor +@EqualsAndHashCode(callSuper = true) @TableName("t_firm") -@ApiModel(value = "Firm对象", description = "企业公司") -@EqualsAndHashCode(callSuper = false) -public class Firm { +public class Firm extends BaseEntity { + private static final long serialVersionUID = 1L; - @ApiModelProperty("企业主键") - @TableId(value = "firm_id", type = IdType.AUTO) + @Excel(name = "企业主键",cellType = Excel.ColumnType.NUMERIC) + @TableId( type = IdType.AUTO) private Integer firmId; - @ApiModelProperty("企业名称") + @Excel(name = "企业名称") @TableField("firm_name") private String firmName; - @ApiModelProperty("企业地址") + @Excel(name = "企业地址") @TableField("firm_address") private String firmAddress; - @ApiModelProperty("企业电话") + @Excel(name = "企业电话") @TableField("firm_phone") private String firmPhone; - @ApiModelProperty("企业类型") + @Excel(name = "企业类型") @TableField("firm_right") private Integer firmRight; - @ApiModelProperty("企业状态") + @Excel(name = "企业状态") @TableField("firm_staus") private Integer firmStaus; - @ApiModelProperty("创建人") - @TableField("create_id") - private Integer createId; + @Excel(name = "创建人") + @TableField("create_by") + private String createBy; - @ApiModelProperty("创建时间") + @Excel(name = "创建时间") @TableField(value = "create_time", fill = FieldFill.INSERT) private Date createTime; - @ApiModelProperty("修改人") - @TableField("update_id") - private Integer updateId; + @Excel(name = "修改人") + @TableField("update_by") + private String updateBy; - @ApiModelProperty("修改时间") + @Excel(name = "修改时间") @TableField(value = "update_time",fill = FieldFill.INSERT) private Date updateTime; + @Excel(name = "备注") + @TableField("remark") + private String remark; + } diff --git a/fate-firm-server/pom.xml b/fate-firm-server/pom.xml index 4705870..61a7b45 100644 --- a/fate-firm-server/pom.xml +++ b/fate-firm-server/pom.xml @@ -19,6 +19,7 @@ + com.alibaba.cloud @@ -52,46 +53,35 @@ - mysql - mysql-connector-java + com.mysql + mysql-connector-j + 8.0.33 com.fate fate-common-datasource - 3.6.3 com.fate fate-common-datascope - 3.6.3 com.fate fate-common-log - 3.6.3 com.fate fate-common-swagger - 3.6.3 - - - com.fate - fate-common-security - 3.6.3 - - - com.fate @@ -107,21 +97,6 @@ - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - - + diff --git a/fate-firm-server/src/main/java/com/fate/firm/FirmApplication.java b/fate-firm-server/src/main/java/com/fate/firm/FirmApplication.java index a49c36a..8b1bead 100644 --- a/fate-firm-server/src/main/java/com/fate/firm/FirmApplication.java +++ b/fate-firm-server/src/main/java/com/fate/firm/FirmApplication.java @@ -18,9 +18,9 @@ import javax.swing.*; @EnableCustomConfig @EnableCustomSwagger2 @EnableMyFeignClients -@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}) +@SpringBootApplication public class FirmApplication { public static void main(String[] args) { - SpringApplication.run(FirmApplication.class); + SpringApplication.run(FirmApplication.class,args); } } 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 485e00d..b3f5501 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 @@ -1,7 +1,11 @@ package com.fate.firm.controller; +import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.service.FirmService; import io.swagger.v3.oas.annotations.parameters.RequestBody; @@ -14,6 +18,7 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletRequest; import java.util.List; /** @@ -27,10 +32,13 @@ import java.util.List; @RestController @RequestMapping("/firm") @Log4j2 -public class FirmController { +public class FirmController extends BaseController { @Autowired private FirmService firmService; + @Autowired + private HttpServletRequest request; + @PostMapping("/addList") public Result addList(@RequestBody Firm firm) { @@ -50,11 +58,20 @@ public class FirmController { return Result.success(list); } + /** + * 查询 + * @author: ZhuoXin + * @date: 2023/11/20 10:24 + * @param: [] + * @return: com.fate.common.core.domain.Result> + **/ @GetMapping("/listAll") public Result> listAll(){ - - List list = firmService.listAll(); - + log.info("功能:查询我的公司,URI:{},方法:{}",request.getRequestURI(),request.getMethod()); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.like(Firm::getCreateBy,"1"); + List list = firmService.list(queryWrapper); + log.info("功能:查询我的公司,URI:{},方法:{},响应:{}",request.getRequestURI(),request.getMethod(), JSON.toJSONString(list)); return Result.success(list); } 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 05b7e5b..e854af6 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 @@ -17,7 +17,4 @@ import java.util.List; */ @Mapper public interface FirmMapper extends BaseMapper { - - List listAll(); - } 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 16af196..6d1cd11 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 @@ -6,7 +6,6 @@ import com.fate.firm.domain.Firm; import java.util.List; - /** *

* 企业公司 服务类 @@ -15,6 +14,7 @@ import java.util.List; * @author sikadi * @since 2023-11-18 06:27:02 */ + public interface FirmService extends IService { Result addList(Firm firm); @@ -24,5 +24,4 @@ public interface FirmService extends IService { List listSel(Firm firm); - List listAll(); } 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 e8cd023..06e5470 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 @@ -31,9 +31,6 @@ public class FirmServiceImpl extends ServiceImpl implements Fi @Override public Result addList(Firm firm) { - firm.setCreateId(Math.toIntExact(SecurityUtils.getUserId())); - firm.setCreateTime(new Date()); - firm.setUpdateId(0); firm.setUpdateTime(null); firm.setFirmStaus(1); int insert = firmMapper.insert(firm); @@ -42,8 +39,6 @@ public class FirmServiceImpl extends ServiceImpl implements Fi @Override public Result updateLL(Firm firm) { - - firm.setUpdateId(Math.toIntExact(SecurityUtils.getUserId())); firm.setCreateTime(new Date()); int i = firmMapper.updateById(firm); return i>0?Result.success("成功"):Result.error("失败"); @@ -65,8 +60,4 @@ public class FirmServiceImpl extends ServiceImpl implements Fi return list; } - @Override - public List listAll() { - return firmMapper.listAll(); - } } diff --git a/fate-firm-server/src/main/resources/bootstrap.yml b/fate-firm-server/src/main/resources/bootstrap.yml index fcbdcfe..433c6f8 100644 --- a/fate-firm-server/src/main/resources/bootstrap.yml +++ b/fate-firm-server/src/main/resources/bootstrap.yml @@ -17,12 +17,17 @@ spring: server-addr: 182.254.222.21:8848 config: # 配置中心地址 - server-addr: 184.254.222.21:8848 + server-addr: 182.254.222.21:8848 # 配置文件格式 file-extension: yml # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} -mybatis: - configuration: - map-underscore-to-camel-case: true +logging: + level: + com.fate.system.mapper: DEBUG + + +#mybatis: +# configuration: +# map-underscore-to-camel-case: true diff --git a/fate-firm-server/src/main/resources/logback.xml b/fate-firm-server/src/main/resources/logback.xml index 6bb7325..9c6c4eb 100644 --- a/fate-firm-server/src/main/resources/logback.xml +++ b/fate-firm-server/src/main/resources/logback.xml @@ -1,7 +1,7 @@ - + diff --git a/fate-firm-server/src/main/resources/mapper/FirmXml.xml b/fate-firm-server/src/main/resources/mapper/frim/FirmXml.xml similarity index 64% rename from fate-firm-server/src/main/resources/mapper/FirmXml.xml rename to fate-firm-server/src/main/resources/mapper/frim/FirmXml.xml index 7141104..b51ebfd 100644 --- a/fate-firm-server/src/main/resources/mapper/FirmXml.xml +++ b/fate-firm-server/src/main/resources/mapper/frim/FirmXml.xml @@ -2,8 +2,4 @@ -