Merge remote-tracking branch 'origin/dev' into dev

zhanghl

2025-04-22 1e7986b8dd426333307312926720d387a85138d5

Merge remote-tracking branch 'origin/dev' into dev

 aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsWorkCalendarController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,98 @@
package com.aps.core.controller.basicData;

import com.aps.common.core.utils.poi.ExcelUtil;
import com.aps.common.core.web.controller.BaseController;
import com.aps.common.core.web.domain.AjaxResult;
import com.aps.common.core.web.page.TableDataInfo;
import com.aps.common.log.annotation.Log;
import com.aps.common.log.enums.BusinessType;
import com.aps.common.security.annotation.RequiresPermissions;
import com.aps.core.domain.ApsWorkCalendar;
import com.aps.core.service.IApsWorkCalendarService;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.List;

/**
 * æ—¥åŽ†ç®¡ç†Controller
 * 
 * @author hjy
 * @date 2025-04-22
 */
@RestController
@RequestMapping("/calendar")
public class ApsWorkCalendarController extends BaseController
{
    @Autowired
    private IApsWorkCalendarService apsWorkCalendarService;

    /**
     * æŸ¥è¯¢æ—¥åŽ†ç®¡ç†åˆ—表
     */
    @RequiresPermissions("aps:calendar:list")
    @GetMapping("/list")
    public TableDataInfo list(ApsWorkCalendar apsWorkCalendar)
    {
        startPage();
        List<ApsWorkCalendar> list = apsWorkCalendarService.selectApsWorkCalendarList(apsWorkCalendar);
        return getDataTable(list);
    }

    /**
     * å¯¼å‡ºæ—¥åŽ†ç®¡ç†åˆ—表
     */
    @RequiresPermissions("core:calendar:export")
    @Log(title = "日历管理", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, ApsWorkCalendar apsWorkCalendar)
    {
        List<ApsWorkCalendar> list = apsWorkCalendarService.selectApsWorkCalendarList(apsWorkCalendar);
        ExcelUtil<ApsWorkCalendar> util = new ExcelUtil<ApsWorkCalendar>(ApsWorkCalendar.class);
        util.exportExcel(response, list, "日历管理数据");
    }

    /**
     * èŽ·å–日历管理详细信息
     */
    @RequiresPermissions("core:calendar:query")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
        return success(apsWorkCalendarService.selectApsWorkCalendarById(id));
    }

    /**
     * æ–°å¢žæ—¥åŽ†ç®¡ç†
     */
    @RequiresPermissions("core:calendar:add")
    @Log(title = "日历管理", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody ApsWorkCalendar apsWorkCalendar)
    {
        return toAjax(apsWorkCalendarService.insertApsWorkCalendar(apsWorkCalendar));
    }

    /**
     * ä¿®æ”¹æ—¥åŽ†ç®¡ç†
     */
    @RequiresPermissions("core:calendar:edit")
    @Log(title = "日历管理", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody ApsWorkCalendar apsWorkCalendar)
    {
        return toAjax(apsWorkCalendarService.updateApsWorkCalendar(apsWorkCalendar));
    }

    /**
     * åˆ é™¤æ—¥åŽ†ç®¡ç†
     */
    @RequiresPermissions("core:calendar:remove")
    @Log(title = "日历管理", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(apsWorkCalendarService.deleteApsWorkCalendarByIds(ids));
    }
}

 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsWorkCalendar.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,166 @@
package com.aps.core.domain;

import com.aps.common.core.annotation.Excel;
import com.aps.common.core.web.domain.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;

import java.util.Date;

/**
 * æ—¥åŽ†ç®¡ç†å¯¹è±¡ aps_work_calendar
 * 
 * @author hjy
 * @date 2025-04-22
 */
public class ApsWorkCalendar extends BaseEntity
{
    private static final long serialVersionUID = 1L;

    /** $column.columnComment */
    private Long id;

    /** æè¿° */
    @Excel(name = "描述")
    private String description;

    /** ç±»åž‹ï¼Œå‘¨å·¥ä½œ/节假日 */
    @Excel(name = "类型，周工作/节假日")
    private String type;

