no message

bus-biz/src/main/java/bus/mapper/BBusInfoMapper.java

@@ -0,0 +1,20 @@
+package bus.mapper;
+
+import bus.model.dto.BBusInfoDto;
+import bus.model.dto.page.BBusInfoPageDto;
+import bus.model.po.*;
+import org.apache.ibatis.annotations.Mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
+
+/**
+ * @Program: bus
+ * @Description: 描述
+ * @Author: zy
+ * @Date: 2025-03-01 10:04:08
+ **/
+@Mapper
+public interface BBusInfoMapper extends BaseMapper<BBusInfoPo> {
+
+    List<BBusInfoDto> list(BBusInfoPageDto dto);
+}

bus-biz/src/main/java/bus/mapper/BNoticeInfoMapper.java

@@ -0,0 +1,21 @@
+package bus.mapper;
+
+import bus.model.dto.BNoticeInfoDto;
+import bus.model.dto.page.BNoticeInfoPageDto;
+import bus.model.vo.BNoticeInfoVo;
+import bus.model.po.*;
+import org.apache.ibatis.annotations.Mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
+
+/**
+ * @Program: bus
+ * @Description: 描述
+ * @Author: zy
+ * @Date: 2025-03-01 10:21:43
+ **/
+@Mapper
+public interface BNoticeInfoMapper extends BaseMapper<BNoticeInfoPo> {
+
+    List<BNoticeInfoDto> list(BNoticeInfoPageDto dto);
+}

bus-biz/src/main/java/bus/mapper/BRegionMapper.java

@@ -0,0 +1,21 @@
+package bus.mapper;
+
+import bus.model.dto.BRegionDto;
+import bus.model.dto.BRegionPageDto;
+import bus.model.vo.BRegionVo;
+import bus.model.po.*;
+import org.apache.ibatis.annotations.Mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
+
+/**
+ * @Program: bus
+ * @Description: 描述
+ * @Author: zy
+ * @Date: 2025-03-01 18:02:30
+ **/
+@Mapper
+public interface BRegionMapper extends BaseMapper<BRegionPo> {
+
+    List<BRegionDto> list(BRegionPageDto dto);
+}

bus-biz/src/main/java/bus/mapper/BStationInfoMapper.java

@@ -0,0 +1,21 @@
+package bus.mapper;
+
+import bus.model.dto.BStationInfoDto;
+import bus.model.dto.BStationInfoPageDto;
+import bus.model.vo.BStationInfoVo;
+import bus.model.po.*;
+import org.apache.ibatis.annotations.Mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
+
+/**
+ * @Program: bus
+ * @Description: 描述
+ * @Author: zy
+ * @Date: 2025-03-01 21:07:50
+ **/
+@Mapper
+public interface BStationInfoMapper extends BaseMapper<BStationInfoPo> {
+
+    List<BStationInfoDto> list(BStationInfoPageDto dto);
+}

bus-biz/src/main/java/bus/mapper/BTestMapper.java

@@ -1,6 +1,6 @@
 package bus.mapper;
 
-import bus.model.dto.BTestPageDto;
+import bus.model.dto.page.BTestPageDto;
 import bus.model.vo.BTestVo;
 import bus.model.po.*;
 import org.apache.ibatis.annotations.Mapper;

bus-biz/src/main/java/bus/mapper/WChatUserMapper.java

@@ -1,7 +1,7 @@
 package bus.mapper;
 
 import bus.model.dto.WChatUserDto;
-import bus.model.dto.WChatUserPageDto;
+import bus.model.dto.page.WChatUserPageDto;
 import bus.model.po.*;
 import org.apache.ibatis.annotations.Mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

bus-biz/src/main/java/bus/service/BBusInfoService.java

@@ -0,0 +1,51 @@
+package bus.service;
+
+import bus.model.dto.BBusInfoDto;
+import bus.model.dto.page.BBusInfoPageDto;
+
+import java.util.List;
+
+/**
+ * @Program: bus
+ * @Description: 描述
+ * @Author: zy
+ * @Date: 2025-03-01 10:04:08
+ **/
+public interface BBusInfoService {
+
+
+    /**
+     * 详情
+     * @param id
+     * @return
+     */
+    BBusInfoDto getDetailById(String id);
+
+	/**
+     * 保存
+     * @param dto
+     * @return
+     */
+    void save(BBusInfoDto dto);
+
+    /**
+    * 列表
+    * @param dto
+    * @return
+    */
+    List<BBusInfoDto> list(BBusInfoPageDto dto);
+
+	/**
+     * 修改
+     * @param dto
+     * @return
+     */
+    void update(BBusInfoDto dto);
+
+	/**
+     * 删除
+     * @param id
+     * @return
+     */
+    void delete(String id);
+}

bus-biz/src/main/java/bus/service/BNoticeInfoService.java

@@ -0,0 +1,54 @@
+package bus.service;
+
+import bus.model.dto.BNoticeInfoDto;
+import bus.model.dto.page.BNoticeInfoPageDto;
+import bus.model.vo.BNoticeInfoVo;
+import bus.model.po.BNoticeInfoPo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * @Program: bus
+ * @Description: 描述
+ * @Author: zy
+ * @Date: 2025-03-01 10:21:43
+ **/
+public interface BNoticeInfoService extends IService<BNoticeInfoPo> {
+
+
+    /**
+     * 详情
+     * @param id
+     * @return
+     */
+    BNoticeInfoDto getDetailById(String id);
+
+	/**
+     * 保存
+     * @param dto
+     * @return
+     */
+    void save(BNoticeInfoDto dto);
+
+    /**
+    * 列表
+    * @param dto
+    * @return
+    */
+    List<BNoticeInfoDto> list(BNoticeInfoPageDto dto);
+
+	/**
+     * 修改
+     * @param dto
+     * @return
+     */
+    void update(BNoticeInfoDto dto);
+
+	/**
+     * 删除
+     * @param id
+     * @return
+     */
+    void delete(String id);
+}

bus-biz/src/main/java/bus/service/BRegionService.java

@@ -0,0 +1,54 @@
+package bus.service;
+
+import bus.model.dto.BRegionDto;
+import bus.model.dto.BRegionPageDto;
+import bus.model.vo.BRegionVo;
+import bus.model.po.BRegionPo;
+import java.util.List;
+
+/**
+ * @Program: bus
+ * @Description: 描述
+ * @Author: zy
+ * @Date: 2025-03-01 18:02:30
+ **/
+public interface BRegionService {
+
+
+    /**
+     * 详情
+     * @param id
+     * @return
+     */
+    BRegionPo getDetailById(String id);
+
+	/**
+     * 保存
+     * @param dto
+     * @return
+     */
+    void save(BRegionDto dto);
+
+    /**
+    * 列表
+    * @param dto
+    * @return
+    */
+    List<BRegionDto> list(BRegionPageDto dto);
+
+	/**
+     * 修改
+     * @param dto
+     * @return
+     */
+    void update(BRegionDto dto);
+
+	/**
+     * 删除
+     * @param id
+     * @return
+     */
+    void delete(String id);
+
+
+}

bus-biz/src/main/java/bus/service/BStationInfoService.java

@@ -0,0 +1,52 @@
+package bus.service;
+
+import bus.model.dto.BStationInfoDto;
+import bus.model.dto.BStationInfoPageDto;
+import bus.model.vo.BStationInfoVo;
+import bus.model.po.BStationInfoPo;
+import java.util.List;
+
+/**
+ * @Program: bus
+ * @Description: 描述
+ * @Author: zy
+ * @Date: 2025-03-01 21:07:50
+ **/
+public interface BStationInfoService {
+
+
+    /**
+     * 详情
+     * @param id
+     * @return
+     */
+    BStationInfoDto getDetailById(String id);
+
+	/**
+     * 保存
+     * @param dto
+     * @return
+     */
+    void save(BStationInfoDto dto);
+
+    /**
+    * 列表
+    * @param dto
+    * @return
+    */
+    List<BStationInfoDto> list(BStationInfoPageDto dto);
+
+	/**
+     * 修改
+     * @param dto
+     * @return
+     */
+    void update(BStationInfoDto dto);
+
+	/**
+     * 删除
+     * @param id
+     * @return
+     */
+    void delete(String id);
+}

bus-biz/src/main/java/bus/service/BTestService.java

