Browse Source

到站提醒提醒,主键改成uuid。

tomatozq 4 years ago
parent
commit
d2100d670b

+ 1 - 1
common/src/main/java/com/jpsoft/bus/modules/bus/dao/StationRemindDAO.java

@@ -11,7 +11,7 @@ public interface StationRemindDAO {
 	int insert(StationRemind entity);
 	int update(StationRemind entity);
 	int exist(String id);
-	StationRemind get(Long id);
+	StationRemind get(String id);
 	int delete(String id);
 	List<StationRemind> list();
 	List<StationRemind> search(Map<String, Object> searchParams, List<Sort> sortList);

+ 1 - 1
common/src/main/java/com/jpsoft/bus/modules/bus/entity/StationRemind.java

@@ -21,7 +21,7 @@ public class StationRemind {
      * 雪花主键
      */
     @ApiModelProperty(value = "雪花主键")
-    private Long id;
+    private String id;
     /**
      * 起始站点编号
      */

+ 1 - 1
common/src/main/java/com/jpsoft/bus/modules/bus/service/StationRemindService.java

@@ -7,7 +7,7 @@ import com.github.pagehelper.Page;
 import com.jpsoft.bus.modules.common.dto.Sort;
 
 public interface StationRemindService {
-	StationRemind get(Long id);
+	StationRemind get(String id);
 	boolean exist(String id);
 	int insert(StationRemind model);
 	int update(StationRemind model);

+ 1 - 1
common/src/main/java/com/jpsoft/bus/modules/bus/service/impl/StationRemindServiceImpl.java

@@ -20,7 +20,7 @@ public class StationRemindServiceImpl implements StationRemindService {
 	private StationRemindDAO stationRemindDAO;
 
 	@Override
-	public StationRemind get(Long id) {
+	public StationRemind get(String id) {
 		// TODO Auto-generated method stub
 		return stationRemindDAO.get(id);
 	}

+ 2 - 2
common/src/main/resources/mapper/bus/StationRemind.xml

@@ -30,7 +30,7 @@
 	    stop_in_advance,open_id,remind_type,vehicle_shift_id,create_by,create_time,update_by,update_time,del_flag)
 		values
 		(
-            #{id,jdbcType= NUMERIC }
+            #{id,jdbcType= VARCHAR }
             ,#{startStationId,jdbcType=VARCHAR}
             ,#{remindStationId,jdbcType=VARCHAR}
             ,#{advanceStationId,jdbcType=VARCHAR}
@@ -91,7 +91,7 @@
         </set>
         where id_=#{id}
     </update>
-    <select id="get" parameterType="long" resultMap="StationRemindMap">
+    <select id="get" parameterType="string" resultMap="StationRemindMap">
         select
         id_,start_station_id,remind_station_id,stop_in_advance,advance_station_id,
         open_id,remind_type,vehicle_shift_id,create_by,create_time,update_by,update_time,del_flag

+ 3 - 3
web/src/main/java/com/jpsoft/bus/modules/mobile/controller/StationRemindApiController.java

@@ -67,7 +67,7 @@ public class StationRemindApiController {
 
         try {
             StationRemind stationRemind = new StationRemind();
-            stationRemind.setId(SnowflakeIdWorker.getInstance().nextId());
+            stationRemind.setId(UUID.randomUUID().toString());
             stationRemind.setStartStationId(startStationId);
             stationRemind.setRemindStationId(remindStationId);
             stationRemind.setStopInAdvance(stopInAdvance);
@@ -116,7 +116,7 @@ public class StationRemindApiController {
             @ApiImplicitParam(name = "vehicleShiftId", value = "车辆班次编号", paramType = "form", allowEmptyValue = true),
             @ApiImplicitParam(name = "openId", value = "微信openId", paramType = "form")
     })
-    public MessageResult<StationRemind> update(Long remindId,String startStationId,String remindStationId,Integer stopInAdvance,
+    public MessageResult<StationRemind> update(String remindId,String startStationId,String remindStationId,Integer stopInAdvance,
                                             Integer remindType,String vehicleShiftId,String openId){
         MessageResult<StationRemind> msgResult = new MessageResult<>();
 
@@ -206,7 +206,7 @@ public class StationRemindApiController {
 
     @ApiOperation(value="取消订阅")
     @PostMapping("cancel")
-    public MessageResult<Integer> cancel(Long id){
+    public MessageResult<Integer> cancel(String id){
         MessageResult<Integer> msgResult = new MessageResult<>();
 
         try {