    /** æ—¥åŽ†ç”Ÿæ•ˆæ—¥æœŸ */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "日历生效日期", width = 30, dateFormat = "yyyy-MM-dd")
    private Date effectiveDate;

    /** å¤±æ•ˆæ—¥æœŸ */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "失效日期", width = 30, dateFormat = "yyyy-MM-dd")
    private Date expiringDate;

    /** æ—¥åŽ†å†…容 */
    @Excel(name = "日历内容")
    private String content;

    /** é€‚用工厂 */
    @Excel(name = "适用工厂")
    private String applicableFactory;

    /** é€‚用车间 */
    @Excel(name = "适用车间")
    private String applicableWorkshop;

    /** é€‚用工序 */
    @Excel(name = "适用工序")
    private String applicableProcess;

    public void setId(Long id) 
    {
        this.id = id;
    }

    public Long getId() 
    {
        return id;
    }

    public void setDescription(String description) 
    {
        this.description = description;
    }

    public String getDescription() 
    {
        return description;
    }

    public void setType(String type) 
    {
        this.type = type;
    }

    public String getType() 
    {
        return type;
    }

    public void setEffectiveDate(Date effectiveDate) 
    {
        this.effectiveDate = effectiveDate;
    }

    public Date getEffectiveDate() 
    {
        return effectiveDate;
    }

    public void setExpiringDate(Date expiringDate) 
    {
        this.expiringDate = expiringDate;
    }

    public Date getExpiringDate() 
    {
        return expiringDate;
    }

    public void setContent(String content) 
    {
        this.content = content;
    }

    public String getContent() 
    {
        return content;
    }

    public void setApplicableFactory(String applicableFactory) 
    {
        this.applicableFactory = applicableFactory;
    }

    public String getApplicableFactory() 
    {
        return applicableFactory;
    }

    public void setApplicableWorkshop(String applicableWorkshop) 
    {
        this.applicableWorkshop = applicableWorkshop;
    }

    public String getApplicableWorkshop() 
    {
        return applicableWorkshop;
    }

    public void setApplicableProcess(String applicableProcess) 
    {
        this.applicableProcess = applicableProcess;
    }

    public String getApplicableProcess() 
    {
        return applicableProcess;
    }

    @Override
    public String toString() {
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
            .append("id", getId())
            .append("description", getDescription())
            .append("type", getType())
            .append("effectiveDate", getEffectiveDate())
            .append("expiringDate", getExpiringDate())
            .append("content", getContent())
            .append("applicableFactory", getApplicableFactory())
            .append("applicableWorkshop", getApplicableWorkshop())
            .append("applicableProcess", getApplicableProcess())
            .append("createBy", getCreateBy())
            .append("createTime", getCreateTime())
            .append("updateBy", getUpdateBy())
            .append("updateTime", getUpdateTime())
            .toString();
    }
}

 aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsWorkCalendarMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,62 @@
package com.aps.core.mapper;

import com.aps.core.domain.ApsWorkCalendar;

import java.util.List;

/**
 * æ—¥åŽ†ç®¡ç†Mapper接口
 * 
 * @author hjy
 * @date 2025-04-22
 */
public interface ApsWorkCalendarMapper 
{
    /**
     * æŸ¥è¯¢æ—¥åŽ†ç®¡ç†
     * 
     * @param id æ—¥åŽ†ç®¡ç†ä¸»é”®
     * @return æ—¥åŽ†ç®¡ç†
     */
    public ApsWorkCalendar selectApsWorkCalendarById(Long id);

    /**
     * æŸ¥è¯¢æ—¥åŽ†ç®¡ç†åˆ—表
     * 
     * @param apsWorkCalendar æ—¥åŽ†ç®¡ç†
     * @return æ—¥åŽ†ç®¡ç†é›†åˆ
     */
    public List<ApsWorkCalendar> selectApsWorkCalendarList(ApsWorkCalendar apsWorkCalendar);

