feat:行政区划

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/AreaController.java

@@ -0,0 +1,99 @@
+package com.ylx.web.controller.massage;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ylx.massage.domain.Area;
+import com.ylx.massage.service.AreaService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+import com.ylx.common.core.domain.R;
+import javax.annotation.Resource;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 区域数据(Area)表控制层
+ *
+ * @author makejava
+ * @since 2024-07-01 09:22:27
+ */
+@RestController
+@Api(tags = {"区域数据表控制层"})
+@RequestMapping("area")
+public class AreaController {
+    /**
+     * 服务对象
+     */
+    @Resource
+    private AreaService areaService;
+
+    /**
+     * 分页查询所有数据
+     *
+     * @param page 分页对象
+     * @param area 查询实体
+     * @return 所有数据
+     */
+    @GetMapping
+    public R selectAll(Page<Area> page, Area area) {
+        return R.ok(this.areaService.page(page, new QueryWrapper<>(area)));
+    }
+
+    @GetMapping("/select")
+    @ApiOperation("按层级查询")
+    public R select(Area area) {
+        LambdaQueryWrapper<Area> objectLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        objectLambdaQueryWrapper.eq(null != area.getLevel(),Area::getLevel, area.getLevel())
+                .eq(StringUtils.isNotBlank(area.getParentCode()),Area::getParentCode, area.getParentCode());
+        return R.ok(this.areaService.list(objectLambdaQueryWrapper));
+    }
+
+    /**
+     * 通过主键查询单条数据
+     *
+     * @param id 主键
+     * @return 单条数据
+     */
+    @GetMapping("{id}")
+    public R selectOne(@PathVariable Serializable id) {
+        return R.ok(this.areaService.getById(id));
+    }
+
+    /**
+     * 新增数据
+     *
+     * @param area 实体对象
+     * @return 新增结果
+     */
+    @PostMapping
+    public R insert(@RequestBody Area area) {
+        return R.ok(this.areaService.save(area));
+    }
+
+    /**
+     * 修改数据
+     *
+     * @param area 实体对象
+     * @return 修改结果
+     */
+    @PutMapping
+    public R update(@RequestBody Area area) {
+        return R.ok(this.areaService.updateById(area));
+    }
+
+    /**
+     * 删除数据
+     *
+     * @param idList 主键结合
+     * @return 删除结果
+     */
+    @DeleteMapping
+    public R delete(@RequestParam("idList") List<Long> idList) {
+        return R.ok(this.areaService.removeByIds(idList));
+    }
+}
+

nightFragrance-framework/src/main/java/com/ylx/framework/config/SecurityConfig.java

@@ -114,7 +114,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 .antMatchers("/login", "/register", "/captchaImage","/wx/login",
                         "/api/lbt/v1/getAll", "/api/js/v1/select", "/api/xiangmu/v1/wx/getAll", "/api/order/v1/getStatus",
                         "/api/xiangmu/v1/getByid", "/api/js/v1/wx/getByid","/api/js/v1/wx/select", "/api/recharge/v1/test",
-                        "/wx/pay/payNotify","/wx/pay/refundNotify","/weChat/getAccessToken","/weChat/getCode","/weChat/verifyToken","/sq/getAccessToken").permitAll()
+                        "/wx/pay/payNotify","/wx/pay/refundNotify","/weChat/getAccessToken","/weChat/getCode","/weChat/verifyToken","/sq/getAccessToken",
+                        "/area/select").permitAll()
                 // 静态资源，可匿名访问
                 .antMatchers(HttpMethod.GET, "/", "/*.txt","/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                 .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()

nightFragrance-massage/src/main/java/com/ylx/massage/domain/Area.java

@@ -0,0 +1,90 @@
+package com.ylx.massage.domain;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+/**
+ * 区域数据(Area)表实体类
+ *
+ * @author makejava
+ * @since 2024-07-01 09:22:27
+ */
+@Setter
+@Getter
+
+@ApiModel(value = "Area" ,description = "行政区划")
+@SuppressWarnings("serial")
+public class Area extends Model<Area> {
+    //主键
+    @ApiModelProperty("主键")
+    private Long id;
+    //编码
+    @ApiModelProperty("编码")
+    private String code;
+    //名称
+    @ApiModelProperty("名称")
+    private String name;
+    //父级编码，0为顶级
+    @ApiModelProperty("父级编码，0为顶级")
+    private String parentCode;
+    //数据层级
+    @ApiModelProperty("数据层级")
+    private Integer level;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getParentCode() {
+        return parentCode;
+    }
+
+    public void setParentCode(String parentCode) {
+        this.parentCode = parentCode;
+    }
+
+    public Integer getLevel() {
+        return level;
+    }
+
+    public void setLevel(Integer level) {
+        this.level = level;
+    }
+
+    /**
+     * 获取主键值
+     *
+     * @return 主键值
+     */
+    @Override
+    public Serializable pkVal() {
+        return this.id;
+    }
+}
+

nightFragrance-massage/src/main/java/com/ylx/massage/domain/TJs.java

@@ -37,6 +37,10 @@ public class TJs implements Serializable {
     @ApiModelProperty("cOpenId")
     private String cOpenId;
 
+    @TableField("city")
+    @ApiModelProperty("城市")
+    private String city;
+
     /**
      * 可预约项目编号 JsonArray
      */

nightFragrance-massage/src/main/java/com/ylx/massage/mapper/AreaMapper.java

@@ -0,0 +1,15 @@
+package com.ylx.massage.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ylx.massage.domain.Area;
+
+/**
+ * 区域数据(Area)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-07-01 09:22:27
+ */
+public interface AreaMapper extends BaseMapper<Area> {
+
+}
+

nightFragrance-massage/src/main/java/com/ylx/massage/service/AreaService.java

@@ -0,0 +1,15 @@
+package com.ylx.massage.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ylx.massage.domain.Area;
+
+/**
+ * 区域数据(Area)表服务接口
+ *
+ * @author makejava
+ * @since 2024-07-01 09:22:27
+ */
+public interface AreaService extends IService<Area> {
+
+}
+

nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/AreaServiceImpl.java

@@ -0,0 +1,19 @@
+package com.ylx.massage.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ylx.massage.mapper.AreaMapper;
+import com.ylx.massage.domain.Area;
+import com.ylx.massage.service.AreaService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 区域数据(Area)表服务实现类
+ *
+ * @author makejava
+ * @since 2024-07-01 09:22:27
+ */
+@Service("areaService")
+public class AreaServiceImpl extends ServiceImpl<AreaMapper, Area> implements AreaService {
+
+}
+

nightFragrance-massage/src/main/resources/mapper/massage/TJsMapper.xml

@@ -35,6 +35,7 @@
         <result column="n_b3" property="nB3"/>
         <result column="name" property="name"/>
         <result column="address" property="address"/>
+        <result column="city" property="city"/>
         <result column="dt_create_time" property="dtCreateTime"/>
         <result column="nNumber" property="number"/>
 
@@ -59,6 +60,7 @@
         js.n_star,
         js.n_bili,
         js.n_num,
+        js.city,
         js.n_status,
         js.n_status2,
         js.n_tong,