no message

bus-biz/pom.xml

@@ -41,11 +41,6 @@
 			<artifactId>spring-boot-starter-data-redis</artifactId>
 			<scope>provided</scope>
 		</dependency>
-		<dependency>
-			<groupId>com.xuxueli</groupId>
-			<artifactId>xxl-job-core</artifactId>
-			<version>2.2.0</version>
-		</dependency>
 	</dependencies>
 
 </project>

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

@@ -0,0 +1,20 @@
+package bus.mapper;
+
+import bus.model.dto.WFallbackInfoPageDto;
+import bus.model.vo.WFallbackInfoVo;
+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-22 23:34:40
+ **/
+@Mapper
+public interface WFallbackInfoMapper extends BaseMapper<WFallbackInfoPo> {
+
+    List<WFallbackInfoVo> list(WFallbackInfoPageDto dto);
+}

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

@@ -14,7 +14,7 @@ import java.util.List;
 * @Program: bus
 * @Description: 描述
 * @Author: zy
-* @Date: 2025-03-20 08:41:56
+* @Date: 2025-03-22 23:34:40
 **/
 public interface CommonService {
 

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

@@ -0,0 +1,52 @@
+package bus.service;
+
+import bus.model.dto.WFallbackInfoDto;
+import bus.model.dto.WFallbackInfoPageDto;
+import bus.model.vo.WFallbackInfoVo;
+import bus.model.po.WFallbackInfoPo;
+import java.util.List;
+
+/**
+ * @Program: bus
+ * @Description: 描述
+ * @Author: zy
+ * @Date: 2025-03-22 23:34:40
+ **/
+public interface WFallbackInfoService {
+
+
+    /**
+     * 详情
+     * @param id
+     * @return
+     */
+    WFallbackInfoPo getDetailById(String id);
+
+	/**
+     * 保存
+     * @param dto
+     * @return
+     */
+    void save(WFallbackInfoDto dto);
+
+    /**
+    * 列表
+    * @param dto
+    * @return
+    */
+    List<WFallbackInfoVo> list(WFallbackInfoPageDto dto);
+
+	/**
+     * 修改
+     * @param dto
+     * @return
+     */
+    void update(WFallbackInfoDto dto);
+
+	/**
+     * 删除
+     * @param id
+     * @return
+     */
+    void delete(String id);
+}

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

@@ -424,7 +424,7 @@ public class BCourseInfoServiceImpl extends ServiceImpl<BCourseInfoMapper, BCour
         String latitude = nearbyRoutesDto.getLatitude();
         String longitude = nearbyRoutesDto.getLongitude();
         // 参数验证
-        if (latitude == null || longitude == null || radius == null ) {
+        if (latitude == null || longitude == null ) {
             return Collections.emptyList();
         }
 
@@ -465,6 +465,7 @@ public class BCourseInfoServiceImpl extends ServiceImpl<BCourseInfoMapper, BCour
                 trackInfo.setFirstBusSpace(courseInfo.getFirstBusSpace());
                 trackInfo.setTicketAmount(courseInfo.getTicketAmount());
                 trackInfo.setMapPicUrl(courseInfo.getMapPicUrl());
+                trackInfo.setCourseType(courseInfo.getCourseType());
                 // 处理路线站点信息
                 List<BCoursePointDto> stationInfoList = courseInfo.getMapPointList();
                 trackInfo.setClist(stationInfoList);
@@ -732,6 +733,7 @@ public class BCourseInfoServiceImpl extends ServiceImpl<BCourseInfoMapper, BCour
         detailDto.setFirstStationName(courseInfo.getFirstStationName());
         detailDto.setLastStationName(courseInfo.getLastStationName());
         detailDto.setMapPicUrl(courseInfo.getMapPicUrl());
+        detailDto.setCourseType(courseInfo.getCourseType());
         // 获取路线点位信息
         String mapPoint = courseInfo.getMapPoint();
         if (StrUtil.isNotBlank(mapPoint)) {

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-03-20 08:41:56
+* @Date: 2025-03-22 23:34:40
 **/
 @Service
 @Transactional

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

@@ -0,0 +1,101 @@
+package bus.service.impl;
+
+import bus.model.SnowflakeUtil;
+import bus.model.dto.WFallbackInfoDto;
+import bus.model.dto.WFallbackInfoPageDto;
+import bus.model.vo.WFallbackInfoVo;
+import bus.model.po.WFallbackInfoPo;
+import bus.mapper.WFallbackInfoMapper;
+
+import bus.service.WFallbackInfoService;
+import com.orcas.common.sso.model.ExtInfo;
+import com.orcas.iso.config.common.user.CurrentUserHolder;
+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-22 23:34:40
+ **/
+@Service
+public class WFallbackInfoServiceImpl implements WFallbackInfoService {
+
+    @Autowired
+    private WFallbackInfoMapper wFallbackInfoMapper;
+    @Resource
+    private SnowflakeUtil snowflakeUtil;
+
+	/**
+     * 详情
+     * @param id
+     * @return
+     */
+    @Override
+    public WFallbackInfoPo getDetailById(String id){
+        return this.wFallbackInfoMapper.selectById(id);
+    }
+
+	/**
+     * 保存
+     * @param dto
+     * @return
+     */
+    @Override
+	public void save(WFallbackInfoDto dto){
+        WFallbackInfoPo po = new WFallbackInfoPo();
+
+        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.wFallbackInfoMapper.insert(po);
+    }
+
+    /**
+    * 列表
+    * @param dto
+    * @return
+    */
+    @Override
+    public List<WFallbackInfoVo> list(WFallbackInfoPageDto dto){
+        return this.wFallbackInfoMapper.list(dto);
+    }
+
+	/**
+     * 修改
+     * @param dto
+     * @return
+     */
+    @Override
+    public void update(WFallbackInfoDto dto){
+        WFallbackInfoPo po = new WFallbackInfoPo();
+        BeanUtils.copyProperties(dto,po);
+        ExtInfo extInfo = CurrentUserHolder.get();
+        po.setUpdateTime(new Date());
+        po.setUpdaterId(extInfo.getUserId());
+        po.setUpdaterName(extInfo.getUserName());
+		wFallbackInfoMapper.updateById(po);
+    }
+
+    /**
+     * 删除
+     * @param id
+     * @return
+     */
+    @Override
+    public void delete(String id){
+		wFallbackInfoMapper.deleteById(id);
+    }
+}

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

@@ -44,37 +44,62 @@
  </select>
 
     <!-- 查询附近站点 -->
+<!--    <select id="findNearbyStations" resultType="bus.model.dto.BStationInfoDto"-->
+<!--            parameterType="bus.model.dto.NearbyRoutesDto" >-->
+<!--        SELECT-->
+<!--        id,-->
+<!--        name,-->
+<!--        latitude,-->
+<!--        longitude,-->
+<!--        ROUND(-->
+<!--        6378.137 * 2 * ASIN(-->
+<!--        SQRT(-->
+<!--        POW(SIN((#{latitude} - latitude) * PI() / 180 / 2), 2) +-->
+<!--        COS(#{latitude} * PI() / 180) * COS(latitude * PI() / 180) *-->
+<!--        POW(SIN((#{longitude} - longitude) * PI() / 180 / 2), 2)-->
+<!--        )-->
+<!--        ) * 1000-->
+<!--        , 2) AS distance-->
+<!--        FROM b_station_info-->
+<!--        WHERE-->
+<!--        is_delete = 0-->
+<!--        AND latitude BETWEEN #{latitude} -  #{radius} / 111300 AND #{latitude} + #{radius} / 111300-->
+<!--        AND longitude BETWEEN #{longitude} - #{radius} / (111300 * COS(#{latitude} * PI() / 180))-->
+<!--        AND #{longitude} + #{radius} / (111300 * COS(#{latitude} * PI() / 180))-->
+<!--        AND (-->
+<!--        6378.137 * 2 * ASIN(-->
+<!--        SQRT(-->
+<!--        POW(SIN((#{latitude} - latitude) * PI() / 180 / 2), 2) +-->
+<!--        COS(#{latitude} * PI() / 180) * COS(latitude * PI() / 180) *-->
+<!--        POW(SIN((#{longitude} - longitude) * PI() / 180 / 2), 2)-->
+<!--        )-->
+<!--        ) * 1000-->
+<!--        ) &lt;= #{radius}-->
+<!--        ORDER BY distance-->
+<!--    </select>-->
+
     <select id="findNearbyStations" resultType="bus.model.dto.BStationInfoDto"
-            parameterType="bus.model.dto.NearbyRoutesDto" >
+            parameterType="bus.model.dto.NearbyRoutesDto">
         SELECT
-        id,
-        name,
-        latitude,
-        longitude,
-        ROUND(
-        6378.137 * 2 * ASIN(
-        SQRT(
-        POW(SIN((#{latitude} - latitude) * PI() / 180 / 2), 2) +
-        COS(#{latitude} * PI() / 180) * COS(latitude * PI() / 180) *
-        POW(SIN((#{longitude} - longitude) * PI() / 180 / 2), 2)
-        )
-        ) * 1000
-        , 2) AS distance
+            id,
+            name,
+            latitude,
+            longitude,
+            ROUND(
+                        6378.137 * 2 * ASIN(
+                            SQRT(
+                                        POW(SIN((#{latitude} - latitude) * PI() / 180 / 2), 2) +
+                                        COS(#{latitude} * PI() / 180) * COS(latitude * PI() / 180) *
+                                        POW(SIN((#{longitude} - longitude) * PI() / 180 / 2), 2)
+                                )
+                        ) * 1000
+                , 2) AS distance
         FROM b_station_info
         WHERE
-        is_delete = 0
-        AND latitude BETWEEN #{latitude} -  #{radius} / 111300 AND #{latitude} + #{radius} / 111300
-        AND longitude BETWEEN #{longitude} - #{radius} / (111300 * COS(#{latitude} * PI() / 180))
-        AND #{longitude} + #{radius} / (111300 * COS(#{latitude} * PI() / 180))
-        AND (
-        6378.137 * 2 * ASIN(
-        SQRT(
-        POW(SIN((#{latitude} - latitude) * PI() / 180 / 2), 2) +
-        COS(#{latitude} * PI() / 180) * COS(latitude * PI() / 180) *
-        POW(SIN((#{longitude} - longitude) * PI() / 180 / 2), 2)
-        )
-        ) * 1000
-        ) &lt;= #{radius}
+            is_delete = 0
+          <if test="stationName !=null and stationName != ''">
+              and name like  CONCAT('%', #{stationName}, '%')
+          </if>
         ORDER BY distance
     </select>
 
@@ -112,6 +137,7 @@
         r.id,
         r.course_name as courseName,
         r.course_code as courseCode,
+        r.course_type as courseType,
         r.map_pic_url as mapPicUrl,
         r.first_station_name as firstStationName,
         r.last_station_name as lastStationName,

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

@@ -0,0 +1,20 @@
+<?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.WFallbackInfoMapper">
+
+ <select id="list" parameterType="bus.model.dto.WFallbackInfoPageDto" resultType="bus.model.vo.WFallbackInfoVo">
+   select
+   id,
+   content,
+   create_time,
+   update_time,
+   creator_id,
+   updater_id,
+   creator_name,
+   updater_name,
+   is_delete
+   from
+   w_fallback_info
+ </select>
+
+</mapper>

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

@@ -45,7 +45,7 @@ orcas:
     logout:
       path: /logout
     excluded:
-      paths: /swagger-ui.html,/webjars/**,/swagger-resources/**,/v2/api-docs,/doc.html,/wChatUser/auto/login,/wChatUser/encryptedData,/wChatUser/getPhoneNumber,/wChatUser/getXcxOpenId,/bNoticeInfo/list,/bCourseInfo/etNearbyRoutes,/bCourseInfo/getCourseDetail,/bCourseInfo/getAllCourseByType,/bAdvert/list,/bNoticeUser/getNoticeInfoList
+      paths: /swagger-ui.html,/webjars/**,/swagger-resources/**,/v2/api-docs,/doc.html,/wChatUser/auto/login,/wChatUser/getPhoneNumber,/wChatUser/encryptedDataber,/wChatUser/getXcxOpenId,/bNoticeInfo/list,/bCourseInfo/etNearbyRoutes,/bCourseInfo/getCourseDetail,/bCourseInfo/getAllCourseByType,/bAdvert/list,/bNoticeUser/getNoticeInfoList,/bCourseInfo/getNearbyRoutes,/bStationInfo/getStationTypeList,/bBusTrackInfo/getPointByBusId
 
 file-store:
   go-fastdfs:

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

@@ -38,8 +38,8 @@ public class CodeGenerateTest {
 		//设置生成的表
 		List<TableInfo> tables = new ArrayList<>();
 		TableInfo tableInfo = new TableInfo();
-		tableInfo.setTableName("b_pre_bus");
-		tableInfo.setTableAlias("BPreBus");
+		tableInfo.setTableName("w_fallback_info");
+		tableInfo.setTableAlias("WFallbackInfo");
 		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-03-20 08:41:56
+* @Date: 2025-03-22 23:34:40
 **/
 @Data
 public class BaseEntity {

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

@@ -8,7 +8,7 @@ import lombok.Data;
 * @Program: bus
 * @Description: 描述
 * @Author: zy
-* @Date: 2025-03-20 08:41:56
+* @Date: 2025-03-22 23:34:40
 **/
 @ApiModel(description = "账户登陆请求实体")
 @Data

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

@@ -14,4 +14,7 @@ public class NearbyRoutesDto {
     @ApiModelProperty("半径米")
     private Integer radius;
 
+    @ApiModelProperty("站点名称")
+    private String stationName;
+
 }

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

@@ -18,6 +18,7 @@ public class WBusTrackInfoDto {
     private String courseId;
     @ApiModelProperty("线路名称")
     private String courseName;
+    private String courseType;
     private String mapPicUrl;
     @ApiModelProperty("出发站点名称")
     private String firstStationName;

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

@@ -20,6 +20,8 @@ public class WCourseDetailDto {
      */
     private String courseName;
 
+    private String   courseType;
+
     /**
      * 票价
      */

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

@@ -0,0 +1,33 @@
+package bus.model.dto;
+
+import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import java.util.Date;
+/**
+* @Program: bus
+* @Description: 描述
+* @Author: zy
+* @Date: 2025-03-22 23:34:40
+**/
+@Data
+public class WFallbackInfoDto{
+    @ApiModelProperty("id")
+    private String id;
+    @ApiModelProperty("反馈内容")
+    private String content;
+    @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/dto/WFallbackInfoPageDto.java

@@ -0,0 +1,34 @@
+package bus.model.dto;
+
+import bus.model.BaseEntity;
+import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import java.util.Date;
+/**
+* @Program: bus
+* @Description: 描述
+* @Author: zy
+* @Date: 2025-03-22 23:34:40
+**/
+@Data
+public class WFallbackInfoPageDto extends BaseEntity{
+    @ApiModelProperty("id")
+    private String id;
+    @ApiModelProperty("反馈内容")
+    private String content;
+    @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/po/WFallbackInfoPo.java

@@ -0,0 +1,30 @@
+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-22 23:34:40
+**/
+@Data
+@TableName("w_fallback_info")
+public class WFallbackInfoPo{
+    @TableId
+    private String id;
+    private String content;
+    private String name;
+    private String phone;
+    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/WFallbackInfoVo.java

@@ -0,0 +1,35 @@
+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-22 23:34:40
+**/
+@Data
+public class WFallbackInfoVo extends AbstractBaseVO{
+    @ApiModelProperty("id")
+    private String id;
+    @ApiModelProperty("反馈内容")
+    private String content;
+    @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/CommonController.java

@@ -33,7 +33,7 @@ import java.util.Map;
 * @Program: bus
 * @Description: 描述
 * @Author: zy
-* @Date: 2025-03-20 08:41:56
+* @Date: 2025-03-22 23:34:39
 **/
 @RestController
 @RequestMapping("/common")

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

@@ -0,0 +1,95 @@
+package bus.controller.biz;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageSerializable;
+import bus.model.dto.WFallbackInfoDto;
+import bus.model.dto.WFallbackInfoPageDto;
+import bus.model.vo.WFallbackInfoVo;
+import bus.service.WFallbackInfoService;
+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-22 23:34:39
+ **/
+@Slf4j
+@CrossOrigin
+@RestController
+@Api(tags = "反馈接口")
+@RequestMapping(value="/wFallbackInfo")
+public class WFallbackInfoController implements BaseController {
+
+    @Autowired
+    private WFallbackInfoService wFallbackInfoService;
+
+
+
+    /**
+     * 详情
+     * @param id
+     * @return
+     */
+    @ApiOperation("详情")
+    @GetMapping(value = "getDetailById")
+    public WFallbackInfoVo getDetailById(@RequestParam String id){
+        return doSingle(wFallbackInfoService.getDetailById(id),WFallbackInfoVo::new);
+    }
+
+	/**
+     * 保存
+     * @param dto
+     * @return
+     */
+    @ApiOperation("保存")
+    @PostMapping(value = "save")
+    public String save(@RequestBody WFallbackInfoDto dto){
+		wFallbackInfoService.save(dto);
+        return "保存成功";
+    }
+
+    /**
+    * 列表
+    * @param dto
+    * @return
+    */
+    @ApiOperation("列表")
+    @PostMapping(value = "list")
+    public PageSerializable<WFallbackInfoVo> list(@RequestBody WFallbackInfoPageDto dto){
+       PageHelper.startPage(dto.getPageNum(),dto.getPageSize());
+       return new PageSerializable<>(wFallbackInfoService.list(dto));
+    }
+
+	/**
+     * 修改
+     * @param dto
+     * @return
+     */
+    @ApiOperation("修改")
+    @PostMapping(value = "update")
+    public String update(@RequestBody WFallbackInfoDto dto){
+		wFallbackInfoService.update(dto);
+        return "修改成功";
+    }
+
+	/**
+     * 删除
+     * @param id
+     * @return
+     */
+    @ApiOperation("删除")
+    @PostMapping(value = "deleteById")
+    public String deleteById(@RequestParam String id){
+		wFallbackInfoService.delete(id);
+        return "删除成功";
+    }
+
+}