diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/util/DateUtil.java b/laws-modules/src/main/java/com/jero/modules/laws/common/util/DateUtil.java index ebb86b67..70cf1e27 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/util/DateUtil.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/util/DateUtil.java @@ -5,7 +5,11 @@ import com.jero.common.exception.JeroBootException; import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.util.ArrayList; import java.util.Date; +import java.util.List; /** * @Author: liao @@ -17,6 +21,11 @@ public class DateUtil { public static DateFormat DATE_FORMAT_DAY = new SimpleDateFormat("yyyy-MM-dd"); public static DateFormat DATE_FORMAT_SECOND = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + /** + * @Author: liao + * @Date: 2023/10/31 10:39 + * @Description: 字符串转日期(yyyy-MM-dd) + **/ public static Date getDateDay(String dateStr) { try { return DATE_FORMAT_DAY.parse(dateStr); @@ -26,6 +35,11 @@ public class DateUtil { } } + /** + * @Author: liao + * @Date: 2023/10/31 10:40 + * @Description: 字符串转日期(yyyy-MM-dd HH:mm:ss) + **/ public static Date getDateSecond(String dateStr) { try { return DATE_FORMAT_SECOND.parse(dateStr); @@ -34,4 +48,24 @@ public class DateUtil { throw new JeroBootException("时间格式错误,正确格式yyyy-MM-dd HH:mm:ss"); } } + + /** + * @Author: liao + * @Date: 2023/10/31 10:42 + * @Description: 获取当前一周的时间集合(字符串) + **/ + public static List getLastWeekDateAsString() { + LocalDate today = LocalDate.now(); + LocalDate lastWeek = today.minusWeeks(1); + + List dayStrings = new ArrayList<>(); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + + while (!lastWeek.isAfter(today)) { + dayStrings.add(lastWeek.format(formatter)); + lastWeek = lastWeek.plusDays(1); + } + + return dayStrings; + } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/entity/LawsDataCenterFile.java b/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/entity/LawsDataCenterFile.java index 7a842f25..e26a3335 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/entity/LawsDataCenterFile.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/entity/LawsDataCenterFile.java @@ -45,8 +45,8 @@ public class LawsDataCenterFile implements Serializable { @ApiModelProperty(value = "创建人") private java.lang.String createBy; /**创建时间*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建时间") private java.util.Date createTime; /**更新人*/ diff --git a/laws-modules/src/main/java/com/jero/modules/laws/localTool/controller/LawsStandardEarlyWarningController.java b/laws-modules/src/main/java/com/jero/modules/laws/localTool/controller/LawsStandardEarlyWarningController.java new file mode 100644 index 00000000..28e51eeb --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/localTool/controller/LawsStandardEarlyWarningController.java @@ -0,0 +1,50 @@ +package com.jero.modules.laws.localTool.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jero.common.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; +import com.jero.modules.laws.localTool.entity.StandardEarlyWarning; +import com.jero.modules.laws.localTool.service.ILawsStandardEarlyWarningService; +import com.jero.modules.laws.standard.entity.LawsNewsFeed; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Author: liao + * @Date: 2023/10/31 9:46 + * @Description: 标准预警 + */ +@Api(tags="标准预警") +@RestController +@RequestMapping("/laws/localTool/standardEarlyWarning") +public class LawsStandardEarlyWarningController { + + @Autowired + private ILawsStandardEarlyWarningService lawsStandardEarlyWarningService; + + @AutoLog(value = "标准预警-新车型实施预警") + @ApiOperation(value = "标准预警-新车型实施预警", notes = "标准预警-新车型实施预警") + @GetMapping(value = "/newModelImplementation") + public Result> newModelImplementation(StandardEarlyWarning standardEarlyWarning, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { + IPage pageList = lawsStandardEarlyWarningService.newModelImplementation(standardEarlyWarning, pageNo, pageSize); + return Result.OK(pageList); + } + + @AutoLog(value = "标准预警-在产车实施预警") + @ApiOperation(value = "标准预警-在产车实施预警", notes = "标准预警-在产车实施预警") + @GetMapping(value = "/onTheProduction") + public Result> onTheProduction(StandardEarlyWarning standardEarlyWarning, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { + IPage pageList = lawsStandardEarlyWarningService.onTheProduction(standardEarlyWarning, pageNo, pageSize); + return Result.OK(pageList); + } + +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/localTool/entity/StandardEarlyWarning.java b/laws-modules/src/main/java/com/jero/modules/laws/localTool/entity/StandardEarlyWarning.java new file mode 100644 index 00000000..f357ee4b --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/localTool/entity/StandardEarlyWarning.java @@ -0,0 +1,61 @@ +package com.jero.modules.laws.localTool.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; + +import java.util.List; + +/** + * @Author: liao + * @Date: 2023/10/31 10:11 + * @Description: 标准预警 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="标准预警", description="标准预警") +public class StandardEarlyWarning { + + /**来源(国内/海外)*/ + @Excel(name = "来源(国内/海外)", width = 15) + @ApiModelProperty(value = "来源(国内/海外)") + private java.lang.String source; + + /**标准号/标准名称*/ + @Excel(name = "标准号/标准名称", width = 15) + @ApiModelProperty(value = "标准号/标准名称") + private java.lang.String standardNumberOrName; + + /**责任部门*/ + @Excel(name = "责任部门", width = 15) + @ApiModelProperty(value = "责任部门") + private java.lang.String responsibleDepartment; + + /**标准编号*/ + @Excel(name = "标准编号", width = 15) + @ApiModelProperty(value = "标准编号") + private java.lang.String standardNumber; + + /**标准名称*/ + @Excel(name = "标准名称", width = 15) + @ApiModelProperty(value = "标准名称") + private java.lang.String standardName; + + /**在产车实施日期*/ + @Excel(name = "在产车实施日期", width = 15) + @ApiModelProperty(value = "在产车实施日期") + private java.lang.String onTheProductionDate; + /**新车型实施日期*/ + @Excel(name = "新车型实施日期", width = 15) + @ApiModelProperty(value = "新车型实施日期") + private java.lang.String newModelImplementationDate; + + /**当前天前一周*/ + private List dayStrings; + +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/localTool/mapper/LawsStandardEarlyWarningMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/localTool/mapper/LawsStandardEarlyWarningMapper.java new file mode 100644 index 00000000..babda0f3 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/localTool/mapper/LawsStandardEarlyWarningMapper.java @@ -0,0 +1,19 @@ +package com.jero.modules.laws.localTool.mapper; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.modules.laws.localTool.entity.StandardEarlyWarning; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * @Author: liao + * @Date: 2023/10/31 10:56 + * @Description: 标准预警 + */ +@Mapper +public interface LawsStandardEarlyWarningMapper { + + IPage pageList(Page page, @Param("param") StandardEarlyWarning standardEarlyWarning); + +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/localTool/mapper/xml/LawsStandardEarlyWarningMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/localTool/mapper/xml/LawsStandardEarlyWarningMapper.xml new file mode 100644 index 00000000..9e79b06a --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/localTool/mapper/xml/LawsStandardEarlyWarningMapper.xml @@ -0,0 +1,65 @@ + + + + + + \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/laws/localTool/service/ILawsStandardEarlyWarningService.java b/laws-modules/src/main/java/com/jero/modules/laws/localTool/service/ILawsStandardEarlyWarningService.java new file mode 100644 index 00000000..43dfd5c4 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/localTool/service/ILawsStandardEarlyWarningService.java @@ -0,0 +1,26 @@ +package com.jero.modules.laws.localTool.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jero.modules.laws.localTool.entity.StandardEarlyWarning; + +/** + * @Author: liao + * @Date: 2023/10/31 10:19 + * @Description: 标准预警 + */ +public interface ILawsStandardEarlyWarningService { + + /** + * @Author: liao + * @Date: 2023/10/31 10:30 + * @Description: 新车型实施预警 + **/ + IPage newModelImplementation(StandardEarlyWarning standardEarlyWarning, Integer pageNo, Integer pageSize); + + /** + * @Author: liao + * @Date: 2023/10/31 13:32 + * @Description: 在产车实施预警 + **/ + IPage onTheProduction(StandardEarlyWarning standardEarlyWarning, Integer pageNo, Integer pageSize); +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/localTool/service/impl/LawsStandardEarlyWarningServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/localTool/service/impl/LawsStandardEarlyWarningServiceImpl.java new file mode 100644 index 00000000..17acb4b6 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/localTool/service/impl/LawsStandardEarlyWarningServiceImpl.java @@ -0,0 +1,57 @@ +package com.jero.modules.laws.localTool.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.modules.laws.common.util.DateUtil; +import com.jero.modules.laws.localTool.entity.StandardEarlyWarning; +import com.jero.modules.laws.localTool.mapper.LawsStandardEarlyWarningMapper; +import com.jero.modules.laws.localTool.service.ILawsStandardEarlyWarningService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @Author: liao + * @Date: 2023/10/31 10:20 + * @Description: 标准预警 + */ +@Service +public class LawsStandardEarlyWarningServiceImpl implements ILawsStandardEarlyWarningService { + + @Autowired + private LawsStandardEarlyWarningMapper lawsStandardEarlyWarningMapper; + + /** + * @Author: liao + * @Date: 2023/10/31 10:30 + * @Description: 新车型实施预警 + **/ + @Override + public IPage newModelImplementation(StandardEarlyWarning standardEarlyWarning, Integer pageNo, Integer pageSize) { + // 获取当前日前一周的日期字符串集合 + List dayStrings = DateUtil.getLastWeekDateAsString(); + standardEarlyWarning.setDayStrings(dayStrings); + standardEarlyWarning.setNewModelImplementationDate("A"); + Page page = new Page<>(pageNo, pageSize); + IPage pageList = lawsStandardEarlyWarningMapper.pageList(page, standardEarlyWarning); + return pageList; + } + + /** + * @Author: liao + * @Date: 2023/10/31 13:32 + * @Description: 在产车实施预警 + **/ + @Override + public IPage onTheProduction(StandardEarlyWarning standardEarlyWarning, Integer pageNo, Integer pageSize) { + // 获取当前日前一周的日期字符串集合 + List dayStrings = DateUtil.getLastWeekDateAsString(); + standardEarlyWarning.setDayStrings(dayStrings); + standardEarlyWarning.setOnTheProductionDate("A"); + Page page = new Page<>(pageNo, pageSize); + IPage pageList = lawsStandardEarlyWarningMapper.pageList(page, standardEarlyWarning); + return pageList; + } + +}