    /**
     * æ–°å¢žæ—¥åŽ†ç®¡ç†
     * 
     * @param apsWorkCalendar æ—¥åŽ†ç®¡ç†
     * @return ç»“æžœ
     */
    public int insertApsWorkCalendar(ApsWorkCalendar apsWorkCalendar);

    /**
     * ä¿®æ”¹æ—¥åŽ†ç®¡ç†
     * 
     * @param apsWorkCalendar æ—¥åŽ†ç®¡ç†
     * @return ç»“æžœ
     */
    public int updateApsWorkCalendar(ApsWorkCalendar apsWorkCalendar);

    /**
     * åˆ é™¤æ—¥åŽ†ç®¡ç†
     * 
     * @param id æ—¥åŽ†ç®¡ç†ä¸»é”®
     * @return ç»“æžœ
     */
    public int deleteApsWorkCalendarById(Long id);

    /**
     * æ‰¹é‡åˆ é™¤æ—¥åŽ†ç®¡ç†
     * 
     * @param ids éœ€è¦åˆ é™¤çš„数据主键集合
     * @return ç»“æžœ
     */
    public int deleteApsWorkCalendarByIds(Long[] ids);
}

 aps-modules/aps-core/src/main/java/com/aps/core/service/IApsWorkCalendarService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,62 @@
package com.aps.core.service;

import com.aps.core.domain.ApsWorkCalendar;

import java.util.List;

/**
 * æ—¥åŽ†ç®¡ç†Service接口
 * 
 * @author hjy
 * @date 2025-04-22
 */
public interface IApsWorkCalendarService 
{
    /**
     * æŸ¥è¯¢æ—¥åŽ†ç®¡ç†
     * 
     * @param id æ—¥åŽ†ç®¡ç†ä¸»é”®
     * @return æ—¥åŽ†ç®¡ç†
     */
    public ApsWorkCalendar selectApsWorkCalendarById(Long id);

    /**
     * æŸ¥è¯¢æ—¥åŽ†ç®¡ç†åˆ—表
     * 
     * @param apsWorkCalendar æ—¥åŽ†ç®¡ç†
     * @return æ—¥åŽ†ç®¡ç†é›†åˆ
     */
    public List<ApsWorkCalendar> selectApsWorkCalendarList(ApsWorkCalendar apsWorkCalendar);

    /**
     * æ–°å¢žæ—¥åŽ†ç®¡ç†
     * 
     * @param apsWorkCalendar æ—¥åŽ†ç®¡ç†
     * @return ç»“æžœ
     */
    public int insertApsWorkCalendar(ApsWorkCalendar apsWorkCalendar);

    /**
     * ä¿®æ”¹æ—¥åŽ†ç®¡ç†
     * 
     * @param apsWorkCalendar æ—¥åŽ†ç®¡ç†
     * @return ç»“æžœ
     */
    public int updateApsWorkCalendar(ApsWorkCalendar apsWorkCalendar);

    /**
     * æ‰¹é‡åˆ é™¤æ—¥åŽ†ç®¡ç†
     * 
     * @param ids éœ€è¦åˆ é™¤çš„日历管理主键集合
     * @return ç»“æžœ
     */
    public int deleteApsWorkCalendarByIds(Long[] ids);

    /**
     * åˆ é™¤æ—¥åŽ†ç®¡ç†ä¿¡æ¯
     * 
     * @param id æ—¥åŽ†ç®¡ç†ä¸»é”®
     * @return ç»“æžœ
     */
    public int deleteApsWorkCalendarById(Long id);
}

 aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWorkCalendarServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,100 @@
package com.aps.core.service.impl;

import com.aps.common.core.utils.DateUtils;
import com.aps.common.security.utils.SecurityUtils;
import com.aps.core.domain.ApsWorkCalendar;
import com.aps.core.mapper.ApsWorkCalendarMapper;
import com.aps.core.service.IApsWorkCalendarService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * æ—¥åŽ†ç®¡ç†Service业务层处理
 * 
 * @author hjy
 * @date 2025-04-22
 */
@Service
public class ApsWorkCalendarServiceImpl implements IApsWorkCalendarService 
{
    @Autowired
    private ApsWorkCalendarMapper apsWorkCalendarMapper;