@@ -1,7 +1,7 @@
 package bus.service;
 
 import bus.model.dto.BTestDto;
-import bus.model.dto.BTestPageDto;
+import bus.model.dto.page.BTestPageDto;
 import bus.model.vo.BTestVo;
 import bus.model.po.BTestPo;
 import java.util.List;

bus-biz/src/main/java/bus/service/CommonService.java

@@ -14,7 +14,7 @@ import java.util.List;
 * @Program: bus
 * @Description: 描述
 * @Author: zy
-* @Date: 2025-02-28 16:46:43
+* @Date: 2025-03-01 21:07:50
 **/
 public interface CommonService {
 

bus-biz/src/main/java/bus/service/WChatUserService.java

@@ -1,9 +1,13 @@
 package bus.service;
 
 import bus.model.dto.WChatUserDto;
-import bus.model.dto.WChatUserPageDto;
-import bus.model.vo.WChatUserVo;
+import bus.model.dto.page.WChatUserPageDto;
+import bus.model.dto.req.WxLoginReq;
 import bus.model.po.WChatUserPo;
+import com.orcas.common.sso.model.SsoUserAuthDto;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -15,6 +19,8 @@ import java.util.List;
 public interface WChatUserService {
 
 
+    SsoUserAuthDto wxLogin(HttpServletRequest request, HttpServletResponse response, WxLoginReq wxLoginReq);
+
     /**
      * 详情
      * @param id

bus-biz/src/main/java/bus/service/impl/BBusInfoServiceImpl.java

@@ -0,0 +1,134 @@
+package bus.service.impl;
+
+import bus.model.SnowflakeUtil;
+import bus.model.dto.BBusInfoDto;
+import bus.model.dto.page.BBusInfoPageDto;
+import bus.model.vo.BBusInfoVo;
+import bus.model.po.BBusInfoPo;
+import bus.mapper.BBusInfoMapper;
+
+import bus.service.BBusInfoService;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.PhoneUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.orcas.common.sso.model.ExtInfo;
+import com.orcas.iso.config.common.user.CurrentUserHolder;
+import com.qzwisdom.qzframework.core.tool.exception.BusinessException;
+import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.BeanUtils;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Program: bus
+ * @Description: 描述
+ * @Author: zy
+ * @Date: 2025-03-01 09:44:24
+ **/
+@Service
+public class BBusInfoServiceImpl extends ServiceImpl<BBusInfoMapper,BBusInfoPo> implements BBusInfoService {
+
+    @Autowired
+    private BBusInfoMapper bBusInfoMapper;
+    @Resource
+    private SnowflakeUtil snowflakeUtil;
+
+	/**
+     * 详情
+     * @param id
+     * @return
+     */
+    @Override
+    public BBusInfoDto getDetailById(String id){
+        BBusInfoPo bBusInfoPo = this.bBusInfoMapper.selectById(id);
+        BBusInfoDto bBusInfoDto = BeanUtil.toBean(bBusInfoPo, BBusInfoDto.class);
+        return bBusInfoDto;
+    }
+
+	/**
+     * 保存
+     * @param dto
+     * @return
+     */
+    @Override
+	public void save(BBusInfoDto dto){
+        BBusInfoPo existingBus = this.bBusInfoMapper.selectOne(
+                new QueryWrapper<BBusInfoPo>()
+                        .eq("is_delete",0)
+                        .eq("bus_no", dto.getBusNo())
+        );
+        if (existingBus != null) {
+            throw new BusinessException("车牌号已存在，请检查后重试");
+        }
+        BBusInfoPo po = new BBusInfoPo();
+        BeanUtils.copyProperties(dto,po);
+        String driverPhone = po.getDriverPhone();
+        boolean phone = PhoneUtil.isPhone(driverPhone);
+        if(!phone){
+            throw new BusinessException("手机号格式不正确");
+        }
+        ExtInfo extInfo = CurrentUserHolder.get();
+        po.setId(snowflakeUtil.snowflakeId());
+        po.setCreateTime(new Date());
+        po.setUpdateTime(new Date());
+        po.setCreatorId(extInfo.getUserId());
+        po.setUpdaterId(extInfo.getUserId());
+        po.setCreatorName(extInfo.getUserName());
+        po.setUpdaterName(extInfo.getUserName());
+		this.bBusInfoMapper.insert(po);
+    }
+
+    /**
+    * 列表
+    * @param dto
+    * @return
+    */
+    @Override
+    public List<BBusInfoDto> list(BBusInfoPageDto dto){
+        return this.bBusInfoMapper.list(dto);
+    }
+
+	/**
+     * 修改
+     * @param dto
+     * @return
+     */
+    @Override
+    public void update(BBusInfoDto dto){
+        BBusInfoPo existingBus = this.bBusInfoMapper.selectOne(
+                new QueryWrapper<BBusInfoPo>()
+                        .eq("bus_no", dto.getBusNo())
+                        .eq("is_delete",0)
+                        .ne("id", dto.getId())
+        );
+        if (existingBus != null) {
+            throw new BusinessException("车牌号已存在，请检查后重试");
+        }
+        BBusInfoPo po = new BBusInfoPo();
+        BeanUtils.copyProperties(dto,po);
+        String driverPhone = po.getDriverPhone();
+        boolean phone = PhoneUtil.isPhone(driverPhone);
+        if(!phone){
+            throw new BusinessException("手机号格式不正确");
+        }
+        ExtInfo extInfo = CurrentUserHolder.get();
+        po.setUpdateTime(new Date());
+        po.setUpdaterId(extInfo.getUserId());
+        po.setUpdaterName(extInfo.getUserName());
+		bBusInfoMapper.updateById(po);
+    }
+
+    /**
+     * 删除
+     * @param id
+     * @return
+     */
+    @Override
+    public void delete(String id){
+		bBusInfoMapper.deleteById(id);
+    }
+}

bus-biz/src/main/java/bus/service/impl/BNoticeInfoServiceImpl.java

@@ -0,0 +1,113 @@
+package bus.service.impl;
+
+import bus.model.SnowflakeUtil;
+import bus.model.dto.BNoticeInfoDto;
+import bus.model.dto.page.BNoticeInfoPageDto;
+import bus.model.po.BBusInfoPo;
+import bus.model.vo.BNoticeInfoVo;
+import bus.model.po.BNoticeInfoPo;
+import bus.mapper.BNoticeInfoMapper;
+
+import bus.service.BNoticeInfoService;
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.orcas.common.sso.model.ExtInfo;
+import com.orcas.iso.config.common.user.CurrentUserHolder;
+import com.qzwisdom.qzframework.core.tool.exception.BusinessException;
+import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.BeanUtils;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Program: bus
+ * @Description: 描述
+ * @Author: zy
+ * @Date: 2025-03-01 10:21:43
+ **/
+@Service
+public class BNoticeInfoServiceImpl extends ServiceImpl<BNoticeInfoMapper, BNoticeInfoPo> implements BNoticeInfoService {
+
+    @Autowired
+    private BNoticeInfoMapper bNoticeInfoMapper;
+    @Resource
+    private SnowflakeUtil snowflakeUtil;
+
+	/**
+     * 详情
+     * @param id
+     * @return
+     */
+    @Override
+    public BNoticeInfoDto getDetailById(String id){
+        BNoticeInfoPo bNoticeInfoPo = this.bNoticeInfoMapper.selectById(id);
+        BNoticeInfoDto bNoticeInfoDto = BeanUtil.toBean(bNoticeInfoPo, BNoticeInfoDto.class);
+        return bNoticeInfoDto;
+    }
+
+	/**
+     * 保存
+     * @param dto
+     * @return
+     */
+    @Override
+	public void save(BNoticeInfoDto dto){
+        BNoticeInfoPo po = new BNoticeInfoPo();
+        BeanUtils.copyProperties(dto,po);
+        ExtInfo extInfo = CurrentUserHolder.get();
+        po.setId(snowflakeUtil.snowflakeId());
+        if(dto.getPubTime()==null) {
+            po.setPubTime(new Date());
+        }
+        po.setCreateTime(new Date());
+        po.setUpdateTime(new Date());
+        po.setCreatorId(extInfo.getUserId());
+        po.setUpdaterId(extInfo.getUserId());
+        po.setCreatorName(extInfo.getUserName());
+        po.setUpdaterName(extInfo.getUserName());
+		this.bNoticeInfoMapper.insert(po);
+    }
+
+    /**
+    * 列表
+    * @param dto
+    * @return
+    */
+    @Override
+    public List<BNoticeInfoDto> list(BNoticeInfoPageDto dto){
+        return this.bNoticeInfoMapper.list(dto);
+    }
+
+	/**
+     * 修改
+     * @param dto
+     * @return
+     */
+    @Override
+    public void update(BNoticeInfoDto dto){
+        BNoticeInfoPo po = new BNoticeInfoPo();
+        BeanUtils.copyProperties(dto,po);
+        if(dto.getPubTime()==null) {
+            po.setPubTime(new Date());
+        }
+        ExtInfo extInfo = CurrentUserHolder.get();
+        po.setUpdateTime(new Date());
+        po.setUpdaterId(extInfo.getUserId());
+        po.setUpdaterName(extInfo.getUserName());
+		bNoticeInfoMapper.updateById(po);
+    }
+
+    /**
+     * 删除
+     * @param id
+     * @return
+     */
+    @Override
+    public void delete(String id){
+		bNoticeInfoMapper.deleteById(id);
+    }
+}

bus-biz/src/main/java/bus/service/impl/BRegionServiceImpl.java

@@ -0,0 +1,81 @@
+package bus.service.impl;
+
+import bus.model.dto.BRegionDto;
+import bus.model.dto.BRegionPageDto;
+import bus.model.vo.BRegionVo;
+import bus.model.po.BRegionPo;
+import bus.mapper.BRegionMapper;
+
+import bus.service.BRegionService;
+import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.BeanUtils;
+import java.util.List;
+
+/**
+ * @Program: bus
+ * @Description: 描述
+ * @Author: zy
+ * @Date: 2025-03-01 18:02:30
+ **/
+@Service
+public class BRegionServiceImpl implements BRegionService {
+
+    @Autowired
+    private BRegionMapper bRegionMapper;
+
+
+	/**
+     * 详情
+     * @param id
+     * @return
+     */
+    @Override
+    public BRegionPo getDetailById(String id){
+        return this.bRegionMapper.selectById(id);
+    }
+
+	/**
+     * 保存
+     * @param dto
+     * @return
+     */
+    @Override
+	public void save(BRegionDto dto){
+        BRegionPo po = new BRegionPo();
+        BeanUtils.copyProperties(dto,po);
+		this.bRegionMapper.insert(po);
+    }
+
+    /**
+    * 列表
+    * @param dto
+    * @return
+    */
+    @Override
+    public List<BRegionDto> list(BRegionPageDto dto){
+        return this.bRegionMapper.list(dto);
+    }
+
+	/**
+     * 修改
+     * @param dto
+     * @return
+     */
+    @Override
+    public void update(BRegionDto dto){
+        BRegionPo po = new BRegionPo();
+        BeanUtils.copyProperties(dto,po);
+		bRegionMapper.updateById(po);
+    }
+
+    /**
+     * 删除
+     * @param id
+     * @return
+     */
+    @Override
+    public void delete(String id){
+		bRegionMapper.deleteById(id);
+    }
+}

bus-biz/src/main/java/bus/service/impl/BStationInfoServiceImpl.java

@@ -0,0 +1,123 @@
+package bus.service.impl;
+
+import bus.model.SnowflakeUtil;
+import bus.model.dto.BStationInfoDto;
+import bus.model.dto.BStationInfoPageDto;
+import bus.model.po.BBusInfoPo;
+import bus.model.vo.BStationInfoVo;
+import bus.model.po.BStationInfoPo;
+import bus.mapper.BStationInfoMapper;
+
+import bus.service.BStationInfoService;
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.orcas.common.sso.model.ExtInfo;
+import com.orcas.iso.config.common.user.CurrentUserHolder;
+import com.qzwisdom.qzframework.core.tool.exception.BusinessException;
+import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.BeanUtils;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Program: bus
+ * @Description: 描述
+ * @Author: zy
+ * @Date: 2025-03-01 21:07:50
+ **/
+@Service
+public class BStationInfoServiceImpl implements BStationInfoService {
+
+    @Autowired
+    private BStationInfoMapper bStationInfoMapper;
+    @Resource
+    private SnowflakeUtil snowflakeUtil;
+
+	/**
+     * 详情
+     * @param id
+     * @return
+     */
+    @Override
+    public BStationInfoDto getDetailById(String id){
+        BStationInfoPo bStationInfoPo = this.bStationInfoMapper.selectById(id);
+        BStationInfoDto bStationInfoDto = BeanUtil.toBean(bStationInfoPo, BStationInfoDto.class);
+        return bStationInfoDto;
+    }
+
+	/**
+     * 保存
+     * @param dto
+     * @return
+     */
+    @Override
+	public void save(BStationInfoDto dto){
+        BStationInfoPo existingBus = this.bStationInfoMapper.selectOne(
+                new QueryWrapper<BStationInfoPo>()
+                        .eq("is_delete",0)
+                        .eq("name", dto.getName())
+        );
+        if (existingBus != null) {
+            throw new BusinessException("站点名称已存在");
+        }
+        BStationInfoPo po = new BStationInfoPo();
+        BeanUtils.copyProperties(dto,po);
+        ExtInfo extInfo = CurrentUserHolder.get();
+        po.setId(snowflakeUtil.snowflakeId());
+        po.setCreateTime(new Date());
+        po.setUpdateTime(new Date());
+        po.setCreatorId(extInfo.getUserId());
+        po.setUpdaterId(extInfo.getUserId());
+        po.setCreatorName(extInfo.getUserName());
+        po.setUpdaterName(extInfo.getUserName());
+		this.bStationInfoMapper.insert(po);
+    }
+
+    /**
+    * 列表
+    * @param dto
+    * @return
+    */
+    @Override
+    public List<BStationInfoDto> list(BStationInfoPageDto dto){
+        return this.bStationInfoMapper.list(dto);
+    }
+
+	/**
+     * 修改
+     * @param dto
+     * @return
+     */
+    @Override
+    public void update(BStationInfoDto dto){
+        BStationInfoPo existingBus = this.bStationInfoMapper.selectOne(
+                new QueryWrapper<BStationInfoPo>()
+                        .eq("is_delete",0)
+                        .eq("name", dto.getName())
+                        .ne("id",dto.getId())
+        );
+        if (existingBus != null) {
+            throw new BusinessException("站点名称已存在");
+        }
+        BStationInfoPo po = new BStationInfoPo();
+        BeanUtils.copyProperties(dto,po);
+        ExtInfo extInfo = CurrentUserHolder.get();
+        po.setUpdateTime(new Date());
+        po.setUpdaterId(extInfo.getUserId());
+        po.setUpdaterName(extInfo.getUserName());
+		bStationInfoMapper.updateById(po);
+    }
+
+    /**
+     * 删除
+     * @param id
+     * @return
+     */
+    @Override
+    public void delete(String id){
+		bStationInfoMapper.deleteById(id);
+    }
+}

bus-biz/src/main/java/bus/service/impl/BTestServiceImpl.java

@@ -1,7 +1,7 @@
 package bus.service.impl;
 
 import bus.model.dto.BTestDto;
-import bus.model.dto.BTestPageDto;
+import bus.model.dto.page.BTestPageDto;
 import bus.model.vo.BTestVo;
 import bus.model.po.BTestPo;
 import bus.mapper.BTestMapper;

bus-biz/src/main/java/bus/service/impl/CommonServiceImpl.java

@@ -29,7 +29,7 @@ import java.util.stream.Collectors;
 * @Program: bus
 * @Description: 描述
 * @Author: zy
-* @Date: 2025-02-28 16:46:43
+* @Date: 2025-03-01 21:07:50
 **/
 @Service
 @Transactional

bus-biz/src/main/java/bus/service/impl/WChatUserServiceImpl.java

@@ -1,16 +1,31 @@
 package bus.service.impl;
 
+import bus.model.dto.CommonLoginDto;
 import bus.model.dto.WChatUserDto;
-import bus.model.dto.WChatUserPageDto;
-import bus.model.vo.WChatUserVo;
+import bus.model.dto.page.WChatUserPageDto;
+import bus.model.dto.req.WxLoginReq;
 import bus.model.po.WChatUserPo;
 import bus.mapper.WChatUserMapper;
 
+import bus.service.CommonService;
 import bus.service.WChatUserService;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+import com.orcas.common.sso.model.SsoUserAuthDto;
+import com.orcas.common.usercenter.entity.RoleEntity;
+import com.orcas.common.usercenter.entity.StaffEntity;
+import com.orcas.common.usercenter.model.StaffBindRoleDto;
+import com.orcas.common.usercenter.model.StaffRequest;
+import com.orcas.iso.service.RoleClient;
+import com.orcas.iso.service.StaffClient;
+import com.orcas.iso.service.UserClient;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.BeanUtils;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.Date;
 import java.util.List;
 
@@ -25,9 +40,59 @@ public class WChatUserServiceImpl implements WChatUserService {
 
     @Autowired
     private WChatUserMapper wChatUserMapper;
+    @Autowired
+    private StaffClient staffClient;
+    @Autowired
+    private UserClient userClient;
+    @Autowired
+    private RoleClient roleClient;
+    @Autowired
+    private CommonService commonService;
+    @Value("${orcas.organizeId}")
+    private String organizeId;
+    @Value("${orcas.creditCode}")
+    private String creditCode;
+    @Value("${orcas.productNo}")
+    private String productNo;
+    @Override
+    public SsoUserAuthDto wxLogin(HttpServletRequest request, HttpServletResponse response, WxLoginReq wxLoginReq) {
+        //http://58.221.153.58:48989/api-gateway/iso-server/usercenter/role/addRole
+//http://58.221.153.58:48989/api-gateway/iso-server/usercenter/role/assignStaffs
+        //http://58.221.153.58:48989/api-gateway/iso-server/usercenter/staff/addStaff
+        //根据用户名称查询底座接口
+        String mobile = wxLoginReq.getMobile();
+        String wxName = wxLoginReq.getWxName();
+        StaffEntity staffByUserName = staffClient.getStaffByUserName(mobile, organizeId);
+        if(staffByUserName == null){
+            //注册用户
+            StaffRequest req = new StaffRequest();
+            req.setPhone(mobile);
+            req.setAccountName(mobile);
+            String sub = StrUtil.sub(mobile, mobile.length() - 6, mobile.length());
+            req.setPassword(sub);
+            req.setStaffName(wxName);
+            req.setUnitOrganizeId(organizeId);
+            req.setUniformCreditCode(creditCode);
+            req.setIsAdmin(0);
+            StaffEntity staffEntity =  staffClient.addStaff(req);
+            List<RoleEntity> roleListByProId = (List<RoleEntity>)roleClient.getRoleListByProId(productNo);
+            //绑定角色
+            StaffBindRoleDto staffBindRoleDto = new StaffBindRoleDto();
+            staffBindRoleDto.setRoleIds(CollectionUtil.newArrayList(roleListByProId.get(0).getId()));
+            staffBindRoleDto.setProductNo(productNo);
+            staffBindRoleDto.setUnitOrganizeId(organizeId);
+            staffBindRoleDto.setStaffId(staffEntity.getId());
+            roleClient.staffBindRole(staffBindRoleDto);
+        }
+        //登录
+        CommonLoginDto userLoginRequest= new CommonLoginDto();
+        userLoginRequest.setAccount(mobile);
+        userLoginRequest.setPassword(StrUtil.sub(mobile, mobile.length() - 6, mobile.length()));
+        SsoUserAuthDto ssoUserAuthDto = commonService.doLogin(request,response,userLoginRequest);
+        return ssoUserAuthDto;
+    }
 
-
-	/**
+    /**
      * 详情
      * @param id
      * @return

bus-biz/src/main/resources/mapper/BBusInfoMapper.xml

@@ -0,0 +1,33 @@
+<?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="bus.mapper.BBusInfoMapper">
+
+ <select id="list" parameterType="bus.model.dto.page.BBusInfoPageDto" resultType="bus.model.dto.BBusInfoDto">
+   select
+   id,
+   bus_name,
+   bus_no,
+   bus_url,
+   driver_name,
+   driver_phone
+   from
+   b_bus_info
+   <where>
+      is_delete = 0
+      <if test="busName != null and busName != ''">
+        and bus_name like concat('%',#{busName},'%')
+      </if>
+      <if test="busNo != null and busNo != ''">
+        and bus_no like concat('%',#{busNo},'%')
+      </if>
+      <if test="driverName != null and driverName != ''">
+        and driver_name like concat('%',#{driverName},'%')
+      </if>
+      <if test="driverPhone != null and driverPhone != ''">
+        and driver_phone like concat('%',#{driverPhone},'%')
+      </if>
+   </where>
+     order by create_time desc
+ </select>
+
+</mapper>

bus-biz/src/main/resources/mapper/BNoticeInfoMapper.xml

@@ -0,0 +1,37 @@
+<?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="bus.mapper.BNoticeInfoMapper">
+
+ <select id="list" parameterType="bus.model.dto.page.BNoticeInfoPageDto" resultType="bus.model.dto.BNoticeInfoDto">
+   select
+   id,
+   title,
+   content,
+   type,
+   pub_time,
+   status
+   from
+   b_notice_info
+  <where>
+    is_delete = 0
+    <if test="title != null and title != ''">
+      and title like concat('%',#{title},'%')
+    </if>
+    <if test="type != null and type != ''">
+      and type = #{type}
+    </if>
+    <if test="status != null and status != ''">
+      and status = #{status}
+    </if>
+    <if test="pubBeginTime != null ">
+      and pub_time &gt;= #{pubBeginTime}
+    </if>
+    <if test="pubEndTime != null">
+      and pub_time &lt;= #{pubEndTime}
+    </if>
+  </where>
+   order by pub_time desc
+
+ </select>
+
+</mapper>

bus-biz/src/main/resources/mapper/BRegionMapper.xml

@@ -0,0 +1,31 @@
+<?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="bus.mapper.BRegionMapper">
+
+ <select id="list" parameterType="bus.model.dto.BRegionPageDto" resultType="bus.model.dto.BRegionDto">
+   select
+   id,
+   ad_code,
+   center,
+   city_code,
+   level,
+   name,
+   sort,
+   parent_id,
+   path
+   from
+   b_region
+<where>
+    <if test="name != null and name != ''">
+      and name like concat('%',#{name},'%')
+    </if>
+    <if test="parentId != null and parentId != ''">
+      and parent_id = #{parentId}
+    </if>
+    <if test="id != null and id != ''">
+      and id = #{id}
+    </if>
+</where>
+ </select>
+
+</mapper>

bus-biz/src/main/resources/mapper/BStationInfoMapper.xml

@@ -0,0 +1,42 @@
+<?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="bus.mapper.BStationInfoMapper">
+
+ <select id="list" parameterType="bus.model.dto.BStationInfoPageDto" resultType="bus.model.dto.BStationInfoDto">
+   select
+   id,
+   name,
+   station_level,
+   station_status,
+   station_code,
+   longitude,
+   latitude,
+   detail_address,
+   province,
+   city,
+   area
+   from
+   b_station_info
+  <where>
+     is_delete = 0
+    <if test="name != null and name != ''">
+      and name like concat('%',#{name},'%')
+    </if>
+    <if test="stationLevel != null and stationLevel != ''">
+      and station_level = #{stationLevel}
+    </if>
+    <if test="stationStatus != null and stationStatus != ''">
+      and station_status = #{stationStatus}
+    </if>
+
+    <if test="stationCode != null and stationCode != ''">
+      and station_code = #{stationCode}
+    </if>
+    <if test="area != null and area != ''">
+      and area = #{area}
+    </if>
+
+  </where>
+ </select>
+
+</mapper>

bus-biz/src/main/resources/mapper/BTestMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="bus.mapper.BTestMapper">
 
- <select id="list" parameterType="bus.model.dto.BTestPageDto" resultType="bus.model.vo.BTestVo">
+ <select id="list" parameterType="bus.model.dto.page.BTestPageDto" resultType="bus.model.vo.BTestVo">
    select
    id,
    name,

bus-biz/src/main/resources/mapper/WChatUserMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="bus.mapper.WChatUserMapper">
 
- <select id="list" parameterType="bus.model.dto.WChatUserPageDto" resultType="bus.model.dto.WChatUserDto">
+ <select id="list" parameterType="bus.model.dto.page.WChatUserPageDto" resultType="bus.model.dto.WChatUserDto">
    select
        id,
        wx_name,
@@ -36,6 +36,7 @@
        and id = #{id}
      </if>
    </where>
+     order by create_time desc
  </select>
 
 </mapper>

bus-boot/src/main/resources/bootstrap-dev.yaml

@@ -27,6 +27,8 @@ orcas:
   productNo: gjgl
   productName: 公交管理
   microNo: gjgl
+  organizeId: 054b7e80-1f3b-457b-bffc-70b3b6e939cf
+  creditCode: mrzz
   redis:
     host: 58.221.153.58
     port: 46379
@@ -39,7 +41,7 @@ orcas:
     logout:
       path: /logout
     excluded:
-      paths: /swagger-ui.html,/webjars/**,/swagger-resources/**,/v2/api-docs,/**
+      paths: /swagger-ui.html,/webjars/**,/swagger-resources/**,/v2/api-docs,/doc.html,/wChatUser/auto/login
 
 file-store:
   go-fastdfs:

bus-boot/src/test/java/bus/CodeGenerateTest.java

@@ -37,8 +37,8 @@ public class CodeGenerateTest {
 		//设置生成的表
 		List<TableInfo> tables = new ArrayList<>();
 		TableInfo tableInfo = new TableInfo();
-		tableInfo.setTableName("w_chat_user");
-		tableInfo.setTableAlias("WChatUser");
+		tableInfo.setTableName("b_station_info");
+		tableInfo.setTableAlias("BStationInfo");
 		tables.add(tableInfo);
 		generateConfig.setTableInfos(tables);
 		//生成代码

bus-common/src/main/java/bus/model/BaseEntity.java

@@ -5,7 +5,7 @@ import lombok.Data;
 * @Program: bus
 * @Description: 描述
 * @Author: zy
-* @Date: 2025-02-28 16:46:44
+* @Date: 2025-03-01 21:07:53
 **/
 @Data
 public class BaseEntity {

bus-common/src/main/java/bus/model/SnowflakeUtil.java

@@ -0,0 +1,33 @@
+package bus.model;
+
+import cn.hutool.core.lang.Snowflake;
+import cn.hutool.core.net.NetUtil;
+import cn.hutool.core.util.IdUtil;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+
+/**
+ * @Author tan
+ * @Date 2021/10/16 16:23
+ */
+@Component
+public class SnowflakeUtil {
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private long workerId = 1;//为终端ID
+    private long dataCenterId = 1;//数据中心ID
+    private Snowflake snowflake = IdUtil.getSnowflake(workerId,dataCenterId);
+    @PostConstruct
+    public void init(){
+        workerId = NetUtil.ipv4ToLong(NetUtil.getLocalhostStr());
+    }
+    public synchronized String snowflakeId(){
+        return String.valueOf(snowflake.nextId());
+    }
+    public synchronized long snowflakeId(long workerId,long dataCenterId){
+        Snowflake snowflake = IdUtil.getSnowflake(workerId, dataCenterId);
+        return snowflake.nextId();
+    }
+}
+

bus-common/src/main/java/bus/model/dto/BBusInfoDto.java

@@ -0,0 +1,36 @@
+package bus.model.dto;
+
+import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+import java.util.Date;
+/**
+* @Program: bus
+* @Description: 描述
+* @Author: zy
+* @Date: 2025-03-01 09:44:24
+**/
+@Data
+public class BBusInfoDto{
+    @ApiModelProperty("id")
+    private String id;
+    @ApiModelProperty("车辆名称")
+    @NotBlank(message = "车辆名称不能为空")
+    private String busName;
+    @ApiModelProperty("车牌号")
+    @NotBlank(message = "车牌号不能为空")
+    private String busNo;
+    @ApiModelProperty("车辆类型")
+    private String busType;
+    @ApiModelProperty("车辆图片")
+    private String busUrl;
+    @ApiModelProperty("驾驶员姓名")
+    @NotBlank(message = "驾驶员姓名不能为空")
+    private String driverName;
+    @ApiModelProperty("驾驶员号码")
+    @NotBlank(message = "驾驶员号码不能为空")
+    private String driverPhone;
+}

bus-common/src/main/java/bus/model/dto/BNoticeInfoDto.java

@@ -0,0 +1,34 @@
+package bus.model.dto;
+
+import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+import java.util.Date;
+import java.util.Date;
+/**
+* @Program: bus
+* @Description: 描述
+* @Author: zy
+* @Date: 2025-03-01 10:21:43
+**/
+@Data
+public class BNoticeInfoDto{
+    @ApiModelProperty("id")
+    private String id;
+    @ApiModelProperty("标题")
+    @NotNull(message = "标题不能为空")
+    private String title;
+    @ApiModelProperty("内容")
+    @NotNull(message = "内容不能为空")
+    private String content;
+    @ApiModelProperty("类型 0平台 1站台 2路线")
+    @NotNull(message = "类型不能为空")
+    private String type;
+    @ApiModelProperty("发布时间")
+    private Date pubTime;
+    @ApiModelProperty("状态 0警用 1启用")
+    @NotNull(message = "状态不能为空")
+    private String status;
+}

bus-common/src/main/java/bus/model/dto/BRegionDto.java

@@ -0,0 +1,31 @@
+package bus.model.dto;
+
+import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+/**
+* @Program: bus
+* @Description: 描述
+* @Author: zy
+* @Date: 2025-03-01 18:02:30
+**/
+@Data
+public class BRegionDto{
+    @ApiModelProperty("ID")
+    private String id;
+    @ApiModelProperty("区域编码")
+    private String adCode;
+    @ApiModelProperty("区域中心点经纬度")
+    private String center;
+    @ApiModelProperty("城市代码")
+    private String cityCode;
+    @ApiModelProperty("行政区划级别")
+    private String level;
+    @ApiModelProperty("名称")
+    private String name;
+    @ApiModelProperty("排序")
+    private Integer sort;
+    @ApiModelProperty("父ID")
+    private Long parentId;
+    @ApiModelProperty("行政地区路径")
+    private String path;
+}

bus-common/src/main/java/bus/model/dto/BRegionPageDto.java

@@ -0,0 +1,21 @@
+package bus.model.dto;
+
+import bus.model.BaseEntity;
+import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+/**
+* @Program: bus
+* @Description: 描述
+* @Author: zy
+* @Date: 2025-03-01 18:02:30
+**/
+@Data
+public class BRegionPageDto extends BaseEntity{
+    @ApiModelProperty("ID")
+    private String id;
+    @ApiModelProperty("名称")
+    private String name;
+    @ApiModelProperty("父ID")
+    private String parentId;
+
+}

bus-common/src/main/java/bus/model/dto/BStationInfoDto.java

@@ -0,0 +1,39 @@
+package bus.model.dto;
+
+import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.Date;
+/**
+* @Program: bus
+* @Description: 描述
+* @Author: zy
+* @Date: 2025-03-01 21:07:53
+**/
+@Data
+public class BStationInfoDto{
+    @ApiModelProperty("站台id")
+    private String id;
+    @ApiModelProperty("站台名称")
+    private String name;
+    @ApiModelProperty("站台层级 0主站点 1子站点")
+    private String stationLevel;
+    @ApiModelProperty("状态 0正常 1维护 2禁用")
+    private String stationStatus;
+    @ApiModelProperty("站点编号")
+    private String stationCode;
+    @ApiModelProperty("经度")
+    private BigDecimal longitude;
+    @ApiModelProperty("纬度")
+    private BigDecimal latitude;
+    @ApiModelProperty("详细地址")
+    private String detailAddress;
+    @ApiModelProperty("省份")
+    private String province;
+    @ApiModelProperty("市")
+    private String city;
+    @ApiModelProperty("区")
+    private String area;
+}

bus-common/src/main/java/bus/model/dto/BStationInfoPageDto.java

@@ -0,0 +1,29 @@
+package bus.model.dto;
+
+import bus.model.BaseEntity;
+import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.Date;
+/**
+* @Program: bus
+* @Description: 描述
+* @Author: zy
+* @Date: 2025-03-01 21:07:53
+**/
+@Data
+public class BStationInfoPageDto extends BaseEntity{
+
+    @ApiModelProperty("站台名称")
+    private String name;
+    @ApiModelProperty("站台层级 0主站点 1子站点")
+    private String stationLevel;
+    @ApiModelProperty("状态 0正常 1维护 2禁用")
+    private String stationStatus;
+    @ApiModelProperty("站点编号")
+    private String stationCode;
+    @ApiModelProperty("区")
+    private String area;
+}

bus-common/src/main/java/bus/model/dto/CommonLoginDto.java

@@ -8,7 +8,7 @@ import lombok.Data;
 * @Program: bus
 * @Description: 描述
 * @Author: zy
-* @Date: 2025-02-28 16:46:44
+* @Date: 2025-03-01 21:07:53
 **/
 @ApiModel(description = "账户登陆请求实体")
 @Data

bus-common/src/main/java/bus/model/dto/page/BBusInfoPageDto.java

@@ -0,0 +1,28 @@
+package bus.model.dto.page;
+
+import bus.model.BaseEntity;
+import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.util.Date;
+/**
+* @Program: bus
+* @Description: 描述
+* @Author: zy
+* @Date: 2025-03-01 09:44:24
+**/
+@Data
+public class BBusInfoPageDto extends BaseEntity{
+
+    @ApiModelProperty("车辆名称")
+    private String busName;
+    @ApiModelProperty("车牌号")
+    private String busNo;
+    @ApiModelProperty("驾驶员姓名")
+    private String driverName;
+    @ApiModelProperty("驾驶员号码")
+    private String driverPhone;
+
+}

bus-common/src/main/java/bus/model/dto/page/BNoticeInfoPageDto.java

@@ -0,0 +1,32 @@
+package bus.model.dto.page;
+
+import bus.model.BaseEntity;
+import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.util.Date;
+import java.util.Date;
+/**
+* @Program: bus
+* @Description: 描述
+* @Author: zy
+* @Date: 2025-03-01 10:21:43
+**/
+@Data
+public class BNoticeInfoPageDto extends BaseEntity{
+
+    @ApiModelProperty("标题")
+    private String title;
+    @ApiModelProperty("类型")
+    private String type;
+    @ApiModelProperty("状态 0警用 1启用")
+    private String status;
+    @ApiModelProperty("开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date pubBeginTime;
+    @ApiModelProperty("结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date pubEndTime;
+}

bus-common/src/main/java/bus/model/dto/BTestPageDto.java → bus-common/src/main/java/bus/model/dto/page/BTestPageDto.java

@@ -1,4 +1,4 @@
-package bus.model.dto;
+package bus.model.dto.page;
 
 import bus.model.BaseEntity;
 import lombok.Data;

bus-common/src/main/java/bus/model/dto/WChatUserPageDto.java → bus-common/src/main/java/bus/model/dto/page/WChatUserPageDto.java

@@ -1,4 +1,4 @@
-package bus.model.dto;
+package bus.model.dto.page;
 
 import bus.model.BaseEntity;
 import lombok.Data;

bus-common/src/main/java/bus/model/dto/req/WxLoginReq.java

@@ -0,0 +1,14 @@
+package bus.model.dto.req;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class WxLoginReq {
+    @ApiModelProperty(value = "手机号")
+    private String mobile;
+    @ApiModelProperty(value = "微信昵称")
+    private String wxName;
+    @ApiModelProperty(value = "微信openId")
+    private String openId;
+}

bus-common/src/main/java/bus/model/po/BBusInfoPo.java

@@ -0,0 +1,33 @@
+package bus.model.po;
+
+import lombok.Data;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.util.Date;
+import java.util.Date;
+
+/**
+* @Program: bus
+* @Description: 
+* @Author: zy
+* @Date: 2025-03-01 10:04:08
+**/
+@Data
+@TableName("b_bus_info")
+public class BBusInfoPo{
+    @TableId
+    private String id;
+    private String busName;
+    private String busNo;
+    private String busUrl;
+    private String busType;
+    private String driverName;
+    private String driverPhone;
+    private Date createTime;
+    private Date updateTime;
+    private String creatorId;
+    private String updaterId;
+    private String creatorName;
+    private String updaterName;
+    private Integer isDelete;
+}

bus-common/src/main/java/bus/model/po/BNoticeInfoPo.java

@@ -0,0 +1,35 @@
+package bus.model.po;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.util.Date;
+import java.util.Date;
+import java.util.Date;
+
+/**
+* @Program: bus
+* @Description: 
+* @Author: zy
+* @Date: 2025-03-01 10:21:43
+**/
+@Data
+@TableName("b_notice_info")
+public class BNoticeInfoPo{
+    @TableId
+    private String id;
+    private String title;
+    private String content;
+    private String type;
+    private Date pubTime;
+    private String status;
+    private Date createTime;
+    private Date updateTime;
+    private String creatorId;
+    private String updaterId;
+    private String creatorName;
+    private String updaterName;
+    @TableLogic
+    private Integer isDelete;
+}

bus-common/src/main/java/bus/model/po/BRegionPo.java

@@ -0,0 +1,26 @@
+package bus.model.po;
+
+import lombok.Data;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+/**
+* @Program: bus
+* @Description: 
+* @Author: zy
+* @Date: 2025-03-01 18:02:30
+**/
+@Data
+@TableName("b_region")
+public class BRegionPo{
+    @TableId
+    private String id;
+    private String adCode;
+    private String center;
+    private String cityCode;
+    private String level;
+    private String name;
+    private Integer sort;
+    private String parentId;
+    private String path;
+}

bus-common/src/main/java/bus/model/po/BStationInfoPo.java

@@ -0,0 +1,39 @@
+package bus.model.po;
+
+import lombok.Data;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.math.BigDecimal;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.Date;
+
+/**
+* @Program: bus
+* @Description: 
+* @Author: zy
+* @Date: 2025-03-01 21:07:53
+**/
+@Data
+@TableName("b_station_info")
+public class BStationInfoPo{
+    @TableId
+    private String id;
+    private String name;
+    private String stationLevel;
+    private String stationStatus;
+    private String stationCode;
+    private BigDecimal longitude;
+    private BigDecimal latitude;
+    private String detailAddress;
+    private String province;
+    private String city;
+    private String area;
+    private Date createTime;
+    private Date updateTime;
+    private String creatorId;
+    private String updaterId;
+    private String creatorName;
+    private String updaterName;
+    private Integer isDelete;
+}

bus-common/src/main/java/bus/model/vo/BBusInfoVo.java

@@ -0,0 +1,45 @@
+package bus.model.vo;
+
+import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+import com.qzwisdom.qzframework.core.tool.base.vo.AbstractBaseVO;
+import java.util.Date;
+import java.util.Date;
+
+/**
+* @Program: bus
+* @Description: 描述
+* @Author: zy
+* @Date: 2025-03-01 10:04:08
+**/
+@Data
+public class BBusInfoVo extends AbstractBaseVO{
+    @ApiModelProperty("id")
+    private String id;
+    @ApiModelProperty("车辆名称")
+    private String busName;
+    @ApiModelProperty("车牌号")
+    private String busNo;
+    @ApiModelProperty("车辆图片")
+    private String busUrl;
+    @ApiModelProperty("车辆类型 待定")
+    private String busType;
+    @ApiModelProperty("驾驶员姓名")
+    private String driverName;
+    @ApiModelProperty("驾驶员号码")
+    private String driverPhone;
+    @ApiModelProperty("记录创建时间")
+    private Date createTime;
+    @ApiModelProperty("记录更新时间")
+    private Date updateTime;
+    @ApiModelProperty("创建人id")
+    private String creatorId;
+    @ApiModelProperty("修改人id")
+    private String updaterId;
+    @ApiModelProperty("创建人姓名")
+    private String creatorName;
+    @ApiModelProperty("修改人姓名")
+    private String updaterName;
+    @ApiModelProperty("是否删除")
+    private Integer isDelete;
+}

bus-common/src/main/java/bus/model/vo/BNoticeInfoVo.java

@@ -0,0 +1,44 @@
+package bus.model.vo;
+
+import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+import com.qzwisdom.qzframework.core.tool.base.vo.AbstractBaseVO;
+import java.util.Date;
+import java.util.Date;
+import java.util.Date;
+
+/**
+* @Program: bus
+* @Description: 描述
+* @Author: zy
+* @Date: 2025-03-01 10:21:43
+**/
+@Data
+public class BNoticeInfoVo extends AbstractBaseVO{
+    @ApiModelProperty("id")
+    private String id;
+    @ApiModelProperty("标题")
+    private String title;
+    @ApiModelProperty("内容")
+    private String content;
+    @ApiModelProperty("类容")
+    private String type;
+    @ApiModelProperty("发布时间")
+    private Date pubTime;
+    @ApiModelProperty("状态 0警用 1启用")
+    private String status;
+    @ApiModelProperty("记录创建时间")
+    private Date createTime;
+    @ApiModelProperty("记录更新时间")
+    private Date updateTime;
+    @ApiModelProperty("创建人id")
+    private String creatorId;
+    @ApiModelProperty("修改人id")
+    private String updaterId;
+    @ApiModelProperty("创建人姓名")
+    private String creatorName;
+    @ApiModelProperty("修改人姓名")
+    private String updaterName;
+    @ApiModelProperty("是否删除")
+    private Integer isDelete;
+}

bus-common/src/main/java/bus/model/vo/BRegionVo.java

@@ -0,0 +1,33 @@
+package bus.model.vo;
+
+import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+import com.qzwisdom.qzframework.core.tool.base.vo.AbstractBaseVO;
+
+/**
+* @Program: bus
+* @Description: 描述
+* @Author: zy
+* @Date: 2025-03-01 18:02:30
+**/
+@Data
+public class BRegionVo extends AbstractBaseVO{
+    @ApiModelProperty("ID")
+    private String id;
+    @ApiModelProperty("区域编码")
+    private String adCode;
+    @ApiModelProperty("区域中心点经纬度")
+    private String center;
+    @ApiModelProperty("城市代码")
+    private String cityCode;
+    @ApiModelProperty("行政区划级别")
+    private String level;
+    @ApiModelProperty("名称")
+    private String name;
+    @ApiModelProperty("排序")
+    private Integer sort;
+    @ApiModelProperty("父ID")
+    private Long parentId;
+    @ApiModelProperty("行政地区路径")
+    private String path;
+}

bus-common/src/main/java/bus/model/vo/BStationInfoVo.java

@@ -0,0 +1,55 @@
+package bus.model.vo;
+
+import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+import com.qzwisdom.qzframework.core.tool.base.vo.AbstractBaseVO;
+import java.math.BigDecimal;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.Date;
+
+/**
+* @Program: bus
+* @Description: 描述
+* @Author: zy
+* @Date: 2025-03-01 21:07:53
+**/
+@Data
+public class BStationInfoVo extends AbstractBaseVO{
+    @ApiModelProperty("站台id")
+    private String id;
+    @ApiModelProperty("站台名称")
+    private String name;
+    @ApiModelProperty("站台层级 0主站点 1子站点")
+    private String stationLevel;
+    @ApiModelProperty("状态 0正常 1维护 2禁用")
+    private String stationStatus;
+    @ApiModelProperty("站点编号")
+    private String stationCode;
+    @ApiModelProperty("经度")
+    private BigDecimal longitude;
+    @ApiModelProperty("纬度")
+    private BigDecimal latitude;
+    @ApiModelProperty("详细地址")
+    private String detailAddress;
+    @ApiModelProperty("省份")
+    private String province;
+    @ApiModelProperty("市")
+    private String city;
+    @ApiModelProperty("区")
+    private String detailedAddress;
+    @ApiModelProperty("记录创建时间")
+    private Date createTime;
+    @ApiModelProperty("记录更新时间")
+    private Date updateTime;
+    @ApiModelProperty("创建人id")
+    private String creatorId;
+    @ApiModelProperty("修改人id")
+    private String updaterId;
+    @ApiModelProperty("创建人姓名")
+    private String creatorName;
+    @ApiModelProperty("修改人姓名")
+    private String updaterName;
+    @ApiModelProperty("是否删除")
+    private Integer isDelete;
+}

bus-web/src/main/java/bus/controller/biz/BBusInfoController.java

@@ -0,0 +1,96 @@
+package bus.controller.biz;
+
+import bus.model.dto.page.BBusInfoPageDto;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageSerializable;
+import bus.model.dto.BBusInfoDto;
+import bus.service.BBusInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import com.qzwisdom.qzframework.core.tool.base.controller.BaseController;
+
+import javax.validation.Valid;
+
+
+/**
+ * @Program: bus
+ * @Description: 描述
+ * @Author: zy
+ * @Date: 2025-03-01 10:04:08
+ **/
+@Slf4j
+@CrossOrigin
+@RestController
+@Api(tags = "车辆接口")
+@RequestMapping(value="/bBusInfo")
+public class BBusInfoController implements BaseController {
+
+    @Autowired
+    private BBusInfoService bBusInfoService;
+
+
+
+    /**
+     * 详情
+     * @param id
+     * @return
+     */
+    @ApiOperation("详情")
+    @GetMapping(value = "getDetailById")
+    public BBusInfoDto getDetailById(@RequestParam String id){
+        return bBusInfoService.getDetailById(id);
+    }
+
+	/**
+     * 保存
+     * @param dto
+     * @return
+     */
+    @ApiOperation("保存")
+    @PostMapping(value = "save")
+    public String save(@RequestBody @Valid BBusInfoDto dto){
+		bBusInfoService.save(dto);
+        return "保存成功";
+    }
+
+    /**
+    * 列表
+    * @param dto
+    * @return
+    */
+    @ApiOperation("列表")
+    @PostMapping(value = "list")
+    public PageSerializable<BBusInfoDto> list(@RequestBody BBusInfoPageDto dto){
+       PageHelper.startPage(dto.getPageNum(),dto.getPageSize());
+       return new PageSerializable<>(bBusInfoService.list(dto));
+    }
+
+	/**
+     * 修改
+     * @param dto
+     * @return
+     */
+    @ApiOperation("修改")
+    @PostMapping(value = "update")
+    public String update(@RequestBody @Valid BBusInfoDto dto){
+		bBusInfoService.update(dto);
+        return "修改成功";
+    }
+
+	/**
+     * 删除
+     * @param id
+     * @return
+     */
+    @ApiOperation("删除")
+    @GetMapping(value = "deleteById")
+    public String deleteById(@RequestParam String id){
+		bBusInfoService.delete(id);
+        return "删除成功";
+    }
+
+}

bus-web/src/main/java/bus/controller/biz/BNoticeInfoController.java

@@ -0,0 +1,96 @@
+package bus.controller.biz;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageSerializable;
+import bus.model.dto.BNoticeInfoDto;
+import bus.model.dto.page.BNoticeInfoPageDto;
+import bus.model.vo.BNoticeInfoVo;
+import bus.service.BNoticeInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import com.qzwisdom.qzframework.core.tool.base.controller.BaseController;
+
+import javax.validation.Valid;
+
+
+/**
+ * @Program: bus
+ * @Description: 描述
+ * @Author: zy
+ * @Date: 2025-03-01 10:21:43
+ **/
+@Slf4j
+@CrossOrigin
+@RestController
+@Api(tags = "公告接口")
+@RequestMapping(value="/bNoticeInfo")
+public class BNoticeInfoController implements BaseController {
+
+    @Autowired
+    private BNoticeInfoService bNoticeInfoService;
+
+
+
+    /**
+     * 详情
+     * @param id
+     * @return
+     */
+    @ApiOperation("详情")
+    @GetMapping(value = "getDetailById")
+    public BNoticeInfoDto getDetailById(@RequestParam String id) {
+        return bNoticeInfoService.getDetailById(id);
+    }
+
+	/**
+     * 保存
+     * @param dto
+     * @return
+     */
+    @ApiOperation("保存")
+    @PostMapping(value = "save")
+    public String save(@RequestBody @Valid  BNoticeInfoDto dto){
+		bNoticeInfoService.save(dto);
+        return "保存成功";
+    }
+
+    /**
+    * 列表
+    * @param dto
+    * @return
+    */
+    @ApiOperation("列表")
+    @PostMapping(value = "list")
+    public PageSerializable<BNoticeInfoDto> list(@RequestBody BNoticeInfoPageDto dto){
+       PageHelper.startPage(dto.getPageNum(),dto.getPageSize());
+       return new PageSerializable<>(bNoticeInfoService.list(dto));
+    }
+
+	/**
+     * 修改
+     * @param dto
+     * @return
+     */
+    @ApiOperation("修改")
+    @PostMapping(value = "update")
+    public String update(@RequestBody @Valid BNoticeInfoDto dto){
+		bNoticeInfoService.update(dto);
+        return "修改成功";
+    }
+
+	/**
+     * 删除
+     * @param id
+     * @return
+     */
+    @ApiOperation("删除")
+    @GetMapping(value = "deleteById")
+    public String deleteById(@RequestParam String id){
+		bNoticeInfoService.delete(id);
+        return "删除成功";
+    }
+
+}

bus-web/src/main/java/bus/controller/biz/BRegionController.java

@@ -0,0 +1,48 @@
+package bus.controller.biz;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageSerializable;
+import bus.model.dto.BRegionDto;
+import bus.model.dto.BRegionPageDto;
+import bus.model.vo.BRegionVo;
+import bus.service.BRegionService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import com.qzwisdom.qzframework.core.tool.base.controller.BaseController;
+
+import java.util.List;
+
+
+/**
+ * @Program: bus
+ * @Description: 描述
+ * @Author: zy
+ * @Date: 2025-03-01 18:02:29
+ **/
+@Slf4j
+@CrossOrigin
+@RestController
+@Api(tags = "省市区接口")
+@RequestMapping(value="/bRegion")
+public class BRegionController implements BaseController {
+
+    @Autowired
+    private BRegionService bRegionService;
+
+    /**
+     * 获取南通-区接口
+     * @param
+     * @return
+     */
+    @ApiOperation("获取南通-区接口")
+    @PostMapping(value = "getAreaByNT")
+    List<BRegionDto> getAreaByNT(){
+        BRegionPageDto dto = new BRegionPageDto();
+        dto.setParentId("1401797451651744569");
+        List<BRegionDto> list = bRegionService.list(dto);
+        return list;
+    }
+}

bus-web/src/main/java/bus/controller/biz/BStationInfoController.java

@@ -0,0 +1,95 @@
+package bus.controller.biz;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageSerializable;
+import bus.model.dto.BStationInfoDto;
+import bus.model.dto.BStationInfoPageDto;
+import bus.model.vo.BStationInfoVo;
+import bus.service.BStationInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import com.qzwisdom.qzframework.core.tool.base.controller.BaseController;
+
+
+
+/**
+ * @Program: bus
+ * @Description: 描述
+ * @Author: zy
+ * @Date: 2025-03-01 21:07:49
+ **/
+@Slf4j
+@CrossOrigin
+@RestController
+@Api(tags = "站点管理接口")
+@RequestMapping(value="/bStationInfo")
+public class BStationInfoController implements BaseController {
+
+    @Autowired
+    private BStationInfoService bStationInfoService;
+
+
+
+    /**
+     * 详情
+     * @param id
+     * @return
+     */
+    @ApiOperation("详情")
+    @GetMapping(value = "getDetailById")
+    public BStationInfoDto getDetailById(@RequestParam String id){
+        return bStationInfoService.getDetailById(id);
+    }
+
+	/**
+     * 保存
+     * @param dto
+     * @return
+     */
+    @ApiOperation("保存")
+    @PostMapping(value = "save")
+    public String save(@RequestBody BStationInfoDto dto){
+		bStationInfoService.save(dto);
+        return "保存成功";
+    }
+
+    /**
+    * 列表
+    * @param dto
+    * @return
+    */
+    @ApiOperation("列表")
+    @PostMapping(value = "list")
+    public PageSerializable<BStationInfoDto> list(@RequestBody BStationInfoPageDto dto){
+       PageHelper.startPage(dto.getPageNum(),dto.getPageSize());
+       return new PageSerializable<>(bStationInfoService.list(dto));
+    }
+
+	/**
+     * 修改
+     * @param dto
+     * @return
+     */
+    @ApiOperation("修改")
+    @PostMapping(value = "update")
+    public String update(@RequestBody BStationInfoDto dto){
+		bStationInfoService.update(dto);
+        return "修改成功";
+    }
+
+	/**
+     * 删除
+     * @param id
+     * @return
+     */
+    @ApiOperation("删除")
+    @GetMapping(value = "deleteById")
+    public String deleteById(@RequestParam String id){
+		bStationInfoService.delete(id);
+        return "删除成功";
+    }
+
+}

bus-web/src/main/java/bus/controller/biz/BTestController.java

@@ -3,7 +3,7 @@ package bus.controller.biz;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageSerializable;
 import bus.model.dto.BTestDto;
-import bus.model.dto.BTestPageDto;
+import bus.model.dto.page.BTestPageDto;
 import bus.model.vo.BTestVo;
 import bus.service.BTestService;
 import io.swagger.annotations.Api;

bus-web/src/main/java/bus/controller/biz/CommonController.java

@@ -33,7 +33,7 @@ import java.util.Map;
 * @Program: bus
 * @Description: 描述
 * @Author: zy
-* @Date: 2025-02-28 16:46:43
+* @Date: 2025-03-01 21:07:49
 **/
 @RestController
 @RequestMapping("/common")

bus-web/src/main/java/bus/controller/biz/WChatUserController.java

@@ -1,11 +1,13 @@
 package bus.controller.biz;
 
+import bus.model.dto.req.WxLoginReq;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageSerializable;
 import bus.model.dto.WChatUserDto;
-import bus.model.dto.WChatUserPageDto;
+import bus.model.dto.page.WChatUserPageDto;
 import bus.model.vo.WChatUserVo;
 import bus.service.WChatUserService;
+import com.orcas.common.sso.model.SsoUserAuthDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -13,6 +15,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.qzwisdom.qzframework.core.tool.base.controller.BaseController;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 
 /**
@@ -32,6 +36,14 @@ public class WChatUserController implements BaseController {
     private WChatUserService wChatUserService;
 
 
+    @RequestMapping(value = "/auto/login", method = RequestMethod.POST)
+    @ApiOperation(value = "小程序登陆调用")
+    public SsoUserAuthDto wxLogin(HttpServletRequest request, HttpServletResponse response,
+                                  @RequestBody WxLoginReq wxLoginReq){
+        SsoUserAuthDto ssoUserAuthDto = wChatUserService.wxLogin(request, response, wxLoginReq);
+        return ssoUserAuthDto;
+    }
+
 
     /**
      * 详情
@@ -44,17 +56,7 @@ public class WChatUserController implements BaseController {
         return doSingle(wChatUserService.getDetailById(id),WChatUserVo::new);
     }
 
-	/**
-     * 保存
-     * @param dto
-     * @return
-     */
-    @ApiOperation("保存")
-    @PostMapping(value = "save")
-    public String save(@RequestBody WChatUserDto dto){
-		wChatUserService.save(dto);
-        return "保存成功";
-    }
+
 
     /**
     * 列表
@@ -68,18 +70,6 @@ public class WChatUserController implements BaseController {
        return new PageSerializable<>(wChatUserService.list(dto));
     }
 
-	/**
-     * 修改
-     * @param dto
-     * @return
-     */
-    @ApiOperation("修改")
-    @PostMapping(value = "update")
-    public String update(@RequestBody WChatUserDto dto){
-		wChatUserService.update(dto);
-        return "修改成功";
-    }
-
 	/**
      * 删除
      * @param id

bus-web/src/main/java/bus/controller/biz/config/GlobalExceptionHandler.java

@@ -0,0 +1,38 @@
+package bus.controller.biz.config;
+
+import com.orcas.common.model.JsonResponse;
+import org.springframework.validation.FieldError;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import javax.xml.transform.Result;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@RestControllerAdvice
+public class GlobalExceptionHandler {
+    
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public JsonResponse handleValidationException(MethodArgumentNotValidException ex) {
+        List<String> errors = ex.getBindingResult()
+                .getFieldErrors()
+                .stream()
+                .map(FieldError::getDefaultMessage)
+                .collect(Collectors.toList());
+        
+        return  JsonResponse.fail(errors.get(0));
+    }
+    
+    @ExceptionHandler(ConstraintViolationException.class)
+    public JsonResponse handleConstraintViolationException(ConstraintViolationException ex) {
+        List<String> errors = ex.getConstraintViolations()
+                .stream()
+                .map(ConstraintViolation::getMessage)
+                .collect(Collectors.toList());
+        
+        return JsonResponse.fail(errors.get(0)) ;
+    }
+}