新增功能 用户行程日期 增删改查列表详情

fs-service/src/main/java/com/fs/his/domain/FsUserItinerary.java

@@ -0,0 +1,49 @@
+package com.fs.his.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fs.common.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.fs.common.core.domain.BaseEntity;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 用户日期行程对象 fs_user_itinerary
+ *
+ * @author fs
+ * @date 2025-09-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class FsUserItinerary extends BaseEntity{
+
+    /** 自增主键ID */
+    @ApiModelProperty("自增主键ID")
+    private Long id;
+
+    /** 用户ID */
+    @ApiModelProperty("用户ID")
+    private Long userId;
+
+    /** 行程内容 */
+    @ApiModelProperty("行程内容")
+    private String itinerary;
+
+    /** 行程日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty("行程日期")
+    private Date itineraryDate;
+
+    /** 行程时间 */
+    @JsonFormat(pattern = "HH:mm:ss")
+    @ApiModelProperty("行程时间")
+    private Date itineraryTime;
+
+    /** 预留字段 */
+    @ApiModelProperty("预留字段")
+    private String reservedField;
+
+
+}

fs-service/src/main/java/com/fs/his/mapper/FsUserItineraryMapper.java

@@ -0,0 +1,61 @@
+package com.fs.his.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fs.his.domain.FsUserItinerary;
+
+/**
+ * 用户日期行程Mapper接口
+ * 
+ * @author fs
+ * @date 2025-09-04
+ */
+public interface FsUserItineraryMapper extends BaseMapper<FsUserItinerary>{
+    /**
+     * 查询用户日期行程
+     * 
+     * @param id 用户日期行程主键
+     * @return 用户日期行程
+     */
+    FsUserItinerary selectFsUserItineraryById(Long id);
+
+    /**
+     * 查询用户日期行程列表
+     * 
+     * @param fsUserItinerary 用户日期行程
+     * @return 用户日期行程集合
+     */
+    List<FsUserItinerary> selectFsUserItineraryList(FsUserItinerary fsUserItinerary);
+
+    /**
+     * 新增用户日期行程
+     * 
+     * @param fsUserItinerary 用户日期行程
+     * @return 结果
+     */
+    int insertFsUserItinerary(FsUserItinerary fsUserItinerary);
+
+    /**
+     * 修改用户日期行程
+     * 
+     * @param fsUserItinerary 用户日期行程
+     * @return 结果
+     */
+    int updateFsUserItinerary(FsUserItinerary fsUserItinerary);
+
+    /**
+     * 删除用户日期行程
+     * 
+     * @param id 用户日期行程主键
+     * @return 结果
+     */
+    int deleteFsUserItineraryById(Long id);
+
+    /**
+     * 批量删除用户日期行程
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    int deleteFsUserItineraryByIds(Long[] ids);
+}

fs-service/src/main/java/com/fs/his/service/IFsUserItineraryService.java

@@ -0,0 +1,61 @@
+package com.fs.his.service;
+
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fs.his.domain.FsUserItinerary;
+
+/**
+ * 用户日期行程Service接口
+ * 
+ * @author fs
+ * @date 2025-09-04
+ */
+public interface IFsUserItineraryService extends IService<FsUserItinerary>{
+    /**
+     * 查询用户日期行程
+     * 
+     * @param id 用户日期行程主键
+     * @return 用户日期行程
+     */
+    FsUserItinerary selectFsUserItineraryById(Long id);
+
+    /**
+     * 查询用户日期行程列表
+     * 
+     * @param fsUserItinerary 用户日期行程
+     * @return 用户日期行程集合
+     */
+    List<FsUserItinerary> selectFsUserItineraryList(FsUserItinerary fsUserItinerary);
+
+    /**
+     * 新增用户日期行程
+     * 
+     * @param fsUserItinerary 用户日期行程
+     * @return 结果
+     */
+    int insertFsUserItinerary(FsUserItinerary fsUserItinerary);
+
+    /**
+     * 修改用户日期行程
+     * 
+     * @param fsUserItinerary 用户日期行程
+     * @return 结果
+     */
+    int updateFsUserItinerary(FsUserItinerary fsUserItinerary);
+
+    /**
+     * 批量删除用户日期行程
+     * 
+     * @param ids 需要删除的用户日期行程主键集合
+     * @return 结果
+     */
+    int deleteFsUserItineraryByIds(Long[] ids);
+
+    /**
+     * 删除用户日期行程信息
+     * 
+     * @param id 用户日期行程主键
+     * @return 结果
+     */
+    int deleteFsUserItineraryById(Long id);
+}

fs-service/src/main/java/com/fs/his/service/impl/FsUserItineraryServiceImpl.java

@@ -0,0 +1,94 @@
+package com.fs.his.service.impl;
+
+import java.util.List;
+import com.fs.common.utils.DateUtils;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.fs.his.mapper.FsUserItineraryMapper;
+import com.fs.his.domain.FsUserItinerary;
+import com.fs.his.service.IFsUserItineraryService;
+
+/**
+ * 用户日期行程Service业务层处理
+ * 
+ * @author fs
+ * @date 2025-09-04
+ */
+@Service
+public class FsUserItineraryServiceImpl extends ServiceImpl<FsUserItineraryMapper, FsUserItinerary> implements IFsUserItineraryService {
+
+    /**
+     * 查询用户日期行程
+     * 
+     * @param id 用户日期行程主键
+     * @return 用户日期行程
+     */
+    @Override
+    public FsUserItinerary selectFsUserItineraryById(Long id)
+    {
+        return baseMapper.selectFsUserItineraryById(id);
+    }
+
+    /**
+     * 查询用户日期行程列表
+     * 
+     * @param fsUserItinerary 用户日期行程
+     * @return 用户日期行程
+     */
+    @Override
+    public List<FsUserItinerary> selectFsUserItineraryList(FsUserItinerary fsUserItinerary)
+    {
+        return baseMapper.selectFsUserItineraryList(fsUserItinerary);
+    }
+
+    /**
+     * 新增用户日期行程
+     * 
+     * @param fsUserItinerary 用户日期行程
+     * @return 结果
+     */
+    @Override
+    public int insertFsUserItinerary(FsUserItinerary fsUserItinerary)
+    {
+        fsUserItinerary.setCreateTime(DateUtils.getNowDate());
+        return baseMapper.insertFsUserItinerary(fsUserItinerary);
+    }
+
+    /**
+     * 修改用户日期行程
+     * 
+     * @param fsUserItinerary 用户日期行程
+     * @return 结果
+     */
+    @Override
+    public int updateFsUserItinerary(FsUserItinerary fsUserItinerary)
+    {
+        fsUserItinerary.setUpdateTime(DateUtils.getNowDate());
+        return baseMapper.updateFsUserItinerary(fsUserItinerary);
+    }
+
+    /**
+     * 批量删除用户日期行程
+     * 
+     * @param ids 需要删除的用户日期行程主键
+     * @return 结果
+     */
+    @Override
+    public int deleteFsUserItineraryByIds(Long[] ids)
+    {
+        return baseMapper.deleteFsUserItineraryByIds(ids);
+    }
+
+    /**
+     * 删除用户日期行程信息
+     * 
+     * @param id 用户日期行程主键
+     * @return 结果
+     */
+    @Override
+    public int deleteFsUserItineraryById(Long id)
+    {
+        return baseMapper.deleteFsUserItineraryById(id);
+    }
+}

fs-service/src/main/resources/mapper/his/FsUserItineraryMapper.xml

@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fs.his.mapper.FsUserItineraryMapper">
+    
+    <resultMap type="FsUserItinerary" id="FsUserItineraryResult">
+        <result property="id"    column="id"    />
+        <result property="userId"    column="user_id"    />
+        <result property="itinerary"    column="itinerary"    />
+        <result property="itineraryDate"    column="itinerary_date"    />
+        <result property="itineraryTime"    column="itinerary_time"    />
+        <result property="reservedField"    column="reserved_field"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectFsUserItineraryVo">
+        select id, user_id, itinerary, itinerary_date, itinerary_time, reserved_field, create_time, update_time from fs_user_itinerary
+    </sql>
+
+    <select id="selectFsUserItineraryList" parameterType="FsUserItinerary" resultMap="FsUserItineraryResult">
+        <include refid="selectFsUserItineraryVo"/>
+        <where>  
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="itinerary != null  and itinerary != ''"> and itinerary = #{itinerary}</if>
+            <if test="itineraryDate != null "> and itinerary_date = #{itineraryDate}</if>
+            <if test="itineraryTime != null "> and itinerary_time = #{itineraryTime}</if>
+            <if test="reservedField != null  and reservedField != ''"> and reserved_field = #{reservedField}</if>
+        </where>
+    </select>
+    
+    <select id="selectFsUserItineraryById" parameterType="Long" resultMap="FsUserItineraryResult">
+        <include refid="selectFsUserItineraryVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertFsUserItinerary" parameterType="FsUserItinerary" useGeneratedKeys="true" keyProperty="id">
+        insert into fs_user_itinerary
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="userId != null">user_id,</if>
+            <if test="itinerary != null and itinerary != ''">itinerary,</if>
+            <if test="itineraryDate != null">itinerary_date,</if>
+            <if test="itineraryTime != null">itinerary_time,</if>
+            <if test="reservedField != null">reserved_field,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="userId != null">#{userId},</if>
+            <if test="itinerary != null and itinerary != ''">#{itinerary},</if>
+            <if test="itineraryDate != null">#{itineraryDate},</if>
+            <if test="itineraryTime != null">#{itineraryTime},</if>
+            <if test="reservedField != null">#{reservedField},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateFsUserItinerary" parameterType="FsUserItinerary">
+        update fs_user_itinerary
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="itinerary != null and itinerary != ''">itinerary = #{itinerary},</if>
+            <if test="itineraryDate != null">itinerary_date = #{itineraryDate},</if>
+            <if test="itineraryTime != null">itinerary_time = #{itineraryTime},</if>
+            <if test="reservedField != null">reserved_field = #{reservedField},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteFsUserItineraryById" parameterType="Long">
+        delete from fs_user_itinerary where id = #{id}
+    </delete>
+
+    <delete id="deleteFsUserItineraryByIds" parameterType="String">
+        delete from fs_user_itinerary where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

fs-user-app/src/main/java/com/fs/app/controller/FsUserItineraryController.java

@@ -0,0 +1,104 @@
+package com.fs.app.controller;
+
+import java.util.List;
+
+import com.fs.app.annotation.Login;
+import com.fs.common.core.domain.R;
+import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.parameters.P;
+import org.springframework.web.bind.annotation.*;
+import com.fs.common.annotation.Log;
+import com.fs.common.core.controller.BaseController;
+import com.fs.common.core.domain.AjaxResult;
+import com.fs.common.enums.BusinessType;
+import com.fs.his.domain.FsUserItinerary;
+import com.fs.his.service.IFsUserItineraryService;
+import com.fs.common.utils.poi.ExcelUtil;
+import com.fs.common.core.page.TableDataInfo;
+
+/**
+ * 用户日期行程Controller
+ * 
+ * @author fs
+ * @date 2025-09-04
+ */
+@RestController
+@RequestMapping("/app/fs/itinerary")
+@Api("用户行程相关接口")
+public class FsUserItineraryController extends AppBaseController
+{
+    @Autowired
+    private IFsUserItineraryService fsUserItineraryService;
+
+    /**
+     * 查询用户日期行程列表
+     */
+    @Login
+    @ApiOperation("查询用户日期行程列表")
+    @GetMapping("/list")
+    public R list(FsUserItinerary fsUserItinerary)
+    {
+        startPage();
+        List<FsUserItinerary> list = fsUserItineraryService.selectFsUserItineraryList(fsUserItinerary);
+        return R.ok().put("data",  new PageInfo<>(list));
+    }
+
+
+    /**
+     * 获取用户日期行程详细信息
+     */
+    @Login
+    @ApiOperation("获取用户日期行程详细信息")
+    @GetMapping(value = "/info")
+    public R getInfo(@RequestParam("id") Long id)
+    {
+        FsUserItinerary fsUserItinerary = fsUserItineraryService.selectFsUserItineraryById(id);
+        return R.ok().put("data", fsUserItinerary);
+    }
+
+    /**
+     * 新增用户日期行程
+     */
+    @Login
+    @ApiOperation("新增用户日期行程")
+    @PostMapping("/add")
+    public R add(@RequestBody FsUserItinerary fsUserItinerary)
+    {
+        if(fsUserItineraryService.insertFsUserItinerary(fsUserItinerary)<=0){
+            return R.error("新增用户日期行程失败");
+        }
+        return R.ok();
+    }
+
+    /**
+     * 修改用户日期行程
+     */
+    @Login
+    @ApiOperation("修改用户日期行程")
+    @PostMapping("/update")
+    public R edit(@RequestBody FsUserItinerary fsUserItinerary)
+    {
+        if(fsUserItineraryService.updateFsUserItinerary(fsUserItinerary)<=0){
+            return R.error("修改用户日期行程失败");
+        }
+        return R.ok();
+    }
+
+    /**
+     * 删除用户日期行程
+     */
+    @Login
+    @ApiOperation("删除用户日期行程")
+	@GetMapping("/delete")
+    public R remove(@RequestParam("id") Long id)
+    {
+        if(fsUserItineraryService.deleteFsUserItineraryById(id)<=0){
+            return R.error("删除用户日期行程失败");
+        }
+        return R.ok();
+    }
+}