    /**
     * æŸ¥è¯¢æ—¥åŽ†ç®¡ç†
     * 
     * @param id æ—¥åŽ†ç®¡ç†ä¸»é”®
     * @return æ—¥åŽ†ç®¡ç†
     */
    @Override
    public ApsWorkCalendar selectApsWorkCalendarById(Long id)
    {
        return apsWorkCalendarMapper.selectApsWorkCalendarById(id);
    }

    /**
     * æŸ¥è¯¢æ—¥åŽ†ç®¡ç†åˆ—表
     * 
     * @param apsWorkCalendar æ—¥åŽ†ç®¡ç†
     * @return æ—¥åŽ†ç®¡ç†
     */
    @Override
    public List<ApsWorkCalendar> selectApsWorkCalendarList(ApsWorkCalendar apsWorkCalendar)
    {
        return apsWorkCalendarMapper.selectApsWorkCalendarList(apsWorkCalendar);
    }

    /**
     * æ–°å¢žæ—¥åŽ†ç®¡ç†
     * 
     * @param apsWorkCalendar æ—¥åŽ†ç®¡ç†
     * @return ç»“æžœ
     */
    @Override
    public int insertApsWorkCalendar(ApsWorkCalendar apsWorkCalendar)
    {
        apsWorkCalendar.setCreateTime(DateUtils.getNowDate());
        apsWorkCalendar.setCreateBy(SecurityUtils.getUsername());
        return apsWorkCalendarMapper.insertApsWorkCalendar(apsWorkCalendar);
    }

    /**
     * ä¿®æ”¹æ—¥åŽ†ç®¡ç†
     * 
     * @param apsWorkCalendar æ—¥åŽ†ç®¡ç†
     * @return ç»“æžœ
     */
    @Override
    public int updateApsWorkCalendar(ApsWorkCalendar apsWorkCalendar)
    {
        apsWorkCalendar.setUpdateTime(DateUtils.getNowDate());
        apsWorkCalendar.setUpdateBy(SecurityUtils.getUsername());
        return apsWorkCalendarMapper.updateApsWorkCalendar(apsWorkCalendar);
    }

    /**
     * æ‰¹é‡åˆ é™¤æ—¥åŽ†ç®¡ç†
     * 
     * @param ids éœ€è¦åˆ é™¤çš„日历管理主键
     * @return ç»“æžœ
     */
    @Override
    public int deleteApsWorkCalendarByIds(Long[] ids)
    {
        return apsWorkCalendarMapper.deleteApsWorkCalendarByIds(ids);
    }

    /**
     * åˆ é™¤æ—¥åŽ†ç®¡ç†ä¿¡æ¯
     * 
     * @param id æ—¥åŽ†ç®¡ç†ä¸»é”®
     * @return ç»“æžœ
     */
    @Override
    public int deleteApsWorkCalendarById(Long id)
    {
        return apsWorkCalendarMapper.deleteApsWorkCalendarById(id);
    }
}

 aps-modules/aps-core/src/main/resources/mapper/core/ApsWorkCalendarMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,109 @@
