Browse Source

添加楼栋表数据,修改菜单栏接口

liu 1 year ago
parent
commit
b0ea8ebb5b

+ 1 - 1
src/main/java/com/template/AutoCode.java

@@ -56,7 +56,7 @@ public class AutoCode {
         mpg.setPackageInfo(pc);
         mpg.setPackageInfo(pc);
         //4、策略配置
         //4、策略配置
         StrategyConfig strategy = new StrategyConfig();
         StrategyConfig strategy = new StrategyConfig();
-        strategy.setInclude("tb_course_scheduling"); // 设置要映射的表名
+        strategy.setInclude("building"); // 设置要映射的表名
         strategy.setNaming(NamingStrategy.underline_to_camel);//下划线转驼峰
         strategy.setNaming(NamingStrategy.underline_to_camel);//下划线转驼峰
         strategy.setColumnNaming(NamingStrategy.underline_to_camel);//下划线转驼峰
         strategy.setColumnNaming(NamingStrategy.underline_to_camel);//下划线转驼峰
         strategy.setEntityLombokModel(true); // 自动lombok;
         strategy.setEntityLombokModel(true); // 自动lombok;

+ 7 - 0
src/main/java/com/template/api/BuildingControllerAPI.java

@@ -0,0 +1,7 @@
+package com.template.api;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@RequestMapping("/auto/building")
+public interface BuildingControllerAPI {
+}

+ 20 - 0
src/main/java/com/template/controller/BuildingController.java

@@ -0,0 +1,20 @@
+package com.template.controller;
+
+
+import com.template.api.BuildingControllerAPI;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author ceshi
+ * @since 2024-08-08
+ */
+@RestController
+public class BuildingController implements BuildingControllerAPI {
+
+}
+

+ 1 - 1
src/main/java/com/template/controller/LoginController.java

@@ -967,7 +967,7 @@ public class LoginController implements LoginControllerAPI {
                 functionPointVo5.setFunctionPoint("设施服务设置");
                 functionPointVo5.setFunctionPoint("设施服务设置");
                 vos13.add(functionPointVo5);
                 vos13.add(functionPointVo5);
 
 
-                FunctionPointVo functionPointVo6 = ifContains(systemManagement, "5");
+                FunctionPointVo functionPointVo6 = ifContains(systemManagement, "6");
                 functionPointVo6.setFunctionPoint("查看界面");
                 functionPointVo6.setFunctionPoint("查看界面");
                 vos13.add(functionPointVo6);
                 vos13.add(functionPointVo6);
             }
             }

+ 4 - 1
src/main/java/com/template/controller/UsersController.java

@@ -61,8 +61,11 @@ public class UsersController implements UsersAPI {
 
 
 //        通过身份证号判断是否已经添加
 //        通过身份证号判断是否已经添加
         String idCard = usersDto.getIdCard();
         String idCard = usersDto.getIdCard();
+        String cardNumber = usersDto.getCardNumber();
         LambdaQueryWrapper<Users> wrapperU = new LambdaQueryWrapper<>();
         LambdaQueryWrapper<Users> wrapperU = new LambdaQueryWrapper<>();
-        wrapperU.eq(Users::getIdCard, idCard);
+        wrapperU.eq(Users::getCardNumber, cardNumber)
+                .or()
+                .eq(Users::getIdCard,idCard);
         Users one = usersService.getOne(wrapperU);
         Users one = usersService.getOne(wrapperU);
         if (ObjectUtils.isNotEmpty(one)) {
         if (ObjectUtils.isNotEmpty(one)) {
             return CommonResult.fail("用户已存在");
             return CommonResult.fail("用户已存在");

+ 18 - 0
src/main/java/com/template/mapper/BuildingMapper.java

@@ -0,0 +1,18 @@
+package com.template.mapper;
+
+import com.template.model.pojo.Building;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ceshi
+ * @since 2024-08-08
+ */
+@Mapper
+public interface BuildingMapper extends BaseMapper<Building> {
+
+}

+ 60 - 0
src/main/java/com/template/model/pojo/Building.java

@@ -0,0 +1,60 @@
+package com.template.model.pojo;
+
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ceshi
+ * @since 2024-08-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="Building对象", description="")
+public class Building implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "楼栋表")
+    @TableId(value = "id", type = IdType.UUID)
+    private Integer id;
+
+    @ApiModelProperty(value = "楼栋")
+    private String building;
+
+    @ApiModelProperty(value = "单元")
+    private String element;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private String createTime;
+
+    @ApiModelProperty(value = "更新时间")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateTime;
+
+    @ApiModelProperty(value = "创建人员")
+    @TableField(fill = FieldFill.INSERT)
+    private String createUser;
+
+    @ApiModelProperty(value = "更新人员")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateUser;
+
+    @ApiModelProperty(value = "逻辑删除 未删除:0;删除:1")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer deleted;
+
+
+}

+ 16 - 0
src/main/java/com/template/services/BuildingService.java

@@ -0,0 +1,16 @@
+package com.template.services;
+
+import com.template.model.pojo.Building;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author ceshi
+ * @since 2024-08-08
+ */
+public interface BuildingService extends IService<Building> {
+
+}

+ 20 - 0
src/main/java/com/template/services/impl/BuildingServiceImpl.java

@@ -0,0 +1,20 @@
+package com.template.services.impl;
+
+import com.template.model.pojo.Building;
+import com.template.mapper.BuildingMapper;
+import com.template.services.BuildingService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author ceshi
+ * @since 2024-08-08
+ */
+@Service
+public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> implements BuildingService {
+
+}

+ 5 - 0
src/main/resources/mapper/template/BuildingMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.template.mapper.BuildingMapper">
+
+</mapper>