<?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.aps.core.mapper.ApsWorkCalendarMapper">
    
    <resultMap type="ApsWorkCalendar" id="ApsWorkCalendarResult">
        <result property="id"    column="id"    />
        <result property="description"    column="description"    />
        <result property="type"    column="type"    />
        <result property="effectiveDate"    column="effective_date"    />
        <result property="expiringDate"    column="expiring_date"    />
        <result property="content"    column="content"    />
        <result property="applicableFactory"    column="applicable_factory"    />
        <result property="applicableWorkshop"    column="applicable_workshop"    />
        <result property="applicableProcess"    column="applicable_process"    />
        <result property="createBy"    column="create_by"    />
        <result property="createTime"    column="create_time"    />
        <result property="updateBy"    column="update_by"    />
        <result property="updateTime"    column="update_time"    />
    </resultMap>

    <sql id="selectApsWorkCalendarVo">
        select id, description, type, effective_date, expiring_date, content, applicable_factory, applicable_workshop, applicable_process, create_by, create_time, update_by, update_time from aps_work_calendar
    </sql>

    <select id="selectApsWorkCalendarList" parameterType="ApsWorkCalendar" resultMap="ApsWorkCalendarResult">
        <include refid="selectApsWorkCalendarVo"/>
        <where>  
            <if test="description != null  and description != ''"> and description like '%' || #{description} || '%'</if>
            <if test="type != null  and type != ''"> and type = #{type}</if>
            <if test="effectiveDate != null "> and effective_date = #{effectiveDate}</if>
            <if test="expiringDate != null "> and expiring_date = #{expiringDate}</if>
            <if test="content != null  and content != ''"> and content = #{content}</if>
            <if test="applicableFactory != null  and applicableFactory != ''"> and applicable_factory = #{applicableFactory}</if>
            <if test="applicableWorkshop != null  and applicableWorkshop != ''"> and applicable_workshop = #{applicableWorkshop}</if>
            <if test="applicableProcess != null  and applicableProcess != ''"> and applicable_process = #{applicableProcess}</if>
        </where>
    </select>
    
    <select id="selectApsWorkCalendarById" parameterType="Long" resultMap="ApsWorkCalendarResult">
        <include refid="selectApsWorkCalendarVo"/>
        where id = #{id}
    </select>

    <insert id="insertApsWorkCalendar" parameterType="ApsWorkCalendar">
        insert into aps_work_calendar
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
            <if test="description != null">description,</if>
            <if test="type != null">type,</if>
            <if test="effectiveDate != null">effective_date,</if>
            <if test="expiringDate != null">expiring_date,</if>
            <if test="content != null">content,</if>
            <if test="applicableFactory != null">applicable_factory,</if>
            <if test="applicableWorkshop != null">applicable_workshop,</if>
            <if test="applicableProcess != null">applicable_process,</if>
            <if test="createBy != null">create_by,</if>
            <if test="createTime != null">create_time,</if>
            <if test="updateBy != null">update_by,</if>
            <if test="updateTime != null">update_time,</if>
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null">#{id},</if>
            <if test="description != null">#{description},</if>
            <if test="type != null">#{type},</if>
            <if test="effectiveDate != null">#{effectiveDate},</if>
            <if test="expiringDate != null">#{expiringDate},</if>
            <if test="content != null">#{content},</if>
            <if test="applicableFactory != null">#{applicableFactory},</if>
            <if test="applicableWorkshop != null">#{applicableWorkshop},</if>
            <if test="applicableProcess != null">#{applicableProcess},</if>
            <if test="createBy != null">#{createBy},</if>
            <if test="createTime != null">#{createTime},</if>
            <if test="updateBy != null">#{updateBy},</if>
            <if test="updateTime != null">#{updateTime},</if>
         </trim>
    </insert>

    <update id="updateApsWorkCalendar" parameterType="ApsWorkCalendar">
        update aps_work_calendar
        <trim prefix="SET" suffixOverrides=",">
            <if test="description != null">description = #{description},</if>
            <if test="type != null">type = #{type},</if>
            <if test="effectiveDate != null">effective_date = #{effectiveDate},</if>
            <if test="expiringDate != null">expiring_date = #{expiringDate},</if>
            <if test="content != null">content = #{content},</if>
            <if test="applicableFactory != null">applicable_factory = #{applicableFactory},</if>
            <if test="applicableWorkshop != null">applicable_workshop = #{applicableWorkshop},</if>
            <if test="applicableProcess != null">applicable_process = #{applicableProcess},</if>
            <if test="createBy != null">create_by = #{createBy},</if>
            <if test="createTime != null">create_time = #{createTime},</if>
            <if test="updateBy != null">update_by = #{updateBy},</if>
            <if test="updateTime != null">update_time = #{updateTime},</if>
        </trim>
        where id = #{id}
    </update>

    <delete id="deleteApsWorkCalendarById" parameterType="Long">
        delete from aps_work_calendar where id = #{id}
    </delete>

    <delete id="deleteApsWorkCalendarByIds" parameterType="String">
        delete from aps_work_calendar where id in 
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}
        </foreach>
    </delete>
</mapper>